Merge branch 'develop' into aj/test-discovery-fix

.changeset/orange-seas-tie.md

+---
+'@eth-optimism/sdk': major
+'@eth-optimism/contracts-bedrock': minor
+---
+
+Moves `FINALIZATION_PERIOD_SECONDS` from the `OptimismPortal` to the `L2OutputOracle` & ensures the `CHALLENGER` key cannot delete finalized outputs.

.changeset/tall-insects-buy.md

+---
+'@eth-optimism/chain-mon': minor
+---
+
+Added a withdrawal monitoring service

.github/workflows/publish-canary.yml

@@ -19,6 +19,7 @@ jobs:
       message-relayer: ${{ steps.packages.outputs.message-relayer }}
       fault-detector: ${{ steps.packages.outputs.fault-detector }}
       drippie-mon: ${{ steps.packages.outputs.drippie-mon }}
+      wd-mon: ${{ steps.packages.outputs.wd-mon }}
       data-transport-layer: ${{ steps.packages.outputs.data-transport-layer }}
       contracts: ${{ steps.packages.outputs.contracts }}
       contracts-bedrock: ${{ steps.packages.outputs.contracts-bedrock }}
@@ -256,6 +257,33 @@ jobs:
           push: true
           tags: ethereumoptimism/drippie-mon:${{ needs.canary-publish.outputs.canary-docker-tag }}
 
+  wd-mon:
+    name: Publish Withdrawal Monitor Version ${{ needs.canary-publish.outputs.canary-docker-tag }}
+    needs: canary-publish
+    if: needs.canary-publish.outputs.wd-mon != ''
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v1
+
+      - name: Login to Docker Hub
+        uses: docker/login-action@v1
+        with:
+          username: ${{ secrets.DOCKERHUB_ACCESS_TOKEN_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_ACCESS_TOKEN_SECRET }}
+
+      - name: Build and push
+        uses: docker/build-push-action@v2
+        with:
+          context: .
+          file: ./ops/docker/Dockerfile.packages
+          target: wd-mon
+          push: true
+          tags: ethereumoptimism/wd-mon:${{ needs.canary-publish.outputs.canary-docker-tag }}
+
   data-transport-layer:
     name: Publish Data Transport Layer Version ${{ needs.canary-publish.outputs.canary-docker-tag }}
     needs: canary-publish

.github/workflows/release.yml

@@ -15,6 +15,7 @@ jobs:
       message-relayer: ${{ steps.packages.outputs.message-relayer }}
       fault-detector: ${{ steps.packages.outputs.fault-detector }}
       drippie-mon: ${{ steps.packages.outputs.drippie-mon }}
+      wd-mon: ${{ steps.packages.outputs.wd-mon }}
       data-transport-layer: ${{ steps.packages.outputs.data-transport-layer }}
       contracts: ${{ steps.packages.outputs.contracts }}
       contracts-bedrock: ${{ steps.packages.outputs.contracts-bedrock }}
@@ -336,6 +337,33 @@ jobs:
           push: true
           tags: ethereumoptimism/fault-detector:${{ needs.release.outputs.fault-detector }},ethereumoptimism/fault-detector:latest
 
+  wd-mon:
+    name: Publish Withdrawal Monitor Version ${{ needs.release.outputs.wd-mon }}
+    needs: release
+    if: needs.release.outputs.wd-mon != ''
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v1
+
+      - name: Login to Docker Hub
+        uses: docker/login-action@v1
+        with:
+          username: ${{ secrets.DOCKERHUB_ACCESS_TOKEN_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_ACCESS_TOKEN_SECRET }}
+
+      - name: Build and push
+        uses: docker/build-push-action@v2
+        with:
+          context: .
+          file: ./ops/docker/Dockerfile.packages
+          target: wd-mon
+          push: true
+          tags: ethereumoptimism/wd-mon:${{ needs.release.outputs.wd-mon }},ethereumoptimism/wd-mon:latest
+
   drippie-mon:
     name: Publish Drippie Monitor Version ${{ needs.release.outputs.drippie-mon }}
     needs: release

