impermax-sdk 2.1.289 → 2.1.290

package/lib/config/nftlp.d.ts

@@ -1,10 +1,5 @@
-import { Networks } from './types';
-export declare enum NftlpTypes {
-    UniswapV3 = "uniswapv3",
-    AlgebraV3 = "algebrav3"
-}
-export declare const hrNftlpTypes: Record<NftlpTypes, string>;
-export declare const NFTLP_SUBGRAPH_URL: Record<Networks, Partial<Record<NftlpTypes, string[]>>>;
-export declare const NFTLP_FACTORY: Record<Networks, Partial<Record<NftlpTypes, string>>>;
-export declare function getNftlpSubgraph(network: Networks, dex: NftlpTypes): string[] | undefined;
-export declare function getNftlpDex(network: Networks, factoryAddress: string): NftlpTypes | undefined;
+import { Address, Extension, NetworkExtensionIndex, Networks } from './types';
+export declare const NFTLP_SUBGRAPH_URL: NetworkExtensionIndex<string[]>;
+export declare const NFTLP_FACTORY: NetworkExtensionIndex<Address>;
+export declare function getNftlpSubgraph(network: Networks, dex: Extension): string[] | undefined;
+export declare function getNftlpDex(network: Networks, factoryAddress: string): Extension | undefined;

package/lib/config/nftlp.js

@@ -1,17 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getNftlpDex = exports.getNftlpSubgraph = exports.NFTLP_FACTORY = exports.NFTLP_SUBGRAPH_URL = exports.hrNftlpTypes = exports.NftlpTypes = void 0;
+exports.getNftlpDex = exports.getNftlpSubgraph = exports.NFTLP_FACTORY = exports.NFTLP_SUBGRAPH_URL = void 0;
 const types_1 = require("./types");
