opcm-standard-validator: Re-enable tests for v2 contracts, validate proposer (#17955)

* Add proposer field to StandarValidator.ValidationInput

* Update deploy to save PDG address depending on v2 feature flag

* Start working on tests

* Fix test that mocks a prestate value

* Move helpers into shared library

* Cut unnecessary bytes utils

* Update StandardValidator to check proposer

* Start updating tests to mock gameArgs

* Add game arg mocking helpers to DisputeGames.sol

* Add mock helpers for remaining game args

* Delete unused library

* Fix new asr and weth mock helpers

* Reorganize gameArg offsets

* Add tests for invalid weth, asr addresses

* Add tests for invalid game args

* Update expected dispute game version

* Fix stack-too-deep error

* Inject correct gametype for v2 games

* Fix handling of errors

* Pull game implementation handling into a helper method

* Skip gameType tests for v2 contracts

* Cut unused event

* Fix proposer value in upgrade tests

* Remove unused import

* Bump contract versions

* Run pre-pr

* Sticter testing: pull challenger, proposer values before upgrading

* Revert change to comment

* Make var naming more consistent

* Update semver-lock

* Avoid name conflict.

* Major version bump since ValidationInput changed.

---------

Co-authored-by: Adrian Sutton <[email protected]>

Author: mbaxter

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

@@ -27,6 +27,7 @@ interface IOPContractsManagerStandardValidator {
         ISystemConfig sysCfg;
         bytes32 absolutePrestate;
         uint256 l2ChainID;
+        address proposer;
     }
 
     struct ValidationOverrides {

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

@@ -22,6 +22,7 @@ import { StandardConstants } from "scripts/deploy/StandardConstants.sol";
 // Libraries
 import { Types } from "scripts/libraries/Types.sol";
 import { Duration } from "src/dispute/lib/LibUDT.sol";
+import { DevFeatures } from "src/libraries/DevFeatures.sol";
 import { GameType, Claim, GameTypes, Proposal, Hash } from "src/dispute/lib/Types.sol";
 
 // Interfaces
@@ -292,6 +293,9 @@ contract Deploy is Deployer {
         artifacts.save("OPContractsManager", address(dio.opcm));
         artifacts.save("DelayedWETHImpl", address(dio.delayedWETHImpl));
         artifacts.save("PreimageOracle", address(dio.preimageOracleSingleton));
+        if (DevFeatures.isDevFeatureEnabled(dio.opcm.devFeatureBitmap(), DevFeatures.DEPLOY_V2_DISPUTE_GAMES)) {
+            artifacts.save("PermissionedDisputeGame", address(dio.permissionedDisputeGameV2Impl));
+        }
 
         // Get a contract set from the implementation addresses which were just deployed.
         Types.ContractSet memory impls = ChainAssertions.dioToContractSet(dio);
@@ -357,9 +361,11 @@ contract Deploy is Deployer {
         artifacts.save("DisputeGameFactoryProxy", address(deployOutput.disputeGameFactoryProxy));
         artifacts.save("PermissionedDelayedWETHProxy", address(deployOutput.delayedWETHPermissionedGameProxy));
         artifacts.save("AnchorStateRegistryProxy", address(deployOutput.anchorStateRegistryProxy));
-        artifacts.save("PermissionedDisputeGame", address(deployOutput.permissionedDisputeGame));
         artifacts.save("OptimismPortalProxy", address(deployOutput.optimismPortalProxy));
         artifacts.save("OptimismPortal2Proxy", address(deployOutput.optimismPortalProxy));
+        if (!DevFeatures.isDevFeatureEnabled(opcm.devFeatureBitmap(), DevFeatures.DEPLOY_V2_DISPUTE_GAMES)) {
+            artifacts.save("PermissionedDisputeGame", address(deployOutput.permissionedDisputeGame));
+        }
 
         // Check if the permissionless game implementation is already set
         IDisputeGameFactory factory = IDisputeGameFactory(artifacts.mustGetAddress("DisputeGameFactoryProxy"));

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

@@ -847,6 +847,11 @@
             "internalType": "uint256",
             "name": "l2ChainID",
             "type": "uint256"
+          },
+          {
+            "internalType": "address",
+            "name": "proposer",
+            "type": "address"
           }
         ],
         "internalType": "struct OPContractsManagerStandardValidator.ValidationInput",
@@ -893,6 +898,11 @@
             "internalType": "uint256",
             "name": "l2ChainID",
             "type": "uint256"
+          },
+          {
+            "internalType": "address",
+            "name": "proposer",
+            "type": "address"
           }
         ],
         "internalType": "struct OPContractsManagerStandardValidator.ValidationInput",

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

@@ -354,6 +354,11 @@
             "internalType": "uint256",
             "name": "l2ChainID",
             "type": "uint256"
+          },
+          {
+            "internalType": "address",
+            "name": "proposer",
+            "type": "address"
           }
         ],
         "internalType": "struct OPContractsManagerStandardValidator.ValidationInput",
@@ -400,6 +405,11 @@
             "internalType": "uint256",
             "name": "l2ChainID",
             "type": "uint256"
+          },
+          {
+            "internalType": "address",
+            "name": "proposer",
+            "type": "address"
           }
         ],
         "internalType": "struct OPContractsManagerStandardValidator.ValidationInput",

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

@@ -20,12 +20,12 @@
     "sourceCodeHash": "0xfca613b5d055ffc4c3cbccb0773ddb9030abedc1aa6508c9e2e7727cc0cd617b"
   },
   "src/L1/OPContractsManager.sol:OPContractsManager": {
-    "initCodeHash": "0x1a1de93a1e15a32fd621b572211bd1ceccf82d5d2b936e0aa337ea7593c1ce19",
-    "sourceCodeHash": "0xbe7ceb48b39fc1d6c311b9d6dd9095ee72fa5cf82f72d27ec4511c97c01b02aa"
+    "initCodeHash": "0x0fec1db69fa99c31c4b13140bceee87419b8d3342cc952063a7a268242f3a199",
+    "sourceCodeHash": "0x2b0abd0e179a5449be392b301677554fa1d4f93af1083baa23f43ccf3cac9d02"
   },
   "src/L1/OPContractsManagerStandardValidator.sol:OPContractsManagerStandardValidator": {
-    "initCodeHash": "0x2eaa345ba05582c67b40a1eb7ec9d54823aa08468e697e2d6c04bb74cc574abc",
-    "sourceCodeHash": "0x30d7e4243a3bab7fea8504be2cd24f2c5ab3335b802d62282a374a458a08feec"
+    "initCodeHash": "0xe0e6d892d38211dc0165ca00dc1e8aa558eb7a1240560260e23262f066f6be72",
+    "sourceCodeHash": "0xe40f42a857c9b0905db4c91d61073d9dd572a6bc49921c5ee6e875cf54dc9407"
   },
   "src/L1/OptimismPortal2.sol:OptimismPortal2": {
     "initCodeHash": "0x5bf576ea7f566e402a997204988471fc9b971410aa9dff8fe810b10baf6b7456",

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

@@ -2153,9 +2153,9 @@ contract OPContractsManager is ISemver {
 
     // -------- Constants and Variables --------
 
-    /// @custom:semver 4.6.0
+    /// @custom:semver 5.0.0
     function version() public pure virtual returns (string memory) {
-        return "4.6.0";
+        return "5.0.0";
     }
 
     OPContractsManagerGameTypeAdder public immutable opcmGameTypeAdder;