impermax-sdk 2.1.71 → 2.1.73

package/lib/offchain/lendingPool/offchainCollateralV3.js

@@ -0,0 +1,79 @@
+"use strict";
+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) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        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 });
+const offchainCollateral_1 = __importDefault(require("./offchainCollateral"));
+const offchainNftlpUniswapV3_1 = __importDefault(require("./nftlp/offchainNftlpUniswapV3"));
+class OffchainCollateralV3 extends offchainCollateral_1.default {
+    constructor(lendingPool) {
+        super();
+        //
+        // Implementation
+        //
+        this.getOffchain = () => this.lendingPool.getOffchain();
+        this.getLendingPool = () => this.lendingPool;
+        this.getBorrowableA = () => this.lendingPool.getBorrowableA();
+        this.getBorrowableB = () => this.lendingPool.getBorrowableB();
+        //
+        // V3 Specifics
+        //
+        this.getNftlp = () => this.nftlp;
+        this.lendingPool = lendingPool;
+        this.nftlp = new offchainNftlpUniswapV3_1.default(this);
+    }
+    getName() {
+        return __awaiter(this, void 0, void 0, function* () {
+            const nameA = yield this.getBorrowableA().getName();
+            const nameB = yield this.getBorrowableB().getName();
+            return `${nameA}/${nameB} LP`;
+        });
+    }
+    getSymbol() {
+        return __awaiter(this, void 0, void 0, function* () {
+            const symbolA = yield this.getBorrowableA().getSymbol();
+            const symbolB = yield this.getBorrowableB().getSymbol();
+            return `${symbolA}/${symbolB}`;
+        });
+    }
+    getDecimals() {
+        return __awaiter(this, void 0, void 0, function* () {
+            return 18;
+        });
+    }
+    getUnderlyingAddress() {
+        return __awaiter(this, void 0, void 0, function* () {
+            return this.getLendingPool().getPairAddress();
+        });
+    }
+    //
+    // Pricing
+    //
+    getTokenPriceAccurate() {
+        return __awaiter(this, void 0, void 0, function* () {
+            return this.lendingPool.getCollateralPrice(false);
+        });
+    }
+    getTokenPriceFast(fallback = true) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (fallback)
+                return this.getTokenPriceAccurate();
+            return 0;
+        });
+    }
+    getTWAP() {
+        return __awaiter(this, void 0, void 0, function* () {
+            return 1;
+        });
+    }
+}
+exports.default = OffchainCollateralV3;

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

@@ -1,30 +1,46 @@
 import Offchain from "../index";
