-
Notifications
You must be signed in to change notification settings - Fork 127
U17 Unichain Mainnet #1271
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
Merged
Merged
U17 Unichain Mainnet #1271
Changes from 3 commits
Commits
Show all changes
17 commits
Select commit
Hold shift + click to select a range
e1801e9
U17 Unichain Main
Wazabie dbee3a6
Add arena-z task to run stacked simulation correctly
Wazabie 4fd5bc4
Pin block number
Wazabie 0ec0e21
Merge branch 'main' into u17-main-unichain
Wazabie a8a5e76
update fork block number
Wazabie 3f5a251
Update .env
Wazabie b62c859
Update TaskManager.t.sol
Wazabie a431d77
Update TaskManager.t.sol
Wazabie 09ffe36
Update .env
Wazabie 95f07ab
Update prestates
Wazabie 34a574d
Merge branch 'main' into u17-main-unichain
Wazabie 880215e
Update opcm and prestate
Wazabie b441153
Merge branch 'main' into u17-main-unichain
mds1 12db581
Merge branch 'main' into u17-main-unichain
mds1 a9802d4
Merge branch 'main' into u17-main-unichain
mds1 83af3ff
doc: fix readme
mds1 9542c64
fix: restore arena-z validations
mds1 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,2 @@ | ||
| TENDERLY_GAS=30000000 | ||
|
mds1 marked this conversation as resolved.
|
||
| FORK_BLOCK_NUMBER=23669561 | ||
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,21 @@ | ||
| # 034-U17-main-arena-z-swell | ||
|
|
||
| Status: [DRAFT, NOT READY TO SIGN] | ||
|
|
||
| ## Objective | ||
|
|
||
| This task upgrades Arena-Z and Swell Mainnet to U17. | ||
|
|
||
| ## Simulation & Signing | ||
|
|
||
| Simulation commands for each safe: | ||
| ```bash | ||
| cd src/tasks/eth/034-U17-main-arena-z-swell | ||
| SIMULATE_WITHOUT_LEDGER=1 just --dotenv-path $(pwd)/.env simulate <council|foundation> | ||
| ``` | ||
|
|
||
| Signing commands for each safe: | ||
| ```bash | ||
| cd src/tasks/eth/034-U17-main-arena-z-swell | ||
| just --dotenv-path $(pwd)/.env sign <council|foundation> | ||
| ``` |
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,29 @@ | ||
| # Validation | ||
|
|
||
| This document can be used to validate the inputs and result of the execution of the upgrade transaction which you are | ||
| signing. | ||
|
|
||
| ## Expected Domain and Message Hashes | ||
|
|
||
| Validate the domain and message hashes. These values should match both the values on your ledger and | ||
| the values printed to the terminal when you run the task. | ||
|
|
||
| > [!CAUTION] | ||
| > | ||
| > Before signing, ensure the below hashes match what is on your ledger. | ||
| > | ||
| > ### Nested Safe 1 (Foundation): `0x847B5c174615B1B7fDF770882256e2D3E95b9D92` | ||
| > | ||
| > - Domain Hash: `0xa4a9c312badf3fcaa05eafe5dc9bee8bd9316c78ee8b0bebe3115bb21b732672` | ||
| > - Message Hash: `0x217eb40268563e05b26fb1e487a307d8db494190efec5afb29b17971c8b8a116` | ||
| > | ||
| > ### Nested Safe 2 (Security Council): `0xc2819DC788505Aac350142A7A707BF9D03E3Bd03` | ||
| > | ||
| > - Domain Hash: `0xdf53d510b56e539b90b369ef08fce3631020fbf921e3136ea5f8747c20bce967` | ||
| > - Message Hash: `0x3cc2f5da158352f9690a7cc6c54dcd1938352f443ffb72d77af95072b3e707ce` | ||
|
|
||
| ## Task Calldata | ||
|
|
||
| ``` | ||
| 0x82ad56cb00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000001200000000000000000000000009e86a129e86a570fb13e89bd5e9aa98b642ae4c5000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000044b0b807eb00000000000000000000000095703e0982140d16f8eba6d158fccede42f04a4c000000000000000000000000543ba4aadbab8f9025686bd03993043599c6fb04000000000000000000000000000000000000000000000000000000000000000000000000000000009e86a129e86a570fb13e89bd5e9aa98b642ae4c5000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000104ff2dd5a10000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000200000000000000000000000034a564bbd863c4bf73eca711cf38a77c4ccbdd6a000000000000000000000000eefd1782d70824cbcacf9438afab7f353f1797f0038dca684026d946d1d0ddb05d50685d1a0dab350b89d10b6705e83c41ec8755000000000000000000000000d3d4c6b703978a5d24fecf3a70a51127667ff1a40000000000000000000000004c4710a4ec3f514a492cc6460818c4a6a6269dd6038dca684026d946d1d0ddb05d50685d1a0dab350b89d10b6705e83c41ec875500000000000000000000000000000000000000000000000000000000 | ||
| ``` |
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,48 @@ | ||
| l2chains = [ | ||
| {name = "arena-z", chainId = 7897}, | ||
| {name = "Swellchain", chainId = 1923} | ||
| ] | ||
|
|
||
| templateName = "OPCMUpgradeV500" | ||
|
|
||
| allowOverwrite = ["SuperchainConfig"] | ||
|
|
||
|
|
||
|
|
||
| # Arena-Z (Permissioned) | ||
|
|
||
| [[opcmUpgrades]] | ||
| chainId = 7897 | ||
| absolutePrestate = "0x038dca684026d946d1d0ddb05d50685d1a0dab350b89d10b6705e83c41ec8755" # prestates."1.7.0-rc.5" https://github.com/ethereum-optimism/devnets/issues/123#issuecomment-3444735369 | ||
| expectedValidationErrors = "PDDG-VM-30,PLDG-10" | ||
|
|
||
| # Swell (Permissioned) | ||
|
|
||
| [[opcmUpgrades]] | ||
| chainId = 1923 | ||
| absolutePrestate = "0x038dca684026d946d1d0ddb05d50685d1a0dab350b89d10b6705e83c41ec8755" # prestates."1.7.0-rc.5" https://github.com/ethereum-optimism/devnets/issues/123#issuecomment-3444735369 | ||
| expectedValidationErrors = "PDDG-VM-30,PLDG-10" | ||
|
|
||
|
|
||
| [addresses] | ||
|
|
||
| OPCM = "0x9e86a129e86a570fb13e89bd5e9aa98b642ae4c5" # Source: https://www.notion.so/oplabs/op-contracts-release-for-U17-Jovian-294f153ee16280b99539c5b6de67c72f?source=copy_link#295f153ee16280fe9c9af13970a5fac6 | ||
| StandardValidatorV500 = "0xE0b673cB5Da8DaC181d4D712eA563c4B14230286" # Source: cast call validator's from OPCM above | ||
| SuperchainConfig = "0x95703e0982140D16f8ebA6d158FccEde42f04a4C" # Source: https://github.com/ethereum-optimism/superchain-registry/blob/6748f8050bfab9930abdfc46288f9629af2f7b38/superchain/configs/mainnet/superchain.toml#L3C27-L3C69 | ||
| SuperchainConfigProxyAdmin = "0x543bA4AADBAb8f9025686Bd03993043599c6fB04" # Source: cast call ProxyAdmin address from SuperchainConfig above | ||
|
|
||
|
|
||
| [stateOverrides] | ||
|
|
||
| # ProxyAdminOwner | ||
| 0x5a0Aae59D09fccBdDb6C6CcEB07B7279367C3d2A = [ | ||
| {key = "0x0000000000000000000000000000000000000000000000000000000000000005", value = 30} | ||
| ] | ||
| # Foundation Upgrades Safe | ||
| 0x847B5c174615B1B7fDF770882256e2D3E95b9D92 = [ | ||
| {key = "0x0000000000000000000000000000000000000000000000000000000000000005", value = 45} | ||
| ] | ||
| # Security Council | ||
| 0xc2819DC788505Aac350142A7A707BF9D03E3Bd03 = [ | ||
| {key = "0x0000000000000000000000000000000000000000000000000000000000000005", value = 48} | ||
| ] |
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,2 @@ | ||
| TENDERLY_GAS=30000000 | ||
| FORK_BLOCK_NUMBER=23669561 |
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,27 @@ | ||
| # 035-U17-main-unichain | ||
|
|
||
| Status: [DRAFT, NOT READY TO SIGN] | ||
|
|
||
| ## Objective | ||
|
|
||
| This task upgrades Unichain Mainnet to U17. | ||
|
|
||
| ## Simulation & Signing | ||
|
|
||
| Simulation commands for each safe: | ||
|
|
||
| ```bash | ||
| cd src/tasks/eth/035-U17-main-unichain | ||
|
|
||
| # Foundation - Simulate and Sign | ||
| SIMULATE_WITHOUT_LEDGER=1 just --dotenv-path $(pwd)/.env simulate foundation | ||
| just --dotenv-path $(pwd)/.env sign foundation | ||
|
|
||
| # Security Council - Simulate and Sign | ||
| SIMULATE_WITHOUT_LEDGER=1 just --dotenv-path $(pwd)/.env simulate council | ||
| just --dotenv-path $(pwd)/.env sign council | ||
|
|
||
| # Chain Governor - Simulate and Sign | ||
| SIMULATE_WITHOUT_LEDGER=1 just --dotenv-path $(pwd)/.env simulate chain-governor | ||
| just --dotenv-path $(pwd)/.env sign chain-governor | ||
| ``` |
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,34 @@ | ||
| # Validation | ||
|
|
||
| This document can be used to validate the inputs and result of the execution of the upgrade transaction which you are | ||
| signing. | ||
|
|
||
| ## Expected Domain and Message Hashes | ||
|
|
||
| Validate the domain and message hashes. These values should match both the values on your ledger and | ||
| the values printed to the terminal when you run the task. | ||
|
|
||
| > [!CAUTION] | ||
| > | ||
| > Before signing, ensure the below hashes match what is on your ledger. | ||
| > | ||
| > ### Nested Safe 1 (Foundation): `0x847B5c174615B1B7fDF770882256e2D3E95b9D92` | ||
| > | ||
| > - Domain Hash: `0xa4a9c312badf3fcaa05eafe5dc9bee8bd9316c78ee8b0bebe3115bb21b732672` | ||
| > - Message Hash: `0x01bdc123c9d8c24f36748875ebbfa43edc5be26a165455e9ea8cb0668c4f9feb` | ||
| > | ||
| > ### Nested Safe 2 (Security Council): `0xc2819DC788505Aac350142A7A707BF9D03E3Bd03` | ||
| > | ||
| > - Domain Hash: `0xdf53d510b56e539b90b369ef08fce3631020fbf921e3136ea5f8747c20bce967` | ||
| > - Message Hash: `0xfd0423f3d23dc510f3d311615022a7b123c810791f93a45dd9fa7186c0ae613a` | ||
| > | ||
| > ### Nested Safe 3 (Chain Governor): `0xb0c4C487C5cf6d67807Bc2008c66fa7e2cE744EC` | ||
| > | ||
| > - Domain Hash: `0x4f0b6efb6c01fa7e127a0ff87beefbeb53e056d30d3216c5ac70371b909ca66d` | ||
| > - Message Hash: `0x48839aade65a5b8806437377e8cd9b91717a87173dc2fc391fe18802665ec694` | ||
|
|
||
| ## Task Calldata | ||
|
|
||
| ``` | ||
| 0x82ad56cb0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000200000000000000000000000009e86a129e86a570fb13e89bd5e9aa98b642ae4c50000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000a4ff2dd5a100000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000001000000000000000000000000c407398d063f942febbcc6f80a156b47f3f1bda60000000000000000000000003b73fa8d82f511a3cae17b5a26e4e1a2d5e2f2a4038dca684026d946d1d0ddb05d50685d1a0dab350b89d10b6705e83c41ec875500000000000000000000000000000000000000000000000000000000 | ||
| ``` |
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,48 @@ | ||
| l2chains = [ | ||
| {name = "Unichain", chainId = 130} | ||
| ] | ||
|
|
||
| templateName = "OPCMUpgradeV500" | ||
|
|
||
| allowOverwrite = ["SuperchainConfig"] | ||
|
|
||
|
|
||
|
|
||
| # Unichain (Permissionless) | ||
|
|
||
| [[opcmUpgrades]] | ||
| chainId = 130 | ||
| absolutePrestate = "0x038dca684026d946d1d0ddb05d50685d1a0dab350b89d10b6705e83c41ec8755" # prestates."1.7.0-rc.5" https://github.com/ethereum-optimism/devnets/issues/123#issuecomment-3444735369 | ||
| expectedValidationErrors = "PROXYA-10,DF-30,PDDG-DWETH-30,PDDG-VM-30,PLDG-DWETH-30,PLDG-VM-30" | ||
|
|
||
|
|
||
|
|
||
| [addresses] | ||
|
|
||
| OPCM = "0x9e86a129e86a570fb13e89bd5e9aa98b642ae4c5" # Source: https://www.notion.so/oplabs/op-contracts-release-for-U17-Jovian-294f153ee16280b99539c5b6de67c72f?source=copy_link#295f153ee16280fe9c9af13970a5fac6 | ||
| StandardValidatorV500 = "0xE0b673cB5Da8DaC181d4D712eA563c4B14230286" # Source: cast call validator's from OPCM above | ||
| SuperchainConfig = "0x95703e0982140D16f8ebA6d158FccEde42f04a4C" # Source: https://github.com/ethereum-optimism/superchain-registry/blob/6748f8050bfab9930abdfc46288f9629af2f7b38/superchain/configs/mainnet/superchain.toml#L3C27-L3C69 | ||
| SuperchainConfigProxyAdmin = "0x543bA4AADBAb8f9025686Bd03993043599c6fB04" # Source: cast call ProxyAdmin address from SuperchainConfig above | ||
|
mds1 marked this conversation as resolved.
Outdated
|
||
|
|
||
|
|
||
| [stateOverrides] | ||
|
|
||
| # Unichain 3/3 (L1PAO) | ||
| 0x6d5B183F538ABB8572F5cD17109c617b994D5833 = [ | ||
| {key = "0x0000000000000000000000000000000000000000000000000000000000000005", value = 7} | ||
|
mds1 marked this conversation as resolved.
|
||
| ] | ||
|
|
||
| # Unichain Operations Safe | ||
| 0xb0c4C487C5cf6d67807Bc2008c66fa7e2cE744EC = [ | ||
| {key = "0x0000000000000000000000000000000000000000000000000000000000000005", value = 14} | ||
| ] | ||
|
|
||
| # Foundation Upgrade Safe | ||
| 0x847B5c174615B1B7fDF770882256e2D3E95b9D92 = [ | ||
| {key = "0x0000000000000000000000000000000000000000000000000000000000000005", value = 46} | ||
| ] | ||
|
|
||
| # Security Council | ||
| 0xc2819DC788505Aac350142A7A707BF9D03E3Bd03 = [ | ||
| {key = "0x0000000000000000000000000000000000000000000000000000000000000005", value = 49} | ||
|
Wazabie marked this conversation as resolved.
|
||
| ] | ||
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.
Uh oh!
There was an error while loading. Please reload this page.