ethereum-optimism · stevennevins · Mar 31, 2026 · Mar 31, 2026 · Apr 1, 2026 · Apr 1, 2026
@@ -30,15 +30,25 @@ interface IOptimismPortal2 is IProxyAdminOwnedBase {
     error OptimismPortal_InvalidOutputRootProof();
     error OptimismPortal_InvalidProofTimestamp();
     error OptimismPortal_InvalidRootClaim();
+    error OptimismPortal_MigratingToSameRegistry();
     error OptimismPortal_NoReentrancy();
+    error OptimismPortal_NotUsingInterop();
-    error OptimismPortal_NotUsingInterop();
+    error OptimismPortal2_NotUsingInterop();
-    error OptimismPortal_NotUsingInterop();
+    error OptimismPortal2_NotUsingInterop();
     error OptimismPortal_ProofNotOldEnough();
     error OptimismPortal_Unproven();
+    error OptimismPortal_InvalidInteropState();
     error OptimismPortal_InvalidLockboxState();
     error OutOfGas();
     error UnexpectedList();
     error UnexpectedString();
 
     event Initialized(uint8 version);
+    event ETHMigrated(address indexed lockbox, uint256 balance);
+    event PortalMigrated(
+        IETHLockbox oldLockbox,
+        IETHLockbox newLockbox,
+        IAnchorStateRegistry oldAnchorStateRegistry,
+        IAnchorStateRegistry newAnchorStateRegistry
+    );
     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);
