-
Notifications
You must be signed in to change notification settings - Fork 128
feat: eth/052 deputy pause key rotation #1399
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
Ethnical
wants to merge
18
commits into
main
Choose a base branch
from
feat/deputy-pause-key-rotation-eth
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from 1 commit
Commits
Show all changes
18 commits
Select commit
Hold shift + click to select a range
dfce358
feat: add eth/052 deputy pause key rotation task
JosepBove 4c05455
fix(eth/052): point task at the current mainnet DPM and FoundationUpg…
Ethnical 1ea27ed
override Safes
Ethnical ea8fa2a
bump: correct signature for the new Deputy
Ethnical 5671ff9
chore: fix the template
Ethnical 44e1228
push
Ethnical af48881
fix(eth/052): route rotation through FoundationUpgradeSafe via config…
Ethnical ebd2fa1
fix(eth/052): restore template, fix sep test safe identifier typo
Ethnical 9f3ea30
chore(eth/052): update deputy signature and EIP-712 hashes
Ethnical 7469333
fix(test/sep/007): restore original deputy signature for regression test
Ethnical e38d8d3
fix sig
Ethnical 7ff92ac
chore: update the fork block with the correct block
Ethnical f163100
Merge branch 'main' into feat/deputy-pause-key-rotation-eth
Ethnical 076c57d
chore: add space?
Ethnical 0b7bca4
Merge branch 'feat/deputy-pause-key-rotation-eth' of github.com:ether…
Ethnical 1615265
remove duplicates
Ethnical 5058f5d
chore: updtate with the correct safes
Ethnical a4b713e
chore: remove comments
Ethnical File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,26 @@ | ||
| # 052-deputy-pause-key-rotation | ||
|
|
||
| Status: READY TO SIGN | ||
|
|
||
| ## Objective | ||
|
|
||
| Rotates the `DeputyPauseModule` Deputy EOA from `0x352f1defb49718e7ea411687e850aa8d6299f7ac` to `0x2fA150379bF32b6d79Eeb4ff9bD280E76049a87c`. | ||
| To achieve this, we will use the `setDeputy` function of the `DeputyPauseModule` contract deployed at `0x126a736B18E0a64fBA19D421647A530E327E112C`. | ||
|
|
||
| ## Simulation | ||
|
|
||
| Please see the "Simulating and Verifying the Transaction" instructions in [SINGLE.md](../../../SINGLE.md). | ||
| When simulating, ensure the logs say `Using script /your/path/to/superchain-ops/src/template/DeputyPauseKeyRotationTemplate.sol`. | ||
| This ensures all safety checks are run. If the default `SignFromJson.s.sol` script is shown (without the full path), something is wrong and the safety checks will not run. | ||
|
|
||
| ## State Validation | ||
|
|
||
| Please see the instructions for [validation](./VALIDATION.md). | ||
|
|
||
| ## Execution | ||
|
|
||
| Rotates the `DeputyPauseModule` Deputy EOA from `0x352f1defb49718e7ea411687e850aa8d6299f7ac` to `0x2fA150379bF32b6d79Eeb4ff9bD280E76049a87c` in the [DeputyPauseModule](https://etherscan.io/address/0x126a736B18E0a64fBA19D421647A530E327E112C#code). | ||
|
|
||
| ## Signing and execution | ||
|
|
||
| This task has to be signed by the [FoundationOperationsSafe](https://etherscan.io/address/0x9BA6e03D8B90dE867373Db8cF1A58d2F7F006b3A). |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,60 @@ | ||
| # Validation | ||
|
|
||
| This document can be used to validate the state diff resulting from the execution of the upgrade | ||
| transaction. | ||
|
|
||
| For each contract listed in the state diff, please verify that no contracts or state changes shown in the Tenderly diff are missing from this document. Additionally, please verify that for each contract: | ||
|
|
||
| - 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. | ||
|
|
||
| ## Expected Domain and Message Hashes | ||
|
|
||
| > [!CAUTION] | ||
| > Before signing, ensure the below hashes match what is on your ledger. | ||
| > | ||
| > ### Optimism Foundation | ||
| > | ||
| > Domain Hash: 0x2e5ad244d335c45fbace4ebd1736b0fad81b01591a2819baedad311ead5bce76 | ||
| > Message Hash: 0xbb9508edc2cb54922dfdbd999b50b95622aa8be4475159ceb3d4a6306241f192 | ||
|
|
||
| ## State Overrides | ||
|
|
||
| The following state overrides should be seen: | ||
|
|
||
| ### `0x9BA6e03D8B90dE867373Db8cF1A58d2F7F006b3A` (The Optimism Foundation Operations Safe) | ||
|
|
||
| Links: | ||
|
|
||
| - [Etherscan](https://etherscan.io/address/0x9BA6e03D8B90dE867373Db8cF1A58d2F7F006b3A) | ||
|
|
||
| Enables the simulation by setting the threshold to 1: | ||
|
|
||
| - **Key:** `0x0000000000000000000000000000000000000000000000000000000000000004` <br/> | ||
| **Value:** `0x0000000000000000000000000000000000000000000000000000000000000001` | ||
|
|
||
| ## State Changes | ||
|
|
||
| ### `0x9ba6e03d8b90de867373db8cf1a58d2f7f006b3a` (Foundation Operations Safe) | ||
|
|
||
| - **Key:** `0x0000000000000000000000000000000000000000000000000000000000000005` | ||
| - **Decoded Kind:** `uint256` | ||
| - **Before:** `118` | ||
| - **After:** `119` | ||
| - **Summary:** nonce | ||
| - **Detail:** | ||
|
|
||
| This updates the nonce of the Foundation Operations Safe. | ||
|
|
||
| --- | ||
|
|
||
| ### `0x126a736b18e0a64fba19d421647a530e327e112c` (DeputyPauseModule) | ||
|
|
||
| - **Key:** `0x0000000000000000000000000000000000000000000000000000000000000002` | ||
| - **Before:** `0x000000000000000000000000352f1defb49718e7ea411687e850aa8d6299f7ac` | ||
| - **After:** `0x0000000000000000000000002fa150379bf32b6d79eeb4ff9bd280e76049a87c` | ||
| - **Summary:** | ||
| - **Detail:** | ||
|
|
||
| This updates the previous deputy `0x352f1defB49718e7Ea411687E850aA8d6299F7aC` to `0x2fA150379bF32b6d79Eeb4ff9bD280E76049a87c`. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,12 @@ | ||
| l2chains = [{name = "OP Mainnet", chainId = 10}] | ||
| templateName = "DeputyPauseKeyRotationTemplate" | ||
|
|
||
| newDeputy = "0x2fA150379bF32b6d79Eeb4ff9bD280E76049a87c" | ||
|
|
||
| newDeputySignature = "0x9f1c36e3cfcc19c4e2349600477d1cd782856d62c520b4f6295f7922fe333b91772a4949015fe38ce61f34353967d0b2c33126793b7609d4227189fa828db2271c" | ||
|
|
||
| [stateOverrides] | ||
| # Nonce override for simulation (storage slot 0x5 is the nonce) | ||
| 0x9BA6e03D8B90dE867373Db8cF1A58d2F7F006b3A = [ | ||
| {key = "0x0000000000000000000000000000000000000000000000000000000000000005", value = 118} | ||
| ] |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
DPM should be the instead -> 0x76fC2F971FB355D0453cF9F64d3F9E4f640E1754