From c42e2a26c826d55287bae0c36a8819845ea72d64 Mon Sep 17 00:00:00 2001
From: katzman <steve.katzman@coinbase.com>
Date: Thu, 7 Mar 2024 16:36:30 -0800
Subject: [PATCH] Fix ecotone mispelling, leverage simulation funcationality
 hooks

---
 .../.env                                              |  2 +-
 .../Makefile                                          |  0
 .../foundry.toml                                      |  0
 .../script/RollbackGasConfig.sol                      |  3 +++
 .../script/UpdateGasConfig.sol                        | 11 ++++++-----
 5 files changed, 10 insertions(+), 6 deletions(-)
 rename mainnet/{2024-03-07-ecotome-sysconfig-updates => 2024-03-07-ecotone-sysconfig-updates}/.env (95%)
 rename mainnet/{2024-03-07-ecotome-sysconfig-updates => 2024-03-07-ecotone-sysconfig-updates}/Makefile (100%)
 rename mainnet/{2024-03-07-ecotome-sysconfig-updates => 2024-03-07-ecotone-sysconfig-updates}/foundry.toml (100%)
 rename mainnet/{2024-03-07-ecotome-sysconfig-updates => 2024-03-07-ecotone-sysconfig-updates}/script/RollbackGasConfig.sol (93%)
 rename mainnet/{2024-03-07-ecotome-sysconfig-updates => 2024-03-07-ecotone-sysconfig-updates}/script/UpdateGasConfig.sol (89%)

diff --git a/mainnet/2024-03-07-ecotome-sysconfig-updates/.env b/mainnet/2024-03-07-ecotone-sysconfig-updates/.env
similarity index 95%
rename from mainnet/2024-03-07-ecotome-sysconfig-updates/.env
rename to mainnet/2024-03-07-ecotone-sysconfig-updates/.env
index 8af6be52..42e25556 100644
--- a/mainnet/2024-03-07-ecotome-sysconfig-updates/.env
+++ b/mainnet/2024-03-07-ecotone-sysconfig-updates/.env
@@ -1,5 +1,5 @@
 OP_COMMIT=c87a469d7d679e8a4efbace56c3646b925bcc009
-BASE_CONTRACTS_COMMIT=fe492be3478134b2305c207a12b153eca04148c0
+BASE_CONTRACTS_COMMIT=b5e59aa508e2c4e3efd1db1312160752ab2756fd
 
 L1_SYSTEM_CONFIG_ADDRESS=0x73a79Fab69143498Ed3712e519A88a918e1f4072
 SYSTEM_CONFIG_OWNER=0x14536667Cd30e52C0b458BaACcB9faDA7046E056
diff --git a/mainnet/2024-03-07-ecotome-sysconfig-updates/Makefile b/mainnet/2024-03-07-ecotone-sysconfig-updates/Makefile
similarity index 100%
rename from mainnet/2024-03-07-ecotome-sysconfig-updates/Makefile
rename to mainnet/2024-03-07-ecotone-sysconfig-updates/Makefile
diff --git a/mainnet/2024-03-07-ecotome-sysconfig-updates/foundry.toml b/mainnet/2024-03-07-ecotone-sysconfig-updates/foundry.toml
similarity index 100%
rename from mainnet/2024-03-07-ecotome-sysconfig-updates/foundry.toml
rename to mainnet/2024-03-07-ecotone-sysconfig-updates/foundry.toml
diff --git a/mainnet/2024-03-07-ecotome-sysconfig-updates/script/RollbackGasConfig.sol b/mainnet/2024-03-07-ecotone-sysconfig-updates/script/RollbackGasConfig.sol
similarity index 93%
rename from mainnet/2024-03-07-ecotome-sysconfig-updates/script/RollbackGasConfig.sol
rename to mainnet/2024-03-07-ecotone-sysconfig-updates/script/RollbackGasConfig.sol
index 66dde1f9..8e4e650b 100644
--- a/mainnet/2024-03-07-ecotome-sysconfig-updates/script/RollbackGasConfig.sol
+++ b/mainnet/2024-03-07-ecotone-sysconfig-updates/script/RollbackGasConfig.sol
@@ -11,6 +11,9 @@ import {
     Enum
 } from "@base-contracts/script/universal/MultisigBuilder.sol";
 
+// This script will be signed ahead of Ecotone but is not planned for execution. 
+// If something goes wrong with the hardfork, we can rollback the config by executing 
+// this pre-signed transaction.  
 contract RollbackGasConfig is MultisigBuilder {
 
     address internal SYSTEM_CONFIG_OWNER = vm.envAddress("SYSTEM_CONFIG_OWNER");
diff --git a/mainnet/2024-03-07-ecotome-sysconfig-updates/script/UpdateGasConfig.sol b/mainnet/2024-03-07-ecotone-sysconfig-updates/script/UpdateGasConfig.sol
similarity index 89%
rename from mainnet/2024-03-07-ecotome-sysconfig-updates/script/UpdateGasConfig.sol
rename to mainnet/2024-03-07-ecotone-sysconfig-updates/script/UpdateGasConfig.sol
index 64fab2e7..4044de85 100644
--- a/mainnet/2024-03-07-ecotome-sysconfig-updates/script/UpdateGasConfig.sol
+++ b/mainnet/2024-03-07-ecotone-sysconfig-updates/script/UpdateGasConfig.sol
@@ -30,7 +30,7 @@ contract UpdateGasConfig is MultisigBuilder {
             callData: abi.encodeCall(
                 SystemConfig.setGasConfig,
                 (
-                0, // overhead is not used post Ecotome
+                0, // overhead is not used post Ecotone
                 SCALAR
                 )
             )
@@ -58,10 +58,11 @@ contract UpdateGasConfig is MultisigBuilder {
         catch {}
 
         SimulationStateOverride[] memory overrides = new SimulationStateOverride[](1);
-        // The state change simulation sets the multisig threshold to 1 in the
-        // simulation to enable an approver to see what the final state change
-        // will look like upon transaction execution. The multisig threshold
-        // will not actually change in the transaction execution.
+        // The state change simulation sets the multisig threshold to 1 and the owner
+        // to the foundry default sender address so that the simulation can be run by 
+        // someone without one of the owning keys.
+        // The multisig threshold and owner will not actually change in the prod 
+        // transaction execution.
         overrides[0] = overrideSafeThresholdAndOwner(_safe, DEFAULT_SENDER);
 
         logSimulationLink({