@gooddollar/goodprotocol 1.0.4-beta.1 → 1.0.6

package/hardhat.config.ts

@@ -124,13 +124,15 @@ const hhconfig: HardhatUserConfig = {
     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: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gooddollar/goodprotocol",
-  "version": "1.0.4-beta.1",
+  "version": "1.0.6",
   "description": "GoodDollar Protocol",
   "scripts": {
     "build": "scripts/build.sh deploy",
@@ -16,7 +16,8 @@
     "runNode": "hardhat node &",
     "testDAOUpgrade": "yarn runNode && yarn compile && yarn deployOldDAO --network develop-mainnet && yarn daoUpgrade --network develop-mainnet",
     "testDAOUpgradeFuse": "yarn runNode && yarn compile && yarn deployOldDAO --network develop && yarn daoUpgrade --network develop",
-    "deployTest": "yarn runNode && yarn compile && hardhat run scripts/test/singleOldDaoDeploy.ts --network dapptest && yarn daoUpgrade --network dapptest && yarn daoUpgrade --network dapptest-mainnet && hardhat run scripts/test/simulateInterest.ts --network dapptest"
+    "deployTestOld": "yarn runNode && yarn compile && hardhat run scripts/test/singleOldDaoDeploy.ts --network dapptest && yarn daoUpgrade --network dapptest && yarn daoUpgrade --network dapptest-mainnet && hardhat run scripts/test/simulateInterest.ts --network dapptest",
+    "deployTest": "yarn runNode && yarn compile && hardhat run scripts/deployFullDAO.ts --network dapptest && hardhat run scripts/deployFullDAO.ts --network dapptest-mainnet && hardhat run scripts/test/simulateInterest.ts --network dapptest"
   },
   "files": [
     "artifacts/contracts",

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

@@ -42,7 +42,9 @@ const printDeploy = async (
 
 export const createDAO = async () => {
   const fusedao = dao[network.name.split("-")[0]];
-  let release: { [key: string]: any } = {}; //dao[network.name];
+  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;
@@ -177,12 +179,15 @@ export const createDAO = async () => {
     Controller: controller,
     GoodDollar: gd,
     Identity: Identity.address,
-    FeeFormula: FeeFormula.address
+    FeeFormula: FeeFormula.address,
+    BancorFormula: BancorFormula.address
   };
 
   if (isMainnet) {
     mainnet = await deployMainnet(Avatar, Identity);
-    Object.entries(mainnet).forEach(([k, v]) => (release[k] = v.address));
+    Object.entries(mainnet)
+      .filter(([k, v]) => v)
+      .forEach(([k, v]) => (release[k] = v.address));
   }
 
   let sidechain: { [key: string]: any } = {};
@@ -203,29 +208,30 @@ export const createDAO = async () => {
 
   await releaser(release, network.name);
 
-  await pressAnyKey();
   const bridgeRelease = await deployBridge(Avatar, gd, setSchemes, isMainnet);
   release = { ...release, ...bridgeRelease };
   await releaser(release, network.name);
 
-  await pressAnyKey();
+  // await pressAnyKey();
   // deploy v2 mainnet/sidechain contracts, returns their addresses
-  const v2 = await deployV2(network.name, false, {
+  const olddao = {
     FirstClaimPool: release.FirstClaimPool,
     BancorFormula: release.BancorFormula,
     Avatar: release.Avatar,
     Controller: release.Controller,
-    DAIUsdOracle: ethers.constants.AddressZero,
-    COMPUsdOracle: ethers.constants.AddressZero,
-    USDCUsdOracle: ethers.constants.AddressZero,
-    AAVEUsdOracle: ethers.constants.AddressZero,
+    DAIUsdOracle: release.DAIUsdOracle || ethers.constants.AddressZero,
+    COMPUsdOracle: release.COMPUsdOracle || ethers.constants.AddressZero,
+    USDCUsdOracle: release.USDCUsdOracle || ethers.constants.AddressZero,
+    AAVEUsdOracle: release.AAVEUsdOracle || ethers.constants.AddressZero,
     AaveLendingPool: ethers.constants.AddressZero,
     AaveIncentiveController: ethers.constants.AddressZero,
-    GasPriceOracle: ethers.constants.AddressZero,
+    GasPriceOracle: release.GasPriceOracle || 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,
+    DAIEthOracle: release.DAIEthOracle || ethers.constants.AddressZero,
+    ETHUsdOracle: release.ETHUsdOracle || ethers.constants.AddressZero,
     Identity: release.Identity,
     GoodDollar: release.GoodDollar,
     Contribution: release.Contribution,
@@ -234,10 +240,12 @@ export const createDAO = async () => {
     ForeignBridge: release.ForeignBridge,
     SchemeRegistrar: ethers.constants.AddressZero,
     UpgradeScheme: ethers.constants.AddressZero
-  });
+  };
+
+  const v2 = await deployV2(network.name, false, olddao);
   release = { ...v2, ...release };
   await releaser(release, network.name);
-  await pressAnyKey();
+  // await pressAnyKey();
   if (isMainnet) {
     await setSchemes([release.ProtocolUpgrade]);
     await performUpgrade(release, fusedao.UBIScheme);
@@ -292,7 +300,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,
@@ -328,6 +336,27 @@ const deployMainnet = async (Avatar, Identity) => {
   const daiAddr = ProtocolSettings[network.name]?.compound?.dai;
   const cdaiAddr = ProtocolSettings[network.name]?.compound?.cdai;
   const COMPAddr = ProtocolSettings[network.name]?.compound?.comp;
+  const daiEthOracleAddr = ProtocolSettings[network.name]?.chainlink?.dai_eth;
+  const ethUsdOracleAddr = ProtocolSettings[network.name]?.chainlink?.eth_usd;
+
+  let DAIUsdOracle, COMPUsdOracle, USDCUsdOracle, AAVEUsdOracle, GasPriceOracle;
+  if (name.includes("test")) {
+    const tokenUsdOracleFactory = await ethers.getContractFactory(
+      "BatUSDMockOracle"
+    );
+    DAIUsdOracle = await tokenUsdOracleFactory.deploy();
+    USDCUsdOracle = await tokenUsdOracleFactory.deploy();
+
+    COMPUsdOracle = await (
+      await ethers.getContractFactory("CompUSDMockOracle")
+    ).deploy();
+    AAVEUsdOracle = await (
+      await ethers.getContractFactory("AaveUSDMockOracle")
+    ).deploy();
+    GasPriceOracle = await (
+      await ethers.getContractFactory("GasPriceMockOracle")
+    ).deploy();
+  }
 
   let DAI = daiAddr
     ? await ethers.getContractAt("DAIMock", daiAddr)
@@ -350,16 +379,31 @@ const deployMainnet = async (Avatar, Identity) => {
   const Contribution = (await ccFactory
     .deploy(Avatar.address, 0, 1e15)
     .then(printDeploy)) as Contract;
-  // const contribution = await ethers.getContractAt(
-  //   ContributionCalculation.abi,
-  //   "0xc3171409dB6827A68294B3A0D40a31310E83eD6B"
-  // );
+
+  let DAIEthOracle = daiEthOracleAddr
+    ? await ethers.getContractAt("DaiEthPriceMockOracle", daiEthOracleAddr)
+    : ((await (await ethers.getContractFactory("DaiEthPriceMockOracle"))
+        .deploy()
+        .then(printDeploy)) as Contract);
+
+  let ETHUsdOracle = ethUsdOracleAddr
+    ? await ethers.getContractAt("EthUSDMockOracle", ethUsdOracleAddr)
+    : ((await (await ethers.getContractFactory("EthUSDMockOracle"))
+        .deploy()
+        .then(printDeploy)) as Contract);
 
   return {
     Contribution,
     DAI,
     COMP,
-    cDAI
+    cDAI,
+    ETHUsdOracle,
+    DAIEthOracle,
+    DAIUsdOracle,
+    COMPUsdOracle,
+    USDCUsdOracle,
+    AAVEUsdOracle,
+    GasPriceOracle
   };
 };
 

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
@@ -14,12 +14,11 @@ const waitTX = async tx => {
 };
 const simulate = async function () {
   const network = networkData.name;
-  const networkSettings = { ...settings["default"], ...settings[network] };
   const accounts = await ethers.getSigners();
 
   let addresses = deployment[network];
   let mainnetAddresses = deployment[`${network}-mainnet`];
-  console.log({ addresses, network });
+  console.log({ addresses, mainnetAddresses, network });
   const identity = await ethers.getContractAt("IIdentity", addresses.Identity);
   await Promise.all(
     accounts.slice(0, 10).map(a =>
@@ -66,7 +65,11 @@ const simulate = async function () {
       .balanceOf(simpleStaking)
       .then(_ => _.toString());
 
-    console.log("collecting interest...", { stakingBalance });
+    console.log("collecting interest...", {
+      stakingBalance,
+      gfm: goodFundManager.address,
+      simpleStaking
+    });
 
     await goodFundManager.collectInterest([simpleStaking], false);
 

package/scripts/upgradeToV2/upgradeToV2.ts

@@ -89,7 +89,7 @@ export const main = async (
   }
 
   const isBackendTest = networkName.startsWith("dapptest");
-  const isTest = network.name === "hardhat";
+  const isTest = network.name === "hardhat" || isBackendTest;
   const isCoverage = process.env.CODE_COVERAGE;
   const isDevelop = !isProduction;
   const isMainnet = networkName.includes("mainnet");
@@ -97,7 +97,13 @@ export const main = async (
     ...ProtocolSettings["default"],
     ...ProtocolSettings[networkName]
   };
-  console.log(`networkName ${networkName}`);
+  console.log(`networkName ${networkName}`, {
+    isTest,
+    isBackendTest,
+    isCoverage,
+    isMainnet,
+    isDevelop
+  });
   const dao = olddao || OldDAO[networkName];
   const fse = require("fs-extra");
   const ProtocolAddresses = await fse.readJson("releases/deployment.json");
@@ -656,7 +662,7 @@ export const main = async (
     //extract just the addresses without the rewards
     // release.StakingContracts = release.StakingContracts.map((_) => _[0]);
 
-    if (isProduction || isBackendTest) {
+    if (isProduction) {
       console.log(
         "SKIPPING GOVERNANCE UPGRADE FOR PRODUCTION. RUN IT MANUALLY"
       );
@@ -708,7 +714,7 @@ export const main = async (
       )
       .then(_ => countTotalGas(_, "fuse basic upgrade"));
 
-    if (isProduction || isBackendTest) {
+    if (isProduction) {
       console.log(
         "SKIPPING GOVERNANCE UPGRADE FOR PRODUCTION. RUN IT MANUALLY"
       );

package/test/governance/ClaimersDistribution.test.ts

@@ -17,14 +17,8 @@ describe("ClaimersDistribution", () => {
     cd: ClaimersDistribution;
 
   before(async () => {
-    [
-      root,
-      acct,
-      claimer1,
-      claimer2,
-      claimer3,
-      ...signers
-    ] = await ethers.getSigners();
+    [root, acct, claimer1, claimer2, claimer3, ...signers] =
+      await ethers.getSigners();
 
     const deployedDAO = await createDAO();
     let {
@@ -202,4 +196,15 @@ describe("ClaimersDistribution", () => {
 
     expect(endCount).to.be.equal(startCount.add(2));
   });
+
+  it("should not cost alot of gas to claim with reputation distribution", async () => {
+    let totalGas = 0;
+    for (let i = 0; i < 31; i++) {
+      await increaseTime(60 * 60 * 24);
+      const tx = await (await ubiScheme.connect(claimer3).claim()).wait();
+      totalGas += tx.gasUsed.toNumber();
+      console.log({ totalGas }, tx.gasUsed.toNumber());
+    }
+    expect(totalGas / 30).lt(300000);
+  });
 });