impermax-sdk 2.1.81 → 2.1.83

package/lib/onchain/account/lendingPool/nftlp/onchainAccountNftlpUniswapV3.d.ts

@@ -19,6 +19,7 @@ export default class OnchainAccountNftlpUniswapV3 extends OnchainAccountNftlp {
             [keys in number]: Promise<UniswapV3Position>;
         };
     };
+    getNftlp: () => any;
     protected initializePositionData(tokenId: number): Promise<PositionData>;
     protected getPositionData(tokenId: number): Promise<PositionData>;
     getFee(tokenId: number): Promise<number>;
@@ -28,7 +29,7 @@ export default class OnchainAccountNftlpUniswapV3 extends OnchainAccountNftlp {
     getPriceB(tokenId: number): Promise<number>;
     getLiquidity(tokenId: number): Promise<number>;
     createPositionObject(tokenId: number, lockStateChange?: boolean): Promise<UniswapV3Position>;
-    createNewPositionObject(fee: number, tickLower: number, tickUpper: number, lockStateChange?: boolean): Promise<UniswapV3Position>;
+    createNewPositionObject(fee: number, priceA: number, priceB: number, lockStateChange?: boolean): Promise<UniswapV3Position>;
     getPositionObject(tokenId: number): Promise<UniswapV3Position>;
 }
 export {};

package/lib/onchain/account/lendingPool/nftlp/onchainAccountNftlpUniswapV3.js

@@ -18,6 +18,7 @@ class OnchainAccountNftlpUniswapV3 extends onchainAccountNftlp_1.default {
     constructor() {
         super(...arguments);
         this.cache = {};
+        this.getNftlp = () => this.getLendingPool().getLendingPool().getNftlp();
     }
     initializePositionData(tokenId) {
         return __awaiter(this, void 0, void 0, function* () {
@@ -51,12 +52,12 @@ class OnchainAccountNftlpUniswapV3 extends onchainAccountNftlp_1.default {
     }
     getPriceA(tokenId) {
         return __awaiter(this, void 0, void 0, function* () {
-            return Math.pow(1.0001, yield this.getTickLower(tokenId));
+            return this.getNftlp().tickToPrice(yield this.getTickLower(tokenId));
         });
     }
     getPriceB(tokenId) {
         return __awaiter(this, void 0, void 0, function* () {
-            return Math.pow(1.0001, yield this.getTickUpper(tokenId));
+            return this.getNftlp().tickToPrice(yield this.getTickUpper(tokenId));
         });
     }
     getLiquidity(tokenId) {
@@ -69,9 +70,9 @@ class OnchainAccountNftlpUniswapV3 extends onchainAccountNftlp_1.default {
             return new uniswapV3Position_1.default(yield this.getLiquidity(tokenId), yield this.getLendingPool().getBorrowableA().getBorrowed(tokenId), yield this.getLendingPool().getBorrowableB().getBorrowed(tokenId), yield this.getNftlp().getMarketPrice(), yield this.getNftlp().getOraclePrice(), yield this.getPriceA(tokenId), yield this.getPriceB(tokenId), yield this.getLendingPool().getSafetyMargin(), yield this.getLendingPool().getLiquidationPenalty(), lockStateChange);
         });
     }
-    createNewPositionObject(fee, tickLower, tickUpper, lockStateChange = false) {
+    createNewPositionObject(fee, priceA, priceB, lockStateChange = false) {
         return __awaiter(this, void 0, void 0, function* () {
-            return new uniswapV3Position_1.default(0, 0, 0, yield this.getNftlp().getMarketPrice(), yield this.getNftlp().getOraclePrice(), Math.pow(1.0001, tickLower), Math.pow(1.0001, tickUpper), yield this.getLendingPool().getSafetyMargin(), yield this.getLendingPool().getLiquidationPenalty(), lockStateChange);
+            return new uniswapV3Position_1.default(0, 0, 0, yield this.getNftlp().getMarketPrice(), yield this.getNftlp().getOraclePrice(), priceA, priceB, yield this.getLendingPool().getSafetyMargin(), yield this.getLendingPool().getLiquidationPenalty(), lockStateChange);
         });
     }
     getPositionObject(tokenId) {

package/lib/onchain/impermaxFactory/lendingPool/nftlp/onchainNftlpUniswapV3.d.ts

@@ -20,4 +20,6 @@ export default class OnchainNftlpUniswapV3 extends OnchainNftlp {
     getUniswapV3Pool(fee: number): Promise<any>;
     protected initializeMarketPrice(): Promise<number>;
     protected initializeOraclePrice(): Promise<number>;
+    tickToPrice(tick: number): Promise<number>;
+    priceToTick(price: number): Promise<number>;
 }

package/lib/onchain/impermaxFactory/lendingPool/nftlp/onchainNftlpUniswapV3.js

@@ -78,5 +78,22 @@ class OnchainNftlpUniswapV3 extends onchainNftlp_1.default {
             return Math.pow((nftlp.methods.oraclePriceSqrtX96().call() / Math.pow(2, 96)), 2);
         });
     }
+    tickToPrice(tick) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const decimalA = yield this.getLendingPool().getBorrowableA().getDecimals();
+            const decimalB = yield this.getLendingPool().getBorrowableB().getDecimals();
+            const netDecimal = decimalA - decimalB;
+            return Math.pow(1.0001, tick) * Math.pow(10, netDecimal);
+        });
+    }
+    priceToTick(price) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const decimalA = yield this.getLendingPool().getBorrowableA().getDecimals();
+            const decimalB = yield this.getLendingPool().getBorrowableB().getDecimals();
+            const netDecimal = decimalA - decimalB;
+            // TODO round to tick precision
+            return Math.log(price / Math.pow(10, netDecimal)) / Math.log(1.0001);
+        });
+    }
 }
 exports.default = OnchainNftlpUniswapV3;

