From d4bea002bbcbee182e8a58f6692ccedcfd58e240 Mon Sep 17 00:00:00 2001 From: bhavik Date: Wed, 29 Dec 2021 22:17:50 +0530 Subject: [PATCH 1/4] changed paraswap address + contract name --- contracts/polygon/connectors/paraswap/helpers.sol | 2 +- contracts/polygon/connectors/paraswap/main.sol | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/contracts/polygon/connectors/paraswap/helpers.sol b/contracts/polygon/connectors/paraswap/helpers.sol index 0f0bc803..8b55019b 100644 --- a/contracts/polygon/connectors/paraswap/helpers.sol +++ b/contracts/polygon/connectors/paraswap/helpers.sol @@ -16,7 +16,7 @@ abstract contract Helpers is DSMath, Basic { bytes callData; } - address internal constant paraswap = 0x90249ed4d69D70E709fFCd8beE2c5A566f65dADE; + address internal constant paraswap = 0xde33f4573bB315939a9D1E65522575E1a9fC3e74; function _swapHelper(SwapData memory swapData, uint256 wmaticAmt) internal returns (uint256 buyAmt) { TokenInterface buyToken = swapData.buyToken; diff --git a/contracts/polygon/connectors/paraswap/main.sol b/contracts/polygon/connectors/paraswap/main.sol index 2041c11c..aaaf63e1 100644 --- a/contracts/polygon/connectors/paraswap/main.sol +++ b/contracts/polygon/connectors/paraswap/main.sol @@ -50,6 +50,6 @@ abstract contract ParaswapResolver is Helpers { } } -contract ConnectV2Paraswap is ParaswapResolver { +contract ConnectV2ParaswapV5Polygon is ParaswapResolver { string public name = "Paraswap-v1"; } \ No newline at end of file From acc1d43af62780dff0332437445dbdc268ddb123 Mon Sep 17 00:00:00 2001 From: bhavik Date: Wed, 29 Dec 2021 23:06:04 +0530 Subject: [PATCH 2/4] changed paraswap address + change mapping name --- contracts/polygon/connectors/paraswap/helpers.sol | 2 +- contracts/polygon/connectors/paraswap/main.sol | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/contracts/polygon/connectors/paraswap/helpers.sol b/contracts/polygon/connectors/paraswap/helpers.sol index 8b55019b..9da20913 100644 --- a/contracts/polygon/connectors/paraswap/helpers.sol +++ b/contracts/polygon/connectors/paraswap/helpers.sol @@ -16,7 +16,7 @@ abstract contract Helpers is DSMath, Basic { bytes callData; } - address internal constant paraswap = 0xde33f4573bB315939a9D1E65522575E1a9fC3e74; + address internal constant paraswap = 0xDEF171Fe48CF0115B1d80b88dc8eAB59176FEe57; function _swapHelper(SwapData memory swapData, uint256 wmaticAmt) internal returns (uint256 buyAmt) { TokenInterface buyToken = swapData.buyToken; diff --git a/contracts/polygon/connectors/paraswap/main.sol b/contracts/polygon/connectors/paraswap/main.sol index aaaf63e1..76add82a 100644 --- a/contracts/polygon/connectors/paraswap/main.sol +++ b/contracts/polygon/connectors/paraswap/main.sol @@ -51,5 +51,5 @@ abstract contract ParaswapResolver is Helpers { } contract ConnectV2ParaswapV5Polygon is ParaswapResolver { - string public name = "Paraswap-v1"; + string public name = "Paraswap-v5"; } \ No newline at end of file From aa5d3c3f309c761829fb8db18a45f1c85794c2eb Mon Sep 17 00:00:00 2001 From: bhavik Date: Wed, 29 Dec 2021 23:52:21 +0530 Subject: [PATCH 3/4] added testcases --- scripts/deployment/deploy.ts | 5 +- test/polygon/paraswap/paraswap.test.ts | 172 +++++++++++++++++++++++++ 2 files changed, 175 insertions(+), 2 deletions(-) create mode 100644 test/polygon/paraswap/paraswap.test.ts diff --git a/scripts/deployment/deploy.ts b/scripts/deployment/deploy.ts index c32788fd..3a2826a3 100644 --- a/scripts/deployment/deploy.ts +++ b/scripts/deployment/deploy.ts @@ -18,9 +18,10 @@ async function main() { "GELATO-A": "ConnectV2Gelato", "MAKERDAO-A": "ConnectV2Maker", "UNISWAP-A": "ConnectV2UniswapV2", - "QUICKSWAP-A": "ConnectV2QuickswapPolygon" + "QUICKSWAP-A": "ConnectV2QuickswapPolygon", "UniswapV3-v1" : "ConnectV2UniswapV3Polygon", - "Uniswap-V3-Staker-v1.1" : "ConnectV2UniswapV3StakerPolygon" + "Uniswap-V3-Staker-v1.1" : "ConnectV2UniswapV3StakerPolygon", + "Paraswap-v5" : "ConnectV2ParaswapV5Polygon" }; const addressMapping: Record = {}; diff --git a/test/polygon/paraswap/paraswap.test.ts b/test/polygon/paraswap/paraswap.test.ts new file mode 100644 index 00000000..277767c5 --- /dev/null +++ b/test/polygon/paraswap/paraswap.test.ts @@ -0,0 +1,172 @@ +import hre from "hardhat"; +import { expect } from "chai"; +import { abis } from "../../../scripts/constant/abis"; +import { addresses } from "../../../scripts/tests/polygon/addresses"; +import { deployAndEnableConnector } from "../../../scripts/tests/deployAndEnableConnector"; +import { getMasterSigner } from "../../../scripts/tests/getMasterSigner"; +import { buildDSAv2 } from "../../../scripts/tests/buildDSAv2"; +import { + ConnectV2ParaswapV5Polygon__factory +} from "../../../typechain"; +import { encodeSpells } from "../../../scripts/tests/encodeSpells"; +import BigNumber from "bignumber.js"; +import axios from "axios"; +const { waffle, ethers } = hre; +const { provider, deployContract } = waffle; +describe("Paraswap", function() { + const connectorName = "paraswap-test"; + let dsaWallet0: any; + let masterSigner: any; + let instaConnectorsV2: any; + let connector: any; + const wallets = provider.getWallets(); + const [wallet0, wallet1] = wallets; + before(async () => { + await hre.network.provider.request({ + method: "hardhat_reset", + params: [ + { + forking: { + // @ts-ignore + jsonRpcUrl: hre.config.networks.hardhat.forking.url, + + }, + }, + ], + }); + masterSigner = await getMasterSigner(); + instaConnectorsV2 = await ethers.getContractAt( + abis.core.connectorsV2, + addresses.core.connectorsV2 + ); + connector = await deployAndEnableConnector({ + connectorName, + contractArtifact: ConnectV2ParaswapV5Polygon__factory, + signer: masterSigner, + connectors: instaConnectorsV2, + }); + console.log("Connector address", connector.address); + }); + it("Should have contracts deployed.", async function() { + expect(!!instaConnectorsV2.address).to.be.true; + expect(!!connector.address).to.be.true; + expect(!!masterSigner.address).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; + }); + it("Deposit ETH into DSA wallet", async function() { + 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") + ); + }); + }); + describe("Main", function() { + it("should swap successfully", async function() { + async function getArg() { + const slippage = 1; + /* matic -> USDT */ + const sellTokenAddress = "0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE"; // matic, decimals 18 + const sellTokenDecimals = 18; + const buyTokenAddress = "0xc2132d05d31c914a87c6611c10748aeb04b58e8f"; // USDT, decimals 6 + const buyTokenDecimals = 6; + const amount = 2; + const srcAmount = new BigNumber(amount) + .times(new BigNumber(10).pow(sellTokenDecimals)) + .toFixed(0); + const fromAddress = dsaWallet0.address; + let url = `https://apiv5.paraswap.io/prices/`; + let params = { + srcToken: sellTokenAddress, + destToken: buyTokenAddress, + srcDecimals: sellTokenDecimals, + destDecimals: buyTokenDecimals, + amount: srcAmount, + side: "SELL", + network: 137, + }; + + const priceRoute = await axios + .get(url, { params: params }) + .then((data) => data.data.priceRoute); + + let buyTokenAmount = priceRoute.destAmount; + let minAmount = new BigNumber(priceRoute.destAmount) + .times(1 - slippage / 100) + .toFixed(0); + + let txConfig = { + priceRoute: priceRoute, + srcToken: sellTokenAddress, + destToken: buyTokenAddress, + srcDecimals: sellTokenDecimals, + destDecimals: buyTokenDecimals, + srcAmount: srcAmount, + destAmount: minAmount, + userAddress: fromAddress, + }; + let url2 = "https://apiv5.paraswap.io/transactions/137?ignoreChecks=true"; + const calldata = await axios + .post(url2, txConfig) + .then((data) => data.data.data); + // console.log(calldata); + + function caculateUnitAmt( + buyAmount: any, + sellAmount: any, + buyDecimal: any, + sellDecimal: any, + maxSlippage: any + ) { + let unitAmt: any; + unitAmt = new BigNumber(buyAmount) + .dividedBy(10 ** buyDecimal) + .dividedBy(new BigNumber(sellAmount).dividedBy(10 ** sellDecimal)); + unitAmt = unitAmt.multipliedBy((100 - maxSlippage) / 100); + unitAmt = unitAmt.multipliedBy(1e18).toFixed(0); + return unitAmt; + } + + let unitAmt = caculateUnitAmt( + buyTokenAmount, + srcAmount, + buyTokenDecimals, + sellTokenDecimals, + 1 + ); + + return [ + buyTokenAddress, + sellTokenAddress, + srcAmount, + unitAmt, + calldata, + 0, + ]; + } + let arg = await getArg(); + const spells = [ + { + connector: connectorName, + method: "swap", + args: arg, + }, + ]; + const tx = await dsaWallet0 + .connect(wallet0) + .cast(...encodeSpells(spells), wallet1.address); + const receipt = await tx.wait(); + + expect(await ethers.provider.getBalance(dsaWallet0.address)).to.be.lte( + ethers.utils.parseEther("8") + ); + }); + }); +}); \ No newline at end of file From a48ab3c0b317d08c93af6dc0e30e42268bbc3116 Mon Sep 17 00:00:00 2001 From: bhavik Date: Thu, 30 Dec 2021 12:15:18 +0530 Subject: [PATCH 4/4] tests: minor fixes --- test/polygon/paraswap/paraswap.test.ts | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/test/polygon/paraswap/paraswap.test.ts b/test/polygon/paraswap/paraswap.test.ts index 277767c5..d1bd8f04 100644 --- a/test/polygon/paraswap/paraswap.test.ts +++ b/test/polygon/paraswap/paraswap.test.ts @@ -11,13 +11,15 @@ import { import { encodeSpells } from "../../../scripts/tests/encodeSpells"; import BigNumber from "bignumber.js"; import axios from "axios"; +// import { Signer } from "ethers"; const { waffle, ethers } = hre; const { provider, deployContract } = waffle; +import type { Signer, Contract } from "ethers"; describe("Paraswap", function() { const connectorName = "paraswap-test"; let dsaWallet0: any; - let masterSigner: any; - let instaConnectorsV2: any; + let masterSigner: Signer; + let instaConnectorsV2: Contract; let connector: any; const wallets = provider.getWallets(); const [wallet0, wallet1] = wallets; @@ -29,7 +31,6 @@ describe("Paraswap", function() { forking: { // @ts-ignore jsonRpcUrl: hre.config.networks.hardhat.forking.url, - }, }, ], @@ -50,7 +51,7 @@ describe("Paraswap", function() { it("Should have contracts deployed.", async function() { expect(!!instaConnectorsV2.address).to.be.true; expect(!!connector.address).to.be.true; - expect(!!masterSigner.address).to.be.true; + expect(!!masterSigner.getAddress()).to.be.true; }); describe("DSA wallet setup", function() { it("Should build DSA v2", async function() { @@ -93,9 +94,9 @@ describe("Paraswap", function() { network: 137, }; - const priceRoute = await axios - .get(url, { params: params }) - .then((data) => data.data.priceRoute); + const priceRoute = (await axios + .get(url, { params: params })).data.priceRoute + let buyTokenAmount = priceRoute.destAmount; let minAmount = new BigNumber(priceRoute.destAmount) @@ -113,10 +114,8 @@ describe("Paraswap", function() { userAddress: fromAddress, }; let url2 = "https://apiv5.paraswap.io/transactions/137?ignoreChecks=true"; - const calldata = await axios - .post(url2, txConfig) - .then((data) => data.data.data); - // console.log(calldata); + const calldata = (await axios + .post(url2, txConfig)).data.data function caculateUnitAmt( buyAmount: any,