contracts-bedrock: more fixups

packages/contracts-bedrock/deploy/101-L2CrossDomainMessengerImpl.ts

@@ -6,9 +6,9 @@ import '@nomiclabs/hardhat-ethers'
 import { assertContractVariable, deploy } from '../src/deploy-utils'
 
 const deployFn: DeployFunction = async (hre) => {
-  const Artifact__L1CrossDomainMessenger = await hre.deployments.get(
-    'L1CrossDomainMessenger'
-  )
+  const Artifact__L1CrossDomainMessenger = await hre.companionNetworks[
+    'l1'
+  ].deployments.get('L1CrossDomainMessengerProxy')
 
   await deploy({
     hre,

packages/contracts-bedrock/deploy/102-L2StandardBridgeImpl.ts

@@ -6,9 +6,9 @@ import '@nomiclabs/hardhat-ethers'
 import { assertContractVariable, deploy } from '../src/deploy-utils'
 
 const deployFn: DeployFunction = async (hre) => {
-  const Artifact__L1StandardBridge = await hre.deployments.get(
-    'L1StandardBridge'
-  )
+  const Artifact__L1StandardBridge = await hre.companionNetworks[
+    'l1'
+  ].deployments.get('L1StandardBridgeProxy')
 
   await deploy({
     hre,

packages/contracts-bedrock/deploy/104-L2ERC721BridgeImpl.ts

@@ -6,10 +6,10 @@ import { ethers } from 'ethers'
 import { predeploys } from '../src/constants'
 import { assertContractVariable, deploy } from '../src/deploy-utils'
 
-// TODO: should be proxy and should be companion network
-
 const deployFn: DeployFunction = async (hre) => {
-  const Artifact__L1ERC721Bridge = await hre.deployments.get('L1ERC721Bridge')
+  const Artifact__L1ERC721Bridge = await hre.companionNetworks[
+    'l1'
+  ].deployments.get('L1ERC721BridgeProxy')
 
   await deploy({
     hre,

packages/contracts-bedrock/deploy/106-SequencerFeeVaultImpl.ts

 import { DeployFunction } from 'hardhat-deploy/dist/types'
 import '@eth-optimism/hardhat-deploy-config'
 import '@nomiclabs/hardhat-ethers'
+import { ethers } from 'ethers'
 
 import { assertContractVariable, deploy } from '../src/deploy-utils'
 
 const deployFn: DeployFunction = async (hre) => {
+  const sequencerFeeVaultRecipient = hre.deployConfig.sequencerFeeVaultRecipient
+  if (sequencerFeeVaultRecipient === ethers.constants.AddressZero) {
+    throw new Error(`SequencerFeeVault RECIPIENT undefined`)
+  }
+
   await deploy({
     hre,
     name: 'SequencerFeeVault',
-    args: [hre.deployConfig.sequencerFeeVaultRecipient],
+    args: [sequencerFeeVaultRecipient],
     postDeployAction: async (contract) => {
       await assertContractVariable(
         contract,
         'RECIPIENT',
-        hre.deployConfig.sequencerFeeVaultRecipient
+        ethers.utils.getAddress(sequencerFeeVaultRecipient)
       )
     },
   })

packages/contracts-bedrock/deploy/107-BaseFeeVaultImpl.ts

 import { DeployFunction } from 'hardhat-deploy/dist/types'
 import '@eth-optimism/hardhat-deploy-config'
 import '@nomiclabs/hardhat-ethers'
+import { ethers } from 'ethers'
 
 import { assertContractVariable, deploy } from '../src/deploy-utils'
 
 const deployFn: DeployFunction = async (hre) => {
+  const baseFeeVaultRecipient = hre.deployConfig.baseFeeVaultRecipient
+  if (baseFeeVaultRecipient === ethers.constants.AddressZero) {
+    throw new Error('BaseFeeVault RECIPIENT undefined')
+  }
+
   await deploy({
     hre,
     name: 'BaseFeeVault',
-    args: [hre.deployConfig.baseFeeVaultRecipient],
+    args: [baseFeeVaultRecipient],
     postDeployAction: async (contract) => {
       await assertContractVariable(
         contract,
         'RECIPIENT',
-        hre.deployConfig.baseFeeVaultRecipient
+        ethers.utils.getAddress(baseFeeVaultRecipient)
       )
     },
   })

packages/contracts-bedrock/deploy/108-L1FeeVaultImpl.ts

 import { DeployFunction } from 'hardhat-deploy/dist/types'
 import '@eth-optimism/hardhat-deploy-config'
 import '@nomiclabs/hardhat-ethers'
+import { ethers } from 'ethers'
 
 import { assertContractVariable, deploy } from '../src/deploy-utils'
 
 const deployFn: DeployFunction = async (hre) => {
+  const l1FeeVaultRecipient = hre.deployConfig.l1FeeVaultRecipient
+  if (l1FeeVaultRecipient === ethers.constants.AddressZero) {
+    throw new Error('L1FeeVault RECIPIENT undefined')
+  }
+
   await deploy({
     hre,
     name: 'L1FeeVault',
-    args: [hre.deployConfig.l1FeeVaultRecipient],
+    args: [l1FeeVaultRecipient],
     postDeployAction: async (contract) => {
       await assertContractVariable(
         contract,
         'RECIPIENT',
-        hre.deployConfig.l1FeeVaultRecipient
+        ethers.utils.getAddress(l1FeeVaultRecipient)
       )
     },
   })

packages/contracts-bedrock/hardhat.config.ts

@@ -50,6 +50,17 @@ const config: HardhatUserConfig = {
       chainId: 5,
       url: process.env.L1_RPC || '',
       accounts: [process.env.PRIVATE_KEY_DEPLOYER || ethers.constants.HashZero],
+      companionNetworks: {
+        l2: 'optimism-goerli',
+      },
+    },
+    'optimism-goerli': {
+      chainId: 420,
+      url: process.env.L2_RPC || '',
+      accounts: [process.env.PRIVATE_KEY_DEPLOYER || ethers.constants.HashZero],
+      companionNetworks: {
+        l1: 'goerli',
+      },
     },
     'alpha-1': {
       chainId: 5,