-import { Address, Borrowable, Factory, PoolTokenType, WhitelistState } from "../../config/types";
+import { Address, Borrowable, Factory, 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 OffchainAccountLendingPool from "../account/lendingPool";
+import OffchainAccount from "../account";
 export declare enum LendingPoolVersion {
     V1 = "V1",
     V2 = "V2",
     V3 = "V3"
 }
-export default class OffchainLendingPool {
+export default abstract class OffchainLendingPool {
     private readonly offchain;
     private readonly factory;
     private readonly pairAddress;
-    private readonly poolTokens;
+    protected readonly collateral: OffchainCollateral;
+    protected readonly borrowables: {
+        [Borrowable.A]: OffchainBorrowable;
+        [Borrowable.B]: OffchainBorrowable;
+    };
+    protected cache: {
+        lendingPoolAddresses?: Promise<{
+            collateral: Address;
+            borrowables: {
+                [key in Borrowable]: Address;
+            };
+        }>;
+    };
+    protected abstract getNewCollateralObject(): OffchainCollateral;
+    protected abstract getNewBorrowableObject(borrowable: Borrowable): OffchainBorrowable;
+    abstract getNewAccountLendingPoolObject(account: OffchainAccount): OffchainAccountLendingPool;
     constructor(offchain: Offchain, factory: Factory, pairAddress: Address);
     getOffchain: () => Offchain;
     getFactory: () => Factory;
     getPairAddress: () => string;
-    getPoolToken(poolTokenType: PoolTokenType): OffchainPoolToken;
     getBorrowable: (borrowable: Borrowable) => OffchainBorrowable;
     getBorrowableA: () => OffchainBorrowable;
     getBorrowableB: () => OffchainBorrowable;
     getCollateral: () => OffchainCollateral;
+    cleanCache(): void;
     getLendingPoolData(): Promise<LendingPoolData>;
     getWhitelistState(): Promise<WhitelistState>;
     getSafetyMargin(): Promise<number>;
@@ -58,4 +74,8 @@ export default class OffchainLendingPool {
     getLendingPoolVersion(): LendingPoolVersion;
     getTotalBorrowsUSD(): Promise<number>;
     getUniswapV2PairAddress(): Promise<Address>;
+    private initializeLendingPoolAddresses;
+    private getLendingPoolAddresses;
+    getCollateralAddress(): Promise<string>;
+    getBorrowableAddress(borrowable: Borrowable): Promise<string>;
 }

package/lib/offchain/lendingPool/offchainLendingPool.js

@@ -8,14 +8,9 @@ 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.LendingPoolVersion = void 0;
 const types_1 = require("../../config/types");
-const offchainCollateral_1 = __importDefault(require("./offchainCollateral"));
-const offchainBorrowable_1 = __importDefault(require("./offchainBorrowable"));
 const farms_1 = require("../../config/farms");
 const utils_1 = require("../../utils");
 const amms_1 = require("../../config/amms");
@@ -31,25 +26,26 @@ const LOW_TVL = 25000;
 const HIGH_TVL = 100000;
 class OffchainLendingPool {
     constructor(offchain, factory, pairAddress) {
+        this.cache = {};
         this.getOffchain = () => this.offchain;
         this.getFactory = () => this.factory;
         this.getPairAddress = () => this.pairAddress;
         this.getBorrowable = (borrowable) => borrowable == types_1.Borrowable.A ? this.getBorrowableA() : this.getBorrowableB();
         // Shortcuts
-        this.getBorrowableA = () => this.poolTokens[types_1.PoolTokenType.BorrowableA];
-        this.getBorrowableB = () => this.poolTokens[types_1.PoolTokenType.BorrowableB];
-        this.getCollateral = () => this.poolTokens[types_1.PoolTokenType.Collateral];
+        this.getBorrowableA = () => this.borrowables[types_1.Borrowable.A];
+        this.getBorrowableB = () => this.borrowables[types_1.Borrowable.B];
+        this.getCollateral = () => this.collateral;
         this.offchain = offchain;
         this.factory = factory;
         this.pairAddress = pairAddress;
-        this.poolTokens = {
-            [types_1.PoolTokenType.Collateral]: new offchainCollateral_1.default(this),
-            [types_1.PoolTokenType.BorrowableA]: new offchainBorrowable_1.default(this, types_1.PoolTokenType.BorrowableA),
-            [types_1.PoolTokenType.BorrowableB]: new offchainBorrowable_1.default(this, types_1.PoolTokenType.BorrowableB),
+        this.collateral = this.getNewCollateralObject();
+        this.borrowables = {
+            [types_1.Borrowable.A]: this.getNewBorrowableObject(types_1.Borrowable.A),
+            [types_1.Borrowable.B]: this.getNewBorrowableObject(types_1.Borrowable.B),
         };
     }
-    getPoolToken(poolTokenType) {
-        return this.poolTokens[poolTokenType];
+    cleanCache() {
+        this.cache = {};
     }
     // Offchain calls
     getLendingPoolData() {
@@ -128,6 +124,8 @@ class OffchainLendingPool {
             const rewards = [];
             const stakedTotalSupply = parseFloat(lendingPoolData.pair.stakedTotalSupply);
             const underlyingLPPrice = yield this.getUnderlyingLPPrice(true);
+            if (!lendingPoolData.pair.rewards)
+                return rewards;
             for (const reward of lendingPoolData.pair.rewards) {
                 const multiplier = farm === farms_1.Farms.traderJoeV2 ? 0.5 : 1;
                 const periodFinish = parseInt(reward.periodFinish);
@@ -249,16 +247,24 @@ class OffchainLendingPool {
             return uniswapAPR + stakingAPR;
         });
     }
+    // TODO: How to get total LP $ in V3?
     getTVL() {
         return __awaiter(this, void 0, void 0, function* () {
-            const [supply0USD, supply1USD, totalBalanceUSD] = yield Promise.all([
+            const [supply0USD, supply1USD] = yield Promise.all([
                 this.getBorrowableA().getTotalBalanceUSD(),
                 this.getBorrowableB().getTotalBalanceUSD(),
-                this.getCollateral().getTotalBalanceUSD(),
             ]);
-            if (supply0USD && supply1USD && totalBalanceUSD)
-                return supply0USD + supply1USD + totalBalanceUSD;
+            if (supply0USD && supply1USD)
+                return supply0USD + supply1USD;
             return 0;
+            // const [supply0USD, supply1USD, totalBalanceUSD] = await Promise.all([
+            //   this.getBorrowableA().getTotalBalanceUSD(),
+            //   this.getBorrowableB().getTotalBalanceUSD(),
+            //   this.getCollateral().getTotalBalanceUSD(),
+            // ]);
+            // if (supply0USD && supply1USD && totalBalanceUSD)
+            //   return supply0USD + supply1USD + totalBalanceUSD;
+            // return 0;
         });
     }
     // Flags
@@ -330,5 +336,36 @@ class OffchainLendingPool {
             return lendingPoolData.pair.uniswapV2PairAddress;
         });
     }
+    initializeLendingPoolAddresses() {
+        return __awaiter(this, void 0, void 0, function* () {
+            const lPool = yield this.getLendingPoolData();
+            return {
+                collateral: lPool.collateral.id,
+                borrowables: {
+                    [types_1.Borrowable.A]: lPool.borrowable0.id,
+                    [types_1.Borrowable.B]: lPool.borrowable1.id,
+                }
+            };
+        });
+    }
+    getLendingPoolAddresses() {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (!this.cache.lendingPoolAddresses)
+                this.cache.lendingPoolAddresses = this.initializeLendingPoolAddresses();
+            return this.cache.lendingPoolAddresses;
+        });
+    }
+    getCollateralAddress() {
+        return __awaiter(this, void 0, void 0, function* () {
+            return (yield this.getLendingPoolAddresses()).collateral;
+        });
+    }
+    ;
+    getBorrowableAddress(borrowable) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return (yield this.getLendingPoolAddresses()).borrowables[borrowable];
+        });
+    }
+    ;
 }
 exports.default = OffchainLendingPool;

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

@@ -0,0 +1,17 @@
+import { Borrowable } from "../../config/types";
+import OffchainCollateral from "./offchainCollateral";
+import OffchainLendingPool from "./offchainLendingPool";
+import OffchainCollateralV2 from "./offchainCollateralV2";
+import OffchainBorrowableV2 from "./offchainBorrowableV2";
+import OffchainAccount from "../account";
+import OffchainAccountLendingPoolV2 from "../account/lendingPool/offchainAccountLendingPoolV2";
+export default class OffchainLendingPoolV2 extends OffchainLendingPool {
+    protected readonly collateral: OffchainCollateral;
+    protected readonly borrowables: {
+        [Borrowable.A]: OffchainBorrowableV2;
+        [Borrowable.B]: OffchainBorrowableV2;
+    };
+    protected getNewCollateralObject(): OffchainCollateralV2;
+    protected getNewBorrowableObject(borrowable: Borrowable): OffchainBorrowableV2;
+    getNewAccountLendingPoolObject(account: OffchainAccount): OffchainAccountLendingPoolV2;
+}

package/lib/offchain/lendingPool/offchainLendingPoolV2.js

@@ -0,0 +1,22 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const types_1 = require("../../config/types");
+const offchainLendingPool_1 = __importDefault(require("./offchainLendingPool"));
+const offchainCollateralV2_1 = __importDefault(require("./offchainCollateralV2"));
+const offchainBorrowableV2_1 = __importDefault(require("./offchainBorrowableV2"));
+const offchainAccountLendingPoolV2_1 = __importDefault(require("../account/lendingPool/offchainAccountLendingPoolV2"));
+class OffchainLendingPoolV2 extends offchainLendingPool_1.default {
+    getNewCollateralObject() {
+        return new offchainCollateralV2_1.default(this);
+    }
+    getNewBorrowableObject(borrowable) {
+        return new offchainBorrowableV2_1.default(this, borrowable);
+    }
+    getNewAccountLendingPoolObject(account) {
+        return new offchainAccountLendingPoolV2_1.default(account, this);
+    }
+}
+exports.default = OffchainLendingPoolV2;

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

@@ -0,0 +1,21 @@
+import { Borrowable } from "../../config/types";
+import OffchainCollateralV3 from "./offchainCollateralV3";
+import OffchainLendingPool from "./offchainLendingPool";
+import OffchainBorrowableV3 from "./offchainBorrowableV3";
+import OffchainAccount from "../account";
+import OffchainAccountLendingPoolV3 from "../account/lendingPool/offchainAccountLendingPoolV3";
+export default class OffchainLendingPoolV3 extends OffchainLendingPool {
+    protected readonly collateral: OffchainCollateralV3;
+    protected readonly borrowables: {
+        [Borrowable.A]: OffchainBorrowableV3;
+        [Borrowable.B]: OffchainBorrowableV3;
+    };
+    protected getNewCollateralObject(): OffchainCollateralV3;
+    protected getNewBorrowableObject(borrowable: Borrowable): OffchainBorrowableV3;
+    getNewAccountLendingPoolObject(account: OffchainAccount): OffchainAccountLendingPoolV3;
+    getBorrowable: (borrowable: Borrowable) => OffchainBorrowableV3;
+    getBorrowableA: () => OffchainBorrowableV3;
+    getBorrowableB: () => OffchainBorrowableV3;
+    getCollateral: () => OffchainCollateralV3;
+    getNftlp: () => import("./nftlp").OffchainNftlp;
+}

package/lib/offchain/lendingPool/offchainLendingPoolV3.js

@@ -0,0 +1,31 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const types_1 = require("../../config/types");
+const offchainCollateralV3_1 = __importDefault(require("./offchainCollateralV3"));
+const offchainLendingPool_1 = __importDefault(require("./offchainLendingPool"));
+const offchainBorrowableV3_1 = __importDefault(require("./offchainBorrowableV3"));
+const offchainAccountLendingPoolV3_1 = __importDefault(require("../account/lendingPool/offchainAccountLendingPoolV3"));
+class OffchainLendingPoolV3 extends offchainLendingPool_1.default {
+    constructor() {
+        super(...arguments);
+        // Shortcuts
+        this.getBorrowable = (borrowable) => this.borrowables[borrowable];
+        this.getBorrowableA = () => this.getBorrowable(types_1.Borrowable.A);
+        this.getBorrowableB = () => this.getBorrowable(types_1.Borrowable.B);
+        this.getCollateral = () => this.collateral;
+        this.getNftlp = () => this.collateral.getNftlp();
+    }
+    getNewCollateralObject() {
+        return new offchainCollateralV3_1.default(this);
+    }
+    getNewBorrowableObject(borrowable) {
+        return new offchainBorrowableV3_1.default(this, borrowable);
+    }
+    getNewAccountLendingPoolObject(account) {
+        return new offchainAccountLendingPoolV3_1.default(account, this);
+    }
+}
+exports.default = OffchainLendingPoolV3;

package/lib/offchain/offchainEndpointManager.js

@@ -46,6 +46,8 @@ class OffchainEndpointManager {
                 endpoint,
                 query: queryBuilder(queries_1.QueryBuilderFactory.getQuery(endpoint)),
             }));
