impermax-sdk 2.1.468 → 2.1.470

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

@@ -1,12 +1,14 @@
 import { NetworkVaultTypeIndex, NetworkFactoryIndex, NetworkExtensionIndex } from "./types";
+/**
+ * Single endpoint for all factory subgraph token prices
+ */
+export declare const PRICE_AGGREGATOR_API_URL = "https://price-aggregator-production.up.railway.app/api/tokens";
 /**
  * Private API Endpoints which we might need to use in future for non-core
  * things (ie. charts, leaderboards, etc.). The app must function well
  * without any of these endpoints, so just nice to haves.
- * TODO: make sure that the app still works when one of these endpoints is down
  */
 export declare const IMPERMAX_POOLS_API: NetworkFactoryIndex<string>;
 export declare const IMPERMAX_VAULT_API: NetworkVaultTypeIndex<string>;
 export declare const NFTLP_API: NetworkExtensionIndex<string>;
-export declare const PRICE_AGGREGATOR_API_URL = "https://price-aggregator-production.up.railway.app/api/tokens";
 export declare const NFTLP_POSITIONS_API: NetworkExtensionIndex<string>;

package/lib/config/private-api.js

@@ -1,14 +1,17 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.NFTLP_POSITIONS_API = exports.PRICE_AGGREGATOR_API_URL = exports.NFTLP_API = exports.IMPERMAX_VAULT_API = exports.IMPERMAX_POOLS_API = void 0;
+exports.NFTLP_POSITIONS_API = exports.NFTLP_API = exports.IMPERMAX_VAULT_API = exports.IMPERMAX_POOLS_API = exports.PRICE_AGGREGATOR_API_URL = void 0;
 const types_1 = require("./types");
+/**
+ * Single endpoint for all factory subgraph token prices
+ */
+exports.PRICE_AGGREGATOR_API_URL = "https://price-aggregator-production.up.railway.app/api/tokens";
 /**
  * Private API Endpoints which we might need to use in future for non-core
  * things (ie. charts, leaderboards, etc.). The app must function well
  * without any of these endpoints, so just nice to haves.
- * TODO: make sure that the app still works when one of these endpoints is down
  */
-// For lending pools
+// API: Lending pools
 exports.IMPERMAX_POOLS_API = {
     [types_1.Networks.Ropsten]: {},
     [types_1.Networks.Mainnet]: {},
@@ -34,7 +37,7 @@ exports.IMPERMAX_POOLS_API = {
     [types_1.Networks.Linea]: {},
     [types_1.Networks.Unichain]: {},
 };
-// For lending pools
+// API: Lending vaults
 exports.IMPERMAX_VAULT_API = {
     [types_1.Networks.Ropsten]: {},
     [types_1.Networks.Mainnet]: {},
@@ -76,6 +79,7 @@ exports.IMPERMAX_VAULT_API = {
         [types_1.VaultType.LENDING]: "https://unichain-lendingvaults-production.up.railway.app/"
     },
 };
+// API: NFTLP
 exports.NFTLP_API = {
     [types_1.Networks.Ropsten]: {},
     [types_1.Networks.Mainnet]: {},
@@ -108,9 +112,7 @@ exports.NFTLP_API = {
         [types_1.Extension.UniswapV3]: "https://unichain-nftlp-uniswapv3.up.railway.app/"
     },
 };
-// Single endpoint for all factory subgraph token prices
-exports.PRICE_AGGREGATOR_API_URL = "https://price-aggregator-production.up.railway.app/api/tokens";
-// TODO: This properly
+// API: Positions/NFTLP TVL
 exports.NFTLP_POSITIONS_API = {
     [types_1.Networks.Ropsten]: {},
     [types_1.Networks.Mainnet]: {},

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

@@ -26,7 +26,7 @@ class OffchainAccountNftlpAeroCL extends offchainAccountNftlpGenericCL_1.default
         const positionId = `${lendingPoolId}-${tokenId}`;
         try {
             const account = this.getLendingPool().getAccount().getAccountAddress();
-            const newlyEarnedRewards = await this.getLendingPool().getLendingPool().getOffchain().getAerodromeV3NewlyEarnedRewards(account, positionId);
+            const newlyEarnedRewards = await this.getLendingPool().getLendingPool().getOffchain().getAeroCLNewlyEarnedRewards(account, positionId);
             this.cache.newlyEarnedReward[tokenId] = Number(newlyEarnedRewards?.newlyEarnedReward) ?? 0;
             return this.cache.newlyEarnedReward[tokenId];
         }

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

@@ -75,7 +75,7 @@ class OffchainAccountNftlpGenericCL extends offchainAccountNftlp_1.default {
             liquidationPenalty: await this.getLendingPool().getLiquidationPenalty(),
             borrowableX: await this.getNftlp().getLendingPool().getBorrowableA().createBorrowableObject(),
             borrowableY: await this.getNftlp().getLendingPool().getBorrowableB().createBorrowableObject(),
-            fullRangeRate: await this.getNftlp().getFullRangeRate(await this.getFee(tokenId)),
+            fullRangeRate: await this.getNftlp().getFullRangeRate(await this.getTickSpacing(tokenId)),
         });
     }
     async getPositionObject(tokenId) {

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

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

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

@@ -14,6 +14,4 @@ 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 });
-// export * from './vaultsApi'
-__exportStar(require("./lendingPoolsApi"), exports);
-__exportStar(require("./userApi"), exports);
+__exportStar(require("./nftlpsApi"), exports);

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

