impermax-sdk 1.1.56 → 1.1.58

package/lib/abis/contracts/ICollateral.json

@@ -648,6 +648,21 @@
             "stateMutability": "view",
             "type": "function"
         },
+        {
+            "constant": true,
+            "inputs": [],
+            "name": "safetyMargin",
+            "outputs": [
+                {
+                    "internalType": "uint256",
+                    "name": "",
+                    "type": "uint256"
+                }
+            ],
+            "payable": false,
+            "stateMutability": "view",
+            "type": "function"
+        },
         {
             "constant": true,
             "inputs": [],
@@ -678,6 +693,26 @@
             "stateMutability": "nonpayable",
             "type": "function"
         },
+        {
+            "constant": false,
+            "inputs": [],
+            "name": "getTwapReserves",
+            "outputs": [
+                {
+                    "internalType": "uint112",
+                    "name": "twapReserve0",
+                    "type": "uint112"
+                },
+                {
+                    "internalType": "uint112",
+                    "name": "twapReserve1",
+                    "type": "uint112"
+                }
+            ],
+            "payable": false,
+            "stateMutability": "nonpayable",
+            "type": "function"
+        },
         {
             "constant": false,
             "inputs": [],
@@ -903,6 +938,36 @@
             "stateMutability": "pure",
             "type": "function"
         },
+        {
+            "constant": true,
+            "inputs": [],
+            "name": "SAFETY_MARGIN_MIN",
+            "outputs": [
+                {
+                    "internalType": "uint256",
+                    "name": "",
+                    "type": "uint256"
+                }
+            ],
+            "payable": false,
+            "stateMutability": "pure",
+            "type": "function"
+        },
+        {
+            "constant": true,
+            "inputs": [],
+            "name": "SAFETY_MARGIN_MAX",
+            "outputs": [
+                {
+                    "internalType": "uint256",
+                    "name": "",
+                    "type": "uint256"
+                }
+            ],
+            "payable": false,
+            "stateMutability": "pure",
+            "type": "function"
+        },
         {
             "constant": true,
             "inputs": [],
@@ -983,6 +1048,21 @@
             "stateMutability": "nonpayable",
             "type": "function"
         },
+        {
+            "constant": false,
+            "inputs": [
+                {
+                    "internalType": "uint256",
+                    "name": "newSafetyMargin",
+                    "type": "uint256"
+                }
+            ],
+            "name": "_setSafetyMargin",
+            "outputs": [],
+            "payable": false,
+            "stateMutability": "nonpayable",
+            "type": "function"
+        },
         {
             "constant": false,
             "inputs": [

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 = {};
@@ -179,16 +180,24 @@ class OnchainLendingPool {
     getMarketPrice() {
         return __awaiter(this, void 0, void 0, function* () {
             const [reserve0, reserve1] = yield this.getReserves();
-            return this.impermaxFactory.getOnchain().priceInverted ? 1 * reserve0 / reserve1 : 1 * reserve1 / reserve0;
+            const priceInverted = this.impermaxFactory.getOnchain().priceInverted;
+            if (factories_1.STABLE_FACTORIES.includes(this.impermaxFactory.getFactory()))
+                return (0, price_from_reserves_1.getPriceFromReservesSolidlyStable)(reserve0, reserve1, priceInverted);
+            else
+                return (0, price_from_reserves_1.getPriceFromReservesUniswapV2)(reserve0, reserve1, priceInverted);
         });
     }
     // TWAP Price
     initializeTWAPPrice() {
         return __awaiter(this, void 0, void 0, function* () {
             try {
+                const collateral = yield this.getCollateral().getPoolToken();
+                if (factories_1.STABLE_FACTORIES.includes(this.impermaxFactory.getFactory())) {
+                    const { twapReserve0, twapReserve1 } = yield collateral.methods.getTwapReserves().call();
+                    return (0, price_from_reserves_1.getPriceFromReservesSolidlyStable)(twapReserve0, twapReserve1);
+                }
                 let price;
                 if (factories_1.SOLIDEX_FACTORIES.includes(this.impermaxFactory.getFactory())) {
-                    const collateral = yield this.getCollateral().getPoolToken();
                     price = yield collateral.methods.getTwapPrice112x112().call();
                 }
                 else {

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

@@ -0,0 +1,2 @@
+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

@@ -0,0 +1,19 @@
+"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
+*/
+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;
+    return !priceInverted ? price : 1 / price;
+}
+exports.getPriceFromReservesSolidlyStable = getPriceFromReservesSolidlyStable;

package/package.json

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