Scratch testnet 3 (for testing only)

.solcover.js

@@ -7,4 +7,5 @@ module.exports = {
   },
   skipFiles,
   istanbulFolder: './reports/coverage',
+  configureYulOptimizer: true,
 }

.solhintignore

@@ -4,6 +4,5 @@ node_modules
 ./contracts/discovery/erc1056
 ./contracts/rewards/RewardsManager.sol
 ./contracts/staking/libs/LibFixedMath.sol
-./contracts/tests/RewardsManagerMock.sol
 ./contracts/tests/ens
 ./contracts/tests/testnet/GSRManager.sol

cli/commands/migrate.ts

@@ -29,8 +29,9 @@ let allContracts = [
   'Curation',
   'SubgraphNFTDescriptor',
   'SubgraphNFT',
-  'GNS',
-  'Staking',
+  'L1GNS',
+  'StakingExtension',
+  'L1Staking',
   'RewardsManager',
   'DisputeManager',
   'AllocationExchange',
@@ -40,17 +41,17 @@ let allContracts = [
 
 const l2Contracts = [
   'GraphProxyAdmin',
-  'BancorFormula',
   'Controller',
   'EpochManager',
   'L2GraphToken',
   'GraphCurationToken',
   'ServiceRegistry',
-  'Curation',
+  'L2Curation',
   'SubgraphNFTDescriptor',
   'SubgraphNFT',
-  'GNS',
-  'Staking',
+  'L2GNS',
+  'StakingExtension',
+  'L2Staking',
   'RewardsManager',
   'DisputeManager',
   'AllocationExchange',

cli/commands/protocol/configure-bridge.ts

@@ -39,6 +39,20 @@ export const configureL1Bridge = async (cli: CLIEnvironment, cliArgs: CLIArgs):
     l1Inbox.address,
     l1Router.address,
   ])
+
+  const l1GNS = cli.contracts.L1GNS
+  logger.info('L1 GNS address: ' + l1GNS.address)
+  const l2GNS = l2AddressBook.getEntry('L2GNS')
+  logger.info('L2 GNS address: ' + l2GNS.address)
+  await sendTransaction(cli.wallet, l1GNS, 'setCounterpartGNSAddress', [l2GNS.address])
+  await sendTransaction(cli.wallet, gateway, 'addToCallhookAllowlist', [l1GNS.address])
+
+  const l1Staking = cli.contracts.L1Staking
+  logger.info('L1 Staking address: ' + l1Staking.address)
+  const l2Staking = l2AddressBook.getEntry('L2Staking')
+  logger.info('L2 Staking address: ' + l2Staking.address)
+  await sendTransaction(cli.wallet, l1Staking, 'setCounterpartStakingAddress', [l2Staking.address])
+  await sendTransaction(cli.wallet, gateway, 'addToCallhookAllowlist', [l1Staking.address])
 }
 
 export const configureL2Bridge = async (cli: CLIEnvironment, cliArgs: CLIArgs): Promise<void> => {
@@ -68,6 +82,18 @@ export const configureL2Bridge = async (cli: CLIEnvironment, cliArgs: CLIArgs):
   logger.info('L2 Router address: ' + l2Router.address)
   await sendTransaction(cli.wallet, gateway, 'setL2Router', [l2Router.address])
 
+  const l1GNS = l1AddressBook.getEntry('L1GNS')
+  const l2GNS = cli.contracts['L2GNS']
+  logger.info('L1 GNS address: ' + l1GNS.address)
+  logger.info('L2 GNS address: ' + l2GNS.address)
+  await sendTransaction(cli.wallet, l2GNS, 'setCounterpartGNSAddress', [l1GNS.address])
+
+  const l1Staking = l1AddressBook.getEntry('L1Staking')
+  const l2Staking = cli.contracts['L2Staking']
+  logger.info('L1 Staking address: ' + l1Staking.address)
+  logger.info('L2 Staking address: ' + l2Staking.address)
+  await sendTransaction(cli.wallet, l2Staking, 'setCounterpartStakingAddress', [l1Staking.address])
+
   logger.info('L2 Gateway address: ' + gateway.address)
   await sendTransaction(cli.wallet, token, 'setGateway', [gateway.address])
 }

cli/commands/protocol/get.ts

