impermax-sdk 2.1.5 → 2.1.7

package/lib/offchain/offchainMultichain.d.ts

@@ -1,6 +1,6 @@
-import { NetworkIndex, Networks } from "../config/types";
+import { NetworkIndex, Networks, VaultType } from "../config/types";
 import Offchain from "./offchain";
-import OffchainVault, { VaultType } from "./vault/offchainVault";
+import OffchainVault from "./vault/offchainVault";
 import { Amms } from "../config/amms";
 import { Farms } from "../config/farms";
 import { RiskLevel } from "./vault/offchainLendingVault";
@@ -49,7 +49,7 @@ export default class OffchainMultichain {
     private constructor();
     static get instance(): OffchainMultichain;
     getOffchain(network: Networks): Offchain;
-    getVaultList(params?: VaultListParams, orderBy?: VaultOrderBy, sortDirection?: SortDirection): Promise<Array<OffchainVault>>;
-    private getVaultSortValue;
+    getVaultList(params?: VaultListParams): Promise<Array<OffchainVault>>;
+    networkHasVault(network: Networks): boolean;
     getLendingPoolList(params?: LendingPoolListParams, orderBy?: LendingPoolListOrderBy): Promise<Array<OffchainLendingPool>>;
 }

package/lib/offchain/offchainMultichain.js

@@ -34,7 +34,6 @@ var SortDirection;
     SortDirection["ASC"] = "asc";
     SortDirection["DESC"] = "desc";
 })(SortDirection = exports.SortDirection || (exports.SortDirection = {}));