CONTRIBUTING.md

@@ -70,22 +70,27 @@ You'll need the following:
 
 ### Setup
 
-Clone the repository, open it, and install nodejs packages with `yarn`:
+Clone the repository and open it:
 
 ```bash
 git clone git@github.com:ethereum-optimism/optimism.git
 cd optimism
-yarn install
 ```
 
 ### Install the Correct Version of NodeJS
 
-Using `nvm`, install the correct version of NodeJS.
+Install node v16.16.0 with [nvm](https://github.com/nvm-sh/nvm)
 
-```
+```bash
 nvm use
 ```
 
+### Install node modules with Yarn
+
+```bash
+yarn install
+```
+
 ### Building the TypeScript packages
 
 [foundry](https://github.com/foundry-rs/foundry) is used for some smart contract

op-chain-ops/cmd/withdrawals/main.go

@@ -140,7 +140,7 @@ func main() {
 				return err
 			}
 
-			period, err := contracts.OptimismPortal.FINALIZATIONPERIODSECONDS(&bind.CallOpts{})
+			period, err := contracts.L2OutputOracle.FINALIZATIONPERIODSECONDS(&bind.CallOpts{})
 			if err != nil {
 				return err
 			}

op-chain-ops/genesis/layer_one.go

@@ -285,6 +285,7 @@ func deployL1Contracts(config *DeployConfig, backend *backends.SimulatedBackend)
 				uint642Big(uint64(config.L1GenesisBlockTimestamp)),
 				config.L2OutputOracleProposer,
 				config.L2OutputOracleChallenger,
+				uint642Big(config.FinalizationPeriodSeconds),
 			},
 		},
 		{
@@ -295,7 +296,6 @@ func deployL1Contracts(config *DeployConfig, backend *backends.SimulatedBackend)
 			Args: []interface{}{
 				predeploys.DevL2OutputOracleAddr,
 				config.FinalSystemOwner,
-				uint642Big(config.FinalizationPeriodSeconds),
 				true, // _paused
 			},
 		},
@@ -353,15 +353,15 @@ func l1Deployer(backend *backends.SimulatedBackend, opts *bind.TransactOpts, dep
 			deployment.Args[3].(*big.Int),
 			deployment.Args[4].(common.Address),
 			deployment.Args[5].(common.Address),
+			deployment.Args[6].(*big.Int),
 		)
 	case "OptimismPortal":
 		_, tx, _, err = bindings.DeployOptimismPortal(
 			opts,
 			backend,
 			deployment.Args[0].(common.Address),
-			deployment.Args[2].(*big.Int),
 			deployment.Args[1].(common.Address),
-			deployment.Args[3].(bool),
+			deployment.Args[2].(bool),
 		)
 	case "L1CrossDomainMessenger":
 		_, tx, _, err = bindings.DeployL1CrossDomainMessenger(

op-e2e/actions/user.go

@@ -445,7 +445,7 @@ func (s *CrossLayerUser) ActCompleteWithdrawal(t Testing) {
 // CompleteWithdrawal creates a L1 withdrawal finalization tx for the given L2 withdrawal tx, returning the tx hash.
 // It's an invalid action to attempt to complete a withdrawal that has not passed the L1 finalization period yet
 func (s *CrossLayerUser) CompleteWithdrawal(t Testing, l2TxHash common.Hash) common.Hash {
-	finalizationPeriod, err := s.L1.env.Bindings.OptimismPortal.FINALIZATIONPERIODSECONDS(&bind.CallOpts{})
+	finalizationPeriod, err := s.L1.env.Bindings.L2OutputOracle.FINALIZATIONPERIODSECONDS(&bind.CallOpts{})
 	require.NoError(t, err)
 
 	// Figure out when our withdrawal was included

op-node/withdrawals/utils.go

@@ -54,7 +54,7 @@ func WaitForFinalizationPeriod(ctx context.Context, client *ethclient.Client, po
 	}
 	l2BlockNumber = l2BlockNumber.Mul(l2BlockNumber, submissionInterval)
 
-	finalizationPeriod, err := portal.FINALIZATIONPERIODSECONDS(opts)
+	finalizationPeriod, err := l2OO.FINALIZATIONPERIODSECONDS(opts)
 	if err != nil {
 		return 0, err
 	}

ops/docker/Dockerfile.packages

@@ -125,6 +125,6 @@ FROM base as balance-monitor
 WORKDIR /opt/optimism/packages/balance-monitor
 ENTRYPOINT ["yarn", "run", "start:prod"]
 
-FROM base as two-step-monitor
-WORKDIR /opt/optimism/packages/two-step-monitor
-ENTRYPOINT ["yarn", "run", "start"]
+FROM base as wd-mon
+WORKDIR /opt/optimism/packages/chain-mon
+ENTRYPOINT ["yarn", "run", "start:wd-mon"]

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.
      */
@@ -73,7 +78,7 @@ contract L2OutputOracle is Initializable, Semver {
     event OutputsDeleted(uint256 indexed prevNextOutputIndex, uint256 indexed newNextOutputIndex);
 
     /**
-     * @custom:semver 1.1.0
+     * @custom:semver 1.2.0
      *
      * @param _submissionInterval  Interval in blocks at which checkpoints must be submitted.
      * @param _l2BlockTime         The time per L2 block, in seconds.
@@ -88,8 +93,9 @@ contract L2OutputOracle is Initializable, Semver {
         uint256 _startingBlockNumber,
         uint256 _startingTimestamp,
         address _proposer,
-        address _challenger
-    ) Semver(1, 1, 0) {
+        address _challenger,
+        uint256 _finalizationPeriodSeconds
+    ) Semver(1, 2, 0) {
         require(_l2BlockTime > 0, "L2OutputOracle: L2 block time must be greater than 0");
         require(
             _submissionInterval > _l2BlockTime,
@@ -100,6 +106,7 @@ contract L2OutputOracle is Initializable, Semver {
         L2_BLOCK_TIME = _l2BlockTime;
         PROPOSER = _proposer;
         CHALLENGER = _challenger;
+        FINALIZATION_PERIOD_SECONDS = _finalizationPeriodSeconds;
 
         initialize(_startingBlockNumber, _startingTimestamp);
     }
@@ -143,6 +150,12 @@ contract L2OutputOracle is Initializable, Semver {
             "L2OutputOracle: cannot delete outputs after the latest output index"
         );
 
+        // Do not allow deleting any outputs that have already been finalized.
+        require(
+            block.timestamp - l2Outputs[_l2OutputIndex].timestamp < FINALIZATION_PERIOD_SECONDS,
+            "L2OutputOracle: cannot delete outputs that have already been finalized"
+        );
+
         uint256 prevNextL2OutputIndex = nextOutputIndex();
 
         // Use assembly to delete the array elements because Solidity doesn't allow it.

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.
      */
@@ -145,22 +140,19 @@ contract OptimismPortal is Initializable, ResourceMetering, Semver {
     }
 
     /**
-     * @custom:semver 1.1.0
+     * @custom:semver 1.2.0
      *
      * @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) {
+    ) Semver(1, 2, 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

@@ -128,14 +128,15 @@ contract L2OutputOracle_Initializer is CommonTest {
         vm.warp(initL1Time);
         vm.roll(startingBlockNumber);
         // Deploy the L2OutputOracle and transfer owernship to the proposer
-        oracleImpl = new L2OutputOracle(
-            submissionInterval,
-            l2BlockTime,
-            startingBlockNumber,
-            startingTimestamp,
-            proposer,
-            owner
-        );
+        oracleImpl = new L2OutputOracle({
+            _submissionInterval: submissionInterval,
+            _l2BlockTime: l2BlockTime,
+            _startingBlockNumber: startingBlockNumber,
+            _startingTimestamp: startingTimestamp,
+            _proposer: proposer,
+            _challenger: owner,
+            _finalizationPeriodSeconds: 7 days
+        });
         Proxy proxy = new Proxy(multisig);
         vm.prank(multisig);
         proxy.upgradeToAndCall(
@@ -167,12 +168,7 @@ contract Portal_Initializer is L2OutputOracle_Initializer {
     function setUp() public virtual override {
         super.setUp();
 
-        opImpl = new OptimismPortal({
-            _l2Oracle: oracle,
-            _guardian: guardian,
-            _finalizationPeriodSeconds: 7 days,
-            _paused: true
-        });
+        opImpl = new OptimismPortal({ _l2Oracle: oracle, _guardian: guardian, _paused: true });
         Proxy proxy = new Proxy(multisig);
         vm.prank(multisig);
         proxy.upgradeToAndCall(
@@ -231,12 +227,7 @@ contract Messenger_Initializer is L2OutputOracle_Initializer {
         super.setUp();
 
         // Deploy the OptimismPortal
-        op = new OptimismPortal({
-            _l2Oracle: oracle,
-            _guardian: guardian,
-            _finalizationPeriodSeconds: 7 days,
-            _paused: false
-        });
+        op = new OptimismPortal({ _l2Oracle: oracle, _guardian: guardian, _paused: false });
         vm.label(address(op), "OptimismPortal");
 
         // Deploy the address manager

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

@@ -22,27 +22,29 @@ contract L2OutputOracleTest is L2OutputOracle_Initializer {
     function test_constructor_badTimestamp_reverts() external {
         vm.expectRevert("L2OutputOracle: starting L2 timestamp must be less than current time");
 
-        new L2OutputOracle(
-            submissionInterval,
-            l2BlockTime,
-            startingBlockNumber,
-            // startingTimestamp is in the future
-            block.timestamp + 1,
-            proposer,
-            owner
-        );
+        // startingTimestamp is in the future
+        new L2OutputOracle({
+            _submissionInterval: submissionInterval,
+            _l2BlockTime: l2BlockTime,
+            _startingBlockNumber: startingBlockNumber,
+            _startingTimestamp: block.timestamp + 1,
+            _proposer: proposer,
+            _challenger: owner,
+            _finalizationPeriodSeconds: 7 days
+        });
     }
 
     function test_constructor_l2BlockTimeZero_reverts() external {
         vm.expectRevert("L2OutputOracle: L2 block time must be greater than 0");
-        new L2OutputOracle(
-            submissionInterval,
-            0,
-            startingBlockNumber,
-            block.timestamp,
-            proposer,
-            owner
-        );
+        new L2OutputOracle({
+            _submissionInterval: submissionInterval,
+            _l2BlockTime: 0,
+            _startingBlockNumber: startingBlockNumber,
+            _startingTimestamp: block.timestamp,
+            _proposer: proposer,
+            _challenger: owner,
+            _finalizationPeriodSeconds: 7 days
+        });
     }
 
     function testFuzz_constructor_submissionIntervalLteL2BlockTime_reverts(
@@ -57,14 +59,15 @@ contract L2OutputOracleTest is L2OutputOracle_Initializer {
         _submissionInterval = bound(_submissionInterval, 0, _l2BlockTime);
 
         vm.expectRevert("L2OutputOracle: submission interval must be greater than L2 block time");
-        new L2OutputOracle(
-            _submissionInterval,
-            _l2BlockTime,
-            startingBlockNumber,
-            block.timestamp,
-            proposer,
-            owner
-        );
+        new L2OutputOracle({
+            _submissionInterval: _submissionInterval,
+            _l2BlockTime: _l2BlockTime,
+            _startingBlockNumber: startingBlockNumber,
+            _startingTimestamp: block.timestamp,
+            _proposer: proposer,
+            _challenger: owner,
+            _finalizationPeriodSeconds: 7 days
+        });
     }
 
     /****************
@@ -411,6 +414,20 @@ contract L2OutputOracleTest is L2OutputOracle_Initializer {
         vm.expectRevert("L2OutputOracle: cannot delete outputs after the latest output index");
         oracle.deleteL2Outputs(latestOutputIndex - 2);
     }
+
+    function test_deleteL2Outputs_finalized_reverts() external {
+        test_proposeL2Output_proposeAnotherOutput_succeeds();
+
+        // Warp past the finalization period + 1 second
+        vm.warp(block.timestamp + oracle.FINALIZATION_PERIOD_SECONDS() + 1);
+
+        uint256 latestOutputIndex = oracle.latestOutputIndex();
+
+        // Try to delete a finalized output
+        vm.prank(owner);
+        vm.expectRevert("L2OutputOracle: cannot delete outputs that have already been finalized");
+        oracle.deleteL2Outputs(latestOutputIndex);
+    }
 }
 
 contract L2OutputOracleUpgradeable_Test is L2OutputOracle_Initializer {

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));

packages/contracts-bedrock/deploy/012-L2OutputOracleImpl.ts

@@ -28,6 +28,7 @@ const deployFn: DeployFunction = async (hre) => {
       0,
       hre.deployConfig.l2OutputOracleProposer,
       hre.deployConfig.l2OutputOracleChallenger,
+      hre.deployConfig.finalizationPeriodSeconds,
     ],
     postDeployAction: async (contract) => {
       await assertContractVariable(
@@ -50,6 +51,11 @@ const deployFn: DeployFunction = async (hre) => {
         'CHALLENGER',
         hre.deployConfig.l2OutputOracleChallenger
       )
+      await assertContractVariable(
+        contract,
+        'FINALIZATION_PERIOD_SECONDS',
+        hre.deployConfig.finalizationPeriodSeconds
+      )
     },
   })
 }

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

@@ -41,7 +41,6 @@ const deployFn: DeployFunction = async (hre) => {
     name: 'OptimismPortal',
     args: [
       L2OutputOracleProxy.address,
-      hre.deployConfig.finalizationPeriodSeconds,
       finalSystemOwner,
       true, // paused
     ],
@@ -51,11 +50,6 @@ const deployFn: DeployFunction = async (hre) => {
         'L2_ORACLE',
         L2OutputOracleProxy.address
       )
-      await assertContractVariable(
-        contract,
-        'FINALIZATION_PERIOD_SECONDS',
-        hre.deployConfig.finalizationPeriodSeconds
-      )
       await assertContractVariable(
         contract,
         'GUARDIAN',

packages/contracts-bedrock/invariant-docs/OptimismPortal.md

@@ -19,6 +19,6 @@ This invariant asserts that there is no chain of calls that can be made that wil
 
 
 ## Deposits of any value should always succeed unless `_to` = `address(0)` or `_isCreation` = `true`.
-**Test:** [`FuzzOptimismPortal.sol#L42`](../contracts/echidna/FuzzOptimismPortal.sol#L42)
+**Test:** [`FuzzOptimismPortal.sol#L41`](../contracts/echidna/FuzzOptimismPortal.sol#L41)
 
 All deposits, barring creation transactions and transactions sent to `address(0)`, should always succeed. 

packages/sdk/src/cross-chain-messenger.ts

@@ -1005,7 +1005,7 @@ export class CrossChainMessenger {
    */
   public async getChallengePeriodSeconds(): Promise<number> {
     const challengePeriod = this.bedrock
-      ? await this.contracts.l1.OptimismPortal.FINALIZATION_PERIOD_SECONDS()
+      ? await this.contracts.l1.L2OutputOracle.FINALIZATION_PERIOD_SECONDS()
       : await this.contracts.l1.StateCommitmentChain.FRAUD_PROOF_WINDOW()
     return challengePeriod.toNumber()
   }