deployOpChain using OPCM

packages/contracts-bedrock/deploy-config/devnetL1-template.json

@@ -6,7 +6,7 @@
   "sequencerWindowSize": 200,
   "channelTimeout": 120,
   "p2pSequencerAddress": "0x9965507D1a55bcC2695C58ba16FB37d819B0A4dc",
-  "batchInboxAddress": "0xff00000000000000000000000000000000000901",
+  "batchInboxAddress": "0x00289C189bEE4E70334629f04Cd5eD602B6600eB",
   "batchSenderAddress": "0x3C44CdDdB6a900fa2b585dd299e03d12FA4293BC",
   "l1StartingBlockTag": "earliest",
   "l2OutputOracleSubmissionInterval": 10,

packages/contracts-bedrock/deploy-config/hardhat.json

@@ -11,7 +11,7 @@
   "sequencerWindowSize": 15,
   "channelTimeout": 40,
   "p2pSequencerAddress": "0x9965507D1a55bcC2695C58ba16FB37d819B0A4dc",
-  "batchInboxAddress": "0xff00000000000000000000000000000000000000",
+  "batchInboxAddress": "0x00289C189bEE4E70334629f04Cd5eD602B6600eB",
   "batchSenderAddress": "0x3C44CdDdB6a900fa2b585dd299e03d12FA4293BC",
   "l2OutputOracleSubmissionInterval": 6,
   "l2OutputOracleStartingTimestamp": 1,

packages/contracts-bedrock/scripts/Artifacts.s.sol

@@ -183,14 +183,14 @@ abstract contract Artifacts {
     /// @param _name The name of the deployment.
     /// @param _deployed The address of the deployment.
     function save(string memory _name, address _deployed) public {
+        console.log("Saving %s: %s", _name, _deployed);
         if (bytes(_name).length == 0) {
             revert InvalidDeployment("EmptyName");
         }
         if (bytes(_namedDeployments[_name].name).length > 0) {
             revert InvalidDeployment("AlreadyExists");
         }
 
-        console.log("Saving %s: %s", _name, _deployed);
         Deployment memory deployment = Deployment({ name: _name, addr: payable(_deployed) });
         _namedDeployments[_name] = deployment;
         _newDeployments.push(deployment);

packages/contracts-bedrock/scripts/libraries/Constants.sol

@@ -10,12 +10,16 @@ import { GameTypes, OutputRoot, Hash } from "src/dispute/lib/Types.sol";
 ///         should be defined in that contract instead.
 library Constants {
     /// @notice Returns the default starting anchor roots value to be used in a new dispute game.
+    function DEFAULT_OUTPUT_ROOT() internal pure returns (OutputRoot memory) {
+        return OutputRoot({ root: Hash.wrap(bytes32(hex"dead")), l2BlockNumber: 0 });
+    }
+
     function DEFAULT_STARTING_ANCHOR_ROOTS() internal pure returns (IAnchorStateRegistry.StartingAnchorRoot[] memory) {
         IAnchorStateRegistry.StartingAnchorRoot[] memory defaultStartingAnchorRoots =
             new IAnchorStateRegistry.StartingAnchorRoot[](1);
         defaultStartingAnchorRoots[0] = IAnchorStateRegistry.StartingAnchorRoot({
             gameType: GameTypes.PERMISSIONED_CANNON,
-            outputRoot: OutputRoot({ root: Hash.wrap(bytes32(hex"dead")), l2BlockNumber: 0 })
+            outputRoot: DEFAULT_OUTPUT_ROOT()
         });
         return defaultStartingAnchorRoots;
     }

packages/contracts-bedrock/test/L1/SystemConfigInterop.t.sol

@@ -80,7 +80,9 @@ contract SystemConfigInterop_Test is CommonTest {
 
     /// @dev Tests that adding a dependency as not the dependency manager reverts.
     function testFuzz_addDependency_notDependencyManager_reverts(uint256 _chainId) public {
+        require(alice != _systemConfigInterop().dependencyManager(), "SystemConfigInterop_Test-100");
         vm.expectRevert("SystemConfig: caller is not the dependency manager");
+        vm.prank(alice);
         _systemConfigInterop().addDependency(_chainId);
     }
 
@@ -100,7 +102,9 @@ contract SystemConfigInterop_Test is CommonTest {
 
     /// @dev Tests that removing a dependency as not the dependency manager reverts.
     function testFuzz_removeDependency_notDependencyManager_reverts(uint256 _chainId) public {
+        require(alice != _systemConfigInterop().dependencyManager(), "SystemConfigInterop_Test-100");
         vm.expectRevert("SystemConfig: caller is not the dependency manager");
+        vm.prank(alice);
         _systemConfigInterop().removeDependency(_chainId);
     }
 

packages/contracts-bedrock/test/vendor/Initializable.t.sol

@@ -393,7 +393,7 @@ contract Initializer_Test is Bridge_Initializer {
     ///         3. The `initialize()` function of each contract cannot be called again.
     function test_cannotReinitialize_succeeds() public {
         // Collect exclusions.
-        string[] memory excludes = new string[](8);
+        string[] memory excludes = new string[](9);
         // TODO: Neither of these contracts are labeled properly in the deployment script. Both are
         //       currently being labeled as their non-interop versions. Remove these exclusions once
         //       the deployment script is fixed.
@@ -412,6 +412,8 @@ contract Initializer_Test is Bridge_Initializer {
         // TODO: Eventually remove this exclusion. Same reason as above dispute contracts.
         excludes[6] = "src/L1/OPContractsManager.sol";
         excludes[7] = "src/L1/OPContractsManagerInterop.sol";
+        // The L2OutputOracle is not always deployed (and is no longer being modified)
+        excludes[8] = "src/L1/L2OutputOracle.sol";
 
         // Get all contract names in the src directory, minus the excluded contracts.
         string[] memory contractNames = ForgeArtifacts.getContractNames("src/*", excludes);