Merge pull request #1 from graphprotocol/dev

update latest

Author: MercuricChloride

.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

addresses.json

@@ -225,10 +225,10 @@
       "txHash": "0xd3a4d1b3e250e606f56417fd6e43d35bc794e793b1c5be4ffbecc3a43ca1b7b6",
       "proxy": true,
       "implementation": {
-        "address": "0x320Fe3AF387a5Fe4159b52dA62246834eCc4b0c1",
-        "creationCodeHash": "0xfec6d35d9de8a7234e77484ee4fa5d6867697d607b591ed5a8e01679fa1f0394",
-        "runtimeCodeHash": "0x4595f2b6c37d65ad1deed2497054b2319fb0c6419439e2e374b29a29aa9fcb81",
-        "txHash": "0x513d322a447acd84d04001933e151156a391999c4c09c7fccad65d6573d694bb"
+        "address": "0xE633B775790b338B8C5a9ff47aB7C5D0faf4CB7a",
+        "creationCodeHash": "0x8e942423da51ec1fbce6834a7da57619454a48aa85efcaffb9a51cff7f655b8f",
+        "runtimeCodeHash": "0xc231e797a4a00f5dae7a26b30c0f689ab57d9f7b47a6b1c41deb73c13f952e3a",
+        "txHash": "0x22dc1dec76de393492ae07901e28581a93afdf6340b0fd53f58d4be81a3e61c9"
       }
     },
     "DisputeManager": {
@@ -324,10 +324,10 @@
       "txHash": "0xd327568a286d6fcda1a6b78a14c87d660523a6900be901d6a7fbc2504faff64b",
       "proxy": true,
       "implementation": {
-        "address": "0x2bc65E92B68560851C225459a31Df6617448EC31",
-        "creationCodeHash": "0x67f10f3d0761db9c6c45ef15b19d7ffd56ca558767aa5b960ffaeec8aa607433",
-        "runtimeCodeHash": "0xbdb984007bd365bea1b1bee307eab5e40a9aa319c111fd7ccab29db30c19ae79",
-        "txHash": "0xe3b69f2bb04e430d23f73933b37a22d9edb651680cf2751221240afebc274ca1"
+        "address": "0xD41ca6A1d034D178c196DFa916f22f7D1a1B8222",
+        "creationCodeHash": "0x7d6f46e4801d562a8c6fc37779711cce39b3544ea62c6c6517d4b06e8604e38c",
+        "runtimeCodeHash": "0xa0c0a37340ee949d31c3d41b642c507c58f225c09da9ae3d378e5148cd27081a",
+        "txHash": "0x25f4234807c7f09b813d4e413311bbe440c8257bc050c71678f63a7abc6e643e"
       }
     }
   },
@@ -480,10 +480,10 @@
       "txHash": "0x108efecde4422dacf6ec7a07884cab214ba0a441fc73a6ad82ceb5c73e1c9334",
       "proxy": true,
       "implementation": {
-        "address": "0x8BE5c7B041662C042aDB8349D5588BB82366BEC0",
-        "creationCodeHash": "0xfec6d35d9de8a7234e77484ee4fa5d6867697d607b591ed5a8e01679fa1f0394",
-        "runtimeCodeHash": "0x4595f2b6c37d65ad1deed2497054b2319fb0c6419439e2e374b29a29aa9fcb81",
-        "txHash": "0x31cd85ce9106900e49e9abf24fafad5493360096bd8486ddb2c42942b061bb56"
+        "address": "0x8ECedc7631f4616D7f4074f9fC9D0368674794BE",
+        "creationCodeHash": "0x8e942423da51ec1fbce6834a7da57619454a48aa85efcaffb9a51cff7f655b8f",
+        "runtimeCodeHash": "0xc231e797a4a00f5dae7a26b30c0f689ab57d9f7b47a6b1c41deb73c13f952e3a",
+        "txHash": "0xe1b5474f03abf1b4f0c0f1fbbad215948ae28b490a21ec07e5a955f52f3969ed"
       }
     },
     "DisputeManager": {
@@ -547,10 +547,10 @@
       "txHash": "0x4a06731591df5c5f77c11bf8df7851234873eb6727fbbc93f5595a223f7cf3fc",
       "proxy": true,
       "implementation": {
-        "address": "0x06A7A68d0D0D496693508ad3f50A8EA962333B7D",
-        "creationCodeHash": "0x9dac8130793923c7f35f3943b755b7a88e2de9a25d0ae5c0b8cb020b6479151a",
-        "runtimeCodeHash": "0xcd798129b77d26c0b29369138d2d8dd413fcf6cb9b3838c5f95f50d9839a388a",
-        "txHash": "0xa4d75169094cd8601ec507234695d83042e888ec2ab49b0ce150d7aae908d895"
+        "address": "0x9e8bab937Cac7c359F5e92248d10C613B3Cd7B8b",
+        "creationCodeHash": "0x7d6f46e4801d562a8c6fc37779711cce39b3544ea62c6c6517d4b06e8604e38c",
+        "runtimeCodeHash": "0xa0c0a37340ee949d31c3d41b642c507c58f225c09da9ae3d378e5148cd27081a",
+        "txHash": "0x517794503416be02d916d289f4e7510359d17567bec987da99319e27e5f40fc1"
       }
     }
   },
