Merge pull request #6807 from ethereum-optimism/feat/multichain-upgrade

contracts-bedrock: upgrade to multichain script

packages/contracts-bedrock/.gas-snapshot

@@ -401,6 +401,7 @@ MintManager_mint_Test:test_mint_moreThanCap_reverts() (gas: 142523)
 MintManager_upgrade_Test:test_upgrade_fromNotOwner_reverts() (gas: 10974)
 MintManager_upgrade_Test:test_upgrade_fromOwner_succeeds() (gas: 23434)
 MintManager_upgrade_Test:test_upgrade_toZeroAddress_reverts() (gas: 11003)
+Multichain:test_script_succeeds() (gas: 3078)
 OptimismMintableERC20_Test:test_bridge_succeeds() (gas: 7621)
 OptimismMintableERC20_Test:test_burn_notBridge_reverts() (gas: 11164)
 OptimismMintableERC20_Test:test_burn_succeeds() (gas: 50996)
@@ -517,8 +518,6 @@ OptimistTest:test_supportsInterface_returnsCorrectInterfaceForERC721_succeeds()
 OptimistTest:test_tokenIdOfAddress_returnsOwnerID_succeeds() (gas: 63730)
 OptimistTest:test_tokenURI_returnsCorrectTokenURI_succeeds() (gas: 195908)
 OptimistTest:test_transferFrom_soulbound_reverts() (gas: 75512)
-PostSherlockL1:test_script_succeeds() (gas: 3078)
-PostSherlockL2:test_script_succeeds() (gas: 3078)
 PreimageOracle_Test:test_keccak256PreimageKey_succeeds() (gas: 319)
 PreimageOracle_Test:test_loadKeccak256PreimagePart_outOfBoundsOffset_reverts() (gas: 8993)
 PreimageOracle_Test:test_loadKeccak256PreimagePart_succeeds() (gas: 76098)

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

@@ -38,5 +38,6 @@
   "numDeployConfirmations": 1,
   "eip1559Denominator": 50,
   "eip1559Elasticity": 10,
-  "l2GenesisRegolithTimeOffset": "0x0"
+  "l2GenesisRegolithTimeOffset": "0x0",
+  "systemConfigStartBlock": 0
 }

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

@@ -56,7 +56,13 @@ abstract contract SafeBuilder is EnhancedScript, GlobalConstants {
         if (block.chainid == OP_GOERLI) {
             safe = 0xE534ccA2753aCFbcDBCeB2291F596fc60495257e;
             proxyAdmin = 0x4200000000000000000000000000000000000018;
+        } else if (block.chainid == GOERLI) {
+            safe = 0xBc1233d0C3e6B5d53Ab455cF65A6623F6dCd7e4f;
+            proxyAdmin = 0x01d3670863c3F4b24D7b107900f0b75d4BbC6e0d;
         }
+        console.log("ChainID: %s", block.chainid);
+        console.log("Using Safe: %s", safe);
+        console.log("Using ProxyAdmin: %s", proxyAdmin);
         return run(safe, proxyAdmin);
     }