updates after rebase

Author: smartcontracts

packages/contracts-bedrock/scripts/deploy/DeployImplementations.s.sol

@@ -498,8 +498,6 @@ contract DeployImplementations is Script {
         require(checkAddress == address(0), "OPCM-40");
         (blueprints.resolvedDelegateProxy, checkAddress) = DeployUtils.createDeterministicBlueprint(vm.getCode("ResolvedDelegateProxy"), _salt);
         require(checkAddress == address(0), "OPCM-50");
-        (blueprints.anchorStateRegistry, checkAddress) = DeployUtils.createDeterministicBlueprint(vm.getCode("AnchorStateRegistry"), _salt);
-        require(checkAddress == address(0), "OPCM-60");
             // The max initcode/runtimecode size is 48KB/24KB.
             // But for Blueprint, the initcode is stored as runtime code, that's why it's necessary to split into 2 parts.
         (blueprints.permissionedDisputeGame1, blueprints.permissionedDisputeGame2) = DeployUtils.createDeterministicBlueprint(vm.getCode("PermissionedDisputeGame"), _salt);

packages/contracts-bedrock/snapshots/semver-lock.json

@@ -219,4 +219,4 @@
     "initCodeHash": "0x2bfce526f82622288333d53ca3f43a0a94306ba1bab99241daa845f8f4b18bd4",
     "sourceCodeHash": "0xf49d7b0187912a6bb67926a3222ae51121e9239495213c975b3b4b217ee57a1b"
   }
-}
+}

packages/contracts-bedrock/snapshots/storageLayout/OPContractsManager.json

@@ -20,4 +20,4 @@
     "slot": "10",
     "type": "struct OPContractsManager.Implementations"
   }
-]
+]

packages/contracts-bedrock/snapshots/storageLayout/OPContractsManagerInterop.json

@@ -20,4 +20,4 @@
     "slot": "10",
     "type": "struct OPContractsManager.Implementations"
   }
-]
+]

packages/contracts-bedrock/test/opcm/DeployImplementations.t.sol

@@ -275,6 +275,7 @@ contract DeployImplementations_Test is Test {
         deployImplementations.deployPreimageOracleSingleton(dii, dio);
         deployImplementations.deployMipsSingleton(dii, dio);
         deployImplementations.deployDisputeGameFactoryImpl(dio);
+        deployImplementations.deployAnchorStateRegistryImpl(dio);
         deployImplementations.deployOPContractsManager(dii, dio);
 
         // Store the original addresses.
@@ -288,6 +289,7 @@ contract DeployImplementations_Test is Test {
         address preimageOracleSingleton = address(dio.preimageOracleSingleton());
         address mipsSingleton = address(dio.mipsSingleton());
         address disputeGameFactoryImpl = address(dio.disputeGameFactoryImpl());
+        address anchorStateRegistryImpl = address(dio.anchorStateRegistryImpl());
         address opcm = address(dio.opcm());
 
         // Do the deployments again. Thi should be a noop.
@@ -301,6 +303,7 @@ contract DeployImplementations_Test is Test {
         deployImplementations.deployPreimageOracleSingleton(dii, dio);
         deployImplementations.deployMipsSingleton(dii, dio);
         deployImplementations.deployDisputeGameFactoryImpl(dio);
+        deployImplementations.deployAnchorStateRegistryImpl(dio);
         deployImplementations.deployOPContractsManager(dii, dio);
 
         // Assert that the addresses did not change.
@@ -314,7 +317,8 @@ contract DeployImplementations_Test is Test {
         assertEq(preimageOracleSingleton, address(dio.preimageOracleSingleton()), "800");
         assertEq(mipsSingleton, address(dio.mipsSingleton()), "900");
         assertEq(disputeGameFactoryImpl, address(dio.disputeGameFactoryImpl()), "1000");
-        assertEq(opcm, address(dio.opcm()), "1100");
+        assertEq(anchorStateRegistryImpl, address(dio.anchorStateRegistryImpl()), "1100");
+        assertEq(opcm, address(dio.opcm()), "1200");
     }
 
     function testFuzz_run_memory_succeeds(bytes32 _seed) public {