@@ -0,0 +1,3 @@
+export * from './positions';
+export * from './uniswapV3Pools';
+export * from './user';

package/lib/offchain/initializer/privateApi/{lendingPoolsApi/nftlp/aerodromeV3 → nftlpsApi}/index.js

@@ -14,4 +14,6 @@ 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("./aerodromeV3Charts"), exports);
+__exportStar(require("./positions"), exports);
+__exportStar(require("./uniswapV3Pools"), exports);
+__exportStar(require("./user"), exports);

package/lib/offchain/initializer/privateApi/{lendingPoolsApi/nftlp/tvl → nftlpsApi/positions}/nftlpTvl.d.ts

@@ -1,5 +1,5 @@
-import { AddressIndex, Extension, Address } from "../../../../../../config/types";
+import { AddressIndex, Extension, Address } from "../../../../../config/types";
 import Offchain from "../../../../../offchain";
-import { NftlpStats } from "../../../../../offchainTypes";
+import { NftlpStats } from "../../../../offchainTypes";
 export declare function fetchNftlpTvls(this: Offchain, extension: Extension): Promise<AddressIndex<NftlpStats>>;
 export declare function getNftlpTvl(this: Offchain, extension: Extension, nftlpAddress: Address): Promise<NftlpStats | undefined>;

package/lib/offchain/initializer/privateApi/{lendingPoolsApi/nftlp/tvl → nftlpsApi/positions}/nftlpTvl.js

@@ -1,8 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getNftlpTvl = exports.fetchNftlpTvls = void 0;
-const private_api_1 = require("../../../../../../config/private-api");
-// TODO: getNftlpTvl should be done by extension -> nftlpAddress
+const private_api_1 = require("../../../../../config/private-api");
 /*--------------------------------------------------------------------------*
  *                               Fetchers                                   *
  *--------------------------------------------------------------------------*/

package/lib/offchain/initializer/privateApi/nftlpsApi/uniswapV3Pools/charts.d.ts

@@ -0,0 +1,5 @@
+import { AddressIndex, Extension, Address } from "../../../../../config/types";
+import Offchain from "../../../../../offchain";
+import { PoolChart } from "../../../../offchainTypes";
+export declare function fetchUniswapV3PoolCharts(this: Offchain, extension: Extension): Promise<AddressIndex<PoolChart[]>>;
+export declare function getUniswapV3PoolChart(this: Offchain, extension: Extension, uniswapV3Pool: Address): Promise<PoolChart[]>;

package/lib/offchain/initializer/privateApi/{lendingPoolsApi/nftlp/uniswapV3/uniswapV3Charts.js → nftlpsApi/uniswapV3Pools/charts.js}

