@dhedge/v2-sdk 1.11.1 → 2.0.0

package/dist/services/odos/index.d.ts

@@ -1,3 +1,6 @@
 import { ethers } from "../..";
 import { Pool } from "../../entities";
-export declare function getOdosSwapTxData(pool: Pool, assetFrom: string, assetTo: string, amountIn: ethers.BigNumber | string, slippage: number): Promise<string>;
+export declare function getOdosSwapTxData(pool: Pool, assetFrom: string, assetTo: string, amountIn: ethers.BigNumber | string, slippage: number): Promise<{
+    swapTxData: string;
+    minAmountOut: string;
+}>;

package/dist/services/pendle/index.d.ts

@@ -1,4 +1,7 @@
 import { ethers } from "../..";
 import { Pool } from "../../entities";
-export declare function getPendleSwapTxData(pool: Pool, tokenIn: string, tokenOut: string, amountIn: ethers.BigNumber | string, slippage: number): Promise<string>;
+export declare function getPendleSwapTxData(pool: Pool, tokenIn: string, tokenOut: string, amountIn: ethers.BigNumber | string, slippage: number): Promise<{
+    swapTxData: string;
+    minAmountOut: string | null;
+}>;
 export declare function getMarket(pool: Pool, tokenIn: string, tokenOut: string): Promise<string>;

package/dist/v2-sdk.cjs.development.js

