fix: e2e bridge tests

Author: Maikol

packages/contracts/e2e/deployment/config/l2/l2GNS.test.ts

@@ -5,7 +5,7 @@ import { isGraphL2ChainId } from '@graphprotocol/sdk'
 
 describe('[L2] GNS', () => {
   const graph = hre.graph()
-  const { L2GNS } = graph.contracts
+  const { L2GNS } = graph.l2.contracts
 
   let unauthorized: SignerWithAddress
 

packages/contracts/e2e/deployment/config/l2/l2Staking.test.ts

@@ -5,7 +5,7 @@ import { isGraphL2ChainId } from '@graphprotocol/sdk'
 
 describe('[L2] Staking', () => {
   const graph = hre.graph()
-  const { L2Staking } = graph.contracts
+  const { L2Staking } = graph.l2.contracts
 
   let unauthorized: SignerWithAddress
 

packages/contracts/tasks/bridge/configure.ts

@@ -32,6 +32,8 @@ task(TASK_BRIDGE_CONFIGURE_L1, 'Configure L1 bridge')
     await configureL1Bridge(graph.contracts, governor, {
       l2GRTAddress: graph.l2.contracts.GraphToken.address,
       l2GRTGatewayAddress: graph.l2.contracts.L2GraphTokenGateway.address,
+      l2GNSAddress: graph.l2.contracts.L2GNS.address,
+      l2StakingAddress: graph.l2.contracts.L2Staking.address,
       arbAddressBookPath: taskArgs.arbitrumAddressBook,
       chainId: graph.chainId,
     })
@@ -60,6 +62,8 @@ task(TASK_BRIDGE_CONFIGURE_L2, 'Configure L2 bridge')
     await configureL2Bridge(graph.contracts, governor, {
       l1GRTAddress: graph.l1.contracts.GraphToken.address,
       l1GRTGatewayAddress: graph.l1.contracts.L1GraphTokenGateway.address,
+      l1GNSAddress: graph.l1.contracts.L1GNS.address,
+      l1StakingAddress: graph.l1.contracts.L1Staking.address,
       arbAddressBookPath: taskArgs.arbitrumAddressBook,
       chainId: graph.chainId,
     })

packages/sdk/src/deployments/network/actions/bridge-config.ts

@@ -6,6 +6,8 @@ import { SimpleAddressBook } from '../../lib/address-book'
 export const configureL1Bridge: GraphNetworkAction<{
   l2GRTAddress: string
   l2GRTGatewayAddress: string
+  l2GNSAddress: string
+  l2StakingAddress: string
   arbAddressBookPath: string
   chainId: number
 }> = async (
@@ -14,23 +16,27 @@ export const configureL1Bridge: GraphNetworkAction<{
   args: {
     l2GRTAddress: string
     l2GRTGatewayAddress: string
+    l2GNSAddress: string
+    l2StakingAddress: string
     arbAddressBookPath: string
     chainId: number
   },
 ): Promise<void> => {
-  const { l2GRTAddress, l2GRTGatewayAddress, arbAddressBookPath, chainId } = args
+  const { l2GRTAddress, l2GRTGatewayAddress, l2GNSAddress, l2StakingAddress, arbAddressBookPath, chainId } = args
   console.info(`>>> Setting L1 Bridge Configuration <<<\n`)
 
   const arbAddressBook = new SimpleAddressBook(arbAddressBookPath, chainId)
 
   const gateway = contracts.L1GraphTokenGateway!
 
+  // Gateway
   console.info('L2 GRT address: ' + l2GRTAddress)
   await gateway.connect(signer).setL2TokenAddress(l2GRTAddress)
 
   console.info('L2 Gateway address: ' + l2GRTGatewayAddress)
   await gateway.connect(signer).setL2CounterpartAddress(l2GRTGatewayAddress)
 
+  // Escrow
   const bridgeEscrow = contracts.BridgeEscrow!
   console.info('Escrow address: ' + bridgeEscrow.address)
   await gateway.connect(signer).setEscrowAddress(bridgeEscrow.address)
@@ -42,11 +48,27 @@ export const configureL1Bridge: GraphNetworkAction<{
     'L1 Inbox address: ' + l1Inbox.address + ' and L1 Router address: ' + l1Router.address,
   )
   await gateway.connect(signer).setArbitrumAddresses(l1Inbox.address, l1Router.address)
+
+  // GNS
+  const gns = contracts.L1GNS!
+  console.info('GNS address: ' + gns.address)
+  console.info('L2 GNS address: ' + l2GNSAddress)
+  await gns.connect(signer).setCounterpartGNSAddress(l2GNSAddress)
+  await gateway.connect(signer).addToCallhookAllowlist(gns.address)
+
+  // Staking
+  const staking = contracts.L1Staking!
+  console.info('Staking address: ' + staking.address)
+  console.info('L2 Staking address: ' + l2StakingAddress)
+  await staking.connect(signer).setCounterpartStakingAddress(l2StakingAddress)
+  await gateway.connect(signer).addToCallhookAllowlist(staking.address)
 }
 
 export const configureL2Bridge: GraphNetworkAction<{
   l1GRTAddress: string
   l1GRTGatewayAddress: string
+  l1GNSAddress: string
+  l1StakingAddress: string
   arbAddressBookPath: string
   chainId: number
 }> = async (
@@ -55,18 +77,21 @@ export const configureL2Bridge: GraphNetworkAction<{
   args: {
     l1GRTAddress: string
     l1GRTGatewayAddress: string
+    l1GNSAddress: string
+    l1StakingAddress: string
     arbAddressBookPath: string
     chainId: number
   },
 ): Promise<void> => {
-  const { l1GRTAddress, l1GRTGatewayAddress, arbAddressBookPath, chainId } = args
+  const { l1GRTAddress, l1GRTGatewayAddress, l1GNSAddress, l1StakingAddress, arbAddressBookPath, chainId } = args
   console.info(`>>> Setting L2 Bridge Configuration <<<\n`)
 
   const arbAddressBook = new SimpleAddressBook(arbAddressBookPath, chainId)
 
   const gateway = contracts.L2GraphTokenGateway!
   const token = contracts.L2GraphToken!
 
+  // Gateway
   console.info('L1 GRT address: ' + l1GRTAddress)
   await gateway.connect(signer).setL1TokenAddress(l1GRTAddress)
   await token.connect(signer).setL1Address(l1GRTAddress)
@@ -80,4 +105,16 @@ export const configureL2Bridge: GraphNetworkAction<{
 
   console.info('L2 Gateway address: ' + gateway.address)
   await token.connect(signer).setGateway(gateway.address)
+
+  // GNS
+  const gns = contracts.L2GNS!
+  console.info('GNS address: ' + gns.address)
+  console.info('L1 GNS address: ' + l1GNSAddress)
+  await gns.connect(signer).setCounterpartGNSAddress(l1GNSAddress)
+
+  // Staking
+  const staking = contracts.L2Staking!
+  console.info('Staking address: ' + staking.address)
+  console.info('L1 Staking address: ' + l1StakingAddress)
+  await staking.connect(signer).setCounterpartStakingAddress(l1StakingAddress)
 }