fix: add gns and staking counter part addresses when configuring bridge

Author: Maikol

packages/contracts/cli/commands/protocol/configure-bridge.ts

@@ -15,16 +15,20 @@ export const configureL1Bridge = async (cli: CLIEnvironment, cliArgs: CLIArgs):
   const l2AddressBook = getAddressBook(cliArgs.addressBook, l2ChainId)
   const arbAddressBook = getAddressBook(cliArgs.arbAddressBook, cli.chainId.toString())
 
+  // Gateway
   const gateway = cli.contracts['L1GraphTokenGateway']
 
   const l2GRT = l2AddressBook.getEntry('L2GraphToken')
   logger.info('L2 GRT address: ' + l2GRT.address)
   await sendTransaction(cli.wallet, gateway, 'setL2TokenAddress', [l2GRT.address])
 
-  const l2Counterpart = l2AddressBook.getEntry('L2GraphTokenGateway')
-  logger.info('L2 Gateway address: ' + l2Counterpart.address)
-  await sendTransaction(cli.wallet, gateway, 'setL2CounterpartAddress', [l2Counterpart.address])
+  const l2GatewayCounterpart = l2AddressBook.getEntry('L2GraphTokenGateway')
+  logger.info('L2 Gateway address: ' + l2GatewayCounterpart.address)
+  await sendTransaction(cli.wallet, gateway, 'setL2CounterpartAddress', [
+    l2GatewayCounterpart.address,
+  ])
 
+  // Escrow
   const bridgeEscrow = cli.contracts.BridgeEscrow
   logger.info('Escrow address: ' + bridgeEscrow.address)
   await sendTransaction(cli.wallet, gateway, 'setEscrowAddress', [bridgeEscrow.address])
@@ -39,6 +43,20 @@ export const configureL1Bridge = async (cli: CLIEnvironment, cliArgs: CLIArgs):
     l1Inbox.address,
     l1Router.address,
   ])
