Instadapp/dsa-connectors
1
0
Fork 0
mirror of https://github.com/Instadapp/dsa-connectors.git synced 2024-07-29 22:37:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

test update

Browse Source
This commit is contained in:
Richa-iitr 2022-09-02 03:08:14 +05:30
parent 866e3456e7
commit b5e05f353c
3 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
contracts/mainnet/connectors/compound/v3/helpers.sol
View File

@ -76,7 +76,6 @@ abstract contract Helpers is DSMath, Basic {
); );
amt_ = sub(finalBal, initialBal); amt_ = sub(finalBal, initialBal);
convertWethToEth(isEth, tokenContract, amt_);
if (params.from == address(0) || params.to == address(this)) if (params.from == address(0) || params.to == address(this))
convertWethToEth(isEth, tokenContract, amt_); convertWethToEth(isEth, tokenContract, amt_);

3
contracts/mainnet/connectors/compound/v3/main.sol
View File

@ -96,6 +96,7 @@ abstract contract CompoundV3Resolver is Events, Helpers {
market != address(0) && token != address(0), market != address(0) && token != address(0),
"invalid market/token address" "invalid market/token address"
); );
require(to != address(0), "invalid to address");
bool isEth = token == ethAddr || token == wethAddr; bool isEth = token == ethAddr || token == wethAddr;
address token_ = isEth ? wethAddr : token; address token_ = isEth ? wethAddr : token;
@ -156,6 +157,7 @@ abstract contract CompoundV3Resolver is Events, Helpers {
market != address(0) && token != address(0), market != address(0) && token != address(0),
"invalid market/token address" "invalid market/token address"
); );
require(to != address(0), "invalid to address");
bool isEth = token == ethAddr || token == wethAddr; bool isEth = token == ethAddr || token == wethAddr;
address token_ = isEth ? wethAddr : token; address token_ = isEth ? wethAddr : token;
@ -614,7 +616,6 @@ abstract contract CompoundV3Resolver is Events, Helpers {
TokenInterface tokenContract = TokenInterface(token_); TokenInterface tokenContract = TokenInterface(token_);
convertEthToWeth(isEth, tokenContract, amt_); convertEthToWeth(isEth, tokenContract, amt_);
approve(tokenContract, market, amt_); approve(tokenContract, market, amt_);
CometInterface(market).buyCollateral( CometInterface(market).buyCollateral(

27
test/mainnet/compound/compound.iii.test.ts
View File

@ -16,6 +16,7 @@ import { abis } from "../../../scripts/constant/abis";
import { constants } from "../../../scripts/constant/constant"; import { constants } from "../../../scripts/constant/constant";
import { ConnectV2CompoundV3__factory } from "../../../typechain"; import { ConnectV2CompoundV3__factory } from "../../../typechain";
import { MaxUint256 } from "@uniswap/sdk-core"; import { MaxUint256 } from "@uniswap/sdk-core";
import { USDC_OPTIMISTIC_KOVAN } from "@uniswap/smart-order-router";
describe("Compound III", function () { describe("Compound III", function () {
const connectorName = "COMPOUND-V3-TEST-A"; const connectorName = "COMPOUND-V3-TEST-A";
@ -367,13 +368,12 @@ describe("Compound III", function () {
it("should withdraw some ETH collateral", async function () { it("should withdraw some ETH collateral", async function () {
let initialBal = await ethers.provider.getBalance(dsaWallet0.address); let initialBal = await ethers.provider.getBalance(dsaWallet0.address);
console.log(initialBal); const amount_ = ethers.utils.parseEther("2");
const amount = ethers.utils.parseEther("2");
const spells = [ const spells = [
{ {
connector: connectorName, connector: connectorName,
method: "withdraw", method: "withdraw",
args: [market, tokens.eth.address, amount, 0, 0] args: [market, tokens.eth.address, amount_, 0, 0]
} }
]; ];
@ -382,7 +382,7 @@ describe("Compound III", function () {
expect((await comet.connect(signer).userCollateral(dsaWallet0.address, tokens.weth.address)).balance).to.be.gte( expect((await comet.connect(signer).userCollateral(dsaWallet0.address, tokens.weth.address)).balance).to.be.gte(
ethers.utils.parseEther("4") ethers.utils.parseEther("4")
); );
expect(await ethers.provider.getBalance(dsaWallet0.address)).to.be.gte(initialBal.add(2).toString()); expect(await ethers.provider.getBalance(dsaWallet0.address)).to.be.gte(initialBal.add(amount_).toString());
}); });
it("manager should be able to withdraw collateral from the position", async function () { it("manager should be able to withdraw collateral from the position", async function () {
@ -407,7 +407,7 @@ describe("Compound III", function () {
//dsawallet0 --> collateral 0eth, balance 7eth //dsawallet0 --> collateral 0eth, balance 7eth
//dsaWallet1 --> balance 7eth coll: 0eth //dsaWallet1 --> balance 7eth coll: 0eth
expect(await ethers.provider.getBalance(dsaWallet1.address)).to.be.gte(ethers.utils.parseEther("7")); expect(await wethContract.connect(wallet0).balanceOf(dsaWallet1.address)).to.be.gte(ethers.utils.parseEther("4"));
}); });
it("Should withdraw on behalf of from Compound", async function () { it("Should withdraw on behalf of from Compound", async function () {
@ -422,13 +422,14 @@ describe("Compound III", function () {
//dsaWallet1 --> balance 2eth coll: 5eth //dsaWallet1 --> balance 2eth coll: 5eth
const tx1 = await dsaWallet1.connect(wallet0).cast(...encodeSpells(spells1), wallet1.address); const tx1 = await dsaWallet1.connect(wallet0).cast(...encodeSpells(spells1), wallet1.address);
let initialBal = await ethers.provider.getBalance(dsaWallet0.address);
const amount = ethers.utils.parseEther("2"); const amount = ethers.utils.parseEther("2");
const spells = [ const spells = [
{ {
connector: connectorName, connector: connectorName,
method: "withdrawOnBehalf", method: "withdrawOnBehalf",
args: [market, dsaWallet0.address, dsaWallet0.address, amount, 0, 0] args: [market, tokens.eth.address, dsaWallet0.address, amount, 0, 0]
} }
]; ];
//dsawallet0 --> collateral 0eth, balance 9eth //dsawallet0 --> collateral 0eth, balance 9eth
@ -436,23 +437,23 @@ describe("Compound III", function () {
const tx = await dsaWallet1.connect(wallet0).cast(...encodeSpells(spells), wallet1.address); const tx = await dsaWallet1.connect(wallet0).cast(...encodeSpells(spells), wallet1.address);
const receipt = await tx.wait(); const receipt = await tx.wait();
expect(await ethers.provider.getBalance(dsaWallet0.address)).to.be.gte(ethers.utils.parseEther("9")); expect(await wethContract.connect(wallet0).balanceOf(dsaWallet0.address)).to.be.gte(amount);
expect( expect((await comet.connect(signer).userCollateral(dsaWallet1.address, tokens.weth.address)).balance).to.be.gte(
new BigNumber( ethers.utils.parseEther("3")
await comet.connect(signer).userCollateral(dsaWallet1.address, tokens.eth.address).balance );
).toFixed()
).to.be.equal(ethers.utils.parseEther("3"));
}); });
it("should buy collateral", async function () { it("should buy collateral", async function () {
//deposit 10 usdc(base token) to dsa //deposit 10 usdc(base token) to dsa
await baseContract.connect(signer).transfer(dsaWallet0.address, ethers.utils.parseUnits("10", 6)); await baseContract.connect(signer).transfer(dsaWallet0.address, ethers.utils.parseUnits("10", 6));
console.log(await baseContract.connect(signer).balanceOf(dsaWallet0.address));
//dsawallet0 --> collateral 0eth, balance 9eth 10usdc //dsawallet0 --> collateral 0eth, balance 9eth 10usdc
//dsaWallet1 --> balance 2eth coll: 3eth //dsaWallet1 --> balance 2eth coll: 3eth
const amount = ethers.utils.parseEther("1"); const amount = ethers.utils.parseEther("1");
const bal = await baseContract.connect(signer).balanceOf(dsaWallet0.address); const bal = await baseContract.connect(signer).balanceOf(dsaWallet0.address);
await baseContract.connect(wallet0).approve(market, bal);
const spells = [ const spells = [
{ {
connector: connectorName, connector: connectorName,
@ -502,7 +503,7 @@ describe("Compound III", function () {
{ {
connector: connectorName, connector: connectorName,
method: "depositFromUsingManager", method: "depositFromUsingManager",
args: [market, dsaWallet0.address, dsaWallet1.address, amount, 0, 0] args: [market, tokens.link.address, dsaWallet0.address, dsaWallet1.address, amount, 0, 0]
} }
]; ];