@dhedge/v2-sdk 2.1.0 → 2.1.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dhedge/v2-sdk",
-  "version": "2.1.0",
+  "version": "2.1.2",
   "license": "MIT",
   "description": "🛠 An SDK for building applications on top of dHEDGE V2",
   "main": "dist/index.js",

package/src/services/kyberSwap/index.ts

@@ -20,7 +20,10 @@ export async function getKyberSwapTxData(
     const quoteResult = await axios.get(
       `${kyberBaseUrl}/${pool.network}/api/v1/routes`,
       {
-        params
+        params,
+        headers: {
+          "x-client-id": "dHEDGE"
+        }
       }
     );
 
@@ -33,7 +36,12 @@ export async function getKyberSwapTxData(
 
     const buildResult = await axios.post(
       `${kyberBaseUrl}/${pool.network}/api/v1/route/build`,
-      buildParams
+      buildParams,
+      {
+        headers: {
+          "x-client-id": "dHEDGE"
+        }
+      }
     );
 
     return {

package/src/services/pendle/index.ts

@@ -8,7 +8,7 @@ import PTAbi from "../../abi/pendle/PT.json";
 import SYAbi from "../../abi/pendle/SY.json";
 import BigNumber from "bignumber.js";
 
-const pendleBaseUrl = "https://api-v2.pendle.finance/core/v1";
+const pendleBaseUrl = "https://api-v2.pendle.finance/core";
 
 export async function getPendleSwapTxData(
   pool: Pool,
@@ -41,7 +41,7 @@ export async function getPendleSwapTxData(
   const market = await getMarket(pool, tokenIn, tokenOut);
   try {
     const swapResult = await axios.get(
-      `${pendleBaseUrl}/sdk/${
+      `${pendleBaseUrl}/v2/sdk/${
         networkChainIdMap[pool.network]
       }/markets/${market}/swap`,
       { params }
@@ -70,9 +70,10 @@ export async function getMarket(
   const networkId = networkChainIdMap[pool.network];
   let marketResult;
   try {
-    marketResult = await axios.get(
-      `${pendleBaseUrl}/${networkId}/markets/active`
-    );
+    const params = { isActive: true, chainId: networkId };
+    marketResult = await axios.get(`${pendleBaseUrl}/v1/markets/all`, {
+      params
+    });
   } catch (e) {
     console.error("Error in Pendle API request:", e);
     throw new ApiError("Pendle api request failed");
@@ -103,9 +104,10 @@ const checkExitPostExpPT = async (
   const networkId = networkChainIdMap[pool.network];
   let inactiveMarketResult;
   try {
-    inactiveMarketResult = await axios.get(
-      `${pendleBaseUrl}/${networkId}/markets/inactive`
-    );
+    const params = { isActive: false, chainId: networkId };
+    inactiveMarketResult = await axios.get(`${pendleBaseUrl}/v1/markets/all`, {
+      params
+    });
   } catch (e) {
     console.error("Error in Pendle API request:", e);
     throw new ApiError("Pendle api request failed");

package/src/test/kyberSwap.test.ts

@@ -4,14 +4,20 @@ import { Dhedge, Pool } from "..";
 
 import { Dapp, Network } from "../types";
 import { CONTRACT_ADDRESS, MAX_AMOUNT, TEST_POOL } from "./constants";
-import { TestingRunParams, testingHelper, wait } from "./utils/testingHelper";
+import {
+  TestingRunParams,
+  setUSDCAmount,
+  testingHelper,
+  wait
+} from "./utils/testingHelper";
 
 import { allowanceDelta, balanceDelta } from "./utils/token";
 import { routerAddress } from "../config";
+import BigNumber from "bignumber.js";
 
-const testKyberSwap = ({ wallet, network }: TestingRunParams) => {
-  const USDT = CONTRACT_ADDRESS[network].USDT;
-  const USDE = CONTRACT_ADDRESS[network].USDE;
+const testKyberSwap = ({ wallet, network, provider }: TestingRunParams) => {
+  const USDC = CONTRACT_ADDRESS[network].USDC;
+  const WETH = CONTRACT_ADDRESS[network].WETH;
 
   let dhedge: Dhedge;
   let pool: Pool;
@@ -22,38 +28,38 @@ const testKyberSwap = ({ wallet, network }: TestingRunParams) => {
       dhedge = new Dhedge(wallet, network);
       pool = await dhedge.loadPool(TEST_POOL[network]);
       // top up gas
-      // await provider.send("hardhat_setBalance", [
-      //   wallet.address,
-      //   "0x10000000000000000"
-      // ]);
-      // await provider.send("evm_mine", []);
-      // // top up USDC
-      // await setUSDCAmount({
-      //   amount: new BigNumber(2).times(1e6).toFixed(0),
-      //   userAddress: pool.address,
-      //   network,
-      //   provider
-      // });
+      await provider.send("hardhat_setBalance", [
+        wallet.address,
+        "0x10000000000000000"
+      ]);
+      await provider.send("evm_mine", []);
+      // top up USDC
+      await setUSDCAmount({
+        amount: new BigNumber(2).times(1e6).toFixed(0),
+        userAddress: pool.address,
+        network,
+        provider
+      });
     });
 
-    it("approves unlimited USDT on KyberSwap", async () => {
-      await pool.approve(Dapp.KYBERSWAP, USDT, MAX_AMOUNT);
-      const usdtAllowanceDelta = await allowanceDelta(
+    it("approves unlimited USDC on KyberSwap", async () => {
+      await pool.approve(Dapp.KYBERSWAP, USDC, MAX_AMOUNT);
+      const usdcAllowanceDelta = await allowanceDelta(
         pool.address,
-        USDT,
+        USDC,
         routerAddress[network]["kyberswap"]!,
         pool.signer
       );
-      await expect(usdtAllowanceDelta.gt(0));
+      await expect(usdcAllowanceDelta.gt(0));
     });
 
-    it("gets only amount and txData for 2 USDT into WETH on KyberSwap", async () => {
-      const usdtBalance = await pool.utils.getBalance(USDT, pool.address);
+    it("gets only amount and txData for 2 USDC into WETH on KyberSwap", async () => {
+      const usdcBalance = await pool.utils.getBalance(USDC, pool.address);
       const result = await pool.trade(
         Dapp.KYBERSWAP,
-        USDT,
-        USDE,
-        usdtBalance,
+        USDC,
+        WETH,
+        usdcBalance,
         1,
         null,
         { estimateGas: false, onlyGetTxData: true }
@@ -62,31 +68,31 @@ const testKyberSwap = ({ wallet, network }: TestingRunParams) => {
       expect(result.minAmountOut).not.toBeNull();
     });
 
-    it("trades USDT balance into USDE on KyberSwap", async () => {
+    it("trades USDC balance into WETH on KyberSwap", async () => {
       await wait(1);
-      const usdtBalance = await pool.utils.getBalance(USDT, pool.address);
-      await pool.trade(Dapp.KYBERSWAP, USDT, USDE, usdtBalance, 1);
-      const usdeBalanceDelta = await balanceDelta(
+      const usdcBalance = await pool.utils.getBalance(USDC, pool.address);
+      await pool.trade(Dapp.KYBERSWAP, USDC, WETH, usdcBalance, 1);
+      const wethBalanceDelta = await balanceDelta(
         pool.address,
-        USDE,
+        WETH,
         pool.signer
       );
-      expect(usdeBalanceDelta.gt(0));
+      expect(wethBalanceDelta.gt(0));
     });
   });
 };
 
+// testingHelper({
+//   network: Network.PLASMA,
+//   onFork: false,
+//   testingRun: testKyberSwap
+// });
+
 testingHelper({
-  network: Network.PLASMA,
-  onFork: false,
+  network: Network.ARBITRUM,
   testingRun: testKyberSwap
 });
 
-// testingHelper({
-//   network: Network.ARBITRUM,
-//   testingRun: testOdos
-// });
-
 // testingHelper({
 //   network: Network.POLYGON,
 //   onFork: false,

package/src/test/pendle.test.ts

@@ -18,7 +18,7 @@ import { balanceDelta } from "./utils/token";
 const testPendle = ({ wallet, network, provider }: TestingRunParams) => {
   const USDC = CONTRACT_ADDRESS[network].USDC;
   const weETH = "0x35751007a407ca6feffe80b3cb397736d2cf4dbe";
-  // const PTweETH = "0xb33808ea0e883138680ba29311a220a7377cdb92";
+  const PTweETH = "0xab7f3837e6e721abbc826927b655180af6a04388";
   const PTweETH_matured = "0xe2b2d203577c7cb3d043e89ccf90b5e24d19b66f";
 
   let dhedge: Dhedge;
@@ -53,24 +53,24 @@ const testPendle = ({ wallet, network, provider }: TestingRunParams) => {
       );
     });
 
-    // it("swaps weETH to PTweETH on Pendle", async () => {
-    //   await pool.approve(Dapp.PENDLE, weETH, MAX_AMOUNT);
-    //   const weEthBalance = await pool.utils.getBalance(weETH, pool.address);
-    //   await pool.trade(
-    //     Dapp.PENDLE,
-    //     weETH,
-    //     PTweETH,
-    //     weEthBalance,
-    //     0.5,
-    //     await getTxOptions(network)
-    //   );
-    //   const ptWeEthBalanceDelta = await balanceDelta(
-    //     pool.address,
-    //     PTweETH,
-    //     pool.signer
-    //   );
-    //   expect(ptWeEthBalanceDelta.gt(0));
-    // });
+    it("swaps weETH to PTweETH on Pendle", async () => {
+      await pool.approve(Dapp.PENDLE, weETH, MAX_AMOUNT);
+      const weEthBalance = await pool.utils.getBalance(weETH, pool.address);
+      await pool.trade(
+        Dapp.PENDLE,
+        weETH,
+        PTweETH,
+        weEthBalance,
+        0.5,
+        await getTxOptions(network)
+      );
+      const ptWeEthBalanceDelta = await balanceDelta(
+        pool.address,
+        PTweETH,
+        pool.signer
+      );
+      expect(ptWeEthBalanceDelta.gt(0));
+    });
 
     // it("swaps PTweETH to weETH on Pendle", async () => {
     //   await pool.approve(Dapp.PENDLE, PTweETH, MAX_AMOUNT);