-// Same as `amms.ts` - Probably remove this and just use NFTLP factory address
-var NftlpTypes;
-(function (NftlpTypes) {
-    NftlpTypes["UniswapV3"] = "uniswapv3";
-    NftlpTypes["AlgebraV3"] = "algebrav3";
-})(NftlpTypes = exports.NftlpTypes || (exports.NftlpTypes = {}));
-exports.hrNftlpTypes = {
-    [NftlpTypes.UniswapV3]: "Uniswap V3",
-    [NftlpTypes.AlgebraV3]: "Algebra V3",
-};
 // Subgraph endpoints for each network/DEX
 // allow for multiple endpoints for each
 exports.NFTLP_SUBGRAPH_URL = {
@@ -32,7 +22,7 @@ exports.NFTLP_SUBGRAPH_URL = {
     [types_1.Networks.Sxnetwork]: {},
     [types_1.Networks.Blast]: {},
     [types_1.Networks.Base]: {
-        [NftlpTypes.UniswapV3]: ["https://base-nftlp-production.up.railway.app/"]
+        [types_1.Extension.UniswapV3]: ["https://base-nftlp-production.up.railway.app/"]
     },
     [types_1.Networks.Scroll]: {},
     [types_1.Networks.Optimism]: {},
@@ -59,7 +49,7 @@ exports.NFTLP_FACTORY = {
     [types_1.Networks.Sxnetwork]: {},
     [types_1.Networks.Blast]: {},
     [types_1.Networks.Base]: {
-        [NftlpTypes.UniswapV3]: "0xe5D6Cf969C01BF8d6c46840eD784D7F209038D7a"
+        [types_1.Extension.UniswapV3]: "0xe5D6Cf969C01BF8d6c46840eD784D7F209038D7a"
     },
     [types_1.Networks.Scroll]: {},
     [types_1.Networks.Optimism]: {},
@@ -76,8 +66,8 @@ exports.getNftlpSubgraph = getNftlpSubgraph;
 function getNftlpDex(network, factoryAddress) {
     const normalizedAddress = factoryAddress.toLowerCase();
     const factories = exports.NFTLP_FACTORY[network];
-    for (const [dex, address] of Object.entries(factories)) {
-        if (address.toLowerCase() === normalizedAddress) {
+    for (const dex of Object.keys(factories)) {
+        if (factories[dex]?.toLowerCase() === normalizedAddress) {
             return dex;
         }
     }

package/lib/config/types.d.ts

@@ -34,8 +34,8 @@ export declare enum Factory {
     V3 = "8"
 }
 export declare enum Extension {
-    UniswapV2 = 0,
-    UniswapV3 = 1
+    UniswapV2 = "1",
+    UniswapV3 = "2"
 }
 export declare enum PoolTokenType {
     Collateral = "collateral",

package/lib/config/types.js

@@ -40,8 +40,8 @@ var Factory;
 })(Factory = exports.Factory || (exports.Factory = {}));
 var Extension;
 (function (Extension) {
-    Extension[Extension["UniswapV2"] = 0] = "UniswapV2";
-    Extension[Extension["UniswapV3"] = 1] = "UniswapV3";
+    Extension["UniswapV2"] = "1";
+    Extension["UniswapV3"] = "2";
     //UniswapV4,
     //Algebra,
 })(Extension = exports.Extension || (exports.Extension = {}));

package/lib/offchain/initializer/allPositionsV3.js

@@ -28,7 +28,7 @@ async function initializeAllV3Positions(factory) {
         if (!positions[lendingPoolId][userAddress])
             positions[lendingPoolId][userAddress] = [];
         const dex = (0, nftlp_1.getNftlpDex)(this.network, nftlpFactory);
-        if (!dex) {
+        if (dex === undefined) {
             console.warn(`Unknown DEX for NFTLP factory ${nftlpFactory} on ${this.network}`);
             continue;
         }

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

@@ -11,3 +11,4 @@ export * from './farming';
 export * from './tvl';
 export * from './private-api';
 export * from './borrowers';
+export * from './nftlps';

package/lib/offchain/initializer/index.js

@@ -27,3 +27,4 @@ __exportStar(require("./farming"), exports);
 __exportStar(require("./tvl"), exports);
 __exportStar(require("./private-api"), exports);
 __exportStar(require("./borrowers"), exports);
+__exportStar(require("./nftlps"), exports);

package/lib/offchain/initializer/lendingPools.js

@@ -4,7 +4,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.fetchLendingPools = exports.initializeLendingPoolsData = exports.getLendingPoolData = exports.getLendingPoolsData = void 0;
-const amms_1 = require("../../config/amms");
 const offchainTypes_1 = require("../offchainTypes");
 const subgraphs_1 = require("../../config/subgraphs");
 const offchainLendingPoolV2_1 = __importDefault(require("../lendingPool/offchainLendingPoolV2"));
@@ -37,20 +36,20 @@ async function initializeLendingPoolsData() {
         this.fetchImpermaxChefRewardRates(),
     ]);
     // Get Uniswap APR
-    const lendingPoolsByAmm = {};
-    for (const factory in lendingPools) {
-        for (const lendingPool of lendingPools[factory]) {
-            const amm = (0, amms_1.getAmmByFactory)(this.network, 
-            // WARN: Quick temporary fix, to be removed after
-            lendingPool?.pair?.uniswapV2Factory ?? lendingPool?.nftlp?.dexFactory);
-            if (!amm)
-                continue;
-            if (!lendingPoolsByAmm[amm])
-                lendingPoolsByAmm[amm] = [];
-            const lendingPoolsOfAmm = lendingPoolsByAmm[amm];
-            lendingPoolsOfAmm.push(lendingPool);
-        }
-    }
+    //const lendingPoolsByAmm: { [key in Amms]?: LendingPoolData[] } = {};
+    //for (const factory in lendingPools) {
+    //  for (const lendingPool of lendingPools[factory]) {
+    //    const amm = getAmmByFactory(
+    //      this.network,
+    //      // WARN: Quick temporary fix, to be removed after
+    //      lendingPool?.pair?.uniswapV2Factory ?? lendingPool?.nftlp?.dexFactory,
+    //    );
+    //    if (!amm) continue;
+    //    if (!lendingPoolsByAmm[amm]) lendingPoolsByAmm[amm] = [];
+    //    const lendingPoolsOfAmm = lendingPoolsByAmm[amm] as LendingPoolData[];
+    //    lendingPoolsOfAmm.push(lendingPool);
+    //  }
+    //}
     // const uniswapAPR = await this.fetchUniswapAPR(lendingPoolsByAmm);
     // Organize lending pools data
     for (const factory in lendingPools) {

package/lib/offchain/initializer/nftlps.d.ts

@@ -0,0 +1,8 @@
+import { NftlpData } from "../offchainTypes";
+import { LendingPoolIndex, AddressIndex, Address } from "../../config/types";
+import Offchain from "../offchain";
+import { ExtensionIndex } from "../../config/types";
+export declare function getNftlpsData(this: Offchain): Promise<LendingPoolIndex<NftlpData>>;
+export declare function getNftlpData(this: Offchain, nftlpAddress: Address): Promise<NftlpData>;
+export declare function initializeNftlpsData(this: Offchain): Promise<AddressIndex<NftlpData>>;
+export declare function fetchNftlpsData(this: Offchain): Promise<ExtensionIndex<NftlpData[]>>;

package/lib/offchain/initializer/nftlps.js

@@ -0,0 +1,69 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.fetchNftlpsData = exports.initializeNftlpsData = exports.getNftlpData = exports.getNftlpsData = void 0;
+const nftlp_1 = require("../../config/nftlp");
+/*--------------------------------------------------------------------------*
+ *                                Getters                                   *
+ *--------------------------------------------------------------------------*/
+async function getNftlpsData() {
+    if (!this.nftlpsData)
+        this.nftlpsData = this.initializeNftlpsData();
+    return this.nftlpsData;
+}
+exports.getNftlpsData = getNftlpsData;
+async function getNftlpData(nftlpAddress) {
+    return (await this.getNftlpsData())[nftlpAddress];
+}
+exports.getNftlpData = getNftlpData;
+/*--------------------------------------------------------------------------*
+ *                            Initializers                                  *
+ *--------------------------------------------------------------------------*/
+// OffchainLendingPool Data
+async function initializeNftlpsData() {
+    const nftlpsData = {};
+    // Get raw data
+    const nftlps = await this.fetchNftlpsData();
+    // Organize nftlps data
+    // Nftlps id can't be duplicated across different extensions
+    for (const extension in nftlps) {
+        for (const nftlp of nftlps[extension]) {
+            nftlp.dex = extension;
+            nftlpsData[nftlp.id] = nftlp;
+        }
+    }
+    return nftlpsData;
+}
+exports.initializeNftlpsData = initializeNftlpsData;
+/*--------------------------------------------------------------------------*
+ *                               Fetchers                                   *
+ *--------------------------------------------------------------------------*/
+async function fetchNftlpsData() {
+    const calls = [];
+    const extensions = [];
+    // Only query for pairs in the pairs list
+    //const pairs = this.getPairsList(Factory.V3, { whitelisted: true, deprecated: true, blacklisted: true });
+    //if (pairs.length === 0) return {};
+    let extension;
+    for (extension of Object.keys(nftlp_1.NFTLP_SUBGRAPH_URL[this.network])) {
+        const subgraphs = nftlp_1.NFTLP_SUBGRAPH_URL[this.network][extension];
+        calls.push(this.getEndpointManager().fetch(subgraphs, this.network, (queryBuilder) => queryBuilder.nftlpsQuery(extension, this.network)));
+        extensions.push(extension);
+    }
+    const results = await Promise.all(calls);
+    const nftlps = {};
+    results.forEach((result, index) => {
+        // `offchainEndpointManager` returns null when using filters and cant find subgraph with filter
+        if (!result)
+            return;
+        // Get the factory for this result
+        const extension = extensions[index];
+        // Get pools data
+        const nftlpsForExtension = result.data?.nftlps;
+        if (!nftlpsForExtension)
+            return;
+        // Add all pools for this factory
+        nftlps[extension] = nftlpsForExtension;
+    });
+    return nftlps;
+}
+exports.fetchNftlpsData = fetchNftlpsData;

package/lib/offchain/initializer/user/positionsV3.js

@@ -37,7 +37,7 @@ async function initializeV3Positions(offchain, factory, rawUserData) {
         const nftlpFactory = position.lendingPool.nftlp.factory;
         // 2. Get the subgraph endpoint/s for this NFTLP factory on this chain
         const dex = (0, nftlp_1.getNftlpDex)(offchain.network, nftlpFactory);
-        if (!dex) {
+        if (dex === undefined) {
             console.warn(`Unknown DEX for NFTLP factory ${nftlpFactory} on ${offchain.network}`);
             continue;
         }

package/lib/offchain/lendingPool/nftlp/offchainNftlp.d.ts

@@ -2,6 +2,7 @@ import OffchainCollateralV3 from "../offchainCollateralV3";
 import OffchainAccountCollateralV3 from "../../account/lendingPool/offchainAccountCollateralV3";
 import OffchainAccountNftlp from "../../account/lendingPool/nftlp/offchainAccountNftlp";
 import { Extension } from "../../../config/types";
+import { NftlpData } from "../../offchainTypes";
 export default abstract class OffchainNftlp {
     protected readonly collateral: OffchainCollateralV3;
     protected cache: {
@@ -16,6 +17,7 @@ export default abstract class OffchainNftlp {
     protected abstract initializeMarketPrice(): Promise<number>;
     abstract getTotalAPR(): Promise<number>;
     getNftlp(): void;
+    getNftlpData(): Promise<NftlpData>;
     getMarketPrice(): Promise<number>;
     getOraclePrice(): Promise<number>;
     cleanCache(): void;

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

@@ -10,6 +10,9 @@ class OffchainNftlp {
     getNftlp() {
         // Something
     }
+    async getNftlpData() {
+        return this.getLendingPool().getOffchain().getNftlpData(this.getNftlpAddress());
+    }
     async getMarketPrice() {
         if (!this.cache.marketPrice)
             this.cache.marketPrice = this.initializeMarketPrice();
@@ -17,8 +20,6 @@ class OffchainNftlp {
     }
     async getOraclePrice() {
         return this.getMarketPrice();
-        //if (!this.cache.oraclePrice) this.cache.oraclePrice = this.initializeOraclePrice();
-        //return this.cache.oraclePrice;
     }
     cleanCache() {
         this.cache = {};

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

@@ -37,19 +37,12 @@ class OffchainNftlpUniswapV3 extends offchainNftlp_1.default {
         ]);
         return priceA / priceB;
     }
-    /*
-    protected async initializeOraclePrice(): Promise<number> {
-      const lendingPoolData = await this.getLendingPool().getLendingPoolData() as any;
-      const priceAdjustment = await this.priceAdjustment();
-      return formatPriceSqrtX96(lendingPoolData.nftlp.oraclePriceSqrtX96, priceAdjustment);
-    }
-    */
     // get basic UniswapV3Pool info given a fee
     // used for calculating the apr
     async initializeUniswapV3Pool(fee) {
         const feeRaw = fee * 1000000;
-        const lendingPoolData = await this.getLendingPool().getLendingPoolData();
-        const pools = lendingPoolData.nftlp.uniswapV3Pools;
+        const nftlpUniswapV3Data = await this.getNftlpData();
+        const pools = nftlpUniswapV3Data.uniswapV3Pools;
         console.log("feeRaw", feeRaw);
         console.log("pools", pools);
         for (let pool of pools) {

package/lib/offchain/lendingPool/offchainLendingPool.d.ts

@@ -55,7 +55,7 @@ export default abstract class OffchainLendingPool {
     getShownLeverage(): Promise<number>;
     getLendingPoolDataPast24h(): Promise<LendingPoolPastData | undefined>;
     getLendingPoolDataPast7d(): Promise<LendingPoolPastData | undefined>;
-    getAmm(): Promise<Amms | null>;
+    abstract getAmm(): Promise<Amms | null>;
     getFarm(): Promise<Farms | null>;
     getKinkMultiplier(): 2 | 5;
     abstract getTotalAPR(): Promise<number>;

package/lib/offchain/lendingPool/offchainLendingPool.js

@@ -3,7 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.LendingPoolVersion = void 0;
 const types_1 = require("../../config/types");
 const farms_1 = require("../../config/farms");
-const amms_1 = require("../../config/amms");
 const factories_1 = require("../../config/factories");
 var LendingPoolVersion;
 (function (LendingPoolVersion) {
@@ -103,14 +102,6 @@ class OffchainLendingPool {
     async getLendingPoolDataPast7d() {
         return (await this.getLendingPoolData()).past7d;
     }
-    // Amms and farms
-    async getAmm() {
-        const lendingPoolData = (await this.getLendingPoolData());
-        // TODO: this properly
-        const pairFactory = lendingPoolData.pair?.uniswapV2Factory ??
-            lendingPoolData.nftlp?.dexFactory;
-        return (0, amms_1.getAmmByFactory)(this.offchain.network, pairFactory);
-    }
     async getFarm() {
         const lendingPoolData = await this.getLendingPoolData();
         return (0, farms_1.getFarmByStakedLPFactory)(this.offchain.network, lendingPoolData.pair.factory);

package/lib/offchain/lendingPool/offchainLendingPoolV2.d.ts

@@ -4,6 +4,7 @@ import OffchainCollateralV2 from "./offchainCollateralV2";
 import OffchainBorrowableV2 from "./offchainBorrowableV2";
 import OffchainAccount from "../account";
 import OffchainAccountLendingPoolV2 from "../account/lendingPool/offchainAccountLendingPoolV2";
+import { Amms } from "../../config/amms";
 export default class OffchainLendingPoolV2 extends OffchainLendingPool {
     protected readonly collateral: OffchainCollateralV2;
     protected readonly borrowables: {
@@ -24,4 +25,5 @@ export default class OffchainLendingPoolV2 extends OffchainLendingPool {
     getCollateralPrice(fast?: boolean): Promise<number>;
     getUnderlyingLPPrice(fast?: boolean): Promise<number>;
     getTotalAPR(): Promise<number>;
+    getAmm(): Promise<Amms | null>;
 }

package/lib/offchain/lendingPool/offchainLendingPoolV2.js

@@ -10,6 +10,7 @@ const offchainBorrowableV2_1 = __importDefault(require("./offchainBorrowableV2")
 const offchainAccountLendingPoolV2_1 = __importDefault(require("../account/lendingPool/offchainAccountLendingPoolV2"));
 const farms_1 = require("../../config/farms");
 const utils_1 = require("../../utils");
+const amms_1 = require("../../config/amms");
 class OffchainLendingPoolV2 extends offchainLendingPool_1.default {
     getNewCollateralObject() {
         return new offchainCollateralV2_1.default(this);
@@ -122,5 +123,10 @@ class OffchainLendingPoolV2 extends offchainLendingPool_1.default {
         ]);
         return uniswapAPR + stakingAPR;
     }
+    async getAmm() {
+        const lendingPoolData = (await this.getLendingPoolData());
+        const pairFactory = lendingPoolData.pair.uniswapV2Factory;
+        return (0, amms_1.getAmmByFactory)(this.offchain.network, pairFactory);
+    }
 }
 exports.default = OffchainLendingPoolV2;

package/lib/offchain/lendingPool/offchainLendingPoolV3.d.ts

@@ -4,6 +4,7 @@ import OffchainLendingPool from "./offchainLendingPool";
 import OffchainBorrowableV3 from "./offchainBorrowableV3";
 import OffchainAccount from "../account";
 import OffchainAccountLendingPoolV3 from "../account/lendingPool/offchainAccountLendingPoolV3";
+import { Amms } from "../../config/amms";
 export default class OffchainLendingPoolV3 extends OffchainLendingPool {
     protected readonly collateral: OffchainCollateralV3;
     protected readonly borrowables: {
@@ -19,4 +20,5 @@ export default class OffchainLendingPoolV3 extends OffchainLendingPool {
     getCollateral: () => OffchainCollateralV3;
     getNftlp: () => import("./nftlp").OffchainNftlp;
     getTotalAPR(): Promise<number>;
+    getAmm(): Promise<Amms | null>;
 }

package/lib/offchain/lendingPool/offchainLendingPoolV3.js

@@ -8,6 +8,7 @@ const offchainCollateralV3_1 = __importDefault(require("./offchainCollateralV3")
 const offchainLendingPool_1 = __importDefault(require("./offchainLendingPool"));
 const offchainBorrowableV3_1 = __importDefault(require("./offchainBorrowableV3"));
 const offchainAccountLendingPoolV3_1 = __importDefault(require("../account/lendingPool/offchainAccountLendingPoolV3"));
+const amms_1 = require("../../config/amms");
 class OffchainLendingPoolV3 extends offchainLendingPool_1.default {
     constructor() {
         super(...arguments);
@@ -30,5 +31,9 @@ class OffchainLendingPoolV3 extends offchainLendingPool_1.default {
     getTotalAPR() {
         return this.getNftlp().getTotalAPR();
     }
+    async getAmm() {
+        const nftlpData = await this.getNftlp().getNftlpData();
+        return (0, amms_1.getAmmByFactory)(this.offchain.network, nftlpData.dexFactory);
+    }
 }
 exports.default = OffchainLendingPoolV3;

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 } from '../config/types';
-import { LendingPoolData, VaultData, VaultPosition, TvlData, UserData, XimxData, VaultBorrowable, NftlpPosition } from './offchainTypes';
+import { LendingPoolData, VaultData, VaultPosition, TvlData, UserData, XimxData, VaultBorrowable, NftlpPosition, NftlpData } from './offchainTypes';
 import OffchainVault from './vault/offchainVault';
 import OffchainConfigManager from './configManager';
 import { LlamaTvlChart } from './offchainAPRHelper';
@@ -28,6 +28,7 @@ export default class Offchain {
     protected solidexHelper: OffchainSolidexHelper;
     protected configManager: OffchainConfigManager;
     protected lendingPoolsData: Promise<LendingPoolIndex<LendingPoolData>> | null;
+    protected nftlpsData: Promise<AddressIndex<NftlpData>> | null;
     protected usersData: {
         [key in Address]?: Promise<FactoryIndex<UserData> | null>;
     };
@@ -97,6 +98,10 @@ export default class Offchain {
     protected fetchBorrowersList: typeof initializer.fetchBorrowersList;
     protected initializeBorrowersList: typeof initializer.initializeBorrowersList;
     getBorrowersList: typeof initializer.getBorrowersList;
+    protected fetchNftlpsData: typeof initializer.fetchNftlpsData;
+    getNftlpsData: typeof initializer.getNftlpsData;
+    getNftlpData: typeof initializer.getNftlpData;
+    protected initializeNftlpsData: typeof initializer.initializeNftlpsData;
     getPairsList(factory: Factory, state: PairState): Address[];
     getCrossChainTVL(): Promise<number>;
     getCrossChainTotalValueSupplied(): Promise<number>;

package/lib/offchain/offchain.js

@@ -92,6 +92,11 @@ class Offchain {
         this.fetchBorrowersList = initializer.fetchBorrowersList;
         this.initializeBorrowersList = initializer.initializeBorrowersList;
         this.getBorrowersList = initializer.getBorrowersList;
+        // NFTLPS
+        this.fetchNftlpsData = initializer.fetchNftlpsData;
+        this.getNftlpsData = initializer.getNftlpsData;
+        this.getNftlpData = initializer.getNftlpData;
+        this.initializeNftlpsData = initializer.initializeNftlpsData;
         // Config
         this.offchainMultichain = offchainMultichain;
         this.network = network;

package/lib/offchain/offchainTypes.d.ts

@@ -1,4 +1,4 @@
-import { Address, AddressIndex, PoolTokenType, ProposalState, WhitelistState, VaultType } from '../config/types';
+import { Address, AddressIndex, PoolTokenType, ProposalState, WhitelistState, VaultType, Extension } from '../config/types';
 export declare const isV3Factory: (factory: string) => boolean;
 export interface TokenData {
     id: Address;
@@ -132,6 +132,25 @@ export interface V2UserData {
         [key in PoolTokenType]?: BorrowPosition;
     }>;
 }
+export interface UniswapV3PoolData {
+    liquidity: string;
+    fee: string;
+    uniswapV3PoolId: Address;
+}
+export interface NftlpUniswapV3Data {
+    dex: Extension;
+    id: Address;
+    factory: Address;
+    dexFactory: Address;
+    uniswapV3Pools: UniswapV3PoolData[];
+}
+export interface NftlpUniswapV2Data {
+    dex: Extension;
+    id: Address;
+    factory: Address;
+    dexFactory: Address;
+}
+export type NftlpData = NftlpUniswapV3Data | NftlpUniswapV2Data;
 export interface NftlpPosition {
     id: string;
     tokenId: string;
@@ -142,7 +161,7 @@ export interface NftlpPosition {
         };
     };
     borrowPositions: BorrowPosition[];
-    dex: string;
+    dex: Extension;
     nftlp: NftlpPositionData;
 }
 export interface NftlpPositionData {

package/lib/offchain/queries/apis/ponder/index.d.ts

@@ -1,4 +1,4 @@
-import { Address, Factory, Networks, VaultType } from "../../../../config/types";
+import { Address, Extension, Factory, Networks, VaultType } from "../../../../config/types";
 import { IQueryBuilder } from "../../interfaces/query-builder";
 export declare class PonderQueryBuilder implements IQueryBuilder {
     blockQuery(): import("graphql").DocumentNode;
@@ -14,6 +14,7 @@ export declare class PonderQueryBuilder implements IQueryBuilder {
     proposalsMetaQuery(rangeBegin: any, rangeLength: any, descending: any): import("graphql").DocumentNode;
     proposalQuery(id: number): import("graphql").DocumentNode;
     ximxQuery(): import("graphql").DocumentNode;
+    nftlpsQuery(extension: Extension, network: Networks): import("graphql").DocumentNode;
     nftlpPositionQuery(lendingPoolId: string, tokenId: string): import("graphql").DocumentNode;
     borrowersListQueryV2(): import("graphql").DocumentNode;
 }

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

@@ -61,14 +61,6 @@ class PonderQueryBuilder {
         const nftlpStr = `{
       id
       factory
-      dexFactory
-      uniswapV3Pools {
-        items {
-          liquidity
-          fee
-          uniswapV3PoolId
-        }
-      }
     }`;
         const id_in_string = addressesFilter?.length > 0
             ? `id_in: ["${addressesFilter.join('","').toLowerCase()}"]`
@@ -460,6 +452,34 @@ class PonderQueryBuilder {
     /*-----------------------------*
      *   NFTLP
      *-----------------------------*/
+    nftlpsQuery(extension, network) {
+        if (extension === types_1.Extension.UniswapV3) {
+            return (0, graphql_tag_1.default) `{
+        nftlps {
+          items {
+            id
+            factory
+            dexFactory
+            uniswapV3Pools {
+              items {
+                liquidity
+                fee
+                uniswapV3PoolId
+              }
+            }
+          }
+        }
+        _meta {
+          status
+        }
+      }`;
+        }
+        if (extension === types_1.Extension.UniswapV2) {
+            // TODO
+        }
+        console.warn(`nftlpsQuery not implemented for extension: ${extension}`);
+        return (0, graphql_tag_1.default) `{}`;
+    }
     nftlpPositionQuery(lendingPoolId, tokenId) {
         const id = `${lendingPoolId}-${tokenId}`;
         return (0, graphql_tag_1.default) `{

package/lib/offchain/queries/apis/thegraph/index.d.ts

@@ -1,15 +1,16 @@
-import { Address, Factory, Networks, VaultType } from "../../../../config/types";
+import { Address, Extension, Factory, Networks, VaultType } from "../../../../config/types";
 import { IQueryBuilder } from "../../interfaces/query-builder";
 export declare class TheGraphQueryBuilder implements IQueryBuilder {
     blockQuery(timestamp: number): import("graphql").DocumentNode;
     getBlockNumber(response: any, network: Networks): number;
     lendingPoolsV3Query(factory: Factory, addressesFilter: Address[]): import("graphql").DocumentNode;
     userQueryV3(account: Address, network: Networks, factory: Factory): import("graphql").DocumentNode;
-    nftlpPositionQuery(lendingPoolId: string, tokenId: string): import("graphql").DocumentNode;
     allPositionsV3Query(): import("graphql").DocumentNode;
     lendingPoolsQuery(factory: Factory, addressesFilter: Address[]): import("graphql").DocumentNode;
     userQuery(account: Address, network: Networks, factory: Factory): import("graphql").DocumentNode;
     tvlQuery(): import("graphql").DocumentNode;
+    nftlpsQuery(extension: Extension, network: Networks): import("graphql").DocumentNode;
+    nftlpPositionQuery(lendingPoolId: string, tokenId: string): import("graphql").DocumentNode;
     vaultsQuery(vaultType: VaultType, addressesFilter: Address[]): import("graphql").DocumentNode;
     vaultsUserQuery(account: Address): import("graphql").DocumentNode;
     proposalsMetaQuery(rangeBegin: any, rangeLength: any, descending: any): import("graphql").DocumentNode;

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

@@ -39,9 +39,6 @@ class TheGraphQueryBuilder {
     userQueryV3(account, network, factory) {
         return (0, graphql_tag_1.default) `{}`;
     }
-    nftlpPositionQuery(lendingPoolId, tokenId) {
-        return (0, graphql_tag_1.default) `{}`;
-    }
     allPositionsV3Query() {
         return (0, graphql_tag_1.default) `{}`;
     }
@@ -204,6 +201,15 @@ class TheGraphQueryBuilder {
       }
     }`;
     }
+    /*-----------------------------*
+     *   Nftlps
+     *-----------------------------*/
+    nftlpsQuery(extension, network) {
+        return (0, graphql_tag_1.default) `{}`;
+    }
+    nftlpPositionQuery(lendingPoolId, tokenId) {
+        return (0, graphql_tag_1.default) `{}`;
+    }
     /*-----------------------------*
      *   Lending vaults
      *-----------------------------*/

package/lib/offchain/queries/interfaces/query-builder.d.ts

@@ -1,15 +1,16 @@
 import { DocumentNode } from 'graphql';
-import { Address, Factory, Networks, VaultType } from '../../../config/types';
+import { Address, Extension, Factory, Networks, VaultType } from '../../../config/types';
 export interface IQueryBuilder {
     blockQuery(timestamp: number): DocumentNode;
     getBlockNumber: (response: any, network: Networks) => number;
     lendingPoolsV3Query(factory: Factory, addressesFilter: Address[], network: Networks): DocumentNode;
     userQueryV3(account: Address, network: Networks, factory: Factory): DocumentNode;
-    nftlpPositionQuery(lendingPoolId: string, tokenId: string): DocumentNode;
     allPositionsV3Query(): DocumentNode;
     lendingPoolsQuery(factory: Factory, addressesFilter: Address[] | undefined, network: Networks): DocumentNode;
     userQuery(account: Address, network: Networks, factory: Factory): DocumentNode;
     tvlQuery(): DocumentNode;
+    nftlpsQuery(extension: Extension, network: Networks): DocumentNode;
+    nftlpPositionQuery(lendingPoolId: string, tokenId: string): DocumentNode;
     vaultsQuery(vaultType: VaultType, addressesFilter: Address[]): DocumentNode;
     vaultsUserQuery(account: Address): DocumentNode;
     proposalsMetaQuery(rangeBegin: number, rangeLength: number, descending: boolean): DocumentNode;

package/package.json

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