+            // An alternative here would be to use `Promise.any` and forget about endpoint block...
+            // Promise.any will race all endpoints passed and return the first one that is fullfilled.
             const endpointResults = yield Promise.allSettled(endpointQueries.map(eq => this.fetchFromEndpoint(eq)));
             // If one endpoint breaks then it shouldnt break, filter it out and report
             const responses = endpointResults

package/lib/offchain/offchainInitializer.js

@@ -17,7 +17,8 @@ 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");
 const queries_1 = require("./queries");
-const lendingPool_1 = __importDefault(require("./lendingPool"));
+const offchainLendingPoolV2_1 = __importDefault(require("./lendingPool/offchainLendingPoolV2"));
+const offchainLendingPoolV3_1 = __importDefault(require("./lendingPool/offchainLendingPoolV3"));
 const subgraphs_1 = require("../config/subgraphs");
 const types_1 = require("../config/types");
 const amms_1 = require("../config/amms");
@@ -377,7 +378,10 @@ 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);
+                const isV2 = Number(factory) < 8;
+                this.lendingPools[factory][lendingPool.id] = isV2 ?
+                    new offchainLendingPoolV2_1.default(this, factory, lendingPool.id)
+                    : new offchainLendingPoolV3_1.default(this, factory, lendingPool.id);
             }
         }
         // Quickfix for MIM and SPELL
