impermax-sdk 2.1.552 → 2.1.554

package/lib/onchain/interactions/lendingPool/nftlp/onchainInteractionsNftlpGenericCL.d.ts

@@ -20,7 +20,7 @@ export default abstract class OnchainInteractionsNftlpGenericCL extends OnchainI
         approveB: number;
         withCollateralTransfer: boolean;
     }>;
-    getModifyExistingPositionActions(tokenId: number, depositADelta: number, depositBDelta: number, borrowADelta: number, borrowBDelta: number): Promise<{
+    getModifyExistingPositionActions(tokenId: number, depositADelta: number, depositBDelta: number, borrowADelta: number, borrowBDelta: number, isSwapAndClose?: boolean): Promise<{
         actions: any[];
         ethValue: number;
         approveA: number;

package/lib/onchain/interactions/lendingPool/nftlp/onchainInteractionsNftlpGenericCL.js

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const onchainInteractionsNftlp_1 = __importDefault(require("./onchainInteractionsNftlp"));
 const ether_utils_1 = require("../../../../utils/ether-utils");
 const general_1 = require("../../../../config/general");
+const MAX_SWAP_AND_CLOSE_SLIPPAGE = 1.01;
 class OnchainInteractionsNftlpGenericCL extends onchainInteractionsNftlp_1.default {
     constructor() {
         super(...arguments);
@@ -34,10 +35,10 @@ class OnchainInteractionsNftlpGenericCL extends onchainInteractionsNftlp_1.defau
         result.actions.unshift(await this.getMintEmptyAction(tickSpacing, (await this.getNftlp().priceToTick(priceA, tickSpacing)).toString(), (await this.getNftlp().priceToTick(priceB, tickSpacing)).toString()));
         return result;
     }
-    async getModifyExistingPositionActions(tokenId, depositADelta, depositBDelta, borrowADelta, borrowBDelta) {
-        return this._getUpdatePositionActions(tokenId, await (await this.getAccountNftlp()).getPositionObject(tokenId), depositADelta, depositBDelta, borrowADelta, borrowBDelta);
+    async getModifyExistingPositionActions(tokenId, depositADelta, depositBDelta, borrowADelta, borrowBDelta, isSwapAndClose = false) {
+        return this._getUpdatePositionActions(tokenId, await (await this.getAccountNftlp()).getPositionObject(tokenId), depositADelta, depositBDelta, borrowADelta, borrowBDelta, isSwapAndClose);
     }
-    async _getUpdatePositionActions(tokenId, positionObject, depositADelta, depositBDelta, borrowADelta, borrowBDelta) {
+    async _getUpdatePositionActions(tokenId, positionObject, depositADelta, depositBDelta, borrowADelta, borrowBDelta, isSwapAndClose = false) {
         const MIN_AMOUNT = 0.5; // TODO this should be calculated based on slippage and concentration
         let ethValue = 0;
         let approveA = 0;
@@ -156,10 +157,17 @@ class OnchainInteractionsNftlpGenericCL extends onchainInteractionsNftlp_1.defau
                 // if repay >= redeem, we can repay MAX_UINT in order to use every redeemed fund for repaying
                 // otherwise we can set a repay limit in order to withdraw the funds not used to repay
                 const maximizeRepay = (-borrowADelta) >= (-depositADelta);
+                // if swap and close is activated and repay >= redeem, we will swap tokenB to tokenA
+                if (isSwapAndClose && maximizeRepay) {
+                    const price = positionObject.marketPrice;
+                    const amountOut = (-borrowADelta) - (-depositADelta);
+                    const amountInMaximum = amountOut * price * MAX_SWAP_AND_CLOSE_SLIPPAGE;
+                    actions.push(await actionsGetter.methods.getSwapAction(0, await borrowableA.toBigNumber(amountOut), await borrowableB.toBigNumber(amountInMaximum)).call());
+                }
                 actions.push(await actionsGetter.methods.getRepayRouterAction(0, maximizeRepay ? general_1.MAX_UINT : await borrowableA.toBigNumber(-borrowADelta), isEthA ? router._address : this.getAccountAddress()).call());
                 // after repayRouter, we need to call repayUser only if repay > redeem and the token is not ETH
                 // (for ETH we've already repaid since repayETH is done through repayRouter)
-                if (!maximizeRepay)
+                if (!maximizeRepay || isSwapAndClose)
                     borrowADelta = 0;
                 else if (isEthA) {
                     ethValue += depositADelta - borrowADelta;
@@ -179,8 +187,14 @@ class OnchainInteractionsNftlpGenericCL extends onchainInteractionsNftlp_1.defau
                 else if (-borrowBDelta * 1.0001 > positionObject.debtY)
                     borrowBDelta *= 1.0001;
                 const maximizeRepay = (-borrowBDelta) > (-depositBDelta);
+                if (isSwapAndClose && maximizeRepay) {
+                    const price = positionObject.marketPrice;
+                    const amountOut = (-borrowBDelta) - (-depositBDelta);
+                    const amountInMaximum = amountOut / price * MAX_SWAP_AND_CLOSE_SLIPPAGE;
+                    actions.push(await actionsGetter.methods.getSwapAction(1, await borrowableB.toBigNumber(amountOut), await borrowableA.toBigNumber(amountInMaximum)).call());
+                }
                 actions.push(await actionsGetter.methods.getRepayRouterAction(1, maximizeRepay ? general_1.MAX_UINT : await borrowableB.toBigNumber(-borrowBDelta), isEthB ? router._address : this.getAccountAddress()).call());
-                if (!maximizeRepay)
+                if (!maximizeRepay || isSwapAndClose)
                     borrowBDelta = 0;
                 else if (isEthB) {
                     ethValue += depositBDelta - borrowBDelta;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "impermax-sdk",
-  "version": "2.1.552",
+  "version": "2.1.554",
   "description": "",
   "main": "./lib/index.js",
   "module": "./lib/index.js",