impermax-sdk 2.1.5 → 2.1.7

package/lib/offchain/account/vault/offchainAccountVault.js

@@ -24,10 +24,17 @@ class OffchainAccountVault extends offchainAccountPoolToken_1.default {
     }
     getVaultPosition() {
         return __awaiter(this, void 0, void 0, function* () {
-            const lendingVaultsUserData = yield this.account.getLendingVaultsUserData();
-            if (!lendingVaultsUserData)
+            const vaultsUserData = yield this.account.getVaultsUserData();
+            if (!vaultsUserData)
                 return undefined;
-            return lendingVaultsUserData[this.getVaultAddress()];
+            // Look through each vault type
+            for (const vaultType in vaultsUserData) {
+                const vaultsOfType = vaultsUserData[vaultType];
+                const position = vaultsOfType[this.getVaultAddress()];
+                if (position)
+                    return position;
+            }
+            return undefined;
         });
     }
     getAmount() {

package/lib/offchain/offchain.d.ts

@@ -6,7 +6,7 @@ import OffchainSolidexHelper from "./offchainSolidexHelper";
 import OffchainAccount from "./account";
 import OffchainEndpointManager from './offchainEndpointManager';
 import { Address, AddressIndex, Factory, FactoryIndex, LendingPoolIndex, Networks, WhitelistState } from '../config/types';
-import { LendingPoolData, LendingVaultData, VaultPosition, TvlData, UserData, XimxData } from './offchainTypes';
+import { LendingPoolData, VaultData, VaultPosition, TvlData, UserData, XimxData } from './offchainTypes';
 import OffchainVault from './vault/offchainVault';
 import OffchainConfigManager from './configManager';
 import { LlamaTvlChart } from './offchainAPRHelper';
@@ -32,7 +32,7 @@ export default class Offchain {
     protected usersData: {
         [key in Address]?: Promise<FactoryIndex<UserData> | null>;
     };
-    protected lendingVaultsData: Promise<AddressIndex<LendingVaultData>> | null;
+    protected vaultsData: Promise<AddressIndex<VaultData>> | null;
     protected lendingVaultsUsersData: {
         [key in Address]?: Promise<AddressIndex<VaultPosition> | null>;
     };
@@ -40,10 +40,13 @@ export default class Offchain {
     protected ximxData: Promise<XimxData> | null;
     protected whitelistData: Promise<LendingPoolIndex<WhitelistState>> | null;
     protected endpointManager: OffchainEndpointManager;
+    protected vaultsUsersData: {
+        [key in Address]?: Promise<AddressIndex<AddressIndex<VaultPosition>>>;
+    };
     constructor(offchainMultichain: OffchainMultichain, network: Networks);
     cleanCache(): void;
     getLendingPool(factory: Factory, pairAddress: Address): Promise<OffchainLendingPool>;
-    getLendingVault(vaultAddress: Address): Promise<OffchainVault>;
+    getVault(vaultAddress: Address): Promise<OffchainVault>;
     getAccount(accountAddress: Address): OffchainAccount;
     getPriceHelper: () => OffchainPriceHelper;
     getSolidexHelper: () => OffchainSolidexHelper;
@@ -67,17 +70,17 @@ export default class Offchain {
     getUserData: typeof initializer.getUserData;
     protected initializeXimxData: typeof initializer.initializeXimxData;
     getXimxData: typeof initializer.getXimxData;
-    protected fetchLendingVaults: typeof initializer.fetchLendingVaults;
-    protected initializeLendingVaultsData: typeof initializer.initializeLendingVaultsData;
-    getLendingVaultsData: typeof initializer.getLendingVaultsData;
-    getLendingVaultData: typeof initializer.getLendingVaultData;
-    protected fetchLendingVaultsUserData: typeof initializer.fetchLendingVaultsUserData;
-    protected initializeLendingVaultsUserData: typeof initializer.initializeLendingVaultsUserData;
-    getLendingVaultsUserData: typeof initializer.getLendingVaultsUserData;
+    getVaultsUserData: typeof initializer.getVaultsUserData;
     protected fetchWhitelist: typeof initializer.fetchWhitelist;
     protected initializeWhitelistData: typeof initializer.initializeWhitelistData;
     getWhitelistData: typeof initializer.getWhitelistData;
     getWhitelistState: typeof initializer.getWhitelistState;
+    protected fetchVaults: typeof initializer.fetchVaults;
+    protected initializeVaultsData: typeof initializer.initializeVaultsData;
+    getVaultsData: typeof initializer.getVaultsData;
+    getVaultData: typeof initializer.getVaultData;
+    protected fetchVaultsUserData: typeof initializer.fetchVaultsUserData;
+    protected initializeVaultsUserData: typeof initializer.initializeVaultsUserData;
     /**
      * DATA GETTERS
      */

package/lib/offchain/offchain.js

@@ -71,17 +71,23 @@ class Offchain {
         this.getUserData = initializer.getUserData;
         this.initializeXimxData = initializer.initializeXimxData;
         this.getXimxData = initializer.getXimxData;
-        this.fetchLendingVaults = initializer.fetchLendingVaults;
-        this.initializeLendingVaultsData = initializer.initializeLendingVaultsData;
-        this.getLendingVaultsData = initializer.getLendingVaultsData;
-        this.getLendingVaultData = initializer.getLendingVaultData;
-        this.fetchLendingVaultsUserData = initializer.fetchLendingVaultsUserData;
-        this.initializeLendingVaultsUserData = initializer.initializeLendingVaultsUserData;
-        this.getLendingVaultsUserData = initializer.getLendingVaultsUserData;
+        // protected initializeLendingVaultsData = initializer.initializeLendingVaultsData;
+        // public getLendingVaultsData = initializer.getLendingVaultsData;
+        // public getLendingVaultData = initializer.getLendingVaultData;
+        // protected fetchLendingVaultsUserData = initializer.fetchLendingVaultsUserData;
+        // protected initializeLendingVaultsUserData = initializer.initializeLendingVaultsUserData;
+        // public getLendingVaultsUserData = initializer.getLendingVaultsUserData;
+        this.getVaultsUserData = initializer.getVaultsUserData;
         this.fetchWhitelist = initializer.fetchWhitelist;
         this.initializeWhitelistData = initializer.initializeWhitelistData;
         this.getWhitelistData = initializer.getWhitelistData;
         this.getWhitelistState = initializer.getWhitelistState;
+        this.fetchVaults = initializer.fetchVaults;
+        this.initializeVaultsData = initializer.initializeVaultsData;
+        this.getVaultsData = initializer.getVaultsData;
+        this.getVaultData = initializer.getVaultData;
+        this.fetchVaultsUserData = initializer.fetchVaultsUserData;
+        this.initializeVaultsUserData = initializer.initializeVaultsUserData;
         // TODO fix conflicting lines (commented)
         //this.network = cfg.network;
         //this.chainId = cfg.chainId;
@@ -96,12 +102,12 @@ class Offchain {
         this.endpointManager = new offchainEndpointManager_1.default();
         this.accounts = {};
         this.usersData = {};
-        this.lendingVaultsUsersData = {};
+        this.vaultsUsersData = {};
     }
     cleanCache() {
         this.lendingPoolsData = null;
         this.usersData = {};
-        this.lendingVaultsData = null;
+        this.vaultsData = null;
         this.lendingVaultsUsersData = {};
         this.tvlData = null;
         this.ximxData = null;
@@ -117,9 +123,10 @@ class Offchain {
             return this.lendingPools[factory][pairAddress];
         });
     }
-    getLendingVault(vaultAddress) {
+    // NOTE: We need to update this to return vault based on its type..
+    getVault(vaultAddress) {
         return __awaiter(this, void 0, void 0, function* () {
-            yield this.getLendingVaultsData(); // make sure that lending vaults are initialized
+            yield this.getVaultsData(); // make sure that lending vaults are initialized
             if (!this.vaults)
                 this.vaults = {};
             if (!this.vaults[vaultAddress])

package/lib/offchain/offchainInitializer.d.ts

@@ -1,11 +1,12 @@
 import { ApolloQueryResult } from "apollo-client";
 import { DocumentNode } from "graphql";
-import { Address, AddressIndex, Factory, FactoryIndex, LendingPoolIndex, WhitelistState } from '../config/types';
-import { Amms } from '../config/amms';
-import { LendingPoolData, LendingVaultData, VaultPosition, RawUserData, TvlData, UserData, WhitelistData, XimxData } from './offchainTypes';
-import Offchain from './offchain';
+import { Address, AddressIndex, Factory, FactoryIndex, LendingPoolIndex, WhitelistState } from "../config/types";
+import { Amms } from "../config/amms";
+import { LendingPoolData, VaultPosition, RawUserData, TvlData, UserData, WhitelistData, XimxData, VaultData } from "./offchainTypes";
+import Offchain from "./offchain";
 export declare function apolloFetcher(subgraphUrl: string, query: DocumentNode): Promise<ApolloQueryResult<any>>;
 export declare function fetchBlockByTimestamp(this: Offchain, timestamp: number): Promise<number | null>;
+export declare function fetchVaults(this: Offchain): Promise<AddressIndex<VaultData[]>>;
 export declare function fetchLendingPools(this: Offchain): Promise<FactoryIndex<LendingPoolData[]>>;
 export declare function fetchLendingPoolsPast(this: Offchain, seconds: number): Promise<FactoryIndex<any[]> | null>;
 export declare function fetchImpermaxChefRewardRates(this: Offchain): Promise<AddressIndex<Array<{
@@ -33,10 +34,9 @@ export declare function getXimxData(this: Offchain): Promise<XimxData>;
 /**
  * Lending Vault
  **/
-export declare function fetchLendingVaults(this: Offchain): Promise<LendingVaultData[]>;
-export declare function initializeLendingVaultsData(this: Offchain): Promise<AddressIndex<LendingVaultData>>;
-export declare function getLendingVaultsData(this: Offchain): Promise<AddressIndex<LendingVaultData>>;
-export declare function getLendingVaultData(this: Offchain, lendingVaultAddress: Address): Promise<LendingVaultData>;
+export declare function initializeVaultsData(this: Offchain): Promise<AddressIndex<VaultData>>;
+export declare function getVaultsData(this: Offchain): Promise<AddressIndex<VaultData>>;
+export declare function getVaultData(this: Offchain, vaultAddress: Address): Promise<VaultData>;
 /**
  * Whitelist
  */
@@ -47,6 +47,6 @@ export declare function getWhitelistState(this: Offchain, factory: Factory, pair
 /**
  * User Data
  */
-export declare function fetchLendingVaultsUserData(this: Offchain, account: Address): Promise<VaultPosition[] | null>;
-export declare function initializeLendingVaultsUserData(this: Offchain, account: Address): Promise<AddressIndex<VaultPosition> | null>;
-export declare function getLendingVaultsUserData(this: Offchain, account: Address): Promise<AddressIndex<VaultPosition> | null>;
+export declare function fetchVaultsUserData(this: Offchain, account: Address): Promise<AddressIndex<VaultPosition[]>>;
+export declare function initializeVaultsUserData(this: Offchain, account: Address): Promise<AddressIndex<AddressIndex<VaultPosition>>>;
+export declare function getVaultsUserData(this: Offchain, account: Address): Promise<AddressIndex<AddressIndex<VaultPosition>>>;

package/lib/offchain/offchainInitializer.js

@@ -12,7 +12,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getLendingVaultsUserData = exports.initializeLendingVaultsUserData = exports.fetchLendingVaultsUserData = exports.getWhitelistState = exports.getWhitelistData = exports.initializeWhitelistData = exports.fetchWhitelist = exports.getLendingVaultData = exports.getLendingVaultsData = exports.initializeLendingVaultsData = exports.fetchLendingVaults = exports.getXimxData = exports.initializeXimxData = exports.getUserData = exports.initializeUserData = exports.fetchUserData = exports.getTvlData = exports.initializeTvlData = exports.getLendingPoolData = exports.getLendingPoolsData = exports.initializeLendingPoolsData = exports.fetchUniswapAPR = exports.fetchCurrentVolumeAndReserves = exports.fetchPastVolume = exports.fetchImpermaxChefRewardRates = exports.fetchLendingPoolsPast = exports.fetchLendingPools = exports.fetchBlockByTimestamp = exports.apolloFetcher = void 0;
+exports.getVaultsUserData = exports.initializeVaultsUserData = exports.fetchVaultsUserData = exports.getWhitelistState = exports.getWhitelistData = exports.initializeWhitelistData = exports.fetchWhitelist = exports.getVaultData = exports.getVaultsData = exports.initializeVaultsData = exports.getXimxData = exports.initializeXimxData = exports.getUserData = exports.initializeUserData = exports.fetchUserData = exports.getTvlData = exports.initializeTvlData = exports.getLendingPoolData = exports.getLendingPoolsData = exports.initializeLendingPoolsData = exports.fetchUniswapAPR = exports.fetchCurrentVolumeAndReserves = exports.fetchPastVolume = exports.fetchImpermaxChefRewardRates = exports.fetchLendingPoolsPast = exports.fetchLendingPools = exports.fetchVaults = exports.fetchBlockByTimestamp = exports.apolloFetcher = void 0;
 const apollo_client_1 = __importDefault(require("apollo-client"));
 const apollo_link_http_1 = require("apollo-link-http");
 const apollo_cache_inmemory_1 = require("apollo-cache-inmemory");
@@ -21,7 +21,7 @@ const lendingPool_1 = __importDefault(require("./lendingPool"));
 const subgraphs_1 = require("../config/subgraphs");
 const types_1 = require("../config/types");
 const amms_1 = require("../config/amms");
-const offchainVault_1 = __importDefault(require("./vault/offchainVault"));
+const vault_1 = require("./vault");
 const impermax_factories_1 = require("../config/contracts/impermax-factories");
 const SECONDS_IN_YEAR = 60 * 60 * 24 * 365;
 function apolloFetcher(subgraphUrl, query) {
@@ -34,7 +34,7 @@ function apolloFetcher(subgraphUrl, query) {
         });
         const result = yield client.query({
             query: query,
-            fetchPolicy: 'cache-first',
+            fetchPolicy: "cache-first",
         });
         return queries_1.QueryBuilderFactory.transformData(result);
     });
@@ -61,6 +61,34 @@ function fetchBlockByTimestamp(timestamp) {
     });
 }
 exports.fetchBlockByTimestamp = fetchBlockByTimestamp;
+// Follows similar logic as `fetchLendingPools`
+function fetchVaults() {
+    return __awaiter(this, void 0, void 0, function* () {
+        const calls = [];
+        let vaultType;
+        for (vaultType in subgraphs_1.VAULT_SUBGRAPH_URL[this.network]) {
+            const subgraphs = subgraphs_1.VAULT_SUBGRAPH_URL[this.network][vaultType];
+            if (!subgraphs || subgraphs.length === 0)
+                continue;
+            calls.push(this.endpointManager.fetch(subgraphs, this.network, (queryBuilder) => queryBuilder.vaultsQuery(vaultType, [])));
+        }
+        const results = yield Promise.all(calls);
+        const vaults = {};
+        let i = 0;
+        for (vaultType in subgraphs_1.VAULT_SUBGRAPH_URL[this.network]) {
+            const subgraphs = subgraphs_1.VAULT_SUBGRAPH_URL[this.network][vaultType];
+            if (!subgraphs || subgraphs.length === 0)
+                continue;
+            // WARN: data.lendingVaults will be wrong for different vaults! In the subgraph schema
+            //       we should name it to just vaults and replace here once done.
+            const vaultsForType = results[i++].data.lendingVaults;
+            const typedVaults = vaultsForType.map((vault) => (Object.assign(Object.assign({}, vault), { vaultType })));
+            vaults[vaultType] = typedVaults;
+        }
+        return vaults;
+    });
+}
+exports.fetchVaults = fetchVaults;
 // Fetch Lending Pools
 function fetchLendingPools() {
     return __awaiter(this, void 0, void 0, function* () {
@@ -83,7 +111,7 @@ function fetchLendingPools() {
 exports.fetchLendingPools = fetchLendingPools;
 function fetchLendingPoolsPast(seconds) {
     return __awaiter(this, void 0, void 0, function* () {
-        const timestamp = Math.floor((new Date).getTime() / 1000);
+        const timestamp = Math.floor(new Date().getTime() / 1000);
         const blockNumber = yield this.fetchBlockByTimestamp(timestamp - seconds);
         if (!blockNumber)
             return null;
@@ -93,7 +121,7 @@ function fetchLendingPoolsPast(seconds) {
             for (factory in subgraphs_1.IMPERMAX_SUBGRAPH_URL[this.network]) {
                 const endpoints = subgraphs_1.IMPERMAX_SUBGRAPH_URL[this.network][factory];
                 // Not all endpoints might support this
-                const supportedEndpoints = endpoints.filter(endpoint => queries_1.QueryBuilderFactory.getQuery(endpoint).lendingPoolsPastQuery);
+                const supportedEndpoints = endpoints.filter((endpoint) => queries_1.QueryBuilderFactory.getQuery(endpoint).lendingPoolsPastQuery);
                 // Skip if no endpoints support past queries for this factory
                 if (supportedEndpoints.length === 0)
                     continue;
@@ -133,7 +161,7 @@ function fetchImpermaxChefRewardRates() {
             rewards[pool.id] = [];
             rewards[pool.id].push({
                 rewardToken,
-                rewardRate: parseFloat(pool.allocPoint) / totalAllocPoint * rewardPerSec
+                rewardRate: (parseFloat(pool.allocPoint) / totalAllocPoint) * rewardPerSec,
             });
         }
         for (const impermaxRewarder of impermaxRewarders) {
@@ -145,7 +173,7 @@ function fetchImpermaxChefRewardRates() {
                     rewards[pool.borrowable] = [];
                 rewards[pool.borrowable].push({
                     rewardToken,
-                    rewardRate: parseFloat(pool.allocPoint) / totalAllocPoint * rewardPerSec
+                    rewardRate: (parseFloat(pool.allocPoint) / totalAllocPoint) * rewardPerSec,
                 });
             }
         }
@@ -156,7 +184,7 @@ exports.fetchImpermaxChefRewardRates = fetchImpermaxChefRewardRates;
 // Uniswap APR
 function fetchPastVolume(amm, lendingPools, seconds) {
     return __awaiter(this, void 0, void 0, function* () {
-        const timestamp = Math.floor((new Date).getTime() / 1000);
+        const timestamp = Math.floor(new Date().getTime() / 1000);
         const blockNumber = yield this.fetchBlockByTimestamp(timestamp - seconds);
         if (!blockNumber)
             return {};
@@ -168,7 +196,7 @@ function fetchPastVolume(amm, lendingPools, seconds) {
             // Since it's not part of core, one endpoint should suffice
             if (!query.pastVolumeQuery)
                 return {};
-            result = yield this.apolloFetcher(subgraph, query.pastVolumeQuery(blockNumber, lendingPools.map(lendingPool => lendingPool.pair.uniswapV2PairAddress)));
+            result = yield this.apolloFetcher(subgraph, query.pastVolumeQuery(blockNumber, lendingPools.map((lendingPool) => lendingPool.pair.uniswapV2PairAddress)));
             for (const pair of result.data.pairs) {
                 pastVolume[pair.id] = parseInt(pair.volumeUSD);
             }
@@ -191,7 +219,7 @@ function fetchCurrentVolumeAndReserves(amm, lendingPools) {
             // Since it's not part of core, one endpoint should suffice
             if (!query.currentVolumeAndReservesQuery)
                 return { currentReserve, currentVolume };
-            result = yield this.apolloFetcher(subgraph, query.currentVolumeAndReservesQuery(lendingPools.map(lendingPool => lendingPool.pair.uniswapV2PairAddress)));
+            result = yield this.apolloFetcher(subgraph, query.currentVolumeAndReservesQuery(lendingPools.map((lendingPool) => lendingPool.pair.uniswapV2PairAddress)));
             for (const pair of result.data.pairs) {
                 currentVolume[pair.id] = parseInt(pair.volumeUSD);
                 currentReserve[pair.id] = parseInt(pair.reserveUSD);
@@ -218,12 +246,12 @@ function fetchUniswapAPR(lendingPoolsByAmm, seconds = 60 * 60 * 24 * 7) {
             promises.push(Promise.all([
                 amm,
                 this.fetchPastVolume(amm, lendingPools, seconds),
-                this.fetchCurrentVolumeAndReserves(amm, lendingPools)
+                this.fetchCurrentVolumeAndReserves(amm, lendingPools),
             ]));
         }
         const ammsData = yield Promise.all(promises);
         for (const data of ammsData) {
-            const [amm, pastVolume, { currentVolume, currentReserve },] = data;
+            const [amm, pastVolume, { currentVolume, currentReserve }] = data;
             const lendingPools = lendingPoolsByAmm[amm];
             if (lendingPools === undefined)
                 continue;
@@ -233,11 +261,13 @@ function fetchUniswapAPR(lendingPoolsByAmm, seconds = 60 * 60 * 24 * 7) {
                     uniswapAPR[lendingPool.id] = 0;
                     continue;
                 }
-                const cumVolumePast = pastVolume[uniswapV2PairAddress] ? pastVolume[uniswapV2PairAddress] : 0;
+                const cumVolumePast = pastVolume[uniswapV2PairAddress]
+                    ? pastVolume[uniswapV2PairAddress]
+                    : 0;
                 const cumVolumeNow = currentVolume[uniswapV2PairAddress];
                 const reserveUSD = currentReserve[uniswapV2PairAddress];
                 const volumeUSD = cumVolumeNow - cumVolumePast;
-                const yearlyVolume = volumeUSD * SECONDS_IN_YEAR / seconds;
+                const yearlyVolume = (volumeUSD * SECONDS_IN_YEAR) / seconds;
                 const yearlyFee = yearlyVolume * amms_1.AMM_LP_FEE[this.network][amm];
                 uniswapAPR[lendingPool.id] = yearlyFee / reserveUSD;
             }
@@ -276,11 +306,14 @@ function initializeLendingPoolsData() {
             for (const lendingPool of lendingPools[factory]) {
                 lendingPool.pair.uniswapAPR = uniswapAPR[lendingPool.id] || 0;
                 if (impermaxChefRewardRates) {
-                    lendingPool.borrowable0.rewards = impermaxChefRewardRates[lendingPool.borrowable0.id];
-                    lendingPool.borrowable1.rewards = impermaxChefRewardRates[lendingPool.borrowable1.id];
+                    lendingPool.borrowable0.rewards =
+                        impermaxChefRewardRates[lendingPool.borrowable0.id];
+                    lendingPool.borrowable1.rewards =
+                        impermaxChefRewardRates[lendingPool.borrowable1.id];
                 }
                 // If one of the price of the 2 tokens is 0, fix the collateral price by doubling it
-                if (parseFloat(lendingPool.borrowable0.underlying.derivedUSD) === 0 || parseFloat(lendingPool.borrowable1.underlying.derivedUSD) === 0) {
+                if (parseFloat(lendingPool.borrowable0.underlying.derivedUSD) === 0 ||
+                    parseFloat(lendingPool.borrowable1.underlying.derivedUSD) === 0) {
                     lendingPool.pair.derivedUSD = (parseFloat(lendingPool.pair.derivedUSD) * 2).toString();
                 }
                 if (!lendingPoolsData[factory])
@@ -310,17 +343,16 @@ function initializeLendingPoolsData() {
         for (const factory in lendingPools) {
             this.lendingPools[factory] = {};
             for (const lendingPool of lendingPools[factory]) {
-                this.lendingPools[factory][lendingPool.id] =
-                    new lendingPool_1.default(this, factory, lendingPool.id);
+                this.lendingPools[factory][lendingPool.id] = new lendingPool_1.default(this, factory, lendingPool.id);
             }
         }
         // Quickfix for MIM and SPELL
         if (this.network === types_1.Networks.Arbitrum) {
             // const ETH_MIM = '0xa6e69dd0c36f3b59539e2c7afd274ef91b5c70f9';
             // const ETH_SPELL = '0x35b44b303eacb71114aa62fe8dae6f9c5de0f680';
-            const ETH_gGOHM = '0x6d94f7e67c6ae0b0257c35754e059fdfb249d998';
-            const ETH_MAGIC = '0x88a0b00bbe918ee00e3482f71962070dc052984b';
-            const ETH_RDNT = '0xfb468ad210d427d65c9a765a480649d5754ca325';
+            const ETH_gGOHM = "0x6d94f7e67c6ae0b0257c35754e059fdfb249d998";
+            const ETH_MAGIC = "0x88a0b00bbe918ee00e3482f71962070dc052984b";
+            const ETH_RDNT = "0xfb468ad210d427d65c9a765a480649d5754ca325";
             // const LIZ_LIZ_ETH = '0x699c5e23357ab1bf658bd0b38070d746e37671f3';
             // const LIZ_ETH_USDC = '0x1229aac120ae75301ab1c3a2a04ec14183493584';
             // const LIZ_ETH_BTC = '0xce009c44e1645bc6d19c90ba440c618a42ae581d';
@@ -331,7 +363,7 @@ function initializeLendingPoolsData() {
                     //lendingPoolsData[Factory.V2V1_1][ETH_SPELL].pair.rewards[0].rewardRate = '8.44';
                     //lendingPoolsData[Factory.V2V1_1][ETH_MIM].pair.rewards[0].rewardRate = '30.64';
                     //lendingPoolsData[Factory.V2V1_1][ETH_gGOHM].pair.rewards[0].rewardRate = '0.000009129';
-                    lendingPoolsDataV2V1_1[ETH_MAGIC].pair.rewards[0].rewardRate = '0.135';
+                    lendingPoolsDataV2V1_1[ETH_MAGIC].pair.rewards[0].rewardRate = "0.135";
                 }
             }
             const lendingPoolsDataV2V2 = lendingPoolsData[types_1.Factory.V2V2];
@@ -375,33 +407,34 @@ function initializeLendingPoolsData() {
         if (this.network === types_1.Networks.Polygon) {
             const lendingPoolsDataV2V2 = lendingPoolsData[types_1.Factory.V2V2];
             if (lendingPoolsDataV2V2) {
-                const GNS_DAI = '0xf9221c5edc736d26ffc4ddccddfa15a4b958862e';
+                const GNS_DAI = "0xf9221c5edc736d26ffc4ddccddfa15a4b958862e";
                 if (lendingPoolsDataV2V2[GNS_DAI]) {
                     const GNS = lendingPoolsDataV2V2[GNS_DAI].borrowable1.underlying;
                     lendingPoolsDataV2V2[GNS_DAI].pair.rewards[0] = {
-                        id: '',
+                        id: "",
                         rewardsToken: GNS,
-                        rewardRate: '0.00608',
-                        periodFinish: '0',
+                        rewardRate: "0.00608",
+                        periodFinish: "0",
                     };
-                    lendingPoolsDataV2V2[GNS_DAI].pair.stakedTotalSupply = '1640000';
+                    lendingPoolsDataV2V2[GNS_DAI].pair.stakedTotalSupply = "1640000";
                 }
             }
         }
         if (this.network === types_1.Networks.Avalanche) {
             const lendingPoolsDataV2V1_2 = lendingPoolsData[types_1.Factory.V2V1_2];
             if (lendingPoolsDataV2V1_2) {
-                const QI_AVAX = '0x3e2a4dcd46e0e339aec603080d90bd939a163062';
+                const QI_AVAX = "0x3e2a4dcd46e0e339aec603080d90bd939a163062";
                 if (lendingPoolsDataV2V1_2[QI_AVAX]) {
                     const QI = lendingPoolsDataV2V1_2[QI_AVAX].borrowable0.underlying;
                     lendingPoolsDataV2V1_2[QI_AVAX].pair.rewards[0] = {
-                        id: '',
+                        id: "",
                         rewardsToken: QI,
-                        rewardRate: '4.54',
-                        periodFinish: '0',
+                        rewardRate: "4.54",
+                        periodFinish: "0",
                     };
                     // TODO -> this is wrong
-                    lendingPoolsDataV2V1_2[QI_AVAX].pair.stakedTotalSupply = '0.000000992210460243'; //https://snowtrace.io/token/0xe530dc2095ef5653205cf5ea79f8979a7028065c?a=0x784da19e61cf348a8c54547531795ecfee2affd1
+                    lendingPoolsDataV2V1_2[QI_AVAX].pair.stakedTotalSupply =
+                        "0.000000992210460243"; //https://snowtrace.io/token/0xe530dc2095ef5653205cf5ea79f8979a7028065c?a=0x784da19e61cf348a8c54547531795ecfee2affd1
                 }
             }
             /*REWARD STOPPED const sAVAX_AVAX = '0x5b588f4481035b0f765393fc9f4752615a6d0498';
@@ -472,7 +505,7 @@ function initializeTvlData() {
             types_1.Networks.Base,
             types_1.Networks.Scroll,
             types_1.Networks.Real,
-            types_1.Networks.Blast
+            types_1.Networks.Blast,
         ]; // exclude ropsten
         const calls = [];
         for (const network of networks) {
@@ -605,22 +638,28 @@ function initializeUserData(account) {
                 const underlyingAddress = supplyPositions.borrowable.underlying.id;
                 const borrowableA = (yield this.getLendingPool(factory, uniswapV2PairAddress)).getPoolToken(types_1.PoolTokenType.BorrowableA);
                 const addressA = yield borrowableA.getUnderlyingAddress();
-                const poolTokenType = underlyingAddress === addressA ? types_1.PoolTokenType.BorrowableA : types_1.PoolTokenType.BorrowableB;
+                const poolTokenType = underlyingAddress === addressA
+                    ? types_1.PoolTokenType.BorrowableA
+                    : types_1.PoolTokenType.BorrowableB;
                 const resultOfFactory = result[factory];
                 if (!(uniswapV2PairAddress in resultOfFactory.supplyPositions))
                     resultOfFactory.supplyPositions[uniswapV2PairAddress] = {};
-                resultOfFactory.supplyPositions[uniswapV2PairAddress][poolTokenType] = supplyPositions;
+                resultOfFactory.supplyPositions[uniswapV2PairAddress][poolTokenType] =
+                    supplyPositions;
             }
             for (const borrowPositions of rawUserData.borrowPositions) {
                 const uniswapV2PairAddress = borrowPositions.borrowable.lendingPool.id;
                 const underlyingAddress = borrowPositions.borrowable.underlying.id;
                 const borrowableA = (yield this.getLendingPool(factory, uniswapV2PairAddress)).getPoolToken(types_1.PoolTokenType.BorrowableA);
                 const addressA = yield borrowableA.getUnderlyingAddress();
-                const poolTokenType = underlyingAddress === addressA ? types_1.PoolTokenType.BorrowableA : types_1.PoolTokenType.BorrowableB;
+                const poolTokenType = underlyingAddress === addressA
+                    ? types_1.PoolTokenType.BorrowableA
+                    : types_1.PoolTokenType.BorrowableB;
                 const resultOfFactory = result[factory];
                 if (!(uniswapV2PairAddress in resultOfFactory.borrowPositions))
                     resultOfFactory.borrowPositions[uniswapV2PairAddress] = {};
-                resultOfFactory.borrowPositions[uniswapV2PairAddress][poolTokenType] = borrowPositions;
+                resultOfFactory.borrowPositions[uniswapV2PairAddress][poolTokenType] =
+                    borrowPositions;
             }
         }
         return result;
@@ -656,50 +695,51 @@ exports.getXimxData = getXimxData;
 /**
  * Lending Vault
  **/
-function fetchLendingVaults() {
-    return __awaiter(this, void 0, void 0, function* () {
-        const subgraph = subgraphs_1.LENDING_VAULT_SUBGRAPH_URL[this.network];
-        if (subgraph.length == 0)
-            return [];
-        const query = queries_1.QueryBuilderFactory.getQuery(subgraph);
-        const result = yield this.apolloFetcher(subgraph, query.lendingVaultsQuery([]));
-        return result.data.lendingVaults;
-    });
-}
-exports.fetchLendingVaults = fetchLendingVaults;
-function initializeLendingVaultsData() {
+function initializeVaultsData() {
     return __awaiter(this, void 0, void 0, function* () {
-        const lendingVaultsData = {};
-        const lendingVaults = yield this.fetchLendingVaults();
-        // Organize lending vaults data
-        for (const lendingVault of lendingVaults) {
-            lendingVaultsData[lendingVault.id] = lendingVault;
+        const vaultsData = {};
+        const vaults = yield this.fetchVaults();
+        // Put all vaults in one map, we can destrucutre later as we know
+        // which vault is whcih type from subgraphs
+        for (const vaultType in vaults) {
+            const vaultsOfType = vaults[vaultType];
+            for (const vault of vaultsOfType) {
+                vaultsData[vault.id] = vault;
+            }
         }
-        // Initialize OffchainLendingVault objects
         this.vaults = {};
-        for (const lendingVault of lendingVaults) {
-            this.vaults[lendingVault.id] =
-                new offchainVault_1.default(this, lendingVault.id);
+        for (const vault of Object.values(vaultsData)) {
+            switch (vault.vaultType) {
+                case types_1.VaultType.LENDING:
+                    this.vaults[vault.id] = new vault_1.OffchainLendingVault(this, vault.id);
+                    break;
+                case types_1.VaultType.HEDGED:
+                    this.vaults[vault.id] = new vault_1.OffchainHedgedVault(this, vault.id);
+                    break;
+                case types_1.VaultType.LEVERAGED:
+                    this.vaults[vault.id] = new vault_1.OffchainLeveragedVault(this, vault.id);
+                    break;
+            }
         }
-        return lendingVaultsData;
+        return vaultsData;
     });
 }
-exports.initializeLendingVaultsData = initializeLendingVaultsData;
-function getLendingVaultsData() {
+exports.initializeVaultsData = initializeVaultsData;
+function getVaultsData() {
     return __awaiter(this, void 0, void 0, function* () {
-        if (!this.lendingVaultsData)
-            this.lendingVaultsData = this.initializeLendingVaultsData();
-        return this.lendingVaultsData;
+        if (!this.vaultsData)
+            this.vaultsData = this.initializeVaultsData();
+        return this.vaultsData;
     });
 }
-exports.getLendingVaultsData = getLendingVaultsData;
-function getLendingVaultData(lendingVaultAddress) {
+exports.getVaultsData = getVaultsData;
+function getVaultData(vaultAddress) {
     return __awaiter(this, void 0, void 0, function* () {
-        const lendingVaultsData = yield this.getLendingVaultsData();
-        return lendingVaultsData[lendingVaultAddress.toLowerCase()];
+        const vaultsData = yield this.getVaultsData();
+        return vaultsData[vaultAddress.toLowerCase()];
     });
 }
-exports.getLendingVaultData = getLendingVaultData;
+exports.getVaultData = getVaultData;
 /**
  * Whitelist
  */
@@ -759,36 +799,56 @@ exports.getWhitelistState = getWhitelistState;
 /**
  * User Data
  */
-function fetchLendingVaultsUserData(account) {
+function fetchVaultsUserData(account) {
     return __awaiter(this, void 0, void 0, function* () {
-        const subgraph = subgraphs_1.LENDING_VAULT_SUBGRAPH_URL[this.network];
-        const query = queries_1.QueryBuilderFactory.getQuery(subgraph);
-        const result = yield this.apolloFetcher(subgraph, query.lendingVaultsUserQuery(account));
-        const user = result.data.user;
-        if (!user)
-            return null;
-        return result.data.user.positions;
+        const calls = [];
+        let vaultType;
+        // Collect all fetch promises
+        for (vaultType in subgraphs_1.VAULT_SUBGRAPH_URL[this.network]) {
+            const subgraphs = subgraphs_1.VAULT_SUBGRAPH_URL[this.network][vaultType];
+            if (!subgraphs || subgraphs.length === 0)
+                continue;
+            calls.push(this.endpointManager.fetch(subgraphs, this.network, (queryBuilder) => queryBuilder.vaultsUserQuery(account)));
+        }
+        const results = yield Promise.all(calls);
+        const userVaultData = {};
+        let i = 0;
+        for (vaultType in subgraphs_1.VAULT_SUBGRAPH_URL[this.network]) {
+            const subgraphs = subgraphs_1.VAULT_SUBGRAPH_URL[this.network][vaultType];
+            if (!subgraphs || subgraphs.length === 0)
+                continue;
+            const result = results[i++];
+            const user = result.data.user;
+            if (user && user.positions) {
+                userVaultData[vaultType] = user.positions.map((position) => (Object.assign(Object.assign({}, position), { vaultType })));
+            }
+        }
+        return userVaultData;
     });
 }
-exports.fetchLendingVaultsUserData = fetchLendingVaultsUserData;
-function initializeLendingVaultsUserData(account) {
+exports.fetchVaultsUserData = fetchVaultsUserData;
+function initializeVaultsUserData(account) {
     return __awaiter(this, void 0, void 0, function* () {
-        const positions = yield this.fetchLendingVaultsUserData(account);
-        if (!positions)
-            return null;
+        const userVaultData = yield this.fetchVaultsUserData(account);
         const result = {};
-        for (const position of positions) {
-            result[position.lendingVault.id] = position;
+        for (const vaultType in userVaultData) {
+            const positions = userVaultData[vaultType];
+            if (!positions)
+                continue;
+            result[vaultType] = {};
+            for (const position of positions) {
+                result[vaultType][position.lendingVault.id] = position;
+            }
         }
         return result;
     });
 }
-exports.initializeLendingVaultsUserData = initializeLendingVaultsUserData;
-function getLendingVaultsUserData(account) {
+exports.initializeVaultsUserData = initializeVaultsUserData;
+function getVaultsUserData(account) {
     return __awaiter(this, void 0, void 0, function* () {
-        if (!(account in this.lendingVaultsUsersData))
-            this.lendingVaultsUsersData[account] = this.initializeLendingVaultsUserData(account);
-        return yield this.lendingVaultsUsersData[account];
+        if (!(account in this.vaultsUsersData))
+            this.vaultsUsersData[account] = this.initializeVaultsUserData(account);
+        return (yield this.vaultsUsersData[account]) || {};
     });
 }
-exports.getLendingVaultsUserData = getLendingVaultsUserData;
+exports.getVaultsUserData = getVaultsUserData;