ethereum-optimism · mbaxter · Oct 14, 2025 · Sep 10, 2025 · Sep 10, 2025 · Sep 11, 2025
@@ -7,5 +7,7 @@ import (
 )
 
 func TestMain(m *testing.M) {
-	presets.DoMain(m, presets.WithMinimal(), presets.WithDisputeGameV2())
+	// TODO(#17810): Use the new v2 dispute game flag via presets.WithDisputeGameV2()
+	//presets.DoMain(m, presets.WithMinimal(), presets.WithDisputeGameV2())
+	presets.DoMain(m, presets.WithMinimal())
 }
@@ -216,6 +216,8 @@ interface IOPContractsManager {
         address anchorStateRegistryImpl;
         address delayedWETHImpl;
         address mipsImpl;
+        address faultDisputeGameV2Impl;
+        address permissionedDisputeGameV2Impl;
     }
 
     /// @notice The input required to identify a chain for upgrading.
@@ -304,6 +306,8 @@ interface IOPContractsManager {
 
     error PrestateRequired();
 
+    error InvalidDevFeatureAccess(bytes32 devFeature);
+
     // -------- Methods --------
 
     function __constructor__(

@@ -157,7 +157,9 @@ contract DeployImplementations is Script {
             disputeGameFactoryImpl: address(_output.disputeGameFactoryImpl),
             anchorStateRegistryImpl: address(_output.anchorStateRegistryImpl),
             delayedWETHImpl: address(_output.delayedWETHImpl),
-            mipsImpl: address(_output.mipsSingleton)
+            mipsImpl: address(_output.mipsSingleton),
+            faultDisputeGameV2Impl: address(_output.faultDisputeGameV2Impl),
+            permissionedDisputeGameV2Impl: address(_output.permissionedDisputeGameV2Impl)
         });
 
         deployOPCMBPImplsContainer(_input, _output, _blueprints, implementations);

@@ -3,6 +3,7 @@ pragma solidity 0.8.15;
 
 import { Script } from "forge-std/Script.sol";
 
+import { DevFeatures } from "src/libraries/DevFeatures.sol";
 import { DeployUtils } from "scripts/libraries/DeployUtils.sol";
 import { Solarray } from "scripts/libraries/Solarray.sol";
 import { ChainAssertions } from "scripts/deploy/ChainAssertions.sol";
@@ -24,6 +25,7 @@ import { IL1ERC721Bridge } from "interfaces/L1/IL1ERC721Bridge.sol";
 import { IL1StandardBridge } from "interfaces/L1/IL1StandardBridge.sol";
 import { IOptimismMintableERC20Factory } from "interfaces/universal/IOptimismMintableERC20Factory.sol";
 import { IETHLockbox } from "interfaces/L1/IETHLockbox.sol";
+import { IOPContractsManager } from "../../interfaces/L1/IOPContractsManager.sol";
 
 contract DeployOPChain is Script {
     struct Output {
@@ -120,6 +122,13 @@ contract DeployOPChain is Script {
         checkOutput(_input, output_);
     }
 
+    // -------- Features --------
+
+    function isDevFeatureV2DisputeGamesEnabled(address _opcmAddr) internal view returns (bool) {
+        IOPContractsManager opcm = IOPContractsManager(_opcmAddr);
+        return DevFeatures.isDevFeatureEnabled(opcm.devFeatureBitmap(), DevFeatures.DEPLOY_V2_DISPUTE_GAMES);
+    }
+
     // -------- Validations --------
 
     function checkInput(Types.DeployOPChainInput memory _i) public view {
@@ -162,13 +171,19 @@ contract DeployOPChain is Script {
             address(_o.optimismPortalProxy),
             address(_o.disputeGameFactoryProxy),
             address(_o.anchorStateRegistryProxy),
-            address(_o.permissionedDisputeGame),
             address(_o.delayedWETHPermissionedGameProxy),
             address(_o.ethLockboxProxy)
         );
-        // TODO: Eventually switch from Permissioned to Permissionless. Add this address back in.
-        // address(_o.delayedWETHPermissionlessGameProxy)
-        // address(_o.faultDisputeGame()),
+
+        if (!isDevFeatureV2DisputeGamesEnabled(_i.opcm)) {
+            // Only check dispute game contracts if v2 dispute games are not enabled.
+            // When v2 contracts are enabled, we no longer deploy dispute games per chain
+            addrs2 = Solarray.extend(addrs2, Solarray.addresses(address(_o.permissionedDisputeGame)));
+
+            // TODO: Eventually switch from Permissioned to Permissionless. Add these addresses back in.
+            // address(_o.delayedWETHPermissionlessGameProxy)
+            // address(_o.faultDisputeGame()),
+        }
 
         DeployUtils.assertValidContractAddresses(Solarray.extend(addrs1, addrs2));
         _assertValidDeploy(_i, _o);
@@ -192,10 +207,17 @@ contract DeployOPChain is Script {
             SuperchainConfig: address(0)
         });
 
-        ChainAssertions.checkAnchorStateRegistryProxy(_o.anchorStateRegistryProxy, true);
+        // Check dispute games
+        address expectedPDGImpl = address(_o.permissionedDisputeGame);
+        if (isDevFeatureV2DisputeGamesEnabled(_i.opcm)) {
+            // With v2 game contracts enabled, we use the predeployed pdg implementation
+            expectedPDGImpl = IOPContractsManager(_i.opcm).implementations().permissionedDisputeGameV2Impl;
+        }
         ChainAssertions.checkDisputeGameFactory(
-            _o.disputeGameFactoryProxy, _i.opChainProxyAdminOwner, address(_o.permissionedDisputeGame), true
+            _o.disputeGameFactoryProxy, _i.opChainProxyAdminOwner, expectedPDGImpl, true
         );
+
+        ChainAssertions.checkAnchorStateRegistryProxy(_o.anchorStateRegistryProxy, true);
         ChainAssertions.checkL1CrossDomainMessenger(_o.l1CrossDomainMessengerProxy, vm, true);
         ChainAssertions.checkOptimismPortal2({
             _contracts: proxies,

@@ -12,6 +12,7 @@ import { LibString } from "@solady/utils/LibString.sol";
 import { Process } from "scripts/libraries/Process.sol";
 import { Config } from "scripts/libraries/Config.sol";
 import { Bytes } from "src/libraries/Bytes.sol";
+import { DevFeatures } from "src/libraries/DevFeatures.sol";
 
 // Interfaces
 import { IOPContractsManager } from "interfaces/L1/IOPContractsManager.sol";
@@ -113,6 +114,8 @@ contract VerifyOPCM is Script {
         fieldNameOverrides["optimismPortalInteropImpl"] = "OptimismPortalInterop";
         fieldNameOverrides["mipsImpl"] = "MIPS64";
         fieldNameOverrides["ethLockboxImpl"] = "ETHLockbox";
+        fieldNameOverrides["faultDisputeGameV2Impl"] = "FaultDisputeGameV2";
+        fieldNameOverrides["permissionedDisputeGameV2Impl"] = "PermissionedDisputeGameV2";
         fieldNameOverrides["permissionlessDisputeGame1"] = "FaultDisputeGame";
         fieldNameOverrides["permissionlessDisputeGame2"] = "FaultDisputeGame";
         fieldNameOverrides["permissionedDisputeGame1"] = "PermissionedDisputeGame";
@@ -177,8 +180,14 @@ contract VerifyOPCM is Script {
     /// @param _addr Address of the contract to verify.
     /// @param _skipConstructorVerification Whether to skip constructor verification.
     function runSingle(string memory _name, address _addr, bool _skipConstructorVerification) public {
+        // This function is used as part of the release checklist to verify new contracts.
+        // Rather than requiring an opcm input parameter, just pass in an empty reference
+        // as we really only need this for features that are in development.
+        IOPContractsManager emptyOpcm = IOPContractsManager(address(0));
         _verifyOpcmContractRef(
-            OpcmContractRef({ field: _name, name: _name, addr: _addr, blueprint: false }), _skipConstructorVerification
+            emptyOpcm,
+            OpcmContractRef({ field: _name, name: _name, addr: _addr, blueprint: false }),
+            _skipConstructorVerification
         );
     }
 
@@ -213,7 +222,7 @@ contract VerifyOPCM is Script {
         // Verify each reference.
         bool success = true;
         for (uint256 i = 0; i < refs.length; i++) {
-            success = _verifyOpcmContractRef(refs[i], _skipConstructorVerification) && success;
+            success = _verifyOpcmContractRef(opcm, refs[i], _skipConstructorVerification) && success;
         }
 
         // Final Result
@@ -381,16 +390,20 @@ contract VerifyOPCM is Script {
     }
 
     /// @notice Verifies a single OPCM contract reference (implementation or bytecode).
+    /// @param _opcm The OPCM contract that contains the target contract reference.
     /// @param _target The target contract reference to verify.
     /// @param _skipConstructorVerification Whether to skip constructor verification.
     /// @return True if the contract reference is verified, false otherwise.
     function _verifyOpcmContractRef(
+        IOPContractsManager _opcm,
         OpcmContractRef memory _target,
         bool _skipConstructorVerification
     )
         internal
         returns (bool)
     {
+        bool success = true;
+
         console.log();
         console.log(string.concat("Checking Contract: ", _target.field));
         console.log(string.concat("  Type: ", _target.blueprint ? "Blueprint" : "Implementation"));
@@ -401,6 +414,20 @@ contract VerifyOPCM is Script {
         string memory artifactPath = _buildArtifactPath(_target.name);
         console.log(string.concat("  Expected Runtime Artifact: ", artifactPath));
 
+        // Check if this is a V2 dispute game that should be skipped
+        if (_isV2DisputeGameImplementation(_target.name)) {
+            if (!_isV2DisputeGamesEnabled(_opcm)) {
+                if (_target.addr == address(0)) {
+                    console.log("[SKIP] V2 dispute game not deployed (feature disabled)");
+                    return true; // Consider this "verified" when feature is off
+                } else {
+                    console.log("[FAIL] ERROR: V2 dispute game deployed but feature disabled");
+                    success = false;
+                }
+            }
+            // If feature is enabled, continue with normal verification
+        }
+
         // Load artifact information (bytecode, immutable refs) for detailed comparison
         ArtifactInfo memory artifact = _loadArtifactInfo(artifactPath);
 
@@ -442,7 +469,7 @@ contract VerifyOPCM is Script {
         }
 
         // Perform detailed bytecode comparison.
-        bool success = _compareBytecode(actualCode, expectedCode, _target.name, artifact, !_target.blueprint);
+        success = _compareBytecode(actualCode, expectedCode, _target.name, artifact, !_target.blueprint) && success;
 
         // If requested and this is not a blueprint, we also need to check the creation code.
         if (!_target.blueprint && !_skipConstructorVerification) {
@@ -497,6 +524,22 @@ contract VerifyOPCM is Script {
         return success;
     }
 
+    /// @notice Checks if V2 dispute games feature is enabled in the dev feature bitmap.
+    /// @param _opcm The OPContractsManager to check.
+    /// @return True if V2 dispute games are enabled.
+    function _isV2DisputeGamesEnabled(IOPContractsManager _opcm) internal view returns (bool) {
+        bytes32 bitmap = _opcm.devFeatureBitmap();
+        return DevFeatures.isDevFeatureEnabled(bitmap, DevFeatures.DEPLOY_V2_DISPUTE_GAMES);
+    }
+
+    /// @notice Checks if a contract is a V2 dispute game implementation.
+    /// @param _contractName The name to check.
+    /// @return True if this is a V2 dispute game.
+    function _isV2DisputeGameImplementation(string memory _contractName) internal pure returns (bool) {
+        return LibString.eq(_contractName, "FaultDisputeGameV2")
+            || LibString.eq(_contractName, "PermissionedDisputeGameV2");
+    }
+
     /// @notice Verifies that the immutable variables in the OPCM contract match expected values.
     /// @param _opcm The OPCM contract to verify immutable variables for.
     /// @return True if all immutable variables are verified, false otherwise.

@@ -525,6 +525,16 @@
             "internalType": "address",
             "name": "mipsImpl",
             "type": "address"
+          },
+          {
+            "internalType": "address",
+            "name": "faultDisputeGameV2Impl",
+            "type": "address"
+          },
+          {
+            "internalType": "address",
+            "name": "permissionedDisputeGameV2Impl",
+            "type": "address"
           }
         ],
         "internalType": "struct OPContractsManager.Implementations",
@@ -991,6 +1001,17 @@
     "name": "InvalidChainId",
     "type": "error"
   },
+  {
+    "inputs": [
+      {
+        "internalType": "bytes32",
+        "name": "devFeature",
+        "type": "bytes32"
+      }
+    ],
+    "name": "InvalidDevFeatureAccess",
+    "type": "error"
+  },
   {
     "inputs": [],
     "name": "InvalidGameConfigs",

@@ -144,6 +144,16 @@
             "internalType": "address",
             "name": "mipsImpl",
             "type": "address"
+          },
+          {
+            "internalType": "address",
+            "name": "faultDisputeGameV2Impl",
+            "type": "address"
+          },
+          {
+            "internalType": "address",
+            "name": "permissionedDisputeGameV2Impl",
+            "type": "address"
           }
         ],
         "internalType": "struct OPContractsManager.Implementations",
@@ -340,6 +350,16 @@
             "internalType": "address",
             "name": "mipsImpl",
             "type": "address"
+          },
+          {
+            "internalType": "address",
+            "name": "faultDisputeGameV2Impl",
+            "type": "address"
+          },
+          {
+            "internalType": "address",
+            "name": "permissionedDisputeGameV2Impl",
+            "type": "address"
           }
         ],
         "internalType": "struct OPContractsManager.Implementations",

@@ -428,6 +428,16 @@
             "internalType": "address",
             "name": "mipsImpl",
             "type": "address"
+          },
+          {
+            "internalType": "address",
+            "name": "faultDisputeGameV2Impl",
+            "type": "address"
+          },
+          {
+            "internalType": "address",
+            "name": "permissionedDisputeGameV2Impl",
+            "type": "address"
           }
         ],
         "internalType": "struct OPContractsManager.Implementations",
@@ -518,6 +528,17 @@
     "name": "InvalidChainId",
     "type": "error"
   },
+  {
+    "inputs": [
+      {
+        "internalType": "bytes32",
+        "name": "devFeature",
+        "type": "bytes32"
+      }
+    ],
+    "name": "InvalidDevFeatureAccess",
+    "type": "error"
+  },
   {
     "inputs": [
       {

@@ -321,6 +321,16 @@
             "internalType": "address",
             "name": "mipsImpl",
             "type": "address"
+          },
+          {
+            "internalType": "address",
+            "name": "faultDisputeGameV2Impl",
+            "type": "address"
+          },
+          {
+            "internalType": "address",
+            "name": "permissionedDisputeGameV2Impl",
+            "type": "address"
           }
         ],
         "internalType": "struct OPContractsManager.Implementations",

@@ -223,6 +223,16 @@
             "internalType": "address",
             "name": "mipsImpl",
             "type": "address"
+          },
+          {
+            "internalType": "address",
+            "name": "faultDisputeGameV2Impl",
+            "type": "address"
+          },
+          {
+            "internalType": "address",
+            "name": "permissionedDisputeGameV2Impl",
+            "type": "address"
           }
         ],
         "internalType": "struct OPContractsManager.Implementations",

@@ -223,6 +223,16 @@
             "internalType": "address",
             "name": "mipsImpl",
             "type": "address"
+          },
+          {
+            "internalType": "address",
+            "name": "faultDisputeGameV2Impl",
+            "type": "address"
+          },
+          {
+            "internalType": "address",
+            "name": "permissionedDisputeGameV2Impl",
+            "type": "address"
           }
         ],
         "internalType": "struct OPContractsManager.Implementations",

@@ -20,8 +20,8 @@
     "sourceCodeHash": "0xfca613b5d055ffc4c3cbccb0773ddb9030abedc1aa6508c9e2e7727cc0cd617b"
   },
   "src/L1/OPContractsManager.sol:OPContractsManager": {
-    "initCodeHash": "0x9f9a3738b05cae6597ea9a5c5747f7dbd3a5328b05a319955054fbd8b1aaa791",
-    "sourceCodeHash": "0x154c764083f353e2a56337c0dd5cbcd6f2e12c21966cd0580c7a0f96c4e147dd"
+    "initCodeHash": "0x42721744f90fa46ee680fecc69da2e5caf7fdd8093c2a7f3b33958e574a15579",
+    "sourceCodeHash": "0x3eab23f3f034eec77afb620a122e51fded9214b5ed6a4c5663e0174714ae0f5e"
   },
   "src/L1/OPContractsManagerStandardValidator.sol:OPContractsManagerStandardValidator": {
     "initCodeHash": "0x57d6a6729d887ead009d518e8f17fa0d26bfc97b8efe1494ab4ef8dbb000d109",