@dhedge/v2-sdk 1.11.0 → 2.0.0

package/src/test/pendle.test.ts

@@ -8,8 +8,7 @@ import {
   TestingRunParams,
   setTokenAmount,
   setUSDCAmount,
-  testingHelper,
-  wait
+  testingHelper
 } from "./utils/testingHelper";
 
 import { getTxOptions } from "./txOptions";
@@ -19,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 = "0xb33808ea0e883138680ba29311a220a7377cdb92";
   const PTweETH_matured = "0xe2b2d203577c7cb3d043e89ccf90b5e24d19b66f";
 
   let dhedge: Dhedge;
@@ -54,33 +53,62 @@ 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);
+    //   const PTweEthBalance = await pool.utils.getBalance(PTweETH, pool.address);
+    //   console.log("PTweEthBalance", PTweEthBalance.toString());
+    //   await wait(3);
+    //   await pool.trade(
+    //     Dapp.PENDLE,
+    //     PTweETH,
+    //     weETH,
+    //     PTweEthBalance,
+    //     0.5,
+    //     await getTxOptions(network)
+    //   );
+    //   const weEthBalanceDelta = await balanceDelta(
+    //     pool.address,
+    //     weETH,
+    //     pool.signer
+    //   );
+    //   expect(weEthBalanceDelta.gt(0));
+    // });
 
-    it("swaps PTweETH to weETH on Pendle", async () => {
-      await pool.approve(Dapp.PENDLE, PTweETH, MAX_AMOUNT);
-      const PTweEthBalance = await pool.utils.getBalance(PTweETH, pool.address);
-      console.log("PTweEthBalance", PTweEthBalance.toString());
-      await wait(3);
+    it("exit matured PTweETH to weETH on Pendle", async () => {
+      await setTokenAmount({
+        amount: new BigNumber(1).times(1e18).toString(),
+        provider,
+        tokenAddress: PTweETH_matured,
+        slot: 0,
+        userAddress: pool.address
+      });
+      await pool.approve(Dapp.PENDLE, PTweETH_matured, MAX_AMOUNT);
+      const PTweEthBalance = await pool.utils.getBalance(
+        PTweETH_matured,
+        pool.address
+      );
       await pool.trade(
         Dapp.PENDLE,
-        PTweETH,
+        PTweETH_matured,
         weETH,
         PTweEthBalance,
         0.5,
@@ -91,7 +119,7 @@ const testPendle = ({ wallet, network, provider }: TestingRunParams) => {
         weETH,
         pool.signer
       );
-      expect(weEthBalanceDelta.gt(0));
+      expect(weEthBalanceDelta.eq(PTweEthBalance));
     });
 
     it("exit matured PTweETH to weETH on Pendle", async () => {
@@ -107,21 +135,19 @@ const testPendle = ({ wallet, network, provider }: TestingRunParams) => {
         PTweETH_matured,
         pool.address
       );
-      await wait(3);
-      await pool.trade(
+      const result = await pool.trade(
         Dapp.PENDLE,
         PTweETH_matured,
         weETH,
         PTweEthBalance,
         0.5,
-        await getTxOptions(network)
-      );
-      const weEthBalanceDelta = await balanceDelta(
-        pool.address,
-        weETH,
-        pool.signer
+        await getTxOptions(network),
+        true
       );
-      expect(weEthBalanceDelta.eq(PTweEthBalance));
+
+      expect(result.gas).not.toBeNull();
+      expect(result.minAmountOut).not.toBeNull();
+      expect(result.gasEstimationError).toBeNull();
     });
   });
 };

package/src/utils/contract.ts

@@ -101,17 +101,43 @@ export const getPoolTxOrGasEstimate = async (
 ): Promise<any> => {
   if (pool.isDhedge) {
     if (estimateGas) {
-      return await pool.poolLogic.estimateGas.execTransaction(
-        args[0],
-        args[1],
-        args[2]
-      );
+      let gas = null;
+      let gasEstimationError = null;
+      try {
+        gas = await pool.poolLogic.estimateGas.execTransaction(
+          args[0],
+          args[1],
+          args[2]
+        );
+      } catch (e) {
+        gasEstimationError = e;
+      }
+      return {
+        gas,
+        txData: args[1],
+        to: args[0],
+        gasEstimationError,
+        minAmountOut: args[3] || null
+      };
     } else {
       return await pool.poolLogic.execTransaction(args[0], args[1], args[2]);
     }
   } else {
     if (estimateGas) {
-      return await pool.signer.estimateGas({ to: args[0], data: args[1] });
+      let gas = null;
+      let gasEstimationError = null;
+      try {
+        gas = await pool.signer.estimateGas({ to: args[0], data: args[1] });
+      } catch (e) {
+        gasEstimationError = e;
+      }
+      return {
+        gas,
+        txData: args[1],
+        to: args[0],
+        gasEstimationError,
+        minAmountOut: args[3] || null
+      };
     } else {
       return await pool.signer.sendTransaction({
         to: args[0],