impermax-sdk 2.1.266 → 2.1.267

package/lib/offchain/account/lendingPool/nftlp/offchainAccountNftlpUniswapV3.js

@@ -60,6 +60,8 @@ class OffchainAccountNftlpUniswapV3 extends offchainAccountNftlp_1.default {
             priceB: await this.getPriceB(tokenId),
             safetyMargin: await this.getLendingPool().getSafetyMargin(),
             liquidationPenalty: await this.getLendingPool().getLiquidationPenalty(),
+            borrowableX: await this.getNftlp().getLendingPool().getBorrowableA().createBorrowableObject(),
+            borrowableY: await this.getNftlp().getLendingPool().getBorrowableB().createBorrowableObject(),
         });
     }
     async getPositionObject(tokenId) {

package/lib/offchain/account/lendingPool/offchainAccountCollateralV2.d.ts

@@ -17,6 +17,6 @@ export default class OffchainAccountCollateralV2 extends OffchainAccountPoolToke
     getTokens(): Promise<number>;
     getAmount(): Promise<number>;
     private getLiquidity;
-    createPositionObject(lockStateChange?: boolean): Promise<UniswapV2Position>;
+    createPositionObject(): Promise<UniswapV2Position>;
     getPositionObject(): Promise<UniswapV2Position>;
 }

package/lib/offchain/account/lendingPool/offchainAccountCollateralV2.js

@@ -33,7 +33,7 @@ class OffchainAccountCollateralV2 extends offchainAccountPoolToken_1.default {
         return await this.getTokens() * await this.getCollateral().getGrowthFactor();
     }
     // Notice: createNewPositionObject is not needed for V2
-    async createPositionObject(lockStateChange = false) {
+    async createPositionObject() {
         //if (await this.getLendingPool().getLendingPool().isStable()) {
         // TODO return stablePosition
         //} else {
@@ -45,6 +45,8 @@ class OffchainAccountCollateralV2 extends offchainAccountPoolToken_1.default {
             oraclePrice: await this.getLendingPool().getLendingPool().getMarketPrice(),
             safetyMargin: await this.getLendingPool().getSafetyMargin(),
             liquidationPenalty: await this.getLendingPool().getLiquidationPenalty(),
+            borrowableX: await this.getLendingPool().getLendingPool().getBorrowableA().createBorrowableObject(),
+            borrowableY: await this.getLendingPool().getLendingPool().getBorrowableB().createBorrowableObject(),
         });
         //}
     }

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

@@ -99,8 +99,8 @@ class OnchainAccountNftlpUniswapV3 extends onchainAccountNftlp_1.default {
             priceB: await this.getPriceB(tokenId),
             safetyMargin: await this.getLendingPool().getSafetyMargin(),
             liquidationPenalty: await this.getLendingPool().getLiquidationPenalty(),
-            availableToBorrowX: await this.getNftlp().getLendingPool().getBorrowableA().getAvailableToBorrow(),
-            availableToBorrowY: await this.getNftlp().getLendingPool().getBorrowableB().getAvailableToBorrow(),
+            borrowableX: await this.getNftlp().getLendingPool().getBorrowableA().createBorrowableObject(lockStateChange),
+            borrowableY: await this.getNftlp().getLendingPool().getBorrowableB().createBorrowableObject(lockStateChange),
             lockStateChange,
         });
     }
@@ -117,8 +117,8 @@ class OnchainAccountNftlpUniswapV3 extends onchainAccountNftlp_1.default {
             priceB: await this.getNftlp().nearestUsableTickPrice(priceB, fee),
             safetyMargin: await this.getLendingPool().getSafetyMargin(),
             liquidationPenalty: await this.getLendingPool().getLiquidationPenalty(),
-            availableToBorrowX: await this.getNftlp().getLendingPool().getBorrowableA().getAvailableToBorrow(),
-            availableToBorrowY: await this.getNftlp().getLendingPool().getBorrowableB().getAvailableToBorrow(),
+            borrowableX: await this.getNftlp().getLendingPool().getBorrowableA().createBorrowableObject(lockStateChange),
+            borrowableY: await this.getNftlp().getLendingPool().getBorrowableB().createBorrowableObject(lockStateChange),
             lockStateChange,
         });
     }

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

@@ -45,8 +45,8 @@ class OnchainAccountCollateralV2 extends onchainAccountPoolToken_1.default {
             oraclePrice: await this.getLendingPool().getLendingPool().getTWAPPrice(),
             safetyMargin: await this.getLendingPool().getSafetyMargin(),
             liquidationPenalty: await this.getLendingPool().getLiquidationPenalty(),
-            availableToBorrowX: await this.getLendingPool().getLendingPool().getBorrowableA().getAvailableToBorrow(),
-            availableToBorrowY: await this.getLendingPool().getLendingPool().getBorrowableB().getAvailableToBorrow(),
+            borrowableX: await this.getLendingPool().getLendingPool().getBorrowableA().createBorrowableObject(lockStateChange),
+            borrowableY: await this.getLendingPool().getLendingPool().getBorrowableB().createBorrowableObject(lockStateChange),
             lockStateChange,
         });
         //}

package/lib/utils/position/genericPosition.d.ts

@@ -1,4 +1,5 @@
 import Position from "./interface";
