feat: opcm creator pattern integrate addGameType for v2 games

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

@@ -14,6 +14,8 @@ import { ISuperchainConfig } from "interfaces/L1/ISuperchainConfig.sol";
 import { IDisputeGameFactory } from "interfaces/dispute/IDisputeGameFactory.sol";
 import { IFaultDisputeGame } from "interfaces/dispute/IFaultDisputeGame.sol";
 import { IPermissionedDisputeGame } from "interfaces/dispute/IPermissionedDisputeGame.sol";
+import { IFaultDisputeGameV2 } from "interfaces/dispute/v2/IFaultDisputeGameV2.sol";
+import { IPermissionedDisputeGameV2 } from "interfaces/dispute/v2/IPermissionedDisputeGameV2.sol";
 import { IProtocolVersions } from "interfaces/L1/IProtocolVersions.sol";
 import { IOptimismPortal2 } from "interfaces/L1/IOptimismPortal2.sol";
 import { ISystemConfig } from "interfaces/L1/ISystemConfig.sol";
@@ -177,6 +179,9 @@ interface IOPContractsManager {
         IPermissionedDisputeGame permissionedDisputeGame;
         IDelayedWETH delayedWETHPermissionedGameProxy;
         IDelayedWETH delayedWETHPermissionlessGameProxy;
+        // V2 dispute game contracts (deployed when DEPLOY_V2_DISPUTE_GAMES flag is set)
+        IFaultDisputeGameV2 faultDisputeGameV2;
+        IPermissionedDisputeGameV2 permissionedDisputeGameV2;
     }
 
     /// @notice Addresses of ERC-5202 Blueprint contracts. There are used for deploying full size
@@ -216,6 +221,8 @@ interface IOPContractsManager {
         address anchorStateRegistryImpl;
         address delayedWETHImpl;
         address mipsImpl;
+        address faultDisputeGameV2Impl;
+        address permissionedDisputeGameV2Impl;
     }
 
     /// @notice The input required to identify a chain for upgrading.

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

@@ -158,7 +158,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);

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

@@ -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";
@@ -106,13 +107,18 @@ contract VerifyOPCM is Script {
     /// @notice Setup flag.
     bool internal ready;
 
+    /// @notice The OPCM address being verified, stored to access during contract verification.
+    address internal currentOpcmAddress;
     /// @notice Populates override mappings.
+
     function setUp() public {
         // Overrides for situations where field names do not cleanly map to contract names.
         fieldNameOverrides["optimismPortalImpl"] = "OptimismPortal2";
         fieldNameOverrides["optimismPortalInteropImpl"] = "OptimismPortalInterop";
         fieldNameOverrides["mipsImpl"] = "MIPS64";
         fieldNameOverrides["ethLockboxImpl"] = "ETHLockbox";
+        fieldNameOverrides["faultDisputeGameV2Impl"] = "FaultDisputeGameV2";
+        fieldNameOverrides["permissionedDisputeGameV2Impl"] = "PermissionedDisputeGameV2";
         fieldNameOverrides["permissionlessDisputeGame1"] = "FaultDisputeGame";
         fieldNameOverrides["permissionlessDisputeGame2"] = "FaultDisputeGame";
         fieldNameOverrides["permissionedDisputeGame1"] = "PermissionedDisputeGame";
@@ -199,6 +205,9 @@ contract VerifyOPCM is Script {
             console.log("         Do NOT do this in production");
         }
 
+        // Store OPCM address for use in verification functions
+        currentOpcmAddress = _opcmAddress;
+
         // Fetch Implementations & Blueprints from OPCM
         IOPContractsManager opcm = IOPContractsManager(_opcmAddress);
 
@@ -394,6 +403,25 @@ contract VerifyOPCM is Script {
     {
         console.log();
         console.log(string.concat("Checking Contract: ", _target.field));
+        // Check if this is a V2 dispute game that should be skipped
+        if (_isV2DisputeGameImplementation(_target.name)) {
+            IOPContractsManager opcm = IOPContractsManager(currentOpcmAddress);
+
+            if (!_isV2DisputeGamesEnabled(opcm)) {
+                if (_target.addr == address(0)) {
+                    console.log("  [SKIP] V2 dispute game not deployed (feature disabled)");
+                    console.log(string.concat("  Contract: ", _target.name));
+                    return true; // Consider this "verified" when feature is off
+                } else {
+                    console.log("  [FAIL] V2 dispute game deployed but feature disabled");
+                    console.log(string.concat("  Contract: ", _target.name));
+                    console.log(string.concat("  Address: ", vm.toString(_target.addr)));
+                    return false;
+                }
+            }
+            // If feature is enabled, continue with normal verification
+        }
+
         console.log(string.concat("  Type: ", _target.blueprint ? "Blueprint" : "Implementation"));
         console.log(string.concat("  Contract: ", _target.name));
         console.log(string.concat("  Address: ", vm.toString(_target.addr)));
@@ -498,6 +526,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.

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

@@ -432,6 +432,16 @@
             "internalType": "contract IDelayedWETH",
             "name": "delayedWETHPermissionlessGameProxy",
             "type": "address"
+          },
+          {
+            "internalType": "contract IFaultDisputeGameV2",
+            "name": "faultDisputeGameV2",
+            "type": "address"
+          },
+          {
+            "internalType": "contract IPermissionedDisputeGameV2",
+            "name": "permissionedDisputeGameV2",
+            "type": "address"
           }
         ],
         "internalType": "struct OPContractsManager.DeployOutput",
@@ -530,6 +540,16 @@
             "internalType": "address",
             "name": "mipsImpl",
             "type": "address"
+          },
+          {
+            "internalType": "address",
+            "name": "faultDisputeGameV2Impl",
+            "type": "address"
+          },
+          {
+            "internalType": "address",
+            "name": "permissionedDisputeGameV2Impl",
+            "type": "address"
           }
         ],
         "internalType": "struct OPContractsManager.Implementations",

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

