sepolia-019: Holocene FP upgrade #374

sebastianst · 2024-11-22T16:50:57Z

Description

OP Sepolia Holocene FP upgrade - sets new FDG and PDG implementations.

Tests

Verifications added for the new DGs, and correct MIPS vm.

Towards ethereum-optimism/optimism#13033

clabby

Nicely done. Ran through the simulation and checked the deployments, looks good to me.

tasks/sep/019-fp-holocene-upgrade/NestedSignFromJson.s.sol

clabby · 2024-11-22T16:58:26Z

NESTED.md

@@ -36,6 +36,8 @@ is ready".

 Make sure your ledger is still unlocked and run the following commands depending on which Safe you are signing on behalf of.

+Note: during development of the Solidity script, simulations can be run without any Ledger by exporting `SIMULATE_WITHOUT_LEDGER=1` in your shell, or by adding it to the `.env` file.


nice, thanks for documenting this :)

clabby · 2024-11-22T16:59:45Z

tasks/sep/019-fp-holocene-upgrade/NestedSignFromJson.s.sol

+
+    DisputeGameFactory constant dgfProxy = DisputeGameFactory(0x05F9613aDB30026FFd634f38e5C4dFd30a197Fa1);
+    address constant livenessGuard = 0xc26977310bC89DAee5823C2e2a73195E85382cC7;
+    bytes32 constant absolutePrestate = 0x03925193e3e89f87835bbdf3a813f60b2aa818a36bbe71cd5d8fd7e79f5e8afe;


Confirmed this is the correct prestate for the op-program/v1.4.0-rc.1 tag.

…SignFromJson.s.sol Co-authored-by: clabby <ben@clab.by>

clabby

re-approval after the suggestion was added

mds1 · 2024-11-22T17:36:11Z

tasks/sep/019-fp-holocene-upgrade/.env

@@ -0,0 +1,6 @@
+ETH_RPC_URL="https://ethereum-sepolia.publicnode.com"
+SUPERCHAIN_CONFIG_ADDR=0xC2Be75506d5724086DEB7245bd260Cc9753911Be


Looks like this is not used

Suggested change

SUPERCHAIN_CONFIG_ADDR=0xC2Be75506d5724086DEB7245bd260Cc9753911Be

mds1 · 2024-11-22T17:37:25Z

tasks/sep/019-fp-holocene-upgrade/README.md

+
+## Objective
+
+Upgrades the Fault Proof contracts of OP Seplia for the Holocene hardfork.


Suggested change

Upgrades the Fault Proof contracts of OP Seplia for the Holocene hardfork.

Upgrades the Fault Proof contracts of OP Sepolia for the Holocene hardfork.

mds1 · 2024-11-22T17:38:09Z

tasks/sep/019-fp-holocene-upgrade/README.md

