misc: upgradeable curation and staking contracts (#244)

Upgradeability to both the Staking and Curation contract. Also implements security improvements.

- add proxy delegate call contract
- prepare curation and staking contract to be used in the context of a proxy
- add a function for the new governor to need to accept the role
- assign governor to the contract creator by default
- make bancor formula to use initialize to support being used from upgradeable contracts
- proxy contract for staking upgrades
- add governed contract test
- remove setToken() function from Curation

The deploy script is now aware of the contracts deployed with a delegatecall proxy to make them upgradeable:

- this script deploys a contract with a Proxy when the attribute __proxy: true is set in the graph.config.yml
- all the parameters that would be passed in the constructor are used to initialize the Implementation. By convention
the `acceptProxy` function is used.
- the deploy script updates the addresses.json file indicating the proxy address and the implementation address.
- improve the CLI consistency
- support deploy single contracts, this is useful when we want to deploy a fix and then upgrade

Author: abarmat

.soliumignore

@@ -1,14 +1,17 @@
 node_modules
+
 contracts/abdk-libraries-solidity
 contracts/bancor
 contracts/ens
 contracts/erc1056
 contracts/openzeppelin
-contracts/IGraphToken.sol
-contracts/MultiSigWallet.sol
-contracts/Staking.sol
+
+contracts/staking/Staking.sol
+contracts/token/IGraphToken.sol
+contracts/upgrades/GraphProxy.sol
+
 contracts/connext/IndexerMultiAssetInterpreter.sol
 contracts/connext/IndexerSingleAssetInterpreter.sol
 contracts/connext/IndexerWithdrawInterpreter.sol
 contracts/connext/Proxy.sol
-contracts/connext/MinimumViableMultisig.sol
+contracts/connext/MinimumViableMultisig.sol

buidler.config.ts

@@ -3,6 +3,7 @@ import { Wallet } from 'ethers'
 import { task, usePlugin } from '@nomiclabs/buidler/config'
 
 import { cliOpts } from './scripts/cli/constants'
+import { loadEnv } from './scripts/cli/env'
 import { migrate } from './scripts/cli/commands/migrate'
 import { verify } from './scripts/cli/commands/verify'
 
@@ -41,14 +42,14 @@ task('migrate', 'Migrate contracts')
   .addFlag('force', cliOpts.force.description)
   .setAction(async (taskArgs, bre) => {
     const accounts = await bre.ethers.getSigners()
-    await migrate(accounts[0] as Wallet, taskArgs.addressBook, taskArgs.graphConfig, taskArgs.force)
+    await migrate(await loadEnv(accounts[0] as Wallet, taskArgs), taskArgs)
   })
 
 task('verify', 'Verify contracts in Etherscan')
   .addParam('addressBook', cliOpts.addressBook.description, cliOpts.addressBook.default)
   .setAction(async (taskArgs, bre) => {
     const accounts = await bre.ethers.getSigners()
-    await verify(accounts[0] as Wallet, taskArgs.addressBook)
+    await verify(await loadEnv(accounts[0] as Wallet, taskArgs))
   })
 
 // Config - Go to https://buidler.dev/config/ to learn more
@@ -130,6 +131,15 @@ const config = {
         mnemonic: getAccountMnemonic(),
       },
     },
+    mainnet: {
+      chainId: 1,
+      url: getInfuraProviderURL('mainnet'),
+      gas: 'auto',
+      gasPrice: 'auto',
+      accounts: {
+        mnemonic: getAccountMnemonic(),
+      },
+    },
   },
   etherscan: {
     url: 'https://api-kovan.etherscan.io/api',

contracts/DisputeManager.sol

@@ -3,9 +3,9 @@ pragma experimental ABIEncoderV2;
 
 import "@openzeppelin/contracts/math/SafeMath.sol";
 
-import "./Governed.sol";
-import "./IGraphToken.sol";
-import "./IStaking.sol";
+import "./governance/Governed.sol";
+import "./staking/IStaking.sol";
+import "./token/IGraphToken.sol";
 
 /*
  * @title DisputeManager
@@ -150,7 +150,6 @@ contract DisputeManager is Governed {
 
     /**
      * @dev Contract Constructor
-     * @param _governor Owner address of this contract
      * @param _token Address of the Graph Protocol token
      * @param _arbitrator Arbitrator role
      * @param _staking Address of the staking contract used for slashing
@@ -159,14 +158,13 @@ contract DisputeManager is Governed {
      * @param _slashingPercentage Percentage of indexer stake slashed after a dispute
      */
     constructor(
-        address _governor,
         address _arbitrator,
         address _token,
         address _staking,
         uint256 _minimumDeposit,
         uint256 _fishermanRewardPercentage,
         uint256 _slashingPercentage
-    ) public Governed(_governor) {
+    ) public {
         arbitrator = _arbitrator;
         token = IGraphToken(_token);
         staking = IStaking(_staking);

contracts/EpochManager.sol

@@ -2,7 +2,7 @@ pragma solidity ^0.6.4;
 
 import "@openzeppelin/contracts/math/SafeMath.sol";
 
-import "./Governed.sol";
+import "./governance/Governed.sol";
 
 /**
  * @title EpochManager contract
@@ -30,10 +30,9 @@ contract EpochManager is Governed {
 
     /**
      * @dev Contract Constructor
-     * @param _governor Owner address of this contract
      * @param _epochLength Epoch length in blocks
      */
-    constructor(address _governor, uint256 _epochLength) public Governed(_governor) {
+    constructor(uint256 _epochLength) public {
         require(_epochLength > 0, "Epoch length cannot be 0");
 
         lastLengthUpdateEpoch = 0;

contracts/GNS.sol

@@ -1,8 +1,8 @@
 pragma solidity ^0.6.4;
 pragma experimental ABIEncoderV2;
 
-import "./Governed.sol";
 import "./erc1056/IEthereumDIDRegistry.sol";
+import "./governance/Governed.sol";
 
 /**
  * @title GNS
@@ -62,10 +62,9 @@ contract GNS is Governed {
 
     /**
      * @dev Contract Constructor.
-     * @param _governor Owner address of this contract
      * @param _didRegistry Address of the Ethereum DID registry
      */
-    constructor(address _governor, address _didRegistry) public Governed(_governor) {
+    constructor(address _didRegistry) public {
         erc1056Registry = IEthereumDIDRegistry(_didRegistry);
     }