impermax-sdk 2.1.177 → 2.1.178

package/lib/config/private-api.d.ts

@@ -4,5 +4,6 @@ import { Address, NetworkVaultTypeIndex, NetworkFactoryIndex } from "./types";
  * things (ie. charts, leaderboards, etc.). The app must function well
  * without any of these endpoints, so just nice to haves.
  */
-export declare const IMPERMAX_POOLS_API: NetworkFactoryIndex<Address>;
-export declare const IMPERMAX_VAULT_API: NetworkVaultTypeIndex<Address>;
+export declare const IMPERMAX_POOLS_API: NetworkFactoryIndex<string>;
+export declare const IMPERMAX_VAULT_API: NetworkVaultTypeIndex<string>;
+export declare const NFTLP_FEE_API: NetworkFactoryIndex<Address>;

package/lib/config/private-api.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.IMPERMAX_VAULT_API = exports.IMPERMAX_POOLS_API = void 0;
+exports.NFTLP_FEE_API = exports.IMPERMAX_VAULT_API = exports.IMPERMAX_POOLS_API = void 0;
 const types_1 = require("./types");
 /**
  * Private API Endpoints which we might need to use in future for non-core
@@ -65,4 +65,31 @@ exports.IMPERMAX_VAULT_API = {
     },
     [types_1.Networks.Linea]: {},
 };
+// :lendingPoolId/:tokenId
+exports.NFTLP_FEE_API = {
+    [types_1.Networks.Ropsten]: {},
+    [types_1.Networks.Mainnet]: {},
+    [types_1.Networks.Polygon]: {},
+    [types_1.Networks.Arbitrum]: {},
+    [types_1.Networks.Avalanche]: {},
+    [types_1.Networks.Moonriver]: {},
+    [types_1.Networks.Aurora]: {},
+    [types_1.Networks.Cronos]: {},
+    [types_1.Networks.Fantom]: {},
+    [types_1.Networks.Harmony]: {},
+    [types_1.Networks.Moonbeam]: {},
+    [types_1.Networks.Sxnetwork]: {},
+    [types_1.Networks.Canto]: {},
+    [types_1.Networks.ZksyncEra]: {},
+    [types_1.Networks.Base]: {
+        [types_1.Factory.V3]: "https://base-nftlp-production.up.railway.app/8453/"
+    },
+    [types_1.Networks.Mantle]: {},
+    [types_1.Networks.Scroll]: {},
+    [types_1.Networks.Optimism]: {},
+    [types_1.Networks.Real]: {},
+    [types_1.Networks.Blast]: {},
+    [types_1.Networks.Sonic]: {},
+    [types_1.Networks.Linea]: {},
+};
 // Add more here

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

@@ -10,10 +10,16 @@ interface PositionData {
     feeGrowthInside1LastX128: number;
     unclaimedFees0: number;
     unclaimedFees1: number;
+    totalFeesEarned0: number;
+    totalFeesEarned1: number;
 }
 export type UniswapV3PositionData = NftlpPosition & {
     nftlp: PositionData;
 };
+interface PositionFees {
+    uncollectedFees0: number;
+    uncollectedFees1: number;
+}
 export default class OffchainAccountNftlpUniswapV3 extends OffchainAccountNftlp {
     protected cache: {
         positionsData?: {
@@ -22,6 +28,9 @@ export default class OffchainAccountNftlpUniswapV3 extends OffchainAccountNftlp
         positionsObject?: {
             [keys in number]: Promise<UniswapV3Position>;
         };
+        pendingFees?: {
+            [keys in number]: PositionFees;
+        };
     };
     getNftlp: () => any;
     getTokenPositions(): Promise<Record<string, UniswapV3PositionData>>;
@@ -35,5 +44,10 @@ export default class OffchainAccountNftlpUniswapV3 extends OffchainAccountNftlp
     createPositionObject(tokenId: number, lockStateChange?: boolean): Promise<UniswapV3Position>;
     createNewPositionObject(fee: number, priceA: number, priceB: number, lockStateChange?: boolean): Promise<UniswapV3Position>;
     getPositionObject(tokenId: number): Promise<UniswapV3Position>;
+    getUncollectedFees(tokenId: number): Promise<PositionFees>;
+    getTotalAccruedFees(tokenId: number): Promise<{
+        accruedFees0: number;
+        accruedFees1: number;
+    }>;
 }
 export {};

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

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const offchainAccountNftlp_1 = __importDefault(require("./offchainAccountNftlp"));
 const uniswapV3General_1 = require("../../../../utils/nftlpMath/uniswapV3General");
 const uniswapV3_1 = __importDefault(require("../../../../utils/position/uniswapV3"));
+const private_api_1 = require("../../../../config/private-api");
 class OffchainAccountNftlpUniswapV3 extends offchainAccountNftlp_1.default {
     constructor() {
         super(...arguments);
@@ -46,8 +47,8 @@ class OffchainAccountNftlpUniswapV3 extends offchainAccountNftlp_1.default {
         return (0, uniswapV3General_1.formatUniV3Liquidity)(liquidity, decimalsA, decimalsB);
     }
     async createPositionObject(tokenId, lockStateChange = true) {
-        return new uniswapV3_1.default(await this.getLiquidity(tokenId), 0, // TODO uncollectedFees
-        0, await this.getLendingPool().getBorrowableA().getBorrowedAmount(tokenId), await this.getLendingPool().getBorrowableB().getBorrowedAmount(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 { uncollectedFees0, uncollectedFees1 } = await this.getUncollectedFees(tokenId);
+        return new uniswapV3_1.default(await this.getLiquidity(tokenId), uncollectedFees0, uncollectedFees1, await this.getLendingPool().getBorrowableA().getBorrowedAmount(tokenId), await this.getLendingPool().getBorrowableB().getBorrowedAmount(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) {
         // TODO check for priceA/priceB sanity
@@ -60,5 +61,36 @@ class OffchainAccountNftlpUniswapV3 extends offchainAccountNftlp_1.default {
             this.cache.positionsObject[tokenId] = this.createPositionObject(tokenId);
         return this.cache.positionsObject[tokenId];
     }
+    async getUncollectedFees(tokenId) {
+        if (!this.cache.pendingFees)
+            this.cache.pendingFees = {};
+        if (tokenId in this.cache.pendingFees)
+            return this.cache.pendingFees[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 { uncollectedFees0: 0, uncollectedFees1: 0 };
+        }
+        try {
+            const positionFees = await fetch(api.concat(`collect/${lendingPoolId}/${tokenId}`)).then(i => i.json());
+            this.cache.pendingFees[tokenId] = { uncollectedFees0: Number(positionFees.feesEarned0), uncollectedFees1: Number(positionFees.feesEarned1) };
+            return this.cache.pendingFees[tokenId];
+        }
+        catch (err) {
+            console.log(`No pending fees data for ${lendingPoolId} on ${network}`);
+            return { uncollectedFees0: 0, uncollectedFees1: 0 };
+        }
+    }
+    async getTotalAccruedFees(tokenId) {
+        const { totalFeesEarned0, totalFeesEarned1 } = (await this.getPositionData(tokenId));
+        const { uncollectedFees0, uncollectedFees1 } = await this.getUncollectedFees(tokenId);
+        return {
+            accruedFees0: Number(totalFeesEarned0) + uncollectedFees0,
+            accruedFees1: Number(totalFeesEarned1) + uncollectedFees1,
+        };
+    }
 }
 exports.default = OffchainAccountNftlpUniswapV3;

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

@@ -467,6 +467,8 @@ class PonderQueryBuilder {
           tokenId
           feeGrowthInside0LastX128
           feeGrowthInside1LastX128
+          totalFeesEarned0
+          totalFeesEarned1
           id
           nftlp {
             factory {

package/package.json

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