From c9b2208ce0e064051703c46fc0a723b776b81e25 Mon Sep 17 00:00:00 2001 From: q1q0 Date: Thu, 20 Apr 2023 17:52:24 -0400 Subject: [PATCH] add compound polygon reward test script --- .../compound/v3-rewards/helpers.sol | 2 +- .../connectors/compound/v3-rewards/main.sol | 4 +- .../compound/compound.iii.rewards.test.ts | 448 ++++++++++++++++++ test/polygon/compound/compound.iii.test.ts | 1 - 4 files changed, 451 insertions(+), 4 deletions(-) create mode 100644 test/polygon/compound/compound.iii.rewards.test.ts diff --git a/contracts/polygon/connectors/compound/v3-rewards/helpers.sol b/contracts/polygon/connectors/compound/v3-rewards/helpers.sol index 769eb8aa..6b3cd72a 100644 --- a/contracts/polygon/connectors/compound/v3-rewards/helpers.sol +++ b/contracts/polygon/connectors/compound/v3-rewards/helpers.sol @@ -9,5 +9,5 @@ import { CometRewards } from "./interface.sol"; abstract contract Helpers is DSMath, Basic { CometRewards internal constant cometRewards = - CometRewards(0x1B0e765F6224C21223AeA2af16c1C46E38885a40); + CometRewards(0x45939657d1CA34A8FA39A924B71D28Fe8431e581); } diff --git a/contracts/polygon/connectors/compound/v3-rewards/main.sol b/contracts/polygon/connectors/compound/v3-rewards/main.sol index 94404856..af702b29 100644 --- a/contracts/polygon/connectors/compound/v3-rewards/main.sol +++ b/contracts/polygon/connectors/compound/v3-rewards/main.sol @@ -63,6 +63,6 @@ abstract contract CompoundV3RewardsResolver is Events, Helpers { } } -contract ConnectV2CompoundV3Rewards is CompoundV3RewardsResolver { - string public name = "CompoundV3Rewards-v1.0"; +contract ConnectV2CompoundV3PolygonRewards is CompoundV3RewardsResolver { + string public name = "CompoundV3-Polygon-Rewards-v1.0"; } diff --git a/test/polygon/compound/compound.iii.rewards.test.ts b/test/polygon/compound/compound.iii.rewards.test.ts new file mode 100644 index 00000000..08e688b0 --- /dev/null +++ b/test/polygon/compound/compound.iii.rewards.test.ts @@ -0,0 +1,448 @@ +import { expect } from "chai"; +import hre from "hardhat"; +const { waffle, ethers } = hre; +const { provider, deployContract } = waffle; + +import { Signer, Contract } from "ethers"; +import { BigNumber } from "bignumber.js"; + +import { deployAndEnableConnector } from "../../../scripts/tests/deployAndEnableConnector"; +import { buildDSAv2 } from "../../../scripts/tests/buildDSAv2"; +import { encodeSpells } from "../../../scripts/tests/encodeSpells"; +import { getMasterSigner } from "../../../scripts/tests/getMasterSigner"; +import { addresses } from "../../../scripts/tests/polygon/addresses"; +import { tokens, tokenMapping } from "../../../scripts/tests/polygon/tokens"; +import { abis } from "../../../scripts/constant/abis"; +import { ConnectV2CompoundV3PolygonRewards__factory, ConnectV2CompoundV3Polygon__factory } from "../../../typechain"; + +describe("Compound III Rewards", function () { + let connectorName = "COMPOUND-V3-REWARDS-TEST-A"; + const market = "0xF25212E676D1F7F89Cd72fFEe66158f541246445"; + const rewards = "0x45939657d1CA34A8FA39A924B71D28Fe8431e581"; + const base = "0x2791Bca1f2de4661ED88A30C99A7a9449Aa84174"; + const account = "0xf827c3E5fD68e78aa092245D442398E12988901C"; + const wethWhale = "0xadbF1854e5883eB8aa7BAf50705338739e558E5b"; + const baseWhale = "0x72a53cdbbcc1b9efa39c834a540550e23463aacb"; + + const ABI = [ + "function balanceOf(address account) public view returns (uint256)", + "function approve(address spender, uint256 amount) external returns(bool)", + "function transfer(address recipient, uint256 amount) external returns (bool)" + ]; + const wethContract = new ethers.Contract(tokens.wmatic.address, ABI); + const baseContract = new ethers.Contract(base, ABI); + + const cometABI = [ + { + inputs: [ + { internalType: "address", name: "comet", type: "address" }, + { internalType: "address", name: "src", type: "address" }, + { internalType: "bool", name: "shouldAccrue", type: "bool" } + ], + name: "claim", + outputs: [], + stateMutability: "nonpayable", + type: "function" + }, + { + inputs: [ + { internalType: "address", name: "comet", type: "address" }, + { internalType: "address", name: "src", type: "address" }, + { internalType: "address", name: "to", type: "address" }, + { internalType: "bool", name: "shouldAccrue", type: "bool" } + ], + name: "claimTo", + outputs: [], + stateMutability: "nonpayable", + type: "function" + }, + { + inputs: [ + { internalType: "address", name: "comet", type: "address" }, + { internalType: "address", name: "account", type: "address" } + ], + name: "getRewardOwed", + outputs: [ + { + components: [ + { internalType: "address", name: "token", type: "address" }, + { internalType: "uint256", name: "owed", type: "uint256" } + ], + internalType: "struct CometRewards.RewardOwed", + name: "", + type: "tuple" + } + ], + stateMutability: "nonpayable", + type: "function" + }, + { + inputs: [{ internalType: "address", name: "", type: "address" }], + name: "rewardConfig", + outputs: [ + { internalType: "address", name: "token", type: "address" }, + { internalType: "uint64", name: "rescaleFactor", type: "uint64" }, + { internalType: "bool", name: "shouldUpscale", type: "bool" } + ], + stateMutability: "view", + type: "function" + }, + { + inputs: [ + { internalType: "address", name: "", type: "address" }, + { internalType: "address", name: "", type: "address" } + ], + name: "rewardsClaimed", + outputs: [{ internalType: "uint256", name: "", type: "uint256" }], + stateMutability: "view", + type: "function" + } + ]; + + const marketABI = [ + { + inputs: [{ internalType: "address", name: "account", type: "address" }], + name: "balanceOf", + outputs: [{ internalType: "uint256", name: "", type: "uint256" }], + stateMutability: "view", + type: "function" + }, + { + inputs: [{ internalType: "address", name: "account", type: "address" }], + name: "borrowBalanceOf", + outputs: [{ internalType: "uint256", name: "", type: "uint256" }], + stateMutability: "view", + type: "function" + }, + { + inputs: [], + name: "baseBorrowMin", + outputs: [{ internalType: "uint256", name: "", type: "uint256" }], + stateMutability: "view", + type: "function" + }, + { + inputs: [], + name: "baseMinForRewards", + outputs: [{ internalType: "uint256", name: "", type: "uint256" }], + stateMutability: "view", + type: "function" + }, + { + inputs: [], + name: "baseToken", + outputs: [{ internalType: "address", name: "", type: "address" }], + stateMutability: "view", + type: "function" + }, + { + inputs: [], + name: "decimals", + outputs: [{ internalType: "uint8", name: "", type: "uint8" }], + stateMutability: "view", + type: "function" + }, + { + inputs: [{ internalType: "address", name: "priceFeed", type: "address" }], + name: "getPrice", + outputs: [{ internalType: "uint256", name: "", type: "uint256" }], + stateMutability: "view", + type: "function" + }, + { + inputs: [ + { internalType: "address", name: "owner", type: "address" }, + { internalType: "address", name: "manager", type: "address" } + ], + name: "hasPermission", + outputs: [{ internalType: "bool", name: "", type: "bool" }], + stateMutability: "view", + type: "function" + }, + { + inputs: [], + name: "numAssets", + outputs: [{ internalType: "uint8", name: "", type: "uint8" }], + stateMutability: "view", + type: "function" + }, + { + inputs: [ + { internalType: "address", name: "asset", type: "address" }, + { internalType: "uint256", name: "baseAmount", type: "uint256" } + ], + name: "quoteCollateral", + outputs: [{ internalType: "uint256", name: "", type: "uint256" }], + stateMutability: "view", + type: "function" + }, + { + inputs: [{ internalType: "address", name: "", type: "address" }], + name: "userBasic", + outputs: [ + { internalType: "int104", name: "principal", type: "int104" }, + { internalType: "uint64", name: "baseTrackingIndex", type: "uint64" }, + { internalType: "uint64", name: "baseTrackingAccrued", type: "uint64" }, + { internalType: "uint16", name: "assetsIn", type: "uint16" }, + { internalType: "uint8", name: "_reserved", type: "uint8" } + ], + stateMutability: "view", + type: "function" + }, + { + inputs: [ + { internalType: "address", name: "", type: "address" }, + { internalType: "address", name: "", type: "address" } + ], + name: "userCollateral", + outputs: [ + { internalType: "uint128", name: "balance", type: "uint128" }, + { internalType: "uint128", name: "_reserved", type: "uint128" } + ], + stateMutability: "view", + type: "function" + } + ]; + + let dsaWallet0: any; + let dsaWallet1: any; + let wallet: any; + let dsa0Signer: any; + let masterSigner: Signer; + let instaConnectorsV2: Contract; + let connector: any; + let connectorMain: any; + let signer: any; + let wethSigner: any; + let usdcSigner: any; + + const cometReward = new ethers.Contract(rewards, cometABI); + const comet = new ethers.Contract(market, marketABI); + + const wallets = provider.getWallets(); + const [wallet0, wallet1, wallet2, wallet3] = wallets; + + before(async () => { + await hre.network.provider.request({ + method: "hardhat_reset", + params: [ + { + forking: { + //@ts-ignore + jsonRpcUrl: hre.config.networks.hardhat.forking.url, + // blockNumber: 15444500 + } + } + ] + }); + masterSigner = await getMasterSigner(); + await hre.network.provider.send("hardhat_setBalance", [ + await masterSigner.getAddress(), + "0x3635c9adc5de9fffff", + ]); + instaConnectorsV2 = await ethers.getContractAt(abis.core.connectorsV2, addresses.core.connectorsV2); + connector = await deployAndEnableConnector({ + connectorName, + contractArtifact: ConnectV2CompoundV3PolygonRewards__factory, + signer: masterSigner, + connectors: instaConnectorsV2 + }); + console.log("Connector address", connector.address); + + await hre.network.provider.send("hardhat_setBalance", [account, ethers.utils.parseEther("10").toHexString()]); + + await hre.network.provider.request({ + method: "hardhat_impersonateAccount", + params: [account] + }); + + signer = await ethers.getSigner(account); + + await hre.network.provider.request({ + method: "hardhat_impersonateAccount", + params: [wethWhale] + }); + wethSigner = await ethers.getSigner(wethWhale); + + await hre.network.provider.request({ + method: "hardhat_impersonateAccount", + params: [baseWhale] + }); + usdcSigner = await ethers.getSigner(baseWhale); + await hre.network.provider.send("hardhat_setBalance", [ + usdcSigner.address, + ethers.utils.parseEther("10").toHexString() + ]); + }); + + it("Should have contracts deployed.", async function () { + expect(!!instaConnectorsV2.address).to.be.true; + expect(!!connector.address).to.be.true; + expect(!!(await masterSigner.getAddress())).to.be.true; + }); + + describe("DSA wallet setup", function () { + it("Should build DSA v2", async function () { + dsaWallet0 = await buildDSAv2(wallet0.address); + expect(!!dsaWallet0.address).to.be.true; + dsaWallet1 = await buildDSAv2(wallet0.address); + expect(!!dsaWallet1.address).to.be.true; + wallet = await ethers.getSigner(dsaWallet0.address); + expect(!!dsaWallet1.address).to.be.true; + }); + + it("Deposit ETH into DSA wallet", async function () { + await hre.network.provider.request({ + method: "hardhat_impersonateAccount", + params: [wallet.address] + }); + + dsa0Signer = await ethers.getSigner(wallet.address); + await wallet0.sendTransaction({ + to: dsaWallet0.address, + value: ethers.utils.parseEther("10") + }); + expect(await ethers.provider.getBalance(dsaWallet0.address)).to.be.gte(ethers.utils.parseEther("10")); + await wallet0.sendTransaction({ + to: dsaWallet1.address, + value: ethers.utils.parseEther("10") + }); + expect(await ethers.provider.getBalance(dsaWallet1.address)).to.be.gte(ethers.utils.parseEther("10")); + }); + + it("should deposit USDC in dsa wallet", async function () { + await baseContract.connect(usdcSigner).transfer(dsaWallet0.address, ethers.utils.parseUnits("500", 6)); + + expect(await baseContract.connect(usdcSigner).balanceOf(dsaWallet0.address)).to.be.gte( + ethers.utils.parseUnits("500", 6) + ); + }); + }); + + describe("Main", function () { + //deposit asset + it("Should supply USDC in Compound V3", async function () { + connectorName = "COMPOUND-V3-TEST-A"; + connectorMain = await deployAndEnableConnector({ + connectorName, + contractArtifact: ConnectV2CompoundV3Polygon__factory, + signer: masterSigner, + connectors: instaConnectorsV2 + }); + const amount = ethers.utils.parseUnits("400", 6); + const spells = [ + { + connector: "COMPOUND-V3-TEST-A", + method: "deposit", + args: [market, base, amount, 0, 0] + } + ]; + + const tx = await dsaWallet0.connect(wallet0).cast(...encodeSpells(spells), wallet1.address); + const receipt = await tx.wait(); + expect(new BigNumber(await baseContract.connect(signer).balanceOf(dsaWallet0.address)).toFixed(0)).to.be.lte( + ethers.utils.parseUnits("100", 6) + ); + expect(new BigNumber(await comet.connect(signer).balanceOf(dsaWallet0.address)).toFixed(0)).to.be.gte( + ethers.utils.parseUnits("399", 6) + ); + }); + + let connector_ = "COMPOUND-V3-REWARDS-TEST-A"; + it("Should claim rewards", async function () { + let reward = (await cometReward.connect(signer).rewardConfig(market)).token; + let rewardInterface = new ethers.Contract(reward, ABI); + let owed_ = await cometReward.connect(signer).callStatic.getRewardOwed(market, dsaWallet0.address); + let amt: number = owed_.owed; + console.log(new BigNumber(amt).toFixed(0)); + const spells = [ + { + connector: connector_, + method: "claimRewards", + args: [market, 0] + } + ]; + + const tx = await dsaWallet0.connect(wallet0).cast(...encodeSpells(spells), wallet1.address); + const receipt = await tx.wait(); + expect(new BigNumber(await rewardInterface.connect(signer).balanceOf(dsaWallet0.address)).toFixed(0)).to.be.gte( + amt + ); + }); + + it("Should supply USDC in Compound V3 through dsaWallet0", async function () { + const amount = ethers.utils.parseUnits("100", 6); // 1 ETH + const spells = [ + { + connector: "COMPOUND-V3-TEST-A", + method: "deposit", + args: [market, base, amount, 0, 0] + } + ]; + + const tx = await dsaWallet0.connect(wallet0).cast(...encodeSpells(spells), wallet1.address); + const receipt = await tx.wait(); + expect(new BigNumber(await baseContract.connect(signer).balanceOf(dsaWallet0.address)).toFixed(0)).to.be.lte( + ethers.utils.parseUnits("0", 6) + ); + expect(new BigNumber(await comet.connect(signer).balanceOf(dsaWallet0.address)).toFixed(0)).to.be.gte( + ethers.utils.parseUnits("499", 6) + ); + }); + + it("Should claim rewards to dsa1", async function () { + let reward = (await cometReward.connect(signer).rewardConfig(market)).token; + let rewardInterface = new ethers.Contract(reward, ABI); + let owed_ = await cometReward.connect(signer).callStatic.getRewardOwed(market, dsaWallet0.address); + let amt: number = owed_.owed; + + const spells = [ + { + connector: connector_, + method: "claimRewardsOnBehalfOf", + args: [market, dsaWallet0.address, dsaWallet1.address, 0] + } + ]; + + const tx = await dsaWallet0.connect(wallet0).cast(...encodeSpells(spells), wallet1.address); + const receipt = await tx.wait(); + expect(new BigNumber(await rewardInterface.connect(signer).balanceOf(dsaWallet1.address)).toFixed(0)).to.be.gte( + amt + ); + }); + + it("should allow manager for dsaWallet0's collateral and base", async function () { + const spells = [ + { + connector: connectorName, + method: "toggleAccountManager", + args: [market, dsaWallet1.address, true] + } + ]; + + const tx = await dsaWallet0.connect(wallet0).cast(...encodeSpells(spells), wallet1.address); + const receipt = await tx.wait(); + }); + + it("Should claim rewards to dsa1 using manager", async function () { + let reward = (await cometReward.connect(signer).rewardConfig(market)).token; + let rewardInterface = new ethers.Contract(reward, ABI); + let owed_ = await cometReward.connect(signer).callStatic.getRewardOwed(market, dsaWallet0.address); + let amt: number = owed_.owed; + + const spells = [ + { + connector: connector_, + method: "claimRewardsOnBehalfOf", + args: [market, dsaWallet0.address, dsaWallet1.address, 0] + } + ]; + + const tx = await dsaWallet1.connect(wallet0).cast(...encodeSpells(spells), wallet1.address); + const receipt = await tx.wait(); + expect(new BigNumber(await rewardInterface.connect(signer).balanceOf(dsaWallet1.address)).toFixed(0)).to.be.gte( + amt + ); + }); + }); +}); diff --git a/test/polygon/compound/compound.iii.test.ts b/test/polygon/compound/compound.iii.test.ts index dc8a2c46..f1daf2bc 100644 --- a/test/polygon/compound/compound.iii.test.ts +++ b/test/polygon/compound/compound.iii.test.ts @@ -15,7 +15,6 @@ import { tokens, tokenMapping } from "../../../scripts/tests/polygon/tokens"; import { abis } from "../../../scripts/constant/abis"; import { constants } from "../../../scripts/constant/constant"; import { ConnectV2CompoundV3Polygon__factory } from "../../../typechain"; -import { ConnectV2CompoundV3__factory } from "../../../typechain"; import { MaxUint256 } from "@uniswap/sdk-core"; describe("Compound III", async function () {