Arbitrum devnet with rewards distribution

cli/commands/migrate.ts

@@ -35,30 +35,28 @@ let allContracts = [
   'AllocationExchange',
   'L1GraphTokenGateway',
   'BridgeEscrow',
+  'L1Reservoir',
 ]
 
-// This is all we'll want to deploy to L2 eventually:
-// const l2Contracts = [
-//   'GraphProxyAdmin',
-//   'BancorFormula',
-//   'Controller',
-//   'EpochManager',
-//   'L2GraphToken',
-//   'GraphCurationToken',
-//   'ServiceRegistry',
-//   'Curation',
-//   'SubgraphNFTDescriptor',
-//   'SubgraphNFT',
-//   'GNS',
-//   'Staking',
-//   'RewardsManager',
-//   'DisputeManager',
-//   'AllocationExchange',
-//   'L2GraphTokenGateway',
-// ]
-//
-// But for now we'll only include a subset:
-const l2Contracts = ['GraphProxyAdmin', 'Controller', 'L2GraphToken', 'L2GraphTokenGateway']
+const l2Contracts = [
+  'GraphProxyAdmin',
+  'BancorFormula',
+  'Controller',
+  'EpochManager',
+  'L2GraphToken',
+  'GraphCurationToken',
+  'ServiceRegistry',
+  'Curation',
+  'SubgraphNFTDescriptor',
+  'SubgraphNFT',
+  'GNS',
+  'Staking',
+  'RewardsManager',
+  'DisputeManager',
+  'AllocationExchange',
+  'L2GraphTokenGateway',
+  'L2Reservoir',
+]
 
 export const migrate = async (cli: CLIEnvironment, cliArgs: CLIArgs): Promise<void> => {
   const graphConfigPath = cliArgs.graphConfig

config/graph.arbitrum-one.yml

@@ -6,18 +6,122 @@ general:
 contracts:
   Controller:
     calls:
+      - fn: "setContractProxy"
+        id: "0xe6876326c1291dfcbbd3864a6816d698cd591defc7aa2153d7f9c4c04016c89f" # keccak256('Curation')
+        contractAddress: "${{Curation.address}}"
+      - fn: "setContractProxy"
+        id: "0x39605a6c26a173774ca666c67ef70cf491880e5d3d6d0ca66ec0a31034f15ea3" # keccak256('GNS')
+        contractAddress: "${{GNS.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: "${{Staking.address}}"
       - fn: "setContractProxy"
         id: "0x45fc200c7e4544e457d3c5709bfe0d520442c30bbcbdaede89e8d4a4bbc19247" # keccak256('GraphToken')
         contractAddress: "${{L2GraphToken.address}}"
       - fn: "setContractProxy"
         id: "0xd362cac9cb75c10d67bcc0b7eeb0b1ef48bb5420b556c092d4fd7f758816fcf0" # keccak256('GraphTokenGateway')
         contractAddress: "${{L2GraphTokenGateway.address}}"
+      - fn: "setContractProxy"
+        id: "0x96ba401694892957e25e29c7a1e4171ae9945b5ee36339de79b199a530436e9e" # keccak256('Reservoir')
+        contractAddress: "${{L2Reservoir.address}}"
+  ServiceRegistry:
+    proxy: true
+    init:
+      controller: "${{Controller.address}}"
+  EpochManager:
+    proxy: true
+    init:
+      controller: "${{Controller.address}}"
+      lengthInBlocks: 1108 # 4 hours (in 13 second blocks)
   L2GraphToken:
     proxy: true
     init:
       owner: *governor
-      initialSupply: "0"
+  Curation:
+    proxy: true
+    init:
+      controller: "${{Controller.address}}"
+      bondingCurve: "${{BancorFormula.address}}"
+      curationTokenMaster: "${{GraphCurationToken.address}}"
+      reserveRatio: 500000 # 50% (parts per million)
+      curationTaxPercentage: 10000 # 1% (parts per million)
+      minimumCurationDeposit: "1000000000000000000" # 1 GRT
+  DisputeManager:
+    proxy: true
+    init:
+      controller: "${{Controller.address}}"
+      arbitrator: *arbitrator
+      minimumDeposit: "10000000000000000000000" # 10,000 GRT (in wei)
+      fishermanRewardPercentage: 500000 # 50% (parts per million)
+      idxSlashingPercentage: 25000 # 2.5% (parts per million)
+      qrySlashingPercentage: 5000 # 0.5% (parts per million)
+  GNS:
+    proxy: true
+    init:
+      controller: "${{Controller.address}}"
+      bondingCurve: "${{BancorFormula.address}}"
+      subgraphNFT: "${{SubgraphNFT.address}}"
+    calls:
+      - fn: "approveAll"
+  SubgraphNFT:
+    init:
+      governor: "${{Env.deployer}}"
+    calls:
+      - fn: "setTokenDescriptor"
+        tokenDescriptor: "${{SubgraphNFTDescriptor.address}}"
+      - fn: "setMinter"
+        minter: "${{GNS.address}}"
+  Staking:
+    proxy: true
+    init:
+      controller: "${{Controller.address}}"
+      minimumIndexerStake: "100000000000000000000000" # 100,000 GRT (in wei)
+      thawingPeriod: 6646 # 10 days (in blocks)
+      protocolPercentage: 10000 # 1% (parts per million)
+      curationPercentage: 100000 # 10% (parts per million)
+      channelDisputeEpochs: 2 # (in epochs)
+      maxAllocationEpochs: 6 # Based on epoch length this is 28 days (in epochs)
+      delegationUnbondingPeriod: 6 # Based on epoch length this is 28 days (in epochs)
+      delegationRatio: 16 # 16x (delegated stake to indexer stake multiplier)
+      rebateAlphaNumerator: 77 # rebateAlphaNumerator / rebateAlphaDenominator
+      rebateAlphaDenominator: 100 # rebateAlphaNumerator / rebateAlphaDenominator
+    calls:
+      - fn: "setDelegationTaxPercentage"
+        delegationTaxPercentage: 5000 # 0.5% (parts per million)
+      - fn: "setSlasher"
+        slasher: "${{DisputeManager.address}}"
+        allowed: true
+      - fn: "setAssetHolder"
+        assetHolder: "${{AllocationExchange.address}}"
+        allowed: true
+  RewardsManager:
+    proxy: true
+    init:
+      controller: "${{Controller.address}}"
+  AllocationExchange:
+    init:
+      graphToken: "${{GraphToken.address}}"
+      staking: "${{Staking.address}}"
+      governor: *governor
+      authority: *authority
+    calls:
+      - fn: "approveAll"
   L2GraphTokenGateway:
     proxy: true
     init:
       controller: "${{Controller.address}}"
+  L2Reservoir:
+    proxy: true
+    init:
+      controller: "${{Controller.address}}"
+    calls:
+      - fn: "approveRewardsManager"

config/graph.mainnet.yml

@@ -30,6 +30,9 @@ contracts:
       - fn: "setContractProxy"
         id: "0xd362cac9cb75c10d67bcc0b7eeb0b1ef48bb5420b556c092d4fd7f758816fcf0" # keccak256('GraphTokenGateway')
         contractAddress: "${{L1GraphTokenGateway.address}}"
+      - fn: "setContractProxy"
+        id: "0x96ba401694892957e25e29c7a1e4171ae9945b5ee36339de79b199a530436e9e" # keccak256('Reservoir')
+        contractAddress: "${{L1Reservoir.address}}"
   ServiceRegistry:
     proxy: true
     init:
@@ -44,7 +47,7 @@ contracts:
       initialSupply: "10000000000000000000000000000" # in wei
     calls:
       - fn: "addMinter"
-        minter: "${{RewardsManager.address}}"
+        minter: "${{L1Reservoir.address}}"
   Curation:
     proxy: true
     init:
@@ -106,7 +109,6 @@ contracts:
     proxy: true
     init:
       controller: "${{Controller.address}}"
-      issuanceRate: "1000000012184945188" # per block increase of total supply, blocks in a year = 365*60*60*24/13
   AllocationExchange:
     init:
       graphToken: "${{GraphToken.address}}"
@@ -123,3 +125,11 @@ contracts:
     proxy: true
     init:
       controller: "${{Controller.address}}"
+  L1Reservoir:
+    proxy: true
+    init:
+      controller: "${{Controller.address}}"
+      dripInterval: 50400
+    calls:
+      - fn: "approveRewardsManager"
+      - fn: "initialSnapshot"

contracts/arbitrum/AddressAliasHelper.sol

@@ -0,0 +1,46 @@
+// SPDX-License-Identifier: Apache-2.0
+
+/*
+ * Copyright 2019-2021, Offchain Labs, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * Originally copied from:
+ * https://github.com/OffchainLabs/arbitrum/tree/84e64dee6ee82adbf8ec34fd4b86c207a61d9007/packages/arb-bridge-eth
+ *
+ * MODIFIED from Offchain Labs' implementation:
+ * - Changed solidity version to 0.7.6 ([email protected])
+ *
+ */
+
+pragma solidity ^0.7.6;
+
+library AddressAliasHelper {
+    uint160 constant offset = uint160(0x1111000000000000000000000000000000001111);
+
+    /// @notice Utility function that converts the address in the L1 that submitted a tx to
+    /// the inbox to the msg.sender viewed in the L2
+    /// @param l1Address the address in the L1 that triggered the tx to L2
+    /// @return l2Address L2 address as viewed in msg.sender
+    function applyL1ToL2Alias(address l1Address) internal pure returns (address l2Address) {
+        l2Address = address(uint160(l1Address) + offset);
+    }
+
+    /// @notice Utility function that converts the msg.sender viewed in the L2 to the
+    /// address in the L1 that submitted a tx to the inbox
+    /// @param l2Address L2 address as viewed in msg.sender
+    /// @return l1Address the address in the L1 that triggered the tx to L2
+    function undoL1ToL2Alias(address l2Address) internal pure returns (address l1Address) {
+        l1Address = address(uint160(l2Address) - offset);
+    }
+}

contracts/arbitrum/ITokenGateway.sol

@@ -66,7 +66,7 @@ interface ITokenGateway {
     /**
      * @notice Calculate the address used when bridging an ERC20 token
      * @dev the L1 and L2 address oracles may not always be in sync.
-     * For example, a custom token may have been registered but not deploy or the contract self destructed.
+     * For example, a custom token may have been registered but not deployed or the contract self destructed.
      * @param l1ERC20 address of L1 token
      * @return L2 address of a bridged ERC20 token
      */

contracts/gateway/BridgeEscrow.sol

@@ -13,8 +13,6 @@ import "../token/IGraphToken.sol";
  * approved as a spender.
  */
 contract BridgeEscrow is GraphUpgradeable, Managed {
-    uint256 private constant MAX_UINT256 = 2**256 - 1;
-
     /**
      * @dev Initialize this contract.
      * @param _controller Address of the Controller that manages this contract
@@ -25,18 +23,18 @@ contract BridgeEscrow is GraphUpgradeable, Managed {
 
     /**
      * @dev Approve a spender (i.e. a bridge that manages the GRT funds held by the escrow)
-     * @param spender Address of the spender that will be approved
+     * @param _spender Address of the spender that will be approved
      */
-    function approveAll(address spender) external onlyGovernor {
-        graphToken().approve(spender, MAX_UINT256);
+    function approveAll(address _spender) external onlyGovernor {
+        graphToken().approve(_spender, type(uint256).max);
     }
 
     /**
      * @dev Revoke a spender (i.e. a bridge that will no longer manage the GRT funds held by the escrow)
-     * @param spender Address of the spender that will be revoked
+     * @param _spender Address of the spender that will be revoked
      */
-    function revokeAll(address spender) external onlyGovernor {
+    function revokeAll(address _spender) external onlyGovernor {
         IGraphToken grt = graphToken();
-        grt.decreaseAllowance(spender, grt.allowance(address(this), spender));
+        grt.decreaseAllowance(_spender, grt.allowance(address(this), _spender));
     }
 }

contracts/gateway/GraphTokenGateway.sol

@@ -42,10 +42,10 @@ abstract contract GraphTokenGateway is GraphUpgradeable, Pausable, Managed, ITok
 
     /**
      * @notice Change the paused state of the contract
-     * @param newPaused New value for the pause state (true means the transfers will be paused)
+     * @param _newPaused New value for the pause state (true means the transfers will be paused)
      */
-    function setPaused(bool newPaused) external onlyGovernorOrGuardian {
-        _setPaused(newPaused);
+    function setPaused(bool _newPaused) external onlyGovernorOrGuardian {
+        _setPaused(_newPaused);
     }
 
     /**