+This upgrades the Fault Proof contracts in the
+[op-contracts/v1.8.0-rc.2](https://github.com/ethereum-optimism/optimism/tree/op-contracts/v1.8.0-rc.2) release.


This should be rc.3, per ethereum-optimism/optimism#13015 (comment)

mds1 · 2024-11-22T17:38:48Z

tasks/sep/019-fp-holocene-upgrade/README.md

+- `MIPS` - `0x69470D6970Cd2A006b84B1d4d70179c892cFCE01`
+- `FaultDisputeGame` - `0x5e0877a8F6692eD470013e651c4357d0C4941e6C`
+- `PermissionedDisputeGame` - `0x4Ed046e66c96600DaE1a4ec39267bB0cE476E8cc`


Any way I can verify these are the correct addresses, e.g. is there a superchain registry PR?

mds1 · 2024-11-22T17:47:43Z

tasks/sep/019-fp-holocene-upgrade/NestedSignFromJson.s.sol

+        allowed[4] = livenessGuard;
+    }
+
+    function _postCheck(Vm.AccountAccess[] memory accesses, Simulation.Payload memory) internal override {


Suggested change

function _postCheck(Vm.AccountAccess[] memory accesses, Simulation.Payload memory) internal override {

function _postCheck(Vm.AccountAccess[] memory accesses, Simulation.Payload memory) internal view override {

mds1 · 2024-11-22T17:51:48Z

tasks/sep/019-fp-holocene-upgrade/VALIDATION.md

+- All addresses (in section headers and storage values) match the provided name, using the Etherscan and Superchain Registry links provided. This validates the bytecode deployed at the addresses contains the correct logic.
+- All key values match the semantic meaning provided, which can be validated using the storage layout links provided.
+
+## State Changes


Validation is missing the state overrides section. Let's make sure to add this so signers (especially on mainnet) understand why the state overrides are present. You can pull these from another nested ceremony's validations, they are always identical

mds1 · 2024-11-22T17:53:39Z

tasks/sep/019-fp-holocene-upgrade/VALIDATION.md

+- All key values match the semantic meaning provided, which can be validated using the storage layout links provided.
+
+## State Changes
+


We also need to call out the:

The nonce increments that happen

The approvedHashes mapping being set

Similar to overrides, check out other validation files for a template. The nonce increment can be a bullet point explaining each, the approved hashes is a bit more involved as you can see

mds1 · 2024-11-22T17:55:34Z

tasks/sep/019-fp-holocene-upgrade/VALIDATION.md

+- **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).


nit, let's be a little more explicit here, and same for the below storage change as well

Suggested change

**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

mds1 · 2024-11-22T17:58:57Z

.circleci/config.yml

+            just install
+            cd tasks/sep/019-fp-holocene-upgrade
+            SIMULATE_WITHOUT_LEDGER=true just \
+             --dotenv-path $(pwd)/.env \
+             --justfile ../../../nested.just \
+             simulate foundation 0


in CI we should run it for both council and foundation, however if we get all sigs before this is merged we can change status to [EXECUTED](https://txHashUrl) and remove this task from CI

Suggested change

just install

cd tasks/sep/019-fp-holocene-upgrade

SIMULATE_WITHOUT_LEDGER=true just \

--dotenv-path $(pwd)/.env \

--justfile ../../../nested.just \

simulate foundation 0

just install

cd tasks/sep/019-fp-holocene-upgrade

SIMULATE_WITHOUT_LEDGER=true just \

--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

mds1 · 2024-11-22T18:00:20Z

tasks/sep/019-fp-holocene-upgrade/VALIDATION.md

+- The following state changes (and none others) are made to that contract. This validates that no unexpected state changes occur.
+- All addresses (in section headers and storage values) match the provided name, using the Etherscan and Superchain Registry links provided. This validates the bytecode deployed at the addresses contains the correct logic.
+- All key values match the semantic meaning provided, which can be validated using the storage layout links provided.
+


When simulating as the council, there will be liveness guard state changes that we need to mention here (can similarly reference a prior validations file as a template)

mds1 · 2024-11-22T18:03:12Z

tasks/sep/019-fp-holocene-upgrade/NestedSignFromJson.s.sol

+    using LibString for string;
+
+    DisputeGameFactory constant dgfProxy = DisputeGameFactory(0x05F9613aDB30026FFd634f38e5C4dFd30a197Fa1);
+    address constant livenessGuard = 0xc26977310bC89DAee5823C2e2a73195E85382cC7;


We should read this from storage, see

superchain-ops/tasks/sep/fp-recovery/005-set-game-implementation/templates/NestedSignFromJson.s.sol

Line 33 in 9f0a42d

bytes32 livenessGuardSlot = 0x4a204f620c8c5ccdca3fd54d003badd85ba500436a431f0cbda4f558c93c34c8;

as an example

mds1 · 2024-11-22T18:05:19Z

tasks/sep/019-fp-holocene-upgrade/NestedSignFromJson.s.sol

+contract NestedSignFromJson is OriginalNestedSignFromJson {
+    using LibString for string;
+
+    DisputeGameFactory constant dgfProxy = DisputeGameFactory(0x05F9613aDB30026FFd634f38e5C4dFd30a197Fa1);


This should be read from the superchain registry instead of hardcoding it, for example

superchain-ops/tasks/eth/fp-recovery/003-enable-permissionless-game/SignFromJson.s.sol

Line 55 in 9f0a42d

function _getContractSet() internal view returns (Types.ContractSet memory _proxies) {

mds1 · 2024-11-22T18:06:04Z

tasks/sep/019-fp-holocene-upgrade/NestedSignFromJson.s.sol

+    address constant livenessGuard = 0xc26977310bC89DAee5823C2e2a73195E85382cC7;
+    bytes32 constant absolutePrestate = 0x03925193e3e89f87835bbdf3a813f60b2aa818a36bbe71cd5d8fd7e79f5e8afe;
+    address constant newMips = 0x69470D6970Cd2A006b84B1d4d70179c892cFCE01;
+    address constant oracle = 0x92240135b46fc1142dA181f550aE8f595B858854;


Is this the same preimage oracle as op-contracts/v1.6.0? If so let's also read this from the superchain registry instead of hardcoding it

sepolia-019: Holocene FP upgrade

6f04534

sebastianst requested review from a team as code owners November 22, 2024 16:50

sebastianst requested a review from blmalone November 22, 2024 16:50

update README

e256295

clabby previously approved these changes Nov 22, 2024

View reviewed changes

Remove commented-out code in tasks/sep/019-fp-holocene-upgrade/Nested…

9f0a42d

…SignFromJson.s.sol Co-authored-by: clabby <ben@clab.by>

sebastianst dismissed clabby’s stale review via 9f0a42d November 22, 2024 17:04

clabby approved these changes Nov 22, 2024

View reviewed changes

mds1 reviewed Nov 22, 2024

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

sepolia-019: Holocene FP upgrade #374

sepolia-019: Holocene FP upgrade #374

sebastianst commented Nov 22, 2024 •

edited

Loading

clabby left a comment

clabby Nov 22, 2024

clabby Nov 22, 2024

clabby left a comment

mds1 Nov 22, 2024

mds1 Nov 22, 2024

mds1 Nov 22, 2024

mds1 Nov 22, 2024

mds1 Nov 22, 2024

mds1 Nov 22, 2024

mds1 Nov 22, 2024

mds1 Nov 22, 2024

mds1 Nov 22, 2024

mds1 Nov 22, 2024

mds1 Nov 22, 2024

mds1 Nov 22, 2024

mds1 Nov 22, 2024

		@@ -36,6 +36,8 @@ is ready".

		Make sure your ledger is still unlocked and run the following commands depending on which Safe you are signing on behalf of.

		Note: during development of the Solidity script, simulations can be run without any Ledger by exporting `SIMULATE_WITHOUT_LEDGER=1` in your shell, or by adding it to the `.env` file.

		@@ -0,0 +1,6 @@
		ETH_RPC_URL="https://ethereum-sepolia.publicnode.com"
		SUPERCHAIN_CONFIG_ADDR=0xC2Be75506d5724086DEB7245bd260Cc9753911Be


		## Objective

		Upgrades the Fault Proof contracts of OP Seplia for the Holocene hardfork.

		This upgrades the Fault Proof contracts in the
		[op-contracts/v1.8.0-rc.2](https://github.com/ethereum-optimism/optimism/tree/op-contracts/v1.8.0-rc.2) release.

	function _postCheck(Vm.AccountAccess[] memory accesses, Simulation.Payload memory) internal override {
	function _postCheck(Vm.AccountAccess[] memory accesses, Simulation.Payload memory) internal view override {

		- All key values match the semantic meaning provided, which can be validated using the storage layout links provided.

		## State Changes

sepolia-019: Holocene FP upgrade #374

Are you sure you want to change the base?

sepolia-019: Holocene FP upgrade #374

Conversation

sebastianst commented Nov 22, 2024 • edited Loading

clabby left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

clabby left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

sebastianst commented Nov 22, 2024 •

edited

Loading