Fix ecotone mispelling, leverage simulation funcationality hooks

base · Mar 8, 2024 · c42e2a2 · c42e2a2
1 parent eea2041
commit c42e2a2
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 6 deletions.
diff --git a/...2024-03-07-ecotome-sysconfig-updates/.env → ...2024-03-07-ecotone-sysconfig-updates/.env b/...2024-03-07-ecotome-sysconfig-updates/.env → ...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/...-03-07-ecotome-sysconfig-updates/Makefile → ...-03-07-ecotone-sysconfig-updates/Makefile b/...-03-07-ecotome-sysconfig-updates/Makefile → ...-03-07-ecotone-sysconfig-updates/Makefile
diff --git a/...07-ecotome-sysconfig-updates/foundry.toml → ...07-ecotone-sysconfig-updates/foundry.toml b/...07-ecotome-sysconfig-updates/foundry.toml → ...07-ecotone-sysconfig-updates/foundry.toml
diff --git a/...nfig-updates/script/RollbackGasConfig.sol → ...nfig-updates/script/RollbackGasConfig.sol b/...nfig-updates/script/RollbackGasConfig.sol → ...nfig-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/...config-updates/script/UpdateGasConfig.sol → ...config-updates/script/UpdateGasConfig.sol b/...config-updates/script/UpdateGasConfig.sol → ...config-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({