goerli: devnet deployment

Also fixes some issues with the deployment scripts as well
as the genesis block creation script. The deployment artifacts
from the deployment are included in this PR.

packages/contracts/deploy/009-Proxy__OVM_L1StandardBridge.deploy.ts

@@ -103,7 +103,12 @@ const deployFn: DeployFunction = async (hre) => {
 
       console.log(`Confirming that owner address was correctly set...`)
       await waitUntilTrue(async () => {
-        return hexStringEquals(await proxy.callStatic.getOwner(), owner)
+        return hexStringEquals(
+          await proxy.connect(proxy.signer.provider).callStatic.getOwner({
+            from: ethers.constants.AddressZero,
+          }),
+          owner
+        )
       })
     },
   })

packages/contracts/scripts/deploy-scripts/goerli-genesis.sh

@@ -2,10 +2,10 @@
 
 export L2_BLOCK_GAS_LIMIT=15000000
 export L2_CHAIN_ID=420
-export BLOCK_SIGNER_ADDRESS=0xBB5fd80abeAd143B59D1B92a75be8bb0F44D8ECc
-export L1_STANDARD_BRIDGE_ADDRESS=0xBB5fd80abeAd143B59D1B92a75be8bb0F44D8ECc
+export BLOCK_SIGNER_ADDRESS=0x27770a9694e4B4b1E130Ab91Bc327C36855f612E
+export L1_STANDARD_BRIDGE_ADDRESS=0x73298186A143a54c20ae98EEE5a025bD5979De02
 export L1_FEE_WALLET_ADDRESS=0xB79f76EF2c5F0286176833E7B2eEe103b1CC3244
-export L1_CROSS_DOMAIN_MESSENGER_ADDRESS=0xE4e015EC8EfAC0d505d8a656C5F93c7FA30c6C5e
+export L1_CROSS_DOMAIN_MESSENGER_ADDRESS=0xEcC89b9EDD804850C4F343A278Be902be11AaF42
 export WHITELIST_OWNER=0x0000000000000000000000000000000000000000
 export GAS_PRICE_ORACLE_OWNER=0x84f70449f90300997840eCb0918873745Ede7aE6
 yarn build:dump

packages/contracts/scripts/deploy-scripts/goerli.sh

+#!/bin/bash
+
+### DEPLOYMENT SCRIPT ###
+# To be called from root of contracts dir #
+
+# Required env vars
+if [[ -z "$CONTRACTS_DEPLOYER_KEY" ]]; then
+  echo "Must pass CONTRACTS_DEPLOYER_KEY"
+  exit 1
+fi
+if [[ -z "$CONTRACTS_RPC_URL" ]]; then
+  echo "Must pass CONTRACTS_RPC_URL"
+  exit 1
+fi
+if [[ -z "$ETHERSCAN_API_KEY" ]]; then
+  echo "Must pass ETHERSCAN_API_KEY"
+  exit 1
+fi
+
+CONTRACTS_TARGET_NETWORK=goerli \
+npx hardhat deploy \
+ --l1-block-time-seconds 15 \
+ --ctc-max-transaction-gas-limit 15000000 \
+ --ctc-l2-gas-discount-divisor 32 \
+ --ctc-enqueue-gas-cost 60000 \
+ --scc-fraud-proof-window 604800 \
+ --scc-sequencer-publish-window 12592000 \
+ --ovm-sequencer-address 0xB79f76EF2c5F0286176833E7B2eEe103b1CC3244 \
+ --ovm-proposer-address 0x9A2F243c605e6908D96b18e21Fb82Bf288B19EF3 \
+ --ovm-address-manager-owner 0x32b70c156302d28A9119445d2bbb9ab1cBD01671 \
+ --network goerli
+
+CONTRACTS_TARGET_NETWORK=goerli \
+npx hardhat etherscan-verify --network goerli

packages/contracts/src/hardhat-deploy-ethers.ts

@@ -11,7 +11,7 @@ export const waitUntilTrue = async (
     delay?: number
   } = {}
 ) => {
-  opts.retries = opts.retries || 10
+  opts.retries = opts.retries || 100
   opts.delay = opts.delay || 5000
 
   let retries = 0