package/lib/onchain/interactions/lendingPool/nftlp/onchainInteractionsNftlpUniswapV3.js

@@ -38,7 +38,9 @@ class OnchainInteractionsNftlpUniswapV3 extends onchainInteractionsNftlp_1.defau
                 borrowBDelta < 0)
                 throw new Error("Unexpected negative inputs");
             const actionsGetter = this.getActionsGetter();
-            const result = yield this._getUpdatePositionActions(-1, yield this.getAccountNftlp().createNewPositionObject(fee, tickLower, tickUpper), depositADelta, depositBDelta, borrowADelta, borrowBDelta);
+            const priceA = yield this.getNftlp().tickToPrice(tickLower);
+            const priceB = yield this.getNftlp().tickToPrice(tickUpper);
+            const result = yield this._getUpdatePositionActions(-1, yield this.getAccountNftlp().createNewPositionObject(fee, priceA, priceB), depositADelta, depositBDelta, borrowADelta, borrowBDelta);
             // TODO check fee and ticks encoding
             result.actions.unshift(yield actionsGetter.methods.getMintUniV3EmptyAction(fee.toString(), tickLower.toString(), tickUpper.toString()).call());
             return result;

package/lib/utils/nftlpMath/uniswapV3Position.js

@@ -58,14 +58,23 @@ class UniswapV3Position {
     // amountX and amountY are expected to have the same sign
     getOptimalLiquidityAtMarketPrice(amountX, amountY) {
         let liquidity;
+        console.log("initial", amountX, amountY);
         if (amountX != 0 && amountY != 0) {
             const sampleX = this.getRealX(this.marketPrice);
             const sampleY = this.getRealY(this.marketPrice);
-            if (Math.abs(amountX) / sampleX > Math.abs(amountY) / sampleY)
-                amountX = amountY / sampleY * sampleX;
-            else
-                amountY = amountX / sampleX * sampleY;
+            console.log("sample", sampleX, sampleY);
+            if (sampleX == 0)
+                amountX = 0;
+            else if (sampleX == 0)
+                amountY = 0;
+            else {
+                if (Math.abs(amountX) / sampleX > Math.abs(amountY) / sampleY)
+                    amountX = amountY / sampleY * sampleX;
+                else
+                    amountY = amountX / sampleX * sampleY;
+            }
         }
+        console.log("final", amountX, amountY);
         liquidity = this.getLiquidity(this.marketPrice, amountX, amountY);
         return { liquidity, amountX, amountY };
     }

package/package.json

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