ctb: Implement addGameType method on OPCM (#13653)

Author: mslipper

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

@@ -9,8 +9,6 @@ import { IResourceMetering } from "interfaces/L1/IResourceMetering.sol";
 import { ISuperchainConfig } from "interfaces/L1/ISuperchainConfig.sol";
 import { IProtocolVersions } from "interfaces/L1/IProtocolVersions.sol";
 
-import { Bytes } from "src/libraries/Bytes.sol";
-
 import { IDelayedWETH } from "interfaces/dispute/IDelayedWETH.sol";
 import { IPreimageOracle } from "interfaces/cannon/IPreimageOracle.sol";
 import { IMIPS } from "interfaces/cannon/IMIPS.sol";
@@ -493,14 +491,22 @@ contract DeployImplementations is Script {
             bytes32 salt = _dii.salt();
             OPContractsManager.Blueprints memory blueprints;
 
+            address checkAddress;
             vm.startBroadcast(msg.sender);
-            blueprints.addressManager = deployBytecode(Blueprint.blueprintDeployerBytecode(vm.getCode("AddressManager")), salt);
-            blueprints.proxy = deployBytecode(Blueprint.blueprintDeployerBytecode(vm.getCode("Proxy")), salt);
-            blueprints.proxyAdmin = deployBytecode(Blueprint.blueprintDeployerBytecode(vm.getCode("ProxyAdmin")), salt);
-            blueprints.l1ChugSplashProxy = deployBytecode(Blueprint.blueprintDeployerBytecode(vm.getCode("L1ChugSplashProxy")), salt);
-            blueprints.resolvedDelegateProxy = deployBytecode(Blueprint.blueprintDeployerBytecode(vm.getCode("ResolvedDelegateProxy")), salt);
-            blueprints.anchorStateRegistry = deployBytecode(Blueprint.blueprintDeployerBytecode(vm.getCode("AnchorStateRegistry")), salt);
-            (blueprints.permissionedDisputeGame1, blueprints.permissionedDisputeGame2)  = deployBigBytecode(vm.getCode("PermissionedDisputeGame"), salt);
+            (blueprints.addressManager, checkAddress) = Blueprint.create(vm.getCode("AddressManager"), salt);
+            require(checkAddress == address(0), "OPCM-10");
+            (blueprints.proxy, checkAddress) = Blueprint.create(vm.getCode("Proxy"), salt);
+            require(checkAddress == address(0), "OPCM-20");
+            (blueprints.proxyAdmin, checkAddress) = Blueprint.create(vm.getCode("ProxyAdmin"), salt);
+            require(checkAddress == address(0), "OPCM-30");
+            (blueprints.l1ChugSplashProxy, checkAddress) = Blueprint.create(vm.getCode("L1ChugSplashProxy"), salt);
+            require(checkAddress == address(0), "OPCM-40");
+            (blueprints.resolvedDelegateProxy, checkAddress) = Blueprint.create(vm.getCode("ResolvedDelegateProxy"), salt);
+            require(checkAddress == address(0), "OPCM-50");
+            (blueprints.anchorStateRegistry, checkAddress) = Blueprint.create(vm.getCode("AnchorStateRegistry"), salt);
+            require(checkAddress == address(0), "OPCM-60");
+            (blueprints.permissionedDisputeGame1, blueprints.permissionedDisputeGame2) = Blueprint.create(vm.getCode("PermissionedDisputeGame"), salt);
+            (blueprints.permissionlessDisputeGame1, blueprints.permissionlessDisputeGame2) = Blueprint.create(vm.getCode("FaultDisputeGame"), salt);
             vm.stopBroadcast();
             // forgefmt: disable-end
 
@@ -862,33 +868,6 @@ contract DeployImplementations is Script {
         dio_ = DeployImplementationsOutput(DeployUtils.toIOAddress(msg.sender, "optimism.DeployImplementationsOutput"));
     }
 
-    function deployBytecode(bytes memory _bytecode, bytes32 _salt) public returns (address newContract_) {
-        assembly ("memory-safe") {
-            newContract_ := create2(0, add(_bytecode, 0x20), mload(_bytecode), _salt)
-        }
-        require(newContract_ != address(0), "DeployImplementations: create2 failed");
-    }
-
-    function deployBigBytecode(
-        bytes memory _bytecode,
-        bytes32 _salt
-    )
-        public
-        returns (address newContract1_, address newContract2_)
-    {
-        // Preamble needs 3 bytes.
-        uint256 maxInitCodeSize = 24576 - 3;
-        require(_bytecode.length > maxInitCodeSize, "DeployImplementations: Use deployBytecode instead");
-
-        bytes memory part1Slice = Bytes.slice(_bytecode, 0, maxInitCodeSize);
-        bytes memory part1 = Blueprint.blueprintDeployerBytecode(part1Slice);
-        bytes memory part2Slice = Bytes.slice(_bytecode, maxInitCodeSize, _bytecode.length - maxInitCodeSize);
-        bytes memory part2 = Blueprint.blueprintDeployerBytecode(part2Slice);
-
-        newContract1_ = deployBytecode(part1, _salt);
-        newContract2_ = deployBytecode(part2, _salt);
-    }
-
     // Zero address is returned if the address is not found in '_standardVersionsToml'.
     function getReleaseAddress(
         string memory _version,

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

@@ -198,7 +198,9 @@ contract DeployOPCM is Script {
             resolvedDelegateProxy: _doi.resolvedDelegateProxyBlueprint(),
             anchorStateRegistry: _doi.anchorStateRegistryBlueprint(),
             permissionedDisputeGame1: _doi.permissionedDisputeGame1Blueprint(),
-            permissionedDisputeGame2: _doi.permissionedDisputeGame2Blueprint()
+            permissionedDisputeGame2: _doi.permissionedDisputeGame2Blueprint(),
+            permissionlessDisputeGame1: address(0),
+            permissionlessDisputeGame2: address(0)
         });
         OPContractsManager.Implementations memory implementations = OPContractsManager.Implementations({
             l1ERC721BridgeImpl: address(_doi.l1ERC721BridgeImpl()),

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

@@ -57,6 +57,16 @@
             "internalType": "address",
             "name": "permissionedDisputeGame2",
             "type": "address"
+          },
+          {
+            "internalType": "address",
+            "name": "permissionlessDisputeGame1",
+            "type": "address"
+          },
+          {
+            "internalType": "address",
+            "name": "permissionlessDisputeGame2",
+            "type": "address"
           }
         ],
         "internalType": "struct OPContractsManager.Blueprints",
@@ -132,6 +142,104 @@
     "stateMutability": "view",
     "type": "function"
   },
+  {
+    "inputs": [
+      {
+        "components": [
+          {
+            "internalType": "string",
+            "name": "saltMixer",
+            "type": "string"
+          },
+          {
+            "internalType": "contract ISystemConfig",
+            "name": "systemConfig",
+            "type": "address"
+          },
+          {
+            "internalType": "contract IProxyAdmin",
+            "name": "proxyAdmin",
+            "type": "address"
+          },
+          {
+            "internalType": "contract IDelayedWETH",
+            "name": "delayedWETH",
+            "type": "address"
+          },
+          {
+            "internalType": "GameType",
+            "name": "disputeGameType",
+            "type": "uint32"
+          },
+          {
+            "internalType": "Claim",
+            "name": "disputeAbsolutePrestate",
+            "type": "bytes32"
+          },
+          {
+            "internalType": "uint256",
+            "name": "disputeMaxGameDepth",
+            "type": "uint256"
+          },
+          {
+            "internalType": "uint256",
+            "name": "disputeSplitDepth",
+            "type": "uint256"
+          },
+          {
+            "internalType": "Duration",
+            "name": "disputeClockExtension",
+            "type": "uint64"
+          },
+          {
+            "internalType": "Duration",
+            "name": "disputeMaxClockDuration",
+            "type": "uint64"
+          },
+          {
+            "internalType": "uint256",
+            "name": "initialBond",
+            "type": "uint256"
+          },
+          {
+            "internalType": "contract IBigStepper",
+            "name": "vm",
+            "type": "address"
+          },
+          {
+            "internalType": "bool",
+            "name": "permissioned",
+            "type": "bool"
+          }
+        ],
+        "internalType": "struct OPContractsManager.AddGameInput[]",
+        "name": "_gameConfigs",
+        "type": "tuple[]"
+      }
+    ],
+    "name": "addGameType",
+    "outputs": [
+      {
+        "components": [
+          {
+            "internalType": "contract IDelayedWETH",
+            "name": "delayedWETH",
+            "type": "address"
+          },
+          {
+            "internalType": "contract IFaultDisputeGame",
+            "name": "faultDisputeGame",
+            "type": "address"
+          }
+        ],
+        "internalType": "struct OPContractsManager.AddGameOutput[]",
+        "name": "",
+        "type": "tuple[]"
+      }
+    ],
+    "stateMutability": "nonpayable",
+    "type": "function"
+  },
   {
     "inputs": [],
     "name": "blueprints",
@@ -177,6 +285,16 @@
             "internalType": "address",
             "name": "permissionedDisputeGame2",
             "type": "address"
+          },
+          {
+            "internalType": "address",
+            "name": "permissionlessDisputeGame1",
+            "type": "address"
+          },
+          {
+            "internalType": "address",
+            "name": "permissionlessDisputeGame2",
+            "type": "address"
           }
         ],
         "internalType": "struct OPContractsManager.Blueprints",
@@ -596,6 +714,11 @@
     "name": "InvalidChainId",
     "type": "error"
   },
+  {
+    "inputs": [],
+    "name": "InvalidGameConfigs",
+    "type": "error"
+  },
   {
     "inputs": [
       {
@@ -622,6 +745,11 @@
     "name": "NotABlueprint",
     "type": "error"
   },
+  {
+    "inputs": [],
+    "name": "OnlyDelegatecall",
+    "type": "error"
+  },
   {
     "inputs": [],
     "name": "ReservedBitsSet",