impermax-sdk 2.1.9 → 2.1.10

package/lib/offchain/lendingPool/offchainLendingPool.js

@@ -183,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() {

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/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) {
@@ -309,14 +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]) {
                 // WARN: Quick temporary fix, to be removed after
                 if (factory === "8")
-                    lendingPool['pair'] = lendingPool['nftlp'];
-                lendingPool.pair.uniswapAPR = uniswapAPR[lendingPool.id] || 0;
+                    lendingPool["pair"] = lendingPool["nftlp"];
+                lendingPool.pair.uniswapAPR = 0;
                 if (impermaxChefRewardRates) {
                     lendingPool.borrowable0.rewards =
                         impermaxChefRewardRates[lendingPool.borrowable0.id];
@@ -384,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];
@@ -449,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";
@@ -48,7 +48,7 @@ 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): Promise<Array<OffchainLendingPool>>;

package/lib/offchain/offchainMultichain.js

@@ -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];
     }
     /*--------------------------------------------------------*
@@ -73,18 +73,14 @@ class OffchainMultichain {
         return __awaiter(this, void 0, void 0, function* () {
             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));
             // Networks
             const networkPromises = networksWithVaults.map((network) => __awaiter(this, void 0, void 0, function* () {
                 const offchain = this.getOffchain(network);
                 const vaultsData = yield offchain.getVaultsData();
+                // VaultTypes
                 const vaultPromises = Object.keys(vaultsData).map((address) => offchain.getVault(address));
-                const vaults = yield Promise.all(vaultPromises);
-                // TODO: Reomve this? Types
-                return params.type
-                    ? vaults.filter((vault) => vault.getVaultType() === params.type)
-                    : vaults;
+                return Promise.all(vaultPromises);
             }));
             const results = yield Promise.all(networkPromises);
             console.timeEnd("Vaults");

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

@@ -83,7 +83,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
@@ -176,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
@@ -264,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.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 {
@@ -37,6 +38,8 @@ class TheGraphQueryBuilder {
         return (0, graphql_tag_1.default) `{}`;
     }
     lendingPoolsQuery(factory, addressesFilter) {
+        if (factory == types_1.Factory.V3)
+            return this.lendingPoolsV3Query(factory, addressesFilter);
         const tokenStr = `{
       id
       symbol
@@ -107,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
@@ -190,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
@@ -293,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
@@ -329,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
@@ -338,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

@@ -4,7 +4,7 @@ export interface IQueryBuilder {
     blockQuery(timestamp: number): DocumentNode;
     getBlockNumber: (response: any, network: Networks) => number;
     lendingPoolsV3Query(factory: Factory, addressesFilter: Address[], network: Networks): DocumentNode;
-    lendingPoolsQuery(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.9",
+  "version": "2.1.10",
   "description": "",
   "main": "./lib/index.js",
   "module": "./lib/index.js",