Remove L2OutputOracle and legacy OptimismPortal (#13489)

* attempt...

* fixes

* fix checks

* fix kontrol build

* update DeploymentSummaryFaultProofs kontrol hash

* fixes

* undo unnecessary change

* feat: Reduce diff and usage of OptimismPortal2

* semver

* fix: init test

---------
Co-authored-by: Maurelian <maurelian@protonmail.ch>

packages/contracts-bedrock/interfaces/L1/IL1CrossDomainMessenger.sol

@@ -3,7 +3,7 @@ pragma solidity ^0.8.0;
 
 import { ICrossDomainMessenger } from "interfaces/universal/ICrossDomainMessenger.sol";
 import { ISuperchainConfig } from "interfaces/L1/ISuperchainConfig.sol";
-import { IOptimismPortal } from "interfaces/L1/IOptimismPortal.sol";
+import { IOptimismPortal2 as IOptimismPortal } from "interfaces/L1/IOptimismPortal2.sol";
 import { ISystemConfig } from "interfaces/L1/ISystemConfig.sol";
 
 interface IL1CrossDomainMessenger is ICrossDomainMessenger {

packages/contracts-bedrock/interfaces/L1/IL2OutputOracle.sol

-// SPDX-License-Identifier: MIT
-pragma solidity ^0.8.0;
-
-import { Types } from "src/libraries/Types.sol";
-
-interface IL2OutputOracle {
-    event Initialized(uint8 version);
-    event OutputProposed(
-        bytes32 indexed outputRoot, uint256 indexed l2OutputIndex, uint256 indexed l2BlockNumber, uint256 l1Timestamp
-    );
-    event OutputsDeleted(uint256 indexed prevNextOutputIndex, uint256 indexed newNextOutputIndex);
-
-    function CHALLENGER() external view returns (address);
-    function FINALIZATION_PERIOD_SECONDS() external view returns (uint256);
-    function L2_BLOCK_TIME() external view returns (uint256);
-    function PROPOSER() external view returns (address);
-    function SUBMISSION_INTERVAL() external view returns (uint256);
-    function challenger() external view returns (address);
-    function computeL2Timestamp(uint256 _l2BlockNumber) external view returns (uint256);
-    function deleteL2Outputs(uint256 _l2OutputIndex) external;
-    function finalizationPeriodSeconds() external view returns (uint256);
-    function getL2Output(uint256 _l2OutputIndex) external view returns (Types.OutputProposal memory);
-    function getL2OutputAfter(uint256 _l2BlockNumber) external view returns (Types.OutputProposal memory);
-    function getL2OutputIndexAfter(uint256 _l2BlockNumber) external view returns (uint256);
-    function initialize(
-        uint256 _submissionInterval,
-        uint256 _l2BlockTime,
-        uint256 _startingBlockNumber,
-        uint256 _startingTimestamp,
-        address _proposer,
-        address _challenger,
-        uint256 _finalizationPeriodSeconds
-    )
-        external;
-    function l2BlockTime() external view returns (uint256);
-    function latestBlockNumber() external view returns (uint256);
-    function latestOutputIndex() external view returns (uint256);
-    function nextBlockNumber() external view returns (uint256);
-    function nextOutputIndex() external view returns (uint256);
-    function proposeL2Output(
-        bytes32 _outputRoot,
-        uint256 _l2BlockNumber,
-        bytes32 _l1BlockHash,
-        uint256 _l1BlockNumber
-    )
-        external
-        payable;
-    function proposer() external view returns (address);
-    function startingBlockNumber() external view returns (uint256);
-    function startingTimestamp() external view returns (uint256);
-    function submissionInterval() external view returns (uint256);
-    function version() external view returns (string memory);
-
-    function __constructor__() external;
-}

packages/contracts-bedrock/interfaces/L1/IOptimismPortal.sol

-// SPDX-License-Identifier: MIT
-pragma solidity ^0.8.0;
-
-import { Types } from "src/libraries/Types.sol";
-import { ISystemConfig } from "interfaces/L1/ISystemConfig.sol";
-import { ISuperchainConfig } from "interfaces/L1/ISuperchainConfig.sol";
-import { IL2OutputOracle } from "interfaces/L1/IL2OutputOracle.sol";
-
-interface IOptimismPortal {
-    error BadTarget();
-    error CallPaused();
-    error ContentLengthMismatch();
-    error EmptyItem();
-    error GasEstimation();
-    error InvalidDataRemainder();
-    error InvalidHeader();
-    error LargeCalldata();
-    error NoValue();
-    error NonReentrant();
-    error OnlyCustomGasToken();
-    error OutOfGas();
-    error SmallGasLimit();
-    error TransferFailed();
-    error Unauthorized();
-    error UnexpectedList();
-    error UnexpectedString();
-
-    event Initialized(uint8 version);
-    event TransactionDeposited(address indexed from, address indexed to, uint256 indexed version, bytes opaqueData);
-    event WithdrawalFinalized(bytes32 indexed withdrawalHash, bool success);
-    event WithdrawalProven(bytes32 indexed withdrawalHash, address indexed from, address indexed to);
-
-    receive() external payable;
-
-    function balance() external view returns (uint256);
-    function depositERC20Transaction(
-        address _to,
-        uint256 _mint,
-        uint256 _value,
-        uint64 _gasLimit,
-        bool _isCreation,
-        bytes memory _data
-    )
-        external;
-    function depositTransaction(
-        address _to,
-        uint256 _value,
-        uint64 _gasLimit,
-        bool _isCreation,
-        bytes memory _data
-    )
-        external
-        payable;
-    function donateETH() external payable;
-    function finalizeWithdrawalTransaction(Types.WithdrawalTransaction memory _tx) external;
-    function finalizedWithdrawals(bytes32) external view returns (bool);
-    function guardian() external view returns (address);
-    function initialize(
-        IL2OutputOracle _l2Oracle,
-        ISystemConfig _systemConfig,
-        ISuperchainConfig _superchainConfig
-    )
-        external;
-    function isOutputFinalized(uint256 _l2OutputIndex) external view returns (bool);
-    function l2Oracle() external view returns (IL2OutputOracle);
-    function l2Sender() external view returns (address);
-    function minimumGasLimit(uint64 _byteCount) external pure returns (uint64);
-    function params() external view returns (uint128 prevBaseFee, uint64 prevBoughtGas, uint64 prevBlockNum); // nosemgrep
-    function paused() external view returns (bool paused_);
-    function proveWithdrawalTransaction(
-        Types.WithdrawalTransaction memory _tx,
-        uint256 _l2OutputIndex,
-        Types.OutputRootProof memory _outputRootProof,
-        bytes[] memory _withdrawalProof
-    )
-        external;
-    function provenWithdrawals(bytes32)
-        external
-        view
-        returns (bytes32 outputRoot, uint128 timestamp, uint128 l2OutputIndex); // nosemgrep
-    function setGasPayingToken(address _token, uint8 _decimals, bytes32 _name, bytes32 _symbol) external;
-    function superchainConfig() external view returns (ISuperchainConfig);
-    function systemConfig() external view returns (ISystemConfig);
-    function version() external pure returns (string memory);
-
-    function __constructor__() external;
-}

packages/contracts-bedrock/scripts/deploy/ChainAssertions.sol

@@ -23,10 +23,8 @@ import { OPContractsManager } from "src/L1/OPContractsManager.sol";
 // Interfaces
 import { IResourceMetering } from "interfaces/L1/IResourceMetering.sol";
 import { ISystemConfig } from "interfaces/L1/ISystemConfig.sol";
-import { IL2OutputOracle } from "interfaces/L1/IL2OutputOracle.sol";
 import { ISuperchainConfig } from "interfaces/L1/ISuperchainConfig.sol";
 import { IL1CrossDomainMessenger } from "interfaces/L1/IL1CrossDomainMessenger.sol";
-import { IOptimismPortal } from "interfaces/L1/IOptimismPortal.sol";
 import { IOptimismPortal2 } from "interfaces/L1/IOptimismPortal2.sol";
 import { IL1ERC721Bridge } from "interfaces/L1/IL1ERC721Bridge.sol";
 import { IL1StandardBridge } from "interfaces/L1/IL1StandardBridge.sol";
@@ -42,15 +40,7 @@ library ChainAssertions {
 
     /// @notice Asserts the correctness of an L1 deployment. This function expects that all contracts
     ///         within the `prox` ContractSet are proxies that have been setup and initialized.
-    function postDeployAssertions(
-        Types.ContractSet memory _prox,
-        DeployConfig _cfg,
-        uint256 _l2OutputOracleStartingTimestamp,
-        Vm _vm
-    )
-        internal
-        view
-    {
+    function postDeployAssertions(Types.ContractSet memory _prox, DeployConfig _cfg, Vm _vm) internal view {
         console.log("Running post-deploy assertions");
         IResourceMetering.ResourceConfig memory rcfg = ISystemConfig(_prox.SystemConfig).resourceConfig();
         IResourceMetering.ResourceConfig memory dflt = Constants.DEFAULT_RESOURCE_CONFIG();
@@ -59,15 +49,8 @@ library ChainAssertions {
         checkSystemConfig({ _contracts: _prox, _cfg: _cfg, _isProxy: true });
         checkL1CrossDomainMessenger({ _contracts: _prox, _vm: _vm, _isProxy: true });
         checkL1StandardBridge({ _contracts: _prox, _isProxy: true });
-        checkL2OutputOracle({
-            _contracts: _prox,
-            _cfg: _cfg,
-            _l2OutputOracleStartingTimestamp: _l2OutputOracleStartingTimestamp,
-            _isProxy: true
-        });
         checkOptimismMintableERC20Factory({ _contracts: _prox, _isProxy: true });
         checkL1ERC721Bridge({ _contracts: _prox, _isProxy: true });
-        checkOptimismPortal({ _contracts: _prox, _cfg: _cfg, _isProxy: true });
         checkOptimismPortal2({ _contracts: _prox, _cfg: _cfg, _isProxy: true });
         checkProtocolVersions({ _contracts: _prox, _cfg: _cfg, _isProxy: true });
     }
@@ -326,56 +309,6 @@ library ChainAssertions {
         }
     }
 
-    /// @notice Asserts that the L2OutputOracle is setup correctly
-    function checkL2OutputOracle(
-        Types.ContractSet memory _contracts,
-        DeployConfig _cfg,
-        uint256 _l2OutputOracleStartingTimestamp,
-        bool _isProxy
-    )
-        internal
-        view
-    {
-        IL2OutputOracle oracle = IL2OutputOracle(_contracts.L2OutputOracle);
-        console.log(
-            "Running chain assertions on the L2OutputOracle %s at %s",
-            _isProxy ? "proxy" : "implementation",
-            address(oracle)
-        );
-        require(address(oracle) != address(0), "CHECK-L2OO-10");
-
-        // Check that the contract is initialized
-        DeployUtils.assertInitialized({ _contractAddress: address(oracle), _isProxy: _isProxy, _slot: 0, _offset: 0 });
-
-        if (_isProxy) {
-            require(oracle.SUBMISSION_INTERVAL() == _cfg.l2OutputOracleSubmissionInterval(), "CHECK-L2OO-20");
-            require(oracle.submissionInterval() == _cfg.l2OutputOracleSubmissionInterval(), "CHECK-L2OO-30");
-            require(oracle.L2_BLOCK_TIME() == _cfg.l2BlockTime(), "CHECK-L2OO-40");
-            require(oracle.l2BlockTime() == _cfg.l2BlockTime(), "CHECK-L2OO-50");
-            require(oracle.PROPOSER() == _cfg.l2OutputOracleProposer(), "CHECK-L2OO-60");
-            require(oracle.proposer() == _cfg.l2OutputOracleProposer(), "CHECK-L2OO-70");
-            require(oracle.CHALLENGER() == _cfg.l2OutputOracleChallenger(), "CHECK-L2OO-80");
-            require(oracle.challenger() == _cfg.l2OutputOracleChallenger(), "CHECK-L2OO-90");
-            require(oracle.FINALIZATION_PERIOD_SECONDS() == _cfg.finalizationPeriodSeconds(), "CHECK-L2OO-100");
-            require(oracle.finalizationPeriodSeconds() == _cfg.finalizationPeriodSeconds(), "CHECK-L2OO-110");
-            require(oracle.startingBlockNumber() == _cfg.l2OutputOracleStartingBlockNumber(), "CHECK-L2OO-120");
-            require(oracle.startingTimestamp() == _l2OutputOracleStartingTimestamp, "CHECK-L2OO-130");
-        } else {
-            require(oracle.SUBMISSION_INTERVAL() == 0, "CHECK-L2OO-140");
-            require(oracle.submissionInterval() == 0, "CHECK-L2OO-150");
-            require(oracle.L2_BLOCK_TIME() == 0, "CHECK-L2OO-160");
-            require(oracle.l2BlockTime() == 0, "CHECK-L2OO-170");
-            require(oracle.PROPOSER() == address(0), "CHECK-L2OO-180");
-            require(oracle.proposer() == address(0), "CHECK-L2OO-190");
-            require(oracle.CHALLENGER() == address(0), "CHECK-L2OO-200");
-            require(oracle.challenger() == address(0), "CHECK-L2OO-210");
-            require(oracle.FINALIZATION_PERIOD_SECONDS() == 0, "CHECK-L2OO-220");
-            require(oracle.finalizationPeriodSeconds() == 0, "CHECK-L2OO-230");
-            require(oracle.startingBlockNumber() == 0, "CHECK-L2OO-240");
-            require(oracle.startingTimestamp() == 0, "CHECK-L2OO-250");
-        }
-    }
-
     /// @notice Asserts that the OptimismMintableERC20Factory is setup correctly
     function checkOptimismMintableERC20Factory(Types.ContractSet memory _contracts, bool _isProxy) internal view {
         IOptimismMintableERC20Factory factory = IOptimismMintableERC20Factory(_contracts.OptimismMintableERC20Factory);
@@ -428,39 +361,6 @@ library ChainAssertions {
     }
 
     /// @notice Asserts the OptimismPortal is setup correctly
-    function checkOptimismPortal(Types.ContractSet memory _contracts, DeployConfig _cfg, bool _isProxy) internal view {
-        IOptimismPortal portal = IOptimismPortal(payable(_contracts.OptimismPortal));
-        console.log(
-            "Running chain assertions on the OptimismPortal %s at %s",
-            _isProxy ? "proxy" : "implementation",
-            address(portal)
-        );
-        require(address(portal) != address(0), "CHECK-OP-10");
-
-        // Check that the contract is initialized
-        DeployUtils.assertInitialized({ _contractAddress: address(portal), _isProxy: _isProxy, _slot: 0, _offset: 0 });
-
-        address guardian = _cfg.superchainConfigGuardian();
-        if (guardian.code.length == 0) {
-            console.log("Guardian has no code: %s", guardian);
-        }
-
-        if (_isProxy) {
-            require(address(portal.l2Oracle()) == _contracts.L2OutputOracle, "CHECK-OP-20");
-            require(address(portal.systemConfig()) == _contracts.SystemConfig, "CHECK-OP-30");
-            require(portal.guardian() == guardian, "CHECK-OP-40");
-            require(address(portal.superchainConfig()) == address(_contracts.SuperchainConfig), "CHECK-OP-50");
-            require(portal.paused() == ISuperchainConfig(_contracts.SuperchainConfig).paused(), "CHECK-OP-60");
-            require(portal.l2Sender() == Constants.DEFAULT_L2_SENDER, "CHECK-OP-70");
-        } else {
-            require(address(portal.l2Oracle()) == address(0), "CHECK-OP-80");
-            require(address(portal.systemConfig()) == address(0), "CHECK-OP-90");
-            require(address(portal.superchainConfig()) == address(0), "CHECK-OP-100");
-            require(portal.l2Sender() == address(0), "CHECK-OP-110");
-        }
-    }
-
-    /// @notice Asserts the OptimismPortal2 is setup correctly
     function checkOptimismPortal2(
         Types.ContractSet memory _contracts,
         DeployConfig _cfg,
@@ -469,7 +369,7 @@ library ChainAssertions {
         internal
         view
     {
-        IOptimismPortal2 portal = IOptimismPortal2(payable(_contracts.OptimismPortal2));
+        IOptimismPortal2 portal = IOptimismPortal2(payable(_contracts.OptimismPortal));
         console.log(
             "Running chain assertions on the OptimismPortal2 %s at %s",
             _isProxy ? "proxy" : "implementation",
@@ -596,7 +496,7 @@ library ChainAssertions {
         // Ensure that the OPCM impls are correctly saved
         OPContractsManager.Implementations memory impls = _opcm.implementations();
         require(impls.l1ERC721BridgeImpl == _contracts.L1ERC721Bridge, "CHECK-OPCM-50");
-        require(impls.optimismPortalImpl == _contracts.OptimismPortal2, "CHECK-OPCM-60");
+        require(impls.optimismPortalImpl == _contracts.OptimismPortal, "CHECK-OPCM-60");
         require(impls.systemConfigImpl == _contracts.SystemConfig, "CHECK-OPCM-70");
         require(impls.optimismMintableERC20FactoryImpl == _contracts.OptimismMintableERC20Factory, "CHECK-OPCM-80");
         require(impls.l1CrossDomainMessengerImpl == _contracts.L1CrossDomainMessenger, "CHECK-OPCM-90");

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

@@ -37,9 +37,7 @@ import { GameType, Claim, GameTypes, OutputRoot, Hash } from "src/dispute/lib/Ty
 // Interfaces
 import { IProxy } from "interfaces/universal/IProxy.sol";
 import { IProxyAdmin } from "interfaces/universal/IProxyAdmin.sol";
-import { IOptimismPortal } from "interfaces/L1/IOptimismPortal.sol";
 import { IOptimismPortal2 } from "interfaces/L1/IOptimismPortal2.sol";
-import { IL2OutputOracle } from "interfaces/L1/IL2OutputOracle.sol";
 import { ISuperchainConfig } from "interfaces/L1/ISuperchainConfig.sol";
 import { ISystemConfig } from "interfaces/L1/ISystemConfig.sol";
 import { IDataAvailabilityChallenge } from "interfaces/L1/IDataAvailabilityChallenge.sol";
@@ -124,7 +122,6 @@ contract Deploy is Deployer {
             AnchorStateRegistry: getAddress("AnchorStateRegistryProxy"),
             OptimismMintableERC20Factory: getAddress("OptimismMintableERC20FactoryProxy"),
             OptimismPortal: getAddress("OptimismPortalProxy"),
-            OptimismPortal2: getAddress("OptimismPortalProxy"),
             SystemConfig: getAddress("SystemConfigProxy"),
             L1ERC721Bridge: getAddress("L1ERC721BridgeProxy"),
             ProtocolVersions: getAddress("ProtocolVersionsProxy"),
@@ -143,8 +140,7 @@ contract Deploy is Deployer {
             PermissionedDelayedWETH: getAddress("PermissionedDelayedWETH"),
             AnchorStateRegistry: getAddress("AnchorStateRegistry"),
             OptimismMintableERC20Factory: getAddress("OptimismMintableERC20Factory"),
-            OptimismPortal: getAddress("OptimismPortal"),
-            OptimismPortal2: getAddress("OptimismPortal2"),
+            OptimismPortal: getAddress("OptimismPortal2"),
             SystemConfig: getAddress("SystemConfig"),
             L1ERC721Bridge: getAddress("L1ERC721Bridge"),
             ProtocolVersions: getAddress("ProtocolVersions"),
@@ -218,16 +214,6 @@ contract Deploy is Deployer {
                 GameType.wrap(uint32(cfg.respectedGameType()))
             );
             vm.stopPrank();
-        } else {
-            // The L2OutputOracle is not deployed by the OPCM, we deploy the proxy and initialize it here.
-            deployERC1967Proxy("L2OutputOracleProxy");
-            initializeL2OutputOracle();
-
-            // The OptimismPortalProxy contract is used both with and without Fault Proofs enabled, and is deployed by
-            // deployOPChain. If Fault Proofs are disabled, then we need to reinitialize the OptimismPortalProxy
-            // as the legacy OptimismPortal.
-            resetInitializedProxy("OptimismPortal");
-            initializeOptimismPortal();
         }
 
         if (cfg.useCustomGasToken()) {
@@ -320,12 +306,6 @@ contract Deploy is Deployer {
         }
         di.run(dii, dio);
 
-        // Temporary patch for legacy system
-        if (!cfg.useFaultProofs()) {
-            deployOptimismPortal();
-            deployL2OutputOracle();
-        }
-
         save("L1CrossDomainMessenger", address(dio.l1CrossDomainMessengerImpl()));
         save("OptimismMintableERC20Factory", address(dio.optimismMintableERC20FactoryImpl()));
         save("SystemConfig", address(dio.systemConfigImpl()));
@@ -333,6 +313,7 @@ contract Deploy is Deployer {
         save("L1ERC721Bridge", address(dio.l1ERC721BridgeImpl()));
 
         // Fault proofs
+        save("OptimismPortal", address(dio.optimismPortalImpl()));
         save("OptimismPortal2", address(dio.optimismPortalImpl()));
         save("DisputeGameFactory", address(dio.disputeGameFactoryImpl()));
         save("DelayedWETH", address(dio.delayedWETHImpl()));
@@ -400,6 +381,7 @@ contract Deploy is Deployer {
         save("AnchorStateRegistry", address(deployOutput.anchorStateRegistryImpl));
         save("PermissionedDisputeGame", address(deployOutput.permissionedDisputeGame));
         save("OptimismPortalProxy", address(deployOutput.optimismPortalProxy));
+        save("OptimismPortal2Proxy", address(deployOutput.optimismPortalProxy));
 
         // Check if the permissionless game implementation is already set
         IDisputeGameFactory factory = IDisputeGameFactory(mustGetAddress("DisputeGameFactoryProxy"));
@@ -492,52 +474,6 @@ contract Deploy is Deployer {
     //             Implementation Deployment Functions            //
     ////////////////////////////////////////////////////////////////
 
-    /// @notice Deploy the OptimismPortal
-    function deployOptimismPortal() public broadcast returns (address addr_) {
-        require(!cfg.useFaultProofs(), "Deploy: FaultProofs OptimismPortal is deployed by OPCM");
-        require(!cfg.useInterop(), "Deploy: The legacy OptimismPortal does not support interop");
-
-        addr_ = DeployUtils.create2AndSave({
-            _save: this,
-            _salt: _implSalt(),
-            _name: "OptimismPortal",
-            _args: DeployUtils.encodeConstructor(abi.encodeCall(IOptimismPortal.__constructor__, ()))
-        });
-
-        // Override the `OptimismPortal` contract to the deployed implementation. This is necessary
-        // to check the `OptimismPortal` implementation alongside dependent contracts, which
-        // are always proxies.
-        Types.ContractSet memory contracts = _proxies();
-        contracts.OptimismPortal = addr_;
-        ChainAssertions.checkOptimismPortal({ _contracts: contracts, _cfg: cfg, _isProxy: false });
-    }
-
-    /// @notice Deploy the L2OutputOracle
-    function deployL2OutputOracle() public broadcast returns (address addr_) {
-        IL2OutputOracle oracle = IL2OutputOracle(
-            DeployUtils.create2AndSave({
-                _save: this,
-                _salt: _implSalt(),
-                _name: "L2OutputOracle",
-                _args: DeployUtils.encodeConstructor(abi.encodeCall(IL2OutputOracle.__constructor__, ()))
-            })
-        );
-
-        // Override the `L2OutputOracle` contract to the deployed implementation. This is necessary
-        // to check the `L2OutputOracle` implementation alongside dependent contracts, which
-        // are always proxies.
-        Types.ContractSet memory contracts = _proxies();
-        contracts.L2OutputOracle = address(oracle);
-        ChainAssertions.checkL2OutputOracle({
-            _contracts: contracts,
-            _cfg: cfg,
-            _l2OutputOracleStartingTimestamp: 0,
-            _isProxy: false
-        });
-
-        addr_ = address(oracle);
-    }
-
     /// @notice Deploy the DataAvailabilityChallenge
     function deployDataAvailabilityChallenge() public broadcast returns (address addr_) {
         IDataAvailabilityChallenge dac = IDataAvailabilityChallenge(
@@ -603,73 +539,6 @@ contract Deploy is Deployer {
         ChainAssertions.checkSystemConfig({ _contracts: _proxies(), _cfg: cfg, _isProxy: true });
     }
 
-    /// @notice Initialize the L2OutputOracle
-    function initializeL2OutputOracle() public broadcast {
-        console.log("Upgrading and initializing L2OutputOracle proxy");
-        address l2OutputOracleProxy = mustGetAddress("L2OutputOracleProxy");
-        address l2OutputOracle = mustGetAddress("L2OutputOracle");
-
-        IProxyAdmin proxyAdmin = IProxyAdmin(payable(mustGetAddress("ProxyAdmin")));
-        proxyAdmin.upgradeAndCall({
-            _proxy: payable(l2OutputOracleProxy),
-            _implementation: l2OutputOracle,
-            _data: abi.encodeCall(
-                IL2OutputOracle.initialize,
-                (
-                    cfg.l2OutputOracleSubmissionInterval(),
-                    cfg.l2BlockTime(),
-                    cfg.l2OutputOracleStartingBlockNumber(),
-                    cfg.l2OutputOracleStartingTimestamp(),
-                    cfg.l2OutputOracleProposer(),
-                    cfg.l2OutputOracleChallenger(),
-                    cfg.finalizationPeriodSeconds()
-                )
-            )
-        });
-
-        IL2OutputOracle oracle = IL2OutputOracle(l2OutputOracleProxy);
-        string memory version = oracle.version();
-        console.log("L2OutputOracle version: %s", version);
-
-        ChainAssertions.checkL2OutputOracle({
-            _contracts: _proxies(),
-            _cfg: cfg,
-            _l2OutputOracleStartingTimestamp: cfg.l2OutputOracleStartingTimestamp(),
-            _isProxy: true
-        });
-    }
-
-    /// @notice Initialize the OptimismPortal
-    function initializeOptimismPortal() public broadcast {
-        console.log("Upgrading and initializing OptimismPortal proxy");
-        require(!cfg.useFaultProofs(), "Deploy: FaultProofs OptimismPortal is initialized by OPCM");
-        address optimismPortalProxy = mustGetAddress("OptimismPortalProxy");
-        address systemConfigProxy = mustGetAddress("SystemConfigProxy");
-        address superchainConfigProxy = mustGetAddress("SuperchainConfigProxy");
-        address optimismPortal = mustGetAddress("OptimismPortal");
-        address l2OutputOracleProxy = mustGetAddress("L2OutputOracleProxy");
-
-        IProxyAdmin proxyAdmin = IProxyAdmin(payable(mustGetAddress("ProxyAdmin")));
-        proxyAdmin.upgradeAndCall({
-            _proxy: payable(optimismPortalProxy),
-            _implementation: optimismPortal,
-            _data: abi.encodeCall(
-                IOptimismPortal.initialize,
-                (
-                    IL2OutputOracle(l2OutputOracleProxy),
-                    ISystemConfig(systemConfigProxy),
-                    ISuperchainConfig(superchainConfigProxy)
-                )
-            )
-        });
-
-        IOptimismPortal portal = IOptimismPortal(payable(optimismPortalProxy));
-        string memory version = portal.version();
-        console.log("OptimismPortal version: %s", version);
-
-        ChainAssertions.checkOptimismPortal({ _contracts: _proxies(), _cfg: cfg, _isProxy: true });
-    }
-
     /// @notice Initialize the DataAvailabilityChallenge
     function initializeDataAvailabilityChallenge() public broadcast {
         console.log("Upgrading and initializing DataAvailabilityChallenge proxy");

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

@@ -14,7 +14,6 @@ library Types {
         address AnchorStateRegistry;
         address OptimismMintableERC20Factory;
         address OptimismPortal;
-        address OptimismPortal2;
         address SystemConfig;
         address L1ERC721Bridge;
         address ProtocolVersions;

packages/contracts-bedrock/snapshots/.gas-snapshot

-GasBenchMark_L1BlockInterop_DepositsComplete:test_depositsComplete_benchmark() (gas: 7589)
-GasBenchMark_L1BlockInterop_DepositsComplete_Warm:test_depositsComplete_benchmark() (gas: 5589)
+GasBenchMark_L1BlockInterop_DepositsComplete:test_depositsComplete_benchmark() (gas: 7567)
+GasBenchMark_L1BlockInterop_DepositsComplete_Warm:test_depositsComplete_benchmark() (gas: 5567)
 GasBenchMark_L1BlockInterop_SetValuesInterop:test_setL1BlockValuesInterop_benchmark() (gas: 175722)
 GasBenchMark_L1BlockInterop_SetValuesInterop_Warm:test_setL1BlockValuesInterop_benchmark() (gas: 5144)
-GasBenchMark_L1Block_SetValuesEcotone:test_setL1BlockValuesEcotone_benchmark() (gas: 158553)
-GasBenchMark_L1Block_SetValuesEcotone_Warm:test_setL1BlockValuesEcotone_benchmark() (gas: 7619)
+GasBenchMark_L1Block_SetValuesEcotone:test_setL1BlockValuesEcotone_benchmark() (gas: 158531)
+GasBenchMark_L1Block_SetValuesEcotone_Warm:test_setL1BlockValuesEcotone_benchmark() (gas: 7597)
 GasBenchMark_L1CrossDomainMessenger:test_sendMessage_benchmark_0() (gas: 369235)
 GasBenchMark_L1CrossDomainMessenger:test_sendMessage_benchmark_1() (gas: 2967442)
-GasBenchMark_L1StandardBridge_Deposit:test_depositERC20_benchmark_0() (gas: 564398)
-GasBenchMark_L1StandardBridge_Deposit:test_depositERC20_benchmark_1() (gas: 4076568)
-GasBenchMark_L1StandardBridge_Deposit:test_depositETH_benchmark_0() (gas: 467098)
-GasBenchMark_L1StandardBridge_Deposit:test_depositETH_benchmark_1() (gas: 3512802)
-GasBenchMark_L1StandardBridge_Finalize:test_finalizeETHWithdrawal_benchmark() (gas: 72619)
-GasBenchMark_L2OutputOracle:test_proposeL2Output_benchmark() (gas: 92973)
+GasBenchMark_L1StandardBridge_Deposit:test_depositERC20_benchmark_0() (gas: 564429)
+GasBenchMark_L1StandardBridge_Deposit:test_depositERC20_benchmark_1() (gas: 4076577)
+GasBenchMark_L1StandardBridge_Deposit:test_depositETH_benchmark_0() (gas: 467041)
+GasBenchMark_L1StandardBridge_Deposit:test_depositETH_benchmark_1() (gas: 3512790)
+GasBenchMark_L1StandardBridge_Finalize:test_finalizeETHWithdrawal_benchmark() (gas: 72667)
\ No newline at end of file
-GasBenchMark_OptimismPortal:test_depositTransaction_benchmark() (gas: 68422)
-GasBenchMark_OptimismPortal:test_depositTransaction_benchmark_1() (gas: 69008)
-GasBenchMark_OptimismPortal:test_proveWithdrawalTransaction_benchmark() (gas: 155565)
\ No newline at end of file

packages/contracts-bedrock/snapshots/abi/L1CrossDomainMessenger.json

@@ -74,7 +74,7 @@
     "name": "PORTAL",
     "outputs": [
       {
-        "internalType": "contract IOptimismPortal",
+        "internalType": "contract IOptimismPortal2",
         "name": "",
         "type": "address"
       }
@@ -185,7 +185,7 @@
         "type": "address"
       },
       {
-        "internalType": "contract IOptimismPortal",
+        "internalType": "contract IOptimismPortal2",
         "name": "_portal",
         "type": "address"
       },
@@ -244,7 +244,7 @@
     "name": "portal",
     "outputs": [
       {
-        "internalType": "contract IOptimismPortal",
+        "internalType": "contract IOptimismPortal2",
         "name": "",
         "type": "address"
       }

packages/contracts-bedrock/snapshots/abi/L2OutputOracle.json

-[
-  {
-    "inputs": [],
-    "stateMutability": "nonpayable",
-    "type": "constructor"
-  },
-  {
-    "inputs": [],
-    "name": "CHALLENGER",
-    "outputs": [
-      {
-        "internalType": "address",
-        "name": "",
-        "type": "address"
-      }
-    ],
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "inputs": [],
-    "name": "FINALIZATION_PERIOD_SECONDS",
-    "outputs": [
-      {
-        "internalType": "uint256",
-        "name": "",
-        "type": "uint256"
-      }
-    ],
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "inputs": [],
-    "name": "L2_BLOCK_TIME",
-    "outputs": [
-      {
-        "internalType": "uint256",
-        "name": "",
-        "type": "uint256"
-      }
-    ],
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "inputs": [],
-    "name": "PROPOSER",
-    "outputs": [
-      {
-        "internalType": "address",
-        "name": "",
-        "type": "address"
-      }
-    ],
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "inputs": [],
-    "name": "SUBMISSION_INTERVAL",
-    "outputs": [
-      {
-        "internalType": "uint256",
-        "name": "",
-        "type": "uint256"
-      }
-    ],
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "inputs": [],
-    "name": "challenger",
-    "outputs": [
-      {
-        "internalType": "address",
-        "name": "",
-        "type": "address"
-      }
-    ],
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "uint256",
-        "name": "_l2BlockNumber",
-        "type": "uint256"
-      }
-    ],
-    "name": "computeL2Timestamp",
-    "outputs": [
-      {
-        "internalType": "uint256",
-        "name": "",
-        "type": "uint256"
-      }
-    ],
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "uint256",
-        "name": "_l2OutputIndex",
-        "type": "uint256"
-      }
-    ],
-    "name": "deleteL2Outputs",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [],
-    "name": "finalizationPeriodSeconds",
-    "outputs": [
-      {
-        "internalType": "uint256",
-        "name": "",
-        "type": "uint256"
-      }
-    ],
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "uint256",
-        "name": "_l2OutputIndex",
-        "type": "uint256"
-      }
-    ],
-    "name": "getL2Output",
-    "outputs": [
-      {
-        "components": [
-          {
-            "internalType": "bytes32",
-            "name": "outputRoot",
-            "type": "bytes32"
-          },
-          {
-            "internalType": "uint128",
-            "name": "timestamp",
-            "type": "uint128"
-          },
-          {
-            "internalType": "uint128",
-            "name": "l2BlockNumber",
-            "type": "uint128"
-          }
-        ],
-        "internalType": "struct Types.OutputProposal",
-        "name": "",
-        "type": "tuple"
-      }
-    ],
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "uint256",
-        "name": "_l2BlockNumber",
-        "type": "uint256"
-      }
-    ],
-    "name": "getL2OutputAfter",
-    "outputs": [
-      {
-        "components": [
-          {
-            "internalType": "bytes32",
-            "name": "outputRoot",
-            "type": "bytes32"
-          },
-          {
-            "internalType": "uint128",
-            "name": "timestamp",
-            "type": "uint128"
-          },
-          {
-            "internalType": "uint128",
-            "name": "l2BlockNumber",
-            "type": "uint128"
-          }
-        ],
-        "internalType": "struct Types.OutputProposal",
-        "name": "",
-        "type": "tuple"
-      }
-    ],
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "uint256",
-        "name": "_l2BlockNumber",
-        "type": "uint256"
-      }
-    ],
-    "name": "getL2OutputIndexAfter",
-    "outputs": [
-      {
-        "internalType": "uint256",
-        "name": "",
-        "type": "uint256"
-      }
-    ],
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "uint256",
-        "name": "_submissionInterval",
-        "type": "uint256"
-      },
-      {
-        "internalType": "uint256",
-        "name": "_l2BlockTime",
-        "type": "uint256"
-      },
-      {
-        "internalType": "uint256",
-        "name": "_startingBlockNumber",
-        "type": "uint256"
-      },
-      {
-        "internalType": "uint256",
-        "name": "_startingTimestamp",
-        "type": "uint256"
-      },
-      {
-        "internalType": "address",
-        "name": "_proposer",
-        "type": "address"
-      },
-      {
-        "internalType": "address",
-        "name": "_challenger",
-        "type": "address"
-      },
-      {
-        "internalType": "uint256",
-        "name": "_finalizationPeriodSeconds",
-        "type": "uint256"
-      }
-    ],
-    "name": "initialize",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [],
-    "name": "l2BlockTime",
-    "outputs": [
-      {
-        "internalType": "uint256",
-        "name": "",
-        "type": "uint256"
-      }
-    ],
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "inputs": [],
-    "name": "latestBlockNumber",
-    "outputs": [
-      {
-        "internalType": "uint256",
-        "name": "",
-        "type": "uint256"
-      }
-    ],
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "inputs": [],
-    "name": "latestOutputIndex",
-    "outputs": [
-      {
-        "internalType": "uint256",
-        "name": "",
-        "type": "uint256"
-      }
-    ],
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "inputs": [],
-    "name": "nextBlockNumber",
-    "outputs": [
-      {
-        "internalType": "uint256",
-        "name": "",
-        "type": "uint256"
-      }
-    ],
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "inputs": [],
-    "name": "nextOutputIndex",
-    "outputs": [
-      {
-        "internalType": "uint256",
-        "name": "",
-        "type": "uint256"
-      }
-    ],
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "bytes32",
-        "name": "_outputRoot",
-        "type": "bytes32"
-      },
-      {
-        "internalType": "uint256",
-        "name": "_l2BlockNumber",
-        "type": "uint256"
-      },
-      {
-        "internalType": "bytes32",
-        "name": "_l1BlockHash",
-        "type": "bytes32"
-      },
-      {
-        "internalType": "uint256",
-        "name": "_l1BlockNumber",
-        "type": "uint256"
-      }
-    ],
-    "name": "proposeL2Output",
-    "outputs": [],
-    "stateMutability": "payable",
-    "type": "function"
-  },
-  {
-    "inputs": [],
-    "name": "proposer",
-    "outputs": [
-      {
-        "internalType": "address",
-        "name": "",
-        "type": "address"
-      }
-    ],
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "inputs": [],
-    "name": "startingBlockNumber",
-    "outputs": [
-      {
-        "internalType": "uint256",
-        "name": "",
-        "type": "uint256"
-      }
-    ],
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "inputs": [],
-    "name": "startingTimestamp",
-    "outputs": [
-      {
-        "internalType": "uint256",
-        "name": "",
-        "type": "uint256"
-      }
-    ],
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "inputs": [],
-    "name": "submissionInterval",
-    "outputs": [
-      {
-        "internalType": "uint256",
-        "name": "",
-        "type": "uint256"
-      }
-    ],
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "inputs": [],
-    "name": "version",
-    "outputs": [
-      {
-        "internalType": "string",
-        "name": "",
-        "type": "string"
-      }
-    ],
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "anonymous": false,
-    "inputs": [
-      {
-        "indexed": false,
-        "internalType": "uint8",
-        "name": "version",
-        "type": "uint8"
-      }
-    ],
-    "name": "Initialized",
-    "type": "event"
-  },
-  {
-    "anonymous": false,
-    "inputs": [
-      {
-        "indexed": true,
-        "internalType": "bytes32",
-        "name": "outputRoot",
-        "type": "bytes32"
-      },
-      {
-        "indexed": true,
-        "internalType": "uint256",
-        "name": "l2OutputIndex",
-        "type": "uint256"
-      },
-      {
-        "indexed": true,
-        "internalType": "uint256",
-        "name": "l2BlockNumber",
-        "type": "uint256"
-      },
-      {
-        "indexed": false,
-        "internalType": "uint256",
-        "name": "l1Timestamp",
-        "type": "uint256"
-      }
-    ],
-    "name": "OutputProposed",
-    "type": "event"
-  },
-  {
-    "anonymous": false,
-    "inputs": [
-      {
-        "indexed": true,
-        "internalType": "uint256",
-        "name": "prevNextOutputIndex",
-        "type": "uint256"
-      },
-      {
-        "indexed": true,
-        "internalType": "uint256",
-        "name": "newNextOutputIndex",
-        "type": "uint256"
-      }
-    ],
-    "name": "OutputsDeleted",
-    "type": "event"
-  }
-]
\ No newline at end of file

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

@@ -4,8 +4,8 @@
     "sourceCodeHash": "0xae49c741c8cd546981ab59b85b88e9fc1055c4fae085e7078d601b42464f86e6"
   },
   "src/L1/L1CrossDomainMessenger.sol": {
-    "initCodeHash": "0x833d739d04125bf14f3bd11d9da9405354d37ad246737b56d5b112cddc0031ff",
-    "sourceCodeHash": "0xca20239ad3eb140e0d3d165ec1d3d1c68581d878ec2b86c5d33b07c6c87f6f45"
+    "initCodeHash": "0x192b98a93759f2044ee1ea56270cd203d4f16210c06be388f29b8c1114b9329d",
+    "sourceCodeHash": "0xfa18fb2e6ac73a143303b07735239a383ae84bd0d0042cceb8253f4784e07afb"
   },
   "src/L1/L1ERC721Bridge.sol": {
     "initCodeHash": "0x280488bce8b4fb364740c59de14c423851902088f384e077bccc79b9df48528a",
@@ -15,18 +15,10 @@
     "initCodeHash": "0x7d7030359826f64714ef0c2a5198901812fb0a99e949f23fe54ccf87a0df2e67",
     "sourceCodeHash": "0xa91b445bdc666a02ba18e3b91ba94b6d54bbe65da714002fc734814201319d57"
   },
-  "src/L1/L2OutputOracle.sol": {
-    "initCodeHash": "0xd992c45b8461b9546fe4e3cecbce15d17ce366a62aab17058aad3b15bf36d21d",
-    "sourceCodeHash": "0xa35478e9e2659a320da725a117b200dea2826175d2b17d881de1196da0cc91eb"
-  },
   "src/L1/OPContractsManager.sol": {
     "initCodeHash": "0x9b704574a7005dc2aa8d6a3e0d85572493cc4bbd60033a23e437632a5fef7720",
     "sourceCodeHash": "0x05ed7ad68e4e9bca7334314e794a1f66e5899532bb01cfa3a7716cb2688df9d5"
   },
-  "src/L1/OptimismPortal.sol": {
-    "initCodeHash": "0x2f5427c78c3445cdbe38931e67274ae87a6ac7fcc1a2279f1e9fc294808b67f9",
-    "sourceCodeHash": "0x77e0f0f8caa9742896a3e7cdee15b0061e298f9c950159bb7231b8196517c9d2"
-  },
   "src/L1/OptimismPortal2.sol": {
     "initCodeHash": "0xfd14fd690752519064d6de6c3e15d69ec9146bc8714e56ac286305773dbb1533",
     "sourceCodeHash": "0x3dbd4601c67a43c42f403f6b28e6e2d8bf4f3d2cf2f2d8f7460026e0c6c66def"
@@ -44,12 +36,12 @@
     "sourceCodeHash": "0xafa784ea78818a382ff3a61e2d84be58c7978110c06b9273db68c0213ead02d3"
   },
   "src/L1/SystemConfig.sol": {
-    "initCodeHash": "0x11707ca5ef2bfc0da82e945cb97e62226852d850e8bdecb8ec22fc1ab7967894",
-    "sourceCodeHash": "0x71cedc36b538c3db2ac43d1d9554583a3f09eee9e9a5c5d39608418bd466ee0e"
+    "initCodeHash": "0xe1baf5d3415baf65a45031c37e4bd794ecb7f779b227f6cbed06d945aa2097fc",
+    "sourceCodeHash": "0x52b7d8825b4962e720513906ac993d36964cf03c45364c9f03d88507a0caac57"
   },
   "src/L1/SystemConfigInterop.sol": {
-    "initCodeHash": "0x53d4adf9db26e1217daccff4e91f9717925ad2e666d0953d43009535efd5ad3d",
-    "sourceCodeHash": "0x8a08e71f05581449c32ea15702c1881463a878243fd8bb90dea33a795abd0b84"
+    "initCodeHash": "0x91ed371ee2f6d4a9ed1483971df8a6888cc8b5aca5212b180e395476f21cb268",
+    "sourceCodeHash": "0x6a51dc1b2bfadd9781c729f8db70972926f364b0e605536fb075bfddd0d4c433"
   },
   "src/L2/BaseFeeVault.sol": {
     "initCodeHash": "0xc403d4c555d8e69a2699e01d192ae7327136701fa02da10a6d75a584b3c364c9",

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

@@ -137,7 +137,7 @@
     "label": "portal",
     "offset": 0,
     "slot": "252",
-    "type": "contract IOptimismPortal"
+    "type": "contract IOptimismPortal2"
   },
   {
     "bytes": "20",

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

-[
-  {
-    "bytes": "1",
-    "label": "_initialized",
-    "offset": 0,
-    "slot": "0",
-    "type": "uint8"
-  },
-  {
-    "bytes": "1",
-    "label": "_initializing",
-    "offset": 1,
-    "slot": "0",
-    "type": "bool"
-  },
-  {
-    "bytes": "32",
-    "label": "startingBlockNumber",
-    "offset": 0,
-    "slot": "1",
-    "type": "uint256"
-  },
-  {
-    "bytes": "32",
-    "label": "startingTimestamp",
-    "offset": 0,
-    "slot": "2",
-    "type": "uint256"
-  },
-  {
-    "bytes": "32",
-    "label": "l2Outputs",
-    "offset": 0,
-    "slot": "3",
-    "type": "struct Types.OutputProposal[]"
-  },
-  {
-    "bytes": "32",
-    "label": "submissionInterval",
-    "offset": 0,
-    "slot": "4",
-    "type": "uint256"
-  },
-  {
-    "bytes": "32",
-    "label": "l2BlockTime",
-    "offset": 0,
-    "slot": "5",
-    "type": "uint256"
-  },
-  {
-    "bytes": "20",
-    "label": "challenger",
-    "offset": 0,
-    "slot": "6",
-    "type": "address"
-  },
-  {
-    "bytes": "20",
-    "label": "proposer",
-    "offset": 0,
-    "slot": "7",
-    "type": "address"
-  },
-  {
-    "bytes": "32",
-    "label": "finalizationPeriodSeconds",
-    "offset": 0,
-    "slot": "8",
-    "type": "uint256"
-  }
-]
\ No newline at end of file

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

-[
-  {
-    "bytes": "1",
-    "label": "_initialized",
-    "offset": 0,
-    "slot": "0",
-    "type": "uint8"
-  },
-  {
-    "bytes": "1",
-    "label": "_initializing",
-    "offset": 1,
-    "slot": "0",
-    "type": "bool"
-  },
-  {
-    "bytes": "32",
-    "label": "params",
-    "offset": 0,
-    "slot": "1",
-    "type": "struct ResourceMetering.ResourceParams"
-  },
-  {
-    "bytes": "1536",
-    "label": "__gap",
-    "offset": 0,
-    "slot": "2",
-    "type": "uint256[48]"
-  },
-  {
-    "bytes": "20",
-    "label": "l2Sender",
-    "offset": 0,
-    "slot": "50",
-    "type": "address"
-  },
-  {
-    "bytes": "32",
-    "label": "finalizedWithdrawals",
-    "offset": 0,
-    "slot": "51",
-    "type": "mapping(bytes32 => bool)"
-  },
-  {
-    "bytes": "32",
-    "label": "provenWithdrawals",
-    "offset": 0,
-    "slot": "52",
-    "type": "mapping(bytes32 => struct OptimismPortal.ProvenWithdrawal)"
-  },
-  {
-    "bytes": "1",
-    "label": "spacer_53_0_1",
-    "offset": 0,
-    "slot": "53",
-    "type": "bool"
-  },
-  {
-    "bytes": "20",
-    "label": "superchainConfig",
-    "offset": 1,
-    "slot": "53",
-    "type": "contract ISuperchainConfig"
-  },
-  {
-    "bytes": "20",
-    "label": "l2Oracle",
-    "offset": 0,
-    "slot": "54",
-    "type": "contract IL2OutputOracle"
-  },
-  {
-    "bytes": "20",
-    "label": "systemConfig",
-    "offset": 0,
-    "slot": "55",
-    "type": "contract ISystemConfig"
-  },
-  {
-    "bytes": "20",
-    "label": "spacer_56_0_20",
-    "offset": 0,
-    "slot": "56",
-    "type": "address"
-  },
-  {
-    "bytes": "32",
-    "label": "spacer_57_0_32",
-    "offset": 0,
-    "slot": "57",
-    "type": "bytes32"
-  },
-  {
-    "bytes": "32",
-    "label": "spacer_58_0_32",
-    "offset": 0,
-    "slot": "58",
-    "type": "bytes32"
-  },
-  {
-    "bytes": "32",
-    "label": "spacer_59_0_32",
-    "offset": 0,
-    "slot": "59",
-    "type": "bytes32"
-  },
-  {
-    "bytes": "32",
-    "label": "spacer_60_0_32",
-    "offset": 0,
-    "slot": "60",
-    "type": "bytes32"
-  },
-  {
-    "bytes": "32",
-    "label": "_balance",
-    "offset": 0,
-    "slot": "61",
-    "type": "uint256"
-  }
-]
\ No newline at end of file

packages/contracts-bedrock/src/L1/L1CrossDomainMessenger.sol

@@ -11,7 +11,7 @@ import { Predeploys } from "src/libraries/Predeploys.sol";
 import { ISemver } from "interfaces/universal/ISemver.sol";
 import { ISuperchainConfig } from "interfaces/L1/ISuperchainConfig.sol";
 import { ISystemConfig } from "interfaces/L1/ISystemConfig.sol";
-import { IOptimismPortal } from "interfaces/L1/IOptimismPortal.sol";
+import { IOptimismPortal2 as IOptimismPortal } from "interfaces/L1/IOptimismPortal2.sol";
 
 /// @custom:proxied true
 /// @title L1CrossDomainMessenger
@@ -30,8 +30,8 @@ contract L1CrossDomainMessenger is CrossDomainMessenger, ISemver {
     ISystemConfig public systemConfig;
 
     /// @notice Semantic version.
-    /// @custom:semver 2.4.1-beta.4
-    string public constant version = "2.4.1-beta.4";
+    /// @custom:semver 2.4.1-beta.5
+    string public constant version = "2.4.1-beta.5";
 
     /// @notice Constructs the L1CrossDomainMessenger contract.
     constructor() {

packages/contracts-bedrock/src/L1/SystemConfig.sol

@@ -12,7 +12,7 @@ import { GasPayingToken, IGasToken } from "src/libraries/GasPayingToken.sol";
 
 // Interfaces
 import { ISemver } from "interfaces/universal/ISemver.sol";
-import { IOptimismPortal } from "interfaces/L1/IOptimismPortal.sol";
+import { IOptimismPortal2 } from "interfaces/L1/IOptimismPortal2.sol";
 import { IResourceMetering } from "interfaces/L1/IResourceMetering.sol";
 
 /// @custom:proxied true
@@ -137,9 +137,9 @@ contract SystemConfig is OwnableUpgradeable, ISemver, IGasToken {
     event ConfigUpdate(uint256 indexed version, UpdateType indexed updateType, bytes data);
 
     /// @notice Semantic version.
-    /// @custom:semver 2.3.0-beta.8
+    /// @custom:semver 2.3.0-beta.9
     function version() public pure virtual returns (string memory) {
-        return "2.3.0-beta.8";
+        return "2.3.0-beta.9";
     }
 
     /// @notice Constructs the SystemConfig contract.
@@ -302,7 +302,7 @@ contract SystemConfig is OwnableUpgradeable, ISemver, IGasToken {
 
             // Set the gas paying token in storage and in the OptimismPortal.
             GasPayingToken.set({ _token: _token, _decimals: GAS_PAYING_TOKEN_DECIMALS, _name: name, _symbol: symbol });
-            IOptimismPortal(payable(optimismPortal())).setGasPayingToken({
+            IOptimismPortal2(payable(optimismPortal())).setGasPayingToken({
                 _token: _token,
                 _decimals: GAS_PAYING_TOKEN_DECIMALS,
                 _name: name,

packages/contracts-bedrock/src/L1/SystemConfigInterop.sol

@@ -68,9 +68,9 @@ contract SystemConfigInterop is SystemConfig {
         Storage.setAddress(DEPENDENCY_MANAGER_SLOT, _dependencyManager);
     }
 
-    /// @custom:semver +interop-beta.7
+    /// @custom:semver +interop-beta.8
     function version() public pure override returns (string memory) {
-        return string.concat(super.version(), "+interop-beta.7");
+        return string.concat(super.version(), "+interop-beta.8");
     }
 
     /// @notice Internal setter for the gas paying token address, includes validation.

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

@@ -16,7 +16,7 @@ import { AddressAliasHelper } from "src/vendor/AddressAliasHelper.sol";
 // Interfaces
 import { ICrossDomainMessenger } from "interfaces/universal/ICrossDomainMessenger.sol";
 import { ISuperchainConfig } from "interfaces/L1/ISuperchainConfig.sol";
-import { IOptimismPortal } from "interfaces/L1/IOptimismPortal.sol";
+import { IOptimismPortal2 } from "interfaces/L1/IOptimismPortal2.sol";
 import { IL1StandardBridge } from "interfaces/L1/IL1StandardBridge.sol";
 
 contract L1StandardBridge_Getter_Test is CommonTest {
@@ -169,7 +169,7 @@ contract L1StandardBridge_Initialize_TestFail is CommonTest { }
 contract L1StandardBridge_Receive_Test is CommonTest {
     /// @dev Tests receive bridges ETH successfully.
     function test_receive_succeeds() external {
-        uint256 balanceBefore = address(optimismPortal).balance;
+        uint256 balanceBefore = address(optimismPortal2).balance;
 
         // The legacy event must be emitted for backwards compatibility
         vm.expectEmit(address(l1StandardBridge));
@@ -193,7 +193,7 @@ contract L1StandardBridge_Receive_Test is CommonTest {
         vm.prank(alice, alice);
         (bool success,) = address(l1StandardBridge).call{ value: 100 }(hex"");
         assertEq(success, true);
-        assertEq(address(optimismPortal).balance, balanceBefore + 100);
+        assertEq(address(optimismPortal2).balance, balanceBefore + 100);
     }
 }
 
@@ -222,7 +222,7 @@ contract PreBridgeETH is CommonTest {
     ///      on whether the bridge call is legacy or not.
     function _preBridgeETH(bool isLegacy, uint256 value) internal {
         if (!isForkTest()) {
-            assertEq(address(optimismPortal).balance, 0);
+            assertEq(address(optimismPortal2).balance, 0);
         }
         uint256 nonce = l1CrossDomainMessenger.messageNonce();
         uint256 version = 0; // Internal constant in the OptimismPortal: DEPOSIT_VERSION
@@ -252,10 +252,10 @@ contract PreBridgeETH is CommonTest {
 
         uint64 baseGas = l1CrossDomainMessenger.baseGas(message, 50000);
         vm.expectCall(
-            address(optimismPortal),
+            address(optimismPortal2),
             value,
             abi.encodeCall(
-                IOptimismPortal.depositTransaction,
+                IOptimismPortal2.depositTransaction,
                 (address(l2CrossDomainMessenger), value, baseGas, false, innerMessage)
             )
         );
@@ -269,7 +269,7 @@ contract PreBridgeETH is CommonTest {
         emit ETHBridgeInitiated(alice, alice, value, hex"dead");
 
         // OptimismPortal emits a TransactionDeposited event on `depositTransaction` call
-        vm.expectEmit(address(optimismPortal));
+        vm.expectEmit(address(optimismPortal2));
         emit TransactionDeposited(l1MessengerAliased, address(l2CrossDomainMessenger), version, opaqueData);
 
         // SentMessage event emitted by the CrossDomainMessenger
@@ -292,9 +292,9 @@ contract L1StandardBridge_DepositETH_Test is PreBridgeETH {
     ///      ETH ends up in the optimismPortal.
     function test_depositETH_succeeds() external {
         _preBridgeETH({ isLegacy: true, value: 500 });
-        uint256 balanceBefore = address(optimismPortal).balance;
+        uint256 balanceBefore = address(optimismPortal2).balance;
         l1StandardBridge.depositETH{ value: 500 }(50000, hex"dead");
-        assertEq(address(optimismPortal).balance, balanceBefore + 500);
+        assertEq(address(optimismPortal2).balance, balanceBefore + 500);
     }
 }
 
@@ -329,9 +329,9 @@ contract L1StandardBridge_BridgeETH_Test is PreBridgeETH {
     ///      ETH ends up in the optimismPortal.
     function test_bridgeETH_succeeds() external {
         _preBridgeETH({ isLegacy: false, value: 500 });
-        uint256 balanceBefore = address(optimismPortal).balance;
+        uint256 balanceBefore = address(optimismPortal2).balance;
         l1StandardBridge.bridgeETH{ value: 500 }(50000, hex"dead");
-        assertEq(address(optimismPortal).balance, balanceBefore + 500);
+        assertEq(address(optimismPortal2).balance, balanceBefore + 500);
     }
 }
 
@@ -385,9 +385,9 @@ contract PreBridgeETHTo is CommonTest {
 
         uint64 baseGas = l1CrossDomainMessenger.baseGas(message, 60000);
         vm.expectCall(
-            address(optimismPortal),
+            address(optimismPortal2),
             abi.encodeCall(
-                IOptimismPortal.depositTransaction,
+                IOptimismPortal2.depositTransaction,
                 (address(l2CrossDomainMessenger), value, baseGas, false, innerMessage)
             )
         );
@@ -401,7 +401,7 @@ contract PreBridgeETHTo is CommonTest {
         emit ETHBridgeInitiated(alice, bob, value, hex"dead");
 
         // OptimismPortal emits a TransactionDeposited event on `depositTransaction` call
-        vm.expectEmit(address(optimismPortal));
+        vm.expectEmit(address(optimismPortal2));
         emit TransactionDeposited(l1MessengerAliased, address(l2CrossDomainMessenger), version, opaqueData);
 
         // SentMessage event emitted by the CrossDomainMessenger
@@ -425,9 +425,9 @@ contract L1StandardBridge_DepositETHTo_Test is PreBridgeETHTo {
     ///      ETH ends up in the optimismPortal.
     function test_depositETHTo_succeeds() external {
         _preBridgeETHTo({ isLegacy: true, value: 600 });
-        uint256 balanceBefore = address(optimismPortal).balance;
+        uint256 balanceBefore = address(optimismPortal2).balance;
         l1StandardBridge.depositETHTo{ value: 600 }(bob, 60000, hex"dead");
-        assertEq(address(optimismPortal).balance, balanceBefore + 600);
+        assertEq(address(optimismPortal2).balance, balanceBefore + 600);
     }
 }
 
@@ -462,9 +462,9 @@ contract L1StandardBridge_BridgeETHTo_Test is PreBridgeETHTo {
     ///      ETH ends up in the optimismPortal.
     function test_bridgeETHTo_succeeds() external {
         _preBridgeETHTo({ isLegacy: false, value: 600 });
-        uint256 balanceBefore = address(optimismPortal).balance;
+        uint256 balanceBefore = address(optimismPortal2).balance;
         l1StandardBridge.bridgeETHTo{ value: 600 }(bob, 60000, hex"dead");
-        assertEq(address(optimismPortal).balance, balanceBefore + 600);
+        assertEq(address(optimismPortal2).balance, balanceBefore + 600);
     }
 }
 
@@ -534,9 +534,9 @@ contract L1StandardBridge_DepositERC20_Test is CommonTest {
 
         uint64 baseGas = l1CrossDomainMessenger.baseGas(message, 10000);
         vm.expectCall(
-            address(optimismPortal),
+            address(optimismPortal2),
             abi.encodeCall(
-                IOptimismPortal.depositTransaction, (address(l2CrossDomainMessenger), 0, baseGas, false, innerMessage)
+                IOptimismPortal2.depositTransaction, (address(l2CrossDomainMessenger), 0, baseGas, false, innerMessage)
             )
         );
 
@@ -550,7 +550,7 @@ contract L1StandardBridge_DepositERC20_Test is CommonTest {
         emit ERC20BridgeInitiated(address(L1Token), address(L2Token), alice, alice, 100, hex"");
 
         // OptimismPortal emits a TransactionDeposited event on `depositTransaction` call
-        vm.expectEmit(address(optimismPortal));
+        vm.expectEmit(address(optimismPortal2));
         emit TransactionDeposited(l1MessengerAliased, address(l2CrossDomainMessenger), version, opaqueData);
 
         // SentMessage event emitted by the CrossDomainMessenger
@@ -617,7 +617,7 @@ contract L1StandardBridge_DepositERC20To_Test is CommonTest {
         emit ERC20BridgeInitiated(address(L1Token), address(L2Token), alice, bob, 1000, hex"");
 
         // OptimismPortal emits a TransactionDeposited event on `depositTransaction` call
-        vm.expectEmit(address(optimismPortal));
+        vm.expectEmit(address(optimismPortal2));
         emit TransactionDeposited(l1MessengerAliased, address(l2CrossDomainMessenger), version, opaqueData);
 
         // SentMessage event emitted by the CrossDomainMessenger
@@ -635,9 +635,9 @@ contract L1StandardBridge_DepositERC20To_Test is CommonTest {
         );
         // The L1 XDM should call OptimismPortal.depositTransaction
         vm.expectCall(
-            address(optimismPortal),
+            address(optimismPortal2),
             abi.encodeCall(
-                IOptimismPortal.depositTransaction, (address(l2CrossDomainMessenger), 0, baseGas, false, innerMessage)
+                IOptimismPortal2.depositTransaction, (address(l2CrossDomainMessenger), 0, baseGas, false, innerMessage)
             )
         );
         vm.expectCall(address(L1Token), abi.encodeCall(ERC20.transferFrom, (alice, address(l1StandardBridge), 1000)));

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

@@ -35,13 +35,6 @@ contract OptimismPortal2_Test is CommonTest {
 
     function setUp() public virtual override {
         super.setUp();
-
-        // zero out contracts that should not be used
-        assembly {
-            sstore(l2OutputOracle.slot, 0)
-            sstore(optimismPortal.slot, 0)
-        }
-
         depositor = makeAddr("depositor");
     }
 

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

@@ -23,7 +23,7 @@ contract OptimismPortalInterop_Test is CommonTest {
 
     /// @dev Tests that the config for the gas paying token can be set.
     function testFuzz_setConfig_gasPayingToken_succeeds(bytes calldata _value) public {
-        vm.expectEmit(address(optimismPortal));
+        vm.expectEmit(address(optimismPortal2));
         emitTransactionDeposited({
             _from: Constants.DEPOSITOR_ACCOUNT,
             _to: Predeploys.L1_BLOCK_ATTRIBUTES,
@@ -46,7 +46,7 @@ contract OptimismPortalInterop_Test is CommonTest {
 
     /// @dev Tests that the config for adding a dependency can be set.
     function testFuzz_setConfig_addDependency_succeeds(bytes calldata _value) public {
-        vm.expectEmit(address(optimismPortal));
+        vm.expectEmit(address(optimismPortal2));
         emitTransactionDeposited({
             _from: Constants.DEPOSITOR_ACCOUNT,
             _to: Predeploys.L1_BLOCK_ATTRIBUTES,
@@ -69,7 +69,7 @@ contract OptimismPortalInterop_Test is CommonTest {
 
     /// @dev Tests that the config for removing a dependency can be set.
     function testFuzz_setConfig_removeDependency_succeeds(bytes calldata _value) public {
-        vm.expectEmit(address(optimismPortal));
+        vm.expectEmit(address(optimismPortal2));
         emitTransactionDeposited({
             _from: Constants.DEPOSITOR_ACCOUNT,
             _to: Predeploys.L1_BLOCK_ATTRIBUTES,
@@ -92,6 +92,6 @@ contract OptimismPortalInterop_Test is CommonTest {
 
     /// @dev Returns the OptimismPortalInterop instance.
     function _optimismPortalInterop() internal view returns (IOptimismPortalInterop) {
-        return IOptimismPortalInterop(payable(address(optimismPortal)));
+        return IOptimismPortalInterop(payable(address(optimismPortal2)));
     }
 }

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

@@ -107,7 +107,7 @@ contract SystemConfig_Initialize_Test is SystemConfig_Init {
         assertEq(address(systemConfig.l1ERC721Bridge()), address(l1ERC721Bridge));
         assertEq(address(systemConfig.l1StandardBridge()), address(l1StandardBridge));
         assertEq(address(systemConfig.disputeGameFactory()), address(disputeGameFactory));
-        assertEq(address(systemConfig.optimismPortal()), address(optimismPortal));
+        assertEq(address(systemConfig.optimismPortal()), address(optimismPortal2));
         assertEq(address(systemConfig.optimismMintableERC20Factory()), address(optimismMintableERC20Factory));
         // Check gas paying token
         (address token, uint8 decimals) = systemConfig.gasPayingToken();
@@ -352,7 +352,7 @@ contract SystemConfig_Init_CustomGasToken is SystemConfig_Init {
                 l1ERC721Bridge: address(0),
                 disputeGameFactory: address(0),
                 l1StandardBridge: address(0),
-                optimismPortal: address(optimismPortal),
+                optimismPortal: address(optimismPortal2),
                 optimismMintableERC20Factory: address(0),
                 gasPayingToken: _gasPayingToken
             })
@@ -477,11 +477,11 @@ contract SystemConfig_Init_CustomGasToken is SystemConfig_Init {
     /// @dev Tests that initialization works with OptimismPortal.
     function test_initialize_customGasTokenCall_succeeds() external {
         vm.expectCall(
-            address(optimismPortal),
-            abi.encodeCall(optimismPortal.setGasPayingToken, (address(token), 18, bytes32("Silly"), bytes32("SIL")))
+            address(optimismPortal2),
+            abi.encodeCall(optimismPortal2.setGasPayingToken, (address(token), 18, bytes32("Silly"), bytes32("SIL")))
         );
 
-        vm.expectEmit(address(optimismPortal));
+        vm.expectEmit(address(optimismPortal2));
         emit TransactionDeposited(
             0xDeaDDEaDDeAdDeAdDEAdDEaddeAddEAdDEAd0001,
             Predeploys.L1_BLOCK_ATTRIBUTES,

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

@@ -68,7 +68,7 @@ contract SystemConfigInterop_Test is CommonTest {
         vm.mockCall(_token, abi.encodeCall(ERC20.symbol, ()), abi.encode(symbol));
 
         vm.expectCall(
-            address(optimismPortal),
+            address(optimismPortal2),
             abi.encodeCall(
                 IOptimismPortalInterop.setConfig,
                 (
@@ -89,7 +89,7 @@ contract SystemConfigInterop_Test is CommonTest {
     /// @dev Tests that a dependency can be added.
     function testFuzz_addDependency_succeeds(uint256 _chainId) public {
         vm.expectCall(
-            address(optimismPortal),
+            address(optimismPortal2),
             abi.encodeCall(
                 IOptimismPortalInterop.setConfig,
                 (ConfigType.ADD_DEPENDENCY, StaticConfig.encodeAddDependency(_chainId))
@@ -111,7 +111,7 @@ contract SystemConfigInterop_Test is CommonTest {
     /// @dev Tests that a dependency can be removed.
     function testFuzz_removeDependency_succeeds(uint256 _chainId) public {
         vm.expectCall(
-            address(optimismPortal),
+            address(optimismPortal2),
             abi.encodeCall(
                 IOptimismPortalInterop.setConfig,
                 (ConfigType.REMOVE_DEPENDENCY, StaticConfig.encodeRemoveDependency(_chainId))
@@ -152,7 +152,7 @@ contract SystemConfigInterop_Test is CommonTest {
                 l1ERC721Bridge: address(0),
                 disputeGameFactory: address(0),
                 l1StandardBridge: address(0),
-                optimismPortal: address(optimismPortal),
+                optimismPortal: address(optimismPortal2),
                 optimismMintableERC20Factory: address(0),
                 gasPayingToken: _token
             })

packages/contracts-bedrock/test/L2/CrossDomainOwnable.t.sol

@@ -63,7 +63,7 @@ contract CrossDomainOwnableThroughPortal_Test is CommonTest {
         vm.recordLogs();
 
         vm.prank(alice);
-        optimismPortal.depositTransaction({
+        optimismPortal2.depositTransaction({
             _to: address(setter),
             _value: 0,
             _gasLimit: 30_000,

packages/contracts-bedrock/test/L2/L2CrossDomainMessenger.t.sol

@@ -197,7 +197,7 @@ contract L2CrossDomainMessenger_Test is CommonTest {
         address caller = AddressAliasHelper.applyL1ToL2Alias(address(l1CrossDomainMessenger));
         bytes memory message = hex"1111";
 
-        vm.store(address(optimismPortal), bytes32(0), bytes32(abi.encode(sender)));
+        vm.store(address(optimismPortal2), bytes32(0), bytes32(abi.encode(sender)));
 
         vm.prank(caller);
         vm.expectRevert("CrossDomainMessenger: cannot send message to blocked system address");
@@ -218,7 +218,7 @@ contract L2CrossDomainMessenger_Test is CommonTest {
         address caller = AddressAliasHelper.applyL1ToL2Alias(address(l1CrossDomainMessenger));
         bytes memory message = hex"1111";
 
-        vm.store(address(optimismPortal), bytes32(0), bytes32(abi.encode(sender)));
+        vm.store(address(optimismPortal2), bytes32(0), bytes32(abi.encode(sender)));
 
         vm.prank(caller);
         vm.expectRevert("CrossDomainMessenger: cannot send message to blocked system address");
@@ -232,14 +232,14 @@ contract L2CrossDomainMessenger_Test is CommonTest {
         );
     }
 
-    /// @dev Tests that the relayMessage function reverts if the message called by non-optimismPortal but not a failed
+    /// @dev Tests that the relayMessage function reverts if the message called by non-optimismPortal2 but not a failed
     /// message
     function test_relayMessage_relayingNewMessageByExternalUser_reverts() external {
         address target = address(alice);
         address sender = address(l1CrossDomainMessenger);
         bytes memory message = hex"1111";
 
-        vm.store(address(optimismPortal), bytes32(0), bytes32(abi.encode(sender)));
+        vm.store(address(optimismPortal2), bytes32(0), bytes32(abi.encode(sender)));
 
         vm.prank(bob);
         vm.expectRevert("CrossDomainMessenger: message cannot be replayed");

packages/contracts-bedrock/test/dispute/DelayedWETH.t.sol

@@ -155,7 +155,7 @@ contract DelayedWETH_Withdraw_Test is DelayedWETH_Init {
         vm.warp(block.timestamp + delayedWeth.delay() + 1);
 
         // Pause the contract.
-        address guardian = optimismPortal.guardian();
+        address guardian = optimismPortal2.guardian();
         vm.prank(guardian);
         superchainConfig.pause("identifier");
 
@@ -259,7 +259,7 @@ contract DelayedWETH_WithdrawFrom_Test is DelayedWETH_Init {
         vm.warp(block.timestamp + delayedWeth.delay() + 1);
 
         // Pause the contract.
-        address guardian = optimismPortal.guardian();
+        address guardian = optimismPortal2.guardian();
         vm.prank(guardian);
         superchainConfig.pause("identifier");
 

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

@@ -3,7 +3,7 @@ pragma solidity 0.8.15;
 
 import { StdUtils } from "forge-std/StdUtils.sol";
 import { Vm } from "forge-std/Vm.sol";
-import { IOptimismPortal } from "interfaces/L1/IOptimismPortal.sol";
+import { IOptimismPortal2 } from "interfaces/L1/IOptimismPortal2.sol";
 import { IL1CrossDomainMessenger } from "interfaces/L1/IL1CrossDomainMessenger.sol";
 import { CommonTest } from "test/setup/CommonTest.sol";
 import { Predeploys } from "src/libraries/Predeploys.sol";
@@ -19,12 +19,12 @@ contract RelayActor is StdUtils {
     bytes32[] public hashes;
     bool public reverted = false;
 
-    IOptimismPortal op;
+    IOptimismPortal2 op;
     IL1CrossDomainMessenger xdm;
     Vm vm;
     bool doFail;
 
-    constructor(IOptimismPortal _op, IL1CrossDomainMessenger _xdm, Vm _vm, bool _doFail) {
+    constructor(IOptimismPortal2 _op, IL1CrossDomainMessenger _xdm, Vm _vm, bool _doFail) {
         op = _op;
         xdm = _xdm;
         vm = _vm;
@@ -95,10 +95,10 @@ contract XDM_MinGasLimits is CommonTest {
         super.setUp();
 
         // Deploy a relay actor
-        actor = new RelayActor(optimismPortal, l1CrossDomainMessenger, vm, doFail);
+        actor = new RelayActor(optimismPortal2, l1CrossDomainMessenger, vm, doFail);
 
         // Give the portal some ether to send to `relayMessage`
-        vm.deal(address(optimismPortal), type(uint128).max);
+        vm.deal(address(optimismPortal2), type(uint128).max);
 
         // Target the `RelayActor` contract
         targetContract(address(actor));

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

-// SPDX-License-Identifier: MIT
-pragma solidity 0.8.15;
-
-import { CommonTest } from "test/setup/CommonTest.sol";
-import { IL2OutputOracle } from "interfaces/L1/IL2OutputOracle.sol";
-import { Vm } from "forge-std/Vm.sol";
-
-contract L2OutputOracle_Proposer {
-    IL2OutputOracle internal oracle;
-    Vm internal vm;
-
-    constructor(IL2OutputOracle _oracle, Vm _vm) {
-        oracle = _oracle;
-        vm = _vm;
-    }
-
-    /// @dev Allows the actor to propose an L2 output to the `L2OutputOracle`
-    function proposeL2Output(
-        bytes32 _outputRoot,
-        uint256 _l2BlockNumber,
-        bytes32 _l1BlockHash,
-        uint256 _l1BlockNumber
-    )
-        external
-    {
-        // Act as the proposer and propose a new output.
-        vm.prank(oracle.PROPOSER());
-        oracle.proposeL2Output(_outputRoot, _l2BlockNumber, _l1BlockHash, _l1BlockNumber);
-    }
-}
-
-contract L2OutputOracle_MonotonicBlockNumIncrease_Invariant is CommonTest {
-    L2OutputOracle_Proposer internal actor;
-
-    function setUp() public override {
-        super.enableLegacyContracts();
-        super.setUp();
-
-        // Create a proposer actor.
-        actor = new L2OutputOracle_Proposer(IL2OutputOracle(address(l2OutputOracle)), vm);
-
-        // Set the target contract to the proposer actor.
-        targetContract(address(actor));
-
-        // Set the target selector for `proposeL2Output`
-        // `proposeL2Output` is the only function we care about, as it is the only function
-        // that can modify the `l2Outputs` array in the oracle.
-        bytes4[] memory selectors = new bytes4[](1);
-        selectors[0] = actor.proposeL2Output.selector;
-        FuzzSelector memory selector = FuzzSelector({ addr: address(actor), selectors: selectors });
-        targetSelector(selector);
-    }
-
-    /// @custom:invariant The block number of the output root proposals should monotonically
-    ///                   increase.
-    ///
-    ///                   When a new output is submitted, it should never be allowed to
-    ///                   correspond to a block number that is less than the current output.
-    function invariant_monotonicBlockNumIncrease() external view {
-        // Assert that the block number of proposals must monotonically increase.
-        assertTrue(l2OutputOracle.nextBlockNumber() >= l2OutputOracle.latestBlockNumber());
-    }
-}

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

-// SPDX-License-Identifier: MIT
-pragma solidity 0.8.15;
-
-import { StdUtils } from "forge-std/Test.sol";
-import { Vm } from "forge-std/Vm.sol";
-
-import { IOptimismPortal } from "interfaces/L1/IOptimismPortal.sol";
-import { ResourceMetering } from "src/L1/ResourceMetering.sol";
-import { IResourceMetering } from "interfaces/L1/IResourceMetering.sol";
-import { Constants } from "src/libraries/Constants.sol";
-
-import { CommonTest } from "test/setup/CommonTest.sol";
-import { EIP1967Helper } from "test/mocks/EIP1967Helper.sol";
-import { Types } from "src/libraries/Types.sol";
-
-contract OptimismPortal_Depositor is StdUtils, ResourceMetering {
-    Vm internal vm;
-    IOptimismPortal internal portal;
-    bool public failedToComplete;
-
-    constructor(Vm _vm, IOptimismPortal _portal) {
-        vm = _vm;
-        portal = _portal;
-        initialize();
-    }
-
-    function initialize() internal initializer {
-        __ResourceMetering_init();
-    }
-
-    function resourceConfig() public pure returns (ResourceMetering.ResourceConfig memory) {
-        return _resourceConfig();
-    }
-
-    function _resourceConfig() internal pure override returns (ResourceMetering.ResourceConfig memory config_) {
-        IResourceMetering.ResourceConfig memory rcfg = Constants.DEFAULT_RESOURCE_CONFIG();
-        assembly ("memory-safe") {
-            config_ := rcfg
-        }
-    }
-
-    // A test intended to identify any unexpected halting conditions
-    function depositTransactionCompletes(
-        address _to,
-        uint256 _value,
-        uint64 _gasLimit,
-        bool _isCreation,
-        bytes memory _data
-    )
-        public
-        payable
-    {
-        vm.assume((!_isCreation || _to == address(0)) && _data.length <= 120_000);
-
-        uint256 preDepositvalue = bound(_value, 0, type(uint128).max);
-        // Give the depositor some ether
-        vm.deal(address(this), preDepositvalue);
-        // cache the contract's eth balance
-        uint256 preDepositBalance = address(this).balance;
-        uint256 value = bound(preDepositvalue, 0, preDepositBalance);
-
-        (, uint64 cachedPrevBoughtGas,) = ResourceMetering(address(portal)).params();
-        ResourceMetering.ResourceConfig memory rcfg = resourceConfig();
-        uint256 maxResourceLimit = uint64(rcfg.maxResourceLimit);
-        uint64 gasLimit = uint64(
-            bound(_gasLimit, portal.minimumGasLimit(uint64(_data.length)), maxResourceLimit - cachedPrevBoughtGas)
-        );
-
-        try portal.depositTransaction{ value: value }(_to, value, gasLimit, _isCreation, _data) {
-            // Do nothing; Call succeeded
-        } catch {
-            failedToComplete = true;
-        }
-    }
-}
-
-contract OptimismPortal_Invariant_Harness is CommonTest {
-    // Reusable default values for a test withdrawal
-    Types.WithdrawalTransaction _defaultTx;
-
-    uint256 _proposedOutputIndex;
-    uint256 _proposedBlockNumber;
-    bytes32 _stateRoot;
-    bytes32 _storageRoot;
-    bytes32 _outputRoot;
-    bytes32 _withdrawalHash;
-    bytes[] _withdrawalProof;
-    Types.OutputRootProof internal _outputRootProof;
-
-    function setUp() public virtual override {
-        super.enableLegacyContracts();
-        super.setUp();
-
-        _defaultTx = Types.WithdrawalTransaction({
-            nonce: 0,
-            sender: alice,
-            target: bob,
-            value: 100,
-            gasLimit: 100_000,
-            data: hex""
-        });
-        // Get withdrawal proof data we can use for testing.
-        (_stateRoot, _storageRoot, _outputRoot, _withdrawalHash, _withdrawalProof) =
-            ffi.getProveWithdrawalTransactionInputs(_defaultTx);
-
-        // Setup a dummy output root proof for reuse.
-        _outputRootProof = Types.OutputRootProof({
-            version: bytes32(uint256(0)),
-            stateRoot: _stateRoot,
-            messagePasserStorageRoot: _storageRoot,
-            latestBlockhash: bytes32(uint256(0))
-        });
-        _proposedBlockNumber = l2OutputOracle.nextBlockNumber();
-        _proposedOutputIndex = l2OutputOracle.nextOutputIndex();
-
-        // Configure the oracle to return the output root we've prepared.
-        vm.warp(l2OutputOracle.computeL2Timestamp(_proposedBlockNumber) + 1);
-        vm.prank(l2OutputOracle.PROPOSER());
-        l2OutputOracle.proposeL2Output(_outputRoot, _proposedBlockNumber, 0, 0);
-
-        // Warp beyond the finalization period for the block we've proposed.
-        vm.warp(
-            l2OutputOracle.getL2Output(_proposedOutputIndex).timestamp + l2OutputOracle.FINALIZATION_PERIOD_SECONDS()
-                + 1
-        );
-        // Fund the portal so that we can withdraw ETH.
-        vm.deal(address(optimismPortal), 0xFFFFFFFF);
-    }
-}
-
-contract OptimismPortal_Deposit_Invariant is CommonTest {
-    OptimismPortal_Depositor internal actor;
-
-    function setUp() public override {
-        super.setUp();
-        // Create a deposit actor.
-        actor = new OptimismPortal_Depositor(vm, optimismPortal);
-
-        targetContract(address(actor));
-
-        bytes4[] memory selectors = new bytes4[](1);
-        selectors[0] = actor.depositTransactionCompletes.selector;
-        FuzzSelector memory selector = FuzzSelector({ addr: address(actor), selectors: selectors });
-        targetSelector(selector);
-    }
-
-    /// @custom:invariant Deposits of any value should always succeed unless
-    ///                   `_to` = `address(0)` or `_isCreation` = `true`.
-    ///
-    ///                   All deposits, barring creation transactions and transactions
-    ///                   sent to `address(0)`, should always succeed.
-    function invariant_deposit_completes() external view {
-        assertEq(actor.failedToComplete(), false);
-    }
-}
-
-contract OptimismPortal_CannotTimeTravel is OptimismPortal_Invariant_Harness {
-    function setUp() public override {
-        super.setUp();
-
-        // Prove the withdrawal transaction
-        optimismPortal.proveWithdrawalTransaction(_defaultTx, _proposedOutputIndex, _outputRootProof, _withdrawalProof);
-
-        // Set the target contract to the portal proxy
-        targetContract(address(optimismPortal));
-        // Exclude the proxy admin from the senders so that the proxy cannot be upgraded
-        excludeSender(EIP1967Helper.getAdmin(address(optimismPortal)));
-    }
-
-    /// @custom:invariant `finalizeWithdrawalTransaction` should revert if the finalization
-    ///                   period has not elapsed.
-    ///
-    ///                   A withdrawal that has been proven should not be able to be finalized
-    ///                   until after the finalization period has elapsed.
-    function invariant_cannotFinalizeBeforePeriodHasPassed() external {
-        vm.expectRevert("OptimismPortal: proven withdrawal finalization period has not elapsed");
-        optimismPortal.finalizeWithdrawalTransaction(_defaultTx);
-    }
-}
-
-contract OptimismPortal_CannotFinalizeTwice is OptimismPortal_Invariant_Harness {
-    function setUp() public override {
-        super.setUp();
-
-        // Prove the withdrawal transaction
-        optimismPortal.proveWithdrawalTransaction(_defaultTx, _proposedOutputIndex, _outputRootProof, _withdrawalProof);
-
-        // Warp past the finalization period.
-        vm.warp(block.timestamp + l2OutputOracle.FINALIZATION_PERIOD_SECONDS() + 1);
-
-        // Finalize the withdrawal transaction.
-        optimismPortal.finalizeWithdrawalTransaction(_defaultTx);
-
-        // Set the target contract to the portal proxy
-        targetContract(address(optimismPortal));
-        // Exclude the proxy admin from the senders so that the proxy cannot be upgraded
-        excludeSender(EIP1967Helper.getAdmin(address(optimismPortal)));
-    }
-
-    /// @custom:invariant `finalizeWithdrawalTransaction` should revert if the withdrawal
-    ///                   has already been finalized.
-    ///
-    ///                   Ensures that there is no chain of calls that can be made that
-    ///                   allows a withdrawal to be finalized twice.
-    function invariant_cannotFinalizeTwice() external {
-        vm.expectRevert("OptimismPortal: withdrawal has already been finalized");
-        optimismPortal.finalizeWithdrawalTransaction(_defaultTx);
-    }
-}
-
-contract OptimismPortal_CanAlwaysFinalizeAfterWindow is OptimismPortal_Invariant_Harness {
-    function setUp() public override {
-        super.setUp();
-
-        // Prove the withdrawal transaction
-        optimismPortal.proveWithdrawalTransaction(_defaultTx, _proposedOutputIndex, _outputRootProof, _withdrawalProof);
-
-        // Warp past the finalization period.
-        vm.warp(block.timestamp + l2OutputOracle.FINALIZATION_PERIOD_SECONDS() + 1);
-
-        // Set the target contract to the portal proxy
-        targetContract(address(optimismPortal));
-        // Exclude the proxy admin from the senders so that the proxy cannot be upgraded
-        excludeSender(EIP1967Helper.getAdmin(address(optimismPortal)));
-    }
-
-    /// @custom:invariant A withdrawal should **always** be able to be finalized
-    ///                   `FINALIZATION_PERIOD_SECONDS` after it was successfully proven.
-    ///
-    ///                   This invariant asserts that there is no chain of calls that can
-    ///                   be made that will prevent a withdrawal from being finalized
-    ///                   exactly `FINALIZATION_PERIOD_SECONDS` after it was successfully
-    ///                   proven.
-    function invariant_canAlwaysFinalize() external {
-        uint256 bobBalanceBefore = address(bob).balance;
-
-        optimismPortal.finalizeWithdrawalTransaction(_defaultTx);
-
-        assertEq(address(bob).balance, bobBalanceBefore + _defaultTx.value);
-    }
-}

packages/contracts-bedrock/test/kontrol/proofs/OptimismPortal.k.sol

-// SPDX-License-Identifier: MIT
-pragma solidity ^0.8.13;
-
-import { DeploymentSummary } from "./utils/DeploymentSummary.sol";
-import { KontrolUtils } from "./utils/KontrolUtils.sol";
-import { Types } from "src/libraries/Types.sol";
-import { IOptimismPortal as OptimismPortal } from "interfaces/L1/IOptimismPortal.sol";
-import { ISuperchainConfig as SuperchainConfig } from "interfaces/L1/ISuperchainConfig.sol";
-import "src/libraries/PortalErrors.sol";
-
-contract OptimismPortalKontrol is DeploymentSummary, KontrolUtils {
-    OptimismPortal optimismPortal;
-    SuperchainConfig superchainConfig;
-
-    /// @dev Inlined setUp function for faster Kontrol performance
-    ///      Tracking issue: https://github.com/runtimeverification/kontrol/issues/282
-    function setUpInlined() public {
-        optimismPortal = OptimismPortal(payable(optimismPortalProxyAddress));
-        superchainConfig = SuperchainConfig(superchainConfigProxyAddress);
-    }
-
-    function prove_finalizeWithdrawalTransaction_paused(Types.WithdrawalTransaction calldata _tx) external {
-        setUpInlined();
-
-        // Pause Optimism Portal
-        vm.prank(optimismPortal.guardian());
-        superchainConfig.pause("identifier");
-
-        vm.expectRevert(CallPaused.selector);
-        optimismPortal.finalizeWithdrawalTransaction(_tx);
-    }
-
-    /// @dev Function containing the logic for prove_proveWithdrawalTransaction_paused
-    ///      The reason for this is that we want the _withdrawalProof to range in size from
-    ///      0 to 10. These 11 proofs will exercise the same logic, which is contained in this function
-    function prove_proveWithdrawalTransaction_paused_internal(
-        Types.WithdrawalTransaction memory _tx,
-        uint256 _l2OutputIndex,
-        Types.OutputRootProof calldata _outputRootProof,
-        bytes[] memory _withdrawalProof
-    )
-        internal
-    {
-        setUpInlined();
-
-        // Pause Optimism Portal
-        vm.prank(optimismPortal.guardian());
-        superchainConfig.pause("identifier");
-
-        vm.expectRevert(CallPaused.selector);
-        optimismPortal.proveWithdrawalTransaction(_tx, _l2OutputIndex, _outputRootProof, _withdrawalProof);
-    }
-
-    /// @custom:kontrol-array-length-equals _withdrawalProof: 10,
-    /// @custom:kontrol-bytes-length-equals _withdrawalProof: 600,
-    function prove_proveWithdrawalTransaction_paused10(
-        Types.WithdrawalTransaction memory _tx,
-        uint256 _l2OutputIndex,
-        Types.OutputRootProof calldata _outputRootProof,
-        bytes[] calldata _withdrawalProof
-    )
-        external
-    {
-        prove_proveWithdrawalTransaction_paused_internal(_tx, _l2OutputIndex, _outputRootProof, _withdrawalProof);
-    }
-
-    /// @custom:kontrol-array-length-equals _withdrawalProof: 9,
-    /// @custom:kontrol-bytes-length-equals _withdrawalProof: 600,
-    function prove_proveWithdrawalTransaction_paused9(
-        Types.WithdrawalTransaction memory _tx,
-        uint256 _l2OutputIndex,
-        Types.OutputRootProof calldata _outputRootProof,
-        bytes[] calldata _withdrawalProof
-    )
-        external
-    {
-        prove_proveWithdrawalTransaction_paused_internal(_tx, _l2OutputIndex, _outputRootProof, _withdrawalProof);
-    }
-
-    /// @custom:kontrol-array-length-equals _withdrawalProof: 8,
-    /// @custom:kontrol-bytes-length-equals _withdrawalProof: 600,
-    function prove_proveWithdrawalTransaction_paused8(
-        Types.WithdrawalTransaction memory _tx,
-        uint256 _l2OutputIndex,
-        Types.OutputRootProof calldata _outputRootProof,
-        bytes[] calldata _withdrawalProof
-    )
-        external
-    {
-        prove_proveWithdrawalTransaction_paused_internal(_tx, _l2OutputIndex, _outputRootProof, _withdrawalProof);
-    }
-
-    /// @custom:kontrol-array-length-equals _withdrawalProof: 7,
-    /// @custom:kontrol-bytes-length-equals _withdrawalProof: 600,
-    function prove_proveWithdrawalTransaction_paused7(
-        Types.WithdrawalTransaction memory _tx,
-        uint256 _l2OutputIndex,
-        Types.OutputRootProof calldata _outputRootProof,
-        bytes[] calldata _withdrawalProof
-    )
-        external
-    {
-        prove_proveWithdrawalTransaction_paused_internal(_tx, _l2OutputIndex, _outputRootProof, _withdrawalProof);
-    }
-
-    /// @custom:kontrol-array-length-equals _withdrawalProof: 6,
-    /// @custom:kontrol-bytes-length-equals _withdrawalProof: 600,
-    function prove_proveWithdrawalTransaction_paused6(
-        Types.WithdrawalTransaction memory _tx,
-        uint256 _l2OutputIndex,
-        Types.OutputRootProof calldata _outputRootProof,
-        bytes[] calldata _withdrawalProof
-    )
-        external
-    {
-        prove_proveWithdrawalTransaction_paused_internal(_tx, _l2OutputIndex, _outputRootProof, _withdrawalProof);
-    }
-
-    /// @custom:kontrol-array-length-equals _withdrawalProof: 5,
-    /// @custom:kontrol-bytes-length-equals _withdrawalProof: 600,
-    function prove_proveWithdrawalTransaction_paused5(
-        Types.WithdrawalTransaction memory _tx,
-        uint256 _l2OutputIndex,
-        Types.OutputRootProof calldata _outputRootProof,
-        bytes[] calldata _withdrawalProof
-    )
-        external
-    {
-        prove_proveWithdrawalTransaction_paused_internal(_tx, _l2OutputIndex, _outputRootProof, _withdrawalProof);
-    }
-
-    /// @custom:kontrol-array-length-equals _withdrawalProof: 4,
-    /// @custom:kontrol-bytes-length-equals _withdrawalProof: 600,
-    function prove_proveWithdrawalTransaction_paused4(
-        Types.WithdrawalTransaction memory _tx,
-        uint256 _l2OutputIndex,
-        Types.OutputRootProof calldata _outputRootProof,
-        bytes[] calldata _withdrawalProof
-    )
-        external
-    {
-        prove_proveWithdrawalTransaction_paused_internal(_tx, _l2OutputIndex, _outputRootProof, _withdrawalProof);
-    }
-
-    /// @custom:kontrol-array-length-equals _withdrawalProof: 3,
-    /// @custom:kontrol-bytes-length-equals _withdrawalProof: 600,
-    function prove_proveWithdrawalTransaction_paused3(
-        Types.WithdrawalTransaction memory _tx,
-        uint256 _l2OutputIndex,
-        Types.OutputRootProof calldata _outputRootProof,
-        bytes[] calldata _withdrawalProof
-    )
-        external
-    {
-        prove_proveWithdrawalTransaction_paused_internal(_tx, _l2OutputIndex, _outputRootProof, _withdrawalProof);
-    }
-
-    /// @custom:kontrol-array-length-equals _withdrawalProof: 2,
-    /// @custom:kontrol-bytes-length-equals _withdrawalProof: 600,
-    function prove_proveWithdrawalTransaction_paused2(
-        Types.WithdrawalTransaction memory _tx,
-        uint256 _l2OutputIndex,
-        Types.OutputRootProof calldata _outputRootProof,
-        bytes[] calldata _withdrawalProof
-    )
-        external
-    {
-        prove_proveWithdrawalTransaction_paused_internal(_tx, _l2OutputIndex, _outputRootProof, _withdrawalProof);
-    }
-
-    /// @custom:kontrol-array-length-equals _withdrawalProof: 1,
-    /// @custom:kontrol-bytes-length-equals _withdrawalProof: 600,
-    function prove_proveWithdrawalTransaction_paused1(
-        Types.WithdrawalTransaction memory _tx,
-        uint256 _l2OutputIndex,
-        Types.OutputRootProof calldata _outputRootProof,
-        bytes[] calldata _withdrawalProof
-    )
-        external
-    {
-        prove_proveWithdrawalTransaction_paused_internal(_tx, _l2OutputIndex, _outputRootProof, _withdrawalProof);
-    }
-
-    function prove_proveWithdrawalTransaction_paused0(
-        Types.WithdrawalTransaction memory _tx,
-        uint256 _l2OutputIndex,
-        Types.OutputRootProof calldata _outputRootProof
-    )
-        external
-    {
-        bytes[] memory _withdrawalProof = new bytes[](0);
-        prove_proveWithdrawalTransaction_paused_internal(_tx, _l2OutputIndex, _outputRootProof, _withdrawalProof);
-    }
-}

packages/contracts-bedrock/test/kontrol/proofs/OptimismPortal2.k.sol

@@ -4,7 +4,7 @@ pragma solidity ^0.8.13;
 import { DeploymentSummaryFaultProofs } from "./utils/DeploymentSummaryFaultProofs.sol";
 import { KontrolUtils } from "./utils/KontrolUtils.sol";
 import { Types } from "src/libraries/Types.sol";
-import { IOptimismPortal as OptimismPortal } from "interfaces/L1/IOptimismPortal.sol";
+import { IOptimismPortal2 as OptimismPortal } from "interfaces/L1/IOptimismPortal2.sol";
 import { ISuperchainConfig as SuperchainConfig } from "interfaces/L1/ISuperchainConfig.sol";
 import "src/libraries/PortalErrors.sol";
 

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

@@ -133,7 +133,7 @@ contract DeployOPChainOutput_Test is Test {
         (IL1ChugSplashProxy l1StandardBridgeProxy) = DeployUtils.buildL1ChugSplashProxyWithImpl("l1StandardBridgeProxy");
         (IResolvedDelegateProxy l1CrossDomainMessengerProxy) =
             DeployUtils.buildResolvedDelegateProxyWithImpl(addressManager, "OVM_L1CrossDomainMessenger");
-        (IProxy optimismPortalProxy) = DeployUtils.buildERC1967ProxyWithImpl("optimismPortalProxy");
+        (IProxy optimismPortalProxy) = DeployUtils.buildERC1967ProxyWithImpl("OptimismPortalProxy");
         (IProxy disputeGameFactoryProxy) = DeployUtils.buildERC1967ProxyWithImpl("disputeGameFactoryProxy");
         (IProxy anchorStateRegistryProxy) = DeployUtils.buildERC1967ProxyWithImpl("anchorStateRegistryProxy");
         vm.etch(address(anchorStateRegistryImpl), hex"01");

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

@@ -171,11 +171,6 @@ contract CommonTest is Test, Setup, Events {
         emit TransactionDeposited(_from, _to, 0, abi.encodePacked(_mint, _value, _gasLimit, _isCreation, _data));
     }
 
-    // @dev Advance the evm's time to meet the L2OutputOracle's requirements for proposeL2Output
-    function warpToProposeTime(uint256 _nextBlockNumber) public {
-        vm.warp(l2OutputOracle.computeL2Timestamp(_nextBlockNumber) + 1);
-    }
-
     function enableLegacyContracts() public {
         // Check if the system has already been deployed, based off of the heuristic that alice and bob have not been
         // set by the `setUp` function yet.

packages/contracts-bedrock/test/setup/Setup.sol

@@ -19,10 +19,8 @@ import { AddressAliasHelper } from "src/vendor/AddressAliasHelper.sol";
 import { Chains } from "scripts/libraries/Chains.sol";
 
 // Interfaces
-import { IOptimismPortal } from "interfaces/L1/IOptimismPortal.sol";
 import { IOptimismPortal2 } from "interfaces/L1/IOptimismPortal2.sol";
 import { IL1CrossDomainMessenger } from "interfaces/L1/IL1CrossDomainMessenger.sol";
-import { IL2OutputOracle } from "interfaces/L1/IL2OutputOracle.sol";
 import { ISystemConfig } from "interfaces/L1/ISystemConfig.sol";
 import { ISuperchainConfig } from "interfaces/L1/ISuperchainConfig.sol";
 import { IDataAvailabilityChallenge } from "interfaces/L1/IDataAvailabilityChallenge.sol";
@@ -80,9 +78,7 @@ contract Setup {
     IDisputeGameFactory disputeGameFactory;
     IAnchorStateRegistry anchorStateRegistry;
     IDelayedWETH delayedWeth;
-    IOptimismPortal optimismPortal;
     IOptimismPortal2 optimismPortal2;
-    IL2OutputOracle l2OutputOracle;
     ISystemConfig systemConfig;
     IL1StandardBridge l1StandardBridge;
     IL1CrossDomainMessenger l1CrossDomainMessenger;
@@ -201,7 +197,6 @@ contract Setup {
         deploy.run();
         console.log("Setup: completed L1 deployment, registering addresses now");
 
-        optimismPortal = IOptimismPortal(deploy.mustGetAddress("OptimismPortalProxy"));
         optimismPortal2 = IOptimismPortal2(deploy.mustGetAddress("OptimismPortalProxy"));
         disputeGameFactory = IDisputeGameFactory(deploy.mustGetAddress("DisputeGameFactoryProxy"));
         delayedWeth = IDelayedWETH(deploy.mustGetAddress("DelayedWETHProxy"));
@@ -216,7 +211,6 @@ contract Setup {
         superchainConfig = ISuperchainConfig(deploy.mustGetAddress("SuperchainConfigProxy"));
         anchorStateRegistry = IAnchorStateRegistry(deploy.mustGetAddress("AnchorStateRegistryProxy"));
 
-        vm.label(address(optimismPortal), "OptimismPortal");
         vm.label(deploy.mustGetAddress("OptimismPortalProxy"), "OptimismPortalProxy");
         vm.label(address(disputeGameFactory), "DisputeGameFactory");
         vm.label(deploy.mustGetAddress("DisputeGameFactoryProxy"), "DisputeGameFactoryProxy");
@@ -240,12 +234,6 @@ contract Setup {
         vm.label(address(anchorStateRegistry), "AnchorStateRegistryProxy");
         vm.label(AddressAliasHelper.applyL1ToL2Alias(address(l1CrossDomainMessenger)), "L1CrossDomainMessenger_aliased");
 
-        if (!deploy.cfg().useFaultProofs()) {
-            l2OutputOracle = IL2OutputOracle(deploy.mustGetAddress("L2OutputOracleProxy"));
-            vm.label(address(l2OutputOracle), "L2OutputOracle");
-            vm.label(deploy.mustGetAddress("L2OutputOracleProxy"), "L2OutputOracleProxy");
-        }
-
         if (deploy.cfg().useAltDA()) {
             dataAvailabilityChallenge =
                 IDataAvailabilityChallenge(deploy.mustGetAddress("DataAvailabilityChallengeProxy"));

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

@@ -6,7 +6,6 @@ import { Vm } from "forge-std/Vm.sol";
 import { CommonTest } from "test/setup/CommonTest.sol";
 
 // Libraries
-import { Types } from "src/libraries/Types.sol";
 import { SafeCall } from "src/libraries/SafeCall.sol";
 import { IL1BlockInterop } from "interfaces/L2/IL1BlockInterop.sol";
 import { Encoding } from "src/libraries/Encoding.sol";
@@ -22,96 +21,17 @@ function setPrevBaseFee(Vm _vm, address _op, uint128 _prevBaseFee) {
 
 contract SetPrevBaseFee_Test is CommonTest {
     function test_setPrevBaseFee_succeeds() external {
-        setPrevBaseFee(vm, address(optimismPortal), 100 gwei);
-        (uint128 prevBaseFee,, uint64 prevBlockNum) = optimismPortal.params();
+        setPrevBaseFee(vm, address(optimismPortal2), 100 gwei);
+        (uint128 prevBaseFee,, uint64 prevBlockNum) = optimismPortal2.params();
         assertEq(uint256(prevBaseFee), 100 gwei);
         assertEq(uint256(prevBlockNum), block.number);
     }
 }
 
-// Tests for obtaining pure gas cost estimates for commonly used functions.
-// The objective with these benchmarks is to strip down the actual test functions
-// so that they are nothing more than the call we want measure the gas cost of.
-// In order to achieve this we make no assertions, and handle everything else in the setUp()
-// function.
-contract GasBenchMark_OptimismPortal is CommonTest {
-    // Reusable default values for a test withdrawal
-    Types.WithdrawalTransaction _defaultTx;
-
-    uint256 _proposedOutputIndex;
-    uint256 _proposedBlockNumber;
-    bytes[] _withdrawalProof;
-    Types.OutputRootProof internal _outputRootProof;
-    bytes32 _outputRoot;
-
-    // Use a constructor to set the storage vars above, so as to minimize the number of ffi calls.
-    constructor() {
-        super.enableLegacyContracts();
-        super.setUp();
-        _defaultTx = Types.WithdrawalTransaction({
-            nonce: 0,
-            sender: alice,
-            target: bob,
-            value: 100,
-            gasLimit: 100_000,
-            data: hex""
-        });
-
-        // Get withdrawal proof data we can use for testing.
-        bytes32 _storageRoot;
-        bytes32 _stateRoot;
-        (_stateRoot, _storageRoot, _outputRoot,, _withdrawalProof) = ffi.getProveWithdrawalTransactionInputs(_defaultTx);
-
-        // Setup a dummy output root proof for reuse.
-        _outputRootProof = Types.OutputRootProof({
-            version: bytes32(uint256(0)),
-            stateRoot: _stateRoot,
-            messagePasserStorageRoot: _storageRoot,
-            latestBlockhash: bytes32(uint256(0))
-        });
-        _proposedBlockNumber = l2OutputOracle.nextBlockNumber();
-        _proposedOutputIndex = l2OutputOracle.nextOutputIndex();
-    }
-
-    // Get the system into a nice ready-to-use state.
-    function setUp() public virtual override {
-        // Configure the oracle to return the output root we've prepared.
-        vm.warp(l2OutputOracle.computeL2Timestamp(_proposedBlockNumber) + 1);
-        vm.prank(l2OutputOracle.PROPOSER());
-        l2OutputOracle.proposeL2Output(_outputRoot, _proposedBlockNumber, 0, 0);
-
-        // Warp beyond the finalization period for the block we've proposed.
-        vm.warp(
-            l2OutputOracle.getL2Output(_proposedOutputIndex).timestamp + l2OutputOracle.FINALIZATION_PERIOD_SECONDS()
-                + 1
-        );
-
-        // Fund the portal so that we can withdraw ETH.
-        vm.deal(address(optimismPortal), 0xFFFFFFFF);
-    }
-
-    function test_depositTransaction_benchmark() external {
-        optimismPortal.depositTransaction{ value: 100 }(
-            address(1), 0, 50000, false, hex"0000111122223333444455556666777788889999aaaabbbbccccddddeeeeffff0000"
-        );
-    }
-
-    function test_depositTransaction_benchmark_1() external {
-        setPrevBaseFee(vm, address(optimismPortal), 1 gwei);
-        optimismPortal.depositTransaction{ value: 100 }(
-            address(1), 0, 50000, false, hex"0000111122223333444455556666777788889999aaaabbbbccccddddeeeeffff0000"
-        );
-    }
-
-    function test_proveWithdrawalTransaction_benchmark() external {
-        optimismPortal.proveWithdrawalTransaction(_defaultTx, _proposedOutputIndex, _outputRootProof, _withdrawalProof);
-    }
-}
-
 contract GasBenchMark_L1CrossDomainMessenger is CommonTest {
     function test_sendMessage_benchmark_0() external {
         vm.pauseGasMetering();
-        setPrevBaseFee(vm, address(optimismPortal), 1 gwei);
+        setPrevBaseFee(vm, address(optimismPortal2), 1 gwei);
         // The amount of data typically sent during a bridge deposit.
         bytes memory data =
             hex"ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff";
@@ -121,7 +41,7 @@ contract GasBenchMark_L1CrossDomainMessenger is CommonTest {
 
     function test_sendMessage_benchmark_1() external {
         vm.pauseGasMetering();
-        setPrevBaseFee(vm, address(optimismPortal), 10 gwei);
+        setPrevBaseFee(vm, address(optimismPortal2), 10 gwei);
         // The amount of data typically sent during a bridge deposit.
         bytes memory data =
             hex"ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff";
@@ -140,21 +60,21 @@ contract GasBenchMark_L1StandardBridge_Deposit is CommonTest {
 
     function test_depositETH_benchmark_0() external {
         vm.pauseGasMetering();
-        setPrevBaseFee(vm, address(optimismPortal), 1 gwei);
+        setPrevBaseFee(vm, address(optimismPortal2), 1 gwei);
         vm.resumeGasMetering();
         l1StandardBridge.depositETH{ value: 500 }(50000, hex"");
     }
 
     function test_depositETH_benchmark_1() external {
         vm.pauseGasMetering();
-        setPrevBaseFee(vm, address(optimismPortal), 10 gwei);
+        setPrevBaseFee(vm, address(optimismPortal2), 10 gwei);
         vm.resumeGasMetering();
         l1StandardBridge.depositETH{ value: 500 }(50000, hex"");
     }
 
     function test_depositERC20_benchmark_0() external {
         vm.pauseGasMetering();
-        setPrevBaseFee(vm, address(optimismPortal), 1 gwei);
+        setPrevBaseFee(vm, address(optimismPortal2), 1 gwei);
         vm.resumeGasMetering();
         l1StandardBridge.bridgeERC20({
             _localToken: address(L1Token),
@@ -167,7 +87,7 @@ contract GasBenchMark_L1StandardBridge_Deposit is CommonTest {
 
     function test_depositERC20_benchmark_1() external {
         vm.pauseGasMetering();
-        setPrevBaseFee(vm, address(optimismPortal), 10 gwei);
+        setPrevBaseFee(vm, address(optimismPortal2), 10 gwei);
         vm.resumeGasMetering();
         l1StandardBridge.bridgeERC20({
             _localToken: address(L1Token),
@@ -200,23 +120,6 @@ contract GasBenchMark_L1StandardBridge_Finalize is CommonTest {
     }
 }
 
-contract GasBenchMark_L2OutputOracle is CommonTest {
-    uint256 nextBlockNumber;
-
-    function setUp() public override {
-        super.enableLegacyContracts();
-        super.setUp();
-        nextBlockNumber = l2OutputOracle.nextBlockNumber();
-        warpToProposeTime(nextBlockNumber);
-        address proposer = deploy.cfg().l2OutputOracleProposer();
-        vm.startPrank(proposer);
-    }
-
-    function test_proposeL2Output_benchmark() external {
-        l2OutputOracle.proposeL2Output(nonZeroHash, nextBlockNumber, 0, 0);
-    }
-}
-
 contract GasBenchMark_L1Block is CommonTest {
     address depositor;
     bytes setValuesCalldata;

packages/contracts-bedrock/test/universal/CrossDomainMessenger.t.sol

@@ -36,7 +36,7 @@ contract CrossDomainMessenger_BaseGas_Test is CommonTest {
         }
 
         uint64 baseGas = l1CrossDomainMessenger.baseGas(_data, _minGasLimit);
-        uint64 minGasLimit = optimismPortal.minimumGasLimit(uint64(_data.length));
+        uint64 minGasLimit = optimismPortal2.minimumGasLimit(uint64(_data.length));
         assertTrue(baseGas >= minGasLimit);
     }
 }
@@ -121,7 +121,7 @@ contract CrossDomainMessenger_RelayMessage_Test is CommonTest {
 
     function setUp() public override {
         super.setUp();
-        er = new ExternalRelay(l1CrossDomainMessenger, address(optimismPortal));
+        er = new ExternalRelay(l1CrossDomainMessenger, address(optimismPortal2));
     }
 
     /// @dev This test mocks an OptimismPortal call to the L1CrossDomainMessenger via
@@ -153,8 +153,8 @@ contract CrossDomainMessenger_RelayMessage_Test is CommonTest {
         });
 
         // set the value of op.l2Sender() to be the L2 Cross Domain Messenger.
-        vm.store(address(optimismPortal), bytes32(senderSlotIndex), bytes32(abi.encode(sender)));
-        vm.prank(address(optimismPortal));
+        vm.store(address(optimismPortal2), bytes32(senderSlotIndex), bytes32(abi.encode(sender)));
+        vm.prank(address(optimismPortal2));
         l1CrossDomainMessenger.relayMessage({
             _nonce: Encoding.encodeVersionedNonce({ _nonce: 0, _version: 1 }),
             _sender: sender,

packages/contracts-bedrock/test/universal/ExtendedPause.t.sol

@@ -15,7 +15,7 @@ contract ExtendedPause_Test is CommonTest {
 
         // validate the paused state
         assertTrue(superchainConfig.paused());
-        assertTrue(optimismPortal.paused());
+        assertTrue(optimismPortal2.paused());
         assertTrue(l1CrossDomainMessenger.paused());
         assertTrue(l1StandardBridge.paused());
         assertTrue(l1ERC721Bridge.paused());
@@ -31,7 +31,7 @@ contract ExtendedPause_Test is CommonTest {
 
         // validate the unpaused state
         assertFalse(superchainConfig.paused());
-        assertFalse(optimismPortal.paused());
+        assertFalse(optimismPortal2.paused());
         assertFalse(l1CrossDomainMessenger.paused());
         assertFalse(l1StandardBridge.paused());
         assertFalse(l1ERC721Bridge.paused());