Apply suggestions from code review

Co-authored-by: Matt Solomon <[email protected]>
ethereum-optimism · Nov 24, 2024 · efa846d · efa846d
1 parent 9f0a42d
commit efa846d
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 4 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -189,6 +189,10 @@ jobs:
              --dotenv-path $(pwd)/.env \
              --justfile ../../../nested.just \
              simulate foundation 0
+            SIMULATE_WITHOUT_LEDGER=true just \
+             --dotenv-path $(pwd)/.env \
+             --justfile ../../../nested.just \
+             simulate council 0
 
   forge_build:
     docker:

diff --git a/tasks/sep/019-fp-holocene-upgrade/.env b/tasks/sep/019-fp-holocene-upgrade/.env
@@ -1,5 +1,4 @@
 ETH_RPC_URL="https://ethereum-sepolia.publicnode.com"
-SUPERCHAIN_CONFIG_ADDR=0xC2Be75506d5724086DEB7245bd260Cc9753911Be
 COUNCIL_SAFE=0xf64bc17485f0B4Ea5F06A96514182FC4cB561977
 FOUNDATION_SAFE=0xDEe57160aAfCF04c34C887B5962D0a69676d3C8B
 OWNER_SAFE=0x1Eb2fFc903729a0F03966B917003800b145F56E2

diff --git a/tasks/sep/019-fp-holocene-upgrade/NestedSignFromJson.s.sol b/tasks/sep/019-fp-holocene-upgrade/NestedSignFromJson.s.sol
@@ -93,7 +93,7 @@ contract NestedSignFromJson is OriginalNestedSignFromJson {
         allowed[4] = livenessGuard;
     }
 
-    function _postCheck(Vm.AccountAccess[] memory accesses, Simulation.Payload memory) internal override {
+    function _postCheck(Vm.AccountAccess[] memory accesses, Simulation.Payload memory) internal view override {
         console.log("Running post-deploy assertions");
         checkStateDiff(accesses);
         checkDGFProxyAndGames();

diff --git a/tasks/sep/019-fp-holocene-upgrade/README.md b/tasks/sep/019-fp-holocene-upgrade/README.md
@@ -4,7 +4,7 @@ Status: READY TO SIGN
 
 ## Objective
 
-Upgrades the Fault Proof contracts of OP Seplia for the Holocene hardfork.
+Upgrades the Fault Proof contracts of OP Sepolia for the Holocene hardfork.
 
 The proposal is soon posted to the governance forum. This is just the testnet upgrade.
 

diff --git a/tasks/sep/019-fp-holocene-upgrade/VALIDATION.md b/tasks/sep/019-fp-holocene-upgrade/VALIDATION.md
@@ -16,7 +16,7 @@ For each contract listed in the state diff, please verify that no contracts or s
 - **Key**: `0xffdfc1249c027f9191656349feb0761381bb32c9f557e01f419fd08754bf5a1b` <br/>
   **Before**: `0x000000000000000000000000d9d616e4a03a8e7cc962396c9f8d4e3d306097d3` <br/>
   **After**: `0x0000000000000000000000005e0877a8f6692ed470013e651c4357d0c4941e6c` <br/>
-  **Meaning**: Updates the CANNON game type implementation. Verify that the new implementation is set using `cast call 0x05F9613aDB30026FFd634f38e5C4dFd30a197Fa1 "gameImpls(uint32)(address)" 0`. Where `0` is the [`CANNON` game type](https://github.com/ethereum-optimism/optimism/blob/op-contracts/v1.4.0/packages/contracts-bedrock/src/dispute/lib/Types.sol#L28).
+  **Meaning**: Updates the CANNON game type implementation. Verify that the new implementation is set using `cast call 0x05F9613aDB30026FFd634f38e5C4dFd30a197Fa1 "gameImpls(uint32)(address)" 0`. Where `0` is the [`CANNON` game type](https://github.com/ethereum-optimism/optimism/blob/op-contracts/v1.4.0/packages/contracts-bedrock/src/dispute/lib/Types.sol#L28). Upon executing this call you will see the returned address is `0xD9d616E4a03a8e7cC962396C9f8D4e3d306097D3`, matching the "Before" value of this slot, demonstrating this slot storing the address of the cannon implementation 
 
 - **Key**: `0x4d5a9bd2e41301728d41c8e705190becb4e74abe869f75bdb405b63716a35f9e` <br/>
   **Before**: `0x00000000000000000000000098e3f752c7224f8322afa935a4caec3832bb25c9` <br/>