+import { BorrowableEntity } from "../borrowableEntity";
 export interface GenericPositionParams {
     liquidity: number;
     debtX: number;
@@ -7,8 +8,8 @@ export interface GenericPositionParams {
     oraclePrice: number;
     safetyMargin: number;
     liquidationPenalty: number;
-    availableToBorrowX?: number;
-    availableToBorrowY?: number;
+    borrowableX: BorrowableEntity;
+    borrowableY: BorrowableEntity;
     lockStateChange?: boolean;
 }
 export declare abstract class GenericPosition implements Position {
@@ -30,8 +31,8 @@ export declare abstract class GenericPosition implements Position {
     oraclePrice: number;
     safetyMargin: number;
     liquidationPenalty: number;
-    availableToBorrowX: number;
-    availableToBorrowY: number;
+    borrowableX: BorrowableEntity;
+    borrowableY: BorrowableEntity;
     constructor(params: GenericPositionParams);
     protected checkLock(): void;
     /**

package/lib/utils/position/genericPosition.js

@@ -15,8 +15,8 @@ class GenericPosition {
         this.oraclePrice = params.oraclePrice;
         this.safetyMargin = params.safetyMargin;
         this.liquidationPenalty = params.liquidationPenalty;
-        this.availableToBorrowX = params.availableToBorrowX ?? 0;
-        this.availableToBorrowY = params.availableToBorrowY ?? 0;
+        this.borrowableX = params.borrowableX;
+        this.borrowableY = params.borrowableY;
         this.lockStateChange = params.lockStateChange ?? true;
         this.state = 0;
     }
@@ -237,26 +237,30 @@ class GenericPosition {
         this.setLiquidity(this.initialLiquidity * (1 - percentageToRemove));
     }
     borrowX(amount) {
-        if (amount > this.availableToBorrowX) {
+        if (amount > this.borrowableX.getInitialAvailableToBorrow()) {
             throw new Error("Trying to borrow more than available liquidity");
         }
         else {
             this.setDebtX(this.initialDebtX + amount);
+            this.borrowableX.borrow(amount);
         }
     }
     borrowY(amount) {
-        if (amount > this.availableToBorrowY) {
+        if (amount > this.borrowableY.getInitialAvailableToBorrow()) {
             throw new Error("Trying to borrow more than available liquidity");
         }
         else {
             this.setDebtY(this.initialDebtY + amount);
+            this.borrowableY.borrow(amount);
         }
     }
     repayX(amount) {
         this.setDebtX(Math.max(this.initialDebtX - amount, 0));
+        this.borrowableX.repay(amount);
     }
     repayY(amount) {
         this.setDebtY(Math.max(this.initialDebtY - amount, 0));
+        this.borrowableY.repay(amount);
     }
     /**
      * PUBLIC GETTERS
@@ -399,8 +403,8 @@ class GenericPosition {
         const realY = this.getRealY();
         let maxDeltaX = realX * highLeverage / currentLeverage;
         let maxDeltaY = realY * highLeverage / currentLeverage;
-        const actualAvailableToBorrowX = this.availableToBorrowX - (this.debtX - this.initialDebtX);
-        const actualAvailableToBorrowY = this.availableToBorrowY - (this.debtY - this.initialDebtY);
+        const actualAvailableToBorrowX = this.borrowableX.getAvailableToBorrow();
+        const actualAvailableToBorrowY = this.borrowableY.getAvailableToBorrow();
         if (maxDeltaX > actualAvailableToBorrowX) {
             maxDeltaY *= actualAvailableToBorrowX / maxDeltaX;
             maxDeltaX = actualAvailableToBorrowX;
@@ -453,7 +457,7 @@ class GenericPosition {
         const equityValue = this.getEquityValue();
         const highDebtX = this.getAmountXGivenValue(equityValue);
         const [debtX,] = this.getMaxDeltaDebtInRange(0, 0, highDebtX, 0);
-        return Math.min(debtX + this.debtX - this.initialDebtX, this.availableToBorrowX);
+        return Math.min(debtX + this.debtX - this.initialDebtX, this.borrowableX.getAvailableToBorrow());
     }
     getMaxBorrowableY() {
         if (this.isLiquidatable())
@@ -461,7 +465,7 @@ class GenericPosition {
         const equityValue = this.getEquityValue();
         const highDebtY = this.getAmountYGivenValue(equityValue);
         const [, debtY] = this.getMaxDeltaDebtInRange(0, 0, 0, highDebtY);
-        return Math.min(debtY + this.debtY - this.initialDebtY, this.availableToBorrowY);
+        return Math.min(debtY + this.debtY - this.initialDebtY, this.borrowableY.getAvailableToBorrow());
     }
 }
 exports.GenericPosition = GenericPosition;

package/lib/utils/position/uniswapV2/index.d.ts

@@ -1,4 +1,5 @@
 import GenericPosition from "../genericPosition";
+import { BorrowableEntity } from "../../borrowableEntity";
 export interface UniswapV2PositionParams {
     liquidity: number;
     debtX: number;
@@ -7,8 +8,8 @@ export interface UniswapV2PositionParams {
     oraclePrice: number;
     safetyMargin: number;
     liquidationPenalty: number;
-    availableToBorrowX?: number;
-    availableToBorrowY?: number;
+    borrowableX: BorrowableEntity;
+    borrowableY: BorrowableEntity;
     lockStateChange?: boolean;
 }
 export declare class UniswapV2Position extends GenericPosition {

package/lib/utils/position/uniswapV3/index.d.ts

@@ -1,4 +1,5 @@
 import GenericPosition from "../genericPosition";
+import { BorrowableEntity } from "../../borrowableEntity";
 export interface UniswapV3PositionParams {
     liquidity: number;
     unclaimedFeesX: number;
@@ -11,8 +12,8 @@ export interface UniswapV3PositionParams {
     oraclePrice: number;
     safetyMargin: number;
     liquidationPenalty: number;
-    availableToBorrowX?: number;
-    availableToBorrowY?: number;
+    borrowableX: BorrowableEntity;
+    borrowableY: BorrowableEntity;
     lockStateChange?: boolean;
 }
 export declare class UniswapV3Position extends GenericPosition {

package/package.json

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