ethereum-optimism · smartcontracts · Mar 6, 2025 · Mar 5, 2025 · Mar 5, 2025 · Mar 5, 2025
diff --git a/packages/contracts-bedrock/interfaces/L1/IOPContractsManager.sol b/packages/contracts-bedrock/interfaces/L1/IOPContractsManager.sol
@@ -229,23 +229,8 @@ interface IOPContractsManager {
     /// @notice Thrown when an invalid `l2ChainId` is provided to `deploy`.
     error InvalidChainId();
 
-    /// @notice Thrown when a role's address is not valid (opChainProxyAdminOwner).
-    error InvalidRoleAddressPAO();
-
-    /// @notice Thrown when a role's address is not valid (systemConfigOwner).
-    error InvalidRoleAddressSCO();
-
-    /// @notice Thrown when a role's address is not valid (batcher).
-    error InvalidRoleAddressBatcher();
-
-    /// @notice Thrown when a role's address is not valid (unsafeBlockSigner).
-    error InvalidRoleAddressUBS();
-
-    /// @notice Thrown when a role's address is not valid (proposer).
-    error InvalidRoleAddressProposer();
-
-    /// @notice Thrown when a role's address is not valid (challenger).
-    error InvalidRoleAddressChallenger();
+    /// @notice Thrown when a role's address is not valid.
+    error InvalidRoleAddress(string role);
 
     /// @notice Thrown when the latest release is not set upon initialization.
     error LatestReleaseNotSet();

diff --git a/packages/contracts-bedrock/interfaces/L1/IOPContractsManagerLegacyUpgrade.sol b/packages/contracts-bedrock/interfaces/L1/IOPContractsManagerLegacyUpgrade.sol
@@ -0,0 +1,21 @@
+// SPDX-License-Identifier: MIT
+pragma solidity ^0.8.0;
+
+import { ISystemConfig } from "interfaces/L1/ISystemConfig.sol";
+import { IProxyAdmin } from "interfaces/universal/IProxyAdmin.sol";
+import { Claim } from "src/dispute/lib/Types.sol";
+
+/// @title IOPContractsManagerLegacyUpgrade
+/// @notice Interface for the legacy OPContractsManager upgrade function.
+///         This interface is used to test Upgrade 13 and 14 paths and can be safely removed
+///         after those upgrades are completed. Only difference in the new struct is the added
+///         disputeGameUsesSuperRoots boolean.
+interface IOPContractsManagerLegacyUpgrade {
+    struct OpChainConfig {
+        ISystemConfig systemConfigProxy;
+        IProxyAdmin proxyAdmin;
+        Claim absolutePrestate;
+    }
+
+    function upgrade(OpChainConfig[] memory _opChainConfigs) external;
+}
diff --git a/packages/contracts-bedrock/interfaces/L1/IOPPrestateUpdater.sol b/packages/contracts-bedrock/interfaces/L1/IOPPrestateUpdater.sol
diff --git a/packages/contracts-bedrock/justfile b/packages/contracts-bedrock/justfile
@@ -65,7 +65,7 @@ test-dev *ARGS: build-go-ffi
 # Default block number for the forked upgrade path.
 
 export sepoliaBlockNumber := "7701807"
-export mainnetBlockNumber := "21971446"
+export mainnetBlockNumber := "21983965"
 
 export pinnedBlockNumber := if env_var_or_default("FORK_BASE_CHAIN", "") == "mainnet" {
     mainnetBlockNumber

diff --git a/packages/contracts-bedrock/scripts/checks/interfaces/main.go b/packages/contracts-bedrock/scripts/checks/interfaces/main.go
@@ -26,6 +26,9 @@ var excludeContracts = []string{
 	// EAS
 	"IEAS", "ISchemaResolver", "ISchemaRegistry",
 
+	// Misc stuff that can be ignored
+	"IOPContractsManagerLegacyUpgrade",
+
 	// TODO: Interfaces that need to be fixed
 	"IInitializable", "IOptimismMintableERC20", "ILegacyMintableERC20",
 	"KontrolCheatsBase", "ISystemConfigInterop", "IResolvedDelegateProxy",

diff --git a/packages/contracts-bedrock/snapshots/abi/OPContractsManager.json b/packages/contracts-bedrock/snapshots/abi/OPContractsManager.json
@@ -662,6 +662,11 @@
             "internalType": "Claim",
             "name": "absolutePrestate",
             "type": "bytes32"
+          },
+          {
+            "internalType": "bool",
+            "name": "disputeGameUsesSuperRoots",
+            "type": "bool"
           }
         ],
         "internalType": "struct OPContractsManager.OpChainConfig[]",
@@ -738,33 +743,14 @@
     "type": "error"
   },
   {
-    "inputs": [],
-    "name": "InvalidRoleAddressBatcher",
-    "type": "error"
-  },
-  {
-    "inputs": [],
-    "name": "InvalidRoleAddressChallenger",
-    "type": "error"
-  },
-  {
-    "inputs": [],
-    "name": "InvalidRoleAddressPAO",
-    "type": "error"
-  },
-  {
-    "inputs": [],
-    "name": "InvalidRoleAddressProposer",
-    "type": "error"
-  },
-  {
-    "inputs": [],
-    "name": "InvalidRoleAddressSCO",
-    "type": "error"
-  },
-  {
-    "inputs": [],
-    "name": "InvalidRoleAddressUBS",
+    "inputs": [
+      {
+        "internalType": "string",
+        "name": "role",
+        "type": "string"
+      }
+    ],
+    "name": "InvalidRoleAddress",
     "type": "error"
   },
   {

diff --git a/packages/contracts-bedrock/snapshots/abi/OPContractsManagerDeployer.json b/packages/contracts-bedrock/snapshots/abi/OPContractsManagerDeployer.json
@@ -504,4 +504,4 @@
     "name": "UnsupportedERCVersion",
     "type": "error"
   }
