impermax-sdk 1.1.61 → 1.1.63

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

@@ -202,17 +202,19 @@ class OnchainAccountLendingPool {
             const collateralB = actualCollateral / (1 + reservesRatio) / priceB;
             let priceSwingA, priceSwingB;
             if (factories_1.STABLE_FACTORIES.includes(this.lendingPool.getImpermaxFactory().getFactory())) {
+                console.log(collateralA, collateralB, debtA, debtB, safetyMargin);
                 priceSwingA = (0, lliquidity_math_1.solidlyStable_getLiquidatableXPriceDecrease)(collateralA, collateralB, debtA, debtB) * safetyMargin;
                 priceSwingB = (0, lliquidity_math_1.solidlyStable_getLiquidatableXPriceDecrease)(collateralB, collateralA, debtB, debtA) * safetyMargin;
+                console.log(priceSwingA, priceSwingB);
             }
             else {
                 priceSwingA = (0, lliquidity_math_1.uniswapV2_getLiquidatableXPriceDecrease)(collateralA, collateralB, debtA, debtB) * safetyMargin;
                 priceSwingB = (0, lliquidity_math_1.uniswapV2_getLiquidatableXPriceDecrease)(collateralB, collateralA, debtB, debtA) * safetyMargin;
             }
-            const currentPrice = yield this.lendingPool.getTWAPPrice();
+            const twapPrice = yield this.lendingPool.getTWAPPrice();
             return !this.account.getOnchain().priceInverted
-                ? [currentPrice * priceSwingA, currentPrice / priceSwingB]
-                : [currentPrice * priceSwingB, currentPrice / priceSwingA];
+                ? [twapPrice * priceSwingA, twapPrice / priceSwingB]
+                : [twapPrice * priceSwingB, twapPrice / priceSwingA];
         });
     }
     // Max Leverage

package/lib/onchain/impermaxFactory/lendingPool/onchainLendingPool.js

@@ -248,10 +248,10 @@ class OnchainLendingPool {
         return __awaiter(this, void 0, void 0, function* () {
             if (factories_1.STABLE_FACTORIES.includes(this.impermaxFactory.getFactory())) {
                 const collateral = yield this.getCollateral().getPoolToken();
-                const decimalsA = yield this.getBorrowableA().getDecimals();
-                const decimalsB = yield this.getBorrowableB().getDecimals();
-                const { twapReserve0, twapReserve1 } = yield collateral.methods.getTwapReserves().call();
+                let { twapReserve0, twapReserve1 } = yield collateral.methods.getTwapReserves().call();
                 const [price0, price1] = yield this.getPriceDenomLP();
+                twapReserve0 = yield this.getBorrowableA().normalize(twapReserve0);
+                twapReserve1 = yield this.getBorrowableB().normalize(twapReserve1);
                 return twapReserve0 * price0 / (twapReserve1 * price1);
             }
             else {
@@ -261,17 +261,9 @@ class OnchainLendingPool {
     }
     getReservesValueRatio() {
         return __awaiter(this, void 0, void 0, function* () {
-            if (factories_1.STABLE_FACTORIES.includes(this.impermaxFactory.getFactory())) {
-                const collateral = yield this.getCollateral().getPoolToken();
-                const decimalsA = yield this.getBorrowableA().getDecimals();
-                const decimalsB = yield this.getBorrowableB().getDecimals();
-                const { twapReserve0, twapReserve1 } = yield collateral.methods.getTwapReserves().call();
-                const [price0, price1] = yield this.getPriceDenomLP();
-                return twapReserve0 * price0 / (twapReserve1 * price1);
-            }
-            else {
-                return 1;
-            }
+            if (!this.cache.reservesValueRatio)
+                this.cache.reservesValueRatio = this.initializeReservesValueRatio();
+            return this.cache.reservesValueRatio;
         });
     }
     initializeTWAPPrice() {

package/package.json

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