@@ -905,10 +905,10 @@
       "txHash": "0x222e14cb6f49e3e7b76f6a523c1a3c24f96402676be8662bf1b94bb2250ddd0f",
       "proxy": true,
       "implementation": {
-        "address": "0x225aB818cD003BB17728768e6a48c160d89C64d0",
-        "creationCodeHash": "0x98aaabec491a17401ca37209db0613c91285de061e859574526f841a4dd60c4a",
-        "runtimeCodeHash": "0x2795a83531898957014373bd4595f1f9a381ecfaf787bdfc64380563af06f06a",
-        "txHash": "0x6b6f45a955e114102874d34e31106ad00e04a9dba96515a9153d60539eb9208a"
+        "address": "0xA301deAbDADF9DBd01932Aa13739c9620FAA54Fd",
+        "creationCodeHash": "0x8e942423da51ec1fbce6834a7da57619454a48aa85efcaffb9a51cff7f655b8f",
+        "runtimeCodeHash": "0xc231e797a4a00f5dae7a26b30c0f689ab57d9f7b47a6b1c41deb73c13f952e3a",
+        "txHash": "0x91c40dd8898d121a3a8d0f3f0e345f5b76157f4baab0ed9b3eb5c7ef14ab95c0"
       }
     },
     "DisputeManager": {
@@ -957,6 +957,15 @@
         "runtimeCodeHash": "0x29e47f693053f978d6b2ac0a327319591bf5b5e8a6e6c0744b8afcc0250bf667",
         "txHash": "0x0eaa9d03982b88e765262a15b95548cb688ce9337a48460f39e55f8850690cbe"
       }
+    },
+    "EthereumDIDRegistry": {
+      "address": "0xa9AEb1c6f14f4244547B9a0946C485DA99047638",
+      "creationCodeHash": "0x20cd202f7991716a84c097da5fbd365fd27f7f35f241f82c529ad7aba18b814b",
+      "runtimeCodeHash": "0x5f396ffd54b6cd6b3faded0f366c5d7e148cc54743926061be2dfd12a75391de",
+      "txHash": "0xdd23b546fa3b6be0cea2339abe3023a082153693fbc7bf1bc86d190165823b39"
+    },
+    "IEthereumDIDRegistry": {
+      "address": "0xa9AEb1c6f14f4244547B9a0946C485DA99047638"
     }
   },
   "421613": {
@@ -1115,10 +1124,10 @@
       "txHash": "0xd4cfa95475e9e867fb24babd6a00a5b6b01d2267533e2412986aa1ff94d51c02",
       "proxy": true,
       "implementation": {
-        "address": "0x80b54Ba64d8a207785969d9ae0dA984EfE8D10dF",
-        "creationCodeHash": "0x98aaabec491a17401ca37209db0613c91285de061e859574526f841a4dd60c4a",
-        "runtimeCodeHash": "0x2795a83531898957014373bd4595f1f9a381ecfaf787bdfc64380563af06f06a",
-        "txHash": "0xb4bc7ae32ec98394c448f8773bdd3049ab83e236acb6823a7a322d88ecfbfd99"
+        "address": "0x17A627c7d6F0A1B4A876Cffea64987B62e91c42D",
+        "creationCodeHash": "0x8e942423da51ec1fbce6834a7da57619454a48aa85efcaffb9a51cff7f655b8f",
+        "runtimeCodeHash": "0xc231e797a4a00f5dae7a26b30c0f689ab57d9f7b47a6b1c41deb73c13f952e3a",
+        "txHash": "0xcf601a6ab653f0028d63529fd261776b3c91df190f2bb4bf32909c95c55049a7"
       }
     },
     "DisputeManager": {
@@ -1167,6 +1176,9 @@
         "runtimeCodeHash": "0x29e47f693053f978d6b2ac0a327319591bf5b5e8a6e6c0744b8afcc0250bf667",
         "txHash": "0xf68a5e1e516ee9a646f19bbe4d58336fdfcf5fc859f84cdac5e68b00bcd3a09a"
       }
