impermax-sdk 2.1.293 → 2.1.295

package/lib/offchain/account/lendingPool/nftlp/offchainAccountNftlpUniswapV3.d.ts

@@ -8,17 +8,17 @@ interface PositionData {
     liquidity: number;
     feeGrowthInside0LastX128: number;
     feeGrowthInside1LastX128: number;
-    unclaimedFees0: number;
-    unclaimedFees1: number;
+    storedUnclaimedFees0: number;
+    storedUnclaimedFees1: number;
     storedTotalFeesEarned0: number;
     storedTotalFeesEarned1: number;
 }
 export type UniswapV3PositionData = NftlpPosition & {
     nftlp: PositionData;
 };
-interface PositionFees {
-    unclaimedFees0: number;
-    unclaimedFees1: number;
+interface FeeAmounts {
+    amountX: number;
+    amountY: number;
 }
 export default class OffchainAccountNftlpUniswapV3 extends OffchainAccountNftlp {
     protected cache: {
@@ -28,8 +28,8 @@ export default class OffchainAccountNftlpUniswapV3 extends OffchainAccountNftlp
         positionsObject?: {
             [keys in number]: Promise<UniswapV3Position>;
         };
-        pendingFees?: {
-            [keys in number]: PositionFees;
+        newlyEarnedFees?: {
+            [keys in number]: FeeAmounts;
         };
     };
     getNftlp: () => any;
@@ -43,10 +43,10 @@ export default class OffchainAccountNftlpUniswapV3 extends OffchainAccountNftlp
     getLiquidity(tokenId: number): Promise<number>;
     createPositionObject(tokenId: number): Promise<UniswapV3Position>;
     getPositionObject(tokenId: number): Promise<UniswapV3Position>;
-    getUnclaimedFees(tokenId: number): Promise<PositionFees>;
-    getTotalAccruedFees(tokenId: number): Promise<{
-        accruedFees0: number;
-        accruedFees1: number;
-    }>;
+    getNewlyEarnedFees(tokenId: number): Promise<FeeAmounts>;
+    getStoredUnclaimedFees(tokenId: number): Promise<FeeAmounts>;
+    getStoredTotalFeesEarned(tokenId: number): Promise<FeeAmounts>;
+    getUnclaimedFees(tokenId: number): Promise<FeeAmounts>;
+    getTotalFeesEarned(tokenId: number): Promise<FeeAmounts>;
 }
 export {};

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

@@ -47,11 +47,11 @@ class OffchainAccountNftlpUniswapV3 extends offchainAccountNftlp_1.default {
         return (0, uniswapV3General_1.formatUniV3Liquidity)(liquidity, decimalsA, decimalsB);
     }
     async createPositionObject(tokenId) {
-        const { unclaimedFees0, unclaimedFees1 } = await this.getUnclaimedFees(tokenId);
+        const unclaimedFees = await this.getUnclaimedFees(tokenId);
         return new uniswapV3_1.default({
             liquidity: await this.getLiquidity(tokenId),
-            unclaimedFeesX: unclaimedFees0,
-            unclaimedFeesY: unclaimedFees1,
+            unclaimedFeesX: unclaimedFees.amountX,
+            unclaimedFeesY: unclaimedFees.amountY,
             debtX: await this.getLendingPool().getBorrowableA().getBorrowedAmount(tokenId),
             debtY: await this.getLendingPool().getBorrowableB().getBorrowedAmount(tokenId),
             marketPrice: await this.getNftlp().getMarketPrice(),
@@ -72,35 +72,51 @@ class OffchainAccountNftlpUniswapV3 extends offchainAccountNftlp_1.default {
             this.cache.positionsObject[tokenId] = this.createPositionObject(tokenId);
         return this.cache.positionsObject[tokenId];
     }
-    async getUnclaimedFees(tokenId) {
-        if (!this.cache.pendingFees)
-            this.cache.pendingFees = {};
-        if (tokenId in this.cache.pendingFees)
-            return this.cache.pendingFees[tokenId];
+    async getNewlyEarnedFees(tokenId) {
+        if (!this.cache.newlyEarnedFees)
+            this.cache.newlyEarnedFees = {};
+        if (tokenId in this.cache.newlyEarnedFees)
+            return this.cache.newlyEarnedFees[tokenId];
         const network = this.getLendingPool().getLendingPool().getOffchain().network;
         const factory = this.getLendingPool().getLendingPool().getFactory();
         const lendingPoolId = this.getLendingPool().getLendingPool().getPairAddress();
         const api = private_api_1.NFTLP_FEE_API[network][factory];
         if (!api) {
-            console.log(`Missing Fees API for ${lendingPoolId} on ${network}?`);
-            return { unclaimedFees0: 0, unclaimedFees1: 0 };
+            console.log(`Missing newly earned fees API for ${lendingPoolId} on ${network}?`);
+            return { amountX: 0, amountY: 0 };
         }
         try {
             const positionFees = await fetch(api.concat(`collect/${lendingPoolId}/${tokenId}`)).then(i => i.json());
-            this.cache.pendingFees[tokenId] = { unclaimedFees0: Number(positionFees.feesEarned0), unclaimedFees1: Number(positionFees.feesEarned1) };
-            return this.cache.pendingFees[tokenId];
+            this.cache.newlyEarnedFees[tokenId] = { amountX: Number(positionFees.newlyEarnedFees0), amountY: Number(positionFees.newlyEarnedFees1) };
+            return this.cache.newlyEarnedFees[tokenId];
         }
         catch (err) {
-            console.log(`No pending fees data for ${lendingPoolId} on ${network}`);
-            return { unclaimedFees0: 0, unclaimedFees1: 0 };
+            console.log(`No newly earned fees data for ${lendingPoolId} on ${network}`);
+            return { amountX: 0, amountY: 0 };
         }
     }
-    async getTotalAccruedFees(tokenId) {
+    async getStoredUnclaimedFees(tokenId) {
+        const { storedUnclaimedFees0, storedUnclaimedFees1 } = (await this.getPositionData(tokenId));
+        return { amountX: Number(storedUnclaimedFees0), amountY: Number(storedUnclaimedFees1) };
+    }
+    async getStoredTotalFeesEarned(tokenId) {
         const { storedTotalFeesEarned0, storedTotalFeesEarned1 } = (await this.getPositionData(tokenId));
-        const { unclaimedFees0, unclaimedFees1 } = await this.getUnclaimedFees(tokenId);
+        return { amountX: Number(storedTotalFeesEarned0), amountY: Number(storedTotalFeesEarned1) };
+    }
+    async getUnclaimedFees(tokenId) {
+        const storedUnclaimedFees = await this.getStoredUnclaimedFees(tokenId);
+        const newlyEarnedFees = await this.getNewlyEarnedFees(tokenId);
+        return {
+            amountX: storedUnclaimedFees.amountX + newlyEarnedFees.amountX,
+            amountY: storedUnclaimedFees.amountY + newlyEarnedFees.amountY,
+        };
+    }
+    async getTotalFeesEarned(tokenId) {
+        const storedTotalFeesEarned = await this.getStoredTotalFeesEarned(tokenId);
+        const newlyEarnedFees = await this.getNewlyEarnedFees(tokenId);
         return {
-            accruedFees0: Number(storedTotalFeesEarned0) + unclaimedFees0,
-            accruedFees1: Number(storedTotalFeesEarned1) + unclaimedFees1,
+            amountX: storedTotalFeesEarned.amountX + newlyEarnedFees.amountX,
+            amountY: storedTotalFeesEarned.amountY + newlyEarnedFees.amountY,
         };
     }
 }

package/lib/offchain/lendingPool/nftlp/offchainNftlpUniswapV3.js

@@ -43,13 +43,9 @@ class OffchainNftlpUniswapV3 extends offchainNftlp_1.default {
         const feeRaw = fee * 1000000;
         const nftlpUniswapV3Data = await this.getNftlpData();
         const pools = nftlpUniswapV3Data.uniswapV3Pools;
-        console.log("feeRaw", feeRaw);
-        console.log("pools", pools);
         for (let pool of pools) {
             if (parseInt(pool.fee) == feeRaw) {
-                console.log("initializeUniswapV3Pool");
                 const liquidity = parseInt(pool.liquidity);
-                console.log("liquidity", liquidity);
                 const decimalsA = await this.getLendingPool().getBorrowableA().getDecimals();
                 const decimalsB = await this.getLendingPool().getBorrowableB().getDecimals();
                 return {
@@ -83,10 +79,6 @@ class OffchainNftlpUniswapV3 extends offchainNftlp_1.default {
         const llamaApyBase = apyBase / 100;
         const apr1dFees = volumeUsd1d * fee * 365 / tvlUsd;
         const apr7dFees = volumeUsd7d * fee / 7 * 365 / tvlUsd;
-        console.log("llamaApyBase", llamaApyBase);
-        console.log("apr1dFees", apr1dFees);
-        console.log("apr7dFees", apr7dFees);
-        console.log("tvlUsd", tvlUsd);
         // convert llama apy to rate
         const avgRate = apr7dFees / utils_1.SECONDS_IN_YEAR;
         // calculate the usd price of 1 unit of formatted liquidity
@@ -97,11 +89,6 @@ class OffchainNftlpUniswapV3 extends offchainNftlp_1.default {
         const baseLiquidityUsd = pool.liquidity * baseLiquidityPrice;
         const avgConcentrationFactor = baseLiquidityUsd / tvlUsd;
         const fullRangeRate = avgRate / avgConcentrationFactor;
-        console.log("avgRate", avgRate);
-        console.log("baseLiquidityPrice", baseLiquidityPrice);
-        console.log("baseLiquidityUsd", baseLiquidityUsd);
-        console.log("avgConcentrationFactor", avgConcentrationFactor);
-        console.log("fullRangeRate", fullRangeRate);
         return { fullRangeRate, tvlUsd };
     }
     async getFullRangeRate(fee) {
@@ -116,15 +103,11 @@ class OffchainNftlpUniswapV3 extends offchainNftlp_1.default {
             totalTvl += tvlUsd;
             totalCompoundedRate += fullRangeRate * tvlUsd;
         }
-        console.log("totalTvl", totalTvl);
-        console.log("totalCompoundedRate", totalCompoundedRate);
         return totalTvl > 0 ? totalCompoundedRate / totalTvl : 0;
     }
     // calculate the pair APR assuming a +-30% price range
     async getTotalAPR() {
         const fullRangeAPR = await this.getWeightedAvgFullRangeRate() * utils_1.SECONDS_IN_YEAR;
-        console.log("fullRangeAPR", fullRangeAPR);
-        console.log("uniV3ConcentrationFactor", (0, uniswapV3General_1.uniV3ConcentrationFactor)(1 / 1.3, 1.3));
         return fullRangeAPR * (0, uniswapV3General_1.uniV3ConcentrationFactor)(1 / 1.3, 1.3);
     }
 }

package/lib/offchain/queries/apis/ponder/index.js

@@ -494,6 +494,8 @@ class PonderQueryBuilder {
           feeGrowthInside1LastX128
           storedTotalFeesEarned0
           storedTotalFeesEarned1
+          storedUnclaimedFees0
+          storedUnclaimedFees1
           id
           nftlp {
             factory {

package/lib/utils/nftlpMath/uniswapV3General.js

@@ -91,7 +91,6 @@ function uniV3ConcentrationFactor(priceA, priceB) {
     if (priceB > exports.MAX_PRICE)
         priceB = exports.MAX_PRICE;
     const deviationFromAvg = Math.sqrt(priceB / priceA);
-    console.log("deviationFromAvg", deviationFromAvg);
     return 1 / (1 - 1 / Math.sqrt(deviationFromAvg));
 }
 exports.uniV3ConcentrationFactor = uniV3ConcentrationFactor;

package/lib/utils/position/uniswapV3/index.js

@@ -80,9 +80,11 @@ class UniswapV3Position extends genericPosition_1.default {
         return this.getInitialRealY() + this.initialUnclaimedFeesY;
     }
     getDepositedX() {
+        console.log("getDepositedX", this.getRealX() + this.unclaimedFeesX, this.getRealX(), this.unclaimedFeesX);
         return this.getRealX() + this.unclaimedFeesX;
     }
     getDepositedY() {
+        console.log("getDepositedY", this.getRealY() + this.unclaimedFeesY, this.getRealY(), this.unclaimedFeesY);
         return this.getRealY() + this.unclaimedFeesY;
     }
     getBaseRate() {
@@ -92,8 +94,6 @@ class UniswapV3Position extends genericPosition_1.default {
         if (this.priceB < this.marketPrice)
             return 0;
         // otherwise calculate the rate based on the concentration factor
-        console.log("this.fullRangeRate", this.fullRangeRate);
-        console.log("getBaseRate", this.fullRangeRate * (0, uniswapV3General_1.uniV3ConcentrationFactor)(this.priceA, this.priceB));
         return this.fullRangeRate * (0, uniswapV3General_1.uniV3ConcentrationFactor)(this.priceA, this.priceB);
     }
     // maxAmountX and maxAmountY are expected to have the same sign

package/package.json

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