Merge pull request #7710 from ethereum-optimism/feat/protocol-versions-mainnet

feat: protocol versions mainnet

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

@@ -39,5 +39,7 @@
   "eip1559Denominator": 50,
   "eip1559Elasticity": 6,
   "l2GenesisRegolithTimeOffset": "0x0",
-  "systemConfigStartBlock": 17422444
+  "systemConfigStartBlock": 17422444,
+  "requiredProtocolVersion": "0x0000000000000000000000000000000000000003000000010000000000000000",
+  "recommendedProtocolVersion": "0x0000000000000000000000000000000000000003000000010000000000000000"
 }

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

@@ -353,7 +353,7 @@ contract Deploy is Deployer {
     }
 
     /// @notice Deploy the ProtocolVersionsProxy
-    function deployProtocolVersionsProxy() public onlyTestnetOrDevnet broadcast returns (address addr_) {
+    function deployProtocolVersionsProxy() public broadcast returns (address addr_) {
         address proxyAdmin = mustGetAddress("ProxyAdmin");
         Proxy proxy = new Proxy({
             _admin: proxyAdmin
@@ -458,7 +458,7 @@ contract Deploy is Deployer {
     }
 
     /// @notice Deploy the ProtocolVersions
-    function deployProtocolVersions() public onlyTestnetOrDevnet broadcast returns (address addr_) {
+    function deployProtocolVersions() public broadcast returns (address addr_) {
         ProtocolVersions versions = new ProtocolVersions{ salt: implSalt() }();
         save("ProtocolVersions", address(versions));
         console.log("ProtocolVersions deployed at %s", address(versions));
@@ -861,7 +861,7 @@ contract Deploy is Deployer {
         require(portal.paused() == false);
     }
 
-    function initializeProtocolVersions() public onlyTestnetOrDevnet broadcast {
+    function initializeProtocolVersions() public broadcast {
         address protocolVersionsProxy = mustGetAddress("ProtocolVersionsProxy");
         address protocolVersions = mustGetAddress("ProtocolVersions");
 

packages/contracts-bedrock/scripts/DeployConfig.s.sol

@@ -91,18 +91,13 @@ contract DeployConfig is Script {
         eip1559Denominator = stdJson.readUint(_json, "$.eip1559Denominator");
         eip1559Elasticity = stdJson.readUint(_json, "$.eip1559Elasticity");
         systemConfigStartBlock = stdJson.readUint(_json, "$.systemConfigStartBlock");
+        requiredProtocolVersion = stdJson.readUint(_json, "$.requiredProtocolVersion");
+        recommendedProtocolVersion = stdJson.readUint(_json, "$.recommendedProtocolVersion");
 
         if (block.chainid == Chains.LocalDevnet || block.chainid == Chains.GethDevnet) {
             faultGameAbsolutePrestate = stdJson.readUint(_json, "$.faultGameAbsolutePrestate");
             faultGameMaxDepth = stdJson.readUint(_json, "$.faultGameMaxDepth");
             faultGameMaxDuration = stdJson.readUint(_json, "$.faultGameMaxDuration");
-            requiredProtocolVersion = stdJson.readUint(_json, "$.requiredProtocolVersion");
-            recommendedProtocolVersion = stdJson.readUint(_json, "$.recommendedProtocolVersion");
-        }
-
-        if (block.chainid == Chains.Goerli || block.chainid == Chains.Sepolia) {
-            requiredProtocolVersion = stdJson.readUint(_json, "$.requiredProtocolVersion");
-            recommendedProtocolVersion = stdJson.readUint(_json, "$.recommendedProtocolVersion");
         }
     }