+    },
+    "IEthereumDIDRegistry": {
+      "address": "0x8FFfcD6a85D29E9C33517aaf60b16FE4548f517E"
     }
   }
 }

audits/OpenZeppelin/2020-08-graph-protocol.pdf

@@ -11,6 +11,11 @@ import { JsonRpcProvider } from '@ethersproject/providers'
 import { providers } from 'ethers'
 import { L2GraphToken } from '../../../build/types/L2GraphToken'
 import { getL2ToL1MessageReader, getL2ToL1MessageWriter } from '../../arbitrum'
+import { getContractAt } from '../../network'
+import { Argv } from 'yargs'
+
+const LEGACY_L2_GRT_ADDRESS = '0x23A941036Ae778Ac51Ab04CEa08Ed6e2FE103614'
+const LEGACY_L2_GATEWAY_ADDRESS = '0x09e9222e96e7b4ae2a407b98d48e330053351eee'
 
 const FOURTEEN_DAYS_IN_SECONDS = 24 * 3600 * 14
 
@@ -78,21 +83,37 @@ export const startSendToL1 = async (cli: CLIEnvironment, cliArgs: CLIArgs): Prom
   const l2Wallet = cli.wallet.connect(l2Provider)
   const l2AddressBook = getAddressBook(cliArgs.addressBook, l2ChainId.toString())
 
-  const gateway = loadAddressBookContract('L2GraphTokenGateway', l2AddressBook, l2Wallet)
-  const l2GRT = loadAddressBookContract('L2GraphToken', l2AddressBook, l2Wallet) as L2GraphToken
+  let gateway: L2GraphTokenGateway
+  let l2GRT: L2GraphToken
+  if (cliArgs.legacyToken) {
+    gateway = getContractAt(
+      'L2GraphTokenGateway',
+      LEGACY_L2_GATEWAY_ADDRESS,
+      l2Wallet,
+    ) as L2GraphTokenGateway
+    l2GRT = getContractAt('L2GraphToken', LEGACY_L2_GRT_ADDRESS, l2Wallet) as L2GraphToken
+  } else {
+    gateway = loadAddressBookContract(
+      'L2GraphTokenGateway',
+      l2AddressBook,
+      l2Wallet,
+    ) as L2GraphTokenGateway
+    l2GRT = loadAddressBookContract('L2GraphToken', l2AddressBook, l2Wallet) as L2GraphToken
+  }
 
-  const l1Gateway = cli.contracts['L1GraphTokenGateway']
   logger.info(`Will send ${cliArgs.amount} GRT to ${recipient}`)
-  logger.info(`Using L2 gateway ${gateway.address} and L1 gateway ${l1Gateway.address}`)
+  logger.info(`Using L2 gateway ${gateway.address}`)
 
   const senderBalance = await l2GRT.balanceOf(cli.wallet.address)
   if (senderBalance.lt(amount)) {
     throw new Error('Sender balance is insufficient for the transfer')
   }
 
   const params = [l1GRTAddress, recipient, amount, '0x']