-// Vaults //
 var VaultOrderBy;
 (function (VaultOrderBy) {
     VaultOrderBy[VaultOrderBy["TVL"] = 0] = "TVL";
@@ -67,66 +66,39 @@ class OffchainMultichain {
             this.offchains[network] = new offchain_1.default(this, network);
         return this.offchains[network];
     }
-    getVaultList(params = {}, orderBy = VaultOrderBy.TVL, sortDirection = SortDirection.DESC) {
+    /*--------------------------------------------------------*
+     *                        Vaults
+     *--------------------------------------------------------*/
+    getVaultList(params = {}) {
         return __awaiter(this, void 0, void 0, function* () {
-            try {
-                const allNetworks = params.networks || Object.values(types_1.Networks);
-                const networksWithVaults = allNetworks.filter((network) => subgraphs_1.LENDING_VAULT_SUBGRAPH_URL[network]);
-                const vaults = yield Promise.all(networksWithVaults.map((network) => __awaiter(this, void 0, void 0, function* () {
-                    try {
-                        const offchain = this.getOffchain(network);
-                        const vaultsData = yield offchain.getLendingVaultsData();
-                        if (!vaultsData)
-                            return [];
-                        const vaultResults = yield Promise.all(Object.keys(vaultsData).map((address) => __awaiter(this, void 0, void 0, function* () {
-                            try {
-                                const vault = yield offchain.getLendingVault(address);
-                                const sortValue = yield this.getVaultSortValue(vault, orderBy);
-                                return { vault, sortValue };
-                            }
-                            catch (err) {
-                                console.error(`Error processing vault ${address}:`, err);
-                                return null;
-                            }
-                        })));
-                        return vaultResults.filter((result) => result !== null);
-                    }
-                    catch (err) {
-                        console.error(`Error fetching network ${network}:`, err);
-                        return [];
-                    }
-                })));
-                const flatVaults = vaults.flat();
-                const multiplier = sortDirection === SortDirection.ASC ? 1 : -1;
-                const sortedVaults = flatVaults.sort((a, b) => (a.sortValue - b.sortValue) * multiplier);
-                return sortedVaults.map(({ vault }) => vault);
-            }
-            catch (err) {
-                console.error("Error in getVaultList:", err);
-                throw err;
-            }
-        });
-    }
-    getVaultSortValue(vault, orderBy) {
-        return __awaiter(this, void 0, void 0, function* () {
-            try {
-                switch (orderBy) {
-                    case VaultOrderBy.TVL:
-                        return yield vault.getVaultSupplyUSD();
-                    case VaultOrderBy.APR:
-                        return yield vault.getSupplyAPR();
-                    case VaultOrderBy.DEPOSITED:
-                        return yield vault.getTotalBalance();
-                    default:
-                        return 0;
+            // Get networks passed, if empty get all
+            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) {
+                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);
                 }
             }
-            catch (err) {
-                console.error("Error getting sort value:", err);
-                return 0;
-            }
+            return allVaults;
         });
     }
+    // Helpful for frontend UI thing
+    networkHasVault(network) {
+        return Object.keys(subgraphs_1.VAULT_SUBGRAPH_URL[network]).length > 0;
+    }
+    /*--------------------------------------------------------*
+     *                    Lending Pools
+     *--------------------------------------------------------*/
+    // private async getVaultSortValue( vault: OffchainVault, orderBy: VaultOrderBy,): Promise<number> { }
     getLendingPoolList(params = {}, orderBy = LendingPoolListOrderBy.TVL) {
         return __awaiter(this, void 0, void 0, function* () {
             // TODO FILL WITH FAKE DATA

package/lib/offchain/offchainTypes.d.ts

@@ -1,4 +1,4 @@
-import { Address, AddressIndex, PoolTokenType, ProposalState, WhitelistState } from '../config/types';
+import { Address, AddressIndex, PoolTokenType, ProposalState, WhitelistState, VaultType } from '../config/types';
 export interface PoolTokenData {
     id: Address;
     totalBalance: string;
@@ -159,13 +159,29 @@ export interface XimxData {
 /**
  * Lending vault
  **/
+export interface VaultBorrowable {
+    pair: string;
+    address: Address;
+    pairAddress: Address;
+    token0: Address;
+    token1: Address;
+}
 export interface LendingVaultData extends PoolTokenData {
     underlying: TokenData;
     supplyRate: string;
     reserveFactor: string;
     availableLiquidity: string;
     lastUpdate: string;
+    vaultType: VaultType.LENDING;
+    borrowables: VaultBorrowable[];
+}
+export interface HedgedVaultData extends PoolTokenData {
+    vaultType: VaultType.HEDGED;
+}
+export interface LeveragedVaultData extends PoolTokenData {
+    vaultType: VaultType.LEVERAGED;
 }
+export type VaultData = LendingVaultData | HedgedVaultData | LeveragedVaultData;
 export interface VaultPosition {
     tokenBalance: string;
     lastExchangeRate: string;

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

@@ -1,4 +1,4 @@
-import { Address, Factory, Networks } from "../../../../config/types";
+import { Address, Factory, Networks, VaultType } from "../../../../config/types";
 import { IQueryBuilder } from "../../interfaces/query-builder";
 export declare class PonderQueryBuilder implements IQueryBuilder {
     blockQuery(): import("graphql").DocumentNode;
@@ -6,8 +6,8 @@ export declare class PonderQueryBuilder implements IQueryBuilder {
     lendingPoolsQuery(factory: Factory, addressesFilter: Address[], network: Networks): import("graphql").DocumentNode;
     userQuery(account: Address, network: Networks, factory: Factory): import("graphql").DocumentNode;
     tvlQuery(): import("graphql").DocumentNode;
-    lendingVaultsUserQuery(account: Address): import("graphql").DocumentNode;
-    lendingVaultsQuery(addressesFilter: Address[]): import("graphql").DocumentNode;
+    vaultsQuery(vaultType: VaultType, addressesFilter: Address[]): import("graphql").DocumentNode;
+    vaultsUserQuery(account: Address): import("graphql").DocumentNode;
     proposalsMetaQuery(rangeBegin: any, rangeLength: any, descending: any): import("graphql").DocumentNode;
     proposalQuery(id: number): import("graphql").DocumentNode;
     ximxQuery(): import("graphql").DocumentNode;

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

@@ -7,6 +7,7 @@ exports.PonderQueryBuilder = void 0;
 const graphql_tag_1 = __importDefault(require("graphql-tag"));
 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.
 class PonderQueryBuilder {
     /*-----------------------------*
      *   1. API Health
@@ -180,30 +181,18 @@ class PonderQueryBuilder {
     /*-----------------------------*
      *   Lending vaults
      *-----------------------------*/
-    lendingVaultsUserQuery(account) {
-        return (0, graphql_tag_1.default) `{
-      user(id: "${account.toLowerCase()}") {
-        positions(first:1000) {
-          tokenBalance
-          lastExchangeRate
-          cumulativeEarnings
-          lendingVault {
-              id
-          }
-        }
-      }
-    }`;
-    }
-    lendingVaultsQuery(addressesFilter) {
+    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()}"]}` : "";
         return (0, graphql_tag_1.default) `{
-      lendingVaults(first: 1000 ${id_in_string}) {
+      lendingVaults(limit: 1000, ${id_in_string}) {
+        items {
           id
           underlying {
-              id
-              symbol
-              name
-              decimals
+            id
+            symbol
+            name
+            decimals
           }
           totalBalance
           totalSupply
@@ -212,14 +201,46 @@ class PonderQueryBuilder {
           exchangeRate
           availableLiquidity
           lastUpdate
+          borrowables { 
+	    			items { 
+              address
+            	pair
+              pairAddress
+              token0
+              token1
+            }
+          }
+        }
       }
       _meta {
-          block {
-              number
-          }
-          hasIndexingErrors
+        status
       }
     }`;
+    }
+    vaultsUserQuery(account) {
+        return (0, graphql_tag_1.default) `{
+      user(id: "${account.toLowerCase()}") {
+        positions(limit: 1000) {
+          items {
+            cumulativeEarnings
+            tokenBalance
+            lastExchangeRate
+            lendingVault {
+              id
+              borrowables { 
+              	items { 
+                	id
+                  pair
+                }
+              }
+            }
+          }
+        }
+      }
+    _meta {
+      status
+    }
+  }`;
     }
     /*-----------------------------*
      *   Config Manager

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

@@ -1,4 +1,4 @@
-import { Address, Factory, Networks } from "../../../../config/types";
+import { Address, Factory, Networks, VaultType } from "../../../../config/types";
 import { IQueryBuilder } from "../../interfaces/query-builder";
 export declare class TheGraphQueryBuilder implements IQueryBuilder {
     blockQuery(timestamp: number): import("graphql").DocumentNode;
@@ -6,8 +6,8 @@ export declare class TheGraphQueryBuilder implements IQueryBuilder {
     lendingPoolsQuery(factory: Factory, addressesFilter: Address[]): import("graphql").DocumentNode;
     userQuery(account: Address, network: Networks, factory: Factory): import("graphql").DocumentNode;
     tvlQuery(): import("graphql").DocumentNode;
-    lendingVaultsQuery(addressesFilter: Address[]): import("graphql").DocumentNode;
-    lendingVaultsUserQuery(account: Address): import("graphql").DocumentNode;
+    vaultsQuery(vaultType: VaultType, addressesFilter: Address[]): import("graphql").DocumentNode;
+    vaultsUserQuery(account: Address): import("graphql").DocumentNode;
     proposalsMetaQuery(rangeBegin: any, rangeLength: any, descending: any): import("graphql").DocumentNode;
     proposalQuery(id: number): import("graphql").DocumentNode;
     ximxQuery(): import("graphql").DocumentNode;

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

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.TheGraphQueryBuilder = void 0;
 const graphql_tag_1 = __importDefault(require("graphql-tag"));
 const factories_1 = require("../../../../config/factories");
+// TODO: Might need to separate Vaults query based on vault type, maybe not.
 class TheGraphQueryBuilder {
     /*-----------------------------*
      *   1. API Health
@@ -184,7 +185,8 @@ class TheGraphQueryBuilder {
     /*-----------------------------*
      *   Lending vaults
      *-----------------------------*/
-    lendingVaultsQuery(addressesFilter) {
+    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()}"]}` : "";
         return (0, graphql_tag_1.default) `{
       lendingVaults(first: 1000 ${id_in_string}) {
@@ -211,7 +213,7 @@ class TheGraphQueryBuilder {
       }
     }`;
     }
-    lendingVaultsUserQuery(account) {
+    vaultsUserQuery(account) {
         return (0, graphql_tag_1.default) `{
       user(id: "${account.toLowerCase()}") {
           positions(first:1000) {

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

@@ -1,13 +1,13 @@
 import { DocumentNode } from 'graphql';
-import { Address, Factory, Networks } from '../../../config/types';
+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;
     userQuery(account: Address, network: Networks, factory: Factory): DocumentNode;
     tvlQuery(): DocumentNode;
-    lendingVaultsQuery(addressesFilter: Address[]): DocumentNode;
-    lendingVaultsUserQuery(account: Address): DocumentNode;
+    vaultsQuery(vaultType: VaultType, addressesFilter: Address[]): DocumentNode;
+    vaultsUserQuery(account: Address): DocumentNode;
     proposalsMetaQuery(rangeBegin: number, rangeLength: number, descending: boolean): DocumentNode;
     proposalQuery(id: number): DocumentNode;
     ximxQuery(): DocumentNode;

package/lib/offchain/vault/offchainHedgedVault.js

@@ -1,27 +1,4 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
@@ -36,12 +13,12 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const types_1 = require("../../config/types");
-const offchainVault_1 = __importStar(require("./offchainVault"));
+const offchainVault_1 = __importDefault(require("./offchainVault"));
 const lendingPool_1 = __importDefault(require("../lendingPool"));
 class OffchainHedgedVaultVault extends offchainVault_1.default {
     constructor(offchain, vaultAddress) {
         super(offchain, vaultAddress);
-        this.vaultType = offchainVault_1.VaultType.HEDGED;
+        this.vaultType = types_1.VaultType.HEDGED;
     }
     getLeverage() {
         return __awaiter(this, void 0, void 0, function* () {

package/lib/offchain/vault/offchainLendingVault.d.ts

@@ -1,7 +1,7 @@
 import Offchain from "../index";
-import { Address } from '../../config/types';
+import { Address } from "../../config/types";
 import OffchainVault from "./offchainVault";
-import { OffchainBorrowable } from "../lendingPool";
+import { VaultBorrowable } from "../offchainTypes";
 export declare enum RiskLevel {
     LOW = 0,
     MEDIUM = 1,
@@ -12,5 +12,5 @@ export default class OffchainLendingVault extends OffchainVault {
     getRiskLevel(): Promise<RiskLevel>;
     getAvailableLiquidity(): Promise<number>;
     getAvailableLiquidityUSD(): Promise<number>;
-    getBorrowables(): Promise<Array<OffchainBorrowable>>;
+    getBorrowables(): Promise<Array<VaultBorrowable>>;
 }

package/lib/offchain/vault/offchainLendingVault.js

@@ -1,27 +1,4 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
@@ -31,9 +8,13 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.RiskLevel = void 0;
-const offchainVault_1 = __importStar(require("./offchainVault"));
+const types_1 = require("../../config/types");
+const offchainVault_1 = __importDefault(require("./offchainVault"));
 var RiskLevel;
 (function (RiskLevel) {
     RiskLevel[RiskLevel["LOW"] = 0] = "LOW";
@@ -43,7 +24,7 @@ var RiskLevel;
 class OffchainLendingVault extends offchainVault_1.default {
     constructor(offchain, vaultAddress) {
         super(offchain, vaultAddress);
-        this.vaultType = offchainVault_1.VaultType.LENDING;
+        this.vaultType = types_1.VaultType.LENDING;
     }
     getRiskLevel() {
         return __awaiter(this, void 0, void 0, function* () {
@@ -63,10 +44,13 @@ class OffchainLendingVault extends offchainVault_1.default {
             return availableLiquidity * tokenPrice;
         });
     }
-    // Borrowables
+    // See the LendingVaultData type in ../offchainTypes.ts
     getBorrowables() {
         return __awaiter(this, void 0, void 0, function* () {
-            return [];
+            const vaultData = (yield this.getPoolTokenData());
+            if (!vaultData.borrowables)
+                return [];
+            return vaultData.borrowables;
         });
     }
 }

package/lib/offchain/vault/offchainLeveragedVault.js

@@ -1,27 +1,4 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
@@ -36,12 +13,12 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const types_1 = require("../../config/types");
-const offchainVault_1 = __importStar(require("./offchainVault"));
+const offchainVault_1 = __importDefault(require("./offchainVault"));
 const lendingPool_1 = __importDefault(require("../lendingPool"));
 class OffchainLeveragedVault extends offchainVault_1.default {
     constructor(offchain, vaultAddress) {
         super(offchain, vaultAddress);
-        this.vaultType = offchainVault_1.VaultType.LEVERAGED;
+        this.vaultType = types_1.VaultType.LEVERAGED;
     }
     getLeverage() {
         return __awaiter(this, void 0, void 0, function* () {

package/lib/offchain/vault/offchainVault.d.ts

@@ -1,12 +1,7 @@
 import Offchain from "../index";
-import { Address } from '../../config/types';
+import { Address, VaultType } from '../../config/types';
 import OffchainPoolToken from '../offchainPoolToken';
-import { PoolTokenData } from '../offchainTypes';
-export declare enum VaultType {
-    LENDING = 0,
-    HEDGED = 1,
-    LEVERAGED = 2
-}
+import { VaultData } from '../offchainTypes';
 export declare enum VaultRisk {
     VERY_LOW = "very-low",
     LOW = "low",
@@ -31,7 +26,7 @@ export default class OffchainVault extends OffchainPoolToken {
     getVaultType: () => VaultType;
     getVaultRisk: () => VaultRisk;
     getVaultStatus: () => VaultStatus;
-    getPoolTokenData(): Promise<PoolTokenData>;
+    getPoolTokenData(): Promise<VaultData>;
     private getTotalSupply;
     private getLastUpdate;
     private getAccrueFactor;

package/lib/offchain/vault/offchainVault.js

@@ -12,15 +12,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.VaultStatus = exports.VaultRisk = exports.VaultType = void 0;
+exports.VaultStatus = exports.VaultRisk = void 0;
 const offchainPoolToken_1 = __importDefault(require("../offchainPoolToken"));
 const utils_1 = require("../../utils");
-var VaultType;
-(function (VaultType) {
-    VaultType[VaultType["LENDING"] = 0] = "LENDING";
-    VaultType[VaultType["HEDGED"] = 1] = "HEDGED";
-    VaultType[VaultType["LEVERAGED"] = 2] = "LEVERAGED";
-})(VaultType = exports.VaultType || (exports.VaultType = {}));
 var VaultRisk;
 (function (VaultRisk) {
     VaultRisk["VERY_LOW"] = "very-low";
@@ -46,9 +40,10 @@ class OffchainVault extends offchainPoolToken_1.default {
         this.offchain = offchain;
         this.vaultAddress = vaultAddress;
     }
+    // NOTE: Rename this to `getVaultData` ?
     getPoolTokenData() {
         return __awaiter(this, void 0, void 0, function* () {
-            return this.offchain.getLendingVaultData(this.vaultAddress);
+            return this.offchain.getVaultData(this.vaultAddress);
         });
     }
     getTotalSupply() {

package/lib/onchain/account/onchainAccountLendingVault.js

@@ -29,7 +29,7 @@ class OnchainAccountLendingVault extends onchainAccountPoolToken_1.default {
     }
     getOffchainAccountPoolToken() {
         return __awaiter(this, void 0, void 0, function* () {
-            return this.account.getOffchainAccount().getLendingVault(this.getVaultAddress());
+            return this.account.getOffchainAccount().getVault(this.getVaultAddress());
         });
     }
     cleanCache() {

package/lib/onchain/onchainLendingVault.js

@@ -36,7 +36,7 @@ class OnchainLendingVault extends onchainPoolToken_1.default {
     }
     getOffchainPoolToken() {
         return __awaiter(this, void 0, void 0, function* () {
-            return yield this.onchain.getOffchain().getLendingVault(this.vaultAddress);
+            return yield this.onchain.getOffchain().getVault(this.vaultAddress);
         });
     }
     initializePoolToken() {

package/package.json

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