@@ -34,7 +34,7 @@ export const gettersList = {
   'epochs-length': { contract: 'EpochManager', name: 'epochLength' },
   'epochs-current': { contract: 'EpochManager', name: 'currentEpoch' },
   // Rewards
-  'rewards-issuance-rate': { contract: 'RewardsManager', name: 'issuanceRate' },
+  'rewards-issuance-per-block': { contract: 'RewardsManager', name: 'issuancePerBlock' },
   'subgraph-availability-oracle': {
     contract: 'RewardsManager',
     name: 'subgraphAvailabilityOracle',

cli/commands/protocol/set.ts

@@ -39,7 +39,7 @@ export const settersList = {
   // Epochs
   'epochs-length': { contract: 'EpochManager', name: 'setEpochLength' },
   // Rewards
-  'rewards-issuance-rate': { contract: 'RewardsManager', name: 'setIssuanceRate' },
+  'rewards-issuance-per-block': { contract: 'RewardsManager', name: 'setIssuancePerBlock' },
   'subgraph-availability-oracle': {
     contract: 'RewardsManager',
     name: 'setSubgraphAvailabilityOracle',

cli/contracts.ts

@@ -18,11 +18,14 @@ import { getContractAt } from './network'
 
 import { EpochManager } from '../build/types/EpochManager'
 import { DisputeManager } from '../build/types/DisputeManager'
-import { Staking } from '../build/types/Staking'
+import { L1Staking } from '../build/types/L1Staking'
+import { L2Staking } from '../build/types/L2Staking'
 import { ServiceRegistry } from '../build/types/ServiceRegistry'
 import { Curation } from '../build/types/Curation'
 import { RewardsManager } from '../build/types/RewardsManager'
 import { GNS } from '../build/types/GNS'
+import { L1GNS } from '../build/types/L1GNS'
+import { L2GNS } from '../build/types/L2GNS'
 import { GraphProxyAdmin } from '../build/types/GraphProxyAdmin'
 import { GraphToken } from '../build/types/GraphToken'
 import { Controller } from '../build/types/Controller'
@@ -37,15 +40,21 @@ import { L1GraphTokenGateway } from '../build/types/L1GraphTokenGateway'
 import { L2GraphToken } from '../build/types/L2GraphToken'
 import { L2GraphTokenGateway } from '../build/types/L2GraphTokenGateway'
 import { BridgeEscrow } from '../build/types/BridgeEscrow'
+import { L2Curation } from '../build/types/L2Curation'
+import { IL1Staking } from '../build/types/IL1Staking'
+import { IL2Staking } from '../build/types/IL2Staking'
+import { Interface } from 'ethers/lib/utils'
+import { loadArtifact } from './artifacts'
 
 export interface NetworkContracts {
   EpochManager: EpochManager
   DisputeManager: DisputeManager
-  Staking: Staking
+  Staking: IL1Staking | IL2Staking
   ServiceRegistry: ServiceRegistry
-  Curation: Curation
+  Curation: Curation | L2Curation
+  L2Curation: L2Curation
   RewardsManager: RewardsManager
-  GNS: GNS
+  GNS: GNS | L1GNS | L2GNS
   GraphProxyAdmin: GraphProxyAdmin
   GraphToken: GraphToken
   Controller: Controller
@@ -60,6 +69,10 @@ export interface NetworkContracts {
   BridgeEscrow: BridgeEscrow
   L2GraphToken: L2GraphToken
   L2GraphTokenGateway: L2GraphTokenGateway
+  L1GNS: L1GNS
+  L2GNS: L2GNS
+  L1Staking: IL1Staking
+  L2Staking: IL2Staking
 }
 
 export const loadAddressBookContract = (
@@ -91,6 +104,15 @@ export const loadContracts = (
         contract.connect = getWrappedConnect(contract, contractName)
         contract = wrapCalls(contract, contractName)
       }
+      if (contractName == 'L1Staking') {
+        // Hack the contract into behaving like an IL1Staking
+        const iface = new Interface(loadArtifact('IL1Staking').abi)
+        contract = new Contract(contract.address, iface) as unknown as IL1Staking
+      } else if (contractName == 'L2Staking') {
+        // Hack the contract into behaving like an IL2Staking
+        const iface = new Interface(loadArtifact('IL2Staking').abi)
+        contract = new Contract(contract.address, iface) as unknown as IL2Staking
+      }
       contracts[contractName] = contract
 
       if (signerOrProvider) {
@@ -101,6 +123,21 @@ export const loadContracts = (
       if (chainIdIsL2(chainId) && contractName == 'L2GraphToken') {
         contracts['GraphToken'] = contracts[contractName]
       }
+      if (signerOrProvider && chainIdIsL2(chainId) && contractName == 'L2GNS') {
+        contracts['GNS'] = contracts[contractName]
+      }
+      if (signerOrProvider && chainIdIsL2(chainId) && contractName == 'L2Staking') {
+        contracts['Staking'] = contracts[contractName]
+      }
+      if (signerOrProvider && chainIdIsL2(chainId) && contractName == 'L2Curation') {
+        contracts['Curation'] = contracts[contractName]
+      }
+      if (signerOrProvider && !chainIdIsL2(chainId) && contractName == 'L1GNS') {
+        contracts['GNS'] = contracts[contractName]
+      }
+      if (signerOrProvider && !chainIdIsL2(chainId) && contractName == 'L1Staking') {
+        contracts['Staking'] = contracts[contractName]
+      }
     } catch (err) {
       logger.warn(`Could not load contract ${contractName} - ${err.message}`)
     }

cli/network.ts

@@ -18,6 +18,9 @@ import { AddressBook } from './address-book'
 import { loadArtifact } from './artifacts'
 import { defaultOverrides } from './defaults'
 import { GraphToken } from '../build/types/GraphToken'
+import { Interface } from 'ethers/lib/utils'
+import { IL1Staking } from '../build/types/IL1Staking'
+import { IL2Staking } from '../build/types/IL2Staking'
 
 const { keccak256, randomBytes, parseUnits, hexlify } = utils
 
@@ -197,7 +200,7 @@ export const deployContract = async (
 
   // Deploy
   const factory = getContractFactory(name, libraries)
-  const contract = await factory.connect(sender).deploy(...args)
+  let contract = await factory.connect(sender).deploy(...args)
   const txHash = contract.deployTransaction.hash
   logger.info(`> Deploy ${name}, txHash: ${txHash}`)
   await sender.provider.waitForTransaction(txHash)
@@ -209,6 +212,15 @@ export const deployContract = async (
   logger.info(`= RuntimeCodeHash: ${runtimeCodeHash}`)
   logger.info(`${name} has been deployed to address: ${contract.address}`)
 
+  if (name == 'L1Staking') {
+    // Hack the contract into behaving like an IL1Staking
+    const iface = new Interface(loadArtifact('IL1Staking').abi)
+    contract = new Contract(contract.address, iface, sender) as unknown as IL1Staking
+  } else if (name == 'L2Staking') {
+    // Hack the contract into behaving like an IL2Staking
+    const iface = new Interface(loadArtifact('IL2Staking').abi)
+    contract = new Contract(contract.address, iface, sender) as unknown as IL2Staking
+  }
   return { contract, creationCodeHash, runtimeCodeHash, txHash, libraries }
 }
 

config/graph.arbitrum-goerli-scratch-3.yml

@@ -0,0 +1,151 @@
+general:
+  arbitrator: &arbitrator "0xed42A803C9f0bAE74bF0E63f36FF0Ae7FF38beF7" # Arbitration Council (TODO: update)
+  governor: &governor "0xf6De21Ce446B47d7599BC6554Eaa9EDF05Dfe731" # Graph Council (TODO: update)
+  authority: &authority "0xDfaf2F953899c3Fae4aa4979727fd9F441E006b2" # Authority that signs payment vouchers
+  availabilityOracle: &availabilityOracle "0xC241E5A6e35432bf340B9853F025D90031a9E8ef" # Subgraph Availability Oracle (TODO: update)
+  pauseGuardian: &pauseGuardian "0x5753d3c0c08C2Cee7be69eBbd058299faB0ea966" # Protocol pause guardian (TODO: update)
+  allocationExchangeOwner: &allocationExchangeOwner "0x91cEc32a6975265cF96A43f4209F39274cBEc088" # Allocation Exchange owner (TODO: update)
+
+contracts:
+  Controller:
+    calls:
+      - fn: "setContractProxy"
+        id: "0xe6876326c1291dfcbbd3864a6816d698cd591defc7aa2153d7f9c4c04016c89f" # keccak256('Curation')
+        contractAddress: "${{L2Curation.address}}"
+      - fn: "setContractProxy"
+        id: "0x39605a6c26a173774ca666c67ef70cf491880e5d3d6d0ca66ec0a31034f15ea3" # keccak256('GNS')
+        contractAddress: "${{L2GNS.address}}"
+      - fn: "setContractProxy"
+        id: "0xf942813d07d17b56de9a9afc8de0ced6e8c053bbfdcc87b7badea4ddcf27c307" # keccak256('DisputeManager')
+        contractAddress: "${{DisputeManager.address}}"
+      - fn: "setContractProxy"
+        id: "0xc713c3df6d14cdf946460395d09af88993ee2b948b1a808161494e32c5f67063" # keccak256('EpochManager')
+        contractAddress: "${{EpochManager.address}}"
+      - fn: "setContractProxy"
+        id: "0x966f1e8d8d8014e05f6ec4a57138da9be1f7c5a7f802928a18072f7c53180761" # keccak256('RewardsManager')
+        contractAddress: "${{RewardsManager.address}}"
+      - fn: "setContractProxy"
+        id: "0x1df41cd916959d1163dc8f0671a666ea8a3e434c13e40faef527133b5d167034" # keccak256('Staking')
+        contractAddress: "${{L2Staking.address}}"
+      - fn: "setContractProxy"
+        id: "0x45fc200c7e4544e457d3c5709bfe0d520442c30bbcbdaede89e8d4a4bbc19247" # keccak256('GraphToken')
+        contractAddress: "${{L2GraphToken.address}}"
+      - fn: "setContractProxy"
+        id: "0xd362cac9cb75c10d67bcc0b7eeb0b1ef48bb5420b556c092d4fd7f758816fcf0" # keccak256('GraphTokenGateway')
+        contractAddress: "${{L2GraphTokenGateway.address}}"
+      - fn: "setPauseGuardian"
+        pauseGuardian: *pauseGuardian
+      - fn: "transferOwnership"
+        owner: *governor
+  GraphProxyAdmin:
+    calls:
+      - fn: "transferOwnership"
+        owner: *governor
+  ServiceRegistry:
+    proxy: true
+    init:
+      controller: "${{Controller.address}}"
+    calls:
+      - fn: "syncAllContracts"
+  EpochManager:
+    proxy: true
+    init:
+      controller: "${{Controller.address}}"
+      lengthInBlocks: 554 # length in hours = lengthInBlocks*13/60/60 (~13 second blocks)
+  L2GraphToken:
+    proxy: true
+    init:
+      owner: "${{Env.deployer}}"
+    calls:
+      - fn: "addMinter"
+        minter: "${{RewardsManager.address}}"
+      - fn: "renounceMinter"
+      - fn: "transferOwnership"
+        owner: *governor
+  L2Curation:
+    proxy: true
+    init:
+      controller: "${{Controller.address}}"
+      curationTokenMaster: "${{GraphCurationToken.address}}"
+      curationTaxPercentage: 10000 # in parts per million
+      minimumCurationDeposit: "1000000000000000000" # in wei
+    calls:
+      - fn: "syncAllContracts"
+  DisputeManager:
+    proxy: true
+    init:
+      controller: "${{Controller.address}}"
+      arbitrator: *arbitrator
+      minimumDeposit: "10000000000000000000000" # in wei
+      fishermanRewardPercentage: 500000 # in parts per million
+      idxSlashingPercentage: 25000 # in parts per million
+      qrySlashingPercentage: 25000 # in parts per million
+    calls:
+      - fn: "syncAllContracts"
+  L2GNS:
+    proxy: true
+    init:
+      controller: "${{Controller.address}}"
+      subgraphNFT: "${{SubgraphNFT.address}}"
+    calls:
+      - fn: "approveAll"
+      - fn: "syncAllContracts"
+  SubgraphNFT:
+    init:
+      governor: "${{Env.deployer}}"
+    calls:
+      - fn: "setTokenDescriptor"
+        tokenDescriptor: "${{SubgraphNFTDescriptor.address}}"
+      - fn: "setMinter"
+        minter: "${{L2GNS.address}}"
+      - fn: "transferOwnership"
+        owner: *governor
+  L2Staking:
+    proxy: true
+    init:
+      controller: "${{Controller.address}}"
+      minimumIndexerStake: "100000000000000000000000" # in wei
+      thawingPeriod: 6646 # in blocks
+      protocolPercentage: 10000 # in parts per million
+      curationPercentage: 100000 # in parts per million
+      channelDisputeEpochs: 2 # in epochs
+      maxAllocationEpochs: 4 # in epochs
+      delegationUnbondingPeriod: 12 # in epochs
+      delegationRatio: 16 # delegated stake to indexer stake multiplier
+      rebateAlphaNumerator: 77 # rebateAlphaNumerator / rebateAlphaDenominator
+      rebateAlphaDenominator: 100 # rebateAlphaNumerator / rebateAlphaDenominator
+      extensionImpl: "${{StakingExtension.address}}"
+    calls:
+      - fn: "setDelegationTaxPercentage"
+        delegationTaxPercentage: 5000 # parts per million
+      - fn: "setSlasher"
+        slasher: "${{DisputeManager.address}}"
+        allowed: true
+      - fn: "setAssetHolder"
+        assetHolder: "${{AllocationExchange.address}}"
+        allowed: true
+      - fn: "syncAllContracts"
+  RewardsManager:
+    proxy: true
+    init:
+      controller: "${{Controller.address}}"
+    calls:
+      - fn: "setSubgraphAvailabilityOracle"
+        subgraphAvailabilityOracle: *availabilityOracle
+      - fn: "syncAllContracts"
+  AllocationExchange:
+    init:
+      graphToken: "${{L2GraphToken.address}}"
+      staking: "${{L2Staking.address}}"
+      governor: *allocationExchangeOwner
+      authority: *authority
+    calls:
+      - fn: "approveAll"
+  L2GraphTokenGateway:
+    proxy: true
+    init:
+      controller: "${{Controller.address}}"
+    calls:
+      - fn: "syncAllContracts"
+      - fn: "setPauseGuardian"
+        pauseGuardian: *pauseGuardian