impermax-sdk 2.1.344 → 2.1.345

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

@@ -6,7 +6,6 @@ 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);
@@ -79,13 +78,10 @@ class OffchainAccountNftlpUniswapV3 extends offchainAccountNftlp_1.default {
             return this.cache.newlyEarnedFees[tokenId];
         const network = this.getLendingPool().getLendingPool().getOffchain().network;
         const lendingPoolId = this.getLendingPool().getLendingPool().getPairAddress();
-        const api = private_api_1.NFTLP_UNIV3_API[network];
-        if (!api) {
-            console.log(`Missing newly earned fees API for ${lendingPoolId} on ${network}?`);
-            return { amountX: 0, amountY: 0 };
-        }
+        const positionId = `${lendingPoolId}-${tokenId}`;
         try {
-            const positionFees = await fetch(api.concat(`fees/${lendingPoolId}/${tokenId}`)).then(i => i.json());
+            const account = this.getLendingPool().getAccount().getAccountAddress();
+            const positionFees = await this.getLendingPool().getLendingPool().getOffchain().getUniswapV3NewlyEarnedFees(account, positionId);
             this.cache.newlyEarnedFees[tokenId] = { amountX: Number(positionFees.newlyEarnedFees0), amountY: Number(positionFees.newlyEarnedFees1) };
             return this.cache.newlyEarnedFees[tokenId];
         }

package/lib/offchain/initializer/privateApi/index.d.ts

@@ -1,2 +1,3 @@
 export * from './vaultsApi';
 export * from './lendingPoolsApi';
+export * from './userApi';

package/lib/offchain/initializer/privateApi/index.js

@@ -16,3 +16,4 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./vaultsApi"), exports);
 __exportStar(require("./lendingPoolsApi"), exports);
+__exportStar(require("./userApi"), exports);

package/lib/offchain/initializer/privateApi/userApi/fees/index.d.ts

@@ -0,0 +1 @@
+export * from './uniswapV3Fees';

package/lib/offchain/initializer/privateApi/userApi/fees/index.js

@@ -0,0 +1,17 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("./uniswapV3Fees"), exports);

package/lib/offchain/initializer/privateApi/userApi/fees/uniswapV3Fees.d.ts

@@ -0,0 +1,5 @@
+import { AddressIndex, Address } from "../../../../../config/types";
+import Offchain from "../../../../../offchain";
+import { NewlyEarnedFees } from "../../../../offchainTypes";
+export declare function fetchUniswapV3NewlyEarnedFees(this: Offchain, account: Address): Promise<AddressIndex<NewlyEarnedFees>>;
+export declare function getUniswapV3NewlyEarnedFees(this: Offchain, account: Address, positionId: string): Promise<NewlyEarnedFees>;

package/lib/offchain/initializer/privateApi/userApi/fees/uniswapV3Fees.js

@@ -0,0 +1,45 @@
+"use strict";
+// private-api: uniswapv3 fees
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getUniswapV3NewlyEarnedFees = exports.fetchUniswapV3NewlyEarnedFees = void 0;
+const types_1 = require("../../../../../config/types");
+const private_api_1 = require("../../../../../config/private-api");
+/*--------------------------------------------------------------------------*
+ *                               Fetchers                                   *
+ *--------------------------------------------------------------------------*/
+// TODO: Make this better by using getnftlppositions
+// const nftlpPositions = await this.offchainMultichain.getMultichainAccount(account).getNftlpPositions();
+async function fetchUniswapV3NewlyEarnedFees(account) {
+    const api = private_api_1.NFTLP_UNIV3_API[this.network];
+    if (!api) {
+        console.log(`Missing NFTLP uniswapV3 fees api on ${this.network}?`);
+        return {};
+    }
+    const v3Positions = (await this.getUserData(account))?.[8];
+    if (!v3Positions?.positions)
+        return {};
+    // Get only uniswapV3 positions
+    const uniswapV3Positions = Object.entries(v3Positions.positions).flatMap(([_, position]) => position.filter(i => i.dex === types_1.Extension.UniswapV3));
+    // Get the unqiue position ID ie. lendingPoolId-tokenId
+    const positionIds = uniswapV3Positions.map(i => i.id);
+    try {
+        const response = await fetch(api.concat(`fees/${positionIds.join(",")}`)).then(i => i.json());
+        return response;
+    }
+    catch (err) {
+        console.log(`Failed to fetch uniswapV3 user fees data on ${this.network}`);
+        return {};
+    }
+}
+exports.fetchUniswapV3NewlyEarnedFees = fetchUniswapV3NewlyEarnedFees;
+/*--------------------------------------------------------------------------*
+ *                                Getters                                   *
+ *--------------------------------------------------------------------------*/
+async function getUniswapV3NewlyEarnedFees(account, positionId) {
+    if (!this.userNewlyEarnedFeesData[types_1.Extension.UniswapV3]) {
+        this.userNewlyEarnedFeesData[types_1.Extension.UniswapV3] = this.fetchUniswapV3NewlyEarnedFees(account);
+    }
+    const feesData = await this.userNewlyEarnedFeesData[types_1.Extension.UniswapV3];
+    return feesData[positionId];
+}
+exports.getUniswapV3NewlyEarnedFees = getUniswapV3NewlyEarnedFees;

