diff --git a/superchain/configs/chainids.json b/superchain/configs/chainids.json index 656b326d3..24c7b9f64 100644 --- a/superchain/configs/chainids.json +++ b/superchain/configs/chainids.json @@ -1,10 +1,4 @@ { - "goerli/base": 84531, - "goerli/op": 420, - "goerli-dev-0/base-devnet-0": 11763071, - "goerli-dev-0/conduit-devnet-0": 129831238013, - "goerli-dev-0/op-labs-chaosnet-0": 888, - "goerli-dev-0/op-labs-devnet-0": 997, "mainnet/base": 8453, "mainnet/lyra": 957, "mainnet/mode": 34443, diff --git a/superchain/configs/goerli-dev-0/base-devnet-0.yaml b/superchain/configs/goerli-dev-0/base-devnet-0.yaml deleted file mode 100644 index 6e485d982..000000000 --- a/superchain/configs/goerli-dev-0/base-devnet-0.yaml +++ /dev/null @@ -1,17 +0,0 @@ -name: Base devnet 0 -chain_id: 11763071 -public_rpc: "" -sequencer_rpc: "" -explorer: "" - -batch_inbox_addr: "0x1176307100000000000000000000000000000000" - -genesis: - l1: - hash: "0x02578eb559ac846feaeb0a8fdf1f19de9965fc59e1a38ebba9ff93ed4e21c99a" - number: 9015915 - l2: - hash: "0x5216ec29e8cc4fc890c31cc70c72be3c61dd9a43cfffb63385be17a56eae4c68" - number: 0 - l2_time: 1684327104 # Wed 17 May 2023 12:38:24 UTC - diff --git a/superchain/configs/goerli-dev-0/conduit-devnet-0.yaml b/superchain/configs/goerli-dev-0/conduit-devnet-0.yaml deleted file mode 100644 index 1ac9be6e8..000000000 --- a/superchain/configs/goerli-dev-0/conduit-devnet-0.yaml +++ /dev/null @@ -1,16 +0,0 @@ -name: Conduit devnet 0 -chain_id: 129831238013 -public_rpc: "https://l2-conduit-superchain-dev-0.t.conduit.xyz/" -sequencer_rpc: "https://l2-conduit-superchain-dev-0.t.conduit.xyz/" -explorer: "https://explorerl2new-conduit-superchain-dev-0.t.conduit.xyz/" - -batch_inbox_addr: "0xF986574B7d9877e9454236Eee38c1e233588Da36" - -genesis: - l1: - hash: "0x758cd138ee63586b25eb03da37c5891f64f66fc50518a7fe3170a51de60245e7" - number: 9896149 - l2: - hash: "0xf8eabf71fbb403e778c0efa7f07ceea5dc70a5c53c35693b4adf87500dd845e0" - number: 0 - l2_time: 1697750040 # Thu 19 Oct 2023 21:14:00 UTC diff --git a/superchain/configs/goerli-dev-0/op-labs-chaosnet-0.yaml b/superchain/configs/goerli-dev-0/op-labs-chaosnet-0.yaml deleted file mode 100644 index 9e3cf787c..000000000 --- a/superchain/configs/goerli-dev-0/op-labs-chaosnet-0.yaml +++ /dev/null @@ -1,16 +0,0 @@ -name: OP Labs chaosnet 0 -chain_id: 888 -public_rpc: "" -sequencer_rpc: "" -explorer: "" - -batch_inbox_addr: "0xff00000000000000000000000000000000000888" - -genesis: - l1: - hash: "0xe3689afa9af88cee6c7a4b00703ba1e5a0ea3de9a76286ada90ee7368dc95e52" - number: 8578807 - l2: - hash: "0x92e26b8a6b0e0939d8e50844deec6890c8b7925f39c921e91944dcb9a87217f8" - number: 0 - l2_time: 1677688044 # Wed 1 Mar 2023 16:27:24 UTC diff --git a/superchain/configs/goerli-dev-0/op-labs-devnet-0.yaml b/superchain/configs/goerli-dev-0/op-labs-devnet-0.yaml deleted file mode 100644 index 0a14454ff..000000000 --- a/superchain/configs/goerli-dev-0/op-labs-devnet-0.yaml +++ /dev/null @@ -1,16 +0,0 @@ -name: OP Labs devnet 0 -chain_id: 997 -public_rpc: "" -sequencer_rpc: "" -explorer: "" - -batch_inbox_addr: "0xff00000000000000000000000000000000000997" - -genesis: - l1: - hash: "0xe0473633677bd7a134925b00f86e688655c28352b81d76a966b7a813e0bc4fce" - number: 8598297 - l2: - hash: "0x742e03d9c8fe4dfd96f8e2d53d3815ec5537cbe3d88ad28cbb75c17ff2672867" - number: 0 - l2_time: 1677973680 # Sat 4 Mar 2023 23:48:00 UTC \ No newline at end of file diff --git a/superchain/configs/goerli-dev-0/semver.yaml b/superchain/configs/goerli-dev-0/semver.yaml deleted file mode 100644 index f73b1a36e..000000000 --- a/superchain/configs/goerli-dev-0/semver.yaml +++ /dev/null @@ -1,10 +0,0 @@ -l1_cross_domain_messenger: 1.1.0 -l1_erc721_bridge: 1.1.0 -l1_standard_bridge: 1.1.0 -l2_output_oracle: 1.2.0 -optimism_mintable_erc20_factory: 1.1.0 -optimism_portal: 1.2.0 -system_config: 1.0.1 - -# superchain-wide contracts -protocol_versions: 0.1.0 diff --git a/superchain/configs/goerli-dev-0/superchain.yaml b/superchain/configs/goerli-dev-0/superchain.yaml deleted file mode 100644 index 76238e44b..000000000 --- a/superchain/configs/goerli-dev-0/superchain.yaml +++ /dev/null @@ -1,11 +0,0 @@ -name: Goerli Dev 0 -l1: - chain_id: 5 - public_rpc: https://goerli.gateway.tenderly.co - explorer: https://goerli.etherscan.io - -protocol_versions_addr: "0x79ADD5713B383DAa0a138d3C4780C7A1804a8090" - -canyon_time: 1698436800 # Fri 27 Oct 2023 20:00:00 UTC -delta_time: 1701993600 # Fri 8 Dec 2023 00:00:00 UTC -ecotone_time: 1706126400 # Wed 24 Jan 2024 20:00:00 UTC diff --git a/superchain/configs/goerli/base.yaml b/superchain/configs/goerli/base.yaml deleted file mode 100644 index c59b42393..000000000 --- a/superchain/configs/goerli/base.yaml +++ /dev/null @@ -1,17 +0,0 @@ -name: Base Goerli -chain_id: 84531 -public_rpc: https://goerli.base.org -sequencer_rpc: https://goerli-sequencer.base.org -explorer: https://goerli-explorer.base.org - -system_config_addr: "0xb15eea247ece011c68a614e4a77ad648ff495bc1" -batch_inbox_addr: "0x8453100000000000000000000000000000000000" - -genesis: - l1: - hash: "0x73d89754a1e0387b89520d989d3be9c37c1f32495a88faf1ea05c61121ab0d19" - number: 8410981 - l2: - hash: "0xa3ab140f15ea7f7443a4702da64c10314eb04d488e72974e02e2d728096b4f76" - number: 0 - l2_time: 1675193616 # Tue 31 Jan 2023 19:33:36 UTC diff --git a/superchain/configs/goerli/op.yaml b/superchain/configs/goerli/op.yaml deleted file mode 100644 index 58ad7bf30..000000000 --- a/superchain/configs/goerli/op.yaml +++ /dev/null @@ -1,17 +0,0 @@ -name: OP-Goerli -chain_id: 420 -public_rpc: https://goerli.optimism.io -sequencer_rpc: https://goerli-sequencer.optimism.io -explorer: https://goerli-explorer.optimism.io - -system_config_addr: "0xAe851f927Ee40dE99aaBb7461C00f9622ab91d60" -batch_inbox_addr: "0xff00000000000000000000000000000000000420" - -genesis: - l1: - hash: "0x6ffc1bf3754c01f6bb9fe057c1578b87a8571ce2e9be5ca14bace6eccfd336c7" - number: 8300214 - l2: - hash: "0x0f783549ea4313b784eadd9b8e8a69913b368b7366363ea814d7707ac505175f" - number: 4061224 - l2_time: 1673550516 # Thu 12 Jan 2023 19:08:36 UTC diff --git a/superchain/configs/goerli/semver.yaml b/superchain/configs/goerli/semver.yaml deleted file mode 100644 index 9d1ba1305..000000000 --- a/superchain/configs/goerli/semver.yaml +++ /dev/null @@ -1,11 +0,0 @@ -l1_cross_domain_messenger: 1.7.0 -l1_erc721_bridge: 1.4.0 -l1_standard_bridge: 1.4.0 -l2_output_oracle: 1.6.0 -optimism_mintable_erc20_factory: 1.6.0 -optimism_portal: 1.10.0 -system_config: 1.10.0 - -# superchain-wide contracts -protocol_versions: 0.1.0 -superchain_config: diff --git a/superchain/configs/goerli/superchain.yaml b/superchain/configs/goerli/superchain.yaml deleted file mode 100644 index ab5d310dd..000000000 --- a/superchain/configs/goerli/superchain.yaml +++ /dev/null @@ -1,11 +0,0 @@ -name: Goerli -l1: - chain_id: 5 - public_rpc: https://goerli.gateway.tenderly.co - explorer: https://goerli.etherscan.io - -protocol_versions_addr: "0x0C24F5098774aA366827D667494e9F889f7cFc08" - -canyon_time: 1699981200 # Tue 14 Nov 2023 17:00:00 UTC -delta_time: 1703116800 # Thu 21 Dec 2023 00:00:00 UTC -ecotone_time: 1707238800 # Tue 6 Feb 2024 17:00:00 UTC diff --git a/superchain/extra/addresses/addresses.json b/superchain/extra/addresses/addresses.json index dde968261..0dfae2800 100644 --- a/superchain/extra/addresses/addresses.json +++ b/superchain/extra/addresses/addresses.json @@ -29,21 +29,6 @@ "Guardian": "0xcE10372313Ca39Fbf75A09e7f4c0E57F070259f4", "Challenger": "0xcE10372313Ca39Fbf75A09e7f4c0E57F070259f4" }, - "420": { - "AddressManager": "0xa6f73589243a6A7a9023b1Fa0651b1d89c177111", - "L1CrossDomainMessengerProxy": "0x5086d1eEF304eb5284A0f6720f79403b4e9bE294", - "L1ERC721BridgeProxy": "0x8DD330DdE8D9898d43b4dc840Da27A07dF91b3c9", - "L1StandardBridgeProxy": "0x636Af16bf2f682dD3109e60102b8E1A089FedAa8", - "L2OutputOracleProxy": "0xE6Dfba0953616Bacab0c9A8ecb3a9BBa77FC15c0", - "OptimismMintableERC20FactoryProxy": "0x883dcF8B05364083D849D8bD226bC8Cb4c42F9C5", - "OptimismPortalProxy": "0x5b47E1A08Ea6d985D6649300584e6722Ec4B1383", - "ProxyAdmin": "0x01d3670863c3F4b24D7b107900f0b75d4BbC6e0d", - "SystemConfigProxy": "0xAe851f927Ee40dE99aaBb7461C00f9622ab91d60", - "ProxyAdminOwner": "0xBc1233d0C3e6B5d53Ab455cF65A6623F6dCd7e4f", - "SystemConfigOwner": "0xBc1233d0C3e6B5d53Ab455cF65A6623F6dCd7e4f", - "Guardian": "0xBc1233d0C3e6B5d53Ab455cF65A6623F6dCd7e4f", - "Challenger": "0xBc1233d0C3e6B5d53Ab455cF65A6623F6dCd7e4f" - }, "424": { "AddressManager": "0x09d5DbA52F0ee2C4A5E94FD5C802bD74Ca9cAD3e", "L1CrossDomainMessengerProxy": "0x97BAf688E5d0465E149d1d5B497Ca99392a6760e", @@ -59,17 +44,6 @@ "Guardian": "0x39E13D1AB040F6EA58CE19998edCe01B3C365f84", "Challenger": "0x39E13D1AB040F6EA58CE19998edCe01B3C365f84" }, - "888": { - "AddressManager": "0x41E2A82Ddf1311D74c898Bb825c8D0eafaea2432", - "L1CrossDomainMessengerProxy": "0xfc428D28D197fFf99A5EbAc6be8B761FEd8718Da", - "L1ERC721BridgeProxy": "0x058BBf091232afE99BC2481F809254cD15e64Df5", - "L1StandardBridgeProxy": "0x60859421Ed85C0B11071230cf61dcEeEf54630Ff", - "L2OutputOracleProxy": "0x7D00A03f180d8C07B88d8c1384a15326c38FF9Ff", - "OptimismMintableERC20FactoryProxy": "0x526920419b61153c1F80fD306B5Ab52b69110A6C", - "OptimismPortalProxy": "0x1566c8Eea4A255C07Ef58edF91431c8A73ae0B62", - "ProxyAdmin": "0x64d1E91BD7B80354e77C05c7FBff3Ad00E05946a", - "SystemConfigProxy": "0xf2fa3621caa534a2ae9eb36667da57890e5c9e6a" - }, "957": { "AddressManager": "0xC845F9C4004EB35a8bde8ad89C4760a9c0e65CAB", "L1CrossDomainMessengerProxy": "0x5456f02c08e9A018E42C39b351328E5AA864174A", @@ -85,17 +59,6 @@ "Guardian": "0x91F4be0C264FAFA1fEd75c4440910Cba2cAd98e8", "Challenger": "0x91F4be0C264FAFA1fEd75c4440910Cba2cAd98e8" }, - "997": { - "AddressManager": "0xf3a31b72d030e1916afeb3abba90e7e104818b9b", - "L1CrossDomainMessengerProxy": "0x12371d047382bb3a4b1891e8474ddaee983d08ec", - "L1ERC721BridgeProxy": "0xab598ffd07bdf497fce58e36138573ccba6b7a8b", - "L1StandardBridgeProxy": "0x0178b1f72eb1e61e1847f8fd36c791822623fb42", - "L2OutputOracleProxy": "0xddb2e0c86ae08f1249d528f1a810cebd1b4c4d72", - "OptimismMintableERC20FactoryProxy": "0x00b75ed2e46c4c29bc363a75a6d97791018b3903", - "OptimismPortalProxy": "0xc6170e048b7daef6d0b6cbbad9aca0e5370ddbbc", - "ProxyAdmin": "0xD98bD7a1F2384D890d0D6153Cb6F813ab6cCFcCF", - "SystemConfigProxy": "0x78c9876a3621b97cc9b3c13ad0f35091db49e8e3" - }, "8453": { "AddressManager": "0x8EfB6B5c4767B09Dc9AA6Af4eAA89F749522BaE2", "L1CrossDomainMessengerProxy": "0x866E82a600A1414e583f7F13623F1aC5d58b0Afa", @@ -141,21 +104,6 @@ "Guardian": "0x45eFFbD799Ab49122eeEAB75B78D9C56A187F9A7", "Challenger": "0x69F0FFc19504B57e9AE4B6D7694d028c3CD876F8" }, - "84531": { - "AddressManager": "0x4Cf6b56b14c6CFcB72A75611080514F94624c54e", - "L1CrossDomainMessengerProxy": "0x8e5693140eA606bcEB98761d9beB1BC87383706D", - "L1ERC721BridgeProxy": "0x5E0c967457347D5175bF82E8CCCC6480FCD7e568", - "L1StandardBridgeProxy": "0xfA6D8Ee5BE770F84FC001D098C4bD604Fe01284a", - "L2OutputOracleProxy": "0x2A35891ff30313CcFa6CE88dcf3858bb075A2298", - "OptimismMintableERC20FactoryProxy": "0xa88530E2DD811363cA3Ef479dBab3C0BF73d90b1", - "OptimismPortalProxy": "0xe93c8cD0D409341205A592f8c4Ac1A5fe5585cfA", - "ProxyAdmin": "0xbc0Fc544736b7d610D9b05F31B182C8154BEf336", - "SystemConfigProxy": "0xb15eea247eCE011C68a614e4a77AD648ff495bc1", - "ProxyAdminOwner": "0x444b8C3E4eA49cE15A93D96AfA83D421F6049524", - "SystemConfigOwner": "0x4C35Ca57616E0d5fD808574772f632D8dA4eadCa", - "Guardian": "0x4C35Ca57616E0d5fD808574772f632D8dA4eadCa", - "Challenger": "0xf30b40411c4d76228092E7eCdc1593c996b13D22" - }, "84532": { "AddressManager": "0x709c2B8ef4A9feFc629A8a2C1AF424Dc5BD6ad1B", "L1CrossDomainMessengerProxy": "0xC34855F4De64F1840e5686e64278da901e261f20", @@ -218,17 +166,6 @@ "FaultDisputeGame": "0x016ae406c9F21F01cA39D05117378F0c523bD8C1", "PermissionedDisputeGame": "0xF795Ad48726B1cD3E7B66a70E5AdA91D6D593132" }, - "11763071": { - "AddressManager": "0x098492Ef1F4Bf26F305F25826CA0F4e4Be6d45f4", - "L1CrossDomainMessengerProxy": "0x548531f9E60e75726F6f6ec1E5F0A181B9d2c1C0", - "L1ERC721BridgeProxy": "0x8e5B1fF0C5afB207Ac447B31e149996E053D9C22", - "L1StandardBridgeProxy": "0x21E0Cc91D566cfF3edC500F8012D6105f889d2b0", - "L2OutputOracleProxy": "0x805fbEDB43E814b2216ce6926A0A19bdeDb0C8Cd", - "OptimismMintableERC20FactoryProxy": "0x92210e86f7e71606394FD57Be284Ef46Eced62Da", - "OptimismPortalProxy": "0x61A7dc680a0f3F67aDc357453d3f51bDc70fAE1B", - "ProxyAdmin": "0x4d56E97228bBF10DcB2ED7E8F455c57AbE247404", - "SystemConfigProxy": "0x4f775d578e3ab8ce81f5ec065050938dbd5fb8c2" - }, "11763072": { "AddressManager": "0x882a60911d00867Fe4ea632C479cc48e583A8D69", "L1CrossDomainMessengerProxy": "0x2cbD403d5BA3949D24ee4dF57805eaC612C2662f", @@ -254,16 +191,5 @@ "SystemConfigOwner": "0x23BA22Dd7923F3a3f2495bB32a6f3c9b9CD1EC6C", "Guardian": "0x45eFFbD799Ab49122eeEAB75B78D9C56A187F9A7", "Challenger": "0x45eFFbD799Ab49122eeEAB75B78D9C56A187F9A7" - }, - "129831238013": { - "AddressManager": "0x099bDAB5005747B8098237b655a808d2bdb28787", - "L1CrossDomainMessengerProxy": "0x91363E5E3B9544a361FB473fBfe42665e16aa436", - "L1ERC721BridgeProxy": "0xf029DB8aC06031984A2829DFed81BE18d382EE9C", - "L1StandardBridgeProxy": "0xBf5cE0a8C1F9926d410Af9b159a11Ea430Cd5ffE", - "L2OutputOracleProxy": "0x689258a0dc1D421f6e884d0325B71e778ceda1DD", - "OptimismMintableERC20FactoryProxy": "0x8e3ECF806D0921d69D646D5E5647308050640416", - "OptimismPortalProxy": "0x0550548367B568C129b1dC7b2B5C6273Cbd2da76", - "ProxyAdmin": "0xf592f1730154cE9e3F1793b583582B31A00EFBf1", - "SystemConfigProxy": "0xc4ffc7731D1842CE86b1DE3679f6E4AB0BA4F99B" } } \ No newline at end of file diff --git a/superchain/extra/addresses/goerli-dev-0/base-devnet-0.json b/superchain/extra/addresses/goerli-dev-0/base-devnet-0.json deleted file mode 100644 index 0ad5a1c2f..000000000 --- a/superchain/extra/addresses/goerli-dev-0/base-devnet-0.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "AddressManager": "0x098492Ef1F4Bf26F305F25826CA0F4e4Be6d45f4", - "L1CrossDomainMessengerProxy": "0x548531f9E60e75726F6f6ec1E5F0A181B9d2c1C0", - "L1ERC721BridgeProxy": "0x8e5B1fF0C5afB207Ac447B31e149996E053D9C22", - "L1StandardBridgeProxy": "0x21E0Cc91D566cfF3edC500F8012D6105f889d2b0", - "L2OutputOracleProxy": "0x805fbEDB43E814b2216ce6926A0A19bdeDb0C8Cd", - "OptimismMintableERC20FactoryProxy": "0x92210e86f7e71606394FD57Be284Ef46Eced62Da", - "OptimismPortalProxy": "0x61A7dc680a0f3F67aDc357453d3f51bDc70fAE1B", - "ProxyAdmin": "0x4d56E97228bBF10DcB2ED7E8F455c57AbE247404", - "SystemConfigProxy": "0x4f775d578e3ab8ce81f5ec065050938dbd5fb8c2" -} diff --git a/superchain/extra/addresses/goerli-dev-0/conduit-devnet-0.json b/superchain/extra/addresses/goerli-dev-0/conduit-devnet-0.json deleted file mode 100644 index 82636528a..000000000 --- a/superchain/extra/addresses/goerli-dev-0/conduit-devnet-0.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "AddressManager": "0x099bDAB5005747B8098237b655a808d2bdb28787", - "L1CrossDomainMessengerProxy": "0x91363E5E3B9544a361FB473fBfe42665e16aa436", - "L1ERC721BridgeProxy": "0xf029DB8aC06031984A2829DFed81BE18d382EE9C", - "L1StandardBridgeProxy": "0xBf5cE0a8C1F9926d410Af9b159a11Ea430Cd5ffE", - "L2OutputOracleProxy": "0x689258a0dc1D421f6e884d0325B71e778ceda1DD", - "OptimismMintableERC20FactoryProxy": "0x8e3ECF806D0921d69D646D5E5647308050640416", - "OptimismPortalProxy": "0x0550548367B568C129b1dC7b2B5C6273Cbd2da76", - "ProxyAdmin": "0xf592f1730154cE9e3F1793b583582B31A00EFBf1", - "SystemConfigProxy": "0xc4ffc7731D1842CE86b1DE3679f6E4AB0BA4F99B" -} diff --git a/superchain/extra/addresses/goerli-dev-0/op-labs-chaosnet-0.json b/superchain/extra/addresses/goerli-dev-0/op-labs-chaosnet-0.json deleted file mode 100644 index 20e862231..000000000 --- a/superchain/extra/addresses/goerli-dev-0/op-labs-chaosnet-0.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "AddressManager": "0x41E2A82Ddf1311D74c898Bb825c8D0eafaea2432", - "L1CrossDomainMessengerProxy": "0xfc428D28D197fFf99A5EbAc6be8B761FEd8718Da", - "L1ERC721BridgeProxy": "0x058BBf091232afE99BC2481F809254cD15e64Df5", - "L1StandardBridgeProxy": "0x60859421Ed85C0B11071230cf61dcEeEf54630Ff", - "L2OutputOracleProxy": "0x7D00A03f180d8C07B88d8c1384a15326c38FF9Ff", - "OptimismMintableERC20FactoryProxy": "0x526920419b61153c1F80fD306B5Ab52b69110A6C", - "OptimismPortalProxy": "0x1566c8Eea4A255C07Ef58edF91431c8A73ae0B62", - "ProxyAdmin": "0x64d1E91BD7B80354e77C05c7FBff3Ad00E05946a", - "SystemConfigProxy": "0xf2fa3621caa534a2ae9eb36667da57890e5c9e6a" -} diff --git a/superchain/extra/addresses/goerli-dev-0/op-labs-devnet-0.json b/superchain/extra/addresses/goerli-dev-0/op-labs-devnet-0.json deleted file mode 100644 index c50d17023..000000000 --- a/superchain/extra/addresses/goerli-dev-0/op-labs-devnet-0.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "AddressManager": "0xf3a31b72d030e1916afeb3abba90e7e104818b9b", - "L1CrossDomainMessengerProxy": "0x12371d047382bb3a4b1891e8474ddaee983d08ec", - "L1ERC721BridgeProxy": "0xab598ffd07bdf497fce58e36138573ccba6b7a8b", - "L1StandardBridgeProxy": "0x0178b1f72eb1e61e1847f8fd36c791822623fb42", - "L2OutputOracleProxy": "0xddb2e0c86ae08f1249d528f1a810cebd1b4c4d72", - "OptimismMintableERC20FactoryProxy": "0x00b75ed2e46c4c29bc363a75a6d97791018b3903", - "OptimismPortalProxy": "0xc6170e048b7daef6d0b6cbbad9aca0e5370ddbbc", - "ProxyAdmin": "0xD98bD7a1F2384D890d0D6153Cb6F813ab6cCFcCF", - "SystemConfigProxy": "0x78c9876a3621b97cc9b3c13ad0f35091db49e8e3" -} diff --git a/superchain/extra/addresses/goerli/base.json b/superchain/extra/addresses/goerli/base.json deleted file mode 100644 index 0e6461dee..000000000 --- a/superchain/extra/addresses/goerli/base.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "AddressManager": "0x4Cf6b56b14c6CFcB72A75611080514F94624c54e", - "L1CrossDomainMessengerProxy": "0x8e5693140eA606bcEB98761d9beB1BC87383706D", - "L1ERC721BridgeProxy": "0x5E0c967457347D5175bF82E8CCCC6480FCD7e568", - "L1StandardBridgeProxy": "0xfA6D8Ee5BE770F84FC001D098C4bD604Fe01284a", - "L2OutputOracleProxy": "0x2A35891ff30313CcFa6CE88dcf3858bb075A2298", - "OptimismMintableERC20FactoryProxy": "0xa88530E2DD811363cA3Ef479dBab3C0BF73d90b1", - "OptimismPortalProxy": "0xe93c8cD0D409341205A592f8c4Ac1A5fe5585cfA", - "ProxyAdmin": "0xbc0Fc544736b7d610D9b05F31B182C8154BEf336", - "SystemConfigProxy": "0xb15eea247eCE011C68a614e4a77AD648ff495bc1", - "ProxyAdminOwner": "0x444b8C3E4eA49cE15A93D96AfA83D421F6049524", - "SystemConfigOwner": "0x4C35Ca57616E0d5fD808574772f632D8dA4eadCa", - "Guardian": "0x4C35Ca57616E0d5fD808574772f632D8dA4eadCa", - "Challenger": "0xf30b40411c4d76228092E7eCdc1593c996b13D22" -} diff --git a/superchain/extra/addresses/goerli/op.json b/superchain/extra/addresses/goerli/op.json deleted file mode 100644 index 7f3d65cbb..000000000 --- a/superchain/extra/addresses/goerli/op.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "AddressManager": "0xa6f73589243a6A7a9023b1Fa0651b1d89c177111", - "L1CrossDomainMessengerProxy": "0x5086d1eEF304eb5284A0f6720f79403b4e9bE294", - "L1ERC721BridgeProxy": "0x8DD330DdE8D9898d43b4dc840Da27A07dF91b3c9", - "L1StandardBridgeProxy": "0x636Af16bf2f682dD3109e60102b8E1A089FedAa8", - "L2OutputOracleProxy": "0xE6Dfba0953616Bacab0c9A8ecb3a9BBa77FC15c0", - "OptimismMintableERC20FactoryProxy": "0x883dcF8B05364083D849D8bD226bC8Cb4c42F9C5", - "OptimismPortalProxy": "0x5b47E1A08Ea6d985D6649300584e6722Ec4B1383", - "ProxyAdmin": "0x01d3670863c3F4b24D7b107900f0b75d4BbC6e0d", - "SystemConfigProxy": "0xAe851f927Ee40dE99aaBb7461C00f9622ab91d60", - "ProxyAdminOwner": "0xBc1233d0C3e6B5d53Ab455cF65A6623F6dCd7e4f", - "SystemConfigOwner": "0xBc1233d0C3e6B5d53Ab455cF65A6623F6dCd7e4f", - "Guardian": "0xBc1233d0C3e6B5d53Ab455cF65A6623F6dCd7e4f", - "Challenger": "0xBc1233d0C3e6B5d53Ab455cF65A6623F6dCd7e4f" -} diff --git a/superchain/extra/genesis-system-configs/goerli-dev-0/base-devnet-0.json b/superchain/extra/genesis-system-configs/goerli-dev-0/base-devnet-0.json deleted file mode 100644 index 4003622f8..000000000 --- a/superchain/extra/genesis-system-configs/goerli-dev-0/base-devnet-0.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "batcherAddr": "0x53394266fc80e5d4e6d25b3d0b7ca243859b7b09", - "overhead": "0x0000000000000000000000000000000000000000000000000000000000000834", - "scalar": "0x00000000000000000000000000000000000000000000000000000000000f4240", - "gasLimit": 25000000 -} diff --git a/superchain/extra/genesis-system-configs/goerli-dev-0/conduit-devnet-0.json b/superchain/extra/genesis-system-configs/goerli-dev-0/conduit-devnet-0.json deleted file mode 100644 index 341ef09f3..000000000 --- a/superchain/extra/genesis-system-configs/goerli-dev-0/conduit-devnet-0.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "batcherAddr": "0xfF983eeAFc176D73Eb915b788db24ba9D970bAe2", - "overhead": "0x00000000000000000000000000000000000000000000000000000000000000bc", - "scalar": "0x00000000000000000000000000000000000000000000000000000000000A6FE0", - "gasLimit": 30000000 -} diff --git a/superchain/extra/genesis-system-configs/goerli-dev-0/op-labs-chaosnet-0.json b/superchain/extra/genesis-system-configs/goerli-dev-0/op-labs-chaosnet-0.json deleted file mode 100644 index 6cc61da18..000000000 --- a/superchain/extra/genesis-system-configs/goerli-dev-0/op-labs-chaosnet-0.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "batcherAddr": "0xa5ee736c2a4d99772f1036a23740274186bc6866", - "overhead": "0x0000000000000000000000000000000000000000000000000000000000000834", - "scalar": "0x00000000000000000000000000000000000000000000000000000000000f4240", - "gasLimit": 15000000 -} diff --git a/superchain/extra/genesis-system-configs/goerli-dev-0/op-labs-devnet-0.json b/superchain/extra/genesis-system-configs/goerli-dev-0/op-labs-devnet-0.json deleted file mode 100644 index 02fb9d717..000000000 --- a/superchain/extra/genesis-system-configs/goerli-dev-0/op-labs-devnet-0.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "batcherAddr": "0xe0fa1cc7a0fd5bd82b9a06b08fd6c4563e6635c2", - "overhead": "0x0000000000000000000000000000000000000000000000000000000000000834", - "scalar": "0x00000000000000000000000000000000000000000000000000000000000f4240", - "gasLimit": 25000000 -} diff --git a/superchain/extra/genesis-system-configs/goerli/base.json b/superchain/extra/genesis-system-configs/goerli/base.json deleted file mode 100644 index ef3bb1ca3..000000000 --- a/superchain/extra/genesis-system-configs/goerli/base.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "batcherAddr": "0x2d679b567db6187c0c8323fa982cfb88b74dbcc7", - "overhead": "0x0000000000000000000000000000000000000000000000000000000000000834", - "scalar": "0x00000000000000000000000000000000000000000000000000000000000f4240", - "gasLimit": 25000000 -} \ No newline at end of file diff --git a/superchain/extra/genesis-system-configs/goerli/op.json b/superchain/extra/genesis-system-configs/goerli/op.json deleted file mode 100644 index 57f15620e..000000000 --- a/superchain/extra/genesis-system-configs/goerli/op.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "batcherAddr": "0x7431310e026b69bfc676c0013e12a1a11411eec9", - "overhead": "0x0000000000000000000000000000000000000000000000000000000000000834", - "scalar": "0x00000000000000000000000000000000000000000000000000000000000f4240", - "gasLimit": 25000000 -} \ No newline at end of file diff --git a/superchain/extra/genesis/goerli-dev-0/base-devnet-0.json.gz b/superchain/extra/genesis/goerli-dev-0/base-devnet-0.json.gz deleted file mode 100644 index e40265623..000000000 Binary files a/superchain/extra/genesis/goerli-dev-0/base-devnet-0.json.gz and /dev/null differ diff --git a/superchain/extra/genesis/goerli-dev-0/conduit-devnet-0.json.gz b/superchain/extra/genesis/goerli-dev-0/conduit-devnet-0.json.gz deleted file mode 100644 index a7bbd9e44..000000000 Binary files a/superchain/extra/genesis/goerli-dev-0/conduit-devnet-0.json.gz and /dev/null differ diff --git a/superchain/extra/genesis/goerli-dev-0/op-labs-chaosnet-0.json.gz b/superchain/extra/genesis/goerli-dev-0/op-labs-chaosnet-0.json.gz deleted file mode 100755 index 12d6ed310..000000000 Binary files a/superchain/extra/genesis/goerli-dev-0/op-labs-chaosnet-0.json.gz and /dev/null differ diff --git a/superchain/extra/genesis/goerli-dev-0/op-labs-devnet-0.json.gz b/superchain/extra/genesis/goerli-dev-0/op-labs-devnet-0.json.gz deleted file mode 100755 index e0930e60f..000000000 Binary files a/superchain/extra/genesis/goerli-dev-0/op-labs-devnet-0.json.gz and /dev/null differ diff --git a/superchain/extra/genesis/goerli/base.json.gz b/superchain/extra/genesis/goerli/base.json.gz deleted file mode 100755 index e2b3d4871..000000000 Binary files a/superchain/extra/genesis/goerli/base.json.gz and /dev/null differ diff --git a/superchain/extra/genesis/goerli/op.json.gz b/superchain/extra/genesis/goerli/op.json.gz deleted file mode 100755 index fe62a66ad..000000000 Binary files a/superchain/extra/genesis/goerli/op.json.gz and /dev/null differ diff --git a/superchain/implementations/networks/goerli-dev-0.yaml b/superchain/implementations/networks/goerli-dev-0.yaml deleted file mode 100644 index 29d8590b7..000000000 --- a/superchain/implementations/networks/goerli-dev-0.yaml +++ /dev/null @@ -1,7 +0,0 @@ -l1_cross_domain_messenger: -l1_erc721_bridge: -l1_standard_bridge: -l2_output_oracle: -optimism_mintable_erc20_factory: -optimism_portal: -system_config: diff --git a/superchain/implementations/networks/goerli.yaml b/superchain/implementations/networks/goerli.yaml deleted file mode 100644 index ac2e49de2..000000000 --- a/superchain/implementations/networks/goerli.yaml +++ /dev/null @@ -1,14 +0,0 @@ -l1_cross_domain_messenger: - 1.5.1: 0xb5df97bB67f5AA7254d40E1B7034bBFF7F183a38 -l1_erc721_bridge: - 1.2.1: 0x53C115eD8D9902f4999fDBd8B93Ea79BF37cb588 -l1_standard_bridge: - 1.2.1: 0xd9aA10f75a2a93Bfc73AaDD41ae777e900CEdBc9 -l2_output_oracle: - 1.4.1: 0xaBd96C062c6B640d5670455E9d1cD98383Dd23CA -optimism_mintable_erc20_factory: - 1.3.0: 0xdfe97868233d1aa22e815a266982f2cf17685a27 -optimism_portal: - 1.8.1: 0x345D27c7B6C90fef5beA9631037C36119f4bF93e -system_config: - 1.6.0: 0x543bA4AADBAb8f9025686Bd03993043599c6fB04 diff --git a/superchain/params.go b/superchain/params.go index ad1305abd..a8edbb330 100644 --- a/superchain/params.go +++ b/superchain/params.go @@ -44,28 +44,14 @@ var OPMainnetL2OOParams = L2OOParams{ FinalizationPeriodSeconds: big.NewInt(12), } -// OPGoerliL2OOParams describes the L2OutputOracle parameters from OP Goerli -var OPGoerliL2OOParams = L2OOParams{ - SubmissionInterval: big.NewInt(120), - L2BlockTime: big.NewInt(2), - FinalizationPeriodSeconds: big.NewInt(12), -} - -// OPGoerliDev0L2OOParams describes the L2OutputOracle parameters from OP Goerli -var OPGoerliDev0L2OOParams = L2OOParams{ - SubmissionInterval: big.NewInt(120), - L2BlockTime: big.NewInt(2), - FinalizationPeriodSeconds: big.NewInt(12), -} - -// OPSepoliaL2OOParams describes the L2OutputOracle parameters from OP Goerli +// OPSepoliaL2OOParams describes the L2OutputOracle parameters from OP Sepolia var OPSepoliaL2OOParams = L2OOParams{ SubmissionInterval: big.NewInt(120), L2BlockTime: big.NewInt(2), FinalizationPeriodSeconds: big.NewInt(12), } -// OPSepoliaDev0L2OOParams describes the L2OutputOracle parameters from OP Goerli +// OPSepoliaDev0L2OOParams describes the L2OutputOracle parameters from OP Sepolia var OPSepoliaDev0L2OOParams = L2OOParams{ SubmissionInterval: big.NewInt(120), L2BlockTime: big.NewInt(2), @@ -135,16 +121,4 @@ var GasPriceOracleParams = map[string]UpgradeFilter{ BaseFeeScalar: Uint32AndBounds{7600, [2]uint32{7600, 7600}}, }, }, - "goerli": { - PreEcotone: &PreEcotoneGasPriceOracleParamsWithBounds{ - Decimals: makeBigIntAndBounds(6, [2]int64{6, 6}), - Overhead: makeBigIntAndBounds(2_100, [2]int64{2_100, 2_100}), - Scalar: makeBigIntAndBounds(100_000, [2]int64{100_000, 100_000}), - }, - Ecotone: &EcotoneGasPriceOracleParamsWithBounds{ - Decimals: makeBigIntAndBounds(6, [2]int64{6, 6}), - BlobBaseFeeScalar: Uint32AndBounds{862_000, [2]uint32{862_000, 862_000}}, - BaseFeeScalar: Uint32AndBounds{7600, [2]uint32{7600, 7600}}, - }, - }, } diff --git a/superchain/superchain_test.go b/superchain/superchain_test.go index 22fa9c120..88b98ccca 100644 --- a/superchain/superchain_test.go +++ b/superchain/superchain_test.go @@ -164,7 +164,7 @@ func TestContractVersionsCheck(t *testing.T) { // TestContractVersionsResolve will test that the high lever interface used works. func TestContractVersionsResolve(t *testing.T) { - impls, err := newContractImplementations("goerli") + impls, err := newContractImplementations("sepolia") if err != nil { t.Fatalf("failed to load contract implementations: %v", err) } @@ -410,7 +410,7 @@ superchain_config_addr: "0x02d91Cf852423640d93920BE0CAdceC0E7A00FA7" canyon_time: 1 delta_time: 2 ecotone_time: 3 -fjord_time: +fjord_time: ` s := SuperchainConfig{} diff --git a/validation/gpo-params_test.go b/validation/gpo-params_test.go index 099b81b4d..021fd3f0d 100644 --- a/validation/gpo-params_test.go +++ b/validation/gpo-params_test.go @@ -20,19 +20,12 @@ import ( func TestGasPriceOracleParams(t *testing.T) { isExcluded := map[uint64]bool{ 291: true, // mainnet/orderly (incorrect scalar parameter) - 420: true, // goerli/op (no public endpoint) - 888: true, // goerli-dev-0/op-labs-chaosnet-0 (no public endpoint) 957: true, // mainnet/lyra (incorrect scalar parameter) - 997: true, // goerli-dev-0/op-labs-devnet-0 (no public endpoint) 58008: true, // sepolia/pgn (blobBaseFeeScalar out of bounds) - 84531: true, // goerli/base (network sunset) 84532: true, // sepolia/base (blobBaseFeeScalar out of bounds) 11155421: true, // sepolia-dev-0/oplabs-devnet-0 (no public endpoint) - 11763071: true, // goerli-dev-0/base-devnet-0 (no public endpoint) 11763072: true, // sepolia-dev-0/base-devnet-0 (no public endpoint) 999999999: true, // sepolia/zora (blobBaseFeeScalar out of bounds) - - 129831238013: true, // goerli-dev-0/conduit-devnet-0 (no ground truth) } gasPriceOraclAddr := predeploys.GasPriceOracleAddr diff --git a/validation/l2oo_test.go b/validation/l2oo_test.go index 59e3d0e55..8a5f83ad7 100644 --- a/validation/l2oo_test.go +++ b/validation/l2oo_test.go @@ -19,20 +19,16 @@ import ( func TestL2OOParams(t *testing.T) { isExcluded := map[uint64]bool{ - 10: true, // mainnet/op (old version of L2OutputOracle, no submissionInterval method) - 291: true, // mainnet/orderly (old version of L2OutputOracle, no submissionInterval method) - 424: true, // mainnet/pgn (old version of L2OutputOracle, no submissionInterval method) - 957: true, // mainnet/lyra (old version of L2OutputOracle, no submissionInterval method) - 997: true, // goerli-dev-0/op-labs-devnet-0 (old version of L2OutputOracle, no submissionInterval method) - 8453: true, // mainnet/base (old version of L2OutputOracle, no submissionInterval method) - 34443: true, // mainnet/mode (old version of L2OutputOracle, no submissionInterval method) - 58008: true, // sepolia/pgn (old version of L2OutputOracle, no submissionInterval method) - 84531: true, // goerli/base (old version of L2OutputOracle, no submissionInterval method) - 7777777: true, // mainnet/zora (old version of L2OutputOracle, no submissionInterval method) - 11155421: true, // sepolia-dev-0/oplabs-devnet-0 (old version of L2OutputOracle, no submissionInterval method) - 11763071: true, // goerli-dev-0/base-devnet-0 (old version of L2OutputOracle, no submissionInterval method) - 999999999: true, // sepolia/zora (old version of L2OutputOracle, no submissionInterval method) - 129831238013: true, // goerli-dev-0/conduit-devnet-0 (old version of L2OutputOracle, no submissionInterval method) + 10: true, // mainnet/op (old version of L2OutputOracle, no submissionInterval method) + 291: true, // mainnet/orderly (old version of L2OutputOracle, no submissionInterval method) + 424: true, // mainnet/pgn (old version of L2OutputOracle, no submissionInterval method) + 957: true, // mainnet/lyra (old version of L2OutputOracle, no submissionInterval method) + 8453: true, // mainnet/base (old version of L2OutputOracle, no submissionInterval method) + 34443: true, // mainnet/mode (old version of L2OutputOracle, no submissionInterval method) + 58008: true, // sepolia/pgn (old version of L2OutputOracle, no submissionInterval method) + 7777777: true, // mainnet/zora (old version of L2OutputOracle, no submissionInterval method) + 11155421: true, // sepolia-dev-0/oplabs-devnet-0 (old version of L2OutputOracle, no submissionInterval method) + 999999999: true, // sepolia/zora (old version of L2OutputOracle, no submissionInterval method) } checkEquality := func(a, b *big.Int) func() bool { @@ -70,12 +66,8 @@ func TestL2OOParams(t *testing.T) { switch chain.Superchain { case "mainnet": desiredParams = OPMainnetL2OOParams - case "goerli": - desiredParams = OPGoerliL2OOParams case "sepolia": desiredParams = OPSepoliaL2OOParams - case "goerli-dev-0": - desiredParams = OPGoerliDev0L2OOParams case "sepolia-dev-0": desiredParams = OPSepoliaDev0L2OOParams default: diff --git a/validation/superchain-genesis_test.go b/validation/superchain-genesis_test.go index 88522045e..794f43a38 100644 --- a/validation/superchain-genesis_test.go +++ b/validation/superchain-genesis_test.go @@ -35,8 +35,7 @@ func testGenesisHashOfChain(t *testing.T, chainID uint64) { func TestGenesisHash(t *testing.T) { isExcluded := map[uint64]bool{ - 10: true, // OP Mainnet, requires override (see https://github.com/ethereum-optimism/op-geth/blob/daade41d463b4ff332c6ed955603e47dcd25528b/core/superchain.go#L83-L94) - 420: true, // OP Goerli, requires override (see https://github.com/ethereum-optimism/op-geth/blob/daade41d463b4ff332c6ed955603e47dcd25528b/core/superchain.go#L83-L94) + 10: true, // OP Mainnet, requires override (see https://github.com/ethereum-optimism/op-geth/blob/daade41d463b4ff332c6ed955603e47dcd25528b/core/superchain.go#L83-L94) } for chainID, chain := range OPChains { diff --git a/validation/superchain-version_test.go b/validation/superchain-version_test.go index d2d57333e..2ce1fb24d 100644 --- a/validation/superchain-version_test.go +++ b/validation/superchain-version_test.go @@ -33,9 +33,7 @@ func TestSuperchainWideContractVersions(t *testing.T) { checkSemverForContract(t, "ProtocolVersions", superchain.Config.ProtocolVersionsAddr, client, desiredSemver) isExcludedFromSuperchainConfigCheck := map[string]bool{ - "Goerli": true, // no version specified - "Goerli Dev 0": true, // no version specified - "Mainnet": true, // no version specified + "Mainnet": true, // no version specified } if isExcludedFromSuperchainConfigCheck[superchain.Config.Name] { @@ -55,20 +53,16 @@ func TestSuperchainWideContractVersions(t *testing.T) { func TestContractVersions(t *testing.T) { isExcluded := map[uint64]bool{ - 291: true, // mainnet/orderly - 424: true, // mainnet/pgn - 888: true, // goerli-dev-0/op-labs-chaosnet-0 - 957: true, // mainnet/lyra - 8453: true, // mainnet/base - 34443: true, // mainnet/mode - 58008: true, // sepolia/pgn - 84531: true, // goerli/base - 84532: true, // sepolia/base - 7777777: true, // mainnet/zora - 11155421: true, // sepolia-dev-0/oplabs-devnet-0 - 11763071: true, // goerli-dev-0/base-devnet-0 - 999999999: true, // sepolia/zoras - 129831238013: true, // goerli-dev-0/conduit-devnet-0 + 291: true, // mainnet/orderly + 424: true, // mainnet/pgn + 957: true, // mainnet/lyra + 8453: true, // mainnet/base + 34443: true, // mainnet/mode + 58008: true, // sepolia/pgn + 84532: true, // sepolia/base + 7777777: true, // mainnet/zora + 11155421: true, // sepolia-dev-0/oplabs-devnet-0 + 999999999: true, // sepolia/zoras } checkOPChainSatisfiesSemver := func(t *testing.T, chain *ChainConfig) {