@gooddollar/goodprotocol 1.0.10 → 1.0.11

package/test/staking/CompoundStakingFactory.test.ts

@@ -4,7 +4,7 @@ import { expect } from "chai";
 import {
   CERC20,
   GoodCompoundStaking,
-  CompoundStakingFactory,
+  CompoundStakingFactory
 } from "../../types";
 import { createDAO, deployUniswap } from "../helpers";
 import { Contract } from "ethers";
@@ -46,33 +46,35 @@ describe("CompoundStakingFactory", () => {
     await dao.setDAOAddress("UNISWAP_ROUTER", router.address);
     let swapHelper = await ethers
       .getContractFactory("UniswapV2SwapHelper")
-      .then((_) => _.deploy());
+      .then(_ => _.deploy());
 
     stakingFactory = (await ethers
       .getContractFactory("CompoundStakingFactory", {
-        libraries: { UniswapV2SwapHelper: swapHelper.address },
+        libraries: { UniswapV2SwapHelper: swapHelper.address }
       })
-      .then((_) => _.deploy())) as CompoundStakingFactory;
+      .then(_ => _.deploy())) as CompoundStakingFactory;
   });
 
-  it("should create proxy clone", async () => {
-    const res = await (
-      await stakingFactory.clone(cdai, ethers.constants.HashZero)
-    ).wait();
-    const log = res.events.find((_) => _.event === "Deployed");
-    const detAddress = await stakingFactory.predictAddress(
-      cdai,
-      ethers.constants.HashZero
-    );
-    expect(log).to.not.empty;
-    expect(log.args.proxy).to.equal(detAddress);
-    expect(log.args.cToken).to.equal(cdai);
-  });
+  // it("should create proxy clone", async () => {
+  //   const res = await (
+  //     await stakingFactory.clone(cdai, ethers.constants.HashZero)
+  //   ).wait();
+  //   const log = res.events.find(_ => _.event === "Deployed");
+  //   const detAddress = await stakingFactory.predictAddress(
+  //     cdai,
+  //     ethers.constants.HashZero
+  //   );
+  //   expect(log).to.not.empty;
+  //   expect(log.args.proxy).to.equal(detAddress);
+  //   expect(log.args.cToken).to.equal(cdai);
+  // });
 
   it("should create and initialize clone", async () => {
     console.log(await dao.nameService.getAddress("UNISWAP_ROUTER"));
     const res = await (
-      await stakingFactory.cloneAndInit(
+      await stakingFactory[
+        "cloneAndInit(address,address,uint64,address,address,address[])"
+      ](
         cdai,
         dao.nameService.address,
         5760,
@@ -81,8 +83,9 @@ describe("CompoundStakingFactory", () => {
         []
       )
     ).wait();
-    const log = res.events.find((_) => _.event === "Deployed");
+    const log = res.events.find(_ => _.event === "Deployed");
     const detAddress = await stakingFactory.predictAddress(
+      await stakingFactory.impl(),
       cdai,
       ethers.utils.solidityKeccak256(
         ["address", "uint64", "address", "address[]"],
@@ -95,12 +98,12 @@ describe("CompoundStakingFactory", () => {
 
     //check initialization
     const staking: GoodCompoundStaking = (await ethers.getContractAt(
-      "GoodCompoundStaking",
+      "GoodCompoundStakingV2",
       detAddress
     )) as GoodCompoundStaking;
     expect(await staking.iToken()).to.equal(cdai);
     expect(await staking.token()).to.equal(dai);
-    expect(await staking.name()).to.equal("GoodCompoundStaking Compound DAI");
+    expect(await staking.name()).to.equal("GoodCompoundStakingV2 Compound DAI");
     expect(await staking.symbol()).to.equal("gcDAI");
   });
 });

package/test/staking/DifferentStakingTokens.test.ts

@@ -90,7 +90,9 @@ describe("Different decimals staking token", () => {
     goodDollar = await ethers.getContractAt("IGoodDollar", gd);
 
     tokenUsdOracleFactory = await ethers.getContractFactory("BatUSDMockOracle");
-    goodCompoundStakingFactory = await getStakingFactory("GoodCompoundStaking");
+    goodCompoundStakingFactory = await getStakingFactory(
+      "GoodCompoundStakingV2"
+    );
 
     tokenFactory = await ethers.getContractFactory("DecimalsMock");
     cTokenFactory = await ethers.getContractFactory("cDecimalsMock");

package/test/staking/DonationsStaking.test.ts

@@ -57,7 +57,9 @@ describe("DonationsStaking - DonationStaking contract that receives funds in ETH
     const goodFundManagerFactory = await ethers.getContractFactory(
       "GoodFundManager"
     );
-    goodCompoundStakingFactory = await getStakingFactory("GoodCompoundStaking");
+    goodCompoundStakingFactory = await getStakingFactory(
+      "GoodCompoundStakingV2"
+    );
 
     const daiFactory = await ethers.getContractFactory("DAIMock");
     let {

package/test/staking/GoodAaveStakingFactory.test.ts

@@ -50,36 +50,38 @@ describe("AaveStakingFactory", () => {
     await dao.setDAOAddress("AAVE", aave.address);
     let swapHelper = await ethers
       .getContractFactory("UniswapV2SwapHelper")
-      .then((_) => _.deploy());
+      .then(_ => _.deploy());
 
     stakingFactory = (await ethers
       .getContractFactory("AaveStakingFactory", {
-        libraries: { UniswapV2SwapHelper: swapHelper.address },
+        libraries: { UniswapV2SwapHelper: swapHelper.address }
       })
-      .then((_) => _.deploy())) as AaveStakingFactory;
+      .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
-    );
+  // 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);
-  });
+  //   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());
+      .then(_ => _.deploy());
     const res = await (
-      await stakingFactory.cloneAndInit(
+      await stakingFactory[
+        "cloneAndInit(address,address,address,uint64,address,address,address,address[])"
+      ](
         usdc.address,
         lendingPool.address,
         dao.nameService.address,
@@ -90,8 +92,9 @@ describe("AaveStakingFactory", () => {
         [usdc.address, dai]
       )
     ).wait();
-    const log = res.events.find((_) => _.event === "Deployed");
+    const log = res.events.find(_ => _.event === "Deployed");
     const detAddress = await stakingFactory.predictAddress(
+      await stakingFactory.impl(),
       usdc.address,
       ethers.utils.solidityKeccak256(
         ["address", "address", "uint64", "address", "address", "address"],
@@ -101,7 +104,7 @@ describe("AaveStakingFactory", () => {
           5760,
           stakingFactory.address,
           incentiveController.address,
-          aaveUsdOracle.address,
+          aaveUsdOracle.address
         ]
       )
     );
@@ -111,12 +114,12 @@ describe("AaveStakingFactory", () => {
 
     //check initialization
     const staking: GoodAaveStaking = (await ethers.getContractAt(
-      "GoodAaveStaking",
+      "GoodAaveStakingV2",
       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("GoodAaveStaking USDC");
-    expect(await staking.symbol()).to.equal("gUSDC");
+    expect(await staking.name()).to.equal("GoodAaveStakingV2 USDC");
+    expect(await staking.symbol()).to.equal("gaUSDC");
   });
 });

package/test/staking/SimpleDAIStaking.test.ts

@@ -97,7 +97,9 @@ describe("SimpleDAISTAking - staking with cDAI mocks", () => {
     );
     compUsdOracle = await compUsdOracleFactory.deploy();
 
-    goodCompoundStakingFactory = await getStakingFactory("GoodCompoundStaking");
+    goodCompoundStakingFactory = await getStakingFactory(
+      "GoodCompoundStakingV2"
+    );
 
     deployStaking = async (token, itoken) => {
       return goodCompoundStakingFactory.deploy().then(async contract => {
@@ -1256,16 +1258,6 @@ describe("SimpleDAISTAking - staking with cDAI mocks", () => {
     );
   });
 
-  it("should not withdraw interest if the recipient specified by the owner is the staking contract", async () => {
-    await advanceBlocks(BLOCK_INTERVAL);
-    await setDAOAddress("FUND_MANAGER", founder.address);
-    const error = await goodCompoundStaking
-      .collectUBIInterest(goodCompoundStaking.address)
-      .catch(e => e);
-    await setDAOAddress("FUND_MANAGER", goodFundManager.address);
-    expect(error.message).to.be.not.empty;
-  });
-
   it("should pause the contract", async () => {
     let encodedCall = goodCompoundStakingFactory.interface.encodeFunctionData(
       "pause",

package/test/staking/StakingRewards.test.ts

@@ -1,7 +1,7 @@
 import { ethers, upgrades } from "hardhat";
 import { BigNumber, Contract } from "ethers";
 import { expect } from "chai";
-import { GoodMarketMaker, GoodCompoundStaking } from "../../types";
+import { GoodMarketMaker } from "../../types";
 import {
   createDAO,
   increaseTime,
@@ -56,7 +56,9 @@ describe("StakingRewards - staking with cDAI mocks and get Rewards in GoodDollar
     const goodFundManagerFactory = await ethers.getContractFactory(
       "GoodFundManager"
     );
-    goodCompoundStakingFactory = await getStakingFactory("GoodCompoundStaking");
+    goodCompoundStakingFactory = await getStakingFactory(
+      "GoodCompoundStakingV2"
+    );
     goodCompoundStakingTestFactory = await getStakingFactory(
       "GoodCompoundStakingTest"
     );
@@ -307,11 +309,13 @@ describe("StakingRewards - staking with cDAI mocks and get Rewards in GoodDollar
     await dai
       .connect(staker)
       .approve(goodCompoundStaking.address, stakingAmount);
-    const totalEffectiveStakesBeforeStake =
-      await goodCompoundStaking.totalEffectiveStakes();
+    const totalEffectiveStakesBeforeStake = await goodCompoundStaking
+      .getStats()
+      .then(_ => _[3]);
     await goodCompoundStaking.connect(staker).stake(stakingAmount, 100, false);
-    const totalEffectiveStakesAfterStake =
-      await goodCompoundStaking.totalEffectiveStakes();
+    const totalEffectiveStakesAfterStake = await goodCompoundStaking
+      .getStats()
+      .then(_ => _[3]);
     await goodCompoundStaking
       .connect(staker)
       .withdrawStake(stakingAmount, false);
@@ -326,11 +330,13 @@ describe("StakingRewards - staking with cDAI mocks and get Rewards in GoodDollar
     await dai
       .connect(staker)
       .approve(goodCompoundStaking.address, stakingAmount);
-    const totalEffectiveStakesBeforeStake =
-      await goodCompoundStaking.totalEffectiveStakes();
+    const totalEffectiveStakesBeforeStake = await goodCompoundStaking
+      .getStats()
+      .then(_ => _[3]);
     await goodCompoundStaking.connect(staker).stake(stakingAmount, 0, false);
-    const totalEffectiveStakesAfterStake =
-      await goodCompoundStaking.totalEffectiveStakes();
+    const totalEffectiveStakesAfterStake = await goodCompoundStaking
+      .getStats()
+      .then(_ => _[3]);
     await goodCompoundStaking
       .connect(staker)
       .withdrawStake(stakingAmount, false);
@@ -1452,7 +1458,7 @@ describe("StakingRewards - staking with cDAI mocks and get Rewards in GoodDollar
     expect(activeContractsCount).to.be.equal(activeContractsCountAfterRemoved);
   });
   it("it should distribute rewards correctly when there is multiple stakers", async () => {
-    const simpleStaking1 = (await goodCompoundStakingTestFactory.deploy(
+    const simpleStaking1 = await goodCompoundStakingTestFactory.deploy(
       bat.address,
       cBat.address,
       nameService.address,
@@ -1462,7 +1468,7 @@ describe("StakingRewards - staking with cDAI mocks and get Rewards in GoodDollar
       batUsdOracle.address,
       compUsdOracle.address,
       [bat.address, dai.address]
-    )) as GoodCompoundStaking;
+    );
     const currentBlock = await ethers.provider.getBlockNumber();
     const rewardsPerBlock = BN.from("1000");
     let encodedData = goodFundManager.interface.encodeFunctionData(
@@ -1624,7 +1630,7 @@ describe("StakingRewards - staking with cDAI mocks and get Rewards in GoodDollar
     await genericCall(goodFundManager.address, encodedData, avatar, 0);
   });
   it("it should get staking reward even reward amount is too low", async () => {
-    const simpleStaking1 = (await goodCompoundStakingTestFactory.deploy(
+    const simpleStaking1 = await goodCompoundStakingTestFactory.deploy(
       bat.address,
       cBat.address,
       nameService.address,
@@ -1634,7 +1640,7 @@ describe("StakingRewards - staking with cDAI mocks and get Rewards in GoodDollar
       batUsdOracle.address,
       compUsdOracle.address,
       [bat.address, dai.address]
-    )) as GoodCompoundStaking;
+    );
 
     const currentBlock = await ethers.provider.getBlockNumber();
     const rewardsPerBlock = BN.from("100");

package/test/staking/SwapHelper.test.ts

@@ -46,7 +46,9 @@ describe("SwapHelper - Helper library for swap on the Uniswap", () => {
     const swapHelperTestFactory = await ethers.getContractFactory(
       "SwapHelperTest"
     );
-    goodCompoundStakingFactory = await getStakingFactory("GoodCompoundStaking");
+    goodCompoundStakingFactory = await getStakingFactory(
+      "GoodCompoundStakingV2"
+    );
     goodCompoundStakingTestFactory = await getStakingFactory(
       "GoodCompoundStakingTest"
     );
@@ -210,6 +212,7 @@ describe("SwapHelper - Helper library for swap on the Uniswap", () => {
       ["100", simpleStaking.address, 0, 10000, true]
     );
     await genericCall(goodFundManager.address, encodedData, avatar, 0);
+    console.log({ redeemedAmount, safeAmount });
     expect(reserve[0].sub(currentReserve[0])).to.be.lt(currentGains[1]);
     expect(currentReserve[0].sub(reserve[0])).to.be.equal(redeemedAmount);
   });

package/test/staking/UsdcAaveStaking.test.ts

@@ -8,7 +8,7 @@ import { createDAO, deployUniswap, getStakingFactory } from "../helpers";
 const BN = ethers.BigNumber;
 export const NULL_ADDRESS = ethers.constants.AddressZero;
 
-describe("UsdcAaveStaking - staking with USDC mocks to AAVE interface", () => {
+describe("UsdcAaveStakingV2 - staking with USDC mocks to AAVE interface", () => {
   let dai: Contract;
   let usdc: Contract;
   let pair: Contract, uniswapRouter: Contract;
@@ -29,7 +29,6 @@ describe("UsdcAaveStaking - staking with USDC mocks to AAVE interface", () => {
     lendingPool,
     setDAOAddress,
     genericCall,
-    goodReserve,
     goodAaveStakingFactory;
   before(async () => {
     [founder, staker, ...signers] = await ethers.getSigners();
@@ -39,7 +38,7 @@ describe("UsdcAaveStaking - staking with USDC mocks to AAVE interface", () => {
     const goodFundManagerFactory = await ethers.getContractFactory(
       "GoodFundManager"
     );
-    goodAaveStakingFactory = await getStakingFactory("GoodAaveStaking");
+    goodAaveStakingFactory = await getStakingFactory("GoodAaveStakingV2");
 
     const lendingPoolFactory = await ethers.getContractFactory(
       "LendingPoolMock"
@@ -56,10 +55,8 @@ describe("UsdcAaveStaking - staking with USDC mocks to AAVE interface", () => {
       marketMaker: mm,
       daiAddress,
       genericCall: gc,
-      COMP,
-      reserve
+      COMP
     } = await createDAO();
-    goodReserve = reserve;
     dai = await ethers.getContractAt("DAIMock", daiAddress);
     avatar = av;
     controller = ctrl;
@@ -240,8 +237,9 @@ describe("UsdcAaveStaking - staking with USDC mocks to AAVE interface", () => {
     expect(gdBalanceAfterCollectInterest.gt(gdBalanceBeforeCollectInterest));
   });
 
-  it("it should collectRewards while collecting interest from aToken if there some earned reward as stkAAVE", async () => {
+  it("it should collect stkAAVE to Avatar when collecting interest", async () => {
     const stakingAmount = ethers.utils.parseUnits("100", 6);
+    const avatarBalance = await aave.balanceOf(avatar);
     await goodAaveStaking.stake(stakingAmount, "0", false);
     const currentGainsAfterStake = await goodAaveStaking.currentGains(
       false,
@@ -278,7 +276,24 @@ 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);
+    expect(await aave.balanceOf(avatar)).gt(avatarBalance);
+  });
+
+  it("should be able to transfer staked tokens", async () => {
+    const stakingAmount = ethers.utils.parseUnits("100", 6);
+
+    await goodAaveStaking.connect(staker).stake(stakingAmount, 0, false);
+
+    await lendingPool.giveInterestToUser("1500", goodAaveStaking.address); // increase interest by calling giveInterestToUser
+
+    await expect(
+      goodAaveStaking
+        .connect(staker)
+        .transfer(signers[0].address, stakingAmount)
+    ).not.reverted;
+    expect(await goodAaveStaking.balanceOf(signers[0].address)).to.eq(
+      stakingAmount
+    );
   });
   async function addLiquidity(
     token0: Contract,

package/test/ubi/UBIScheme.e2e.test.ts

@@ -83,7 +83,7 @@ describe("UBIScheme - network e2e tests", () => {
       "GoodFundManager"
     );
     const goodCompoundStakingFactory = await getStakingFactory(
-      "GoodCompoundStaking"
+      "GoodCompoundStakingV2"
     );
     const deployedDAO = await createDAO();
     let {

package/test/utils/ProtocolUpgrade.test.ts

@@ -197,7 +197,7 @@ describe("ProtocolUpgrade - Upgrade old protocol contracts to new ones", () => {
       deployment["test-mainnet"].GoodReserveCDai
     );
     newStakingContract = await ethers.getContractAt(
-      "GoodCompoundStaking",
+      "GoodCompoundStakingV2",
       deployment["test-mainnet"].StakingContracts[0][0]
     );
     stakingAmountOfNewDonationStaking =

package/artifacts/contracts/staking/aave/AaveStakingFactoryV2.sol/AaveStakingFactoryV2.dbg.json

@@ -1,4 +0,0 @@
-{
-  "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../../build-info/432071a069fa44ffd3a7f92eee83d72e.json"
-}