fixes

ethereum-optimism · Jan 22, 2025 · 7e60e7a · 7e60e7a
1 parent baea73a
commit 7e60e7a
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 9 deletions.
diff --git a/packages/contracts-bedrock/scripts/deploy/DeployOPCM.s.sol b/packages/contracts-bedrock/scripts/deploy/DeployOPCM.s.sol
@@ -256,14 +256,8 @@ contract DeployOPCM is Script {
         OPContractsManager impl = OPContractsManager(address(_doo.opcm()));
         require(address(impl.superchainConfig()) == address(_doi.superchainConfig()), "OPCMI-10");
         require(address(impl.protocolVersions()) == address(_doi.protocolVersions()), "OPCMI-20");
+        require(LibString.eq(impl.l1ContractsRelease(), string.concat(_doi.l1ContractsRelease(), "-rc")), "OPCMI-30");
 
-        if (impl.isRC()) {
-            require(
-                LibString.eq(impl.l1ContractsRelease(), string.concat(_doi.l1ContractsRelease(), "-rc")), "OPCMI-30"
-            );
-        } else {
-            require(LibString.eq(impl.l1ContractsRelease(), _doi.l1ContractsRelease()), "OPCMI-30");
-        }
         require(impl.upgradeController() == _doi.upgradeController(), "OPCMI-40");
 
         OPContractsManager.Blueprints memory blueprints = impl.blueprints();

diff --git a/packages/contracts-bedrock/snapshots/semver-lock.json b/packages/contracts-bedrock/snapshots/semver-lock.json
@@ -17,7 +17,7 @@
   },
   "src/L1/OPContractsManager.sol": {
     "initCodeHash": "0x9fc601820098fb3308ece91087c9209a4bff049f1f8d1e7c33a7a7a27cf5f96f",
-    "sourceCodeHash": "0x396b1fd5e49e53338032b1be9abc31fec56c3c7e969d3655b63f214d59fb85e7"
+    "sourceCodeHash": "0xcfd0f82cb6481c22841747d9ed9022dc9e6b01a7e03edffb13587bfeae8eaee8"
   },
   "src/L1/OPContractsManagerInterop.sol": {
     "initCodeHash": "0xc7f77833e13a5aa7460df755c60d36068bc10868f9071b4350b139eaa391c071",

diff --git a/packages/contracts-bedrock/src/L1/OPContractsManager.sol b/packages/contracts-bedrock/src/L1/OPContractsManager.sol
@@ -194,7 +194,7 @@ contract OPContractsManager is ISemver {
 
     // -------- Errors --------
 
-    /// @notice Thrown when an address other than the upgrade controller calls the upgrade function.
+    /// @notice Thrown when an address other than the upgrade controller calls the setRC function.
     error OnlyUpgradeController();
 
     /// @notice Thrown when an address is the zero address.