package/lib/offchain/initializer/privateApi/userApi/index.d.ts

@@ -0,0 +1 @@
+export * from './fees';

package/lib/offchain/initializer/privateApi/userApi/index.js

@@ -0,0 +1,17 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("./fees"), exports);

package/lib/offchain/offchain.d.ts

@@ -3,7 +3,7 @@ import OffchainLendingPool from './lendingPool';
 import OffchainSolidexHelper from './offchainSolidexHelper';
 import OffchainAccount from './account';
 import { Address, AddressIndex, Factory, FactoryIndex, LendingPoolIndex, Networks, WhitelistState, VaultType, Extension } from '../config/types';
-import { LendingPoolData, VaultData, VaultPosition, TvlData, UserData, XimxData, VaultBorrowable, NftlpData, PoolChart } from './offchainTypes';
+import { LendingPoolData, VaultData, VaultPosition, TvlData, UserData, XimxData, VaultBorrowable, NftlpData, PoolChart, NewlyEarnedFees } from './offchainTypes';
 import OffchainVault from './vault/offchainVault';
 import OffchainConfigManager from './configManager';
 import { LlamaTvlChart } from './offchainAPRHelper';
@@ -49,6 +49,9 @@ export default class Offchain {
     protected extensionChartsData: {
         [key in Extension]?: Promise<AddressIndex<PoolChart[]>>;
     };
+    protected userNewlyEarnedFeesData: {
+        [key in Extension]?: Promise<AddressIndex<NewlyEarnedFees>>;
+    };
     constructor(offchainMultichain: OffchainMultichain, network: Networks);
     cleanCache(): void;
     getLendingPool(factory: Factory, pairAddress: Address): Promise<OffchainLendingPool | null>;
@@ -99,6 +102,8 @@ export default class Offchain {
     protected initializeNftlpsData: typeof initializer.initializeNftlpsData;
     protected fetchUniswapV3Charts: typeof initializer.fetchUniswapV3Charts;
     getUniswapV3Charts: typeof initializer.getUniswapV3Chart;
+    protected fetchUniswapV3NewlyEarnedFees: typeof initializer.fetchUniswapV3NewlyEarnedFees;
+    getUniswapV3NewlyEarnedFees: typeof initializer.getUniswapV3NewlyEarnedFees;
     getPairsList(factory: Factory, state?: PairState): Address[];
     getCrossChainTVL(): Promise<number>;
     getCrossChainTotalValueSupplied(): Promise<number>;

package/lib/offchain/offchain.js

@@ -40,8 +40,11 @@ class Offchain {
         this.deprecatedPairs = {};
         this.blacklistedPairs = {};
         this.disabledBorrowsPairs = [];
-        // 2. NFTLPs
+        // ------ Pools API --------
         this.extensionChartsData = {};
+        // ------ User API --------
+        // TODO: Proper positionIndex type
+        this.userNewlyEarnedFeesData = {};
         this.getSolidexHelper = () => this.solidexHelper;
         this.getConfigManager = () => this.configManager;
         // Multichain, 1 instance
@@ -103,6 +106,8 @@ class Offchain {
         // Private api initializers
         this.fetchUniswapV3Charts = initializer.fetchUniswapV3Charts;
         this.getUniswapV3Charts = initializer.getUniswapV3Chart;
+        this.fetchUniswapV3NewlyEarnedFees = initializer.fetchUniswapV3NewlyEarnedFees;
+        this.getUniswapV3NewlyEarnedFees = initializer.getUniswapV3NewlyEarnedFees;
         // Config
         this.offchainMultichain = offchainMultichain;
         this.network = network;
@@ -134,6 +139,7 @@ class Offchain {
         this.getPriceHelper().cleanCache();
         this.getAPRHelper().cleanCache();
         this.borrowersList = null;
+        this.userNewlyEarnedFeesData = {};
     }
     async getLendingPool(factory, pairAddress) {
         await this.getLendingPoolsData(); // make sure that lending pools are initialized

package/lib/offchain/offchainTypes.d.ts

@@ -287,3 +287,7 @@ export type UniswapV3PoolChart = {
     timestampUTC: string;
 };
 export type PoolChart = UniswapV3PoolChart;
+export type NewlyEarnedFees = {
+    newlyEarnedFees0: number;
+    newlyEarnedFees1: number;
+};

package/package.json

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