impermax-sdk 1.1.80 → 1.1.82

package/lib/onchain/account/lendingPool/onchainAccountBorrowable.js

@@ -98,11 +98,11 @@ class OnchainAccountBorrowable extends onchainAccountPoolToken_1.default {
                     break;
                 borrowAmountPrev = borrowAmount;
                 const changeCollateral = 0;
-                const changeBorrowedA = this.getPoolTokenType() == types_1.PoolTokenType.BorrowableA ? borrowAmount * this.getUiMargin() : 0;
-                const changeBorrowedB = this.getPoolTokenType() == types_1.PoolTokenType.BorrowableB ? borrowAmount * this.getUiMargin() : 0;
+                const changeBorrowedA = this.getPoolTokenType() == types_1.PoolTokenType.BorrowableA ? borrowAmount : 0;
+                const changeBorrowedB = this.getPoolTokenType() == types_1.PoolTokenType.BorrowableB ? borrowAmount : 0;
                 const changes = { changeCollateral, changeBorrowedA, changeBorrowedB };
                 const [liqPriceA, liqPriceB] = yield this.lendingPool.getLiquidationPrices(changes);
-                if (liqPriceA > twapPrice || liqPriceB < twapPrice)
+                if (liqPriceA * this.getUiMargin() > twapPrice || liqPriceB / this.getUiMargin() < twapPrice)
                     borrowAmount -= jump;
                 else {
                     bestAmount = borrowAmount;

package/lib/onchain/account/lendingPool/onchainAccountCollateral.js

@@ -79,24 +79,21 @@ class OnchainAccountCollateral extends onchainAccountPoolToken_1.default {
             const collateralAmount = yield this.getDeposited();
             const twapPrice = yield this.lendingPool.getLendingPool().getTWAPPrice();
             const [liqPriceA, liqPriceB] = yield this.lendingPool.getLiquidationPrices(onchainTypes_1.NO_CHANGES);
-            console.log("collateralAmount", collateralAmount);
-            console.log("liquidationpricenochange", liqPriceA, twapPrice, liqPriceB);
             // start search
             let withdrawAmount = collateralAmount;
             let withdrawAmountPrev = 0;
             let bestAmount = 0;
             for (let i = 0; i < 1000; i++) {
                 const jump = Math.abs(withdrawAmount - withdrawAmountPrev) / 2;
-                if (jump / collateralAmount < 0.001)
+                if (jump / collateralAmount < 0.000001)
                     break;
                 withdrawAmountPrev = withdrawAmount;
-                const changeCollateral = -1 * Math.min(withdrawAmount * this.getUiMargin(), collateralAmount);
+                const changeCollateral = -1 * Math.min(withdrawAmount, collateralAmount);
                 const changeBorrowedA = 0;
                 const changeBorrowedB = 0;
                 const changes = { changeCollateral, changeBorrowedA, changeBorrowedB };
                 const [liqPriceA, liqPriceB] = yield this.lendingPool.getLiquidationPrices(changes);
-                console.log("getMaxWithdrawable", changes, liqPriceA, twapPrice, liqPriceB, bestAmount, withdrawAmount);
-                if (liqPriceA > twapPrice || liqPriceB < twapPrice)
+                if (liqPriceA * this.getUiMargin() > twapPrice || liqPriceB / this.getUiMargin() < twapPrice)
                     withdrawAmount -= jump;
                 else {
                     bestAmount = withdrawAmount;

package/lib/onchain/account/lendingPool/onchainAccountLendingPool.js

@@ -274,7 +274,7 @@ class OnchainAccountLendingPool {
                 }
                 const changes = { changeCollateral, changeBorrowedA, changeBorrowedB };
                 const [liqPriceA, liqPriceB] = yield this.getLiquidationPrices(changes);
-                if (liqPriceA > twapPrice || liqPriceB < twapPrice)
+                if (liqPriceA * this.getUiMargin() > twapPrice || liqPriceB / this.getUiMargin() < twapPrice)
                     addLev -= jump;
                 else {
                     bestChanges = changes;
@@ -293,6 +293,7 @@ class OnchainAccountLendingPool {
             const adjCollateralValue = valueCollateral / Math.sqrt(slippage);
             const collateralValueA = valueCollateral * reservesWeight0;
             const collateralValueB = valueCollateral * reservesWeight1;
+            console.log("getMaxDeleverage", valueCollateral, valueA, valueB, reservesWeight0, reservesWeight1, adjCollateralValue, collateralValueA, collateralValueB);
             if (collateralValueA >= valueA && collateralValueB >= valueB) {
                 return this.getCollateral().getDeposited();
             }

package/lib/utils/lliquidity-math.js

@@ -16,6 +16,8 @@ exports.uniswapV2_getPriceFromReserves = uniswapV2_getPriceFromReserves;
  *  - 1 meaning it is liquidatable
  */
 function uniswapV2_getLiquidatableXPriceDecrease(x0, y0, debtX, debtY) {
+    if ((x0 == 0 || y0 == 0) && (debtX > 0 || debtY > 0))
+        return 1;
     const k = x0 * y0;
     const x = k / debtY * (1 + Math.sqrt(1 - debtY * debtX / k));
     if (!x)
@@ -74,6 +76,8 @@ function solidlyStable_yOut(xIn, x0, y0) {
 }
 exports.solidlyStable_yOut = solidlyStable_yOut;
 function solidlyStable_getEquityValue(x, y, debtX, debtY) {
+    if ((x == 0 || y == 0) && (debtX > 0 || debtY > 0))
+        return -Infinity;
     const price = solidlyStable_getPriceFromReserves(x, y);
     const lpValue = x * price + y;
     const debtValue = debtX * price + debtY;
@@ -84,6 +88,10 @@ exports.solidlyStable_getEquityValue = solidlyStable_getEquityValue;
  * Find xIn input amount that would bring the equity to negative
  */
 function solidlyStable_getXInMargin(x0, y0, debtX, debtY) {
+    if (debtX == 0 && debtY == 0)
+        return Infinity;
+    if (x0 == 0 || y0 == 0)
+        return 0;
     if (solidlyStable_getEquityValue(x0, y0, debtX, debtY) < 0)
         return 0;
     const STARTING_POINT = x0 * 1e9;

package/package.json

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