+
+  // GNS
+  const gns = cli.contracts.L1GNS
+  const l2GNSCounterpart = l2AddressBook.getEntry('L2GNS')
+  logger.info('L2 GNS address: ' + l2GNSCounterpart.address)
+  await sendTransaction(cli.wallet, gns, 'setCounterpartGNSAddress', [l2GNSCounterpart.address])
+
+  // Staking
+  const staking = cli.contracts.L1Staking
+  const l2StakingCounterpart = l2AddressBook.getEntry('L2Staking')
+  logger.info('L2 Staking address: ' + l2StakingCounterpart.address)
+  await sendTransaction(cli.wallet, staking, 'setCounterpartStakingAddress', [
+    l2StakingCounterpart.address,
+  ])
 }
 
 export const configureL2Bridge = async (cli: CLIEnvironment, cliArgs: CLIArgs): Promise<void> => {
@@ -52,6 +70,7 @@ export const configureL2Bridge = async (cli: CLIEnvironment, cliArgs: CLIArgs):
   const l1AddressBook = getAddressBook(cliArgs.addressBook, l1ChainId)
   const arbAddressBook = getAddressBook(cliArgs.arbAddressBook, cli.chainId.toString())
 
+  // Gateway
   const gateway = cli.contracts['L2GraphTokenGateway']
   const token = cli.contracts['L2GraphToken']
 
@@ -70,6 +89,20 @@ export const configureL2Bridge = async (cli: CLIEnvironment, cliArgs: CLIArgs):
 
   logger.info('L2 Gateway address: ' + gateway.address)
   await sendTransaction(cli.wallet, token, 'setGateway', [gateway.address])
+
+  // GNS
+  const gns = cli.contracts.L2GNS
+  const l1GNSCounterpart = l1AddressBook.getEntry('L1GNS')
+  logger.info('L1 GNS address: ' + l1GNSCounterpart.address)
+  await sendTransaction(cli.wallet, gns, 'setCounterpartGNSAddress', [l1GNSCounterpart.address])
+
+  // Staking
+  const staking = cli.contracts.L2Staking
+  const l1StakingCounterpart = l1AddressBook.getEntry('L1Staking')
+  logger.info('L1 Staking address: ' + l1StakingCounterpart.address)
+  await sendTransaction(cli.wallet, staking, 'setCounterpartStakingAddress', [
+    l1StakingCounterpart.address,
+  ])
 }
 
 export const configureL1BridgeCommand = {

packages/contracts/e2e/deployment/config/l1/l1GNS.test.ts

@@ -0,0 +1,23 @@
+import { SignerWithAddress } from '@nomiclabs/hardhat-ethers/signers'
+import { expect } from 'chai'
+import hre from 'hardhat'
+import { isGraphL2ChainId } from '@graphprotocol/sdk'
+
+describe('[L1] GNS', () => {
+  const graph = hre.graph()
+  const { L1GNS } = graph.contracts
+
+  let unauthorized: SignerWithAddress
+
+  before(async function () {
+    if (isGraphL2ChainId(graph.chainId)) this.skip()
+    unauthorized = (await graph.getTestAccounts())[0]
+  })
+
+  describe('L1GNS', () => {
+    it('counterpartGNSAddress should match the L2GNS address', async () => {
+      const l2GNS = await L1GNS.counterpartGNSAddress()
+      expect(l2GNS).eq(graph.l2.contracts.L2GNS.address)
+    })
+  })
+})

packages/contracts/e2e/deployment/config/l1/l1Staking.test.ts

@@ -0,0 +1,25 @@
+import { SignerWithAddress } from '@nomiclabs/hardhat-ethers/signers'
+import { expect } from 'chai'
+import hre from 'hardhat'
+import { isGraphL2ChainId } from '@graphprotocol/sdk'
+
+describe('[L1] Staking', () => {
+  const graph = hre.graph()
+  const { L1Staking } = graph.contracts
+
+  let unauthorized: SignerWithAddress
+
+  before(async function () {
+    if (isGraphL2ChainId(graph.chainId)) this.skip()
+    unauthorized = (await graph.getTestAccounts())[0]
+  })
+
+  describe('L1Staking', () => {
+    it('counterpartStakingAddress should match the L2Staking address', async () => {
+      // counterpartStakingAddress is internal so we access the storage directly
+      const l2StakingData = await hre.ethers.provider.getStorageAt(L1Staking.address, 24)
+      const l2Staking = hre.ethers.utils.defaultAbiCoder.decode(['address'], l2StakingData)[0]
+      expect(l2Staking).eq(graph.l2.contracts.L2Staking.address)
+    })
+  })
+})

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

@@ -0,0 +1,23 @@
+import { SignerWithAddress } from '@nomiclabs/hardhat-ethers/signers'
+import { expect } from 'chai'
+import hre from 'hardhat'
+import { isGraphL2ChainId } from '@graphprotocol/sdk'
+
+describe('[L2] GNS', () => {
+  const graph = hre.graph()
+  const { L2GNS } = graph.contracts
+
+  let unauthorized: SignerWithAddress
+
+  before(async function () {
+    if (isGraphL2ChainId(graph.chainId)) this.skip()
+    unauthorized = (await graph.getTestAccounts())[0]
+  })
+
+  describe('L2GNS', () => {
+    it('counterpartGNSAddress should match the L1GNS address', async () => {
+      const l1GNS = await L2GNS.counterpartGNSAddress()
+      expect(l1GNS).eq(graph.l1.contracts.L1GNS.address)
+    })
+  })
+})

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

@@ -0,0 +1,25 @@
+import { SignerWithAddress } from '@nomiclabs/hardhat-ethers/signers'
+import { expect } from 'chai'
+import hre from 'hardhat'
+import { isGraphL2ChainId } from '@graphprotocol/sdk'
+
+describe('[L2] Staking', () => {
+  const graph = hre.graph()
+  const { L2Staking } = graph.contracts
+
+  let unauthorized: SignerWithAddress
+
+  before(async function () {
+    if (isGraphL2ChainId(graph.chainId)) this.skip()
+    unauthorized = (await graph.getTestAccounts())[0]
+  })
+
+  describe('L2Staking', () => {
+    it('counterpartStakingAddress should match the L1Staking address', async () => {
+      // counterpartStakingAddress is internal so we access the storage directly
+      const l1StakingData = await hre.ethers.provider.getStorageAt(L2Staking.address, 24)
+      const l1Staking = hre.ethers.utils.defaultAbiCoder.decode(['address'], l1StakingData)[0]
+      expect(l1Staking).eq(graph.l1.contracts.L1Staking.address)
+    })
+  })
+})