@@ -613,7 +617,7 @@ function initializeUserData(account) {
             for (const supplyPositions of rawUserData.supplyPositions) {
                 const uniswapV2PairAddress = supplyPositions.borrowable.lendingPool.id;
                 const underlyingAddress = supplyPositions.borrowable.underlying.id;
-                const borrowableA = (yield this.getLendingPool(factory, uniswapV2PairAddress)).getPoolToken(types_1.PoolTokenType.BorrowableA);
+                const borrowableA = (yield this.getLendingPool(factory, uniswapV2PairAddress)).getBorrowableA();
                 const addressA = yield borrowableA.getUnderlyingAddress();
                 const poolTokenType = underlyingAddress === addressA
                     ? types_1.PoolTokenType.BorrowableA
@@ -627,8 +631,8 @@ function initializeUserData(account) {
             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 borrowableB = (yield this.getLendingPool(factory, uniswapV2PairAddress)).getBorrowableB();
+                const addressA = yield borrowableB.getUnderlyingAddress();
                 const poolTokenType = underlyingAddress === addressA
                     ? types_1.PoolTokenType.BorrowableA
                     : types_1.PoolTokenType.BorrowableB;

package/lib/offchain/offchainPriceHelper.js

@@ -164,8 +164,10 @@ class OffchainPriceHelper {
                     const lendingPool = lendingPoolsData[factory][id];
                     this.addPriceIfMissing(offchainTokenPrice, lendingPool.borrowable0.underlying);
                     this.addPriceIfMissing(offchainTokenPrice, lendingPool.borrowable1.underlying);
-                    for (const reward of lendingPool.pair.rewards) {
-                        this.addPriceIfMissing(offchainTokenPrice, reward.rewardsToken);
+                    if (lendingPool.pair.rewards) {
+                        for (const reward of lendingPool.pair.rewards) {
+                            this.addPriceIfMissing(offchainTokenPrice, reward.rewardsToken);
+                        }
                     }
                 }
             }

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

@@ -34,17 +34,6 @@ class PonderQueryBuilder {
       name
       decimals
       derivedUSD
-    }`;
-        const distributorStr = `{ 
-      id 
-    }`;
-        const farmingPoolStr = `{
-      epochAmount
-      epochBegin
-      segmentLength
-      vestingBegin
-      sharePercentage
-      distributor ${distributorStr}
     }`;
         const borrowableStr = `{
       id
@@ -60,7 +49,6 @@ class PonderQueryBuilder {
       accrualTimestamp 
       exchangeRate 
       borrowTracker
-      farmingPool ${farmingPoolStr}
     }`;
         const collateralStr = `{
       id
@@ -74,14 +62,6 @@ class PonderQueryBuilder {
       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) `{

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

@@ -1,9 +1,9 @@
 import Offchain from "../index";
 import { Address } from '../../config/types';
 import OffchainVault from "./offchainVault";
-import OffchainLendingPool from "../lendingPool";
+import OffchainLendingPoolV2 from "../lendingPool/offchainLendingPoolV2";
 export default class OffchainHedgedVaultVault extends OffchainVault {
     constructor(offchain: Offchain, vaultAddress: Address);
     getLeverage(): Promise<number>;
-    getPair(): Promise<OffchainLendingPool>;
+    getPair(): Promise<OffchainLendingPoolV2>;
 }

package/lib/offchain/vault/offchainHedgedVault.js

@@ -14,7 +14,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const types_1 = require("../../config/types");
 const offchainVault_1 = __importDefault(require("./offchainVault"));
-const lendingPool_1 = __importDefault(require("../lendingPool"));
+const offchainLendingPoolV2_1 = __importDefault(require("../lendingPool/offchainLendingPoolV2"));
 class OffchainHedgedVaultVault extends offchainVault_1.default {
     constructor(offchain, vaultAddress) {
         super(offchain, vaultAddress);
@@ -27,7 +27,7 @@ class OffchainHedgedVaultVault extends offchainVault_1.default {
     }
     getPair() {
         return __awaiter(this, void 0, void 0, function* () {
-            return new lendingPool_1.default(this.getOffchain(), types_1.Factory.V2V2, "0x");
+            return new offchainLendingPoolV2_1.default(this.getOffchain(), types_1.Factory.V2V2, "0x");
         });
     }
 }

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

@@ -1,9 +1,9 @@
 import Offchain from "../index";
 import { Address } from '../../config/types';
 import OffchainVault from "./offchainVault";
-import OffchainLendingPool from "../lendingPool";
+import OffchainLendingPoolV2 from "../lendingPool/offchainLendingPoolV2";
 export default class OffchainLeveragedVault extends OffchainVault {
     constructor(offchain: Offchain, vaultAddress: Address);
     getLeverage(): Promise<number>;
-    getPair(): Promise<OffchainLendingPool>;
+    getPair(): Promise<OffchainLendingPoolV2>;
 }

package/lib/offchain/vault/offchainLeveragedVault.js

@@ -14,7 +14,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const types_1 = require("../../config/types");
 const offchainVault_1 = __importDefault(require("./offchainVault"));
-const lendingPool_1 = __importDefault(require("../lendingPool"));
+const offchainLendingPoolV2_1 = __importDefault(require("../lendingPool/offchainLendingPoolV2"));
 class OffchainLeveragedVault extends offchainVault_1.default {
     constructor(offchain, vaultAddress) {
         super(offchain, vaultAddress);
@@ -27,7 +27,7 @@ class OffchainLeveragedVault extends offchainVault_1.default {
     }
     getPair() {
         return __awaiter(this, void 0, void 0, function* () {
-            return new lendingPool_1.default(this.getOffchain(), types_1.Factory.V2V2, "0x");
+            return new offchainLendingPoolV2_1.default(this.getOffchain(), types_1.Factory.V2V2, "0x");
         });
     }
 }

package/lib/onchain/account/lendingPool/onchainAccountCollateralV2.d.ts

@@ -1,5 +1,5 @@
 import OnchainAccountPoolToken from '../onchainAccountPoolToken';
-import OffchainAccountCollateral from '../../../offchain/account/lendingPool/offchainAccountCollateral';
+import OffchainAccountCollateralV2 from '../../../offchain/account/lendingPool/offchainAccountCollateralV2';
 import OnchainAccountCollateral from "./onchainAccountCollateral";
 import { OnchainCollateralV2 } from "../../impermaxFactory/lendingPool";
 import OnchainAccountLendingPoolV2 from "./onchainAccountLendingPoolV2";
@@ -15,8 +15,8 @@ export default class OnchainAccountCollateralV2 extends OnchainAccountPoolToken
     getAccount: () => import("..").default;
     getInteractionsPoolToken(): OnchainInteractionsCollateralV2;
     getInteractionsCollateral: () => OnchainInteractionsCollateralV2;
-    getOffchainAccountPoolToken(): Promise<OffchainAccountCollateral>;
-    getOffchainAccountCollateral: () => Promise<OffchainAccountCollateral>;
+    getOffchainAccountPoolToken(): Promise<OffchainAccountCollateralV2>;
+    getOffchainAccountCollateral: () => Promise<OffchainAccountCollateralV2>;
     cleanCache(): void;
     fixStakedLPExchangeRate(n: Promise<number>): Promise<number>;
     getAvailableBalanceUSD(): Promise<number>;

package/lib/onchain/impermaxFactory/lendingPool/onchainCollateralV2.d.ts

@@ -1,6 +1,6 @@
 import { Contract } from "../../onchainTypes";
 import OnchainPoolToken from '../../onchainPoolToken';
-import OffchainCollateral from '../../../offchain/lendingPool/offchainCollateral';
+import OffchainCollateralV2 from '../../../offchain/lendingPool/offchainCollateralV2';
 import OnchainCollateral from "./onchainCollateral";
 import OnchainLendingPoolV2 from "./onchainLendingPoolV2";
 export default class OnchainCollateralV2 extends OnchainPoolToken implements OnchainCollateral {
@@ -11,9 +11,9 @@ export default class OnchainCollateralV2 extends OnchainPoolToken implements Onc
     cleanCache(): void;
     private getContractHelper;
     getCollateralAddress: () => Promise<string>;
-    getOffchainCollateral(): Promise<OffchainCollateral>;
+    getOffchainCollateral(): Promise<OffchainCollateralV2>;
     getPoolTokenAddress: () => Promise<string>;
-    getOffchainPoolToken: () => Promise<OffchainCollateral>;
+    getOffchainPoolToken: () => Promise<OffchainCollateralV2>;
     protected initializePoolToken(): Promise<Contract>;
     protected initializeToken(): Promise<Contract>;
     protected initializeExchangeRate(): Promise<number>;

package/package.json

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