@gooddollar/goodprotocol 1.0.8 → 1.0.11

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;
@@ -38,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"
@@ -237,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,
@@ -275,6 +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(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 =