impermax-sdk 2.1.236 → 2.1.238

package/lib/offchain/initializer/lendingPools.js

@@ -176,8 +176,10 @@ async function fetchLendingPools() {
     const factories = [];
     let factory;
     for (factory in subgraphs_1.IMPERMAX_SUBGRAPH_URL[this.network]) {
+        // Only query for pairs in the pairs list
+        const pairs = this.getPairsList(factory);
         const subgraphs = subgraphs_1.IMPERMAX_SUBGRAPH_URL[this.network][factory];
-        calls.push(this.getEndpointManager().fetch(subgraphs, this.network, (queryBuilder) => queryBuilder.lendingPoolsQuery(factory, this.whitelistedPairs[factory], this.network)));
+        calls.push(this.getEndpointManager().fetch(subgraphs, this.network, (queryBuilder) => queryBuilder.lendingPoolsQuery(factory, pairs, this.network)));
         factories.push(factory);
     }
     const results = await Promise.all(calls);

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

@@ -35,20 +35,27 @@ async function initializeUserData(account) {
             supplyPositions: {},
             borrowPositions: {},
         };
+        // Get whitelisted + deprecated pairs for this network and factory
+        // Unlike lending pools user queries can't be filtered by lending pool id,
+        // so we filter manually.
+        const pairs = this.getPairsList(factory);
         // Get collateral/borrow positions for V2/V3
         if ((0, offchainTypes_1.isV3Factory)(factory)) {
+            // TODO: V3 pair filter (nftlp)
             const v3Data = await (0, positionsV3_1.initializeV3Positions)(this, factory, userDataOfFactory);
             result[factory].positions = v3Data.positions;
         }
         else {
-            const v2Data = await (0, positionsV2_1.initializeV2Positions)(this, factory, userDataOfFactory);
+            // Pass filtered pairs
+            const v2Data = await (0, positionsV2_1.initializeV2Positions)(this, factory, userDataOfFactory, pairs);
             result[factory].collateralPositions = v2Data.collateralPositions;
             result[factory].borrowPositions = v2Data.borrowPositions;
         }
         // Supply positions is same for v2 and v3
         for (const supplyPosition of userDataOfFactory.supplyPositions) {
             const lendingPoolId = supplyPosition.borrowable.lendingPool.id;
-            if (!this.whitelistedPairs[factory]?.includes(lendingPoolId))
+            // Don't include supply positions if lending pool is not in pair list
+            if (pairs.length > 0 && !pairs.includes(lendingPoolId))
                 continue;
             const underlyingId = supplyPosition.borrowable.underlying.id;
             const borrowableA = (await this.getLendingPool(factory, lendingPoolId)).getBorrowableA();

package/lib/offchain/initializer/user/positionsV2.d.ts

@@ -1,7 +1,7 @@
 import { AddressIndex, Factory, PoolTokenType } from "../../../config/types";
 import { CollateralPosition, BorrowPosition, RawV2UserData } from "../../offchainTypes";
 import Offchain from "../../offchain";
-export declare function initializeV2Positions(offchain: Offchain, factory: Factory, rawUserData: RawV2UserData): Promise<{
+export declare function initializeV2Positions(offchain: Offchain, factory: Factory, rawUserData: RawV2UserData, pairs: Array<string>): Promise<{
     collateralPositions: AddressIndex<CollateralPosition[]>;
     borrowPositions: AddressIndex<{
         [key in PoolTokenType]?: BorrowPosition;

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

@@ -2,13 +2,14 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.initializeV2Positions = void 0;
 const types_1 = require("../../../config/types");
-async function initializeV2Positions(offchain, factory, rawUserData) {
+async function initializeV2Positions(offchain, factory, rawUserData, pairs) {
     const collateralPositions = {};
     const borrowPositions = {};
     // Collateral positions
     for (const collateralPosition of rawUserData.collateralPositions) {
         const lendingPoolId = collateralPosition.collateral.lendingPool.id;
-        if (!offchain.whitelistedPairs[factory]?.includes(lendingPoolId))
+        // Don't include collateral positions if lending pool is not in pair list
+        if (pairs.length > 0 && !pairs.includes(lendingPoolId))
             continue;
         if (!collateralPositions[lendingPoolId])
             collateralPositions[lendingPoolId] = [];
@@ -17,7 +18,8 @@ async function initializeV2Positions(offchain, factory, rawUserData) {
     // Borrow positions
     for (const borrowPosition of rawUserData.borrowPositions) {
         const lendingPoolId = borrowPosition.borrowable.lendingPool.id;
-        if (!offchain.whitelistedPairs[factory]?.includes(lendingPoolId))
+        // Don't include borrow positions if lending pool is not in pair list
+        if (pairs.length > 0 && !pairs.includes(lendingPoolId))
             continue;
         const underlyingId = borrowPosition.borrowable.underlying.id;
         const borrowableA = (await offchain.getLendingPool(factory, lendingPoolId)).getBorrowableA();

package/lib/offchain/offchain.d.ts

@@ -18,6 +18,7 @@ export default class Offchain {
     readonly network: Networks;
     readonly chainId: number;
     readonly whitelistedPairs: FactoryIndex<Address[]>;
+    readonly deprecatedPairs: FactoryIndex<Address[]>;
     protected lendingPools: LendingPoolIndex<OffchainLendingPool>;
     protected vaults: AddressIndex<OffchainVault>;
     protected accounts: AddressIndex<OffchainAccount>;
@@ -46,7 +47,7 @@ export default class Offchain {
         }>>;
     };
     protected borrowersList: Promise<OffchainAccount[]> | null;
-    constructor(offchainMultichain: OffchainMultichain, network: Networks, whitelist?: FactoryIndex<Address[]>);
+    constructor(offchainMultichain: OffchainMultichain, network: Networks, whitelist?: FactoryIndex<Address[]>, deprecated?: FactoryIndex<Address[]>);
     cleanCache(): void;
     getLendingPool(factory: Factory, pairAddress: Address): Promise<OffchainLendingPool>;
     getVault(vaultAddress: Address): Promise<OffchainVault>;
@@ -93,22 +94,7 @@ export default class Offchain {
     protected fetchBorrowersList: typeof initializer.fetchBorrowersList;
     protected initializeBorrowersList: typeof initializer.initializeBorrowersList;
     getBorrowersList: typeof initializer.getBorrowersList;
-    /**
-     * DATA GETTERS
-     */
-    getPairList(): Promise<{
-        pairAddress: string;
-        factory: Factory;
-    }[]>;
-    private getPairData;
-    getPairListWithData(pairList: {
-        pairAddress: string;
-        factory: Factory;
-    }[]): Promise<{
-        pairAddress: Address;
-        factory: Factory;
-        totalBorrowsUSD: number;
-    }[]>;
+    getPairsList(factory: Factory): string[];
     getCrossChainTVL(): Promise<number>;
     getCrossChainTotalValueSupplied(): Promise<number>;
     getCrossChainTotalValueBorrowed(): Promise<number>;

package/lib/offchain/offchain.js

@@ -33,8 +33,9 @@ const offchainVault_1 = __importDefault(require("./vault/offchainVault"));
 const configManager_1 = __importDefault(require("./configManager"));
 const chainId_1 = require("../config/chainId");
 class Offchain {
-    constructor(offchainMultichain, network, whitelist) {
+    constructor(offchainMultichain, network, whitelist, deprecated) {
         this.whitelistedPairs = {};
+        this.deprecatedPairs = {};
         this.allV3PositionsData = {};
         this.getSolidexHelper = () => this.solidexHelper;
         this.getConfigManager = () => this.configManager;
@@ -90,9 +91,8 @@ class Offchain {
         // TODO fix conflicting lines (commented)
         //this.network = cfg.network;
         //this.chainId = cfg.chainId;
-        // TODO: refactor way of doing whitelist, messing up with user query since pairs dont get initialized
-        // this.whitelistedPairs = whitelist ?? {};
         this.whitelistedPairs = whitelist ?? {};
+        this.deprecatedPairs = deprecated ?? {};
         this.offchainMultichain = offchainMultichain;
         this.network = network;
         this.chainId = chainId_1.CHAIN_IDS[network];
@@ -137,32 +137,15 @@ class Offchain {
             this.accounts[accountAddress] = new account_1.default(this, accountAddress);
         return this.accounts[accountAddress];
     }
-    /**
-     * DATA GETTERS
-     */
-    // Pair List
-    async getPairList() {
-        const result = [];
-        const lendingPoolData = await this.getLendingPoolsData();
-        let factory;
-        for (factory in lendingPoolData) {
-            for (const pairAddress in lendingPoolData[factory]) {
-                result.push({ pairAddress, factory });
-            }
-        }
-        return result;
-    }
-    async getPairData(factory, pairAddress) {
-        const lendingPool = await this.getLendingPool(factory, pairAddress);
-        const totalBorrowsUSD = await lendingPool.getTotalBorrowsUSD();
-        return { pairAddress, factory, totalBorrowsUSD };
-    }
-    async getPairListWithData(pairList) {
-        const requests = [];
-        for (const pair of pairList) {
-            requests.push(this.getPairData(pair.factory, pair.pairAddress));
-        }
-        return Promise.all(requests);
+    /* --------------------------------------------------
+     *    Pairs to get data, passed in constructor
+     * -------------------------------------------------*/
+    // Returns the unique whitelisted + deprecated pairs list to show on the frontend.
+    getPairsList(factory) {
+        const whitelistedPairs = this.whitelistedPairs[factory] ?? [];
+        const deprecatedPairs = this.deprecatedPairs[factory] ?? [];
+        const pairs = [...whitelistedPairs, ...deprecatedPairs].map(i => i.toLowerCase());
+        return pairs;
     }
     /* --------------------------------------------------
      *    Cross chain stats

package/lib/offchain/offchainMultichain.d.ts

@@ -62,7 +62,7 @@ export default class OffchainMultichain {
     protected multichainAccounts: AddressIndex<OffchainMultichainAccount>;
     private constructor();
     static get instance(): OffchainMultichain;
-    getOffchain(network: Networks, whitelist?: FactoryIndex<Address[]>): Offchain;
+    getOffchain(network: Networks, whitelist?: FactoryIndex<Address[]>, deprecated?: FactoryIndex<Address[]>): Offchain;
     getAPRHelper(): OffchainAPRHelper;
     getPriceHelper(): OffchainPriceHelper;
     getEndpointManager(): OffchainEndpointManager;

package/lib/offchain/offchainMultichain.js

@@ -61,9 +61,9 @@ class OffchainMultichain {
         }
         return __classPrivateFieldGet(OffchainMultichain, _a, "f", _OffchainMultichain_instance);
     }
-    getOffchain(network, whitelist) {
+    getOffchain(network, whitelist, deprecated) {
         if (!this.offchains[network])
-            this.offchains[network] = new offchain_1.default(this, network, whitelist);
+            this.offchains[network] = new offchain_1.default(this, network, whitelist, deprecated);
         return this.offchains[network];
     }
     getAPRHelper() {

package/package.json

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