feat: updated standard validator tests

op-validator/pkg/validations/codes.go

@@ -10,7 +10,7 @@ var descriptions = map[string]string{
 	// SystemConfig validations
 	"SYSCON-10":  "SystemConfig version mismatch",
 	"SYSCON-20":  "SystemConfig gas limit is not set to 60,000,000",
-	"SYSCON-30":  "SystemConfig scalar is not set to 1",
+	"SYSCON-30":  "SystemConfig scalar is set to zero",
 	"SYSCON-40":  "SystemConfig implementation address mismatch",
 	"SYSCON-50":  "SystemConfig maxResourceLimit is not set to 20,000,000",
 	"SYSCON-60":  "SystemConfig elasticityMultiplier is not set to 10",

packages/contracts-bedrock/deploy-config/hardhat.json

@@ -44,15 +44,15 @@
   "requiredProtocolVersion": "0x0000000000000000000000000000000000000000000000000000000000000001",
   "recommendedProtocolVersion": "0x0000000000000000000000000000000000000000000000000000000000000001",
   "faultGameAbsolutePrestate": "0x0000000000000000000000000000000000000000000000000000000000000000",
-  "faultGameMaxDepth": 8,
-  "faultGameClockExtension": 0,
-  "faultGameMaxClockDuration": 1200,
+  "faultGameMaxDepth": 73,
+  "faultGameClockExtension": 10800,
+  "faultGameMaxClockDuration": 302400,
   "faultGameGenesisBlock": 0,
   "faultGameGenesisOutputRoot": "0xDEADBEEFDEADBEEFDEADBEEFDEADBEEFDEADBEEFDEADBEEFDEADBEEFDEADBEEF",
-  "faultGameSplitDepth": 4,
-  "faultGameWithdrawalDelay": 604800,
-  "preimageOracleMinProposalSize": 10000,
-  "preimageOracleChallengePeriod": 120,
+  "faultGameSplitDepth": 30,
+  "faultGameWithdrawalDelay": 302400,
+  "preimageOracleMinProposalSize": 126000,
+  "preimageOracleChallengePeriod": 86400,
   "proofMaturityDelaySeconds": 12,
   "disputeGameFinalityDelaySeconds": 6,
   "respectedGameType": 0,

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

@@ -277,6 +277,7 @@ contract Deploy is Deployer {
 
         // Save the implementation addresses which are needed outside of this function or script.
         // When called in a fork test, this will overwrite the existing implementations.
+        artifacts.save("PreimageOracle", address(dio.preimageOracleSingleton));
         artifacts.save("MipsSingleton", address(dio.mipsSingleton));
         artifacts.save("OPContractsManager", address(dio.opcm));
         artifacts.save("DelayedWETHImpl", address(dio.delayedWETHImpl));
@@ -353,6 +354,7 @@ contract Deploy is Deployer {
         artifacts.save("PermissionedDisputeGame", address(deployOutput.permissionedDisputeGame));
         artifacts.save("OptimismPortalProxy", address(deployOutput.optimismPortalProxy));
         artifacts.save("OptimismPortal2Proxy", address(deployOutput.optimismPortalProxy));
+
         // Check if the permissionless game implementation is already set
         IDisputeGameFactory factory = IDisputeGameFactory(artifacts.mustGetAddress("DisputeGameFactoryProxy"));
         address permissionlessGameImpl = address(factory.gameImpls(GameTypes.CANNON));

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

@@ -88,23 +88,23 @@ contract StandardValidator {
     }
 
     function systemConfigVersion() public pure returns (string memory) {
-        return "2.5.0";
+        return "3.2.0";
     }
 
     function optimismPortalVersion() public pure returns (string memory) {
-        return "3.14.0";
+        return "4.4.0";
     }
 
     function l1CrossDomainMessengerVersion() public pure returns (string memory) {
-        return "2.6.0";
+        return "2.8.0";
     }
 
     function l1ERC721BridgeVersion() public pure returns (string memory) {
-        return "2.4.0";
+        return "2.6.0";
     }
 
     function l1StandardBridgeVersion() public pure returns (string memory) {
-        return "2.3.0";
+        return "2.5.0";
     }
 
     function mipsVersion() public pure returns (string memory) {
@@ -116,19 +116,19 @@ contract StandardValidator {
     }
 
     function disputeGameFactoryVersion() public pure returns (string memory) {
-        return "1.0.1";
+        return "1.1.0";
     }
 
     function anchorStateRegistryVersion() public pure returns (string memory) {
-        return "2.2.2";
+        return "3.4.0";
     }
 
     function delayedWETHVersion() public pure returns (string memory) {
-        return "1.3.0";
+        return "1.5.0";
     }
 
     function permissionedDisputeGameVersion() public pure returns (string memory) {
-        return "1.4.1";
+        return "1.6.0";
     }
 
     function preimageOracleVersion() public pure returns (string memory) {
@@ -158,7 +158,7 @@ contract StandardValidator {
         ISemver _semver = ISemver(address(_sysCfg));
         _errors = internalRequire(stringEq(_semver.version(), systemConfigVersion()), "SYSCON-10", _errors);
         _errors = internalRequire(_sysCfg.gasLimit() <= uint64(200_000_000), "SYSCON-20", _errors);
-        _errors = internalRequire(_sysCfg.scalar() >> 248 == 1, "SYSCON-30", _errors);
+        _errors = internalRequire(_sysCfg.scalar() != 0, "SYSCON-30", _errors);
         _errors =
             internalRequire(_admin.getProxyImplementation(address(_sysCfg)) == systemConfigImpl, "SYSCON-40", _errors);