diff --git a/tasks/eth/3-add-superchainConfig/README.md b/tasks/eth/3-add-superchainConfig/README.md index 48a43d310f..fdea71c71b 100644 --- a/tasks/eth/3-add-superchainConfig/README.md +++ b/tasks/eth/3-add-superchainConfig/README.md @@ -1,14 +1,14 @@ # Upgrade #4 Multisig Ceremony -Status: DRAFT, NOT READY TO SIGN - -> [!IMPORTANT] !!! DO NOT SIGN using this playbook yet, as the associated governance proposal has -> not yet passed. +Status: READY_TO_SIGN ## Objective -This is the playbook for executing Upgrade #4, pending approval by governance. Voting on this -proposal is tracked at https://vote.optimism.io/proposals/tbd. +This is the playbook for executing Upgrade #4. + +The proposal was: +- [X] approved by Token House voting here: https://vote.optimism.io/proposals/110376471005925230990107796624328147348746431603727026291575353089698990280147 +- [X] not vetoed by the Citizens' house here: https://snapshot.org/#/citizenshouse.eth/proposal/0x9e85524badfcec19856bfc51cfefc78cb5f36a9b77ec0b3b304d7d7768bdf810 The proposal should be treated as the source of truth and used by the multisig signers to verify the correctness of the onchain operations. diff --git a/tasks/eth/3-add-superchainConfig/Validation.md b/tasks/eth/3-add-superchainConfig/Validation.md index 8b47892e38..958bbd96ff 100644 --- a/tasks/eth/3-add-superchainConfig/Validation.md +++ b/tasks/eth/3-add-superchainConfig/Validation.md @@ -34,11 +34,11 @@ Enables the simulation by reducing the threshold to 1: The Safe you are signing for will have the following overrides which will set the [Multicall](https://etherscan.io/address/0xca11bde05977b3631167028862be2a173976ca11#code) contract as the sole owner of the signing safe. This allows simulating both the approve hash and the final tx in a single Tenderly tx. - **Key:** 0x0000000000000000000000000000000000000000000000000000000000000003
- **Value:** 0x0000000000000000000000000000000000000000000000000000000000000001 + **Value:** 0x0000000000000000000000000000000000000000000000000000000000000001
**Meaning:** The number of owners is set to 1. - **Key:** 0x0000000000000000000000000000000000000000000000000000000000000004
- **Value:** 0x0000000000000000000000000000000000000000000000000000000000000001 + **Value:** 0x0000000000000000000000000000000000000000000000000000000000000001
**Meaning:** The threshold is set to 1. The following two overrides are modifications to the [`owners` mapping](https://github.com/safe-global/safe-contracts/blob/v1.4.0/contracts/libraries/SafeStorage.sol#L15). For the purpose of calculating the storage, note that this mapping is in slot `2`. @@ -49,13 +49,13 @@ This mapping implements a linked list for iterating through the list of owners. And we do indeed see these entries: - **Key:** 0x316a0aac0d94f5824f0b66f5bbe94a8c360a17699a1d3a233aafcf7146e9f11c
- **Value:** 0x0000000000000000000000000000000000000000000000000000000000000001 + **Value:** 0x0000000000000000000000000000000000000000000000000000000000000001
**Meaning:** This is `owners[0xca11bde05977b3631167028862be2a173976ca11] -> 1`, so the key can be derived from `cast index address 0xca11bde05977b3631167028862be2a173976ca11 2`. - **Key:** 0xe90b7bceb6e7df5418fb78d8ee546e97c83a08bbccc01a0644d599ccd2a7c2e0
- **Value:** 0x000000000000000000000000ca11bde05977b3631167028862be2a173976ca11 + **Value:** 0x000000000000000000000000ca11bde05977b3631167028862be2a173976ca11
**Meaning:** This is `owners[1] -> 0xca11bde05977b3631167028862be2a173976ca11`, so the key can be derived from `cast index address 0x0000000000000000000000000000000000000001 2`.