Merge branch 'develop' into ci/no-test-nag

packages/contracts-periphery/deploy/nft-bridge/L2ERC721BridgeImplementation.ts

@@ -37,9 +37,9 @@ const deployFn: DeployFunction = async (hre) => {
     throw new Error(`Unexpected admin ${admin}`)
   }
 
-  const Deployment__L1ERC721Bridge = await hre.deployments.get(
-    'L1ERC721BridgeProxy'
-  )
+  const Deployment__L1ERC721Bridge = await hre.companionNetworks[
+    'l1'
+  ].deployments.get('L1ERC721BridgeProxy')
 
   const L1ERC721BridgeAddress = Deployment__L1ERC721Bridge.address
 

packages/contracts-periphery/hardhat.config.ts

@@ -51,6 +51,9 @@ const config: HardhatUserConfig = {
           apiKey: getenv('OPTIMISTIC_ETHERSCAN_API_KEY'),
         },
       },
+      companionNetworks: {
+        l1: 'ethereum',
+      },
     },
     'optimism-kovan': {
       chainId: 69,
@@ -71,6 +74,9 @@ const config: HardhatUserConfig = {
           apiKey: getenv('OPTIMISTIC_ETHERSCAN_API_KEY'),
         },
       },
+      companionNetworks: {
+        l1: 'goerli',
+      },
     },
     ethereum: {
       chainId: 1,
@@ -81,6 +87,9 @@ const config: HardhatUserConfig = {
           apiKey: getenv('ETHEREUM_ETHERSCAN_API_KEY'),
         },
       },
+      companionNetworks: {
+        l2: 'optimism',
+      },
     },
     goerli: {
       chainId: 5,
@@ -91,6 +100,9 @@ const config: HardhatUserConfig = {
           apiKey: getenv('ETHEREUM_ETHERSCAN_API_KEY'),
         },
       },
+      companionNetworks: {
+        l2: 'optimism-goerli',
+      },
     },
     ropsten: {
       chainId: 3,
@@ -119,6 +131,9 @@ const config: HardhatUserConfig = {
         '0xa6aecc98b63bafb0de3b29ae9964b14acb4086057808be29f90150214ebd4a0f',
       ],
       url: 'http://127.0.0.1:8545',
+      companionNetworks: {
+        l1: 'ops-l1',
+      },
     },
     'ops-l1': {
       chainId: 31337,
@@ -126,6 +141,9 @@ const config: HardhatUserConfig = {
         '0xac0974bec39a17e36ba4a6b4d238ff944bacb478cbed5efcae784d7bf4f2ff80',
       ],
       url: 'http://127.0.0.1:9545',
+      companionNetworks: {
+        l2: 'ops-l2',
+      },
     },
   },
   paths: {