Merge branch 'develop' into clabby/ctb/dispute-game-type-storage

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

@@ -34,7 +34,7 @@
   "governanceTokenSymbol": "OP",
   "governanceTokenName": "Optimism",
   "governanceTokenOwner": "0x038a8825A3C3B0c08d52Cc76E5E361953Cf6Dc76",
-  "l2GenesisBlockGasLimit": "0x17D7840",
+  "l2GenesisBlockGasLimit": "0x2faf080",
   "l2GenesisBlockBaseFeePerGas": "0x3b9aca00",
   "eip1559Denominator": 50,
   "eip1559Elasticity": 10,

packages/contracts-bedrock/deploy-config/internal-devnet.json

@@ -20,7 +20,7 @@
   "l2OutputOracleStartingBlockNumber": 1,
   "l2OutputOracleProposer": "0xE06d39D4B8DC05E562353F060DED346AC4acC077",
   "l2OutputOracleChallenger": "0xE06d39D4B8DC05E562353F060DED346AC4acC077",
-  "finalizationPeriodSeconds": 2,
+  "finalizationPeriodSeconds": 12,
 
   "proxyAdminOwner": "0x858F0751ef8B4067f0d2668C076BDB50a8549fbF",
   "baseFeeVaultRecipient": "0x858F0751ef8B4067f0d2668C076BDB50a8549fbF",
@@ -46,5 +46,7 @@
   "gasPriceOracleOverhead": 2100,
   "gasPriceOracleScalar": 1000000,
   "eip1559Denominator": 50,
-  "eip1559Elasticity": 10
+  "eip1559Elasticity": 10,
+
+  "systemConfigStartBlock": 8364212
 }

packages/contracts-bedrock/scripts/universal/SafeBuilder.sol

@@ -61,8 +61,6 @@ abstract contract SafeBuilder is EnhancedScript, GlobalConstants {
             proxyAdmin = 0x01d3670863c3F4b24D7b107900f0b75d4BbC6e0d;
         }
         console.log("ChainID: %s", block.chainid);
-        console.log("Using Safe: %s", safe);
-        console.log("Using ProxyAdmin: %s", proxyAdmin);
         return run(safe, proxyAdmin);
     }
 

packages/contracts-bedrock/scripts/upgrades/Multichain.s.sol

@@ -97,11 +97,15 @@ contract Multichain is SafeBuilder {
         // Set the network in storage
         NETWORK = vm.envOr("NETWORK", GOERLI_PROD);
 
+        // TODO: hack
+        PROXY_ADMIN = ProxyAdmin(vm.envOr("PROXY_ADMIN", 0x01d3670863c3F4b24D7b107900f0b75d4BbC6e0d));
+
         // For simple comparisons of dynamic types
         bytes32 network = keccak256(bytes(NETWORK));
 
         string memory deployConfigPath;
         if (network == goerli) {
+            console.log("Using goerli-prod");
             deployConfigPath = string.concat(vm.projectRoot(), "/deploy-config/goerli.json");
             proxies = ContractSet({
                 L1CrossDomainMessenger: 0x5086d1eEF304eb5284A0f6720f79403b4e9bE294,
@@ -113,6 +117,7 @@ contract Multichain is SafeBuilder {
                 L1ERC721Bridge: 0x8DD330DdE8D9898d43b4dc840Da27A07dF91b3c9
             });
         } else if (network == chaosnet) {
+            console.log("Using chaosnet");
             deployConfigPath = string.concat(vm.projectRoot(), "/deploy-config/chaosnet.json");
             proxies = ContractSet({
                 L1CrossDomainMessenger: 0xfc428D28D197fFf99A5EbAc6be8B761FEd8718Da,
@@ -124,6 +129,7 @@ contract Multichain is SafeBuilder {
                 L1ERC721Bridge: 0x058BBf091232afE99BC2481F809254cD15e64Df5
             });
         } else if (network == devnet) {
+            console.log("Using devnet");
             deployConfigPath = string.concat(vm.projectRoot(), "/deploy-config/internal-devnet.json");
             proxies = ContractSet({
                 L1CrossDomainMessenger: 0x71A046D793C71af209960DCb8bD5388d2c5D2a78,