impermax-sdk 2.1.228 → 2.1.230

package/lib/offchain/account/lendingPool/nftlp/offchainAccountNftlpUniswapV3.d.ts

@@ -10,8 +10,8 @@ interface PositionData {
     feeGrowthInside1LastX128: number;
     unclaimedFees0: number;
     unclaimedFees1: number;
-    totalFeesEarned0: number;
-    totalFeesEarned1: number;
+    storedTotalFeesEarned0: number;
+    storedTotalFeesEarned1: number;
 }
 export type UniswapV3PositionData = NftlpPosition & {
     nftlp: PositionData;

package/lib/offchain/account/lendingPool/nftlp/offchainAccountNftlpUniswapV3.js

@@ -81,11 +81,11 @@ class OffchainAccountNftlpUniswapV3 extends offchainAccountNftlp_1.default {
         }
     }
     async getTotalAccruedFees(tokenId) {
-        const { totalFeesEarned0, totalFeesEarned1 } = (await this.getPositionData(tokenId));
+        const { storedTotalFeesEarned0, storedTotalFeesEarned1 } = (await this.getPositionData(tokenId));
         const { uncollectedFees0, uncollectedFees1 } = await this.getUncollectedFees(tokenId);
         return {
-            accruedFees0: Number(totalFeesEarned0) + uncollectedFees0,
-            accruedFees1: Number(totalFeesEarned1) + uncollectedFees1,
+            accruedFees0: Number(storedTotalFeesEarned0) + uncollectedFees0,
+            accruedFees1: Number(storedTotalFeesEarned1) + uncollectedFees1,
         };
     }
 }

package/lib/offchain/queries/apis/ponder/index.js

@@ -467,8 +467,8 @@ class PonderQueryBuilder {
           tokenId
           feeGrowthInside0LastX128
           feeGrowthInside1LastX128
-          totalFeesEarned0
-          totalFeesEarned1
+          storedTotalFeesEarned0
+          storedTotalFeesEarned1
           id
           nftlp {
             factory {

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

@@ -67,25 +67,11 @@ class OnchainInteractionsNftlpUniswapV3 extends onchainInteractionsNftlp_1.defau
         else if (depositADelta < 0 || depositBDelta < 0) {
             const currentDepositA = positionObject.getDepositedX();
             const currentDepositB = positionObject.getDepositedY();
-            console.log("Withdrawing...", currentDepositA, currentDepositB, depositADelta, depositBDelta);
             percentageToRemove = currentDepositA == 0 ? -depositBDelta / currentDepositB : -depositADelta / currentDepositA;
             percentageToRemove = Math.min(percentageToRemove * this.getDust(), 1);
             depositADelta = -currentDepositA * percentageToRemove;
             depositBDelta = -currentDepositB * percentageToRemove;
-            console.log("Withdrawing...", percentageToRemove, depositADelta, depositBDelta);
         }
-        // slightly increase repayAmount if we are repaying 100%
-        // TODO this is NOT working
-        // also, what if we are deleveraging? Repay amount should not be increased if userAmount is 0
-        // but at the same time how can we repay 100% if the borrow amount is constantly increasing?
-        // (it's better if the ui works before testing this)
-        console.log("slightly increase repayAmount");
-        console.log(borrowADelta, positionObject.debtX);
-        console.log(borrowBDelta, positionObject.debtY);
-        if (-borrowADelta * this.getDust() > positionObject.debtX)
-            borrowADelta *= 1.0001;
-        if (-borrowBDelta * this.getDust() > positionObject.debtY)
-            borrowBDelta *= 1.0001;
         const borrowableA = this.getLendingPool().getLendingPool().getBorrowableA();
         const borrowableB = this.getLendingPool().getLendingPool().getBorrowableB();
         const isEthA = await borrowableA.isETH();
@@ -93,8 +79,8 @@ class OnchainInteractionsNftlpUniswapV3 extends onchainInteractionsNftlp_1.defau
         // Borrow and mint
         if ((borrowADelta > 0 && depositADelta > 0) || (borrowBDelta > 0 && depositBDelta > 0)) {
             // slightly increase borrowDelta in order to avoid amountUser to be dust
-            const actualBorrowADelta = Math.max(borrowADelta * this.getDust(), 0);
-            const actualBorrowBDelta = Math.max(borrowBDelta * this.getDust(), 0);
+            const actualBorrowADelta = Math.max(borrowADelta * 1.0001, 0);
+            const actualBorrowBDelta = Math.max(borrowBDelta * 1.0001, 0);
             const amountAUser = Math.max(depositADelta - actualBorrowADelta, 0);
             const amountBUser = Math.max(depositBDelta - actualBorrowBDelta, 0);
             if (isEthA) {
@@ -154,9 +140,15 @@ class OnchainInteractionsNftlpUniswapV3 extends onchainInteractionsNftlp_1.defau
                 doWithdrawEth = true;
             // withdraw or repay tokenA
             if (borrowADelta < 0) {
+                // if we are repaying what we're withdrawing, round the repay amount to the withdraw amount
+                if (borrowADelta * 1.0001 < depositADelta && depositADelta * 1.0001 < borrowADelta)
+                    borrowADelta = depositADelta;
+                // if we are repaying 100%, slightly increase the repay amount
+                else if (-borrowADelta * 1.0001 > positionObject.debtX)
+                    borrowADelta *= 1.0001;
                 // 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) / this.getDust();
+                const maximizeRepay = (-borrowADelta) >= (-depositADelta);
                 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)
@@ -175,7 +167,11 @@ class OnchainInteractionsNftlpUniswapV3 extends onchainInteractionsNftlp_1.defau
             }
             // withdraw or repay tokenB (same logic as tokenA)
             if (borrowBDelta < 0) {
-                const maximizeRepay = (-borrowBDelta) > (-depositBDelta) / this.getDust();
+                if (borrowBDelta * 1.0001 < depositBDelta && depositBDelta * 1.0001 < borrowBDelta)
+                    borrowBDelta = depositBDelta;
+                else if (-borrowBDelta * 1.0001 > positionObject.debtY)
+                    borrowBDelta *= 1.0001;
+                const maximizeRepay = (-borrowBDelta) > (-depositBDelta);
                 actions.push(await actionsGetter.methods.getRepayRouterAction(1, maximizeRepay ? general_1.MAX_UINT : await borrowableB.toBigNumber(-borrowBDelta), isEthB ? router._address : this.getAccountAddress()).call());
                 if (!maximizeRepay)
                     borrowBDelta = 0;
@@ -193,6 +189,8 @@ class OnchainInteractionsNftlpUniswapV3 extends onchainInteractionsNftlp_1.defau
         }
         // Repay
         if (borrowADelta < 0) {
+            if (-borrowADelta * 1.0001 > positionObject.debtX)
+                borrowADelta *= 1.0001;
             if (isEthA) {
                 actions.push(await actionsGetter.methods.getRepayRouterAction(0, general_1.MAX_UINT, router._address).call());
                 ethValue -= borrowADelta;
@@ -204,6 +202,8 @@ class OnchainInteractionsNftlpUniswapV3 extends onchainInteractionsNftlp_1.defau
             }
         }
         if (borrowBDelta < 0) {
+            if (-borrowBDelta * 1.0001 > positionObject.debtY)
+                borrowBDelta *= 1.0001;
             if (isEthB) {
                 actions.push(await actionsGetter.methods.getRepayRouterAction(1, general_1.MAX_UINT, router._address).call());
                 ethValue -= borrowBDelta;

package/package.json

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