Move `FINALIZATION_PERIOD_SECONDS` to `L2OutputOracle`; Need to update deployment etc.

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

@@ -34,6 +34,11 @@ contract L2OutputOracle is Initializable, Semver {
      */
     address public immutable PROPOSER;
 
+    /**
+     * @notice Minimum time (in seconds) that must elapse before a withdrawal can be finalized.
+     */
+    uint256 public immutable FINALIZATION_PERIOD_SECONDS;
+
     /**
      * @notice The number of the first L2 block recorded in this contract.
      */
@@ -88,7 +93,8 @@ contract L2OutputOracle is Initializable, Semver {
         uint256 _startingBlockNumber,
         uint256 _startingTimestamp,
         address _proposer,
-        address _challenger
+        address _challenger,
+        uint256 _finalizationPeriodSeconds
     ) Semver(1, 1, 0) {
         require(_l2BlockTime > 0, "L2OutputOracle: L2 block time must be greater than 0");
         require(
@@ -100,6 +106,7 @@ contract L2OutputOracle is Initializable, Semver {
         L2_BLOCK_TIME = _l2BlockTime;
         PROPOSER = _proposer;
         CHALLENGER = _challenger;
+        FINALIZATION_PERIOD_SECONDS = _finalizationPeriodSeconds;
 
         initialize(_startingBlockNumber, _startingTimestamp);
     }
@@ -145,7 +152,7 @@ contract L2OutputOracle is Initializable, Semver {
 
         // Do not allow deleting any outputs that have already been finalized.
         require(
-            block.timestamp - l2Outputs[_l2OutputIndex].timestamp < 7 days,
+            block.timestamp - l2Outputs[_l2OutputIndex].timestamp < FINALIZATION_PERIOD_SECONDS,
             "L2OutputOracle: cannot delete outputs that have already been finalized"
         );
 

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

@@ -48,11 +48,6 @@ contract OptimismPortal is Initializable, ResourceMetering, Semver {
      */
     uint256 internal constant FINALIZE_GAS_BUFFER = 20_000;
 
-    /**
-     * @notice Minimum time (in seconds) that must elapse before a withdrawal can be finalized.
-     */
-    uint256 public immutable FINALIZATION_PERIOD_SECONDS;
-
     /**
      * @notice Address of the L2OutputOracle.
      */
@@ -149,18 +144,15 @@ contract OptimismPortal is Initializable, ResourceMetering, Semver {
      *
      * @param _l2Oracle                  Address of the L2OutputOracle contract.
      * @param _guardian                  Address that can pause deposits and withdrawals.
-     * @param _finalizationPeriodSeconds Output finalization time in seconds.
      * @param _paused                    Sets the contract's pausability state.
      */
     constructor(
         L2OutputOracle _l2Oracle,
-        uint256 _finalizationPeriodSeconds,
         address _guardian,
         bool _paused
     ) Semver(1, 1, 0) {
         L2_ORACLE = _l2Oracle;
         GUARDIAN = _guardian;
-        FINALIZATION_PERIOD_SECONDS = _finalizationPeriodSeconds;
         initialize(_paused);
     }
 
@@ -480,6 +472,6 @@ contract OptimismPortal is Initializable, ResourceMetering, Semver {
      * @return Whether or not the finalization period has elapsed.
      */
     function _isFinalizationPeriodElapsed(uint256 _timestamp) internal view returns (bool) {
-        return block.timestamp > _timestamp + FINALIZATION_PERIOD_SECONDS;
+        return block.timestamp > _timestamp + L2_ORACLE.FINALIZATION_PERIOD_SECONDS();
     }
 }

packages/contracts-bedrock/contracts/echidna/FuzzOptimismPortal.sol

@@ -12,7 +12,6 @@ contract EchidnaFuzzOptimismPortal {
         portal = new OptimismPortal({
             _l2Oracle: L2OutputOracle(address(0)),
             _guardian: address(0),
-            _finalizationPeriodSeconds: 10,
             _paused: false
         });
     }

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

@@ -85,7 +85,7 @@ contract GasBenchMark_OptimismPortal is Portal_Initializer {
         // Warp beyond the finalization period for the block we've proposed.
         vm.warp(
             oracle.getL2Output(_proposedOutputIndex).timestamp +
-                op.FINALIZATION_PERIOD_SECONDS() +
+                oracle.FINALIZATION_PERIOD_SECONDS() +
                 1
         );
         // Fund the portal so that we can withdraw ETH.

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

@@ -134,7 +134,8 @@ contract L2OutputOracle_Initializer is CommonTest {
             startingBlockNumber,
             startingTimestamp,
             proposer,
-            owner
+            owner,
+            7 days // finalization period (seconds)
         );
         Proxy proxy = new Proxy(multisig);
         vm.prank(multisig);
@@ -170,7 +171,6 @@ contract Portal_Initializer is L2OutputOracle_Initializer {
         opImpl = new OptimismPortal({
             _l2Oracle: oracle,
             _guardian: guardian,
-            _finalizationPeriodSeconds: 7 days,
             _paused: true
         });
         Proxy proxy = new Proxy(multisig);
@@ -234,7 +234,6 @@ contract Messenger_Initializer is L2OutputOracle_Initializer {
         op = new OptimismPortal({
             _l2Oracle: oracle,
             _guardian: guardian,
-            _finalizationPeriodSeconds: 7 days,
             _paused: false
         });
         vm.label(address(op), "OptimismPortal");

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

@@ -29,7 +29,8 @@ contract L2OutputOracleTest is L2OutputOracle_Initializer {
             // startingTimestamp is in the future
             block.timestamp + 1,
             proposer,
-            owner
+            owner,
+            7 days // finalization period (seconds)
         );
     }
 
@@ -41,7 +42,8 @@ contract L2OutputOracleTest is L2OutputOracle_Initializer {
             startingBlockNumber,
             block.timestamp,
             proposer,
-            owner
+            owner,
+            7 days // finalization period (seconds)
         );
     }
 
@@ -63,7 +65,8 @@ contract L2OutputOracleTest is L2OutputOracle_Initializer {
             startingBlockNumber,
             block.timestamp,
             proposer,
-            owner
+            owner,
+            7 days // finalization period (seconds)
         );
     }
 

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

@@ -15,7 +15,6 @@ contract OptimismPortal_Test is Portal_Initializer {
     event Unpaused(address);
 
     function test_constructor_succeeds() external {
-        assertEq(op.FINALIZATION_PERIOD_SECONDS(), 7 days);
         assertEq(address(op.L2_ORACLE()), address(oracle));
         assertEq(op.l2Sender(), 0x000000000000000000000000000000000000dEaD);
         assertEq(op.paused(), false);
@@ -314,11 +313,11 @@ contract OptimismPortal_Test is Portal_Initializer {
         );
 
         // warp to the finalization period
-        vm.warp(ts + op.FINALIZATION_PERIOD_SECONDS());
+        vm.warp(ts + oracle.FINALIZATION_PERIOD_SECONDS());
         assertEq(op.isOutputFinalized(0), false);
 
         // warp past the finalization period
-        vm.warp(ts + op.FINALIZATION_PERIOD_SECONDS() + 1);
+        vm.warp(ts + oracle.FINALIZATION_PERIOD_SECONDS() + 1);
         assertEq(op.isOutputFinalized(0), true);
     }
 
@@ -331,7 +330,7 @@ contract OptimismPortal_Test is Portal_Initializer {
         oracle.proposeL2Output(keccak256(abi.encode(2)), checkpoint, 0, 0);
 
         // warp to the final second of the finalization period
-        uint256 finalizationHorizon = block.timestamp + op.FINALIZATION_PERIOD_SECONDS();
+        uint256 finalizationHorizon = block.timestamp + oracle.FINALIZATION_PERIOD_SECONDS();
         vm.warp(finalizationHorizon);
         // The checkpointed block should not be finalized until 1 second from now.
         assertEq(op.isOutputFinalized(nextOutputIndex), false);
@@ -398,7 +397,7 @@ contract OptimismPortal_FinalizeWithdrawal_Test is Portal_Initializer {
         // Warp beyond the finalization period for the block we've proposed.
         vm.warp(
             oracle.getL2Output(_proposedOutputIndex).timestamp +
-                op.FINALIZATION_PERIOD_SECONDS() +
+                oracle.FINALIZATION_PERIOD_SECONDS() +
                 1
         );
         // Fund the portal so that we can withdraw ETH.
@@ -620,7 +619,7 @@ contract OptimismPortal_FinalizeWithdrawal_Test is Portal_Initializer {
             _withdrawalProof
         );
 
-        vm.warp(block.timestamp + op.FINALIZATION_PERIOD_SECONDS() + 1);
+        vm.warp(block.timestamp + oracle.FINALIZATION_PERIOD_SECONDS() + 1);
         vm.expectEmit(true, true, false, true);
         emit WithdrawalFinalized(_withdrawalHash, true);
         op.finalizeWithdrawalTransaction(_defaultTx);
@@ -692,7 +691,7 @@ contract OptimismPortal_FinalizeWithdrawal_Test is Portal_Initializer {
         );
 
         // Warp to after the finalization period
-        vm.warp(block.timestamp + op.FINALIZATION_PERIOD_SECONDS() + 1);
+        vm.warp(block.timestamp + oracle.FINALIZATION_PERIOD_SECONDS() + 1);
 
         // Mock a startingTimestamp change on the L2 Oracle
         vm.mockCall(
@@ -727,7 +726,7 @@ contract OptimismPortal_FinalizeWithdrawal_Test is Portal_Initializer {
         );
 
         // Warp to after the finalization period
-        vm.warp(block.timestamp + op.FINALIZATION_PERIOD_SECONDS() + 1);
+        vm.warp(block.timestamp + oracle.FINALIZATION_PERIOD_SECONDS() + 1);
 
         // Mock an outputRoot change on the output proposal before attempting
         // to finalize the withdrawal.
@@ -769,7 +768,7 @@ contract OptimismPortal_FinalizeWithdrawal_Test is Portal_Initializer {
         );
 
         // Warp to after the finalization period
-        vm.warp(block.timestamp + op.FINALIZATION_PERIOD_SECONDS() + 1);
+        vm.warp(block.timestamp + oracle.FINALIZATION_PERIOD_SECONDS() + 1);
 
         // Mock a timestamp change on the output proposal that has not passed the
         // finalization period.
@@ -808,7 +807,7 @@ contract OptimismPortal_FinalizeWithdrawal_Test is Portal_Initializer {
             _withdrawalProof
         );
 
-        vm.warp(block.timestamp + op.FINALIZATION_PERIOD_SECONDS() + 1);
+        vm.warp(block.timestamp + oracle.FINALIZATION_PERIOD_SECONDS() + 1);
         vm.expectEmit(true, true, true, true);
         emit WithdrawalFinalized(_withdrawalHash, false);
         op.finalizeWithdrawalTransaction(_defaultTx);
@@ -854,7 +853,7 @@ contract OptimismPortal_FinalizeWithdrawal_Test is Portal_Initializer {
             _withdrawalProof
         );
 
-        vm.warp(block.timestamp + op.FINALIZATION_PERIOD_SECONDS() + 1);
+        vm.warp(block.timestamp + oracle.FINALIZATION_PERIOD_SECONDS() + 1);
         vm.expectEmit(true, true, true, true);
         emit WithdrawalFinalized(_withdrawalHash, true);
         op.finalizeWithdrawalTransaction(_defaultTx);
@@ -905,7 +904,7 @@ contract OptimismPortal_FinalizeWithdrawal_Test is Portal_Initializer {
             withdrawalProof
         );
 
-        vm.warp(block.timestamp + op.FINALIZATION_PERIOD_SECONDS() + 1);
+        vm.warp(block.timestamp + oracle.FINALIZATION_PERIOD_SECONDS() + 1);
         vm.expectRevert("OptimismPortal: insufficient gas to finalize withdrawal");
         op.finalizeWithdrawalTransaction{ gas: gasLimit }(insufficientGasTx);
     }
@@ -937,7 +936,7 @@ contract OptimismPortal_FinalizeWithdrawal_Test is Portal_Initializer {
         });
 
         // Setup the Oracle to return the outputRoot we want as well as a finalized timestamp.
-        uint256 finalizedTimestamp = block.timestamp - op.FINALIZATION_PERIOD_SECONDS() - 1;
+        uint256 finalizedTimestamp = block.timestamp - oracle.FINALIZATION_PERIOD_SECONDS() - 1;
         vm.mockCall(
             address(op.L2_ORACLE()),
             abi.encodeWithSelector(L2OutputOracle.getL2Output.selector),
@@ -959,7 +958,7 @@ contract OptimismPortal_FinalizeWithdrawal_Test is Portal_Initializer {
             withdrawalProof
         );
 
-        vm.warp(block.timestamp + op.FINALIZATION_PERIOD_SECONDS() + 1);
+        vm.warp(block.timestamp + oracle.FINALIZATION_PERIOD_SECONDS() + 1);
         vm.expectCall(address(this), _testTx.data);
         vm.expectEmit(true, true, true, true);
         emit WithdrawalFinalized(withdrawalHash, true);
@@ -1025,7 +1024,7 @@ contract OptimismPortal_FinalizeWithdrawal_Test is Portal_Initializer {
         // Ensure that the sentMessages is correct
         assertEq(messagePasser.sentMessages(withdrawalHash), true);
 
-        vm.warp(block.timestamp + op.FINALIZATION_PERIOD_SECONDS() + 1);
+        vm.warp(block.timestamp + oracle.FINALIZATION_PERIOD_SECONDS() + 1);
         op.proveWithdrawalTransaction(
             _tx,
             100, // l2BlockNumber

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

@@ -49,7 +49,7 @@ contract OptimismPortal_Invariant_Harness is Portal_Initializer {
         // Warp beyond the finalization period for the block we've proposed.
         vm.warp(
             oracle.getL2Output(_proposedOutputIndex).timestamp +
-                op.FINALIZATION_PERIOD_SECONDS() +
+                oracle.FINALIZATION_PERIOD_SECONDS() +
                 1
         );
         // Fund the portal so that we can withdraw ETH.
@@ -101,7 +101,7 @@ contract OptimismPortal_CannotFinalizeTwice is OptimismPortal_Invariant_Harness
         );
 
         // Warp past the finalization period.
-        vm.warp(block.timestamp + op.FINALIZATION_PERIOD_SECONDS() + 1);
+        vm.warp(block.timestamp + oracle.FINALIZATION_PERIOD_SECONDS() + 1);
 
         // Finalize the withdrawal transaction.
         op.finalizeWithdrawalTransaction(_defaultTx);
@@ -138,7 +138,7 @@ contract OptimismPortal_CanAlwaysFinalizeAfterWindow is OptimismPortal_Invariant
         );
 
         // Warp past the finalization period.
-        vm.warp(block.timestamp + op.FINALIZATION_PERIOD_SECONDS() + 1);
+        vm.warp(block.timestamp + oracle.FINALIZATION_PERIOD_SECONDS() + 1);
 
         // Set the target contract to the portal proxy
         targetContract(address(op));