impermax-sdk 2.1.198 → 2.1.200

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

@@ -28,6 +28,18 @@ export default class OnchainAccountNftlpUniswapV3 extends OnchainAccountNftlp {
     getPriceA(tokenId: number): Promise<number>;
     getPriceB(tokenId: number): Promise<number>;
     getLiquidity(tokenId: number): Promise<number>;
+    getCurrentFeeGrowthInsideX128(tokenId: number): Promise<{
+        currentFeeGrowthInside0X128: number;
+        currentFeeGrowthInside1X128: number;
+    }>;
+    getCurrentUnclaimedFeesRaw(tokenId: number): Promise<{
+        unclaimedFees0: number;
+        unclaimedFees1: number;
+    }>;
+    getCurrentUnclaimedFees(tokenId: number): Promise<{
+        unclaimedFees0: number;
+        unclaimedFees1: number;
+    }>;
     createPositionObject(tokenId: number, lockStateChange?: boolean): Promise<UniswapV3Position>;
     createNewPositionObject(fee: number, priceA: number, priceB: number, lockStateChange?: boolean): Promise<UniswapV3Position>;
     getPositionObject(tokenId: number): Promise<UniswapV3Position>;

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

@@ -6,6 +6,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const onchainAccountNftlp_1 = __importDefault(require("./onchainAccountNftlp"));
 const uniswapV3_1 = __importDefault(require("../../../../utils/position/uniswapV3"));
 const uniswapV3General_1 = require("../../../../utils/nftlpMath/uniswapV3General");
+const REINVESTOR = '0x000000000000000000000000000000000000dead';
+const Q128 = 2 * 128;
 class OnchainAccountNftlpUniswapV3 extends onchainAccountNftlp_1.default {
     constructor() {
         super(...arguments);
@@ -44,9 +46,39 @@ class OnchainAccountNftlpUniswapV3 extends onchainAccountNftlp_1.default {
         const liquidity = (await this.getPositionData(tokenId)).liquidity;
         return (0, uniswapV3General_1.formatUniV3Liquidity)(liquidity, decimalsA, decimalsB);
     }
+    async getCurrentFeeGrowthInsideX128(tokenId) {
+        const multicall = this.getLendingPool().getAccount().getOnchain().multicall;
+        const nftlp = this.getNftlp().getNftlp();
+        const [_, position] = await multicall.aggregate([
+            nftlp.methods.reinvest(tokenId, REINVESTOR),
+            nftlp.methods.positions(tokenId)
+        ]);
+        return {
+            currentFeeGrowthInside0X128: position[4],
+            currentFeeGrowthInside1X128: position[5],
+        };
+    }
+    async getCurrentUnclaimedFeesRaw(tokenId) {
+        const { currentFeeGrowthInside0X128, currentFeeGrowthInside1X128 } = await this.getCurrentFeeGrowthInsideX128(tokenId);
+        const positionData = await this.getPositionData(tokenId);
+        const delta0 = currentFeeGrowthInside0X128 - positionData.feeGrowthInside0LastX128;
+        const delta1 = currentFeeGrowthInside1X128 - positionData.feeGrowthInside1LastX128;
+        return {
+            unclaimedFees0: positionData.unclaimedFees0 + delta0 * positionData.liquidity / Q128,
+            unclaimedFees1: positionData.unclaimedFees1 + delta1 * positionData.liquidity / Q128,
+        };
+    }
+    async getCurrentUnclaimedFees(tokenId) {
+        const raw = await this.getCurrentUnclaimedFeesRaw(tokenId);
+        return {
+            unclaimedFees0: this.getNftlp().getLendingPool().getBorrowableA().normalize(raw.unclaimedFees0),
+            unclaimedFees1: this.getNftlp().getLendingPool().getBorrowableB().normalize(raw.unclaimedFees1),
+        };
+    }
     async createPositionObject(tokenId, lockStateChange = true) {
-        return new uniswapV3_1.default(await this.getLiquidity(tokenId), 0, // TODO uncollectedFees
-        0, await this.getLendingPool().getBorrowableA().getBorrowed(tokenId), await this.getLendingPool().getBorrowableB().getBorrowed(tokenId), await this.getNftlp().getMarketPrice(), await this.getNftlp().getOraclePrice(), await this.getPriceA(tokenId), await this.getPriceB(tokenId), await this.getLendingPool().getSafetyMargin(), await this.getLendingPool().getLiquidationPenalty(), lockStateChange);
+        const unclaimedFees = await this.getCurrentUnclaimedFees(tokenId);
+        console.log("unclaimedFees", unclaimedFees);
+        return new uniswapV3_1.default(await this.getLiquidity(tokenId), unclaimedFees.unclaimedFees0, unclaimedFees.unclaimedFees1, await this.getLendingPool().getBorrowableA().getBorrowed(tokenId), await this.getLendingPool().getBorrowableB().getBorrowed(tokenId), await this.getNftlp().getMarketPrice(), await this.getNftlp().getOraclePrice(), await this.getPriceA(tokenId), await this.getPriceB(tokenId), await this.getLendingPool().getSafetyMargin(), await this.getLendingPool().getLiquidationPenalty(), lockStateChange);
     }
     async createNewPositionObject(fee, priceA, priceB, lockStateChange = false) {
         priceA = await this.getNftlp().nearestUsableTickPrice(priceA, fee);

package/lib/onchain/onchain.d.ts

@@ -25,7 +25,7 @@ export default class Onchain {
     protected lendingVaults: AddressIndex<OnchainLendingVault>;
     protected accounts: AddressIndex<OnchainAccount>;
     protected interactions: AddressIndex<OnchainInteractions>;
-    protected multicall: Multicall;
+    multicall: Multicall;
     constructor(cfg: OnchainConfig);
     cleanCache(): void;
     setPriceInverted(priceInverted: boolean): void;

package/package.json

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