@dhedge/v2-sdk 1.9.1 → 1.9.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dhedge/v2-sdk",
-  "version": "1.9.1",
+  "version": "1.9.2",
   "license": "MIT",
   "description": "🛠 An SDK for building applications on top of dHEDGE V2",
   "main": "dist/index.js",
@@ -20,9 +20,9 @@
     "prepare": "tsdx build",
     "size": "size-limit",
     "analyze": "size-limit --why",
-    "fork:polygon": "hardhat node --fork $(grep POLYGON_URL .env | cut -d '=' -f2)",
-    "fork:optimism": "hardhat node --fork $(grep OPTIMISM_URL .env | cut -d '=' -f2)",
-    "fork:arbitrum": "hardhat node --fork $(grep ARBITRUM_URL .env | cut -d '=' -f2)"
+    "fork:polygon": "hardhat node --port 8542 --fork $(grep POLYGON_URL .env | cut -d '=' -f2)",
+    "fork:optimism": "hardhat node --port 8544 --fork $(grep OPTIMISM_URL .env | cut -d '=' -f2)",
+    "fork:arbitrum": "hardhat node --port 8540 --fork $(grep ARBITRUM_URL .env | cut -d '=' -f2)"
   },
   "husky": {
     "hooks": {

package/src/entities/pool.ts

@@ -1,6 +1,5 @@
 /* eslint-disable @typescript-eslint/explicit-module-boundary-types */
 /* eslint-disable @typescript-eslint/no-explicit-any */
-import axios from "axios";
 import { Contract, ethers, Wallet, BigNumber } from "ethers";
 
 import IERC20 from "../abi/IERC20.json";
@@ -16,7 +15,6 @@ import IBalancerRewardsGauge from "../abi/IBalancerRewardsGauge.json";
 
 import {
   MaxUint128,
-  networkChainIdMap,
   nonfungiblePositionManagerAddress,
   routerAddress,
   stakingAddress,
@@ -42,7 +40,6 @@ import {
 import { FeeAmount } from "@uniswap/v3-sdk";
 import { getUniswapV3SwapTxData } from "../services/uniswap/V3Trade";
 import { getEasySwapperTxData } from "../services/toros/easySwapper";
-import { getOneInchProtocols } from "../services/oneInch/protocols";
 import { getAaveV3ClaimTxData } from "../services/aave/incentives";
 import {
   getVelodromeAddLiquidityTxData,
@@ -61,7 +58,7 @@ import {
 } from "../services/futures";
 import { getFuturesCancelOrderTxData } from "../services/futures/trade";
 import { getZeroExTradeTxData } from "../services/zeroEx/zeroExTrade";
-import { ApiError } from "../errors";
+import { getOneInchSwapTxData } from "../services/oneInch";
 
 export class Pool {
   public readonly poolLogic: Contract;
@@ -299,24 +296,13 @@ export class Pool {
         );
         break;
       case Dapp.ONEINCH:
-        const chainId = networkChainIdMap[this.network];
-        const protocols = await getOneInchProtocols(chainId);
-        if (!process.env.ONEINCH_API_URL)
-          throw new Error("ONEINCH_API_URL not configured in .env file");
-        const apiUrl = `${
-          process.env.ONEINCH_API_URL
-        }/${chainId}/swap?fromTokenAddress=${assetFrom}&toTokenAddress=${assetTo}&amount=${amountIn.toString()}&fromAddress=${
-          this.address
-        }&destReceiver=${
-          this.address
-        }&slippage=${slippage.toString()}&disableEstimate=true${protocols}`;
-        try {
-          const response = await axios.get(apiUrl);
-          swapTxData = response.data.tx.data;
-        } catch (e) {
-          throw new ApiError("Swap api request of 1inch failed");
-        }
-
+        swapTxData = await getOneInchSwapTxData(
+          this,
+          assetFrom,
+          assetTo,
+          amountIn,
+          slippage
+        );
         break;
       case Dapp.BALANCER:
         swapTxData = await this.utils.getBalancerSwapTx(

package/src/services/oneInch/index.ts

@@ -0,0 +1,33 @@
+/* eslint-disable @typescript-eslint/no-explicit-any */
+import axios from "axios";
+import { ApiError, ethers } from "../..";
+import { networkChainIdMap } from "../../config";
+import { Pool } from "../../entities";
+
+const oneInchBaseUrl = "https://api.1inch.dev/swap/v5.2/";
+
+export async function getOneInchSwapTxData(
+  pool: Pool,
+  assetFrom: string,
+  assetTo: string,
+  amountIn: ethers.BigNumber | string,
+  slippage: number
+): Promise<string> {
+  if (!process.env.ONEINCH_API_KEY)
+    throw new Error("ONEINCH_API_KEY not configured in .env file");
+
+  const chainId = networkChainIdMap[pool.network];
+  const apiUrl = `${oneInchBaseUrl}${chainId}/swap?src=${assetFrom}&dst=${assetTo}&amount=${amountIn.toString()}&from=${
+    pool.address
+  }&slippage=${slippage.toString()}&disableEstimate=true`;
+  try {
+    const response = await axios.get(apiUrl, {
+      headers: {
+        Authorization: `Bearer ${process.env.ONEINCH_API_KEY}`
+      }
+    });
+    return response.data.tx.data;
+  } catch (e) {
+    throw new ApiError("Swap api request of 1inch failed");
+  }
+}

package/src/test/oneInch.test.ts

@@ -3,44 +3,52 @@ import { Dhedge, Pool } from "..";
 import { routerAddress } from "../config";
 import { Dapp, Network } from "../types";
 import { CONTRACT_ADDRESS, MAX_AMOUNT, TEST_POOL } from "./constants";
+import { TestingRunParams, testingHelper } from "./utils/testingHelper";
 import { allowanceDelta, balanceDelta } from "./utils/token";
 
-import { wallet } from "./wallet";
+const testOneInch = ({ wallet, network }: TestingRunParams) => {
+  const USDC = CONTRACT_ADDRESS[network].USDC;
+  const WETH = CONTRACT_ADDRESS[network].WETH;
 
-// const network = Network.OPTIMISM;
-// const network = Network.POLYGON;
-const network = Network.ARBITRUM;
-const USDC = CONTRACT_ADDRESS[network].USDC;
-const WETH = CONTRACT_ADDRESS[network].WETH;
+  let dhedge: Dhedge;
+  let pool: Pool;
+  jest.setTimeout(100000);
 
-let dhedge: Dhedge;
-let pool: Pool;
-jest.setTimeout(100000);
+  describe(`pool on ${network}`, () => {
+    beforeAll(async () => {
+      dhedge = new Dhedge(wallet, network);
+      pool = await dhedge.loadPool(TEST_POOL[network]);
+    });
 
-describe("pool", () => {
-  beforeAll(async () => {
-    dhedge = new Dhedge(wallet, network);
-    pool = await dhedge.loadPool(TEST_POOL[network]);
-  });
+    it("approves unlimited USDC on 1Inch", async () => {
+      await pool.approve(Dapp.ONEINCH, USDC, MAX_AMOUNT);
+      const usdcAllowanceDelta = await allowanceDelta(
+        pool.address,
+        USDC,
+        routerAddress[network]["1inch"]!,
+        pool.signer
+      );
+      await expect(usdcAllowanceDelta.gt(0));
+    });
 
-  it("approves unlimited USDC on 1Inch", async () => {
-    await pool.approve(Dapp.ONEINCH, USDC, MAX_AMOUNT);
-    const usdcAllowanceDelta = await allowanceDelta(
-      pool.address,
-      USDC,
-      routerAddress[network]["1inch"]!,
-      pool.signer
-    );
-    await expect(usdcAllowanceDelta.gt(0));
+    it("trades 2 USDC into WETH on 1Inch", async () => {
+      await pool.trade(Dapp.ONEINCH, USDC, WETH, "2000000", 0.5);
+      const wethBalanceDelta = await balanceDelta(
+        pool.address,
+        WETH,
+        pool.signer
+      );
+      expect(wethBalanceDelta.gt(0));
+    });
   });
+};
 
-  it("trades 2 USDC into WETH on 1Inch", async () => {
-    await pool.trade(Dapp.ONEINCH, USDC, WETH, "2000000", 0.5);
-    const wethBalanceDelta = await balanceDelta(
-      pool.address,
-      WETH,
-      pool.signer
-    );
-    expect(wethBalanceDelta.gt(0));
-  });
+testingHelper({
+  network: Network.OPTIMISM,
+  testingRun: testOneInch
+});
+
+testingHelper({
+  network: Network.POLYGON,
+  testingRun: testOneInch
 });

package/src/test/utils/testingHelper.ts

@@ -0,0 +1,20 @@
+import { ethers } from "ethers";
+import { Network } from "../../types";
+import { getWallet } from "../wallet";
+
+export type TestingRunParams = {
+  network: Network;
+  wallet: ethers.Wallet;
+};
+
+type TestHelperParams = {
+  testingRun: (testingRunParams: TestingRunParams) => void;
+} & { network: Network };
+
+export const testingHelper = ({
+  network,
+  testingRun
+}: TestHelperParams): void => {
+  const wallet = getWallet(network);
+  testingRun({ network, wallet });
+};

package/src/test/wallet.ts

@@ -1,5 +1,5 @@
 import { ethers } from "ethers";
-
+import { Network } from "../types";
 // eslint-disable-next-line @typescript-eslint/no-var-requires
 require("dotenv").config();
 
@@ -25,3 +25,16 @@ export const wallet = new ethers.Wallet(
   process.env.PRIVATE_KEY as string,
   provider
 );
+
+export const networkPortMap = {
+  [Network.POLYGON]: 8542,
+  [Network.OPTIMISM]: 8544,
+  [Network.ARBITRUM]: 8540
+};
+
+export const getWallet = (network: Network): ethers.Wallet => {
+  const provider = new ethers.providers.JsonRpcProvider(
+    `http://127.0.0.1:${networkPortMap[network]}/`
+  );
+  return new ethers.Wallet(process.env.PRIVATE_KEY as string, provider);
+};

package/src/test/zeroEx.test.ts

@@ -3,44 +3,52 @@ import { Dhedge, Pool } from "..";
 import { routerAddress } from "../config";
 import { Dapp, Network } from "../types";
 import { CONTRACT_ADDRESS, MAX_AMOUNT, TEST_POOL } from "./constants";
+import { TestingRunParams, testingHelper } from "./utils/testingHelper";
 import { allowanceDelta, balanceDelta } from "./utils/token";
 
-import { wallet } from "./wallet";
+const testZeroEx = ({ wallet, network }: TestingRunParams) => {
+  const USDC = CONTRACT_ADDRESS[network].USDC;
+  const WETH = CONTRACT_ADDRESS[network].WETH;
 
-//const network = Network.OPTIMISM;
-const network = Network.POLYGON;
-// const network = Network.ARBITRUM;
-const USDC = CONTRACT_ADDRESS[network].USDC;
-const WETH = CONTRACT_ADDRESS[network].WETH;
+  let dhedge: Dhedge;
+  let pool: Pool;
+  jest.setTimeout(100000);
 
-let dhedge: Dhedge;
-let pool: Pool;
-jest.setTimeout(100000);
+  describe(`[${network}] 0x trade`, () => {
+    beforeAll(async () => {
+      dhedge = new Dhedge(wallet, network);
+      pool = await dhedge.loadPool(TEST_POOL[network]);
+    });
 
-describe("pool", () => {
-  beforeAll(async () => {
-    dhedge = new Dhedge(wallet, network);
-    pool = await dhedge.loadPool(TEST_POOL[network]);
-  });
+    it("approves unlimited USDC on 0x", async () => {
+      await pool.approve(Dapp.ZEROEX, USDC, MAX_AMOUNT);
+      const usdcAllowanceDelta = await allowanceDelta(
+        pool.address,
+        USDC,
+        routerAddress[network]["0x"]!,
+        pool.signer
+      );
+      await expect(usdcAllowanceDelta.gt(0));
+    });
 
-  it("approves unlimited USDC on 0x", async () => {
-    await pool.approve(Dapp.ZEROEX, USDC, MAX_AMOUNT);
-    const usdcAllowanceDelta = await allowanceDelta(
-      pool.address,
-      USDC,
-      routerAddress[network]["0x"]!,
-      pool.signer
-    );
-    await expect(usdcAllowanceDelta.gt(0));
+    it("trades 2 USDC into WETH on 0x", async () => {
+      await pool.trade(Dapp.ZEROEX, USDC, WETH, "2000000", 0.5);
+      const wethBalanceDelta = await balanceDelta(
+        pool.address,
+        WETH,
+        pool.signer
+      );
+      expect(wethBalanceDelta.gt(0));
+    });
   });
+};
 
-  it("trades 2 USDC into WETH on 0x", async () => {
-    await pool.trade(Dapp.ZEROEX, USDC, WETH, "2000000", 0.5);
-    const wethBalanceDelta = await balanceDelta(
-      pool.address,
-      WETH,
-      pool.signer
-    );
-    expect(wethBalanceDelta.gt(0));
-  });
+testingHelper({
+  network: Network.OPTIMISM,
+  testingRun: testZeroEx
+});
+
+testingHelper({
+  network: Network.POLYGON,
+  testingRun: testZeroEx
 });

package/dist/services/oneInch/protocols.d.ts

@@ -1 +0,0 @@
-export declare function getOneInchProtocols(chainId: number): Promise<string>;

package/src/services/oneInch/protocols.ts

@@ -1,17 +0,0 @@
-import axios from "axios";
-
-export async function getOneInchProtocols(chainId: number): Promise<string> {
-  try {
-    const response = await axios.get(
-      `https://api.1inch.io/v5.0/${chainId}/liquidity-sources`
-    );
-    const protocols = response.data.protocols.map((e: { id: string }) => e.id);
-    const filteredProtocols = protocols.filter(
-      (e: string) => !e.includes("PMM")
-    );
-
-    return `&protocols=${filteredProtocols.join(",")}`;
-  } catch {
-    return "";
-  }
-}