@gooddollar/goodprotocol 2.1.4 → 2.2.0-beta.1

package/test/governance/ClaimersDistribution.test.ts

@@ -257,6 +257,6 @@ describe("ClaimersDistribution", () => {
       // console.log({ totalGas }, tx.gasUsed.toNumber(), tx2.gasUsed.toNumber());
     }
     console.log(Object.keys(gasCosts));
-    expect(totalGas / 30).lt(316000);
+    expect(totalGas / 30).lt(319000);
   });
 });

package/test/governance/CompoundVotingMachine.castvote.test.ts

@@ -94,13 +94,13 @@ describe("CompoundVotingMachine#CastVote", () => {
 
         await gov
           .connect(actor)
-          ["propose(address[],uint256[],string[],bytes[],string)"](
-            targets,
-            values,
-            signatures,
-            callDatas,
-            "do nothing"
-          );
+        ["propose(address[],uint256[],string[],bytes[],string)"](
+          targets,
+          values,
+          signatures,
+          callDatas,
+          "do nothing"
+        );
         await ethers.provider.send("evm_mine", []);
         await ethers.provider.send("evm_mine", []);
         let proposalId = await gov.latestProposalIds(actor.address);
@@ -123,13 +123,13 @@ describe("CompoundVotingMachine#CastVote", () => {
         );
         let tx = await gov
           .connect(actor)
-          ["propose(address[],uint256[],string[],bytes[],string)"](
-            targets,
-            values,
-            signatures,
-            callDatas,
-            "do nothing"
-          );
+        ["propose(address[],uint256[],string[],bytes[],string)"](
+          targets,
+          values,
+          signatures,
+          callDatas,
+          "do nothing"
+        );
         await ethers.provider.send("evm_mine", []);
         await ethers.provider.send("evm_mine", []);
         let proposalId = await gov.latestProposalIds(actor.address);
@@ -171,10 +171,10 @@ describe("CompoundVotingMachine#CastVote", () => {
         describe("casts vote on behalf of the signatory", async () => {
           let receipt;
           it("should cast vote", async () => {
-            let wallet = ethers.Wallet.createRandom({ gasPrice: 10000000 });
+            let wallet = ethers.Wallet.createRandom();
             await acct.sendTransaction({
               to: wallet.address,
-              value: ethers.utils.parseEther("9999")
+              value: ethers.utils.parseEther("1")
             });
 
             wallet = wallet.connect(ethers.provider);
@@ -182,13 +182,13 @@ describe("CompoundVotingMachine#CastVote", () => {
             await grep.mint(actor.address, ethers.BigNumber.from("100001"));
             await gov
               .connect(actor)
-              ["propose(address[],uint256[],string[],bytes[],string)"](
-                targets,
-                values,
-                signatures,
-                callDatas,
-                "do nothing"
-              );
+            ["propose(address[],uint256[],string[],bytes[],string)"](
+              targets,
+              values,
+              signatures,
+              callDatas,
+              "do nothing"
+              , { gasPrice: 1e6, gasLimit: 1000000 });
             let proposalId = await gov.latestProposalIds(actor.address);
 
             const signature = await wallet._signTypedData(
@@ -231,13 +231,13 @@ describe("CompoundVotingMachine#CastVote", () => {
           await grep.mint(actor.address, ethers.BigNumber.from("100001"));
           await gov
             .connect(actor)
-            ["propose(address[],uint256[],string[],bytes[],string)"](
-              targets,
-              values,
-              signatures,
-              callDatas,
-              "do nothing"
-            );
+          ["propose(address[],uint256[],string[],bytes[],string)"](
+            targets,
+            values,
+            signatures,
+            callDatas,
+            "do nothing"
+          );
           let proposalId = await gov.latestProposalIds(actor.address);
 
           const sigsFor = [];

package/test/helpers.ts

@@ -12,7 +12,7 @@ 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 { GoodMarketMaker, CompoundVotingMachine } from "../types";
+import { GoodMarketMaker, CompoundVotingMachine, IdentityV4 } from "../types";
 import { Contract } from "ethers";
 import testDeployer from "@superfluid-finance/ethereum-contracts/dev-scripts/deploy-test-framework";
 
@@ -24,9 +24,7 @@ export const getStakingFactory = async (
     | "GoodAaveStakingV2"
     | "GoodCompoundStakingV2"
 ) => {
-  let swapHelper = await ethers
-    .getContractFactory("UniswapV2SwapHelper")
-    .then(_ => _.deploy());
+  let swapHelper = await ethers.getContractFactory("UniswapV2SwapHelper").then(_ => _.deploy());
 
   const simpleStakingFactory = await ethers.getContractFactory(factory, {
     libraries: {
@@ -46,17 +44,13 @@ export const deploySuperFluid = async () => {
 };
 
 export const deploySuperGoodDollar = async (sfContracts, tokenArgs) => {
-  const SuperGoodDollarFactory = await ethers.getContractFactory(
-    "SuperGoodDollar"
-  );
+  const SuperGoodDollarFactory = await ethers.getContractFactory("SuperGoodDollar");
 
   console.log("deploying supergooddollar logic");
   const SuperGoodDollar = await SuperGoodDollarFactory.deploy(sfContracts.host);
 
   console.log("deploying supergooddollar proxy");
-  const GoodDollarProxyFactory = await ethers.getContractFactory(
-    "contracts/token/superfluid/UUPSProxy.sol:UUPSProxy"
-  );
+  const GoodDollarProxyFactory = await ethers.getContractFactory("contracts/token/superfluid/UUPSProxy.sol:UUPSProxy");
   const GoodDollarProxy = await GoodDollarProxyFactory.deploy();
   console.log("deployed supergooddollar proxy, initializing proxy...");
   await GoodDollarProxy.initializeProxy(SuperGoodDollar.address);
@@ -67,15 +61,12 @@ export const deploySuperGoodDollar = async (sfContracts, tokenArgs) => {
     const outNftProxy = await GoodDollarProxyFactory.deploy();
     const inNftProxy = await GoodDollarProxyFactory.deploy();
 
-    const constantInflowNFT = await ethers.deployContract("ConstantInflowNFT", [
+    const constantInflowNFT = await ethers.deployContract("ConstantInflowNFT", [sfContracts.host, outNftProxy.address]);
+
+    const constantOutflowNFT = await ethers.deployContract("ConstantOutflowNFT", [
       sfContracts.host,
-      outNftProxy.address
+      inNftProxy.address
     ]);
-
-    const constantOutflowNFT = await ethers.deployContract(
-      "ConstantOutflowNFT",
-      [sfContracts.host, inNftProxy.address]
-    );
     await outNftProxy.initializeProxy(constantOutflowNFT.address);
     await inNftProxy.initializeProxy(constantInflowNFT.address);
 
@@ -83,42 +74,27 @@ export const deploySuperGoodDollar = async (sfContracts, tokenArgs) => {
     await SuperGoodDollar.attach(GoodDollarProxy.address)[
       "initialize(string,string,uint256,address,address,address,address)"
     ](...tokenArgs);
-    const GoodDollar = await ethers.getContractAt(
-      "SuperGoodDollar",
-      GoodDollarProxy.address
-    );
+    const GoodDollar = await ethers.getContractAt("SuperGoodDollar", GoodDollarProxy.address);
     console.log("supergooddollar created successfully");
 
     await constantOutflowNFT
       .attach(outNftProxy.address)
-      .initialize(
-        (await GoodDollar.symbol()) + " Outflow NFT",
-        (await GoodDollar.symbol()) + " COF"
-      );
+      .initialize((await GoodDollar.symbol()) + " Outflow NFT", (await GoodDollar.symbol()) + " COF");
     await constantInflowNFT
       .attach(inNftProxy.address)
-      .initialize(
-        (await GoodDollar.symbol()) + " Inflow NFT",
-        (await GoodDollar.symbol()) + " CIF"
-      );
+      .initialize((await GoodDollar.symbol()) + " Inflow NFT", (await GoodDollar.symbol()) + " CIF");
     return GoodDollar;
   } else {
     console.log("initializing supergooddollar....");
     await SuperGoodDollar.attach(GoodDollarProxy.address)[
       "initialize(string,string,uint256,address,address,address,address)"
     ](...tokenArgs);
-    const GoodDollar = await ethers.getContractAt(
-      "SuperGoodDollar",
-      GoodDollarProxy.address
-    );
+    const GoodDollar = await ethers.getContractAt("SuperGoodDollar", GoodDollarProxy.address);
     console.log("supergooddollar created successfully");
     return GoodDollar;
   }
 };
-export const createDAO = async (
-  tokenType: "super" | "regular" = "super",
-  identity: "v2" | "v3" = "v3"
-) => {
+export const createDAO = async (tokenType: "super" | "regular" = "super", identity: "v2" | "v3" | "v4" = "v4") => {
   let [root, ...signers] = await ethers.getSigners();
 
   const sfContracts = await deploySuperFluid();
@@ -130,38 +106,23 @@ export const createDAO = async (
 
   let cDAI = await cdaiFactory.deploy(dai.address);
 
-  const DAOCreatorFactory = new ethers.ContractFactory(
-    DAOCreatorABI.abi,
-    DAOCreatorABI.bytecode,
-    root
-  );
+  const DAOCreatorFactory = new ethers.ContractFactory(DAOCreatorABI.abi, DAOCreatorABI.bytecode, root);
 
-  const IdentityFactory = await ethers.getContractFactory(
-    identity === "v2" ? "IdentityV2" : "IdentityV3"
-  );
+  const IdentityFactory = await ethers.getContractFactory("Identity" + identity.toUpperCase());
 
-  const FeeFormulaFactory = new ethers.ContractFactory(
-    FeeFormulaABI.abi,
-    FeeFormulaABI.bytecode,
-    root
-  );
+  const FeeFormulaFactory = new ethers.ContractFactory(FeeFormulaABI.abi, FeeFormulaABI.bytecode, root);
 
-  const BancorFormula = await (
-    await ethers.getContractFactory("BancorFormula")
-  ).deploy();
+  const BancorFormula = await (await ethers.getContractFactory("BancorFormula")).deploy();
 
   await BancorFormula.init();
 
   console.log("deploy upgradeable identity...");
 
-  const Identity = await upgrades.deployProxy(
-    IdentityFactory,
-    [root.address, ethers.constants.AddressZero],
-    {
-      kind: "uups"
-    }
-  );
-
+  const Identity = (await upgrades.deployProxy(IdentityFactory, [root.address, ethers.constants.AddressZero], {
+    kind: "uups"
+  })) as IdentityV4;
+  // put reverify far in the future to avoid interference with tests
+  if (identity === "v4") await Identity.setReverifyDaysOptions([180]);
   const daoCreator = await DAOCreatorFactory.deploy();
   const FeeFormula = await FeeFormulaFactory.deploy(0);
   const GReputation = await ethers.getContractFactory("GReputation");
@@ -183,19 +144,10 @@ export const createDAO = async (
 
     GoodDollar = await upgrades.deployProxy(
       GoodDollarFactory,
-      [
-        "GoodDollar",
-        "G$",
-        0,
-        FeeFormula.address,
-        Identity.address,
-        ethers.constants.AddressZero,
-        daoCreator.address
-      ],
+      ["GoodDollar", "G$", 0, FeeFormula.address, Identity.address, ethers.constants.AddressZero, daoCreator.address],
       {
         kind: "uups",
-        initializer:
-          "initialize(string, string, uint256, address, address, address,address)"
+        initializer: "initialize(string, string, uint256, address, address, address,address)"
       }
     );
   } else {
@@ -218,20 +170,11 @@ export const createDAO = async (
     daoCreator: daoCreator.address
   });
   // await Identity.setAuthenticationPeriod(365);
-  await daoCreator.forgeOrg(
-    GoodDollar.address,
-    reputation.address,
-    [],
-    1000,
-    []
-  );
+  await daoCreator.forgeOrg(GoodDollar.address, reputation.address, [], 1000, []);
 
   const Avatar = new ethers.Contract(
     await daoCreator.avatar(),
-    [
-      "function owner() view returns (address)",
-      "function nativeToken() view returns (address)"
-    ],
+    ["function owner() view returns (address)", "function nativeToken() view returns (address)"],
     root
   );
 
@@ -245,11 +188,7 @@ export const createDAO = async (
     await GoodDollar.isPauser(Avatar.address)
   );
 
-  const ccFactory = new ethers.ContractFactory(
-    ContributionCalculation.abi,
-    ContributionCalculation.bytecode,
-    root
-  );
+  const ccFactory = new ethers.ContractFactory(ContributionCalculation.abi, ContributionCalculation.bytecode, root);
 
   const contribution = await ccFactory.deploy(Avatar.address, 0, 1e15);
 
@@ -332,13 +271,9 @@ export const createDAO = async (
 
   const MM = await ethers.getContractFactory("GoodMarketMaker");
 
-  let marketMaker = (await upgrades.deployProxy(
-    MM,
-    [nameService.address, 999388834642296, 1e15],
-    {
-      kind: "uups"
-    }
-  )) as unknown as GoodMarketMaker;
+  let marketMaker = (await upgrades.deployProxy(MM, [nameService.address, 999388834642296, 1e15], {
+    kind: "uups"
+  })) as unknown as GoodMarketMaker;
 
   await (await reputation.updateDAO(nameService.address)).wait();
 
@@ -346,28 +281,16 @@ export const createDAO = async (
   //generic call permissions
   let schemeMock = signers[signers.length - 1];
 
-  const ictrl = await ethers.getContractAt(
-    "Controller",
-    controller,
-    schemeMock
-  );
+  const ictrl = await ethers.getContractAt("Controller", controller, schemeMock);
 
   const setSchemes = async (addrs, params = []) => {
     for (let i in addrs) {
-      await ictrl.registerScheme(
-        addrs[i],
-        params[i] || ethers.constants.HashZero,
-        "0x0000001F",
-        Avatar.address
-      );
+      await ictrl.registerScheme(addrs[i], params[i] || ethers.constants.HashZero, "0x0000001F", Avatar.address);
     }
   };
 
   const setDAOAddress = async (name, addr) => {
-    const encoded = nameService.interface.encodeFunctionData("setAddress", [
-      name,
-      addr
-    ]);
+    const encoded = nameService.interface.encodeFunctionData("setAddress", [name, addr]);
 
     await ictrl.genericCall(nameService.address, encoded, Avatar.address, 0);
   };
@@ -377,21 +300,20 @@ export const createDAO = async (
     expect(funcNameEnd).to.be.gt(-1);
     const functionName = functionAbi.substring(0, funcNameEnd);
 
-    await expect(contract[functionAbi](...parameters)).to.revertedWith(
-      /avatar/
-    );
-    const encoded = contract.interface.encodeFunctionData(functionName, [
-      ...parameters
-    ]);
+    await expect(contract[functionAbi](...parameters)).to.revertedWith(/avatar/);
+    const encoded = contract.interface.encodeFunctionData(functionName, [...parameters]);
 
     await ictrl.genericCall(contract.address, encoded, Avatar.address, 0);
   };
 
   const setReserveToken = async (token, gdReserve, tokenReserve, RR) => {
-    const encoded = marketMaker.interface.encodeFunctionData(
-      "initializeToken",
-      [token, gdReserve, tokenReserve, RR, 0]
-    );
+    const encoded = marketMaker.interface.encodeFunctionData("initializeToken", [
+      token,
+      gdReserve,
+      tokenReserve,
+      RR,
+      0
+    ]);
 
     await ictrl.genericCall(marketMaker.address, encoded, Avatar.address, 0);
   };
@@ -417,9 +339,9 @@ export const createDAO = async (
   const gd = await Avatar.nativeToken();
   //make GoodCap minter
   console.log("Setting reserve as minter...");
-  const encoded = (
-    await ethers.getContractAt("IGoodDollar", gd)
-  ).interface.encodeFunctionData("addMinter", [goodReserve.address]);
+  const encoded = (await ethers.getContractAt("IGoodDollar", gd)).interface.encodeFunctionData("addMinter", [
+    goodReserve.address
+  ]);
 
   await ictrl.genericCall(gd, encoded, Avatar.address, 0);
 
@@ -427,25 +349,17 @@ export const createDAO = async (
 
   await ictrl.genericCall(
     goodReserve.address,
-    goodReserve.interface.encodeFunctionData("setDistributionHelper", [
-      distHelper.address
-    ]),
+    goodReserve.interface.encodeFunctionData("setDistributionHelper", [distHelper.address]),
     Avatar.address,
     0
   );
 
-  const gasFeeMockFactory = await ethers.getContractFactory(
-    "GasPriceMockOracle"
-  );
+  const gasFeeMockFactory = await ethers.getContractFactory("GasPriceMockOracle");
   const gasFeeOracle = await gasFeeMockFactory.deploy();
-  const daiEthPriceMockFactory = await ethers.getContractFactory(
-    "DaiEthPriceMockOracle"
-  );
+  const daiEthPriceMockFactory = await ethers.getContractFactory("DaiEthPriceMockOracle");
   const daiEthOracle = await daiEthPriceMockFactory.deploy();
 
-  const ethUsdOracleFactory = await ethers.getContractFactory(
-    "EthUSDMockOracle"
-  );
+  const ethUsdOracleFactory = await ethers.getContractFactory("EthUSDMockOracle");
   const ethUsdOracle = await ethUsdOracleFactory.deploy();
 
   console.log("setting nameservice addrresses...");
@@ -531,15 +445,17 @@ export const deployUBI = async (deployedDAO, withFirstClaim = true) => {
 
   const gd = await nameService.getAddress("GOODDOLLAR");
 
-  let encoded = (
-    await ethers.getContractAt("IGoodDollar", gd)
-  ).interface.encodeFunctionData("mint", [firstClaim.address, 1000000]);
+  let encoded = (await ethers.getContractAt("IGoodDollar", gd)).interface.encodeFunctionData("mint", [
+    firstClaim.address,
+    1000000
+  ]);
 
   await genericCall(gd, encoded);
 
-  encoded = (
-    await ethers.getContractAt("IGoodDollar", gd)
-  ).interface.encodeFunctionData("mint", [ubiScheme.address, 1000000]);
+  encoded = (await ethers.getContractAt("IGoodDollar", gd)).interface.encodeFunctionData("mint", [
+    ubiScheme.address,
+    1000000
+  ]);
 
   await genericCall(gd, encoded);
 
@@ -547,9 +463,7 @@ export const deployUBI = async (deployedDAO, withFirstClaim = true) => {
   await setSchemes([firstClaim.address, ubiScheme.address]);
 
   if (withFirstClaim) {
-    encoded = firstClaim.interface.encodeFunctionData("setUBIScheme", [
-      ubiScheme.address
-    ]);
+    encoded = firstClaim.interface.encodeFunctionData("setUBIScheme", [ubiScheme.address]);
 
     await genericCall(firstClaim.address, encoded);
     await firstClaim.start();
@@ -598,15 +512,17 @@ export const deployOldUBI = async deployedDAO => {
 
   const gd = await nameService.getAddress("GOODDOLLAR");
 
-  let encoded = (
-    await ethers.getContractAt("IGoodDollar", gd)
-  ).interface.encodeFunctionData("mint", [firstClaim.address, 1000000]);
+  let encoded = (await ethers.getContractAt("IGoodDollar", gd)).interface.encodeFunctionData("mint", [
+    firstClaim.address,
+    1000000
+  ]);
 
   await genericCall(gd, encoded);
 
-  encoded = (
-    await ethers.getContractAt("IGoodDollar", gd)
-  ).interface.encodeFunctionData("mint", [ubiScheme.address, 1000000]);
+  encoded = (await ethers.getContractAt("IGoodDollar", gd)).interface.encodeFunctionData("mint", [
+    ubiScheme.address,
+    1000000
+  ]);
 
   await genericCall(gd, encoded);
 
@@ -651,26 +567,16 @@ export const deployOldVoting = async dao => {
       SchemeRegistrarF.deploy()
     ]);
     console.log("setting parameters");
-    const voteParametersHash = await absoluteVote.getParametersHash(
-      50,
-      ethers.constants.AddressZero
-    );
+    const voteParametersHash = await absoluteVote.getParametersHash(50, ethers.constants.AddressZero);
 
     console.log("setting params for voting machine and schemes");
 
     await Promise.all([
-      schemeRegistrar.setParameters(
-        voteParametersHash,
-        voteParametersHash,
-        absoluteVote.address
-      ),
+      schemeRegistrar.setParameters(voteParametersHash, voteParametersHash, absoluteVote.address),
       absoluteVote.setParameters(50, ethers.constants.AddressZero),
       upgradeScheme.setParameters(voteParametersHash, absoluteVote.address)
     ]);
-    const upgradeParametersHash = await upgradeScheme.getParametersHash(
-      voteParametersHash,
-      absoluteVote.address
-    );
+    const upgradeParametersHash = await upgradeScheme.getParametersHash(voteParametersHash, absoluteVote.address);
 
     // Deploy SchemeRegistrar
     const schemeRegisterParams = await schemeRegistrar.getParametersHash(
@@ -710,18 +616,10 @@ export const deployUniswap = async (comp, dai) => {
     UniswapV2Factory.bytecode,
     (await ethers.getSigners())[0]
   );
-  const wethFactory = new ethers.ContractFactory(
-    WETH9.abi,
-    WETH9.bytecode,
-    (await ethers.getSigners())[0]
-  );
+  const wethFactory = new ethers.ContractFactory(WETH9.abi, WETH9.bytecode, (await ethers.getSigners())[0]);
 
   const weth = await wethFactory.deploy();
-  const factory = await uniswapFactory.deploy(
-    (
-      await ethers.getSigners()
-    )[0].address
-  );
+  const factory = await uniswapFactory.deploy((await ethers.getSigners())[0].address);
   const router = await routerFactory.deploy(factory.address, weth.address);
   await factory.createPair(comp.address, weth.address); // Create comp and weth pair
   const compPairAddress = factory.getPair(comp.address, weth.address);
@@ -729,28 +627,11 @@ export const deployUniswap = async (comp, dai) => {
   await factory.createPair(dai.address, weth.address); // Create comp and dai pair
   const daiPairAddress = factory.getPair(dai.address, weth.address);
 
-  const compPair = new Contract(
-    compPairAddress,
-    JSON.stringify(IUniswapV2Pair.abi),
-    staker
-  ).connect(founder);
-  const daiPair = new Contract(
-    daiPairAddress,
-    JSON.stringify(IUniswapV2Pair.abi),
-    staker
-  ).connect(founder);
-  await dai["mint(address,uint256)"](
-    founder.address,
-    ethers.utils.parseEther("2000000")
-  );
-  await dai["mint(address,uint256)"](
-    daiPair.address,
-    ethers.utils.parseEther("2000000")
-  );
-  await comp["mint(address,uint256)"](
-    compPair.address,
-    ethers.utils.parseEther("200000")
-  );
+  const compPair = new Contract(compPairAddress, JSON.stringify(IUniswapV2Pair.abi), staker).connect(founder);
+  const daiPair = new Contract(daiPairAddress, JSON.stringify(IUniswapV2Pair.abi), staker).connect(founder);
+  await dai["mint(address,uint256)"](founder.address, ethers.utils.parseEther("2000000"));
+  await dai["mint(address,uint256)"](daiPair.address, ethers.utils.parseEther("2000000"));
+  await comp["mint(address,uint256)"](compPair.address, ethers.utils.parseEther("200000"));
   console.log("depositing eth to liquidity pools");
   await weth.deposit({ value: ethers.utils.parseEther("4000") });
   console.log(await weth.balanceOf(founder.address).then(_ => _.toString()));