@@ -1,15 +1,14 @@
 "use strict";
 // private-api: uniswapv3 charts
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getUniswapV3Chart = exports.fetchUniswapV3Charts = void 0;
-const types_1 = require("../../../../../../config/types");
-const private_api_1 = require("../../../../../../config/private-api");
+exports.getUniswapV3PoolChart = exports.fetchUniswapV3PoolCharts = void 0;
+const private_api_1 = require("../../../../../config/private-api");
 /*--------------------------------------------------------------------------*
  *                               Fetchers                                   *
  *--------------------------------------------------------------------------*/
 // Fetches all charts of all lending pools for an NFTLP factory (ie. Dex)
-async function fetchUniswapV3Charts() {
-    const api = private_api_1.NFTLP_API[this.network][types_1.Extension.UniswapV3];
+async function fetchUniswapV3PoolCharts(extension) {
+    const api = private_api_1.NFTLP_API[this.network][extension];
     if (!api) {
         // console.log(`Missing NFTLP cl subgraph on ${this.network}?`)
         return {};
@@ -19,19 +18,19 @@ async function fetchUniswapV3Charts() {
         return response;
     }
     catch (err) {
-        console.log(`Failed to fetch uniswapV3 Pool data on ${this.network}`);
+        console.log(`Failed to fetch uniswapV3 Pool data on ${this.network} for extension ${extension}`);
         return {};
     }
 }
-exports.fetchUniswapV3Charts = fetchUniswapV3Charts;
+exports.fetchUniswapV3PoolCharts = fetchUniswapV3PoolCharts;
 /*--------------------------------------------------------------------------*
  *                                Getters                                   *
  *--------------------------------------------------------------------------*/
-async function getUniswapV3Chart(uniswapV3Pool) {
-    if (!this.extensionChartsData[types_1.Extension.UniswapV3]) {
-        this.extensionChartsData[types_1.Extension.UniswapV3] = this.fetchUniswapV3Charts();
+async function getUniswapV3PoolChart(extension, uniswapV3Pool) {
+    if (!this.extensionChartsData[extension]) {
+        this.extensionChartsData[extension] = this.fetchUniswapV3PoolCharts(extension);
     }
-    const poolChartData = await this.extensionChartsData[types_1.Extension.UniswapV3];
-    return poolChartData[uniswapV3Pool];
+    const poolChartData = await this.extensionChartsData[extension];
+    return poolChartData?.[uniswapV3Pool] ?? [];
 }
-exports.getUniswapV3Chart = getUniswapV3Chart;
+exports.getUniswapV3PoolChart = getUniswapV3PoolChart;

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

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

package/lib/offchain/initializer/privateApi/{lendingPoolsApi → nftlpsApi/uniswapV3Pools}/index.js

@@ -14,4 +14,4 @@ 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("./nftlp"), exports);
+__exportStar(require("./charts"), exports);

package/lib/offchain/initializer/privateApi/{userApi/nfltp → nftlpsApi/user/aeroCL}/index.d.ts

@@ -1,2 +1 @@
-export * from "./fees";
 export * from "./rewards";

package/lib/offchain/initializer/privateApi/{userApi/nfltp/fees → nftlpsApi/user/aeroCL}/index.js

@@ -14,4 +14,4 @@ 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);
+__exportStar(require("./rewards"), exports);

package/lib/offchain/initializer/privateApi/nftlpsApi/user/aeroCL/rewards.d.ts

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

package/lib/offchain/initializer/privateApi/{userApi/nfltp/rewards/aerodromeV3Rewards.js → nftlpsApi/user/aeroCL/rewards.js}

@@ -1,13 +1,13 @@
 "use strict";
 // private-api: aerodromeV3 reward
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getAerodromeV3NewlyEarnedRewards = exports.fetchAerodromeV3NewlyEarnedRewards = void 0;
+exports.getAeroCLNewlyEarnedRewards = exports.fetchAeroCLNewlyEarnedRewards = void 0;
 const types_1 = require("../../../../../../config/types");
 const private_api_1 = require("../../../../../../config/private-api");
 /*--------------------------------------------------------------------------*
  *                               Fetchers                                   *
  *--------------------------------------------------------------------------*/
-async function fetchAerodromeV3NewlyEarnedRewards(account) {
+async function fetchAeroCLNewlyEarnedRewards(account) {
     const api = private_api_1.NFTLP_API[this.network][types_1.Extension.AeroCL];
     if (!api) {
         console.log(`Missing NFTLP aerodromeV3 reward api on ${this.network}?`);
@@ -29,17 +29,17 @@ async function fetchAerodromeV3NewlyEarnedRewards(account) {
         return {};
     }
 }
-exports.fetchAerodromeV3NewlyEarnedRewards = fetchAerodromeV3NewlyEarnedRewards;
+exports.fetchAeroCLNewlyEarnedRewards = fetchAeroCLNewlyEarnedRewards;
 /*--------------------------------------------------------------------------*
  *                                Getters                                   *
  *--------------------------------------------------------------------------*/
-async function getAerodromeV3NewlyEarnedRewards(account, positionId) {
+async function getAeroCLNewlyEarnedRewards(account, positionId) {
     if (!this.userNewlyEarnedRewardData[account])
         this.userNewlyEarnedRewardData[account] = {};
     if (!this.userNewlyEarnedRewardData[account][types_1.Extension.AeroCL]) {
-        this.userNewlyEarnedRewardData[account][types_1.Extension.AeroCL] = this.fetchAerodromeV3NewlyEarnedRewards(account);
+        this.userNewlyEarnedRewardData[account][types_1.Extension.AeroCL] = this.fetchAeroCLNewlyEarnedRewards(account);
     }
     const feesData = await this.userNewlyEarnedRewardData[account][types_1.Extension.AeroCL];
     return feesData?.[positionId];
 }
-exports.getAerodromeV3NewlyEarnedRewards = getAerodromeV3NewlyEarnedRewards;
+exports.getAeroCLNewlyEarnedRewards = getAeroCLNewlyEarnedRewards;

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

@@ -0,0 +1,2 @@
+export * from "./uniswapv3";
+export * from "./aeroCL";

package/lib/offchain/initializer/privateApi/{userApi/nfltp → nftlpsApi/user}/index.js

@@ -15,6 +15,6 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 // For UniswapV3 position new fees earned
-__exportStar(require("./fees"), exports);
-// For AerodromeV3 position new rewards earned
-__exportStar(require("./rewards"), exports);
+__exportStar(require("./uniswapv3"), exports);
+// For AeroCL position new rewards earned
+__exportStar(require("./aeroCL"), exports);

package/lib/offchain/initializer/privateApi/{userApi/nfltp/fees/uniswapV3Fees.js → nftlpsApi/user/uniswapv3/fees.js}

@@ -7,8 +7,6 @@ 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_API[this.network][types_1.Extension.UniswapV3];
     if (!api) {

package/lib/offchain/initializer/privateApi/nftlpsApi/user/uniswapv3/index.d.ts

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

package/lib/offchain/initializer/privateApi/{userApi → nftlpsApi/user/uniswapv3}/index.js

@@ -14,4 +14,4 @@ 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("./nfltp"), exports);
+__exportStar(require("./fees"), exports);

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

@@ -72,7 +72,7 @@ class OffchainNftlpUniswapV3 extends offchainNftlpGenericCL_1.default {
             return 0;
         let feeGrowthData = [];
         try {
-            feeGrowthData = await this.getLendingPool().getOffchain().getUniswapV3Charts(address.toLowerCase());
+            feeGrowthData = await this.getLendingPool().getOffchain().getUniswapV3PoolChart(this.getExtension(), address.toLowerCase());
         }
         catch (err) { }
         if (!feeGrowthData || feeGrowthData.length < 2) {

package/lib/offchain/offchain.d.ts

@@ -2,8 +2,8 @@ import * as initializer from './initializer';
 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, XIbexData, VaultBorrowable, NftlpData, PoolChart, NewlyEarnedFees, NftlpStats, XIbexUserData, NewlyEarnedReward } from './offchainTypes';
+import { Address, AddressIndex, Factory, FactoryIndex, LendingPoolIndex, Networks, WhitelistState, Extension } from '../config/types';
+import { LendingPoolData, VaultData, VaultPosition, TvlData, UserData, XIbexData, NftlpData, PoolChart, NewlyEarnedFees, NftlpStats, XIbexUserData, NewlyEarnedReward } from './offchainTypes';
 import OffchainVault from './vault/offchainVault';
 import OffchainConfigManager from './configManager';
 import { PairState } from '../config/whitelist';
@@ -47,25 +47,30 @@ export default class Offchain {
     protected xibexUsersData: {
         [key in Address]?: Promise<XIbexUserData | null>;
     };
-    protected vaultBorrowablesData: {
-        [key in VaultType]?: Promise<AddressIndex<VaultBorrowable[]>>;
-    };
     protected extensionChartsData: {
         [key in Extension]?: Promise<AddressIndex<PoolChart[]>>;
     };
+    protected fetchUniswapV3PoolCharts: typeof initializer.fetchUniswapV3PoolCharts;
+    getUniswapV3PoolChart: typeof initializer.getUniswapV3PoolChart;
     protected extensionStatsData: {
         [key in Extension]?: Promise<AddressIndex<NftlpStats>>;
     };
+    protected fetchNftlpTvls: typeof initializer.fetchNftlpTvls;
+    getNftlpTvl: typeof initializer.getNftlpTvl;
     protected userNewlyEarnedFeesData: {
         [address: Address]: {
             [key in Extension]?: Promise<AddressIndex<NewlyEarnedFees>>;
         };
     };
+    protected fetchUniswapV3NewlyEarnedFees: typeof initializer.fetchUniswapV3NewlyEarnedFees;
+    getUniswapV3NewlyEarnedFees: typeof initializer.getUniswapV3NewlyEarnedFees;
     protected userNewlyEarnedRewardData: {
         [address: Address]: {
             [key in Extension]?: Promise<AddressIndex<NewlyEarnedReward>>;
         };
     };
+    protected fetchAeroCLNewlyEarnedRewards: typeof initializer.fetchAeroCLNewlyEarnedRewards;
+    getAeroCLNewlyEarnedRewards: typeof initializer.getAeroCLNewlyEarnedRewards;
     constructor(offchainMultichain: OffchainMultichain, network: Networks);
     cleanCache(): Promise<void>;
     getLendingPool(factory: Factory, pairAddress: Address): Promise<OffchainLendingPool | null>;
@@ -108,8 +113,6 @@ export default class Offchain {
     protected fetchVaultsUserData: typeof initializer.fetchVaultsUserData;
     protected initializeVaultsUserData: typeof initializer.initializeVaultsUserData;
     protected initializeXIbexUserData: typeof initializer.initializeXIbexUserData;
-    protected fetchNftlpTvls: typeof initializer.fetchNftlpTvls;
-    getNftlpTvl: typeof initializer.getNftlpTvl;
     protected fetchBorrowersList: typeof initializer.fetchBorrowersList;
     protected initializeBorrowersList: typeof initializer.initializeBorrowersList;
     getBorrowersList: typeof initializer.getBorrowersList;
@@ -117,14 +120,5 @@ export default class Offchain {
     getNftlpsData: typeof initializer.getNftlpsData;
     protected fetchNftlpsData: typeof initializer.fetchNftlpsData;
     protected initializeNftlpsData: typeof initializer.initializeNftlpsData;
-    getUniswapV3NewlyEarnedFees: typeof initializer.getUniswapV3NewlyEarnedFees;
-    protected fetchUniswapV3NewlyEarnedFees: typeof initializer.fetchUniswapV3NewlyEarnedFees;
-    getAerodromeV3NewlyEarnedRewards: typeof initializer.getAerodromeV3NewlyEarnedRewards;
-    protected fetchAerodromeV3NewlyEarnedRewards: typeof initializer.fetchAerodromeV3NewlyEarnedRewards;
-    getUniswapV3Charts: typeof initializer.getUniswapV3Chart;
-    protected fetchUniswapV3Charts: typeof initializer.fetchUniswapV3Charts;
-    getAerodromeV3Charts: typeof initializer.getAerodromeV3Chart;
-    protected fetchAerodromeV3Charts: typeof initializer.fetchAerodromeV3Charts;
     getPairsList(factory: Factory, state?: PairState): Address[];
-    getPoolChart(address: Address): Promise<import("./offchainTypes").UniswapV3PoolChart[]>;
 }

package/lib/offchain/offchain.js

@@ -42,12 +42,24 @@ class Offchain {
         this.deprecatedPairs = {};
         this.blacklistedPairs = {};
         this.disabledBorrowsPairs = [];
-        // ------ Pools API --------
+        /*--------------------------------------------------------------------------*
+         *                            Private API                                   *
+         *--------------------------------------------------------------------------*/
+        // ------ UniswapV3Pool Charts --------
         this.extensionChartsData = {};
+        this.fetchUniswapV3PoolCharts = initializer.fetchUniswapV3PoolCharts;
+        this.getUniswapV3PoolChart = initializer.getUniswapV3PoolChart;
+        // ------ NFTLP TVLs --------
         this.extensionStatsData = {};
+        this.fetchNftlpTvls = initializer.fetchNftlpTvls;
+        this.getNftlpTvl = initializer.getNftlpTvl;
         // ------ User API --------
         this.userNewlyEarnedFeesData = {};
+        this.fetchUniswapV3NewlyEarnedFees = initializer.fetchUniswapV3NewlyEarnedFees;
+        this.getUniswapV3NewlyEarnedFees = initializer.getUniswapV3NewlyEarnedFees;
         this.userNewlyEarnedRewardData = {};
+        this.fetchAeroCLNewlyEarnedRewards = initializer.fetchAeroCLNewlyEarnedRewards;
+        this.getAeroCLNewlyEarnedRewards = initializer.getAeroCLNewlyEarnedRewards;
         this.getSolidexHelper = () => this.solidexHelper;
         this.getConfigManager = () => this.configManager;
         // Multichain, 1 instance
@@ -93,11 +105,6 @@ class Offchain {
         this.fetchVaultsUserData = initializer.fetchVaultsUserData;
         this.initializeVaultsUserData = initializer.initializeVaultsUserData;
         this.initializeXIbexUserData = initializer.initializeXIbexUserData;
-        this.fetchNftlpTvls = initializer.fetchNftlpTvls;
-        this.getNftlpTvl = initializer.getNftlpTvl;
-        // NOTE: Not needed anymore since new vault subgraphs, delete?
-        // protected fetchVaultBorrowables = initializer.fetchVaultBorrowables;
-        // public getVaultBorrowables = initializer.getVaultBorrowables;
         // NOTE: This isn't needed as `fetchBorrowersList` below will fetch v2 and v3 positions.
         //       Hidden atm in case we decide to add functions for v3 only.
         // protected fetchAllV3Positions = initializer.fetchAllV3Positions;
@@ -111,17 +118,6 @@ class Offchain {
         this.getNftlpsData = initializer.getNftlpsData;
         this.fetchNftlpsData = initializer.fetchNftlpsData;
         this.initializeNftlpsData = initializer.initializeNftlpsData;
-        // Fees/Rewards
-        this.getUniswapV3NewlyEarnedFees = initializer.getUniswapV3NewlyEarnedFees;
-        this.fetchUniswapV3NewlyEarnedFees = initializer.fetchUniswapV3NewlyEarnedFees;
-        this.getAerodromeV3NewlyEarnedRewards = initializer.getAerodromeV3NewlyEarnedRewards;
-        this.fetchAerodromeV3NewlyEarnedRewards = initializer.fetchAerodromeV3NewlyEarnedRewards;
-        // Charts
-        // TODO: this better
-        this.getUniswapV3Charts = initializer.getUniswapV3Chart;
-        this.fetchUniswapV3Charts = initializer.fetchUniswapV3Charts;
-        this.getAerodromeV3Charts = initializer.getAerodromeV3Chart;
-        this.fetchAerodromeV3Charts = initializer.fetchAerodromeV3Charts;
         // Config
         this.offchainMultichain = offchainMultichain;
         this.network = network;
@@ -136,15 +132,11 @@ class Offchain {
         this.accounts = {};
         this.usersData = {};
         this.vaultsUsersData = {};
-        this.vaultBorrowablesData = {};
         this.xibexUsersData = {};
         // Staking module is only available on Arbitrum atm, 
         // so we initialize it once in the offchainMultichain.
         // this.stakingModule = new OffchainStakingModule(this);
-        // TODO: make this better
-        this.extensionChartsData[types_1.Extension.UniswapV3] = this.fetchUniswapV3Charts();
         this.extensionStatsData[types_1.Extension.UniswapV3] = this.fetchNftlpTvls(types_1.Extension.UniswapV3);
-        this.extensionChartsData[types_1.Extension.AeroCL] = this.fetchAerodromeV3Charts();
         this.extensionStatsData[types_1.Extension.AeroCL] = this.fetchNftlpTvls(types_1.Extension.AeroCL);
     }
     async cleanCache() {
@@ -154,7 +146,6 @@ class Offchain {
         this.vaultsData = null;
         this.lendingVaultsUsersData = {};
         this.vaultsUsersData = {};
-        this.vaultBorrowablesData = {};
         this.tvlData = null;
         this.whitelistData = null;
         this.solidexHelper.cleanCache();
@@ -213,10 +204,5 @@ class Offchain {
             pairs.push(...blacklisted);
         return pairs.map(i => i.toLowerCase());
     }
-    // Charts?
-    // TODO: This better
-    async getPoolChart(address) {
-        return this.getUniswapV3Charts(address.toLowerCase());
-    }
 }
 exports.default = Offchain;

package/lib/offchain/offchainTypes.d.ts

@@ -345,7 +345,12 @@ export type UniswapV3PoolChart = {
     token0Price: number;
     token1Price: number;
 };
-export type PoolChart = UniswapV3PoolChart;
+export type AeroCLPoolChart = UniswapV3PoolChart & {
+    rewardRate: string;
+    stakedLiquidity: string;
+    rewardGrowthGlobalX128: string;
+};
+export type PoolChart = UniswapV3PoolChart | AeroCLPoolChart;
 export type NewlyEarnedFees = {
     newlyEarnedFees0: number;
     newlyEarnedFees1: number;

package/package.json

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

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

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

package/lib/offchain/initializer/privateApi/lendingPoolsApi/nftlp/aerodromeV3/aerodromeV3Charts.d.ts

@@ -1,5 +0,0 @@
-import { AddressIndex, Address } from "../../../../../../config/types";
-import Offchain from "../../../../../offchain";
-import { PoolChart } from "../../../../../offchainTypes";
-export declare function fetchAerodromeV3Charts(this: Offchain): Promise<AddressIndex<PoolChart[]>>;
-export declare function getAerodromeV3Chart(this: Offchain, aerodromeV3Pool: Address): Promise<PoolChart[]>;

package/lib/offchain/initializer/privateApi/lendingPoolsApi/nftlp/aerodromeV3/aerodromeV3Charts.js

@@ -1,38 +0,0 @@
-"use strict";
-// private-api: aerodromeV3 charts
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.getAerodromeV3Chart = exports.fetchAerodromeV3Charts = void 0;
-const types_1 = require("../../../../../../config/types");
-const private_api_1 = require("../../../../../../config/private-api");
-/*--------------------------------------------------------------------------*
- *                               Fetchers                                   *
- *--------------------------------------------------------------------------*/
-// Fetches all charts of all lending pools for an NFTLP factory (ie. Dex)
-async function fetchAerodromeV3Charts() {
-    const api = private_api_1.NFTLP_API[this.network][types_1.Extension.AeroCL];
-    if (!api) {
-        //console.log(`Missing NFTLP aerodromeV3 subgraph on ${this.network}?`)
-        return {};
-    }
-    try {
-        const response = await this.offchainMultichain.getEndpointManager().fetchAPI(api.concat('pools/charts'));
-        return response;
-    }
-    catch (err) {
-        console.log(`Failed to fetch aerodromeV3 Pool data on ${this.network}`);
-        console.log(err);
-        return {};
-    }
-}
-exports.fetchAerodromeV3Charts = fetchAerodromeV3Charts;
-/*--------------------------------------------------------------------------*
- *                                Getters                                   *
- *--------------------------------------------------------------------------*/
-async function getAerodromeV3Chart(aerodromeV3Pool) {
-    if (!this.extensionChartsData[types_1.Extension.AeroCL]) {
-        this.extensionChartsData[types_1.Extension.AeroCL] = this.fetchAerodromeV3Charts();
-    }
-    const poolChartData = await this.extensionChartsData[types_1.Extension.AeroCL];
-    return poolChartData[aerodromeV3Pool];
-}
-exports.getAerodromeV3Chart = getAerodromeV3Chart;

package/lib/offchain/initializer/privateApi/lendingPoolsApi/nftlp/aerodromeV3/index.d.ts

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

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

@@ -1,3 +0,0 @@
-export * from './uniswapV3';
-export * from './tvl';
-export * from './aerodromeV3';

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

@@ -1,19 +0,0 @@
-"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("./uniswapV3"), exports);
-__exportStar(require("./tvl"), exports);
-__exportStar(require("./aerodromeV3"), exports);

package/lib/offchain/initializer/privateApi/lendingPoolsApi/nftlp/uniswapV3/index.d.ts

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

package/lib/offchain/initializer/privateApi/lendingPoolsApi/nftlp/uniswapV3/index.js

@@ -1,17 +0,0 @@
-"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("./uniswapV3Charts"), exports);

package/lib/offchain/initializer/privateApi/lendingPoolsApi/nftlp/uniswapV3/uniswapV3Charts.d.ts

@@ -1,5 +0,0 @@
-import { AddressIndex, Address } from "../../../../../../config/types";
-import Offchain from "../../../../../offchain";
-import { PoolChart } from "../../../../../offchainTypes";
-export declare function fetchUniswapV3Charts(this: Offchain): Promise<AddressIndex<PoolChart[]>>;
-export declare function getUniswapV3Chart(this: Offchain, uniswapV3Pool: Address): Promise<PoolChart[]>;

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

@@ -1 +0,0 @@
-export * from "./nfltp";

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

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

package/lib/offchain/initializer/privateApi/userApi/nfltp/rewards/aerodromeV3Rewards.d.ts

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

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

@@ -1 +0,0 @@
-export * from "./aerodromeV3Rewards";

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

@@ -1,17 +0,0 @@
-"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("./aerodromeV3Rewards"), exports);

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

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

package/lib/offchain/initializer/privateApi/vaultsApi/vaultBorrowables.js

@@ -1,54 +0,0 @@
-// NOTE: Replaced API with query as new vault subgraphs includes borrowables
-// private-api: Vault borrowables
-// 
-// import { AddressIndex, VaultType, Address } from "../../../../config/types";
-// import { VaultBorrowable } from "../../../offchainTypes";
-// import { IMPERMAX_VAULT_API } from "../../../../config/private-api";
-// import Offchain from "../../../offchain";
-// 
-// 
-// /*--------------------------------------------------------------------------*
-//  *                               Fetchers                                   *
-//  *--------------------------------------------------------------------------*/
-// 
-// export async function fetchVaultBorrowables(
-//   this: Offchain,
-//   vaultType: VaultType
-// ): Promise<AddressIndex<VaultBorrowable[]>> {
-//   const api = IMPERMAX_VAULT_API[this.network][vaultType];
-//   if (!api) {
-//     console.log(`Missing API for ${vaultType} on ${this.network}?`);
-//     return {};
-//   }
-// 
-//   try {
-//     const response = await fetch(api.concat('borrowables')).then(i => i.json());
-//     return response.reduce((acc: AddressIndex<VaultBorrowable[]>, borrowable: any) => {
-//       const vaultId = borrowable.lendingVaultId.toLowerCase();
-//       if (!acc[vaultId]) acc[vaultId] = [];
-//       acc[vaultId].push(borrowable);
-//       return acc;
-//     }, {});
-//   } catch (err) {
-//     console.log(`Failed to fetch vault borrowables for ${vaultType} on ${this.network}`);
-//     return {};
-//   }
-// }
-//  
-// /*--------------------------------------------------------------------------*
-//  *                                Getters                                   *
-//  *--------------------------------------------------------------------------*/
-// 
-// 
-// export async function getVaultBorrowables(
-//   this: Offchain,
-//   vaultType: VaultType,
-//   vaultAddress: Address
-// ): Promise<VaultBorrowable[] | null> {
-//   if (!this.vaultBorrowablesData[vaultType]) {
-//     this.vaultBorrowablesData[vaultType] = this.fetchVaultBorrowables(vaultType);
-//   }
-// 
-//   const borrowablesMap = await this.vaultBorrowablesData[vaultType];
-//   return borrowablesMap?.[vaultAddress.toLowerCase()] || null;
-// }