-]
+]
diff --git a/packages/contracts-bedrock/snapshots/abi/OPContractsManagerDeployerInterop.json b/packages/contracts-bedrock/snapshots/abi/OPContractsManagerDeployerInterop.json
@@ -504,4 +504,4 @@
     "name": "UnsupportedERCVersion",
     "type": "error"
   }
-]
+]
diff --git a/packages/contracts-bedrock/snapshots/abi/OPContractsManagerGameTypeAdder.json b/packages/contracts-bedrock/snapshots/abi/OPContractsManagerGameTypeAdder.json
@@ -311,6 +311,11 @@
             "internalType": "Claim",
             "name": "absolutePrestate",
             "type": "bytes32"
+          },
+          {
+            "internalType": "bool",
+            "name": "disputeGameUsesSuperRoots",
+            "type": "bool"
           }
         ],
         "internalType": "struct OPContractsManager.OpChainConfig[]",

diff --git a/packages/contracts-bedrock/snapshots/abi/OPContractsManagerUpgrader.json b/packages/contracts-bedrock/snapshots/abi/OPContractsManagerUpgrader.json
@@ -208,6 +208,11 @@
             "internalType": "Claim",
             "name": "absolutePrestate",
             "type": "bytes32"
+          },
+          {
+            "internalType": "bool",
+            "name": "disputeGameUsesSuperRoots",
+            "type": "bool"
           }
         ],
         "internalType": "struct OPContractsManager.OpChainConfig[]",

