diff --git a/src/tasks/sep/060-U18-rev-share-betanet/.env b/src/tasks/sep/060-U18-rev-share-betanet/.env new file mode 100644 index 0000000000..02789f94b3 --- /dev/null +++ b/src/tasks/sep/060-U18-rev-share-betanet/.env @@ -0,0 +1 @@ +TENDERLY_GAS=15000000 \ No newline at end of file diff --git a/src/tasks/sep/060-U18-rev-share-betanet/README.md b/src/tasks/sep/060-U18-rev-share-betanet/README.md new file mode 100644 index 0000000000..9a5ab59028 --- /dev/null +++ b/src/tasks/sep/060-U18-rev-share-betanet/README.md @@ -0,0 +1,22 @@ +# 060-U18-rev-share-betanet + +Status: READY TO SIGN + +## Objective + +Updates RevShare Betanet (revshare-beta-0) to U18. + +## Simulation & Signing + +```bash +cd src/tasks/sep/060-U18-rev-share-betanet + +# Testing +just simulate-stack sep 060-U18-rev-share-betanet + +# Commands to execute +just --dotenv-path $(pwd)/.env simulate +USE_KEYSTORE=1 just --dotenv-path $(pwd)/.env sign +# or USE_KEYSTORE=1 just sign-stack sep 060-U18-rev-share-betanet +SIGNATURES=0x just execute +``` diff --git a/src/tasks/sep/060-U18-rev-share-betanet/VALIDATION.md b/src/tasks/sep/060-U18-rev-share-betanet/VALIDATION.md new file mode 100644 index 0000000000..a8afca991e --- /dev/null +++ b/src/tasks/sep/060-U18-rev-share-betanet/VALIDATION.md @@ -0,0 +1,19 @@ +## Expected Domain and Message Hashes + +First, we need to 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. +> +> ### Betanet 1/1 Safe (`0xe934Dc97E347C6aCef74364B50125bb8689c40ff`) +> +> - Domain Hash: `` +> - Message Hash: `` + +## Task Calldata + +``` + +``` diff --git a/src/tasks/sep/060-U18-rev-share-betanet/addresses.json b/src/tasks/sep/060-U18-rev-share-betanet/addresses.json new file mode 100644 index 0000000000..aec411272f --- /dev/null +++ b/src/tasks/sep/060-U18-rev-share-betanet/addresses.json @@ -0,0 +1,19 @@ +{ + "420110021": { + "ProxyAdmin": "0xaad0f9bbf7474d7eed4e5c18019ff560e9b2e031", + "ProxyAdminOwner": "0xe934Dc97E347C6aCef74364B50125bb8689c40ff", + "SystemConfigProxy": "0x7C8d1043FC9081CaD426DBD470E2863FbE978eef", + "L1CrossDomainMessengerProxy": "0xBE1A9F1fCE3B0d310F7444f9C973F3241CF5EAc3", + "L1StandardBridgeProxy": "0x26F9690897A56e2C459C0E0A48f525cD6dFaaD70", + "OptimismPortalProxy": "0x527aE436461691526302c5F391dA494F6d14C9dc", + "DisputeGameFactoryProxy": "0x0C668124823EE7a6ab9988C76a61fF01f480b908", + "DelayedWETHProxy": "0x29353c19876C3c3549b0811A562928Da2381cdDB", + "PermissionedDelayedWETHProxy": "0x29353c19876C3c3549b0811A562928Da2381cdDB", + "AnchorStateRegistryProxy": "0x1057Cd919CeAF39632A697A0938C2Db85aa08B10", + "AddressManager": "0x8eAbc58D43de19a57647861a0522C5E51982110a", + "L1ERC721BridgeProxy": "0xBbf34FC49ac3256f2D34AED57B2C33637a3e3Ba1", + "Proposer": "0x39Ff903Ca8a3d759dE9A7502D9C3B5Ef8A8e6670", + "Challenger": "0xd9f48B7D3e1Ff4A1d4877834aaCAC9d1d6230d8E", + "OptimismMintableERC20FactoryProxy": "0xc7cD679BD64e9396767Fc2903A429F6689fa4447" + } +} diff --git a/src/tasks/sep/060-U18-rev-share-betanet/config.toml b/src/tasks/sep/060-U18-rev-share-betanet/config.toml new file mode 100644 index 0000000000..93b332b998 --- /dev/null +++ b/src/tasks/sep/060-U18-rev-share-betanet/config.toml @@ -0,0 +1,29 @@ +# RevShare Betanet on U18 +l2chains = [ + {name = "u18-beta-0", chainId = 420110021} +] + +# Addresses for this task can be found here: https://github.com/ethereum-optimism/devnets/tree/main/betanets/u18-beta + +fallbackAddressesJsonPath = "src/tasks/sep/060-U18-rev-share-betanet/addresses.json" + +templateName = "OPCMUpgradeV600" + +[[opcmUpgrades]] +chainId = 420110021 +# U18 prestates for betanet: https://www.notion.so/oplabs/Betanet-2a9f153ee16280859261e3000d866ee9?source=copy_link#2c5f153ee162805abcc3e949ab6c837e +cannonPrestate = "0x0364251d4ea4b677ac462a25642b6de1fa53b2d6b97e56380691906bdb2e95cf" +cannonKonaPrestate = "0x03091ea717990785736623f894e6fb344fcf262361657bb28c9ece29207d9a9c" +expectedValidationErrors = "OVERRIDES-L1PAOMULTISIG,OVERRIDES-CHALLENGER,SYSCON-130,PLDG-10,CKDG-10" +# OVERRIDES-L1PAOMULTISIG,OVERRIDES-CHALLENGER: these are expected as they are not the standard OP Sepolia ones +# SYSCON-130: this is expected as the SystemConfig proxyAdmin on betanets is not the standard OP Sepolia one +# PLDG-10: this is expected because u18-beta-0 is a Permissioned chain +# CKDG-10: Custom dispute game implementation not found, expected as it's a Permissioned chain with no Permissionless implementation + +[addresses] +OPCM = "0xf0a2e224519e876979ea6b2cd15ef5cc3d6703bd" # v600 OPCM source: https://github.com/ethereum-optimism/superchain-registry/blob/c84ed822ae5a65500d8c0e323460fa688cfcca22/validation/standard/standard-versions-sepolia.toml#L23C56-L23C98 + +[stateOverrides] +0xe934Dc97E347C6aCef74364B50125bb8689c40ff = [ + {key = "0x0000000000000000000000000000000000000000000000000000000000000005", value = 64} +] diff --git a/src/tasks/sep/060-betanet-rev-share/VALIDATION.md b/src/tasks/sep/060-betanet-rev-share/VALIDATION.md deleted file mode 100644 index 8e3df17183..0000000000 --- a/src/tasks/sep/060-betanet-rev-share/VALIDATION.md +++ /dev/null @@ -1,28 +0,0 @@ -# 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): `0xDEe57160aAfCF04c34C887B5962D0a69676d3C8B` -> -> - Domain Hash: `0x37e1f5dd3b92a004a23589b741196c8a214629d4ea3a690ec8e41ae45c689cbb` -> - Message Hash: `0x377bd6172b8c79fc5e2536a74ab5d5fa555b3524c04c6f21aa35d16274dcf294` -> -> ### Nested Safe 2 (Security Council): `0xf64bc17485f0B4Ea5F06A96514182FC4cB561977` -> -> - Domain Hash: `0xbe081970e9fc104bd1ea27e375cd21ec7bb1eec56bfe43347c3e36c5d27b8533` -> - Message Hash: `0x489e12f3fe9efdc68cb892257af2c199b9d14c8c32f55a402ee95e85614661d4` -## Task Calldata - -``` -0x82ad56cb00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000002000000000000000000000000071241bbae674967dd523e621c272ea32cf33119a0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000e41a80dc3800000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000001000000000000000000000000a1f4f424901e0773e68c714077bcdd5cf8bcec230000000000000000000000000000000000000000000000001bc16d674ec80000000000000000000000000000ed9b99a703bad32ac96fddc313c0652e379251fd00000000000000000000000000000000000000000000000000000000000c35000000000000000000000000005f077b4c3509c2c192e50b6654d924fcb8126a6000000000000000000000000000000000000000000000000000000000 -``` \ No newline at end of file diff --git a/src/tasks/sep/060-betanet-rev-share/.env b/src/tasks/sep/061-betanet-rev-share/.env similarity index 100% rename from src/tasks/sep/060-betanet-rev-share/.env rename to src/tasks/sep/061-betanet-rev-share/.env diff --git a/src/tasks/sep/060-betanet-rev-share/README.md b/src/tasks/sep/061-betanet-rev-share/README.md similarity index 69% rename from src/tasks/sep/060-betanet-rev-share/README.md rename to src/tasks/sep/061-betanet-rev-share/README.md index 66734309ff..98cefe148d 100644 --- a/src/tasks/sep/060-betanet-rev-share/README.md +++ b/src/tasks/sep/061-betanet-rev-share/README.md @@ -1,4 +1,4 @@ -# 060 betanet-rev-share: RevShare Upgrade and Setup for Betanet +# 061 betanet-rev-share: RevShare Upgrade and Setup for Betanet Status: [READY TO SIGN] @@ -24,16 +24,9 @@ Simulation commands for each safe: ```bash # For stacked simulation (recommended for validation): -just simulate-stack sep 060-betanet-rev-share +just simulate-stack sep 061-betanet-rev-share # For individual simulation: -cd src/tasks/sep/060-betanet-rev-share -SIMULATE_WITHOUT_LEDGER=1 just --dotenv-path "$(pwd)"/.env --justfile ../../../justfile simulate +cd src/tasks/sep/061-betanet-rev-share +SIMULATE_WITHOUT_LEDGER=1 just --dotenv-path "$(pwd)"/.env --justfile ../../../justfile simulate ``` - -Signing commands for each safe: - -```bash -cd src/tasks/sep/060-betanet-rev-share -just --dotenv-path "$(pwd)"/.env --justfile ../../../justfile sign -``` \ No newline at end of file diff --git a/src/tasks/sep/061-betanet-rev-share/VALIDATION.md b/src/tasks/sep/061-betanet-rev-share/VALIDATION.md new file mode 100644 index 0000000000..a8afca991e --- /dev/null +++ b/src/tasks/sep/061-betanet-rev-share/VALIDATION.md @@ -0,0 +1,19 @@ +## Expected Domain and Message Hashes + +First, we need to 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. +> +> ### Betanet 1/1 Safe (`0xe934Dc97E347C6aCef74364B50125bb8689c40ff`) +> +> - Domain Hash: `` +> - Message Hash: `` + +## Task Calldata + +``` + +``` diff --git a/src/tasks/sep/060-betanet-rev-share/addresses.json b/src/tasks/sep/061-betanet-rev-share/addresses.json similarity index 100% rename from src/tasks/sep/060-betanet-rev-share/addresses.json rename to src/tasks/sep/061-betanet-rev-share/addresses.json diff --git a/src/tasks/sep/060-betanet-rev-share/config.toml b/src/tasks/sep/061-betanet-rev-share/config.toml similarity index 52% rename from src/tasks/sep/060-betanet-rev-share/config.toml rename to src/tasks/sep/061-betanet-rev-share/config.toml index 60742360b3..168d593c1b 100644 --- a/src/tasks/sep/060-betanet-rev-share/config.toml +++ b/src/tasks/sep/061-betanet-rev-share/config.toml @@ -3,7 +3,7 @@ templateName = "RevShareUpgradeAndSetup" # L2 chains to target -l2chains = [{name = "revshare-beta-0", chainId = 420120033}] +l2chains = [{name = "revshare-beta-0", chainId = 420120033}] # TODO: Update after new betanet is deployed safeAddress = "ProxyAdminOwner" @@ -22,18 +22,12 @@ l1WithdrawerMinWithdrawalAmounts = [2000000000000000000] l1WithdrawerRecipients = ["0xed9B99a703BaD32AC96FDdc313c0652e379251Fd"] l1WithdrawerGasLimits = [800000] -fallbackAddressesJsonPath = "src/tasks/sep/060-betanet-rev-share/addresses.json" +fallbackAddressesJsonPath = "src/tasks/sep/061-betanet-rev-share/addresses.json" [addresses] -ProxyAdminOwner = "0x1eb2ffc903729a0f03966b917003800b145f56e2" +ProxyAdminOwner = "0xe934Dc97E347C6aCef74364B50125bb8689c40ff" [stateOverrides] -0x1Eb2fFc903729a0F03966B917003800b145F56E2 = [ # L1PAO -{key = "0x0000000000000000000000000000000000000000000000000000000000000005", value = 47} -] -0xf64bc17485f0B4Ea5F06A96514182FC4cB561977 = [ # SC -{key = "0x0000000000000000000000000000000000000000000000000000000000000005", value = 61} -] -0xDEe57160aAfCF04c34C887B5962D0a69676d3C8B = [ # FUS -{key = "0x0000000000000000000000000000000000000000000000000000000000000005", value = 66} +0xe934Dc97E347C6aCef74364B50125bb8689c40ff = [ + {key = "0x0000000000000000000000000000000000000000000000000000000000000005", value = 65} ] \ No newline at end of file