Work 78 - Adding the ability to Deploy other Chains

packages/govern-create/deploy/factories.ts

@@ -1,5 +1,6 @@
 import { HardhatRuntimeEnvironment } from 'hardhat/types'
 import { DeployFunction } from 'hardhat-deploy/types'
+import { network, ethers } from 'hardhat'
 
 const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
   const { deployments, getNamedAccounts } = hre
@@ -26,6 +27,43 @@ const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
     log: true,
     // deterministicDeployment: true,
   })
+
+
+    const token = await deploy('GovernToken', {
+      from: deployer,
+      args: [
+        tokenFactory.address,
+        "GovernToken base",
+        "GTB",
+        0
+      ],
+      log: true,
+      // deterministicDeployment: true,
+    })
+
+    const merkelDistributor = await deploy('MerkleDistributor', {
+      from: deployer,
+      log: true
+    })
+
+    const minter = await deploy('GovernMinter', {
+      from: deployer,
+      args: [
+        token.address,
+        tokenFactory.address,
+        merkelDistributor.address
+      ]
+    })
+
+    try {
+      const tokenFactoryInstance = (await ethers.getContractFactory('GovernTokenFactory')).attach(tokenFactory.address);
+      await tokenFactoryInstance.setupBases(merkelDistributor.address,
+        minter.address,
+        token.address)
+    } catch (error) {
+      console.log(error);
+    }  
+
 
   await deploy('GovernBaseFactory', {
     from: deployer,

packages/govern-create/deploy/verify.ts

@@ -4,6 +4,7 @@ import { TASK_ETHERSCAN_VERIFY } from 'hardhat-deploy'
 
 import { verifyContract } from '../utils/etherscan'
 import { ERC3000DefaultConfig } from 'erc3k/utils/ERC3000'
+import { network } from 'hardhat'
 
 const TWO_ADDRR = `0x${'00'.repeat(19)}02`
 
@@ -19,9 +20,14 @@ const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
   console.log(
     'Waiting for 2 minutes so Etherscan is aware of contracts before verifying'
   )
-  await delay(120000) // Etherscan needs some time to process before trying to verify.
-  console.log('Starting to verify now')
 
+  if (network.name == 'fuji' || 'avalanche') {
+    console.log('Starting to verify now, Some network are fast some arent')
+  } else {
+    // Etherscan needs some time to process before trying to verify.
+    console.log('Starting to verify now')
+    await delay(120000) 
+  }
   await run(TASK_ETHERSCAN_VERIFY, {
     apiKey: process.env.ETHERSCAN_KEY,
     license: 'GPL-3.0',

packages/govern-create/hardhat.config.ts

@@ -66,6 +66,15 @@ const config: HardhatUserConfig = {
       url: 'https://rinkeby.infura.io/v3/7a03fcb37be7479da06f92c5117afd47',
       accounts: PRIV_KEYS,
     },
+    avalanche: {
+      url: 'https://api.avax.network/ext/bc/C/rpc',
+      accounts: PRIV_KEYS,
+    },
+    fuji: {
+      url: 'https://api.avax-test.network/ext/bc/C/rpc',
+      accounts: PRIV_KEYS,
+      blockGasLimit: 8000000
+    }
   },
 }
 

packages/govern-create/package.json

@@ -22,7 +22,7 @@
   },
   "devDependencies": {
     "@nomiclabs/hardhat-ethers": "^2.0.0",
-    "@nomiclabs/hardhat-etherscan": "^2.1.0",
+    "@nomiclabs/hardhat-etherscan": "^2.1.8",
     "@nomiclabs/hardhat-waffle": "^2.0.0",
     "@typechain/ethers-v5": "^4.0.0",
     "@types/chai": "^4.2.13",
@@ -35,7 +35,7 @@
     "ethereum-waffle": "^3.0.0",
     "ethers": "^5.0.0",
     "hardhat": "^2.1.1",
-    "hardhat-deploy": "^0.7.2",
+    "hardhat-deploy": "^0.9.22",
     "hardhat-typechain": "^0.3.3",
     "solidity-coverage": "^0.7.15",
     "tmp-promise": "^3.0.2",

packages/govern-create/utils/etherscan.ts

@@ -2,7 +2,7 @@ import HRE from 'hardhat'
 import fs from 'fs'
 import { file } from 'tmp-promise'
 
-export const SUPPORTED_ETHERSCAN_NETWORKS = ['mainnet', 'rinkeby', 'rinkeby_staging']
+export const SUPPORTED_ETHERSCAN_NETWORKS = ['mainnet', 'rinkeby', 'rinkeby_staging', 'fuji', 'avalanche', 'polygon', 'mumbai']
 
 function delay(ms: number) {
   return new Promise((resolve) => setTimeout(resolve, ms))

packages/govern-create/utils/network.ts

@@ -1,6 +1,7 @@
 import 'dotenv/config'
 
 export const RINKEBY_URL = 'https://rinkeby.eth.aragon.network'
+export const FUJI_URL = 'https://api.avax-test.network/ext/bc/C/rpc'
 
 export function node_url(networkName: string): string {
   if (networkName) {

packages/govern-token/contracts/GovernMinter.sol

@@ -25,13 +25,13 @@ contract GovernMinter is ACL {
     event MintedSingle(address indexed to, uint256 amount, bytes context);
     event MintedMerkle(address indexed distributor, bytes32 indexed merkleRoot, uint256 totalAmount, bytes tree, bytes context);
 
-    constructor(GovernToken _token, address _initialMinter, MerkleDistributor _distributorBase) ACL(_initialMinter) public {
+    constructor(address _token, address _initialMinter, address _distributorBase) ACL(_initialMinter) public {
         initialize(_token, _initialMinter, _distributorBase);
     }
 
-    function initialize(GovernToken _token, address _initialMinter, MerkleDistributor _distributorBase) public initACL(_initialMinter) onlyInit("minter") {
-        token = _token;
-        distributorBase = address(_distributorBase);
+    function initialize(address _token, address _initialMinter, address _distributorBase) public initACL(_initialMinter) onlyInit("minter") {
+        token = GovernToken(_token);
+        distributorBase = _distributorBase;
         _grant(MINT_ROLE, _initialMinter);
     }
 

packages/govern-token/contracts/GovernTokenFactory.sol

@@ -24,7 +24,8 @@ contract GovernTokenFactory {
     event CreatedToken(GovernToken token, GovernMinter minter);
 
     constructor() public {
-        setupBases();
+        // setupBases();
+        // This we disable since it fails for the contract code out of storage
     }
 
     function newToken(
@@ -36,7 +37,8 @@ contract GovernTokenFactory {
         GovernMinter minter
     ) {
         if (!_useProxies) {
-            (token, minter) = _deployContracts(_token.tokenName, _token.tokenSymbol, _token.tokenDecimals);
+            // (token, minter) = _deployContracts(_token.tokenName, _token.tokenSymbol, _token.tokenDecimals);
+            // The idea of deployContract is moved again with the contract code out of storage
         } else {
             token = GovernToken(tokenBase.clone(abi.encodeWithSelector(
                 token.initialize.selector,
@@ -78,14 +80,11 @@ contract GovernTokenFactory {
         emit CreatedToken(token, minter);
     }
 
-    function setupBases() private {
-        distributorBase = address(new MerkleDistributor(ERC20(tokenBase), bytes32(0)));
+    function setupBases(address _distributorBase, address _minter, address _token) public {
+        distributorBase = _distributorBase;
 
-        (GovernToken token, GovernMinter minter) = _deployContracts(
-            "GovernToken base",
-            "GTB",
-            0
-        );
+        GovernToken token = GovernToken(_token);
+        GovernMinter minter = GovernMinter(_minter);
         token.changeMinter(address(minter));
 
         // test the bases
@@ -97,15 +96,15 @@ contract GovernTokenFactory {
         minterBase = address(minter);
     }
 
-    function _deployContracts(
-        string memory _tokenName,
-        string memory _tokenSymbol,
-        uint8 _tokenDecimals
-    ) internal returns (
-        GovernToken token,
-        GovernMinter minter
-    ) {
-        token = new GovernToken(address(this), _tokenName, _tokenSymbol, _tokenDecimals);
-        minter = new GovernMinter(GovernToken(token), address(this), MerkleDistributor(distributorBase));
-    }
+    // function _deployContracts(
+    //     string memory _tokenName,
+    //     string memory _tokenSymbol,
+    //     uint8 _tokenDecimals
+    // ) internal returns (
+    //     GovernToken token,
+    //     GovernMinter minter
+    // ) {
+    //     token = new GovernToken(address(this), _tokenName, _tokenSymbol, _tokenDecimals);
+    //     minter = new GovernMinter(GovernToken(token), address(this), MerkleDistributor(distributorBase));
+    // }
 }

packages/govern-token/contracts/MerkleDistributor.sol

@@ -23,8 +23,8 @@ contract MerkleDistributor is Initializable {
 
     event Claimed(uint256 indexed index, address indexed to, uint256 amount);
 
-    constructor(ERC20 _token, bytes32 _merkleRoot) public {
-        initialize(_token, _merkleRoot);
+    constructor() public {
+        initialize(ERC20(address(0)), bytes32(0));
     }
 
     function initialize(ERC20 _token, bytes32 _merkleRoot) public onlyInit("distributor") {