@gooddollar/goodprotocol 1.0.7 → 1.0.10

package/test/governance/Reputation.test.ts

@@ -31,7 +31,7 @@ describe("Reputation", () => {
     let value;
     await reputation.mint(acct.address, 3131);
 
-    value = await reputation.balanceOf(acct.address);
+    value = await reputation.balanceOfLocal(acct.address);
     expect(value).to.equal(3131);
   });
 
@@ -50,10 +50,10 @@ describe("Reputation", () => {
     await expect(reputation.connect(signers[2]).mint(signers[2], 1000)).to
       .reverted;
 
-    let account0Rep = await reputation.balanceOf(signers[0].address);
-    let account1Rep = await reputation.balanceOf(signers[1].address);
-    let account2Rep = await reputation.balanceOf(signers[2].address);
-    let totalRep = await reputation.totalSupply();
+    let account0Rep = await reputation.balanceOfLocal(signers[0].address);
+    let account1Rep = await reputation.balanceOfLocal(signers[1].address);
+    let account2Rep = await reputation.balanceOfLocal(signers[2].address);
+    let totalRep = await reputation.totalSupplyLocal();
 
     expect(account1Rep).to.equal(1000, "account 1 reputation should be 1000");
     expect(account2Rep).to.equal(0, "account 2 reputation should be 0");
@@ -71,9 +71,9 @@ describe("Reputation", () => {
     await reputation.mint(signers[2].address, 3000);
 
     // this tx should have no effect
-    let account0Rep = await reputation.balanceOf(signers[0].address);
-    let account1Rep = await reputation.balanceOf(signers[1].address);
-    let account2Rep = await reputation.balanceOf(signers[2].address);
+    let account0Rep = await reputation.balanceOfLocal(signers[0].address);
+    let account1Rep = await reputation.balanceOfLocal(signers[1].address);
+    let account2Rep = await reputation.balanceOfLocal(signers[2].address);
 
     // expect(account0Rep, 2001, "account 0 reputation should be 2000");
     expect(account1Rep).to.equal(
@@ -82,7 +82,7 @@ describe("Reputation", () => {
     );
     expect(account2Rep).to.equal(3000, "account 2 reputation should be 3000");
 
-    let totalRep = await reputation.totalSupply();
+    let totalRep = await reputation.totalSupplyLocal();
 
     expect(totalRep).to.equal(
       account0Rep.add(account1Rep).add(account2Rep),
@@ -96,23 +96,22 @@ describe("Reputation", () => {
       .catch(e => e);
     expect(tx.message).to.have.string("Reputation: need minter role");
   });
-  it("user should be able to burn their own reputation",async()=>{
-    await reputation.connect(signers[0]).burn(signers[0].address, ethers.utils.parseEther("1"))
-  })
+  it("user should be able to burn their own reputation", async () => {
+    await reputation
+      .connect(signers[0])
+      .burn(signers[0].address, ethers.utils.parseEther("1"));
+  });
   it("check total reputation overflow", async () => {
     let BigNumber = ethers.BigNumber;
-    let bigNum = BigNumber.from(2)
-      .pow(128)
-      .sub(1)
-      .toString();
+    let bigNum = BigNumber.from(2).pow(128).sub(1).toString();
 
     await reputation.mint(signers[0].address, bigNum);
 
-    let totalRepBefore = await reputation.totalSupply();
+    let totalRepBefore = await reputation.totalSupplyLocal();
 
     await expect(reputation.mint(signers[1].address, 1)).to.reverted;
 
-    let totalRepAfter = await reputation.totalSupply();
+    let totalRepAfter = await reputation.totalSupplyLocal();
 
     expect(totalRepBefore).to.equal(totalRepAfter);
   });
@@ -122,15 +121,15 @@ describe("Reputation", () => {
     await reputation.mint(signers[1].address, 1500);
     await reputation.burn(signers[1].address, 500);
 
-    value = await reputation.balanceOf(signers[1].address);
-    let totalRepSupply = await reputation.totalSupply();
+    value = await reputation.balanceOfLocal(signers[1].address);
+    let totalRepSupply = await reputation.totalSupplyLocal();
 
     expect(value).to.equal(1000);
     expect(totalRepSupply).to.equal(1000);
   });
 
   it("totalSupply is 0 on init", async () => {
-    const totalSupply = await reputation.totalSupply();
+    const totalSupply = await reputation.totalSupplyLocal();
 
     expect(totalSupply).to.equal(0);
   });
@@ -163,12 +162,12 @@ describe("Reputation", () => {
 
   it("mint (plus) should be reflected in totalSupply", async () => {
     await reputation.mint(signers[1].address, 1000);
-    let totalSupply = await reputation.totalSupply();
+    let totalSupply = await reputation.totalSupplyLocal();
 
     expect(totalSupply).to.equal(1000);
 
     await reputation.mint(signers[2].address, 500);
-    totalSupply = await reputation.totalSupply();
+    totalSupply = await reputation.totalSupplyLocal();
 
     expect(totalSupply).to.equal(1500);
   });
@@ -176,22 +175,22 @@ describe("Reputation", () => {
   it("mint (plus) should be reflected in balances", async () => {
     await reputation.mint(signers[1].address, 1000);
 
-    const amount = await reputation.balanceOf(signers[1].address);
+    const amount = await reputation.balanceOfLocal(signers[1].address);
 
     expect(amount).to.equal(1000);
   });
 
   it("mint (minus) should be reflected in totalSupply", async () => {
     await reputation.mint(signers[1].address, 1000);
-    let totalSupply = await reputation.totalSupply();
+    let totalSupply = await reputation.totalSupplyLocal();
     expect(totalSupply).to.equal(1000);
 
     await reputation.burn(signers[1].address, 500);
-    totalSupply = await reputation.totalSupply();
+    totalSupply = await reputation.totalSupplyLocal();
     expect(totalSupply).to.equal(500);
 
     await reputation.burn(signers[1].address, 700);
-    totalSupply = await reputation.totalSupply();
+    totalSupply = await reputation.totalSupplyLocal();
     expect(totalSupply).to.equal(0);
   });
 
@@ -199,31 +198,31 @@ describe("Reputation", () => {
     await reputation.mint(signers[1].address, 1000);
     await reputation.burn(signers[1].address, 500);
 
-    let amount = await reputation.balanceOf(signers[1].address);
+    let amount = await reputation.balanceOfLocal(signers[1].address);
 
     expect(amount).to.equal(500);
 
     await reputation.burn(signers[1].address, 700);
-    amount = await reputation.balanceOf(signers[1].address);
+    amount = await reputation.balanceOfLocal(signers[1].address);
     expect(amount).to.equal(0);
   });
 
   it("account balance cannot be negative", async () => {
     await reputation.mint(signers[1].address, 1);
 
-    let amount = await reputation.balanceOf(signers[1].address);
+    let amount = await reputation.balanceOfLocal(signers[1].address);
     expect(amount).to.equal(1);
     await reputation.burn(signers[1].address, 2);
-    let rep = await reputation.balanceOf(signers[1].address);
+    let rep = await reputation.balanceOfLocal(signers[1].address);
     expect(rep).to.equal(0);
   });
 
   it("totalSupply cannot be negative", async () => {
     await reputation.mint(signers[1].address, 1);
-    let amount = await reputation.totalSupply();
+    let amount = await reputation.totalSupplyLocal();
     expect(amount).to.equal(1);
     await reputation.burn(signers[1].address, 2);
-    let rep = await reputation.totalSupply();
+    let rep = await reputation.totalSupplyLocal();
     expect(rep).to.equal(0);
   });
 
@@ -236,9 +235,9 @@ describe("Reputation", () => {
     await reputation.mint(signers[2].address, rep2);
     await reputation.mint(signers[3].address, rep3);
 
-    const balanceOf1 = await reputation.balanceOf(signers[1].address);
-    const balanceOf2 = await reputation.balanceOf(signers[2].address);
-    const balanceOf3 = await reputation.balanceOf(signers[3].address);
+    const balanceOf1 = await reputation.balanceOfLocal(signers[1].address);
+    const balanceOf2 = await reputation.balanceOfLocal(signers[2].address);
+    const balanceOf3 = await reputation.balanceOfLocal(signers[3].address);
 
     expect(balanceOf1).to.equal(rep1);
     expect(balanceOf2).to.equal(rep2);
@@ -250,19 +249,21 @@ describe("Reputation", () => {
     await reputation.mint(signers[1].address, rep1);
     var tx = await (await reputation.mint(signers[1].address, rep1)).wait();
     await reputation.mint(signers[3].address, rep1);
-    expect(await reputation.totalSupply()).to.equal(rep1 + rep1 + rep1);
-    expect(await reputation.totalSupplyAt(tx.blockNumber)).to.equal(
+    expect(await reputation.totalSupplyLocal()).to.equal(rep1 + rep1 + rep1);
+    expect(await reputation.totalSupplyLocalAt(tx.blockNumber)).to.equal(
       rep1 + rep1
     );
-    expect(await reputation.totalSupplyAt(tx.blockNumber - 1)).to.equal(rep1);
+    expect(await reputation.totalSupplyLocalAt(tx.blockNumber - 1)).to.equal(
+      rep1
+    );
     expect(
-      await reputation.balanceOfAt(signers[1].address, tx.blockNumber)
+      await reputation.balanceOfLocalAt(signers[1].address, tx.blockNumber)
     ).to.equal(rep1 + rep1);
     expect(
-      await reputation.balanceOfAt(signers[1].address, tx.blockNumber - 1)
+      await reputation.balanceOfLocalAt(signers[1].address, tx.blockNumber - 1)
     ).to.equal(rep1);
     expect(
-      await reputation.balanceOfAt(signers[3].address, tx.blockNumber)
+      await reputation.balanceOfLocalAt(signers[3].address, tx.blockNumber)
     ).to.equal(0);
   });
 
@@ -281,28 +282,28 @@ describe("Reputation", () => {
     var times = 3;
 
     await reputationTestHelper.multipleMint(signers[1].address, rep, times);
-    expect(await reputation.totalSupply()).to.equal(rep * times);
-    expect(await reputation.balanceOf(signers[1].address)).to.equal(
+    expect(await reputation.totalSupplyLocal()).to.equal(rep * times);
+    expect(await reputation.balanceOfLocal(signers[1].address)).to.equal(
       rep * times
     );
 
     await reputationTestHelper.multipleBurn(signers[1].address, rep, 2);
-    expect(await reputation.totalSupply()).to.equal(rep);
-    expect(await reputation.balanceOf(signers[1].address)).to.equal(rep);
+    expect(await reputation.totalSupplyLocal()).to.equal(rep);
+    expect(await reputation.balanceOfLocal(signers[1].address)).to.equal(rep);
   });
 
   it("balanceOfAt before first mint should be 0 ", async () => {
     const rep1 = Math.floor(Math.random() * 1e6);
     var tx = await (await reputation.mint(signers[1].address, rep1)).wait();
-    expect(await reputation.totalSupply()).to.equal(rep1);
-    expect(await reputation.totalSupplyAt(tx.blockNumber)).to.equal(rep1);
-    expect(await reputation.totalSupplyAt(tx.blockNumber - 1)).to.equal(0);
+    expect(await reputation.totalSupplyLocal()).to.equal(rep1);
+    expect(await reputation.totalSupplyLocalAt(tx.blockNumber)).to.equal(rep1);
+    expect(await reputation.totalSupplyLocalAt(tx.blockNumber - 1)).to.equal(0);
 
     expect(
-      await reputation.balanceOfAt(signers[1].address, tx.blockNumber)
+      await reputation.balanceOfLocalAt(signers[1].address, tx.blockNumber)
     ).to.equal(rep1);
     expect(
-      await reputation.balanceOfAt(signers[1].address, tx.blockNumber - 1)
+      await reputation.balanceOfLocalAt(signers[1].address, tx.blockNumber - 1)
     ).to.equal(0);
   });
 });

package/test/governance/StakersDistribution.test.ts

@@ -381,18 +381,22 @@ describe("StakersDistribution - staking with GD  and get Rewards in GDAO", () =>
     await simpleStaking.connect(staker).stake(stakingAmount, 0, false);
     await advanceBlocks(40);
     await increaseTime(86700 * 30); // Increase one month
-    const stakerGDAOBalanceBeforeStake = await grep.balanceOf(staker.address);
+    const stakerGDAOBalanceBeforeStake = await grep.balanceOfLocal(
+      staker.address
+    );
     await simpleStaking.connect(staker).stake(stakingAmount, 0, false);
-    const stakerGDAOBalanceAfterStake = await grep.balanceOf(staker.address);
+    const stakerGDAOBalanceAfterStake = await grep.balanceOfLocal(
+      staker.address
+    );
     await simpleStaking.connect(staker).withdrawRewards();
 
     const rewardsPerBlockAfterStake = await stakersDistribution.rewardsPerBlock(
       simpleStaking.address
     );
-    const GDAOBalanceBeforeWithdraw = await grep.balanceOf(staker.address);
+    const GDAOBalanceBeforeWithdraw = await grep.balanceOfLocal(staker.address);
     await advanceBlocks(10);
     await simpleStaking.connect(staker).withdrawStake(stakingAmount, false);
-    const GDAOBalanceAfterWithdraw = await grep.balanceOf(staker.address);
+    const GDAOBalanceAfterWithdraw = await grep.balanceOfLocal(staker.address);
     expect(rewardsPerBlockAfterStake).to.be.equal(rewardsPerBlockBeforeStake); // Should not update rewards per block since simplestaking blockend passed
     expect(GDAOBalanceBeforeWithdraw).to.be.equal(GDAOBalanceAfterWithdraw); // Should not earn any GDAO since simplestaking blockend passed
     expect(stakerGDAOBalanceAfterStake.gt(stakerGDAOBalanceBeforeStake)).to.be
@@ -432,10 +436,10 @@ describe("StakersDistribution - staking with GD  and get Rewards in GDAO", () =>
     const blockNumberOfStake = (await ethers.provider.getBlockNumber()) + 1;
     await simpleStaking.connect(staker).stake(stakingAmount, 0, false);
     await advanceBlocks(30);
-    const GDAOBalanceBeforeWithdraw = await grep.balanceOf(staker.address);
+    const GDAOBalanceBeforeWithdraw = await grep.balanceOfLocal(staker.address);
     await simpleStaking.connect(staker).withdrawStake(stakingAmount, false);
 
-    const GDAOBalanceAfterWithdraw = await grep.balanceOf(staker.address);
+    const GDAOBalanceAfterWithdraw = await grep.balanceOfLocal(staker.address);
     expect(GDAOBalanceAfterWithdraw).to.be.gt(GDAOBalanceBeforeWithdraw);
 
     expect(GDAOBalanceAfterWithdraw).to.be.equal(
@@ -750,12 +754,12 @@ describe("StakersDistribution - staking with GD  and get Rewards in GDAO", () =>
     const daiStakingRewardsPerBlock = await stakersDistribution.rewardsPerBlock(
       simpleStaking.address
     );
-    const gdaoBalanceBeforeWithdraw = await grep.balanceOf(staker.address);
+    const gdaoBalanceBeforeWithdraw = await grep.balanceOfLocal(staker.address);
     await simpleUsdcStaking
       .connect(staker)
       .withdrawStake(stakingAmountUsdc, false);
     await simpleStaking.connect(staker).withdrawStake(stakingAmountDai, false);
-    const gdaoBalanceAfterWithdraw = await grep.balanceOf(staker.address);
+    const gdaoBalanceAfterWithdraw = await grep.balanceOfLocal(staker.address);
     expect(gdaoBalanceAfterWithdraw.sub(gdaoBalanceBeforeWithdraw)).to.be.equal(
       UserPendingGdaos.add(usdcStakingRewardsPerBlock).add(
         daiStakingRewardsPerBlock.mul(2)

package/test/helpers.ts

@@ -18,7 +18,11 @@ import { GoodMarketMaker, CompoundVotingMachine } from "../types";
 import { Contract } from "ethers";
 
 export const getStakingFactory = async (
-  factory: "GoodCompoundStaking" | "GoodAaveStaking" | "GoodCompoundStakingTest"
+  factory:
+    | "GoodCompoundStaking"
+    | "GoodAaveStaking"
+    | "GoodCompoundStakingTest"
+    | "GoodAaveStakingV2"
 ) => {
   let swapHelper = await ethers
     .getContractFactory("UniswapV2SwapHelper")

package/test/staking/GoodAaveStakingFactoryV2.test.ts

@@ -0,0 +1,122 @@
+import { default as hre, ethers, upgrades } from "hardhat";
+import { deployMockContract, MockContract } from "ethereum-waffle";
+import { expect } from "chai";
+import { CERC20, GoodAaveStaking, AaveStakingFactory } from "../../types";
+import { createDAO, deployUniswap } from "../helpers";
+import { Contract } from "ethers";
+
+const BN = ethers.BigNumber;
+export const NULL_ADDRESS = ethers.constants.AddressZero;
+
+let cdai: CERC20;
+
+describe("AaveStakingFactoryV2", () => {
+  let founder,
+    signers,
+    cdai,
+    usdc,
+    aave,
+    incentiveController,
+    aaveUsdOracle: Contract,
+    dai,
+    dao,
+    stakingFactory: AaveStakingFactory,
+    lendingPool: Contract;
+
+  before(async () => {
+    [founder, ...signers] = await ethers.getSigners();
+    dao = await createDAO();
+    const usdcFactory = await ethers.getContractFactory("USDCMock");
+    const lendingPoolFactory = await ethers.getContractFactory(
+      "LendingPoolMock"
+    );
+    aave = await (await ethers.getContractFactory("AaveMock")).deploy();
+    incentiveController = await (
+      await ethers.getContractFactory("IncentiveControllerMock")
+    ).deploy(aave.address);
+    usdc = await usdcFactory.deploy();
+    lendingPool = await lendingPoolFactory.deploy(usdc.address);
+    aaveUsdOracle = await (
+      await ethers.getContractFactory("AaveUSDMockOracle")
+    ).deploy();
+    dai = dao.daiAddress;
+    cdai = dao.cdaiAddress;
+    const uniswap = await deployUniswap(
+      dao.COMP,
+      await ethers.getContractAt("DAIMock", dai)
+    );
+    const router = uniswap.router;
+    await dao.setDAOAddress("UNISWAP_ROUTER", router.address);
+    await dao.setDAOAddress("AAVE", aave.address);
+    let swapHelper = await ethers
+      .getContractFactory("UniswapV2SwapHelper")
+      .then(_ => _.deploy());
+
+    stakingFactory = (await ethers
+      .getContractFactory("AaveStakingFactoryV2", {
+        libraries: { UniswapV2SwapHelper: swapHelper.address }
+      })
+      .then(_ => _.deploy())) as AaveStakingFactory;
+  });
+
+  it("should create proxy clone", async () => {
+    const res = await (
+      await stakingFactory.clone(usdc.address, ethers.constants.HashZero)
+    ).wait();
+    const log = res.events.find(_ => _.event === "Deployed");
+    const detAddress = await stakingFactory.predictAddress(
+      usdc.address,
+      ethers.constants.HashZero
+    );
+
+    expect(log).to.not.empty;
+    expect(log.args.proxy).to.equal(detAddress);
+    expect(log.args.token).to.equal(usdc.address);
+  });
+
+  it("should create and initialize clone", async () => {
+    const ns = await ethers
+      .getContractFactory("NameService")
+      .then(_ => _.deploy());
+    const res = await (
+      await stakingFactory.cloneAndInit(
+        usdc.address,
+        lendingPool.address,
+        dao.nameService.address,
+        5760,
+        stakingFactory.address,
+        incentiveController.address,
+        aaveUsdOracle.address,
+        [usdc.address, dai]
+      )
+    ).wait();
+    const log = res.events.find(_ => _.event === "Deployed");
+    const detAddress = await stakingFactory.predictAddress(
+      usdc.address,
+      ethers.utils.solidityKeccak256(
+        ["address", "address", "uint64", "address", "address", "address"],
+        [
+          lendingPool.address,
+          dao.nameService.address,
+          5760,
+          stakingFactory.address,
+          incentiveController.address,
+          aaveUsdOracle.address
+        ]
+      )
+    );
+    expect(log).to.not.empty;
+    expect(log.args.proxy).to.equal(detAddress);
+    expect(log.args.token).to.equal(usdc.address);
+
+    //check initialization
+    const staking: GoodAaveStaking = (await ethers.getContractAt(
+      "GoodAaveStaking",
+      detAddress
+    )) as GoodAaveStaking;
+    expect(await staking.iToken()).to.equal(lendingPool.address);
+    expect(await staking.token()).to.equal(usdc.address);
+    expect(await staking.name()).to.equal("GoodAaveStakingV2 aUSDC");
+    expect(await staking.symbol()).to.equal("gaUSDC");
+  });
+});

package/test/staking/UsdcAaveStaking.test.ts

@@ -29,6 +29,7 @@ describe("UsdcAaveStaking - staking with USDC mocks to AAVE interface", () => {
     lendingPool,
     setDAOAddress,
     genericCall,
+    goodReserve,
     goodAaveStakingFactory;
   before(async () => {
     [founder, staker, ...signers] = await ethers.getSigners();
@@ -55,8 +56,10 @@ describe("UsdcAaveStaking - staking with USDC mocks to AAVE interface", () => {
       marketMaker: mm,
       daiAddress,
       genericCall: gc,
-      COMP
+      COMP,
+      reserve
     } = await createDAO();
+    goodReserve = reserve;
     dai = await ethers.getContractAt("DAIMock", daiAddress);
     avatar = av;
     controller = ctrl;
@@ -275,6 +278,7 @@ describe("UsdcAaveStaking - staking with USDC mocks to AAVE interface", () => {
     );
     expect(currentGainsAfterEarnRewards[4]).to.be.equal(0); // stkAAVE rewards shouldnt count as gain
     expect(currentGainsAfterCollectInterest[4]).to.be.equal("0");
+    expect(await aave.balanceOf(goodReserve.address)).gt(0);
   });
   async function addLiquidity(
     token0: Contract,