@gooddollar/goodprotocol 1.0.3-beta.4 → 1.0.4

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,
@@ -74,12 +74,18 @@ export const main = async (
   if (isProduction && networkName.includes("mainnet")) {
     GAS_SETTINGS.gasLimit = 6000000;
     GAS_SETTINGS.maxFeePerGas = ethers.utils.parseUnits("80", "gwei");
-  } else if (isProduction && !networkName.includes("mainnet")) {
+  } else if (network.config.chainId === 122) {
     //case we are on fusefuse
     GAS_SETTINGS = {
       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");
@@ -108,6 +114,10 @@ export const main = async (
 
   const founders = await getFounders(networkName);
 
+  console.log(
+    `root: ${root.address} founders: ${founders.map(_ => _.address)}`
+  );
+
   const compoundTokens = [
     {
       name: "cdai",
@@ -216,7 +226,8 @@ export const main = async (
       args: [
         () => get(release, "NameService", newdao.NameService),
         protocolSettings.governance.proposalVotingPeriod,
-        protocolSettings.governance.guardian || root.address
+        protocolSettings.governance.guardian || root.address,
+        () => get(release, "GReputation", newdao.GReputation)
       ]
     },
     {
@@ -614,7 +625,7 @@ export const main = async (
         dao.Reserve,
         dao.MarketMaker,
         dao.FundManager,
-        dao.COMP
+        release.COMP
       ]
     });
     tx = await upgrade.upgradeReserve(
@@ -622,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...", {
@@ -636,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");
@@ -666,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(
@@ -702,7 +718,8 @@ export const main = async (
       await upgrade.upgradeGovernance(
         dao.SchemeRegistrar,
         dao.UpgradeScheme,
-        release.CompoundVotingMachine
+        release.CompoundVotingMachine,
+        GAS_SETTINGS
       );
     }
   };
@@ -752,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))
       )
@@ -941,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/test/governance/CompoundVotingMachine.delegate.test.ts

@@ -62,10 +62,6 @@ describe("CompoundVotingMachine#Delegation", () => {
   before(async () => {
     [root, acct, ...signers] = await ethers.getSigners();
 
-    const CompoundVotingMachine = await ethers.getContractFactory(
-      "CompoundVotingMachine"
-    );
-
     let {
       daoCreator,
       reputation,

package/test/governance/CompoundVotingMachine.guardian.test.ts

@@ -93,7 +93,7 @@ describe("CompoundVotingMachine#Guardian", () => {
   it("should set guardian from initializer", async () => {
     const votingMachine = (await upgrades.deployProxy(
       await ethers.getContractFactory("CompoundVotingMachine"),
-      [nameService.address, 5760, signers[2].address],
+      [nameService.address, 5760, signers[2].address, NULL_ADDRESS],
       { kind: "uups" }
     )) as unknown as CompoundVotingMachine;
     expect(await votingMachine.guardian()).to.equal(signers[2].address);
@@ -151,7 +151,7 @@ describe("CompoundVotingMachine#Guardian", () => {
 
     const gov2 = (await upgrades.deployProxy(
       CompoundVotingMachine,
-      [nameService.address, 5760, root.address],
+      [nameService.address, 5760, root.address, NULL_ADDRESS],
       { kind: "uups" }
     )) as CompoundVotingMachine;
 

package/test/helpers.ts

@@ -14,15 +14,8 @@ import IUniswapV2Pair from "@uniswap/v2-core/build/IUniswapV2Pair.json";
 import UniswapV2Factory from "@uniswap/v2-core/build/UniswapV2Factory.json";
 import WETH9 from "@uniswap/v2-periphery/build/WETH9.json";
 import UniswapV2Router02 from "@uniswap/v2-periphery/build/UniswapV2Router02.json";
-import {
-  Controller,
-  GoodMarketMaker,
-  CompoundVotingMachine,
-  GoodCompoundStaking,
-  GoodAaveStaking
-} from "../types";
-import { Contract } from "@ethersproject/contracts";
-import { BigNumber } from "@ethersproject/bignumber";
+import { GoodMarketMaker, CompoundVotingMachine } from "../types";
+import { Contract } from "ethers";
 
 export const getStakingFactory = async (
   factory: "GoodCompoundStaking" | "GoodAaveStaking" | "GoodCompoundStakingTest"
@@ -285,7 +278,7 @@ export const createDAO = async () => {
   );
   const votingMachine = (await upgrades.deployProxy(
     await ethers.getContractFactory("CompoundVotingMachine"),
-    [nameService.address, 5760, root.address],
+    [nameService.address, 5760, root.address, reputation.address],
     { kind: "uups" }
   )) as unknown as CompoundVotingMachine;
   return {

package/test/reserve/GoodReserveCDai.cap.test.ts

@@ -2,7 +2,7 @@ import { default as hre, ethers, upgrades } from "hardhat";
 import { expect } from "chai";
 import { GoodMarketMaker, CERC20, GoodReserveCDai } from "../../types";
 import { createDAO, increaseTime, advanceBlocks } from "../helpers";
-import { Contract } from "@ethersproject/contracts";
+import { Contract } from "ethers";
 
 const BN = ethers.BigNumber;
 export const NULL_ADDRESS = ethers.constants.AddressZero;

package/test/reserve/GoodReserveCDai.test.ts

@@ -175,7 +175,7 @@ describe("GoodReserve - staking with cDAI mocks", () => {
   //   // await goodDollar.addMinter(goodReserve.address);
   // });
 
-  xit("should mint UBI correctly for 18 decimals precision and no interest", async () => {
+  it("should mint UBI correctly for 18 decimals precision and no interest", async () => {
     let reserveToken = await marketMaker.reserveTokens(cDAI.address);
     let reserveBalanceBefore = reserveToken.reserveSupply;
     let supplyBefore = reserveToken.gdSupply;
@@ -191,7 +191,7 @@ describe("GoodReserve - staking with cDAI mocks", () => {
 
     await dai["mint(address,uint256)"](goodReserve.address, daiAmount);
     const tx = await (
-      await goodReserve.mintUBI(1, ethers.utils.parseEther("0.1"), cDAI.address)
+      await goodReserve.mintUBI(daiAmount, 0, cDAI.address)
     ).wait();
     const gdBalanceFund = await goodDollar.balanceOf(founder.address);
     const gdPriceAfter = await goodReserve["currentPrice()"]();
@@ -214,7 +214,7 @@ describe("GoodReserve - staking with cDAI mocks", () => {
     // expected that the new reserve balance will include
     // the new 1e18 cdai which transferred
     expect(reserveBalanceAfter).to.be.equal(
-      reserveBalanceBefore.add(BN.from("10").pow(17)).sub(BN.from("1"))
+      reserveBalanceBefore.add(BN.from("10").pow(17))
     );
     // the new reserve ratio should be effected from the mintExpansion by:
     // the daily change that was set up in the constructor (999388834642296)
@@ -228,115 +228,17 @@ describe("GoodReserve - staking with cDAI mocks", () => {
         .toString()
     );
   });
-  /*
-  it("should mint UBI correctly for 18 decimals precision and partial interest", async () => {
-    let reserveToken = await marketMaker.reserveTokens(cDAI.address);
-    let reserveBalanceBefore = reserveToken.reserveSupply;
-    let supplyBefore = reserveToken.gdSupply;
-    const gdBalanceFundBefore = await goodDollar.balanceOf(founder.address);
-    const gdBalanceAvatarBefore = await goodDollar.balanceOf(avatar);
-    const gdPriceBefore = await goodReserve["currentPrice()"]();
-    const tx = await (
-      await goodReserve.mintInterestAndUBI(
-        cDAI.address,
-        ethers.utils.parseUnits("10000", "gwei"),
-        "10000"
-      )
-    ).wait(); // interest is 0.0001 cDai which equal to 1 gd
-    const gdBalanceFundAfter = await goodDollar.balanceOf(founder.address);
-    const gdBalanceAvatarAfter = await goodDollar.balanceOf(avatar);
-    const gdPriceAfter = await goodReserve["currentPrice()"]();
-    reserveToken = await marketMaker.reserveTokens(cDAI.address);
-    let reserveBalanceAfter = reserveToken.reserveSupply;
-    let supplyAfter = reserveToken.gdSupply;
-    let rrAfter = reserveToken.reserveRatio;
-    let et = BN.from(ethers.utils.parseUnits("10000", "gwei"));
-    console.log(
-      gdPriceBefore.toNumber(),
-      supplyAfter.toNumber(),
-      supplyBefore.toNumber()
-    );
-    const mintEvent = tx.events.find(_ => _.event === "UBIMinted");
-    const toMint = mintEvent.args.gdInterestMinted.add(
-      mintEvent.args.gdExpansionMinted
-    );
-    expect(reserveBalanceAfter.toString()).to.be.equal(
-      et.add(reserveBalanceBefore).toString(),
-      "reserve balance has changed"
-    );
-    expect(supplyAfter.toString()).to.be.equal(
-      toMint.add(supplyBefore).toString(),
-      "supply has changed"
-    );
-    expect(gdPriceAfter.toString()).to.be.equal(
-      gdPriceBefore.toString(),
-      "price has changed"
-    );
-    expect(
-      (gdBalanceAvatarAfter - gdBalanceAvatarBefore).toString()
-    ).to.be.equal("0"); // 1 gd
-    expect(gdBalanceFundAfter.sub(gdBalanceFundBefore)).to.be.equal(
-      toMint,
-      "ubi minted mismatch"
-    );
-    expect(rrAfter.toString()).to.be.equal("999388");
+
+  it("should not mint UBI if the reserve is not cDAI", async () => {
+    let error = await goodReserve.mintUBI(1, 0, dai.address).catch(e => e);
+    expect(error.message).not.to.be.empty;
   });
-  */
-  // it("should not mint UBI if the reserve is not cDAI", async () => {
-  //   let error = await goodReserve
-  //     .mintInterestAndUBI(dai.address, ethers.utils.parseEther("1"), "0")
-  //     .catch(e => e);
-  //   expect(error.message).not.to.be.empty;
-  // });
 
-  xit("should not mint UBI if the caller is not the fund manager", async () => {
-    let tx = goodReserve
-      .connect(staker)
-      .mintUBI(1, ethers.utils.parseEther("1"), cDAI.address);
+  it("should not mint UBI if the caller is not the fund manager", async () => {
+    let tx = goodReserve.connect(staker).mintUBI(0, 0, cDAI.address);
     await expect(tx).to.be.revertedWith("GoodReserve: not a minter");
   });
 
-  // it("should set block interval by avatar", async () => {
-  //   let encodedCall = web3.eth.abi.encodeFunctionCall(
-  //     {
-  //       name: "setBlockInterval",
-  //       type: "function",
-  //       inputs: [
-  //         {
-  //           type: "uint256",
-  //           name: "_blockInterval"
-  //         }
-  //       ]
-  //     },
-  //     [100]
-  //   );
-  //   await controller.genericCall(
-  //     goodReserve.address,
-  //     encodedCall,
-  //     avatar,
-  //     0
-  //   );
-  //   const newBI = await goodReserve.blockInterval();
-  //   expect(newBI.toString()).to.be.equal("100");
-  // });
-
-  // it("should not mint UBI if not in the interval", async () => {
-  //   const gdBalanceFundBefore = await goodDollar.balanceOf(founder.address);
-  //   const gdBalanceAvatarBefore = await goodDollar.balanceOf(avatar);
-  //   const error = await goodReserve
-  //     .mintInterestAndUBI(
-  //       cDAI.address,
-  //       ethers.utils.parseUnits("10000", "gwei"),
-  //       "10000"
-  //     )
-  //     .catch(e => e);
-  //   const gdBalanceFundAfter = await goodDollar.balanceOf(founder.address);
-  //   const gdBalanceAvatarAfter = await goodDollar.balanceOf(avatar);
-  //   expect(error.message).to.have.string("wait for the next interval");
-  //   expect(gdBalanceFundAfter).to.be.equal(gdBalanceFundBefore);
-  //   expect(gdBalanceAvatarAfter).to.be.equal(gdBalanceAvatarBefore);
-  // });
-
   it("should be able to buy gd with DAI", async () => {
     let daiAmount = ethers.utils.parseEther("100");
     const cdaiRateStored = await cDAI.exchangeRateStored();
@@ -1086,8 +988,8 @@ describe("GoodReserve - staking with cDAI mocks", () => {
         (1 - amount.toNumber() / parseInt(supply.toString())) **
           (1000000 / reserveToken.reserveRatio));
 
-    // expected = Math.ceil((0.8 * expected) / 100) * 100; //deduct 20% contribution, allow 2 points precission mismatch (due to bancor pow estimation?), match solidity no floating point
-    expected = Math.floor(0.8 * expected);
+    expected = Math.ceil((0.8 * expected) / 100) * 100; //deduct 20% contribution, allow 5 points precission mismatch (due to bancor pow estimation?), match solidity no floating point
+    //expected = Math.floor(0.8 * expected);
     expect(cDAIBalanceAfter.sub(cDAIBalanceBefore)).to.be.equal(expected);
     expect(cDAIBalanceReserveBefore.sub(cDAIBalanceReserveAfter)).to.be.equal(
       expected

package/test/utils/ProtocolUpgrade.test.ts

@@ -417,6 +417,14 @@ describe("ProtocolUpgrade - Upgrade old protocol contracts to new ones", () => {
     );
   });
 
+  it("should initialize reputation address", async () => {
+    const cvm = await ethers.getContractAt(
+      "CompoundVotingMachine",
+      deployment["test-mainnet"].CompoundVotingMachine
+    );
+    expect(await cvm.rep()).to.equal(deployment["test-mainnet"].GReputation);
+  });
+
   it("it should set fuse nameservice variables properly", async () => {
     const fse = require("fs-extra");
     const deployment = await fse.readJson("releases/deployment.json");

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"