impermax-sdk 1.1.57 → 1.1.59

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

@@ -16,6 +16,7 @@ const types_1 = require("../../../config/types");
 const onchainCollateral_1 = __importDefault(require("./onchainCollateral"));
 const onchainBorrowable_1 = __importDefault(require("./onchainBorrowable"));
 const factories_1 = require("../../../config/factories");
+const price_from_reserves_1 = require("../../../utils/price-from-reserves");
 class OnchainLendingPool {
     constructor(impermaxFactory, pairAddress) {
         this.cache = {};
@@ -181,9 +182,9 @@ class OnchainLendingPool {
             const [reserve0, reserve1] = yield this.getReserves();
             const priceInverted = this.impermaxFactory.getOnchain().priceInverted;
             if (factories_1.STABLE_FACTORIES.includes(this.impermaxFactory.getFactory()))
-                return getPriceFromReservesSolidlyStable(reserve0, reserve1, priceInverted);
+                return (0, price_from_reserves_1.getPriceFromReservesSolidlyStable)(reserve0, reserve1, priceInverted);
             else
-                return getPriceFromReservesUniswapV2(reserve0, reserve1, priceInverted);
+                return (0, price_from_reserves_1.getPriceFromReservesUniswapV2)(reserve0, reserve1, priceInverted);
         });
     }
     // TWAP Price
@@ -191,9 +192,11 @@ class OnchainLendingPool {
         return __awaiter(this, void 0, void 0, function* () {
             try {
                 const collateral = yield this.getCollateral().getPoolToken();
+                const decimalsA = yield this.getBorrowableA().getDecimals();
+                const decimalsB = yield this.getBorrowableB().getDecimals();
                 if (factories_1.STABLE_FACTORIES.includes(this.impermaxFactory.getFactory())) {
                     const { twapReserve0, twapReserve1 } = yield collateral.methods.getTwapReserves().call();
-                    return getPriceFromReservesSolidlyStable(twapReserve0, twapReserve1);
+                    return (0, price_from_reserves_1.getPriceFromReservesSolidlyStable)(twapReserve0 / Math.pow(10, decimalsA), twapReserve1 / Math.pow(10, decimalsB));
                 }
                 let price;
                 if (factories_1.SOLIDEX_FACTORIES.includes(this.impermaxFactory.getFactory())) {
@@ -202,8 +205,6 @@ class OnchainLendingPool {
                 else {
                     price = (yield this.impermaxFactory.getSimpleUniswapOracle().methods.getResult(this.pairAddress).call()).price;
                 }
-                const decimalsA = yield this.getBorrowableA().getDecimals();
-                const decimalsB = yield this.getBorrowableB().getDecimals();
                 return price / Math.pow(2, 112) * Math.pow(10, decimalsA) / Math.pow(10, decimalsB);
             }
             catch (e) {

package/lib/utils/price-from-reserves.d.ts

@@ -1,2 +1,2 @@
-declare function getPriceFromReservesUniswapV2(x: number, y: number, priceInverted?: boolean): number;
-declare function getPriceFromReservesSolidlyStable(x: number, y: number, priceInverted?: boolean): number;
+export declare function getPriceFromReservesUniswapV2(x: number, y: number, priceInverted?: boolean): number;
+export declare function getPriceFromReservesSolidlyStable(x: number, y: number, priceInverted?: boolean): number;

package/lib/utils/price-from-reserves.js

@@ -1,4 +1,7 @@
+"use strict";
 // return X/Y price
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getPriceFromReservesSolidlyStable = exports.getPriceFromReservesUniswapV2 = void 0;
 /*
 * X/Y price is given by dividing Y reserves by X reserves
 */
@@ -6,9 +9,12 @@ function getPriceFromReservesUniswapV2(x, y, priceInverted = true) {
     const price = y / x;
     return !priceInverted ? price : 1 / price;
 }
+exports.getPriceFromReservesUniswapV2 = getPriceFromReservesUniswapV2;
 function getPriceFromReservesSolidlyStable(x, y, priceInverted = false) {
     const N = 3 * x ^ 2 * y + y ^ 3;
     const D = 3 * y ^ 2 * x + x ^ 3;
     const price = N / D;
+    console.log(x, y, price);
     return !priceInverted ? price : 1 / price;
 }
+exports.getPriceFromReservesSolidlyStable = getPriceFromReservesSolidlyStable;

package/package.json

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