impermax-sdk 2.1.8 → 2.1.10

package/lib/config/amms.d.ts

@@ -45,10 +45,12 @@ export declare enum Amms {
     equalizer = "equalizer",
     wigoswap = "wigoswap",
     velodrome = "velodrome",
-    alien = "alien"
+    alien = "alien",
+    uniswapv3 = "uniswapv3"
 }
 export declare const hrAmms: {
     uniswap: string;
+    uniswapv3: string;
     quickswap: string;
     satin: string;
     pearl: string;

package/lib/config/amms.js

@@ -50,9 +50,11 @@ var Amms;
     Amms["wigoswap"] = "wigoswap";
     Amms["velodrome"] = "velodrome";
     Amms["alien"] = "alien";
+    Amms["uniswapv3"] = "uniswapv3";
 })(Amms = exports.Amms || (exports.Amms = {}));
 exports.hrAmms = {
-    [Amms.uniswap]: 'Uniswap',
+    [Amms.uniswap]: 'UniswapV2',
+    [Amms.uniswapv3]: 'UniswapV3',
     [Amms.quickswap]: 'QuickSwap',
     [Amms.satin]: 'Satin',
     [Amms.pearl]: 'Pearl',
@@ -173,7 +175,8 @@ exports.AMM_FACTORY = {
         [Amms.aeroStable1]: '0x9111b8D7Cc1a676A70015BEA3A3a9968A44C52c3',
         [Amms.scale]: '0xEd8db60aCc29e14bC867a497D94ca6e3CeB5eC04',
         [Amms.uniswap]: '0x8909Dc15e40173Ff4699343b6eB8132c65e18eC6',
-        [Amms.alien]: '0x3E84D913803b02A4a7f027165E8cA42C14C0FdE7'
+        [Amms.alien]: '0x3E84D913803b02A4a7f027165E8cA42C14C0FdE7',
+        [Amms.uniswapv3]: '0x33128a8fc17869897dce68ed026d694621f6fdfd'
     },
     [types_1.Networks.Scroll]: {
         [Amms.tokan]: '0x074568F090e93194289c2C2BF285eE7f60b485a9',

package/lib/config/contracts/impermax-factories.js

@@ -50,6 +50,7 @@ exports.IMPERMAX_FACTORY = {
         [types_1.Factory.SOLV2]: '0x66ca66E002a9CEE8dEfE25dB6f0c6225117C2d9f',
         [types_1.Factory.SOL_STABLE]: '0x8aDc5F73e63b3Af3fd0648281fE451738D8B9D86',
         [types_1.Factory.V2V2]: '0x47183bB55AD0F891887E099Cec3570d3C667cD00',
+        [types_1.Factory.V3]: '0xfa13d3fda783824949bef75f5e95bb546cfddf6f',
     },
     [types_1.Networks.Scroll]: {
         [types_1.Factory.SOLV2]: '0x02Ff7B4d96EeBF8c9B34Fae0418E591e11da3099',

package/lib/config/subgraphs.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.WHITELIST_SUBGRAPH_URL = exports.CONFIG_MANAGER_SUBGRAPH_URL = exports.XIMX_SUBGRAPH_URL = exports.BLOCKS_SUBGRAPH_URL = exports.IMPERMAX_CHEF_SUBGRAPH_URL = exports.VAULT_SUBGRAPH_URL = exports.IMPERMAX_SUBGRAPH_URL = void 0;
 const types_1 = require("./types");
+// @ts-ignore
 exports.IMPERMAX_SUBGRAPH_URL = {
     [types_1.Networks.Ropsten]: {},
     [types_1.Networks.Mainnet]: {
@@ -102,6 +103,9 @@ exports.IMPERMAX_SUBGRAPH_URL = {
             "https://gateway.thegraph.com/api/1350441d268f171aeb0934412dfadf3b/subgraphs/id/B7xsBeef3FohKaFPcsAsviyLKaWXTqcSELjAsPj2B7iW",
             "https://base-start-production.up.railway.app/",
         ],
+        [types_1.Factory.V3]: [
+            "https://impermax-indexer-production.up.railway.app/",
+        ],
     },
     [types_1.Networks.Scroll]: {
         [types_1.Factory.SOLV2]: [

package/lib/config/types.d.ts

@@ -88,8 +88,7 @@ export declare enum VaultType {
     HEDGED = "Hedged",
     LEVERAGED = "Leverage"
 }
-export type NetworkVaultTypeIndex<Type> = {
-    [key in Networks]: {
-        [key in VaultType]?: Type;
-    };
+export type VaultTypeIndex<Type> = {
+    [key in VaultType]?: Type;
 };
+export type NetworkVaultTypeIndex<Type> = NetworkIndex<VaultTypeIndex<Type>>;

package/lib/index.d.ts

@@ -33,6 +33,7 @@ import { OnchainInteractionsLendingPool, OnchainInteractionsLendingVault, Onchai
 import { OnchainInteractionsBorrowable, OnchainInteractionsCollateral } from './onchain/interactions/lendingPool';
 import { LENDING_VAULT_WATCHER } from './config/contracts/lending-vault-watcher';
 import OffchainVault, { OffchainLendingVault, OffchainLeveragedVault, OffchainHedgedVault } from './offchain/vault';
-import { SortDirection, VaultOrderBy, VaultListParams } from "./offchain/offchainMultichain";
+import { SortDirection, VaultListOrderBy, VaultListParams, LendingPoolListParams, LendingPoolListOrderBy } from "./offchain/offchainMultichain";
 import { VaultRisk } from "./offchain/vault/offchainVault";
-export { offchain, OffchainMultichain, Offchain, OffchainLendingPool, OffchainPoolToken, OffchainCollateral, OffchainBorrowable, OffchainVault, OffchainLeveragedVault, OffchainLendingVault, OffchainHedgedVault, OffchainConfigManager, OffchainPairConfig, OffchainProposal, OffchainMultichainAccount, OffchainAccount, OffchainAccountLendingPool, OffchainAccountPoolToken, OffchainAccountCollateral, OffchainAccountBorrowable, OffchainLeveragedPosition, OffchainAccountVault, OffchainPriceHelper, OffchainSolidexHelper, PoolTokenData, BorrowableData, CollateralData, BorrowablePastData, TokenData, RewardData, PairData, FarmingPoolData, LendingPoolPastData, LendingPoolData, CollateralPosition, SupplyPosition, BorrowPosition, UserData, TvlData, XimxData, LendingVaultData, VaultPosition, PairConfigData, ProposalData, ProposalMetadata, VaultRisk, VaultType, onchain, Onchain, OnchainLendingPool, OnchainPoolToken, OnchainBorrowable, OnchainCollateral, OnchainLendingVault, OnchainConfigManager, OnchainProposal, OnchainPairConfig, OnchainAccount, OnchainAccountLendingPool, OnchainAccountPoolToken, OnchainAccountBorrowable, OnchainAccountCollateral, OnchainAccountLendingVault, OnchainContractsHelper, OnchainImpermaxFactory, OnchainInteractions, OnchainInteractionsLendingPool, OnchainInteractionsPoolToken, OnchainInteractionsCollateral, OnchainInteractionsBorrowable, OnchainInteractionsLendingVault, OnchainInteractionsConfigManager, Contract, ApprovalType, PermitData, OnchainConfig, Changes, NO_CHANGES, Values, AirdropData, PendingRewardUI, CollateralConfig, BorrowableConfig, PairConfig, CLAIM_AGGREGATOR, IMPERMAX_CHEF, IMX, IMPERMAX_FACTORY, getNetworkFactories, LENDING_VAULT_WATCHER, MERKLE_DISTRIBUTOR_IBEX, MERKLE_DISTRIBUTOR_IBEX_2, MERKLE_DISTRIBUTOR_ETH, ROUTER, SIMPLE_UNISWAP_ORACLE, WETH, MERKLE_URL_ETH, MERKLE_URL_IBEX, MERKLE_URL_IBEX_2, hrAmms, AMM_FACTORY, getAmmByFactory, AMM_SUBGRAPH_URLS, ADD_LIQUIDITY_URLS, AMM_LP_FEE, DEBANK_IDS, ETH_SYMBOL, ETH_NAME, SOLIDEX_FACTORIES, BORROW_FEE_FACTORIES, OLD_KINK_MULTIPLIER_FACTORIES, LIQUIDATION_FEE_FACTORIES, V2_FACTORIES, Farms, hrFarms, FarmIndex, STAKED_LP_FACTORY, getFarmByStakedLPFactory, NOT_SYNCED, DEADLINE, ZERO, APPROVE_AMOUNT, IMPERMAX_SUBGRAPH_URL, IMPERMAX_CHEF_SUBGRAPH_URL, BLOCKS_SUBGRAPH_URL, XIMX_SUBGRAPH_URL, Networks, Factory, PoolTokenType, Amms, Address, NetworkIndex, FactoryIndex, AddressIndex, NetworkFactoryIndex, LendingPoolIndex, AmmIndex, DistributorDetails, ProposalState, WhitelistState, VaultOrderBy, VaultListParams, SortDirection };
+import { LendingPoolVersion } from "./offchain/lendingPool/offchainLendingPool";
+export { offchain, OffchainMultichain, Offchain, OffchainLendingPool, OffchainPoolToken, OffchainCollateral, OffchainBorrowable, OffchainVault, OffchainLeveragedVault, OffchainLendingVault, OffchainHedgedVault, OffchainConfigManager, OffchainPairConfig, OffchainProposal, OffchainMultichainAccount, OffchainAccount, OffchainAccountLendingPool, OffchainAccountPoolToken, OffchainAccountCollateral, OffchainAccountBorrowable, OffchainLeveragedPosition, OffchainAccountVault, OffchainPriceHelper, OffchainSolidexHelper, PoolTokenData, BorrowableData, CollateralData, BorrowablePastData, TokenData, RewardData, PairData, FarmingPoolData, LendingPoolPastData, LendingPoolData, CollateralPosition, SupplyPosition, BorrowPosition, UserData, TvlData, XimxData, LendingVaultData, VaultPosition, PairConfigData, ProposalData, ProposalMetadata, VaultRisk, VaultType, onchain, Onchain, OnchainLendingPool, OnchainPoolToken, OnchainBorrowable, OnchainCollateral, OnchainLendingVault, OnchainConfigManager, OnchainProposal, OnchainPairConfig, OnchainAccount, OnchainAccountLendingPool, OnchainAccountPoolToken, OnchainAccountBorrowable, OnchainAccountCollateral, OnchainAccountLendingVault, OnchainContractsHelper, OnchainImpermaxFactory, OnchainInteractions, OnchainInteractionsLendingPool, OnchainInteractionsPoolToken, OnchainInteractionsCollateral, OnchainInteractionsBorrowable, OnchainInteractionsLendingVault, OnchainInteractionsConfigManager, Contract, ApprovalType, PermitData, OnchainConfig, Changes, NO_CHANGES, Values, AirdropData, PendingRewardUI, CollateralConfig, BorrowableConfig, PairConfig, CLAIM_AGGREGATOR, IMPERMAX_CHEF, IMX, IMPERMAX_FACTORY, getNetworkFactories, LENDING_VAULT_WATCHER, MERKLE_DISTRIBUTOR_IBEX, MERKLE_DISTRIBUTOR_IBEX_2, MERKLE_DISTRIBUTOR_ETH, ROUTER, SIMPLE_UNISWAP_ORACLE, WETH, MERKLE_URL_ETH, MERKLE_URL_IBEX, MERKLE_URL_IBEX_2, hrAmms, AMM_FACTORY, getAmmByFactory, AMM_SUBGRAPH_URLS, ADD_LIQUIDITY_URLS, AMM_LP_FEE, DEBANK_IDS, ETH_SYMBOL, ETH_NAME, SOLIDEX_FACTORIES, BORROW_FEE_FACTORIES, OLD_KINK_MULTIPLIER_FACTORIES, LIQUIDATION_FEE_FACTORIES, V2_FACTORIES, Farms, hrFarms, FarmIndex, STAKED_LP_FACTORY, getFarmByStakedLPFactory, NOT_SYNCED, DEADLINE, ZERO, APPROVE_AMOUNT, IMPERMAX_SUBGRAPH_URL, IMPERMAX_CHEF_SUBGRAPH_URL, BLOCKS_SUBGRAPH_URL, XIMX_SUBGRAPH_URL, Networks, Factory, PoolTokenType, Amms, Address, NetworkIndex, FactoryIndex, AddressIndex, NetworkFactoryIndex, LendingPoolIndex, AmmIndex, DistributorDetails, ProposalState, WhitelistState, VaultListOrderBy, VaultListParams, LendingPoolListOrderBy, LendingPoolListParams, SortDirection, LendingPoolVersion };

package/lib/index.js

@@ -25,7 +25,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.OnchainInteractionsLendingVault = exports.OnchainInteractionsBorrowable = exports.OnchainInteractionsCollateral = exports.OnchainInteractionsPoolToken = exports.OnchainInteractionsLendingPool = exports.OnchainInteractions = exports.OnchainImpermaxFactory = exports.OnchainContractsHelper = exports.OnchainAccountLendingVault = exports.OnchainAccountCollateral = exports.OnchainAccountBorrowable = exports.OnchainAccountPoolToken = exports.OnchainAccountLendingPool = exports.OnchainAccount = exports.OnchainPairConfig = exports.OnchainProposal = exports.OnchainConfigManager = exports.OnchainLendingVault = exports.OnchainCollateral = exports.OnchainBorrowable = exports.OnchainPoolToken = exports.OnchainLendingPool = exports.Onchain = exports.onchain = exports.VaultType = exports.VaultRisk = exports.OffchainSolidexHelper = exports.OffchainPriceHelper = exports.OffchainAccountVault = exports.OffchainLeveragedPosition = exports.OffchainAccountBorrowable = exports.OffchainAccountCollateral = exports.OffchainAccountPoolToken = exports.OffchainAccountLendingPool = exports.OffchainAccount = exports.OffchainMultichainAccount = exports.OffchainProposal = exports.OffchainPairConfig = exports.OffchainConfigManager = exports.OffchainHedgedVault = exports.OffchainLendingVault = exports.OffchainLeveragedVault = exports.OffchainVault = exports.OffchainBorrowable = exports.OffchainCollateral = exports.OffchainPoolToken = exports.OffchainLendingPool = exports.Offchain = exports.OffchainMultichain = exports.offchain = void 0;
 exports.WhitelistState = exports.ProposalState = exports.Amms = exports.PoolTokenType = exports.Factory = exports.Networks = exports.XIMX_SUBGRAPH_URL = exports.BLOCKS_SUBGRAPH_URL = exports.IMPERMAX_CHEF_SUBGRAPH_URL = exports.IMPERMAX_SUBGRAPH_URL = exports.APPROVE_AMOUNT = exports.ZERO = exports.DEADLINE = exports.NOT_SYNCED = exports.getFarmByStakedLPFactory = exports.STAKED_LP_FACTORY = exports.hrFarms = exports.Farms = exports.V2_FACTORIES = exports.LIQUIDATION_FEE_FACTORIES = exports.OLD_KINK_MULTIPLIER_FACTORIES = exports.BORROW_FEE_FACTORIES = exports.SOLIDEX_FACTORIES = exports.ETH_NAME = exports.ETH_SYMBOL = exports.DEBANK_IDS = exports.AMM_LP_FEE = exports.ADD_LIQUIDITY_URLS = exports.AMM_SUBGRAPH_URLS = exports.getAmmByFactory = exports.AMM_FACTORY = exports.hrAmms = exports.MERKLE_URL_IBEX_2 = exports.MERKLE_URL_IBEX = exports.MERKLE_URL_ETH = exports.WETH = exports.SIMPLE_UNISWAP_ORACLE = exports.ROUTER = exports.MERKLE_DISTRIBUTOR_ETH = exports.MERKLE_DISTRIBUTOR_IBEX_2 = exports.MERKLE_DISTRIBUTOR_IBEX = exports.LENDING_VAULT_WATCHER = exports.getNetworkFactories = exports.IMPERMAX_FACTORY = exports.IMX = exports.IMPERMAX_CHEF = exports.CLAIM_AGGREGATOR = exports.NO_CHANGES = exports.ApprovalType = exports.OnchainInteractionsConfigManager = void 0;
-exports.SortDirection = exports.VaultOrderBy = void 0;
+exports.LendingPoolVersion = exports.SortDirection = exports.LendingPoolListOrderBy = exports.VaultListOrderBy = void 0;
 const offchain_1 = __importStar(require("./offchain"));
 exports.Offchain = offchain_1.default;
 Object.defineProperty(exports, "OffchainAccount", { enumerable: true, get: function () { return offchain_1.OffchainAccount; } });
@@ -162,6 +162,9 @@ Object.defineProperty(exports, "OffchainHedgedVault", { enumerable: true, get: f
 // Data helpers (sort, filter)
 const offchainMultichain_1 = require("./offchain/offchainMultichain");
 Object.defineProperty(exports, "SortDirection", { enumerable: true, get: function () { return offchainMultichain_1.SortDirection; } });
-Object.defineProperty(exports, "VaultOrderBy", { enumerable: true, get: function () { return offchainMultichain_1.VaultOrderBy; } });
+Object.defineProperty(exports, "VaultListOrderBy", { enumerable: true, get: function () { return offchainMultichain_1.VaultListOrderBy; } });
+Object.defineProperty(exports, "LendingPoolListOrderBy", { enumerable: true, get: function () { return offchainMultichain_1.LendingPoolListOrderBy; } });
 const offchainVault_1 = require("./offchain/vault/offchainVault");
 Object.defineProperty(exports, "VaultRisk", { enumerable: true, get: function () { return offchainVault_1.VaultRisk; } });
+const offchainLendingPool_1 = require("./offchain/lendingPool/offchainLendingPool");
+Object.defineProperty(exports, "LendingPoolVersion", { enumerable: true, get: function () { return offchainLendingPool_1.LendingPoolVersion; } });

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

@@ -1,15 +1,15 @@
-import Offchain from '../index';
-import { Address, Borrowable, Factory, PoolTokenType, WhitelistState } from '../../config/types';
-import OffchainCollateral from './offchainCollateral';
-import OffchainBorrowable from './offchainBorrowable';
-import OffchainPoolToken from '../offchainPoolToken';
-import { LendingPoolData, LendingPoolPastData } from '../offchainTypes';
-import { Farms } from '../../config/farms';
-import { Amms } from '../../config/amms';
+import Offchain from "../index";
+import { Address, Borrowable, Factory, PoolTokenType, WhitelistState } from "../../config/types";
+import OffchainCollateral from "./offchainCollateral";
+import OffchainBorrowable from "./offchainBorrowable";
+import OffchainPoolToken from "../offchainPoolToken";
+import { LendingPoolData, LendingPoolPastData } from "../offchainTypes";
+import { Farms } from "../../config/farms";
+import { Amms } from "../../config/amms";
 export declare enum LendingPoolVersion {
-    V1 = 0,
-    V2 = 1,
-    V3 = 2
+    V1 = "V1",
+    V2 = "V2",
+    V3 = "V3"
 }
 export default class OffchainLendingPool {
     private readonly offchain;
@@ -48,13 +48,13 @@ export default class OffchainLendingPool {
     getCollateralPrice(fast?: boolean): Promise<number>;
     getUnderlyingLPPrice(fast?: boolean): Promise<number>;
     getKinkMultiplier(): 2 | 5;
-    getTotalBorrowsUSD(): Promise<number>;
     getTotalAPR(): Promise<number>;
     getTVL(): Promise<number>;
     isDeprecated(): Promise<boolean>;
     isBlacklisted(): Promise<boolean>;
-    isStable(): Promise<boolean>;
     isLowTVL(): Promise<boolean>;
     isHighTVL(): Promise<boolean>;
-    getLendingPoolVersion(): Promise<LendingPoolVersion>;
+    isStable(): boolean;
+    getLendingPoolVersion(): LendingPoolVersion;
+    getTotalBorrowsUSD(): Promise<number>;
 }

package/lib/offchain/lendingPool/offchainLendingPool.js

@@ -22,9 +22,9 @@ const amms_1 = require("../../config/amms");
 const factories_1 = require("../../config/factories");
 var LendingPoolVersion;
 (function (LendingPoolVersion) {
-    LendingPoolVersion[LendingPoolVersion["V1"] = 0] = "V1";
-    LendingPoolVersion[LendingPoolVersion["V2"] = 1] = "V2";
-    LendingPoolVersion[LendingPoolVersion["V3"] = 2] = "V3";
+    LendingPoolVersion["V1"] = "V1";
+    LendingPoolVersion["V2"] = "V2";
+    LendingPoolVersion["V3"] = "V3";
 })(LendingPoolVersion = exports.LendingPoolVersion || (exports.LendingPoolVersion = {}));
 class OffchainLendingPool {
     constructor(offchain, factory, pairAddress) {
@@ -83,7 +83,7 @@ class OffchainLendingPool {
     }
     getLiquidationPenalty() {
         return __awaiter(this, void 0, void 0, function* () {
-            return (yield this.getLiquidationIncentive()) + (yield this.getLiquidationFee());
+            return ((yield this.getLiquidationIncentive()) + (yield this.getLiquidationFee()));
         });
     }
     // Uniswap APR
@@ -110,8 +110,13 @@ class OffchainLendingPool {
         return __awaiter(this, void 0, void 0, function* () {
             const farm = yield this.getFarm();
             const lendingPoolData = yield this.getLendingPoolData();
-            if (farm === farms_1.Farms.solidex || farm === farms_1.Farms.solidexB || farm === farms_1.Farms.solidexUSDC || farm === farms_1.Farms.solidexUSDCB) {
-                const solidexLPDetails = yield this.offchain.getSolidexHelper().getSolidexLPDetails();
+            if (farm === farms_1.Farms.solidex ||
+                farm === farms_1.Farms.solidexB ||
+                farm === farms_1.Farms.solidexUSDC ||
+                farm === farms_1.Farms.solidexUSDCB) {
+                const solidexLPDetails = yield this.offchain
+                    .getSolidexHelper()
+                    .getSolidexLPDetails();
                 const result = solidexLPDetails[lendingPoolData.pair.uniswapV2PairAddress];
                 if (result)
                     return result;
@@ -123,14 +128,19 @@ class OffchainLendingPool {
             for (const reward of lendingPoolData.pair.rewards) {
                 const multiplier = farm === farms_1.Farms.traderJoeV2 ? 0.5 : 1;
                 const periodFinish = parseInt(reward.periodFinish);
-                if ((new Date).getTime() / 1000 - FINISH_DELAY > periodFinish && periodFinish !== 0)
+                if (new Date().getTime() / 1000 - FINISH_DELAY > periodFinish &&
+                    periodFinish !== 0)
                     continue;
                 let rewardRate = parseFloat(reward.rewardRate);
                 if (farm == farms_1.Farms.traderJoeV4)
                     rewardRate = rewardRate * 0.45;
-                const rewardPrice = yield this.offchain.getPriceHelper().getDebankTokenPrice(reward.rewardsToken.id);
+                const rewardPrice = yield this.offchain
+                    .getPriceHelper()
+                    .getDebankTokenPrice(reward.rewardsToken.id);
                 rewards.push({
-                    APR: (0, utils_1.toAPR)((rewardPrice * rewardRate) / (stakedTotalSupply * underlyingLPPrice) * multiplier),
+                    APR: (0, utils_1.toAPR)(((rewardPrice * rewardRate) /
+                        (stakedTotalSupply * underlyingLPPrice)) *
+                        multiplier),
                     symbol: reward.rewardsToken.symbol,
                 });
             }
@@ -173,9 +183,12 @@ class OffchainLendingPool {
     }
     // Amms and farms
     getAmm() {
+        var _a, _b, _c;
         return __awaiter(this, void 0, void 0, function* () {
             const lendingPoolData = yield this.getLendingPoolData();
-            return (0, amms_1.getAmmByFactory)(this.offchain.network, lendingPoolData.pair.uniswapV2Factory);
+            // TODO: this properly
+            const pairFactory = (_b = (_a = lendingPoolData.pair) === null || _a === void 0 ? void 0 : _a.uniswapV2Factory) !== null && _b !== void 0 ? _b : (_c = lendingPoolData.nftlp) === null || _c === void 0 ? void 0 : _c.dexFactory;
+            return (0, amms_1.getAmmByFactory)(this.offchain.network, pairFactory);
         });
     }
     getFarm() {
@@ -197,16 +210,17 @@ class OffchainLendingPool {
     getCollateralPrice(fast = true) {
         return __awaiter(this, void 0, void 0, function* () {
             const lendingPoolData = yield this.getLendingPoolData();
-            return this.calculateCollateralPrice(parseFloat(lendingPoolData.pair.reserve0), parseFloat(lendingPoolData.pair.reserve1), parseFloat(lendingPoolData.pair.totalSupply), fast ?
-                yield this.getBorrowableA().getTokenPriceFast() :
-                yield this.getBorrowableA().getTokenPriceAccurate(), fast ?
-                yield this.getBorrowableB().getTokenPriceFast() :
-                yield this.getBorrowableB().getTokenPriceAccurate());
+            return this.calculateCollateralPrice(parseFloat(lendingPoolData.pair.reserve0), parseFloat(lendingPoolData.pair.reserve1), parseFloat(lendingPoolData.pair.totalSupply), fast
+                ? yield this.getBorrowableA().getTokenPriceFast()
+                : yield this.getBorrowableA().getTokenPriceAccurate(), fast
+                ? yield this.getBorrowableB().getTokenPriceFast()
+                : yield this.getBorrowableB().getTokenPriceAccurate());
         });
     }
     getUnderlyingLPPrice(fast = true) {
         return __awaiter(this, void 0, void 0, function* () {
-            return (yield this.getCollateralPrice(fast)) / (yield this.getStakedLPExchangeRate());
+            return ((yield this.getCollateralPrice(fast)) /
+                (yield this.getStakedLPExchangeRate()));
         });
     }
     // Kink Multiplier
@@ -215,29 +229,33 @@ class OffchainLendingPool {
             return 5;
         return 2;
     }
-    // Stats
-    getTotalBorrowsUSD() {
-        return __awaiter(this, void 0, void 0, function* () {
-            const totalBorrowsUSDA = yield this.getBorrowableA().getTotalBorrowsUSD();
-            const totalBorrowsUSDB = yield this.getBorrowableB().getTotalBorrowsUSD();
-            return totalBorrowsUSDA + totalBorrowsUSDB;
-        });
-    }
     getTotalAPR() {
         return __awaiter(this, void 0, void 0, function* () {
-            const uniswapV2Pair = (yield this.getLendingPoolData()).pair.uniswapV2PairAddress;
+            const uniswapV2Pair = (yield this.getLendingPoolData()).pair
+                .uniswapV2PairAddress;
             // If llama fails/apr is 0 we get the uniswapAPR and stakingAPR through subgraph
-            const apr = yield this.offchain.getAPRHelper().getLlamaAPR(uniswapV2Pair, this.offchain.network);
+            const apr = yield this.offchain
+                .getAPRHelper()
+                .getLlamaAPR(uniswapV2Pair, this.offchain.network);
             if (apr > 0)
                 return apr;
-            const [uniswapAPR, stakingAPR] = yield Promise.all([this.getUniswapAPR(), this.getStakingAPR()]);
+            const [uniswapAPR, stakingAPR] = yield Promise.all([
+                this.getUniswapAPR(),
+                this.getStakingAPR(),
+            ]);
             return uniswapAPR + stakingAPR;
         });
     }
+    // NOTE: Should this also include collateral totalBalanceUSD ?
     getTVL() {
         return __awaiter(this, void 0, void 0, function* () {
-            // TODO
-            return 1;
+            const [supply0USD, supply1USD] = yield Promise.all([
+                this.getBorrowableA().getSupplyUSD(),
+                this.getBorrowableB().getSupplyUSD(),
+            ]);
+            if (supply0USD && supply1USD)
+                return supply0USD + supply1USD;
+            return 0;
         });
     }
     // Flags
@@ -251,11 +269,6 @@ class OffchainLendingPool {
             return false;
         });
     }
-    isStable() {
-        return __awaiter(this, void 0, void 0, function* () {
-            return false;
-        });
-    }
     isLowTVL() {
         return __awaiter(this, void 0, void 0, function* () {
             return false;
@@ -266,11 +279,31 @@ class OffchainLendingPool {
             return false;
         });
     }
+    // WARN: If V3 supports multiple pool types, then need more robust way to check if is stable or not
+    isStable() {
+        const factoryType = Number(this.factory);
+        if (factoryType === 7)
+            return true;
+        return false;
+    }
     // Versions Specfics
     getLendingPoolVersion() {
-        return __awaiter(this, void 0, void 0, function* () {
-            // TODO
+        const factoryType = Number(this.factory);
+        if (factoryType < 4)
+            return LendingPoolVersion.V1;
+        if (factoryType < 8)
             return LendingPoolVersion.V2;
+        return LendingPoolVersion.V3;
+    }
+    getTotalBorrowsUSD() {
+        return __awaiter(this, void 0, void 0, function* () {
+            const [borrows0USD, borrows1USD] = yield Promise.all([
+                this.getBorrowableA().getTotalBorrowsUSD(),
+                this.getBorrowableB().getTotalBorrowsUSD(),
+            ]);
+            if (borrows0USD && borrows1USD)
+                return borrows0USD + borrows1USD;
+            return 0;
         });
     }
 }

package/lib/offchain/offchain.d.ts

@@ -43,7 +43,7 @@ export default class Offchain {
     protected vaultsUsersData: {
         [key in Address]?: Promise<AddressIndex<AddressIndex<VaultPosition>>>;
     };
-    constructor(offchainMultichain: OffchainMultichain, network: Networks);
+    constructor(offchainMultichain: OffchainMultichain, network: Networks, whitelist?: FactoryIndex<Address[]>);
     cleanCache(): void;
     getLendingPool(factory: Factory, pairAddress: Address): Promise<OffchainLendingPool>;
     getVault(vaultAddress: Address): Promise<OffchainVault>;

package/lib/offchain/offchain.js

@@ -45,7 +45,7 @@ const offchainVault_1 = __importDefault(require("./vault/offchainVault"));
 const configManager_1 = __importDefault(require("./configManager"));
 const chainId_1 = require("../config/chainId");
 class Offchain {
-    constructor(offchainMultichain, network) {
+    constructor(offchainMultichain, network, whitelist) {
         this.whitelistedPairs = {};
         this.getPriceHelper = () => this.priceHelper;
         this.getSolidexHelper = () => this.solidexHelper;
@@ -91,7 +91,7 @@ class Offchain {
         // TODO fix conflicting lines (commented)
         //this.network = cfg.network;
         //this.chainId = cfg.chainId;
-        //this.whitelistedPairs = cfg.whitelistedPairs ? cfg.whitelistedPairs : {};
+        this.whitelistedPairs = whitelist !== null && whitelist !== void 0 ? whitelist : {};
         this.offchainMultichain = offchainMultichain;
         this.network = network;
         this.chainId = chainId_1.CHAIN_IDS[network];

package/lib/offchain/offchainAPRHelper.js

@@ -167,18 +167,23 @@ class OffchainAPRHelper {
     getLlamaAPR(pool, chain) {
         var _a;
         return __awaiter(this, void 0, void 0, function* () {
-            // Get or initialize the pools
-            const llamaAllPools = yield this.getLlamaYields();
-            // Map to llama chain names, if not supported, then fetch native way
-            const llamaChain = LlamaChains[chain];
-            if (!llamaChain)
+            try {
+                // Get or initialize the pools
+                const llamaAllPools = yield this.getLlamaYields();
+                // Map to llama chain names, if not supported, then fetch native way
+                const llamaChain = LlamaChains[chain];
+                if (!llamaChain)
+                    return 0;
+                // Make pool unique ({poolAddress}-{chain})
+                const llamaId = pool.concat("-", llamaChain).toLowerCase();
+                // Convert to decimals to match `getUniswapAPR` and `getStakingAPR`
+                const apy = ((_a = llamaAllPools[llamaId]) === null || _a === void 0 ? void 0 : _a.apy) / 100;
+                // If 0 then should fetch native way to make sure
+                return apy || 0;
+            }
+            catch (err) {
                 return 0;
-            // Make pool unique ({poolAddress}-{chain})
-            const llamaId = pool.concat("-", llamaChain).toLowerCase();
-            // Convert to decimals to match `getUniswapAPR` and `getStakingAPR`
-            const apy = ((_a = llamaAllPools[llamaId]) === null || _a === void 0 ? void 0 : _a.apy) / 100;
-            // If 0 then should fetch native way to make sure
-            return apy || 0;
+            }
         });
     }
     getLlamaTvlAndBorrows(chain) {

package/lib/offchain/offchainInitializer.js

@@ -99,18 +99,29 @@ exports.fetchVaults = fetchVaults;
 function fetchLendingPools() {
     return __awaiter(this, void 0, void 0, function* () {
         const calls = [];
+        const factories = [];
         let factory;
         for (factory in subgraphs_1.IMPERMAX_SUBGRAPH_URL[this.network]) {
-            // Multiple endpoints
             const subgraphs = subgraphs_1.IMPERMAX_SUBGRAPH_URL[this.network][factory];
-            calls.push(this.endpointManager.fetch(subgraphs, this.network, (queryBuilder) => queryBuilder.lendingPoolsQuery(factory, [], this.network)));
+            calls.push(this.endpointManager.fetch(subgraphs, this.network, (queryBuilder) => queryBuilder.lendingPoolsQuery(factory, this.whitelistedPairs[factory], this.network)));
+            factories.push(factory);
         }
         const results = yield Promise.all(calls);
         const lendingPools = {};
-        let i = 0;
-        for (factory in subgraphs_1.IMPERMAX_SUBGRAPH_URL[this.network]) {
-            lendingPools[factory] = results[i++].data.lendingPools;
-        }
+        results.forEach((result, index) => {
+            var _a;
+            // `offchainEndpointManager` returns null when using filters and cant find subgraph with filter
+            if (!result)
+                return;
+            // Get the factory for this result
+            const factory = factories[index];
+            // Get pools data
+            const poolsForFactory = (_a = result.data) === null || _a === void 0 ? void 0 : _a.lendingPools;
+            if (!poolsForFactory)
+                return;
+            // Add all pools for this factory
+            lendingPools[factory] = poolsForFactory;
+        });
         return lendingPools;
     });
 }
@@ -123,6 +134,7 @@ function fetchLendingPoolsPast(seconds) {
             return null;
         try {
             const calls = [];
+            const factories = [];
             let factory;
             for (factory in subgraphs_1.IMPERMAX_SUBGRAPH_URL[this.network]) {
                 const endpoints = subgraphs_1.IMPERMAX_SUBGRAPH_URL[this.network][factory];
@@ -131,15 +143,25 @@ function fetchLendingPoolsPast(seconds) {
                 // Skip if no endpoints support past queries for this factory
                 if (supportedEndpoints.length === 0)
                     continue;
-                // Query only from supported endpoints
                 calls.push(this.endpointManager.fetch(supportedEndpoints, this.network, (queryBuilder) => queryBuilder.lendingPoolsPastQuery(blockNumber, this.whitelistedPairs[factory])));
+                factories.push(factory);
             }
             const results = yield Promise.all(calls);
             const lendingPools = {};
-            let i = 0;
-            for (factory in subgraphs_1.IMPERMAX_SUBGRAPH_URL[this.network]) {
-                lendingPools[factory] = results[i++].data.lendingPools;
-            }
+            results.forEach((result, index) => {
+                var _a;
+                // `offchainEndpointManager` returns null when using filters and cant find subgraph with filter
+                if (!result)
+                    return;
+                // Get the factory for this result
+                const factory = factories[index];
+                // Get pools data
+                const poolsForFactory = (_a = result.data) === null || _a === void 0 ? void 0 : _a.lendingPools;
+                if (!poolsForFactory)
+                    return;
+                // Add all pools for this factory
+                lendingPools[factory] = poolsForFactory;
+            });
             return lendingPools;
         }
         catch (_a) {
@@ -284,6 +306,7 @@ function fetchUniswapAPR(lendingPoolsByAmm, seconds = 60 * 60 * 24 * 7) {
 exports.fetchUniswapAPR = fetchUniswapAPR;
 // OffchainLendingPool Data
 function initializeLendingPoolsData() {
+    var _a, _b, _c;
     return __awaiter(this, void 0, void 0, function* () {
         const lendingPoolsData = {};
         // Get raw data
@@ -297,7 +320,9 @@ function initializeLendingPoolsData() {
         const lendingPoolsByAmm = {};
         for (const factory in lendingPools) {
             for (const lendingPool of lendingPools[factory]) {
-                const amm = (0, amms_1.getAmmByFactory)(this.network, lendingPool.pair.uniswapV2Factory);
+                const amm = (0, amms_1.getAmmByFactory)(this.network, 
+                // WARN: Quick temporary fix, to be removed after
+                (_b = (_a = lendingPool === null || lendingPool === void 0 ? void 0 : lendingPool.pair) === null || _a === void 0 ? void 0 : _a.uniswapV2Factory) !== null && _b !== void 0 ? _b : (_c = lendingPool === null || lendingPool === void 0 ? void 0 : lendingPool.nftlp) === null || _c === void 0 ? void 0 : _c.dexFactory);
                 if (!amm)
                     continue;
                 if (!lendingPoolsByAmm[amm])
@@ -306,11 +331,14 @@ function initializeLendingPoolsData() {
                 lendingPoolsOfAmm.push(lendingPool);
             }
         }
-        const uniswapAPR = yield this.fetchUniswapAPR(lendingPoolsByAmm);
+        // const uniswapAPR = await this.fetchUniswapAPR(lendingPoolsByAmm);
         // Organize lending pools data
         for (const factory in lendingPools) {
             for (const lendingPool of lendingPools[factory]) {
-                lendingPool.pair.uniswapAPR = uniswapAPR[lendingPool.id] || 0;
+                // WARN: Quick temporary fix, to be removed after
+                if (factory === "8")
+                    lendingPool["pair"] = lendingPool["nftlp"];
+                lendingPool.pair.uniswapAPR = 0;
                 if (impermaxChefRewardRates) {
                     lendingPool.borrowable0.rewards =
                         impermaxChefRewardRates[lendingPool.borrowable0.id];
@@ -378,37 +406,6 @@ function initializeLendingPoolsData() {
                     lendingPoolsDataV2V2[ETH_RDNT].pair.rewards[0].rewardRate = (parseFloat(lendingPoolsDataV2V2[ETH_RDNT].pair.rewards[0].rewardRate) / 2).toString();
                 }
             }
-            /*if (lendingPoolsData[Factory.SOLV2][LIZ_LIZ_ETH]) {
-              const LIZ = lendingPoolsData[Factory.SOLV2][LIZ_LIZ_ETH].borrowable0.underlying;
-              lendingPoolsData[Factory.SOLV2][LIZ_LIZ_ETH].pair.rewards = [{
-                id: '',
-                rewardsToken: LIZ,
-                rewardRate: '3.724',
-                periodFinish: '0',
-              }];
-              lendingPoolsData[Factory.SOLV2][LIZ_LIZ_ETH].pair.stakedTotalSupply = '40131.19426';
-              lendingPoolsData[Factory.SOLV2][LIZ_ETH_USDC].pair.rewards = [{
-                id: '',
-                rewardsToken: LIZ,
-                rewardRate: '1.284',
-                periodFinish: '0',
-              }];
-              lendingPoolsData[Factory.SOLV2][LIZ_ETH_USDC].pair.stakedTotalSupply = '0.182614';
-              lendingPoolsData[Factory.SOLV2][LIZ_ETH_BTC].pair.rewards = [{
-                id: '',
-                rewardsToken: LIZ,
-                rewardRate: '0.159',
-                periodFinish: '0',
-              }];
-              lendingPoolsData[Factory.SOLV2][LIZ_ETH_BTC].pair.stakedTotalSupply = '0.002468';
-              lendingPoolsData[Factory.SOLV2][LIZ_LIZ_USDC].pair.rewards = [{
-                id: '',
-                rewardsToken: LIZ,
-                rewardRate: '1.566',
-                periodFinish: '0',
-              }];
-              lendingPoolsData[Factory.SOLV2][LIZ_LIZ_USDC].pair.stakedTotalSupply = '0.568227';
-            }*/
         }
         if (this.network === types_1.Networks.Polygon) {
             const lendingPoolsDataV2V2 = lendingPoolsData[types_1.Factory.V2V2];
@@ -443,38 +440,6 @@ function initializeLendingPoolsData() {
                         "0.000000992210460243"; //https://snowtrace.io/token/0xe530dc2095ef5653205cf5ea79f8979a7028065c?a=0x784da19e61cf348a8c54547531795ecfee2affd1
                 }
             }
-            /*REWARD STOPPED const sAVAX_AVAX = '0x5b588f4481035b0f765393fc9f4752615a6d0498';
-            if (lendingPoolsData[Factory.V2V1_2][sAVAX_AVAX]) {
-              const QI = lendingPoolsData[Factory.V2V1_2][QI_AVAX].borrowable0.underlying;
-              lendingPoolsData[Factory.V2V1_2][sAVAX_AVAX].pair.rewards[1] = {
-                id: '',
-                rewardsToken: QI,
-                rewardRate: '1.74',
-                periodFinish: '0',
-              };
-            }
-            const UST_AVAX = '0xc6e68d77d0f4fa925a1cf2611dab6b10900eaf2b';
-            if (lendingPoolsData[Factory.V2V1_2][UST_AVAX]) {
-              const AVAX = lendingPoolsData[Factory.V2V1_2][UST_AVAX].borrowable1.underlying;
-              lendingPoolsData[Factory.V2V1_2][UST_AVAX].pair.rewards[0].rewardRate = '0.000099';
-              lendingPoolsData[Factory.V2V1_2][UST_AVAX].pair.rewards[2] = {
-                id: '',
-                rewardsToken: AVAX,
-                rewardRate: '0.00047',
-                periodFinish: '0',
-              };
-            }
-            const UST_USDC = '0x69c1c44e8742b66d892294a7eeb9aac51891b0eb';
-            if (lendingPoolsData[Factory.V2V1_2][UST_USDC]) {
-              const AVAX = lendingPoolsData[Factory.V2V1_2][UST_AVAX].borrowable1.underlying;
-              lendingPoolsData[Factory.V2V1_2][UST_USDC].pair.rewards[0].rewardRate = '0.000099';
-              lendingPoolsData[Factory.V2V1_2][UST_USDC].pair.rewards[2] = {
-                id: '',
-                rewardsToken: AVAX,
-                rewardRate: '0.00047',
-                periodFinish: '0',
-              };
-            }*/
         }
         return lendingPoolsData;
     });

package/lib/offchain/offchainMultichain.d.ts

@@ -1,4 +1,4 @@
-import { NetworkIndex, Networks, VaultType } from "../config/types";
+import { NetworkIndex, Networks, VaultType, Address, FactoryIndex } from "../config/types";
 import Offchain from "./offchain";
 import OffchainVault from "./vault/offchainVault";
 import { Amms } from "../config/amms";
@@ -10,7 +10,7 @@ export declare enum SortDirection {
     ASC = "asc",
     DESC = "desc"
 }
-export declare enum VaultOrderBy {
+export declare enum VaultListOrderBy {
     TVL = 0,
     APR = 1,
     DEPOSITED = 2
@@ -48,8 +48,8 @@ export default class OffchainMultichain {
     protected offchains: NetworkIndex<Offchain>;
     private constructor();
     static get instance(): OffchainMultichain;
-    getOffchain(network: Networks): Offchain;
+    getOffchain(network: Networks, whitelist?: FactoryIndex<Address[]>): Offchain;
     getVaultList(params?: VaultListParams): Promise<Array<OffchainVault>>;
     networkHasVault(network: Networks): boolean;
-    getLendingPoolList(params?: LendingPoolListParams, orderBy?: LendingPoolListOrderBy): Promise<Array<OffchainLendingPool>>;
+    getLendingPoolList(params?: LendingPoolListParams): Promise<Array<OffchainLendingPool>>;
 }

package/lib/offchain/offchainMultichain.js

@@ -24,7 +24,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 var _a, _OffchainMultichain_instance;
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.LendingPoolListOrderBy = exports.VaultOrderBy = exports.SortDirection = void 0;
+exports.LendingPoolListOrderBy = exports.VaultListOrderBy = exports.SortDirection = void 0;
 const types_1 = require("../config/types");
 const offchain_1 = __importDefault(require("./offchain"));
 const subgraphs_1 = require("../config/subgraphs");
@@ -34,12 +34,12 @@ var SortDirection;
     SortDirection["ASC"] = "asc";
     SortDirection["DESC"] = "desc";
 })(SortDirection = exports.SortDirection || (exports.SortDirection = {}));
-var VaultOrderBy;
-(function (VaultOrderBy) {
-    VaultOrderBy[VaultOrderBy["TVL"] = 0] = "TVL";
-    VaultOrderBy[VaultOrderBy["APR"] = 1] = "APR";
-    VaultOrderBy[VaultOrderBy["DEPOSITED"] = 2] = "DEPOSITED";
-})(VaultOrderBy = exports.VaultOrderBy || (exports.VaultOrderBy = {}));
+var VaultListOrderBy;
+(function (VaultListOrderBy) {
+    VaultListOrderBy[VaultListOrderBy["TVL"] = 0] = "TVL";
+    VaultListOrderBy[VaultListOrderBy["APR"] = 1] = "APR";
+    VaultListOrderBy[VaultListOrderBy["DEPOSITED"] = 2] = "DEPOSITED";
+})(VaultListOrderBy = exports.VaultListOrderBy || (exports.VaultListOrderBy = {}));
 // Pools //
 var LendingPoolListOrderBy;
 (function (LendingPoolListOrderBy) {
@@ -61,9 +61,9 @@ class OffchainMultichain {
         }
         return __classPrivateFieldGet(OffchainMultichain, _a, "f", _OffchainMultichain_instance);
     }
-    getOffchain(network) {
+    getOffchain(network, whitelist) {
         if (!this.offchains[network])
-            this.offchains[network] = new offchain_1.default(this, network);
+            this.offchains[network] = new offchain_1.default(this, network, whitelist);
         return this.offchains[network];
     }
     /*--------------------------------------------------------*
@@ -71,24 +71,20 @@ class OffchainMultichain {
      *--------------------------------------------------------*/
     getVaultList(params = {}) {
         return __awaiter(this, void 0, void 0, function* () {
-            // Get networks passed, if empty get all
+            console.time("Vaults");
             const allNetworks = params.networks || Object.values(types_1.Networks);
-            // Filter out networks without vaults
             const networksWithVaults = allNetworks.filter((network) => this.networkHasVault(network));
-            // Loop through all the vaults in `allNetworks`
-            const allVaults = [];
-            for (const network of networksWithVaults) {
+            // Networks
+            const networkPromises = networksWithVaults.map((network) => __awaiter(this, void 0, void 0, function* () {
                 const offchain = this.getOffchain(network);
                 const vaultsData = yield offchain.getVaultsData();
-                // Filter out vaults based on vaultType (if passed)
-                for (const address in vaultsData) {
-                    const vault = yield offchain.getVault(address);
-                    if (params.type && vault.getVaultType() !== params.type)
-                        continue;
-                    allVaults.push(vault);
-                }
-            }
-            return allVaults;
+                // VaultTypes
+                const vaultPromises = Object.keys(vaultsData).map((address) => offchain.getVault(address));
+                return Promise.all(vaultPromises);
+            }));
+            const results = yield Promise.all(networkPromises);
+            console.timeEnd("Vaults");
+            return results.flat();
         });
     }
     // Helpful for frontend UI thing
@@ -99,10 +95,25 @@ class OffchainMultichain {
      *                    Lending Pools
      *--------------------------------------------------------*/
     // private async getVaultSortValue( vault: OffchainVault, orderBy: VaultOrderBy,): Promise<number> { }
-    getLendingPoolList(params = {}, orderBy = LendingPoolListOrderBy.TVL) {
+    getLendingPoolList(params = {}) {
         return __awaiter(this, void 0, void 0, function* () {
-            // TODO FILL WITH FAKE DATA
-            return [];
+            console.time("Lending Pools");
+            const allNetworks = params.networks || Object.values(types_1.Networks);
+            // Networks
+            const networkPromises = allNetworks.map((network) => __awaiter(this, void 0, void 0, function* () {
+                const offchain = this.getOffchain(network);
+                const lendingPoolsData = yield offchain.getLendingPoolsData();
+                // Factories
+                const factoryPromises = Object.entries(lendingPoolsData).map(([factory, pools]) => __awaiter(this, void 0, void 0, function* () {
+                    const poolPromises = Object.keys(pools).map((poolId) => offchain.getLendingPool(factory, poolId));
+                    return Promise.all(poolPromises);
+                }));
+                const factoryResults = yield Promise.all(factoryPromises);
+                return factoryResults.flat();
+            }));
+            const results = yield Promise.all(networkPromises);
+            console.timeEnd("Lending Pools");
+            return results.flat();
         });
     }
 }

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

@@ -3,6 +3,7 @@ import { IQueryBuilder } from "../../interfaces/query-builder";
 export declare class PonderQueryBuilder implements IQueryBuilder {
     blockQuery(): import("graphql").DocumentNode;
     getBlockNumber(response: any, network: Networks): number;
+    lendingPoolsV3Query(factory: Factory, addressesFilter: Address[], network: Networks): import("graphql").DocumentNode;
     lendingPoolsQuery(factory: Factory, addressesFilter: Address[], network: Networks): import("graphql").DocumentNode;
     userQuery(account: Address, network: Networks, factory: Factory): import("graphql").DocumentNode;
     tvlQuery(): import("graphql").DocumentNode;

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

@@ -5,6 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PonderQueryBuilder = void 0;
 const graphql_tag_1 = __importDefault(require("graphql-tag"));
+const types_1 = require("../../../../config/types");
 const factories_1 = require("../../../../config/factories");
 const impermax_factories_1 = require("../../../../config/contracts/impermax-factories");
 // TODO: Might need to separate Vaults query based on vault type, maybe not.
@@ -23,10 +24,90 @@ class PonderQueryBuilder {
     getBlockNumber(response, network) {
         return response.data._meta.status[network].block.number || 0;
     }
+    /*-----------------------------*
+     *   2. Lending pools V3
+     *-----------------------------*/
+    lendingPoolsV3Query(factory, addressesFilter, network) {
+        const tokenStr = `{
+      id
+      symbol
+      name
+      decimals
+      derivedUSD
+    }`;
+        const distributorStr = `{ 
+      id 
+    }`;
+        const farmingPoolStr = `{
+      epochAmount
+      epochBegin
+      segmentLength
+      vestingBegin
+      sharePercentage
+      distributor ${distributorStr}
+    }`;
+        const borrowableStr = `{
+      id
+      underlying ${tokenStr}
+      totalBalance
+      totalBorrows
+      borrowRate
+      reserveFactor
+      kinkBorrowRate
+      kinkUtilizationRate
+      adjustSpeed
+      borrowIndex
+      accrualTimestamp 
+      exchangeRate 
+      borrowTracker
+      farmingPool ${farmingPoolStr}
+    }`;
+        const collateralStr = `{
+      id
+      safetyMargin
+      liquidationIncentive
+      liquidationFee
+    }`;
+        const nftlpStr = `{
+      id
+      factory
+      dexFactory
+      token1Price
+      token0Price
+      rewards {
+        items { 
+          id
+          rewardRate
+          rewardsToken ${tokenStr}
+          periodFinish
+        }
+      }
+    }`;
+        const id_in_string = (addressesFilter === null || addressesFilter === void 0 ? void 0 : addressesFilter.length) > 0 ? `id_in: ["${addressesFilter.join('","').toLowerCase()}"]` : "";
+        return (0, graphql_tag_1.default) `{
+      lendingPools(
+        limit: 1000
+        where: { factoryId: "${impermax_factories_1.IMPERMAX_FACTORY[network][factory]}", ${id_in_string}}
+      ) {
+        items {
+          id
+          borrowable0 ${borrowableStr}
+          borrowable1 ${borrowableStr}
+          collateral ${collateralStr}
+          nftlp ${nftlpStr}
+        }
+      }
+      _meta {
+        status
+      }
+    }`;
+    }
     /*-----------------------------*
      *   2. Lending pools
      *-----------------------------*/
     lendingPoolsQuery(factory, addressesFilter, network) {
+        if (factory == types_1.Factory.V3)
+            return this.lendingPoolsV3Query(factory, addressesFilter, network);
         const tokenStr = `{
       id
       symbol
@@ -95,7 +176,7 @@ class PonderQueryBuilder {
         }
       }
     }`;
-        const id_in_string = addressesFilter.length > 0 ? `id_in: ["${addressesFilter.join('","').toLowerCase()}"]}` : "";
+        const id_in_string = (addressesFilter === null || addressesFilter === void 0 ? void 0 : addressesFilter.length) > 0 ? `id_in: ["${addressesFilter.join('","').toLowerCase()}"]` : "";
         return (0, graphql_tag_1.default) `{
       lendingPools(
         limit: 1000
@@ -183,7 +264,7 @@ class PonderQueryBuilder {
      *-----------------------------*/
     vaultsQuery(vaultType, addressesFilter) {
         // do something here for difference kind of vault type, currently only lending
-        const id_in_string = addressesFilter.length > 0 ? `where: {id_in: ["${addressesFilter.join('","').toLowerCase()}"]}` : "";
+        const id_in_string = (addressesFilter === null || addressesFilter === void 0 ? void 0 : addressesFilter.length) > 0 ? `id_in: ["${addressesFilter.join('","').toLowerCase()}"]` : "";
         return (0, graphql_tag_1.default) `{
       lendingVaults(limit: 1000, ${id_in_string}) {
         items {

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

@@ -3,6 +3,7 @@ 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;
     lendingPoolsQuery(factory: Factory, addressesFilter: Address[]): import("graphql").DocumentNode;
     userQuery(account: Address, network: Networks, factory: Factory): import("graphql").DocumentNode;
     tvlQuery(): import("graphql").DocumentNode;

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

@@ -5,6 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TheGraphQueryBuilder = void 0;
 const graphql_tag_1 = __importDefault(require("graphql-tag"));
+const types_1 = require("../../../../config/types");
 const factories_1 = require("../../../../config/factories");
 // TODO: Might need to separate Vaults query based on vault type, maybe not.
 class TheGraphQueryBuilder {
@@ -33,7 +34,12 @@ class TheGraphQueryBuilder {
     /*-----------------------------*
      *   2. Lending pools
      *-----------------------------*/
+    lendingPoolsV3Query(factory, addressesFilter) {
+        return (0, graphql_tag_1.default) `{}`;
+    }
     lendingPoolsQuery(factory, addressesFilter) {
+        if (factory == types_1.Factory.V3)
+            return this.lendingPoolsV3Query(factory, addressesFilter);
         const tokenStr = `{
       id
       symbol
@@ -104,7 +110,7 @@ class TheGraphQueryBuilder {
         periodFinish
       }
     }`;
-        const id_in_string = addressesFilter.length > 0 ? `where: {id_in: ["${addressesFilter.join('","').toLowerCase()}"]}` : "";
+        const id_in_string = (addressesFilter === null || addressesFilter === void 0 ? void 0 : addressesFilter.length) > 0 ? `where: {id_in: ["${addressesFilter.join('","').toLowerCase()}"]}` : "";
         return (0, graphql_tag_1.default) `{
       lendingPools(first: 1000, orderBy: totalBorrowsUSD, orderDirection: desc ${id_in_string}) {
         id
@@ -187,7 +193,7 @@ class TheGraphQueryBuilder {
      *-----------------------------*/
     vaultsQuery(vaultType, addressesFilter) {
         // do something here for difference kind of vault type, currently only lending
-        const id_in_string = addressesFilter.length > 0 ? `where: {id_in: ["${addressesFilter.join('","').toLowerCase()}"]}` : "";
+        const id_in_string = (addressesFilter === null || addressesFilter === void 0 ? void 0 : addressesFilter.length) > 0 ? `where: {id_in: ["${addressesFilter.join('","').toLowerCase()}"]}` : "";
         return (0, graphql_tag_1.default) `{
       lendingVaults(first: 1000 ${id_in_string}) {
         id
@@ -290,7 +296,7 @@ class TheGraphQueryBuilder {
       accrualTimestamp
       exchangeRate
     }`;
-        const id_in_string = addressesFilter.length > 0 ? `where: {id_in: ["${addressesFilter.join('","').toLowerCase()}"]}` : "";
+        const id_in_string = (addressesFilter === null || addressesFilter === void 0 ? void 0 : addressesFilter.length) > 0 ? `where: {id_in: ["${addressesFilter.join('","').toLowerCase()}"]}` : "";
         return (0, graphql_tag_1.default) `{
       lendingPools(first: 1000, orderBy: totalBorrowsUSD, orderDirection: desc, block: {number: ${blockNumber}} ${id_in_string}) {
         id
@@ -326,7 +332,7 @@ class TheGraphQueryBuilder {
     }`;
     }
     pastVolumeQuery(blockNumber, addressesFilter) {
-        const id_in_string = addressesFilter.length > 0 ? `where: {id_in: ["${addressesFilter.join('","').toLowerCase()}"]}` : "";
+        const id_in_string = (addressesFilter === null || addressesFilter === void 0 ? void 0 : addressesFilter.length) > 0 ? `where: {id_in: ["${addressesFilter.join('","').toLowerCase()}"]}` : "";
         return (0, graphql_tag_1.default) `{
       pairs (block: {number: ${blockNumber}} ${id_in_string}) {
         id
@@ -335,7 +341,7 @@ class TheGraphQueryBuilder {
     }`;
     }
     currentVolumeAndReservesQuery(addressesFilter) {
-        const id_in_string = addressesFilter.length > 0 ? `where: {id_in: ["${addressesFilter.join('","').toLowerCase()}"]}` : "";
+        const id_in_string = (addressesFilter === null || addressesFilter === void 0 ? void 0 : addressesFilter.length) > 0 ? `where: {id_in: ["${addressesFilter.join('","').toLowerCase()}"]}` : "";
         return (0, graphql_tag_1.default) `{
       pairs (${id_in_string}) {
         id

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

@@ -3,7 +3,8 @@ import { Address, Factory, Networks, VaultType } from '../../../config/types';
 export interface IQueryBuilder {
     blockQuery(timestamp: number): DocumentNode;
     getBlockNumber: (response: any, network: Networks) => number;
-    lendingPoolsQuery(factory: Factory, addressesFilter: Address[], network: Networks): DocumentNode;
+    lendingPoolsV3Query(factory: Factory, addressesFilter: Address[], network: Networks): DocumentNode;
+    lendingPoolsQuery(factory: Factory, addressesFilter: Address[] | undefined, network: Networks): DocumentNode;
     userQuery(account: Address, network: Networks, factory: Factory): DocumentNode;
     tvlQuery(): DocumentNode;
     vaultsQuery(vaultType: VaultType, addressesFilter: Address[]): DocumentNode;

package/package.json

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