-  logger.info('Approving token transfer')
-  await sendTransaction(l2Wallet, l2GRT, 'approve', [gateway.address, amount])
+  if (!cliArgs.legacyToken) {
+    logger.info('Approving token transfer')
+    await sendTransaction(l2Wallet, l2GRT, 'approve', [gateway.address, amount])
+  }
   logger.info('Sending outbound transfer transaction')
   const receipt = await sendTransaction(
     l2Wallet,
@@ -135,11 +156,20 @@ export const finishSendToL1 = async (
 
   const l2AddressBook = getAddressBook(cliArgs.addressBook, l2ChainId.toString())
 
-  const gateway = loadAddressBookContract(
-    'L2GraphTokenGateway',
-    l2AddressBook,
-    l2Provider,
-  ) as L2GraphTokenGateway
+  let gateway: L2GraphTokenGateway
+  if (cliArgs.legacyToken) {
+    gateway = getContractAt(
+      'L2GraphTokenGateway',
+      LEGACY_L2_GATEWAY_ADDRESS,
+      l2Provider,
+    ) as L2GraphTokenGateway
+  } else {
+    gateway = loadAddressBookContract(
+      'L2GraphTokenGateway',
+      l2AddressBook,
+      l2Provider,
+    ) as L2GraphTokenGateway
+  }
   let txHash: string
   if (cliArgs.txHash) {
     txHash = cliArgs.txHash
@@ -193,6 +223,22 @@ export const finishSendToL1 = async (
 export const startSendToL1Command = {
   command: 'start-send-to-l1 <amount> [recipient]',
   describe: 'Start an L2-to-L1 Graph Token transaction',
+  builder: (yargs: Argv): Argv => {
+    return yargs
+      .option('legacy-token', {
+        type: 'boolean',
+        default: false,
+        description: 'Use the legacy GRT token',
+      })
+      .positional('amount', {
+        type: 'string',
+        description: 'The amount of tokens to send',
+      })
+      .positional('recipient', {
+        type: 'string',
+        description: 'The recipient of the tokens on L1. Same as the L2 sender if empty.',
+      })
+  },
   handler: async (argv: CLIArgs): Promise<void> => {
     return startSendToL1(await loadEnv(argv), argv)
   },
@@ -203,6 +249,18 @@ export const finishSendToL1Command = {
   describe:
     'Finish an L2-to-L1 Graph Token transaction. L2 dispute period must have completed. ' +
     'If txHash is not specified, the last withdrawal from the main account in the past 14 days will be redeemed.',
+  builder: (yargs: Argv): Argv => {
+    return yargs
+      .option('legacy-token', {
+        type: 'boolean',
+        default: false,
+        description: 'Use the legacy GRT token',
+      })
+      .positional('txHash', {
+        type: 'string',
+        description: 'The transaction hash of the withdrawal on L2',
+      })
+  },
   handler: async (argv: CLIArgs): Promise<void> => {
     return finishSendToL1(await loadEnv(argv), argv, false)
   },

cli/commands/bridge/to-l1.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/get.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/commands/protocol/set.ts

@@ -1,8 +1,8 @@
 general:
   arbitrator: &arbitrator "0xF89688d5d44d73cc4dE880857A3940487076e5A4" # Arbitration Council (TODO: update)
   governor: &governor "0x5CeeeE16F30357d49c50bcd7F520ca6527cf388a" # Graph Council (TODO: update)
-  authority: &authority "0xD06f366678AE139a94b2AaC2913608De568F1D03" # Authority that signs payment vouchers (TODO: update)
-  availabilityOracle: &availabilityOracle "0xA99A56fA38a6B9553853c84E11458AeCcdad509B" # Subgraph Availability Oracle (TODO: update)
+  authority: &authority "0x2ebFDb50f104c96ee0D1d4D00a4e49f53f4a29c0" # Authority that signs payment vouchers
+  availabilityOracle: &availabilityOracle "0xb05B7488B4c3639cD23d74AA063bD58dec6d8b7e" # Subgraph Availability Oracle (TODO: update)
   pauseGuardian: &pauseGuardian "0x4B6C90B9fE29dfa521188B6547989C23d613b79B" # Protocol pause guardian (TODO: update)
   allocationExchangeOwner: &allocationExchangeOwner "0x05F359b1319f1Ca9b799CB6386F31421c2c49dBA" # Allocation Exchange owner (TODO: update)
 
@@ -57,6 +57,8 @@ contracts:
     init:
       owner: "${{Env.deployer}}"
     calls:
+      - fn: "addMinter"
+        minter: "${{RewardsManager.address}}"
       - fn: "renounceMinter"
       - fn: "transferOwnership"
         owner: *governor
@@ -130,6 +132,8 @@ contracts:
     init:
       controller: "${{Controller.address}}"
     calls:
+      - fn: "setIssuancePerBlock"
+        issuancePerBlock: "6036500000000000000" # per block increase of total supply, blocks in a year = 365*60*60*24/12
       - fn: "setSubgraphAvailabilityOracle"
         subgraphAvailabilityOracle: *availabilityOracle
       - fn: "syncAllContracts"

config/graph.arbitrum-goerli.yml

@@ -57,6 +57,8 @@ contracts:
     init:
       owner: "${{Env.deployer}}"
     calls:
+      - fn: "addMinter"
+        minter: "${{RewardsManager.address}}"
       - fn: "renounceMinter"
       - fn: "transferOwnership"
         owner: *governor
@@ -130,6 +132,8 @@ contracts:
     init:
       controller: "${{Controller.address}}"
     calls:
+      - fn: "setIssuancePerBlock"
+        issuancePerBlock: "6036500000000000000" # per block increase of total supply, blocks in a year = 365*60*60*24/12
       - fn: "setSubgraphAvailabilityOracle"
         subgraphAvailabilityOracle: *availabilityOracle
       - fn: "syncAllContracts"

config/graph.arbitrum-localhost.yml

@@ -1,8 +1,8 @@
 general:
   arbitrator: &arbitrator "0x113DC95e796836b8F0Fa71eE7fB42f221740c3B0" # Arbitration Council
   governor: &governor "0x8C6de8F8D562f3382417340A6994601eE08D3809" # Graph Council
-  authority: &authority "0x79f2212de27912bCb25a452fC102C85c142E3eE3" # Authority that signs payment vouchers
-  availabilityOracle: &availabilityOracle "0xbCAEE36Ce38Ec534c7078db1f90118E72173645B" # Subgraph Availability Oracle
+  authority: &authority "0x4a06858f104B2aB1e1185AB7E09F7B5d3b700479" # Authority that signs payment vouchers
+  availabilityOracle: &availabilityOracle "0x1BEB2266f264Cebd9C6FBE1ceB394a8d944401c1" # Subgraph Availability Oracle
   pauseGuardian: &pauseGuardian "0xB0aD33a21b98bCA1761729A105e2E34e27153aAE" # Protocol pause guardian
   allocationExchangeOwner: &allocationExchangeOwner "0x270Ea4ea9e8A699f8fE54515E3Bb2c418952623b" # Allocation Exchange owner
 
@@ -57,6 +57,8 @@ contracts:
     init:
       owner: "${{Env.deployer}}"
     calls:
+      - fn: "addMinter"
+        minter: "${{RewardsManager.address}}"
       - fn: "renounceMinter"
       - fn: "transferOwnership"
         owner: *governor
@@ -130,6 +132,8 @@ contracts:
     init:
       controller: "${{Controller.address}}"
     calls:
+      - fn: "setIssuancePerBlock"
+        issuancePerBlock: "6036500000000000000" # per block increase of total supply, blocks in a year = 365*60*60*24/12
       - fn: "setSubgraphAvailabilityOracle"
         subgraphAvailabilityOracle: *availabilityOracle
       - fn: "syncAllContracts"

config/graph.arbitrum-one.yml

@@ -1,8 +1,8 @@
 general:
   arbitrator: &arbitrator "0xFD01aa87BeB04D0ac764FC298aCFd05FfC5439cD" # Arbitration Council
   governor: &governor "0xf1135bFF22512FF2A585b8d4489426CE660f204c" # Graph Council
-  authority: &authority "0x52e498aE9B8A5eE2A5Cd26805F06A9f29A7F489F" # Authority that signs payment vouchers
-  availabilityOracle: &availabilityOracle "0x14053D40ea2E81D3AB0739728a54ab84F21200F9" # Subgraph Availability Oracle
+  authority: &authority "0x043C3ae868c8740eB935f22C668B74583F4968D0" # Authority that signs payment vouchers
+  availabilityOracle: &availabilityOracle "0x3994E316418053b253F7cF7B8Ca2452DEa46CbD1" # Subgraph Availability Oracle
   pauseGuardian: &pauseGuardian "0x6855D551CaDe60754D145fb5eDCD90912D860262" # Protocol pause guardian
   allocationExchangeOwner: &allocationExchangeOwner "0xf1135bFF22512FF2A585b8d4489426CE660f204c" # Allocation Exchange owner
 
@@ -58,6 +58,8 @@ contracts:
     calls:
       - fn: "addMinter"
         minter: "${{RewardsManager.address}}"
+      - fn: "addMinter"
+        minter: "${{L1GraphTokenGateway.address}}"
       - fn: "renounceMinter"
       - fn: "transferOwnership"
         owner: *governor
@@ -131,8 +133,8 @@ contracts:
     init:
       controller: "${{Controller.address}}"
     calls:
-      - fn: "setIssuanceRate"
-        issuanceRate: "1000000011247641700" # per block increase of total supply, blocks in a year = 365*60*60*24/13
+      - fn: "setIssuancePerBlock"
+        issuancePerBlock: "114693500000000000000" # per block increase of total supply, blocks in a year = 365*60*60*24/12
       - fn: "setSubgraphAvailabilityOracle"
         subgraphAvailabilityOracle: *availabilityOracle
       - fn: "syncAllContracts"