@@ -16129,68 +16129,108 @@ function _call() {
 }
 var getPoolTxOrGasEstimate = /*#__PURE__*/function () {
   var _ref = /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/runtime_1.mark(function _callee2(pool, args, estimateGas) {
+    var gas, gasEstimationError, _gas, _gasEstimationError;
+
     return runtime_1.wrap(function _callee2$(_context2) {
       while (1) {
         switch (_context2.prev = _context2.next) {
           case 0:
             if (!pool.isDhedge) {
-              _context2.next = 12;
+              _context2.next = 21;
               break;
             }
 
             if (!estimateGas) {
-              _context2.next = 7;
+              _context2.next = 16;
               break;
             }
 
-            _context2.next = 4;
+            gas = null;
+            gasEstimationError = null;
+            _context2.prev = 4;
+            _context2.next = 7;
             return pool.poolLogic.estimateGas.execTransaction(args[0], args[1], args[2]);
 
-          case 4:
-            return _context2.abrupt("return", _context2.sent);
-
           case 7:
-            _context2.next = 9;
+            gas = _context2.sent;
+            _context2.next = 13;
+            break;
+
+          case 10:
+            _context2.prev = 10;
+            _context2.t0 = _context2["catch"](4);
+            gasEstimationError = _context2.t0;
+
+          case 13:
+            return _context2.abrupt("return", {
+              gas: gas,
+              txData: args[1],
+              to: args[0],
+              gasEstimationError: gasEstimationError,
+              minAmountOut: args[3] || null
+            });
+
+          case 16:
+            _context2.next = 18;
             return pool.poolLogic.execTransaction(args[0], args[1], args[2]);
 
-          case 9:
+          case 18:
             return _context2.abrupt("return", _context2.sent);
 
-          case 10:
-            _context2.next = 21;
+          case 19:
+            _context2.next = 39;
             break;
 
-          case 12:
+          case 21:
             if (!estimateGas) {
-              _context2.next = 18;
+              _context2.next = 36;
               break;
             }
 
-            _context2.next = 15;
+            _gas = null;
+            _gasEstimationError = null;
+            _context2.prev = 24;
+            _context2.next = 27;
             return pool.signer.estimateGas({
               to: args[0],
               data: args[1]
             });
 
-          case 15:
-            return _context2.abrupt("return", _context2.sent);
+          case 27:
+            _gas = _context2.sent;
+            _context2.next = 33;
+            break;
 
-          case 18:
-            _context2.next = 20;
+          case 30:
+            _context2.prev = 30;
+            _context2.t1 = _context2["catch"](24);
+            _gasEstimationError = _context2.t1;
+
+          case 33:
+            return _context2.abrupt("return", {
+              gas: _gas,
+              txData: args[1],
+              to: args[0],
+              gasEstimationError: _gasEstimationError,
+              minAmountOut: args[3] || null
+            });
+
+          case 36:
+            _context2.next = 38;
             return pool.signer.sendTransaction(_extends({
               to: args[0],
               data: args[1]
             }, args[2]));
 
-          case 20:
+          case 38:
             return _context2.abrupt("return", _context2.sent);
 
-          case 21:
+          case 39:
           case "end":
             return _context2.stop();
         }
       }
-    }, _callee2);
+    }, _callee2, null, [[4, 10], [24, 30]]);
   }));
 
   return function getPoolTxOrGasEstimate(_x12, _x13, _x14) {
@@ -24560,7 +24600,10 @@ function _getOdosSwapTxData() {
 
           case 10:
             assembleResult = _context.sent;
-            return _context.abrupt("return", assembleResult.data.transaction.data);
+            return _context.abrupt("return", {
+              swapTxData: assembleResult.data.transaction.data,
+              minAmountOut: assembleResult.data.outputTokens[0].amount
+            });
 
           case 14:
             _context.prev = 14;
@@ -24701,66 +24744,111 @@ var ActionMiscV3Abi = [
 	}
 ];
 
+var PTAbi = [
+	{
+		inputs: [
+		],
+		name: "SY",
+		outputs: [
+			{
+				internalType: "address",
+				name: "",
+				type: "address"
+			}
+		],
+		stateMutability: "view",
+		type: "function"
+	}
+];
+
+var SYAbi = [
+	{
+		inputs: [
+		],
+		name: "exchangeRate",
+		outputs: [
+			{
+				internalType: "uint256",
+				name: "",
+				type: "uint256"
+			}
+		],
+		stateMutability: "view",
+		type: "function"
+	}
+];
+
 var pendleBaseUrl = "https://api-v2.pendle.finance/core/v1";
 function getPendleSwapTxData(_x, _x2, _x3, _x4, _x5) {
   return _getPendleSwapTxData.apply(this, arguments);
 }
 
 function _getPendleSwapTxData() {
-  _getPendleSwapTxData = _asyncToGenerator( /*#__PURE__*/runtime_1.mark(function _callee2(pool, tokenIn, tokenOut, amountIn, slippage) {
-    var expiredMarket, params, market, swapResult;
-    return runtime_1.wrap(function _callee2$(_context2) {
+  _getPendleSwapTxData = _asyncToGenerator( /*#__PURE__*/runtime_1.mark(function _callee3(pool, tokenIn, tokenOut, amountIn, slippage) {
+    var expiredMarket, result, params, market, swapResult;
+    return runtime_1.wrap(function _callee3$(_context3) {
       while (1) {
-        switch (_context2.prev = _context2.next) {
+        switch (_context3.prev = _context3.next) {
           case 0:
-            _context2.next = 2;
+            _context3.next = 2;
             return checkExitPostExpPT(pool, tokenIn, tokenOut);
 
           case 2:
-            expiredMarket = _context2.sent;
+            expiredMarket = _context3.sent;
 
             if (!expiredMarket) {
-              _context2.next = 5;
+              _context3.next = 8;
               break;
             }
 
-            return _context2.abrupt("return", getExitExpPTTxData(pool, tokenOut, amountIn, expiredMarket));
+            _context3.next = 6;
+            return getExitExpPTTxData(pool, tokenIn, tokenOut, amountIn, expiredMarket);
 
-          case 5:
+          case 6:
+            result = _context3.sent;
+            return _context3.abrupt("return", {
+              swapTxData: result.txData,
+              minAmountOut: result.minAmountOut
+            });
+
+          case 8:
             params = {
               receiver: pool.address,
               tokenIn: tokenIn,
               tokenOut: tokenOut,
               amountIn: amountIn.toString(),
-              slippage: slippage
+              slippage: slippage / 100
             };
-            _context2.next = 8;
+            _context3.next = 11;
             return getMarket(pool, tokenIn, tokenOut);
 
-          case 8:
-            market = _context2.sent;
-            _context2.prev = 9;
-            _context2.next = 12;
+          case 11:
+            market = _context3.sent;
+            _context3.prev = 12;
+            _context3.next = 15;
             return axios.get(pendleBaseUrl + "/sdk/" + networkChainIdMap[pool.network] + "/markets/" + market + "/swap", {
               params: params
             });
 
-          case 12:
-            swapResult = _context2.sent;
-            return _context2.abrupt("return", swapResult.data.tx.data);
+          case 15:
+            swapResult = _context3.sent;
+            return _context3.abrupt("return", {
+              swapTxData: swapResult.data.tx.data,
+              minAmountOut: swapResult.data.data.amountOut
+            });
 
-          case 16:
-            _context2.prev = 16;
-            _context2.t0 = _context2["catch"](9);
-            console.error("Error in Pendle API request:", _context2.t0);
+          case 19:
+            _context3.prev = 19;
+            _context3.t0 = _context3["catch"](12);
+            console.error("Error in Pendle API request:", _context3.t0);
             throw new ApiError("Pendle api request failed");
 
-          case 20:
+          case 23:
           case "end":
-            return _context2.stop();
+            return _context3.stop();
         }
       }
-    }, _callee2, null, [[9, 16]]);
+    }, _callee3, null, [[12, 19]]);
   }));
   return _getPendleSwapTxData.apply(this, arguments);
 }
@@ -24776,26 +24864,26 @@ function getMarket(_x6, _x7, _x8) {
 }
 
 function _getMarket() {
-  _getMarket = _asyncToGenerator( /*#__PURE__*/runtime_1.mark(function _callee3(pool, tokenIn, tokenOut) {
+  _getMarket = _asyncToGenerator( /*#__PURE__*/runtime_1.mark(function _callee4(pool, tokenIn, tokenOut) {
     var networkId, marketResult, allMarkets, markets;
-    return runtime_1.wrap(function _callee3$(_context3) {
+    return runtime_1.wrap(function _callee4$(_context4) {
       while (1) {
-        switch (_context3.prev = _context3.next) {
+        switch (_context4.prev = _context4.next) {
           case 0:
             networkId = networkChainIdMap[pool.network];
-            _context3.prev = 1;
-            _context3.next = 4;
+            _context4.prev = 1;
+            _context4.next = 4;
             return axios.get(pendleBaseUrl + "/" + networkId + "/markets/active");
 
           case 4:
-            marketResult = _context3.sent;
-            _context3.next = 11;
+            marketResult = _context4.sent;
+            _context4.next = 11;
             break;
 
           case 7:
-            _context3.prev = 7;
-            _context3.t0 = _context3["catch"](1);
-            console.error("Error in Pendle API request:", _context3.t0);
+            _context4.prev = 7;
+            _context4.t0 = _context4["catch"](1);
+            console.error("Error in Pendle API request:", _context4.t0);
             throw new ApiError("Pendle api request failed");
 
           case 11:
@@ -24807,31 +24895,31 @@ function _getMarket() {
             });
 
             if (!markets[0]) {
-              _context3.next = 18;
+              _context4.next = 18;
               break;
             }
 
             checkUnderlying(markets[0], tokenOut, networkId);
-            return _context3.abrupt("return", markets[0].address);
+            return _context4.abrupt("return", markets[0].address);
 
           case 18:
             if (!markets[1]) {
-              _context3.next = 23;
+              _context4.next = 23;
               break;
             }
 
             checkUnderlying(markets[1], tokenIn, networkId);
-            return _context3.abrupt("return", markets[1].address);
+            return _context4.abrupt("return", markets[1].address);
 
           case 23:
             throw new Error("Can only trade PT assets");
 
           case 24:
           case "end":
-            return _context3.stop();
+            return _context4.stop();
         }
       }
-    }, _callee3, null, [[1, 7]]);
+    }, _callee4, null, [[1, 7]]);
   }));
   return _getMarket.apply(this, arguments);
 }
@@ -24899,13 +24987,52 @@ var checkExitPostExpPT = /*#__PURE__*/function () {
   };
 }();
 
-var getExitExpPTTxData = function getExitExpPTTxData(pool, tokenOut, amountIn, market) {
-  var actionMiscV3 = new ethers.ethers.utils.Interface(ActionMiscV3Abi);
-  var txData = actionMiscV3.encodeFunctionData("exitPostExpToToken", [pool.address, market, amountIn.toString(), 0, [tokenOut, 0, tokenOut, ethers.ethers.constants.AddressZero, // swapData
-  [0, ethers.ethers.constants.AddressZero, ethers.ethers.constants.HashZero, false // needScale
-  ]]]);
-  return txData;
-};
+var getExitExpPTTxData = /*#__PURE__*/function () {
+  var _ref2 = /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/runtime_1.mark(function _callee2(pool, tokenIn, tokenOut, amountIn, market) {
+    var actionMiscV3, txData, PTcontract, SYcontract, exchangeRate, minAmountOut;
+    return runtime_1.wrap(function _callee2$(_context2) {
+      while (1) {
+        switch (_context2.prev = _context2.next) {
+          case 0:
+            actionMiscV3 = new ethers.ethers.utils.Interface(ActionMiscV3Abi);
+            txData = actionMiscV3.encodeFunctionData("exitPostExpToToken", [pool.address, market, amountIn.toString(), 0, [tokenOut, 0, tokenOut, ethers.ethers.constants.AddressZero, // swapData
+            [0, ethers.ethers.constants.AddressZero, ethers.ethers.constants.HashZero, false // needScale
+            ]]]); // Get the PT contract instance
+
+            PTcontract = new ethers.ethers.Contract(tokenIn, PTAbi, pool.signer); // Get the SY contract instance
+
+            _context2.t0 = ethers.ethers.Contract;
+            _context2.next = 6;
+            return PTcontract.SY();
+
+          case 6:
+            _context2.t1 = _context2.sent;
+            _context2.t2 = SYAbi;
+            _context2.t3 = pool.signer;
+            SYcontract = new _context2.t0(_context2.t1, _context2.t2, _context2.t3);
+            _context2.next = 12;
+            return SYcontract.exchangeRate();
+
+          case 12:
+            exchangeRate = _context2.sent;
+            minAmountOut = new BigNumber(amountIn.toString()).times(1e18).div(exchangeRate.toString()).decimalPlaces(0, BigNumber.ROUND_DOWN).toFixed(0);
+            return _context2.abrupt("return", {
+              txData: txData,
+              minAmountOut: minAmountOut
+            });
+
+          case 15:
+          case "end":
+            return _context2.stop();
+        }
+      }
+    }, _callee2);
+  }));
+
+  return function getExitExpPTTxData(_x12, _x13, _x14, _x15, _x16) {
+    return _ref2.apply(this, arguments);
+  };
+}();
 
 var Pool = /*#__PURE__*/function () {
   function Pool(network, signer, poolLogic, mangerLogic, utils, factory, isDhedge) {
@@ -25425,7 +25552,7 @@ var Pool = /*#__PURE__*/function () {
   /*#__PURE__*/
   function () {
     var _trade = /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/runtime_1.mark(function _callee10(dapp, assetFrom, assetTo, amountIn, slippage, options, estimateGas) {
-      var swapTxData, _yield$getOneInchSwap, iSynthetix, assets, daoAddress, iUniswapV2Router, minAmountOut, tx;
+      var swapTxData, minAmountOut, _yield$getOneInchSwap, iSynthetix, assets, daoAddress, _yield$getOdosSwapTxD, _yield$getPendleSwapT, iUniswapV2Router, calculatedMinAmountOut, tx;
 
       return runtime_1.wrap(function _callee10$(_context10) {
         while (1) {
@@ -25443,94 +25570,100 @@ var Pool = /*#__PURE__*/function () {
                 estimateGas = false;
               }
 
+              minAmountOut = null;
               _context10.t0 = dapp;
-              _context10.next = _context10.t0 === exports.Dapp.ONEINCH ? 6 : _context10.t0 === exports.Dapp.BALANCER ? 11 : _context10.t0 === exports.Dapp.SYNTHETIX ? 15 : _context10.t0 === exports.Dapp.TOROS ? 22 : _context10.t0 === exports.Dapp.ODOS ? 26 : _context10.t0 === exports.Dapp.PENDLE ? 30 : 34;
+              _context10.next = _context10.t0 === exports.Dapp.ONEINCH ? 7 : _context10.t0 === exports.Dapp.BALANCER ? 13 : _context10.t0 === exports.Dapp.SYNTHETIX ? 17 : _context10.t0 === exports.Dapp.TOROS ? 24 : _context10.t0 === exports.Dapp.ODOS ? 28 : _context10.t0 === exports.Dapp.PENDLE ? 34 : 40;
               break;
 
-            case 6:
-              _context10.next = 8;
+            case 7:
+              _context10.next = 9;
               return getOneInchSwapTxData(this, assetFrom, assetTo, amountIn, slippage);
 
-            case 8:
+            case 9:
               _yield$getOneInchSwap = _context10.sent;
               swapTxData = _yield$getOneInchSwap.swapTxData;
-              return _context10.abrupt("break", 49);
+              minAmountOut = _yield$getOneInchSwap.dstAmount;
+              return _context10.abrupt("break", 55);
 
-            case 11:
-              _context10.next = 13;
+            case 13:
+              _context10.next = 15;
               return this.utils.getBalancerSwapTx(this, assetFrom, assetTo, amountIn, slippage);
 
-            case 13:
+            case 15:
               swapTxData = _context10.sent;
-              return _context10.abrupt("break", 49);
+              return _context10.abrupt("break", 55);
 
-            case 15:
+            case 17:
               iSynthetix = new ethers.ethers.utils.Interface(ISynthetix.abi);
               assets = [assetFrom, assetTo].map(function (asset) {
                 return ethers.ethers.utils.formatBytes32String(asset);
               });
-              _context10.next = 19;
+              _context10.next = 21;
               return this.factory.owner();
 
-            case 19:
+            case 21:
               daoAddress = _context10.sent;
               swapTxData = iSynthetix.encodeFunctionData(exports.Transaction.SWAP_SYNTHS, [assets[0], amountIn, assets[1], daoAddress, SYNTHETIX_TRACKING_CODE]);
-              return _context10.abrupt("break", 49);
-
-            case 22:
-              _context10.next = 24;
-              return getEasySwapperTxData(this, assetFrom, assetTo, ethers.ethers.BigNumber.from(amountIn), slippage);
+              return _context10.abrupt("break", 55);
 
             case 24:
-              swapTxData = _context10.sent;
-              return _context10.abrupt("break", 49);
+              _context10.next = 26;
+              return getEasySwapperTxData(this, assetFrom, assetTo, ethers.ethers.BigNumber.from(amountIn), slippage);
 
             case 26:
-              _context10.next = 28;
-              return getOdosSwapTxData(this, assetFrom, assetTo, amountIn, slippage);
+              swapTxData = _context10.sent;
+              return _context10.abrupt("break", 55);
 
             case 28:
-              swapTxData = _context10.sent;
-              return _context10.abrupt("break", 49);
+              _context10.next = 30;
+              return getOdosSwapTxData(this, assetFrom, assetTo, amountIn, slippage);
 
             case 30:
-              _context10.next = 32;
+              _yield$getOdosSwapTxD = _context10.sent;
+              swapTxData = _yield$getOdosSwapTxD.swapTxData;
+              minAmountOut = _yield$getOdosSwapTxD.minAmountOut;
+              return _context10.abrupt("break", 55);
+
+            case 34:
+              _context10.next = 36;
               return getPendleSwapTxData(this, assetFrom, assetTo, amountIn, slippage);
 
-            case 32:
-              swapTxData = _context10.sent;
-              return _context10.abrupt("break", 49);
+            case 36:
+              _yield$getPendleSwapT = _context10.sent;
+              swapTxData = _yield$getPendleSwapT.swapTxData;
+              minAmountOut = _yield$getPendleSwapT.minAmountOut;
+              return _context10.abrupt("break", 55);
 
-            case 34:
+            case 40:
               iUniswapV2Router = new ethers.ethers.utils.Interface(IUniswapV2Router.abi);
-              _context10.next = 37;
+              _context10.next = 43;
               return this.utils.getMinAmountOut(dapp, assetFrom, assetTo, amountIn, slippage);
 
-            case 37:
-              minAmountOut = _context10.sent;
+            case 43:
+              calculatedMinAmountOut = _context10.sent;
               _context10.t1 = iUniswapV2Router;
               _context10.t2 = exports.Transaction.SWAP;
               _context10.t3 = amountIn;
-              _context10.t4 = minAmountOut;
+              _context10.t4 = calculatedMinAmountOut;
               _context10.t5 = [assetFrom, assetTo];
               _context10.t6 = this.address;
-              _context10.next = 46;
+              _context10.next = 52;
               return getDeadline(this);
 
-            case 46:
+            case 52:
               _context10.t7 = _context10.sent;
               _context10.t8 = [_context10.t3, _context10.t4, _context10.t5, _context10.t6, _context10.t7];
               swapTxData = _context10.t1.encodeFunctionData.call(_context10.t1, _context10.t2, _context10.t8);
 
-            case 49:
-              _context10.next = 51;
-              return getPoolTxOrGasEstimate(this, [routerAddress[this.network][dapp], swapTxData, options], estimateGas);
+            case 55:
+              _context10.next = 57;
+              return getPoolTxOrGasEstimate(this, [routerAddress[this.network][dapp], swapTxData, options, minAmountOut], estimateGas);
 
-            case 51:
+            case 57:
               tx = _context10.sent;
               return _context10.abrupt("return", tx);
 
-            case 53:
+            case 59:
             case "end":
               return _context10.stop();
           }