@@ -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",

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

@@ -330,6 +330,16 @@
             "internalType": "contract IDelayedWETH",
             "name": "delayedWETHPermissionlessGameProxy",
             "type": "address"
+          },
+          {
+            "internalType": "contract IFaultDisputeGameV2",
+            "name": "faultDisputeGameV2",
+            "type": "address"
+          },
+          {
+            "internalType": "contract IPermissionedDisputeGameV2",
+            "name": "permissionedDisputeGameV2",
+            "type": "address"
           }
         ],
         "internalType": "struct OPContractsManager.DeployOutput",
@@ -428,6 +438,16 @@
             "internalType": "address",
             "name": "mipsImpl",
             "type": "address"
+          },
+          {
+            "internalType": "address",
+            "name": "faultDisputeGameV2Impl",
+            "type": "address"
+          },
+          {
+            "internalType": "address",
+            "name": "permissionedDisputeGameV2Impl",
+            "type": "address"
           }
         ],
         "internalType": "struct OPContractsManager.Implementations",

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

@@ -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",

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

@@ -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",

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

@@ -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",

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

@@ -20,8 +20,8 @@
     "sourceCodeHash": "0xfca613b5d055ffc4c3cbccb0773ddb9030abedc1aa6508c9e2e7727cc0cd617b"
   },
   "src/L1/OPContractsManager.sol:OPContractsManager": {
-    "initCodeHash": "0xf414fb79a8941d3ff24f7c6ae65ccee0927c78bd444b20540db9e3376cf2e9e2",
-    "sourceCodeHash": "0x74a5c3a080db33be6780c9b9bff37c0ce46b4335d6a35148e080a8c2096cd2c8"
+    "initCodeHash": "0xfea70b2646110201bc6e5cdc33033a764c9bdc1f1c8696c6100f1da5767c3e18",
+    "sourceCodeHash": "0x49d0020391f7814c2063f33aafc28dfd94cd6e0314e3c05b9ad8fa951d811506"
   },
   "src/L1/OPContractsManagerStandardValidator.sol:OPContractsManagerStandardValidator": {
     "initCodeHash": "0xcc5dacb9e1c2b9395aa5f9c300f03c18af1ff5a9efd6a7ce4d5135dfbe7b1e2b",

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

@@ -7,7 +7,7 @@
     "type": "struct OPContractsManager.Blueprints"
   },
   {
-    "bytes": "448",
+    "bytes": "512",
     "label": "implementation",
     "offset": 0,
     "slot": "13",