impermax-sdk 2.1.233 → 2.1.236

package/lib/offchain/initializer/user/lendingPools.js

@@ -48,6 +48,8 @@ async function initializeUserData(account) {
         // Supply positions is same for v2 and v3
         for (const supplyPosition of userDataOfFactory.supplyPositions) {
             const lendingPoolId = supplyPosition.borrowable.lendingPool.id;
+            if (!this.whitelistedPairs[factory]?.includes(lendingPoolId))
+                continue;
             const underlyingId = supplyPosition.borrowable.underlying.id;
             const borrowableA = (await this.getLendingPool(factory, lendingPoolId)).getBorrowableA();
             const addressA = await borrowableA.getUnderlyingAddress();

package/lib/offchain/initializer/user/positionsV2.js

@@ -8,14 +8,17 @@ async function initializeV2Positions(offchain, factory, rawUserData) {
     // Collateral positions
     for (const collateralPosition of rawUserData.collateralPositions) {
         const lendingPoolId = collateralPosition.collateral.lendingPool.id;
-        if (!collateralPositions[lendingPoolId]) {
+        if (!offchain.whitelistedPairs[factory]?.includes(lendingPoolId))
+            continue;
+        if (!collateralPositions[lendingPoolId])
             collateralPositions[lendingPoolId] = [];
-        }
         collateralPositions[lendingPoolId].push(collateralPosition);
     }
     // Borrow positions
     for (const borrowPosition of rawUserData.borrowPositions) {
         const lendingPoolId = borrowPosition.borrowable.lendingPool.id;
+        if (!offchain.whitelistedPairs[factory]?.includes(lendingPoolId))
+            continue;
         const underlyingId = borrowPosition.borrowable.underlying.id;
         const borrowableA = (await offchain.getLendingPool(factory, lendingPoolId)).getBorrowableA();
         const addressA = await borrowableA.getUnderlyingAddress();

package/lib/offchain/offchain.js

@@ -92,7 +92,7 @@ class Offchain {
         //this.chainId = cfg.chainId;
         // TODO: refactor way of doing whitelist, messing up with user query since pairs dont get initialized
         // this.whitelistedPairs = whitelist ?? {};
-        this.whitelistedPairs = {};
+        this.whitelistedPairs = whitelist ?? {};
         this.offchainMultichain = offchainMultichain;
         this.network = network;
         this.chainId = chainId_1.CHAIN_IDS[network];

package/lib/utils/position/uniswapV3/index.js

@@ -461,13 +461,15 @@ class UniswapV3Position {
         const realY = this.getRealY();
         let maxDeltaX = realX * highLeverage / currentLeverage;
         let maxDeltaY = realY * highLeverage / currentLeverage;
-        if (maxDeltaX > this.availableToBorrowX) {
-            maxDeltaY *= maxDeltaX / this.availableToBorrowX;
-            maxDeltaX = this.availableToBorrowX;
+        const actualAvailableToBorrowX = this.availableToBorrowX - (this.debtX - this.initialDebtX);
+        const actualAvailableToBorrowY = this.availableToBorrowY - (this.debtY - this.initialDebtY);
+        if (maxDeltaX > actualAvailableToBorrowX) {
+            maxDeltaY *= actualAvailableToBorrowX / maxDeltaX;
+            maxDeltaX = actualAvailableToBorrowX;
         }
-        if (maxDeltaY > this.availableToBorrowY) {
-            maxDeltaX *= maxDeltaY / this.availableToBorrowY;
-            maxDeltaY = this.availableToBorrowY;
+        if (maxDeltaY > actualAvailableToBorrowY) {
+            maxDeltaX *= actualAvailableToBorrowY / maxDeltaY;
+            maxDeltaY = actualAvailableToBorrowY;
         }
         const [deltaX, deltaY] = this.getMaxDeltaLeverageInRange(0, 0, maxDeltaX, maxDeltaY);
         const collateralValue = this.getCollateralValue();
@@ -511,17 +513,17 @@ class UniswapV3Position {
         if (this.isLiquidatable())
             return 0;
         const equityValue = this.getEquityValue();
-        const highDebtX = Math.max(this.getAmountXGivenValue(equityValue), this.availableToBorrowX);
+        const highDebtX = this.getAmountXGivenValue(equityValue);
         const [debtX,] = this.getMaxDeltaDebtInRange(0, 0, highDebtX, 0);
-        return debtX + this.debtX - this.initialDebtX;
+        return Math.min(debtX + this.debtX - this.initialDebtX, this.availableToBorrowX);
     }
     getMaxBorrowableY() {
         if (this.isLiquidatable())
             return 0;
         const equityValue = this.getEquityValue();
-        const highDebtY = Math.max(this.getAmountYGivenValue(equityValue), this.availableToBorrowY);
+        const highDebtY = this.getAmountYGivenValue(equityValue);
         const [, debtY] = this.getMaxDeltaDebtInRange(0, 0, 0, highDebtY);
-        return debtY + this.debtY - this.initialDebtY;
+        return Math.min(debtY + this.debtY - this.initialDebtY, this.availableToBorrowY);
     }
 }
 exports.UniswapV3Position = UniswapV3Position;

package/package.json

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