@@ -71,9 +81,11 @@ interface IOptimismPortal2 is IProxyAdminOwnedBase {
         external;
     function finalizedWithdrawals(bytes32) external view returns (bool);
     function guardian() external view returns (address);
-    function initialize(ISystemConfig _systemConfig, IAnchorStateRegistry _anchorStateRegistry) external;
+    function initialize(ISystemConfig _systemConfig, IAnchorStateRegistry _anchorStateRegistry, IETHLockbox _ethLockbox) external;
     function initVersion() external view returns (uint8);
     function l2Sender() external view returns (address);
+    function migrateLiquidity() external;
+    function migrateToSharedDisputeGame(IETHLockbox _newLockbox, IAnchorStateRegistry _newAnchorStateRegistry) external;
     function minimumGasLimit(uint64 _byteCount) external pure returns (uint64);
     function numProofSubmitters(bytes32 _withdrawalHash) external view returns (uint256);
     function params() external view returns (uint128 prevBaseFee, uint64 prevBoughtGas, uint64 prevBlockNum); // nosemgrep

@@ -11,6 +11,7 @@ import { IAnchorStateRegistry } from "interfaces/dispute/IAnchorStateRegistry.so
 import { IProxyAdminOwnedBase } from "interfaces/universal/IProxyAdminOwnedBase.sol";
 import { IETHLockbox } from "interfaces/L1/IETHLockbox.sol";
 
+/// TODO(#19709) remove this file and migrate fully to the OptimismPortal2
 interface IOptimismPortalInterop is IProxyAdminOwnedBase {
     error ContentLengthMismatch();
     error EmptyItem();
@@ -64,7 +65,7 @@ interface IOptimismPortalInterop is IProxyAdminOwnedBase {
     function disputeGameFinalityDelaySeconds() external view returns (uint256);
     function donateETH() external payable;
     function superchainConfig() external view returns (ISuperchainConfig);
-    function migrateToSuperRoots(IETHLockbox _newLockbox, IAnchorStateRegistry _newAnchorStateRegistry) external;
+    function migrateToSharedDisputeGame(IETHLockbox _newLockbox, IAnchorStateRegistry _newAnchorStateRegistry) external;
     function finalizeWithdrawalTransaction(Types.WithdrawalTransaction memory _tx) external;
     function finalizeWithdrawalTransactionExternalProof(
         Types.WithdrawalTransaction memory _tx,

@@ -10,6 +10,7 @@ interface IOPContractsManagerContainer {
         address resolvedDelegateProxy;
     }
 
+    // TODO(#19709): Remove the reference to optimismPortalInteropImpl when we remove OptimismPortalInterop from src
     struct Implementations {
         address superchainConfigImpl;
         address protocolVersionsImpl;

@@ -493,6 +493,8 @@ contract DeployImplementations is Script {
         _output.optimismPortalImpl = impl;
     }
 
+
+    /// TODO(#19709) remove this file and migrate fully to the OptimismPortal2
     function deployOptimismPortalInteropImpl(Input memory _input, Output memory _output) private {
         uint256 proofMaturityDelaySeconds = _input.proofMaturityDelaySeconds;
         IOptimismPortalInterop impl = IOptimismPortalInterop(

@@ -294,6 +294,11 @@
         "internalType": "contract IAnchorStateRegistry",
         "name": "_anchorStateRegistry",
         "type": "address"
+      },
+      {
+        "internalType": "contract IETHLockbox",
+        "name": "_ethLockbox",
+        "type": "address"
       }
     ],
     "name": "initialize",
@@ -314,6 +319,31 @@
     "stateMutability": "view",
     "type": "function"
   },
+  {
+    "inputs": [],
+    "name": "migrateLiquidity",
+    "outputs": [],
+    "stateMutability": "nonpayable",
+    "type": "function"
+  },
+  {
+    "inputs": [
+      {
+        "internalType": "contract IETHLockbox",
+        "name": "_newLockbox",
+        "type": "address"
+      },
+      {
+        "internalType": "contract IAnchorStateRegistry",
+        "name": "_newAnchorStateRegistry",
+        "type": "address"
+      }
+    ],
+    "name": "migrateToSharedDisputeGame",
+    "outputs": [],
+    "stateMutability": "nonpayable",
+    "type": "function"
+  },
   {
     "inputs": [
       {
@@ -627,6 +657,25 @@
     "stateMutability": "pure",
     "type": "function"
   },
+  {
+    "anonymous": false,
+    "inputs": [
+      {
+        "indexed": true,
+        "internalType": "address",
+        "name": "lockbox",
+        "type": "address"
+      },
+      {
+        "indexed": false,
+        "internalType": "uint256",
+        "name": "balance",
+        "type": "uint256"
+      }
+    ],
+    "name": "ETHMigrated",
+    "type": "event"
+  },
   {
     "anonymous": false,
     "inputs": [
@@ -640,6 +689,37 @@
     "name": "Initialized",
     "type": "event"
   },
+  {
+    "anonymous": false,
+    "inputs": [
+      {
+        "indexed": false,
+        "internalType": "contract IETHLockbox",
+        "name": "oldLockbox",
+        "type": "address"
+      },
+      {
+        "indexed": false,
+        "internalType": "contract IETHLockbox",
+        "name": "newLockbox",
+        "type": "address"
+      },
+      {
+        "indexed": false,
+        "internalType": "contract IAnchorStateRegistry",
+        "name": "oldAnchorStateRegistry",
+        "type": "address"
+      },
+      {
+        "indexed": false,
+        "internalType": "contract IAnchorStateRegistry",
+        "name": "newAnchorStateRegistry",
+        "type": "address"
+      }
+    ],
+    "name": "PortalMigrated",
+    "type": "event"
+  },
   {
     "anonymous": false,
     "inputs": [
@@ -819,6 +899,11 @@
     "name": "OptimismPortal_InvalidRootClaim",
     "type": "error"
   },
+  {
+    "inputs": [],
+    "name": "OptimismPortal_MigratingToSameRegistry",
+    "type": "error"
+  },
   {
     "inputs": [],
     "name": "OptimismPortal_NoReentrancy",
@@ -829,6 +914,11 @@
     "name": "OptimismPortal_NotAllowedOnCGTMode",
     "type": "error"
   },
+  {
+    "inputs": [],
+    "name": "OptimismPortal_NotUsingInterop",
+    "type": "error"
+  },
   {
     "inputs": [],
     "name": "OptimismPortal_ProofNotOldEnough",

@@ -339,7 +339,7 @@
         "type": "address"
       }
     ],
-    "name": "migrateToSuperRoots",
+    "name": "migrateToSharedDisputeGame",
     "outputs": [],
     "stateMutability": "nonpayable",
     "type": "function"

@@ -4,8 +4,8 @@
     "sourceCodeHash": "0xe772f7db8033e4a738850cb28ac4849d3a454c93732135a8a10d4f7cb498088e"
   },
   "src/L1/ETHLockbox.sol:ETHLockbox": {
-    "initCodeHash": "0x781079a80d379658eb4553622a9da86f7532ffa424f1e8957a82680ee9435f66",
-    "sourceCodeHash": "0xf4d9f6adc3d99d65b70df3255976980d36d37f8a4514ecc24d786dd03efdb7be"
+    "initCodeHash": "0xb2ff8426ab2eb36352f790748963c8e1f7a91caf16bee6a035c2c41bac532836",
+    "sourceCodeHash": "0x870004d5acc24a704277680f09ccca51a020a512e6c6d48cca583a23a0de43a2"
   },
   "src/L1/FeesDepositor.sol:FeesDepositor": {
     "initCodeHash": "0xe2ca240d728f711df438b7aeb3589c95ad11a97d742539a692ddafaf1365eb54",
@@ -24,20 +24,20 @@
     "sourceCodeHash": "0x9d16e900a764cd7f19db3656cf7a9e555b23b9c7e018641ed21566657847a314"
   },
   "src/L1/OPContractsManager.sol:OPContractsManager": {
-    "initCodeHash": "0xd59648acb50002957cfd952a0cc14a4d6c2a2f6cd3a0f7d485e61f633d4873f3",
-    "sourceCodeHash": "0x6d4ffaaa57441dec3c3ee8fd9ac59f95229defec405347af853e265bfd749235"
+    "initCodeHash": "0x01d04967c6597f401825dbb2f3e851e35593b12e89d31690d6a1c8874f1a7828",
+    "sourceCodeHash": "0x48c7027ea48fbd3edc91b55f6884d2ca12ec3f15600bdcb46308e70996f08ad2"
   },
   "src/L1/OPContractsManagerStandardValidator.sol:OPContractsManagerStandardValidator": {
-    "initCodeHash": "0x233f5f4b424bc2aabe170cf758c9ff80841ceab4c78e37edfe3a7bc660c5577d",
-    "sourceCodeHash": "0x7c0cb663f82b07da8dec8a7497cf2fa56a335fb5bdc57b612c86462f8527d4d5"
+    "initCodeHash": "0x0f526653885529a95b251f0854fe36ebcfebe54e05c264275fd4488538222d6f",
+    "sourceCodeHash": "0x351071d455ff5af83bc0edb52fd6a24a5e6917191e5443eb331fbf8dea21efb6"
   },
   "src/L1/OptimismPortal2.sol:OptimismPortal2": {
-    "initCodeHash": "0x8c296124bc1b1468cf301a434eebf3f0d9a194cde06876b993a8672577f08187",
-    "sourceCodeHash": "0xb14d8bceab135616e55fd560a077a4cc66fc3b535f09931d3b9167ee940fa62f"
+    "initCodeHash": "0x25efe4afd106a1e994f8ef92e7fda72a80d71edeb347d488f1cb0be59c760835",
+    "sourceCodeHash": "0xb14ab78410b24f848e2c56f13b76cc34df64b5c9fd845a6a64a1aea9dc652886"
   },
   "src/L1/OptimismPortalInterop.sol:OptimismPortalInterop": {
-    "initCodeHash": "0xbafd0b80deb0a834335052e32a4199a96121148d9bda05acb62535ac18bd9909",
-    "sourceCodeHash": "0x24373f3fd28c5c6ae93cc32e2a213bb47458bc0f36e81b2a7b20a7b6b0a97119"
+    "initCodeHash": "0xa7262e160851c0de73b96943a28141ea23d3337494f1c507ecfc66d8a8d83024",
+    "sourceCodeHash": "0x941a3ba130742d8671c27f230635614589e851ab685cd7094e2c4487c5e05585"
   },
   "src/L1/ProtocolVersions.sol:ProtocolVersions": {
     "initCodeHash": "0xcb59ad9a5ec2a0831b7f4daa74bdacba82ffa03035dafb499a732c641e017f4e",
@@ -52,8 +52,8 @@
     "sourceCodeHash": "0xb09cb2f7cbde8585fad5c5beb6811fa9044b156b4203da8005d3f6a7a68c30b2"
   },
   "src/L1/opcm/OPContractsManagerV2.sol:OPContractsManagerV2": {
-    "initCodeHash": "0x6c8af9dac0ff4dc0c783fcf8af06bde4d444ebab065c907785a24fd4f65f2414",
-    "sourceCodeHash": "0x937e16a99db4a376c8855b3df8eb529d19614c0fa3d5d7dbe334006bad1452a3"
+    "initCodeHash": "0x177c9727d6a6a450e279becd2a14103401ab3b177d820cc2af887aa3fe01c1f6",
+    "sourceCodeHash": "0x263e1d09fe1c1d7d4ed1f557866441bb256c82983815cb63c29f4d6a7ea73e88"
   },
   "src/L2/BaseFeeVault.sol:BaseFeeVault": {
     "initCodeHash": "0xf1fb169c6dd4eceb5cec6ed6dfa3affc45970e5a01e00827d06af1f9e8df026d",

@@ -73,9 +73,9 @@ contract ETHLockbox is ProxyAdminOwnedBase, Initializable, ReinitializableBase,
     mapping(IETHLockbox => bool) public authorizedLockboxes;
 
     /// @notice Semantic version.
-    /// @custom:semver 1.2.1
+    /// @custom:semver 1.3.1
     function version() public view virtual returns (string memory) {
-        return "1.2.1";
+        return "1.3.1";
     }
 
     /// @notice Constructs the ETHLockbox contract.
@@ -195,7 +195,7 @@ contract ETHLockbox is ProxyAdminOwnedBase, Initializable, ReinitializableBase,
     }
 
     /// @notice Migrates liquidity from the current ETH lockbox to another.
-    /// @dev    Must be called atomically with `OptimismPortal.migrateToSuperRoots()` in the same
+    /// @dev    Must be called atomically with `OptimismPortal.migrateToSharedDisputeGame()` in the same
     ///         transaction batch, or otherwise the OptimismPortal may not be able to unlock ETH
     ///         from the ETHLockbox on finalized withdrawals.
     /// @param _lockbox The address of the ETH lockbox to migrate liquidity to.

@@ -1172,6 +1172,7 @@ contract OPContractsManagerDeployer is OPContractsManagerBase {
         // the ETHLockbox in U16 and then upgrade to U16a.
         if (isDevFeatureEnabled(DevFeatures.OPTIMISM_PORTAL_INTEROP)) {
             output.systemConfigProxy.setFeature(Features.ETH_LOCKBOX, true);
+            output.systemConfigProxy.setFeature(Features.INTEROP, true);
         }
 
         // Initialize the OptimismPortal.
@@ -1335,7 +1336,10 @@ contract OPContractsManagerDeployer is OPContractsManagerBase {
         virtual
         returns (bytes memory)
     {
-        return abi.encodeCall(IOptimismPortal.initialize, (_output.systemConfigProxy, _output.anchorStateRegistryProxy));
+        return abi.encodeCall(
+            IOptimismPortal.initialize,
+            (_output.systemConfigProxy, _output.anchorStateRegistryProxy, IETHLockbox(address(0)))
+        );
     }
 
     /// @notice Helper method for encoding the OptimismPortalInterop initializer data.
@@ -1672,7 +1676,7 @@ contract OPContractsManagerInteropMigrator is OPContractsManagerBase {
             clearGameImplementation(oldDisputeGameFactory, GameTypes.SUPER_CANNON_KONA);
 
             // Migrate the portal to the new ETHLockbox and AnchorStateRegistry.
-            portals[i].migrateToSuperRoots(newEthLockbox, newAnchorStateRegistry);
+            portals[i].migrateToSharedDisputeGame(newEthLockbox, newAnchorStateRegistry);
         }
 
         // Separate context to avoid stack too deep.
@@ -1916,9 +1920,9 @@ contract OPContractsManager is ISemver {
     /// @dev This needs to stay at 6.x.x because the next release will ship OPCMv2. Since we are
     ///      not actually planning to release a 7.x.x of OPCMv1, it needs to stay at 6.x.x to avoid
     ///      errors in the versioning rules of OPCMv2.
-    /// @custom:semver 6.0.5
+    /// @custom:semver 6.1.5
     function version() public pure virtual returns (string memory) {
-        return "6.0.5";
+        return "6.1.5";
     }
 
     OPContractsManagerGameTypeAdder public immutable opcmGameTypeAdder;

@@ -40,8 +40,8 @@ import { IBigStepper } from "interfaces/dispute/IBigStepper.sol";
 /// before and after an upgrade.
 contract OPContractsManagerStandardValidator is ISemver {
     /// @notice The semantic version of the OPContractsManagerStandardValidator contract.
-    /// @custom:semver 2.5.0
-    string public constant version = "2.5.0";
+    /// @custom:semver 2.6.0
+    string public constant version = "2.6.0";
 
     /// @notice The SuperchainConfig contract.
     ISuperchainConfig public superchainConfig;
@@ -437,24 +437,22 @@ contract OPContractsManagerStandardValidator is ISemver {
     {
         IOptimismPortal2 _portal = IOptimismPortal2(payable(_sysCfg.optimismPortal()));
 
-        if (DevFeatures.isDevFeatureEnabled(devFeatureBitmap, DevFeatures.OPTIMISM_PORTAL_INTEROP)) {
-            _errors = internalRequire(
-                LibString.eq(getVersion(address(_portal)), string.concat(getVersion(optimismPortalInteropImpl))),
-                "PORTAL-10",
-                _errors
-            );
-            _errors = internalRequire(
-                getProxyImplementation(_admin, address(_portal)) == optimismPortalInteropImpl, "PORTAL-20", _errors
-            );
+        // Use the OptimismPortalInteropImpl only when OPTIMISM_PORTAL_INTEROP is enabled without OPCM_V2 (legacy path).
+        // With OPCM_V2, the portal is always optimismPortalImpl regardless of INTEROP.
+        address expectedPortalImpl;
+        if (isOPCMV1AndInterop(devFeatureBitmap)) {
+            expectedPortalImpl = optimismPortalInteropImpl;
         } else {
-            _errors = internalRequire(
-                LibString.eq(getVersion(address(_portal)), getVersion(optimismPortalImpl)), "PORTAL-10", _errors
-            );
-            _errors = internalRequire(
-                getProxyImplementation(_admin, address(_portal)) == optimismPortalImpl, "PORTAL-20", _errors
-            );
+            expectedPortalImpl = optimismPortalImpl;
         }
 
+        _errors = internalRequire(
+            LibString.eq(getVersion(address(_portal)), getVersion(expectedPortalImpl)), "PORTAL-10", _errors
+        );
+        _errors = internalRequire(
+            getProxyImplementation(_admin, address(_portal)) == expectedPortalImpl, "PORTAL-20", _errors
+        );
+
         IDisputeGameFactory _dgf = IDisputeGameFactory(_sysCfg.disputeGameFactory());
         _errors = internalRequire(address(_portal.disputeGameFactory()) == address(_dgf), "PORTAL-30", _errors);
         _errors = internalRequire(address(_portal.systemConfig()) == address(_sysCfg), "PORTAL-40", _errors);
@@ -767,6 +765,13 @@ contract OPContractsManagerStandardValidator is ISemver {
         return errors_;
     }
 
+    /// @notice Helper function to clean up branching logic in the assertValidOptimismPortal block where
+    /// The PortalImplementation address is conditional based on the feature flags currently set
+    function isOPCMV1AndInterop(bytes32 _devFeatureBitmap) internal pure returns (bool) {
+        return DevFeatures.isDevFeatureEnabled(_devFeatureBitmap, DevFeatures.OPTIMISM_PORTAL_INTEROP)
+            && !DevFeatures.isDevFeatureEnabled(_devFeatureBitmap, DevFeatures.OPCM_V2);
+    }
+
     /// @notice Returns true if the game type is a super game type.
     function isSuperGame(GameType _gameType) internal pure returns (bool) {
         return GameTypes.isSuperGame(_gameType);