contracts-bedrock: better initialize

op-chain-ops/genesis/layer_one.go

@@ -123,7 +123,7 @@ func BuildL1DeveloperGenesis(config *DeployConfig) (*core.Genesis, error) {
 	if err != nil {
 		return nil, err
 	}
-	data, err = portalABI.Pack("initialize")
+	data, err = portalABI.Pack("initialize", false)
 	if err != nil {
 		return nil, fmt.Errorf("cannot abi encode initialize for OptimismPortal: %w", err)
 	}

packages/contracts-bedrock/contracts/L1/OptimismPortal.sol

@@ -159,14 +159,15 @@ contract OptimismPortal is Initializable, ResourceMetering, Semver {
         L2_ORACLE = _l2Oracle;
         GUARDIAN = _guardian;
         FINALIZATION_PERIOD_SECONDS = _finalizationPeriodSeconds;
-        initialize();
+        initialize(true);
     }
 
     /**
      * @notice Initializer.
      */
-    function initialize() public initializer {
+    function initialize(bool _paused) public initializer {
         l2Sender = Constants.DEFAULT_L2_SENDER;
+        paused = _paused;
         __ResourceMetering_init();
     }
 

packages/contracts-bedrock/contracts/deployment/SystemDictator.sol

@@ -310,11 +310,11 @@ contract SystemDictator is OwnableUpgradeable {
             )
         );
 
-        // Upgrade and initialize the OptimismPortal.
+        // Upgrade and initialize the OptimismPortal as paused.
         config.globalConfig.proxyAdmin.upgradeAndCall(
             payable(config.proxyAddressConfig.optimismPortalProxy),
             address(config.implementationAddressConfig.optimismPortalImpl),
-            abi.encodeCall(OptimismPortal.initialize, ())
+            abi.encodeCall(OptimismPortal.initialize, (true))
         );
 
         // Upgrade the L1CrossDomainMessenger.

packages/contracts-bedrock/contracts/test/CommonTest.t.sol

@@ -175,7 +175,7 @@ contract Portal_Initializer is L2OutputOracle_Initializer {
         vm.prank(multisig);
         proxy.upgradeToAndCall(
             address(opImpl),
-            abi.encodeWithSelector(OptimismPortal.initialize.selector)
+            abi.encodeWithSelector(OptimismPortal.initialize.selector, false)
         );
         op = OptimismPortal(payable(address(proxy)));
     }
@@ -235,6 +235,8 @@ contract Messenger_Initializer is L2OutputOracle_Initializer {
             _finalizationPeriodSeconds: 7 days
         });
         vm.label(address(op), "OptimismPortal");
+        vm.prank(op.GUARDIAN());
+        op.unpause();
 
         // Deploy the address manager
         vm.prank(multisig);

packages/contracts-bedrock/contracts/test/OptimismPortal.t.sol

@@ -1059,12 +1059,12 @@ contract OptimismPortalUpgradeable_Test is Portal_Initializer {
 
     function test_initialize_cannotInitProxy_reverts() external {
         vm.expectRevert("Initializable: contract is already initialized");
-        OptimismPortal(payable(proxy)).initialize();
+        OptimismPortal(payable(proxy)).initialize(false);
     }
 
     function test_initialize_cannotInitImpl_reverts() external {
         vm.expectRevert("Initializable: contract is already initialized");
-        OptimismPortal(opImpl).initialize();
+        OptimismPortal(opImpl).initialize(false);
     }
 
     function test_upgradeToAndCall_upgrading_succeeds() external {

packages/contracts-bedrock/deploy/013-OptimismPortalImpl.ts

@@ -18,8 +18,8 @@ const deployFn: DeployFunction = async (hre) => {
     name: 'OptimismPortal',
     args: [
       L2OutputOracleProxy.address,
-      hre.deployConfig.finalizationPeriodSeconds,
       hre.deployConfig.finalSystemOwner,
+      hre.deployConfig.finalizationPeriodSeconds,
     ],
     postDeployAction: async (contract) => {
       await assertContractVariable(