@gooddollar/goodprotocol 1.0.3 → 1.0.5

package/hardhat.config.ts

@@ -117,19 +117,22 @@ const hhconfig: HardhatUserConfig = {
     "fuse-mainnet": {
       accounts: { mnemonic },
       url: "https://ropsten.infura.io/v3/" + infura_api,
-
+      gasPrice: 20000000000,
+      gas: 5000000,
       chainId: 3
     },
     staging: {
       accounts: { mnemonic },
       url: "https://rpc.fuse.io/",
-
-      chainId: 122
+      chainId: 122,
+      gas: 6000000,
+      gasPrice: 1000000000
     },
     "staging-mainnet": {
       accounts: { mnemonic },
       url: "https://ropsten.infura.io/v3/" + infura_api,
-
+      gasPrice: 20000000000,
+      gas: 5000000,
       chainId: 3
     },
     production: {
@@ -143,7 +146,7 @@ const hhconfig: HardhatUserConfig = {
       accounts: [deployerPrivateKey],
       url: "https://mainnet.infura.io/v3/" + infura_api,
       gas: 3000000,
-      gasPrice: 25000000000,
+      gasPrice: 50000000000,
       chainId: 1
     }
   },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gooddollar/goodprotocol",
-  "version": "1.0.3",
+  "version": "1.0.5",
   "description": "GoodDollar Protocol",
   "scripts": {
     "build": "scripts/build.sh deploy",
@@ -60,6 +60,7 @@
     "ethers-multicall": "^0.2.1",
     "openzeppelin-solidity": "^4.3.2",
     "patch-package": "latest",
+    "press-any-key": "^0.1.1",
     "truffle-plugin-verify": "^0.5.11",
     "truffle-source-verify": "^0.0.6"
   },

package/releases/deployment.json

@@ -146,41 +146,42 @@
         "COMP": "0x0000000000000000000000000000000000000000"
     },
     "fuse-mainnet": {
-        "NameService": "0x5e8bF25c75787e9fa17e2321266b0cbE95c830d0",
-        "GReputation": "0x8be7F5a424240e828F937f7dB92A4b4B44708410",
-        "CompoundVotingMachine": "0x31e831f7950F1d127856974AeE594f796c84af11",
-        "GoodMarketMaker": "0xdd9A6822745d017E42d976FF791E9d6Bed396C00",
-        "GoodReserveCDai": "0x8ECd5577aAf386806C2724CcEdB168B369BeFa99",
-        "ExchangeHelper": "0xA5C33Eb014267DA1dd69d7c0E1d3be7AAC2640e1",
-        "GoodFundManager": "0xb51CF5c8aeaa85fBB86cFF6175Bc31e8256686b1",
-        "StakersDistribution": "0xC5E509eE778E4A1Ca1D141Dd381A12A608bE71f1",
-        "ProtocolUpgrade": "0x6d3037CfBE39854744CE98469bee1837364B3286",
-        "CompoundStakingFactory": "0xF115708be5dF1D069EED031117bA7969c925F69A",
+        "NameService": "0x3baeEff20Cb02a5b8eF413C611c015E69221663e",
+        "GReputation": "0x30A5Ba8ED4864bf3B1fa30c78Ac774fA9D5C62CC",
+        "CompoundVotingMachine": "0xE2C57968b52A417132511fBDCAB1763D41a4F270",
+        "GoodMarketMaker": "0xD2cf3205EA36AEFf3CF0e8e8701EAe40AA3f6E4F",
+        "GoodReserveCDai": "0x2AEe03Bb8b182AF876B9d008AF9416D2A3dF6dB3",
+        "ExchangeHelper": "0xeFF1EfCf1F0247f82B0d8406f32831b00Bfdf729",
+        "GoodFundManager": "0x3419945657B6Bd89DaFD7F2bafC75FF46511298F",
+        "StakersDistribution": "0xe8C67A909d3231ddD97E4CC2c1B17a8FFA94475E",
+        "ProtocolUpgrade": "0x1a521868ED7B4d8835f1F52172d38C1C3e630E92",
+        "CompoundStakingFactory": "0xE1193dE8716400ee5aD7b4B96CBdf0dABaF7d088",
         "StakingContracts": [
             [
-                "0x235fEd3D403CDbC7CC78E58744f823F7c738476F",
+                "0x98867484E2F0c902F64bCdEDc2e289307c988214",
                 13888
             ]
         ],
-        "DonationsStaking": "0x0A53e103E65deB1Ba18F374f6A2Bc6660305fd9C",
-        "Contribution": "0xd9dD31139a544Df145cf10cC73e7FC1Db33971Fa",
+        "DonationsStaking": "0x2aAd517DE8256ee6DC7ce31Ae09EBb99F17F9975",
+        "Contribution": "0x2250c5131bf9DdCbD55F9bEFc999D691c419ad93",
         "DAI": "0xB5E5D0F8C0cbA267CD3D7035d6AdC8eBA7Df7Cdd",
         "cDAI": "0x6ce27497a64fffb5517aa4aee908b1e7eb63b9ff",
-        "ForeignBridge": "0xEE0756A5394721e54A092F9aEbd525DD3A2Ace8d",
-        "GoodDollar": "0xd76135e33B9ee4F1bF1D57Ec18bBBC11AFf30941",
+        "ForeignBridge": "0x18F2a22Aa6420D06C079e70838a21a3c75322834",
+        "GoodDollar": "0x22A4720e32e3419e809731E7114042D6C3055845",
         "Reputation": "0x5925F6Bf62147D2b14B85e6dCB979e3D1A81Dbb1",
-        "Identity": "0x13973e242C75091E605844F816b9a8E211929559",
-        "Avatar": "0xB7D068E9e4235176FA51c5971081117DFE5e7F75",
-        "Controller": "0xd6513d7145a208d94E508BAB2E4bE31f6dce5147",
+        "Identity": "0x4D347bda25BEf041BfCB5205deECD1A33ab46db9",
+        "Avatar": "0x11655e9D725Fc1f8D1410C03f136aC586f7161ee",
+        "Controller": "0xD458BAEC7E8864A2c9c2e1261D87A4FAf77002B7",
         "AbsoluteVote": "0x57312053C36A226Df13B01089218A5f9951D3f9c",
         "ProxyAdmin": "0xE383e9D08e3e4f76CBb4a6953aF343E7bbcc6e98",
         "COMP": "0xf76d4a441e4ba86a923ce32b89aff89dbccaa075",
         "network": "fuse-mainnet",
         "networkId": 3,
         "ProxyFactory": "0x163b69fA3a7d3e5347a29A5A49b282c35d17C87A",
-        "UniswapV2SwapHelper": "0x9aed4D407EAc930B00CB19072D4ea477e98Ae397",
-        "AaveStakingFactory": "0xfACb3efbFd5E4d7511b233D0d5d6CA96CFa97578",
-        "BancorFormula": "0x57b2c85934Ef1A891eC9b9945f3fdbcf1104c302"
+        "UniswapV2SwapHelper": "0x28b3Bc8F2a1E5cf3BfE06d22971955a53a0F52d8",
+        "AaveStakingFactory": "0xfC32F09b85aB3134195bC237C2b69001B5c609dB",
+        "BancorFormula": "0x57b2c85934Ef1A891eC9b9945f3fdbcf1104c302",
+        "FeeFormula": "0x416B5A5e12235De6838D62Fd053e7Ce59E944426"
     },
     "dapptest": {
         "NameService": "0xcbEAF3BDe82155F56486Fb5a1072cb8baAf547cc",
@@ -242,65 +243,70 @@
         "network": "dapptest-mainnet"
     },
     "staging-mainnet": {
-        "NameService": "0x1C8F3CE77a6958fF2F4b422851b6Ce9C09dcAF8A",
-        "GReputation": "0xd398951013E1bd097B82Df94159e219455DA4fC5",
-        "CompoundVotingMachine": "0xB301e738A8A2c8c95BE0822b264653bBcd265362",
-        "GoodMarketMaker": "0x9B276580B1694143F59a853B47D9b4a72504A686",
-        "GoodReserveCDai": "0x17a399CdC103490E561b3CBFf5E4263C26f3000D",
-        "ExchangeHelper": "0xed768F4C9184cAead84679af39AEed9Fe542F59e",
-        "GoodFundManager": "0xCB67BCFEA070eF05533168A59DC1181FD6b39990",
-        "StakersDistribution": "0x56a8fA4a1F793fac39c7749F5ddF0ACDcaD4b951",
-        "ProtocolUpgrade": "0xc3069547cDAf7d7F8A9916B24702Da3CBbefFC78",
-        "UniswapV2SwapHelper": "0xCdDe99dDD1bf4fa22d808697F306DfC59412F46f",
-        "CompoundStakingFactory": "0x6049e33E3179a22cf79057B2C8E7dCDc775710ed",
-        "AaveStakingFactory": "0xFA3E3BD1149CeB820dbcaB6472e36d663C4F9066",
-        "DonationsStaking": "0x431B770626546153593E1576F8E66fa9E01E7b40",
+        "NameService": "0xC87FAb8A8CDD346079ca6177e47408Ba18066104",
+        "GReputation": "0xD50604E530fF36B2747aE8574b37B21B9f779d37",
+        "CompoundVotingMachine": "0x40f42698A07B19Ac431Cc115a7B9CddD294d248b",
+        "GoodMarketMaker": "0x78a76Ad9A5d4a1d0c9FABcA20083442160840d0C",
+        "GoodReserveCDai": "0x6D728DE2Be4b3d7c6B50E6F3bF46CA1F64dF7820",
+        "ExchangeHelper": "0x6BC7a1310DfE3EfE7401Aff3C598C9d948f8b245",
+        "GoodFundManager": "0x1A231e22BE9923EE4C453095A7a94820D930A553",
+        "StakersDistribution": "0xF24Ef005134208Ac62aD50EafD052Ddb2C3e7bb5",
+        "ProtocolUpgrade": "0xC60411d3Bc9F36946a6de1f3890c214192255497",
+        "UniswapV2SwapHelper": "0x24D19000790fD11e244E76fA4D86FDd92e57c144",
+        "CompoundStakingFactory": "0xf22EF80a76f41424b813C9b38b3064dBfa87cf79",
+        "AaveStakingFactory": "0x9093B908b35C08f2E8DEABA352D5C319952a7e55",
+        "DonationsStaking": "0x66Fb63cB6c4E2800db9d1691B3d00361Ada9dE61",
         "network": "staging-mainnet",
         "networkId": 3,
-        "ForeignBridge": "0xEDA39475415f1A2944a467Aa6359CB4C1c3ed50f",
-        "Contribution": "0x7cC2CcDA5483e721778C4040B1DbD23B3Ab1B4A5",
+        "ForeignBridge": "0xDaAc9A734242C2D99dD1cb3680770ACA26A25CeB",
+        "Contribution": "0x27816e32270a413AF676A2E3a25dB93C7F565a80",
         "StakingContracts": [
             [
                 "0x61b36EcaEd25c4EE3017905B5Dd006129a4dfb0B",
                 13888
             ]
         ],
-        "Identity": "0xfb5dAF44cd18Db7b96DB3F9c6E411D65fcf4f372",
-        "GoodDollar": "0x4738C5e91C4F809da21DD0Df4B5aD5f699878C1c",
-        "Controller": "0x589F7ae100a7dbd80DC512208b7a0F457A041BE6",
-        "Avatar": "0x3BC91a65f53dACBd2336C04AC060741f70dCd187",
+        "Identity": "0x7599F95677cb14d7D8834a58B3b0545a13870A56",
+        "GoodDollar": "0x2e975e7711088aAfb38119454fF7fb99bAA9142F",
+        "Controller": "0x52F0584bfB6F55cc4a3E351427fACbA7e23A3fd4",
+        "Avatar": "0xFCF6029bD177370C79173D48e05AAFf3c5f0C0bC",
         "BancorFormula": "0x57b2c85934Ef1A891eC9b9945f3fdbcf1104c302",
         "DAI": "0xB5E5D0F8C0cbA267CD3D7035d6AdC8eBA7Df7Cdd",
         "cDAI": "0x6ce27497a64fffb5517aa4aee908b1e7eb63b9ff",
         "COMP": "0xf76d4a441e4ba86a923ce32b89aff89dbccaa075",
-        "ProxyFactory": "0x1268c5d249746546f95E2cE8Bf7477C9729EbaBE"
+        "ProxyFactory": "0x33D3712b90ade5d7363F3548650e508ad8eACfAA",
+        "FeeFormula": "0xc43514e62190A6253C56C7c50DAdb907e3eda666"
     },
     "staging": {
-        "FuseFaucet": "0xDfCb356c9bd420263aC56D7980f409AcE9050896",
+        "FuseFaucet": "0x70f361EDB97B245E8A68573637A31886A427fe2a",
         "ProxyAdmin": "0x2Ea4aAA8351CfE63B537E81Cd4a13c435B945C1D",
-        "Invites": "0x7d5FC799dE6fB6a30161684f27320BAcAdBf4126",
+        "Invites": "0x763b49F901DC894F2dEc1c7d19e46250B4452679",
         "ProxyAdmin2": "0x23D8492444DA663fcb2bDa8cA9A0e84989D1f59e",
-        "GoodDollar": "0x100b8fd10ff8DC43fda45E636B4BB1eE6088270a",
-        "NameService": "0xd6D206e19Aab34761E62dC30FA37b8D3d071Dd1D",
-        "GReputation": "0xF5e5098e070c6798b84ca2742cC9d4EEf9d110Fc",
-        "CompoundVotingMachine": "0xde3CbD2823E5f541457f63854e400a375016c7F9",
-        "ClaimersDistribution": "0x74C2665E988b7b4559F7401Aa7AAEcB9440d31AE",
-        "GovernanceStaking": "0xa04865a50dF03607fB17Aa00bf00Dd2A02EC8A6B",
-        "UBIScheme": "0x65D36106C057263939a6BddaA02D4DF6BB2df5C5",
-        "ProtocolUpgradeFuse": "0x34c0770400f5F8F22B6fB59b5785A5bEA37af9c5",
-        "Identity": "0x104efFcBDddae9cd4813b8A05Ecd6A17BaBfE6d9",
-        "Avatar": "0xcA9E4D51bc496F0b661E9fa02d25E4f67Dd88870",
-        "Controller": "0x7CBA0778748960145F3E56b3285255064D86709D",
+        "GoodDollar": "0xe39236a9Cf13f65DB8adD06BD4b834C65c523d2b",
+        "NameService": "0xE63402A7dc11AB4D03c477cc92209463a55A5134",
+        "GReputation": "0x80312bad9dd71d3a159e794B7fb1B2386F82F07F",
+        "CompoundVotingMachine": "0xcF624DfdA707De7C7a5669A472F81dAc130264c3",
+        "ClaimersDistribution": "0x86d43F93eD9AD1182981C19567f83BAc1DC1513B",
+        "GovernanceStaking": "0x18525875Bd0259d3efE1c04927A027fAd8cA0b86",
+        "UBIScheme": "0x54469071Ca82B46A2C01C09D38ca6Ca4347EB21d",
+        "ProtocolUpgradeFuse": "0x1495D6f5434376981778F64c63d2E15dA25B0541",
+        "Identity": "0x0af5eF8cdCeddDD9033cEf1E83B0Ae54f3a793A5",
+        "Avatar": "0x28523b680d4ffBd6e4FC95c3c12F5485F9635E00",
+        "Controller": "0xb6808120fB648c0bdc483Ec423d933a7eBf6BB0a",
         "AbsoluteVote": "0x7b58A5737440Bc05ca3972fDeFf8ac3bA984536B",
         "SchemeRegistrar": "0x0E79f80809180aB8FAE189D4e76fC814672d9a40",
-        "AdminWallet": "0x8b0Ec4aFaEE9974233c29fa52cC5D2493FB81D45",
+        "AdminWallet": "0x2961a6C2Fe39F0FFC4f4b1D9E037CD95f4e9C993",
         "UpgradeScheme": "0xfC9F6F5E3ff7BAAB3fEf82e66f56917D625ba38B",
-        "OneTimePayments": "0x2b5Ef42bc3D1BEfCbA20E3233DeDadD2439B8Ac2",
+        "OneTimePayments": "0x7912636D68E5d92708862b38698f764BF1EC297C",
         "network": "staging",
         "networkId": 122,
         "ProxyFactory": "0x240d844AdA767bE0AB08F9BcCcB6D8a04aE370EC",
-        "HomeBridge": "0x53f6Bd6Da1564f5B00D2069d8E0F316AF859fb99",
-        "FirstClaimPool": "0x1EA5564a28F34107b99dC591f142537404329762"
+        "HomeBridge": "0x3B25860174ECb3a0962bA3A5065b1f4063253419",
+        "FirstClaimPool": "0x5D007A7633D05b0dDD068B71E8448CD1fcdbd823",
+        "FeeFormula": "0x05eb1C46bd539Fd2A098b06D83a5bB81E5a58e63",
+        "DAI": "0x0000000000000000000000000000000000000000",
+        "cDAI": "0x0000000000000000000000000000000000000000",
+        "COMP": "0x0000000000000000000000000000000000000000"
     },
     "test": {
         "ProxyFactory": "0x36dE29DB57062A583436Ae071e141404dFE2311C",

package/scripts/deployFullDAO.ts

@@ -22,6 +22,7 @@ import ProtocolSettings from "../releases/deploy-settings.json";
 import dao from "../releases/deployment.json";
 import { main as deployV2 } from "./upgradeToV2/upgradeToV2";
 import { TransactionResponse } from "@ethersproject/providers";
+import pressAnyKey from "press-any-key";
 
 const { name } = network;
 
@@ -41,6 +42,9 @@ const printDeploy = async (
 
 export const createDAO = async () => {
   const fusedao = dao[network.name.split("-")[0]];
+  let release: { [key: string]: any } = {};
+  // let release: { [key: string]: any } = dao[network.name];
+
   let [root, ...signers] = await ethers.getSigners();
   //generic call permissions
   let schemeMock = root;
@@ -79,7 +83,9 @@ export const createDAO = async () => {
 
   const BancorFormula = (await (
     await ethers.getContractFactory("BancorFormula")
-  ).deploy()) as Contract;
+  )
+    .deploy()
+    .then(printDeploy)) as Contract;
 
   const AddFounders = (await AddFoundersFactory.deploy().then(
     printDeploy
@@ -94,7 +100,7 @@ export const createDAO = async () => {
   )) as Contract;
   // const Identity = await ethers.getContractAt(
   //   IdentityABI.abi,
-  //   "0x77Bd4D825F4df162BDdda73a7E295c27e09E289f"
+  //   release.Identity
   // );
 
   const daoCreator = (await DAOCreatorFactory.deploy(AddFounders.address).then(
@@ -129,6 +135,15 @@ export const createDAO = async () => {
     root
   );
 
+  // const Avatar = new ethers.Contract(
+  //   release.Avatar,
+  //   [
+  //     "function owner() view returns (address)",
+  //     "function nativeToken() view returns (address)"
+  //   ],
+  //   root
+  // );
+
   await Identity.setAvatar(Avatar.address).then(printDeploy);
 
   console.log("Done deploying DAO, setting schemes permissions");
@@ -158,13 +173,22 @@ export const createDAO = async () => {
   );
 
   let mainnet: { [key: string]: Contract } = {};
+  release = {
+    ...release,
+    Avatar: Avatar.address,
+    Controller: controller,
+    GoodDollar: gd,
+    Identity: Identity.address,
+    FeeFormula: FeeFormula.address
+  };
 
   if (isMainnet) {
     mainnet = await deployMainnet(Avatar, Identity);
+    Object.entries(mainnet).forEach(([k, v]) => (release[k] = v.address));
   }
 
   let sidechain: { [key: string]: any } = {};
-  let release: { [key: string]: any } = {};
+
   if (false === isMainnet) {
     sidechain = await deploySidechain(
       setSchemes,
@@ -175,25 +199,23 @@ export const createDAO = async () => {
     );
     schemes.push(sidechain.OneTimePayments.address);
     const adminWallet = await deployAdminWallet(Identity.address);
-    await root
-      .sendTransaction({
-        to: adminWallet.address,
-        value: ethers.utils.parseUnits("0.1", "ether")
-      })
-      .then(printDeploy);
     Object.entries(sidechain).forEach(([k, v]) => (release[k] = v.address));
     release["AdminWallet"] = adminWallet.address;
   }
 
+  await releaser(release, network.name);
+
   const bridgeRelease = await deployBridge(Avatar, gd, setSchemes, isMainnet);
   release = { ...release, ...bridgeRelease };
+  await releaser(release, network.name);
 
-  //deploy v2 mainnet/sidechain contracts, returns their addresses
+  await pressAnyKey();
+  // deploy v2 mainnet/sidechain contracts, returns their addresses
   const v2 = await deployV2(network.name, false, {
-    FirstClaimPool: sidechain?.FirstClaimPool?.address,
-    BancorFormula: BancorFormula.address,
-    Avatar: Avatar.address,
-    Controller: controller,
+    FirstClaimPool: release.FirstClaimPool,
+    BancorFormula: release.BancorFormula,
+    Avatar: release.Avatar,
+    Controller: release.Controller,
     DAIUsdOracle: ethers.constants.AddressZero,
     COMPUsdOracle: ethers.constants.AddressZero,
     USDCUsdOracle: ethers.constants.AddressZero,
@@ -201,20 +223,22 @@ export const createDAO = async () => {
     AaveLendingPool: ethers.constants.AddressZero,
     AaveIncentiveController: ethers.constants.AddressZero,
     GasPriceOracle: ethers.constants.AddressZero,
-    cDAI: mainnet?.cDAI?.address || ethers.constants.AddressZero,
-    DAI: mainnet?.dai?.address || ethers.constants.AddressZero,
-    COMP: mainnet?.COMP?.address || ethers.constants.AddressZero,
+    cDAI: release.cDAI || ethers.constants.AddressZero,
+    DAI: release.DAI || ethers.constants.AddressZero,
+    COMP: release.COMP || ethers.constants.AddressZero,
     USDC: ethers.constants.AddressZero,
-    Identity: Identity.address,
-    GoodDollar: gd,
-    Contribution: mainnet?.contribution?.address,
+    Identity: release.Identity,
+    GoodDollar: release.GoodDollar,
+    Contribution: release.Contribution,
     UniswapRouter: "0x0000000000000000000000000000000000000001",
-    ...bridgeRelease,
+    HomeBridge: release.HomeBridge,
+    ForeignBridge: release.ForeignBridge,
     SchemeRegistrar: ethers.constants.AddressZero,
     UpgradeScheme: ethers.constants.AddressZero
   });
   release = { ...v2, ...release };
-
+  await releaser(release, network.name);
+  await pressAnyKey();
   if (isMainnet) {
     await setSchemes([release.ProtocolUpgrade]);
     await performUpgrade(release, fusedao.UBIScheme);
@@ -233,28 +257,16 @@ export const createDAO = async () => {
 
   if (false === isMainnet) {
     let encoded = (
-      await ethers.getContractAt("IGoodDollar", gd)
+      await ethers.getContractAt("IGoodDollar", release.GoodDollar)
     ).interface.encodeFunctionData("mint", [release.UBIScheme, 1000000]);
 
-    await genericCall(gd, encoded);
+    await genericCall(release.GoodDollar, encoded);
 
     await setSchemes([release.ProtocolUpgradeFuse]);
     await performUpgradeFuse(release);
   }
 
   await releaser(release, network.name);
-
-  return {
-    ...mainnet,
-    ...sidechain,
-    daoCreator,
-    controller,
-    avatar: await daoCreator.avatar(),
-    gd: await Avatar.nativeToken(),
-    identity: Identity.address,
-    bancorFormula: BancorFormula.address
-    // bridge: Bridge.address,
-  };
 };
 
 const deployBridge = async (Avatar, gd, setSchemes, isMainnet) => {
@@ -281,7 +293,7 @@ const deployBridge = async (Avatar, gd, setSchemes, isMainnet) => {
     .then(printDeploy)) as Contract;
   await setSchemes([scheme.address]);
 
-  if (network.name.includes("develop")) {
+  if (network.name.includes("develop") || network.name.includes("dapptest")) {
     const mockBridge = (await new ethers.ContractFactory(
       BridgeMock.abi,
       BridgeMock.bytecode,
@@ -318,7 +330,7 @@ const deployMainnet = async (Avatar, Identity) => {
   const cdaiAddr = ProtocolSettings[network.name]?.compound?.cdai;
   const COMPAddr = ProtocolSettings[network.name]?.compound?.comp;
 
-  let dai = daiAddr
+  let DAI = daiAddr
     ? await ethers.getContractAt("DAIMock", daiAddr)
     : ((await daiFactory.deploy().then(printDeploy)) as Contract);
 
@@ -328,7 +340,7 @@ const deployMainnet = async (Avatar, Identity) => {
 
   let cDAI = cdaiAddr
     ? await ethers.getContractAt("DAIMock", cdaiAddr)
-    : ((await cdaiFactory.deploy(dai.address).then(printDeploy)) as Contract);
+    : ((await cdaiFactory.deploy(DAI.address).then(printDeploy)) as Contract);
 
   const ccFactory = new ethers.ContractFactory(
     ContributionCalculation.abi,
@@ -336,7 +348,7 @@ const deployMainnet = async (Avatar, Identity) => {
     root
   );
 
-  const contribution = (await ccFactory
+  const Contribution = (await ccFactory
     .deploy(Avatar.address, 0, 1e15)
     .then(printDeploy)) as Contract;
   // const contribution = await ethers.getContractAt(
@@ -345,8 +357,8 @@ const deployMainnet = async (Avatar, Identity) => {
   // );
 
   return {
-    contribution,
-    dai,
+    Contribution,
+    DAI,
     COMP,
     cDAI
   };
@@ -416,6 +428,13 @@ export const deploySidechain = async (
     .deployProxy(faucetf, [identity])
     .then(printDeploy)) as Contract;
 
+  await root
+    .sendTransaction({
+      to: faucet.address,
+      value: ethers.utils.parseEther("5")
+    })
+    .then(printDeploy);
+
   console.log("setting firstclaim and otp schemes...");
   await setSchemes([firstClaim.address, otp.address]);
   await firstClaim.start().then(printDeploy);
@@ -554,10 +573,35 @@ const performUpgrade = async (release, ubiScheme) => {
   console.log("performing protocol v2 upgrade on Mainnet...", {
     release
   });
-  console.log("upgrading nameservice + staking rewards...");
+  console.log(
+    "upgrading nameservice + staking rewards...",
+    release.NameService,
+    [
+      ethers.utils.keccak256(ethers.utils.toUtf8Bytes("RESERVE")),
+      ethers.utils.keccak256(ethers.utils.toUtf8Bytes("MARKET_MAKER")),
+      ethers.utils.keccak256(ethers.utils.toUtf8Bytes("FUND_MANAGER")),
+      ethers.utils.keccak256(ethers.utils.toUtf8Bytes("REPUTATION")),
+      ethers.utils.keccak256(ethers.utils.toUtf8Bytes("GDAO_STAKERS")),
+      ethers.utils.keccak256(ethers.utils.toUtf8Bytes("BRIDGE_CONTRACT")),
+      ethers.utils.keccak256(ethers.utils.toUtf8Bytes("UBI_RECIPIENT")),
+      ethers.utils.keccak256(ethers.utils.toUtf8Bytes("EXCHANGE_HELPER"))
+    ],
+    [
+      release.GoodReserveCDai,
+      release.GoodMarketMaker,
+      release.GoodFundManager,
+      release.GReputation,
+      release.StakersDistribution,
+      release.ForeignBridge || ethers.constants.AddressZero,
+      ubiScheme,
+      release.ExchangeHelper
+    ],
+    release.StakingContracts.map((_: any) => _[0]),
+    release.StakingContracts.map((_: any) => _[1])
+  );
   let tx;
-  tx = await (
-    await upgrade.upgradeBasic(
+  tx = await upgrade
+    .upgradeBasic(
       release.NameService,
       [
         ethers.utils.keccak256(ethers.utils.toUtf8Bytes("RESERVE")),
@@ -582,7 +626,7 @@ const performUpgrade = async (release, ubiScheme) => {
       release.StakingContracts.map((_: any) => _[0]),
       release.StakingContracts.map((_: any) => _[1])
     )
-  ).wait();
+    .then(printDeploy);
 
   console.log("upgrading reserve...", {
     params: [

package/scripts/test/simulateInterest.ts

@@ -1,8 +1,8 @@
 import fse from "fs-extra";
 import { ethers, network as networkData } from "hardhat";
-import settings from "../releases/deploy-settings.json";
-import deployment from "../releases/deployment.json";
-import { increaseTime, advanceBlocks } from "../test/helpers";
+import settings from "../../releases/deploy-settings.json";
+import deployment from "../../releases/deployment.json";
+import { increaseTime, advanceBlocks } from "../../test/helpers";
 
 /**
  * helper script to simulate enough days of interest transfer and claiming

package/scripts/upgradeToV2/upgradeToV2.ts

@@ -11,7 +11,7 @@ import { network, ethers, upgrades, run } from "hardhat";
 import { networkNames } from "@openzeppelin/upgrades-core";
 import { isFunction, get, omitBy } from "lodash";
 import { getImplementationAddress } from "@openzeppelin/upgrades-core";
-// import pressAnyKey from "press-any-key";
+import pressAnyKey from "press-any-key";
 import {
   AaveStakingFactory,
   CompoundStakingFactory,
@@ -80,6 +80,12 @@ export const main = async (
       gasLimit: 6000000,
       gasPrice: ethers.utils.parseUnits("1", "gwei")
     };
+  } else if (network.config.chainId === 3 || network.config.chainId === 42) {
+    GAS_SETTINGS = {
+      maxPriorityFeePerGas: ethers.utils.parseUnits("1", "gwei"),
+      maxFeePerGas: ethers.utils.parseUnits("10", "gwei"),
+      gasLimit: 6000000
+    };
   }
 
   const isBackendTest = networkName.startsWith("dapptest");
@@ -619,7 +625,7 @@ export const main = async (
         dao.Reserve,
         dao.MarketMaker,
         dao.FundManager,
-        dao.COMP
+        release.COMP
       ]
     });
     tx = await upgrade.upgradeReserve(
@@ -627,7 +633,8 @@ export const main = async (
       dao.Reserve,
       dao.MarketMaker,
       dao.FundManager,
-      dao.COMP
+      release.COMP,
+      GAS_SETTINGS
     );
     await countTotalGas(tx, "call upgrade reserve");
     console.log("upgrading donationstaking...", {
@@ -641,7 +648,8 @@ export const main = async (
       release.NameService,
       dao.DonationsStaking, //old
       release.DonationsStaking, //new
-      dao.DAIStaking
+      dao.DAIStaking,
+      GAS_SETTINGS
     );
     await countTotalGas(tx, "call upgrade donations");
     console.log("Donation staking upgraded");
@@ -671,31 +679,34 @@ export const main = async (
     )) as unknown as ProtocolUpgradeFuse;
 
     console.log("performing protocol v2 upgrade on Fuse...", { release, dao });
-    await upgrade.upgrade(
-      release.NameService,
-      //old contracts
-      [
-        dao.SchemeRegistrar,
-        dao.UpgradeScheme,
-        dao.UBIScheme,
-        dao.FirstClaimPool
-      ],
-      release.UBIScheme,
-      [
-        ethers.utils.keccak256(ethers.utils.toUtf8Bytes("REPUTATION")),
-        ethers.utils.keccak256(ethers.utils.toUtf8Bytes("BRIDGE_CONTRACT")),
-        ethers.utils.keccak256(ethers.utils.toUtf8Bytes("UBISCHEME")),
-        ethers.utils.keccak256(ethers.utils.toUtf8Bytes("GDAO_STAKING")),
-        ethers.utils.keccak256(ethers.utils.toUtf8Bytes("GDAO_CLAIMERS"))
-      ],
-      [
-        release.GReputation,
-        dao.HomeBridge,
+    await upgrade
+      .upgrade(
+        release.NameService,
+        //old contracts
+        [
+          dao.SchemeRegistrar || ethers.constants.AddressZero,
+          dao.UpgradeScheme,
+          dao.UBIScheme,
+          dao.FirstClaimPool
+        ],
         release.UBIScheme,
-        release.GovernanceStaking,
-        release.ClaimersDistribution
-      ]
-    );
+        [
+          ethers.utils.keccak256(ethers.utils.toUtf8Bytes("REPUTATION")),
+          ethers.utils.keccak256(ethers.utils.toUtf8Bytes("BRIDGE_CONTRACT")),
+          ethers.utils.keccak256(ethers.utils.toUtf8Bytes("UBISCHEME")),
+          ethers.utils.keccak256(ethers.utils.toUtf8Bytes("GDAO_STAKING")),
+          ethers.utils.keccak256(ethers.utils.toUtf8Bytes("GDAO_CLAIMERS"))
+        ],
+        [
+          release.GReputation,
+          dao.HomeBridge,
+          release.UBIScheme,
+          release.GovernanceStaking,
+          release.ClaimersDistribution
+        ],
+        GAS_SETTINGS
+      )
+      .then(_ => countTotalGas(_, "fuse basic upgrade"));
 
     if (isProduction || isBackendTest) {
       console.log(
@@ -707,7 +718,8 @@ export const main = async (
       await upgrade.upgradeGovernance(
         dao.SchemeRegistrar,
         dao.UpgradeScheme,
-        release.CompoundVotingMachine
+        release.CompoundVotingMachine,
+        GAS_SETTINGS
       );
     }
   };
@@ -757,10 +769,13 @@ export const main = async (
       founders
     });
     await Promise.all(
-      founders.slice(0, Math.ceil(founders.length / 2)).map(f =>
+      founders.slice(1).map(f =>
         absoluteVote
           .connect(f)
-          .vote(proposalId, 1, 0, f.address, { gasLimit: 300000 })
+          .vote(proposalId, 1, 0, f.address, {
+            ...GAS_SETTINGS,
+            gasLimit: 300000
+          })
           .then(_ => countTotalGas(_.wait(), "vote"))
           .catch(e => console.log("founder vote failed:", f.address, e.message))
       )
@@ -946,8 +961,10 @@ export const main = async (
   await deployContracts();
 
   if (isPerformUpgrade) {
-    console.log("deployed contracts", { totalGas });
+    console.log("deployed contracts", { totalGas, dao, release });
+    if (isTest === false) await pressAnyKey();
     await voteProtocolUpgrade(release);
+    if (isTest === false) await pressAnyKey();
     console.log("voted contracts", { totalGas });
     isMainnet && (await performUpgrade(release));
     !isMainnet && (await performUpgradeFuse(release));

package/yarn.lock

@@ -13647,6 +13647,13 @@ preserve@^0.2.0:
   resolved "https://registry.yarnpkg.com/preserve/-/preserve-0.2.0.tgz#815ed1f6ebc65926f865b310c0713bcb3315ce4b"
   integrity sha1-gV7R9uvGWSb4ZbMQwHE7yzMVzks=
 
+press-any-key@^0.1.1:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/press-any-key/-/press-any-key-0.1.1.tgz#97cf184ae84f25858fe3d83ab824e9d1dce2cde8"
+  integrity sha512-TR722R9UpZjvOtyVcmS7hx2/1KzKIyeizIqHJ7sRcfXvCDzeSknS3UNLhmQMN7075Jd9gGUBdq98sHw2eqb86Q==
+  dependencies:
+    single-line-log "^1.1.2"
+
 prettier@^1.14.3:
   version "1.19.1"
   resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.19.1.tgz#f7d7f5ff8a9cd872a7be4ca142095956a60797cb"
@@ -15022,6 +15029,13 @@ simple-get@^2.7.0:
     once "^1.3.1"
     simple-concat "^1.0.0"
 
+single-line-log@^1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/single-line-log/-/single-line-log-1.1.2.tgz#c2f83f273a3e1a16edb0995661da0ed5ef033364"
+  integrity sha1-wvg/Jzo+GhbtsJlWYdoO1e8DM2Q=
+  dependencies:
+    string-width "^1.0.1"
+
 slash@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/slash/-/slash-1.0.0.tgz#c41f2f6c39fc16d1cd17ad4b5d896114ae470d55"