Merge remote-tracking branch 'origin/main' into mde/sam-contract

Author: Maikol

.github/workflows/publish.yml

@@ -31,4 +31,4 @@ jobs:
           pushd packages/${{ inputs.package }}
           yarn npm publish --tag ${{ inputs.tag }} --access public
         env:
-          YARN_NPM_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
+          YARN_NPM_AUTH_TOKEN: ${{ secrets.GRAPHPROTOCOL_NPM_TOKEN }}

.gitignore

@@ -6,7 +6,7 @@ yarn-error.log*
 node_modules/
 
 # Yarn
-.yarn/*
+.yarn/
 !.yarn/patches
 !.yarn/releases
 !.yarn/plugins
@@ -31,7 +31,7 @@ bin/
 .vscode
 
 # Coverage and other reports
-/reports
+reports/
 coverage.json
 
 # Local test files
@@ -42,4 +42,4 @@ tx-*.log
 addresses-fork.json
 
 # Keys
-.keystore
+.keystore

package.json

@@ -13,6 +13,7 @@
   "scripts": {
     "postinstall": "husky install",
     "clean": "yarn workspaces foreach --all --parallel --verbose run clean",
+    "clean:all": "yarn clean && rm -rf node_modules packages/*/node_modules",
     "build": "yarn workspaces foreach --all --verbose run build",
     "lint": "yarn workspaces foreach --all --parallel --verbose run lint",
     "test": "yarn workspaces foreach --all --parallel --verbose --interlaced run test"

packages/contracts/addresses.json

@@ -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,22 @@ 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])
+  await sendTransaction(cli.wallet, gateway, 'addToCallhookAllowlist', [gns.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,
+  ])
+  await sendTransaction(cli.wallet, gateway, 'addToCallhookAllowlist', [staking.address])
 }
 
 export const configureL2Bridge = async (cli: CLIEnvironment, cliArgs: CLIArgs): Promise<void> => {
@@ -52,6 +72,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 +91,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/cli/commands/protocol/configure-bridge.ts

@@ -4,7 +4,7 @@ import { Overrides } from 'ethers'
 export const local = {
   mnemonic: 'myth like bonus scare over problem client lizard pioneer submit female collect',
   providerUrl: 'http://localhost:8545',
-  addressBookPath: './addresses.json',
+  addressBookPath: './addresses-local.json',
   graphConfigPath: './config/graph.mainnet.yml',
   accountNumber: '0',
   arbitrumAddressBookPath: './arbitrum-addresses.json',

packages/contracts/cli/defaults.ts

@@ -1,4 +1,4 @@
-import { isGraphChainId } from '@graphprotocol/sdk'
+import { isGraphL2ChainId } from '@graphprotocol/sdk'
 import { SignerWithAddress } from '@nomiclabs/hardhat-ethers/signers'
 import { expect } from 'chai'
 import hre from 'hardhat'
@@ -10,7 +10,7 @@ describe('[L1] GraphToken', () => {
   let unauthorized: SignerWithAddress
 
   before(async function () {
-    if (isGraphChainId(graph.chainId)) this.skip()
+    if (isGraphL2ChainId(graph.chainId)) this.skip()
     unauthorized = (await graph.getTestAccounts())[0]
   })
 

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

@@ -0,0 +1,28 @@
+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, L1GraphTokenGateway } = 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)
+    })
+
+    it('should be added to callhookAllowlist', async () => {
+      const isAllowed = await L1GraphTokenGateway.callhookAllowlist(L1GNS.address)
+      expect(isAllowed).true
+    })
+  })
+})

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

@@ -0,0 +1,30 @@
+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, L1GraphTokenGateway } = 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)
+    })
+
+    it('should be added to callhookAllowlist', async () => {
+      const isAllowed = await L1GraphTokenGateway.callhookAllowlist(L1Staking.address)
+      expect(isAllowed).true
+    })
+  })
+})

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

@@ -0,0 +1,23 @@
+import { SignerWithAddress } from '@nomiclabs/hardhat-ethers/signers'
+import { expect } from 'chai'
+import hre from 'hardhat'
+import { isGraphL1ChainId } from '@graphprotocol/sdk'
+
+describe('[L2] GNS', () => {
+  const graph = hre.graph()
+  const { L2GNS } = graph.l2.contracts
+
+  let unauthorized: SignerWithAddress
+
+  before(async function () {
+    if (isGraphL1ChainId(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)
+    })
+  })
+})