diff --git a/packages/contracts-bedrock/snapshots/semver-lock.json b/packages/contracts-bedrock/snapshots/semver-lock.json
@@ -16,24 +16,16 @@
     "sourceCodeHash": "0x44797707aea8c63dec049a02d69ea056662a06e5cf320028ab8b388634bf1c67"
   },
   "src/L1/OPContractsManager.sol": {
-    "initCodeHash": "0xfc5622ed6411ec01e7bcfb3c9250b130b8ca25e74ee40e70e4017fefa34cddf7",
-    "sourceCodeHash": "0x1f53a1e174479aa244ad78fc171d4cbeb8529505a57af59f89435837e2803bcc"
-  },
-  "src/L1/OPContractsManagerInterop.sol": {
-    "initCodeHash": "0x6855bfe2f22b4ce53c62fca0d32029cc39f0a2ab2ded43808bb6c493acadc781",
-    "sourceCodeHash": "0x79b3ae68d83f021d9118f8a1943c1d0773e7e01a19f580f6b90ad4c00370cff5"
-  },
-  "src/L1/OPPrestateUpdater.sol": {
-    "initCodeHash": "0x840b42954a8921e8216a93ace6d2a047e28ef8df8f426181b1b229d2d5818fc1",
-    "sourceCodeHash": "0x985c33cc1933d68de38d6c13afc1ac42ef7e455cb06bb255c1fed22b06b97a62"
+    "initCodeHash": "0x5cbd9da550ffc2fdd17434145798cbfd5cf8140c474319671bf339f43cbb994c",
+    "sourceCodeHash": "0x1af10fb0f17db1dfc8b02844f36577bffe54c942f6f8f09a0b75fa9ba38654d9"
   },
   "src/L1/OptimismPortal2.sol": {
-    "initCodeHash": "0xac11984d6c3e58fd02e33509540ee329c4f5caedb94e422f8ab3a7a95ce7a546",
-    "sourceCodeHash": "0x79652f4f6aebc11dd4ad201dcf9a436d94db76e2edef07b12486c3de9cd804d2"
+    "initCodeHash": "0x22eddc89e6acc58ab5c22927d303a1be8d05a21220e6d314883cba2bca4ffb56",
+    "sourceCodeHash": "0x03da70e6c4b48c9e58722a0ea41c9cb7ca6bf12ce26f8118316a4168b8715b98"
   },
   "src/L1/OptimismPortalInterop.sol": {
-    "initCodeHash": "0x8d76300f7a79686e522d4cac0582f4f7ec77b798f881747d0403762fa56b3a71",
-    "sourceCodeHash": "0x1b2ce1f2e3125bd449501b9d228b207d31f2bc39c7f23262c674e0d1f47c0d0b"
+    "initCodeHash": "0xd77aedf895785318db654a0a7f72f80f0a83a70d32e8b479f3fa3ffa1e50265f",
+    "sourceCodeHash": "0xcd94e7641d43620f4169b083b2e597c2db2eb679b44ccaf5c7eeae6f63d2774a"
   },
   "src/L1/ProtocolVersions.sol": {
     "initCodeHash": "0x5a76c8530cb24cf23d3baacc6eefaac226382af13f1e2a35535d2ec2b0573b29",
@@ -44,12 +36,12 @@
     "sourceCodeHash": "0xfd56e63e76b1f203cceeb9bbb14396ae803cbbbf7e80ca0ee11fb586321812af"
   },
   "src/L1/SystemConfig.sol": {
-    "initCodeHash": "0x93e732c31e59dc78d6414ad12fcc0cbe4537d3a69a2ca34ff8713b0b51679b19",
-    "sourceCodeHash": "0x538518cf61bda80bc3f0b94e4fe236b65e53fff397fd43958e695705c57e02d9"
+    "initCodeHash": "0x471ac69544fdee81d0734b87151297ad4cf91ca1d43a2c95e9e644c0424eed65",
+    "sourceCodeHash": "0x8c3ccb8f3718c00c3f9bf7c866a22d87ea18a87a6e9454c31d1c97638107434c"
   },
   "src/L1/SystemConfigInterop.sol": {
-    "initCodeHash": "0xe3651f84f0fecf6c4b60801d8168da55bfe3889912548fcd6b935c9f6dff91b3",
-    "sourceCodeHash": "0xe3031507a78ed71352c0c1523272881a48c8d6bd98d5322ce3a7cb8061eeade3"
+    "initCodeHash": "0xcdca84b074ddfd6b4e4df1a57d3500c1d48ecf88852af47f6351e9ae24b6fc2a",
+    "sourceCodeHash": "0x71914fa1408befaef3a06a67404e0ab580d9d945e068ba23063ea6588f0f68a6"
   },
   "src/L2/BaseFeeVault.sol": {
     "initCodeHash": "0xc403d4c555d8e69a2699e01d192ae7327136701fa02da10a6d75a584b3c364c9",
@@ -243,4 +235,4 @@
     "initCodeHash": "0x2bfce526f82622288333d53ca3f43a0a94306ba1bab99241daa845f8f4b18bd4",
     "sourceCodeHash": "0xf49d7b0187912a6bb67926a3222ae51121e9239495213c975b3b4b217ee57a1b"
   }
-}
+}
diff --git a/packages/contracts-bedrock/snapshots/storageLayout/SystemConfig.json b/packages/contracts-bedrock/snapshots/storageLayout/SystemConfig.json
@@ -110,5 +110,12 @@
     "offset": 12,
     "slot": "106",
     "type": "uint64"
+  },
+  {
+    "bytes": "32",
+    "label": "l2ChainId",
+    "offset": 0,
+    "slot": "107",
+    "type": "uint256"
   }
-]
+]
-Original file line number
+Diff line change
@@ Expand Up / @@ -504,4 +504,4 @@ @@
         "name": "UnsupportedERCVersion",
         "type": "error"
       }
-    ]
+    ]