impermax-sdk 2.1.64 → 2.1.69

package/lib/config/private-api.js

@@ -59,6 +59,8 @@ exports.IMPERMAX_VAULT_API = {
     [types_1.Networks.Blast]: {
         [types_1.VaultType.LENDING]: "https://blast-lendingvaults-production.up.railway.app/vaults/"
     },
-    [types_1.Networks.Sonic]: {},
+    [types_1.Networks.Sonic]: {
+        [types_1.VaultType.LENDING]: "https://sonic-lendingvaults-production.up.railway.app/vaults/"
+    },
 };
 // Add more here

package/lib/offchain/account/offchainMultichainAccount.d.ts

@@ -15,9 +15,15 @@ export declare enum SupplyPositionsOrderBy {
 export declare enum VaultPositionsOrderBy {
     TVL = 0
 }
+export declare enum BorrowPositionsOrderBy {
+    TVL = 0
+}
 export interface SupplyPositionsParams {
     networks?: Array<Networks>;
 }
+export interface BorrowPositionsParams {
+    networks?: Array<Networks>;
+}
 export interface VaultPositionsParams {
     networks?: Array<Networks>;
 }
@@ -47,6 +53,7 @@ export default class OffchainMultichainAccount {
     getOffchainAccount(network: Networks): OffchainAccount;
     getLeveragedPositions(params?: LeveragedPositionsParams, orderBy?: LeveragedPositionsOrderBy): Promise<Array<OffchainLeveragedPosition>>;
     getSupplyPositions(params?: SupplyPositionsParams, orderBy?: SupplyPositionsOrderBy): Promise<Array<OffchainAccountLendingPool>>;
+    getBorrowPositions(params?: BorrowPositionsParams, orderBy?: BorrowPositionsOrderBy): Promise<Array<OffchainAccountLendingPool>>;
     getVaultPositions(params?: VaultPositionsParams, orderBy?: VaultPositionsOrderBy): Promise<Array<OffchainAccountVault>>;
     getTopPositions(params?: TopPositionsParams): Promise<Array<AccountPosition>>;
     getTotalBalanceUSD(): Promise<number>;

package/lib/offchain/account/offchainMultichainAccount.js

@@ -9,7 +9,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.PositionType = exports.VaultPositionsOrderBy = exports.SupplyPositionsOrderBy = exports.LeveragedPositionsOrderBy = void 0;
+exports.PositionType = exports.BorrowPositionsOrderBy = exports.VaultPositionsOrderBy = exports.SupplyPositionsOrderBy = exports.LeveragedPositionsOrderBy = void 0;
 const types_1 = require("../../config/types");
 var LeveragedPositionsOrderBy;
 (function (LeveragedPositionsOrderBy) {
@@ -23,6 +23,10 @@ var VaultPositionsOrderBy;
 (function (VaultPositionsOrderBy) {
     VaultPositionsOrderBy[VaultPositionsOrderBy["TVL"] = 0] = "TVL";
 })(VaultPositionsOrderBy = exports.VaultPositionsOrderBy || (exports.VaultPositionsOrderBy = {}));
+var BorrowPositionsOrderBy;
+(function (BorrowPositionsOrderBy) {
+    BorrowPositionsOrderBy[BorrowPositionsOrderBy["TVL"] = 0] = "TVL";
+})(BorrowPositionsOrderBy = exports.BorrowPositionsOrderBy || (exports.BorrowPositionsOrderBy = {}));
 var PositionType;
 (function (PositionType) {
     PositionType["MARKET"] = "Market";
@@ -75,6 +79,32 @@ class OffchainMultichainAccount {
             return results.flat();
         });
     }
+    // NOTE: Should this return OffchainCollateral?
+    getBorrowPositions(params = {}, orderBy = BorrowPositionsOrderBy.TVL) {
+        var _a;
+        return __awaiter(this, void 0, void 0, function* () {
+            const allNetworks = (_a = params.networks) !== null && _a !== void 0 ? _a : Object.values(types_1.Networks);
+            // Get user supply positions in each network
+            const networkPromises = allNetworks.map((network) => __awaiter(this, void 0, void 0, function* () {
+                const offchainAccount = this.getOffchainAccount(network);
+                const userData = yield offchainAccount.getUserData();
+                if (!userData)
+                    return [];
+                const positions = [];
+                // Get network positions in each factory
+                const borrowPositions = yield offchainAccount.getBorrowPositions();
+                for (const factory in borrowPositions) {
+                    const poolsOfFactory = borrowPositions[factory];
+                    for (const poolAddress of poolsOfFactory) {
+                        positions.push(offchainAccount.getLendingPool(factory, poolAddress));
+                    }
+                }
+                return Promise.all(positions);
+            }));
+            const results = yield Promise.all(networkPromises);
+            return results.flat();
+        });
+    }
     getVaultPositions(params = {}, orderBy = VaultPositionsOrderBy.TVL) {
         var _a;
         return __awaiter(this, void 0, void 0, function* () {

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

@@ -7,12 +7,7 @@ import OffchainAccountBorrowable from '../../../offchain/account/lendingPool/off
 export default abstract class OnchainAccountBorrowable extends OnchainAccountPoolToken {
     protected readonly lendingPool: OnchainAccountLendingPool;
     protected readonly poolToken: OnchainBorrowable;
-    protected borrowableCache: {
-        borrowed?: Promise<number>;
-        farmingShares?: Promise<number>;
-        availableFarmingReward?: Promise<number>;
-        availableRewarderReward?: Promise<number>;
-    };
+    protected borrowableCache: {};
     constructor(lendingPool: OnchainAccountLendingPool, borrowable: Borrowable);
     getLendingPool: () => OnchainAccountLendingPool;
     getPoolToken: () => OnchainBorrowable;
@@ -26,14 +21,4 @@ export default abstract class OnchainAccountBorrowable extends OnchainAccountPoo
     getSupplyAPR: () => Promise<number>;
     getBorrowRate: () => Promise<number>;
     getAccrualTimestamp: () => Promise<number>;
-    private initializeBorrowed;
-    getBorrowed(): Promise<number>;
-    getBorrowedUSD(): Promise<number>;
-    abstract getMaxBorrowable(): Promise<number>;
-    private initializeFarmingShares;
-    getFarmingShares(): Promise<number>;
-    private initializeAvailableFarmingReward;
-    getAvailableFarmingReward(): Promise<number>;
-    private initializeAvailableRewarderReward;
-    getAvailableRewarderReward(): Promise<number>;
 }

package/lib/onchain/account/lendingPool/onchainAccountBorrowable.js

@@ -43,89 +43,5 @@ class OnchainAccountBorrowable extends onchainAccountPoolToken_1.default {
         super.cleanCache();
         this.borrowableCache = {};
     }
-    // Borrowed
-    initializeBorrowed() {
-        return __awaiter(this, void 0, void 0, function* () {
-            const borrowable = yield this.poolToken.getPoolToken();
-            const balance = yield borrowable.methods.borrowBalance(this.getAccountAddress()).call();
-            const storedAmount = yield yield this.poolToken.normalize(balance);
-            const accrualTimestamp = yield this.getAccrualTimestamp();
-            const borrowRate = yield this.getBorrowRate();
-            return storedAmount * (1 + (Date.now() / 1000 - accrualTimestamp) * borrowRate);
-        });
-    }
-    getBorrowed() {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (!this.borrowableCache.borrowed)
-                this.borrowableCache.borrowed = this.initializeBorrowed();
-            return this.borrowableCache.borrowed;
-        });
-    }
-    getBorrowedUSD() {
-        return __awaiter(this, void 0, void 0, function* () {
-            const borrowed = yield this.getBorrowed();
-            const tokenPrice = yield this.getTokenPriceAccurate();
-            return borrowed * tokenPrice;
-        });
-    }
-    // Farming Shares
-    initializeFarmingShares() {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (!(yield this.poolToken.hasImpermaxChef()))
-                return 0;
-            return (yield this.poolToken.getImpermaxChef().methods.userInfo(yield this.poolToken.getPoolTokenAddress(), this.getAccountAddress()).call()).shares;
-        });
-    }
-    getFarmingShares() {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (!this.borrowableCache.farmingShares)
-                this.borrowableCache.farmingShares = this.initializeFarmingShares();
-            return this.borrowableCache.farmingShares;
-        });
-    }
-    // Available Reward
-    initializeAvailableFarmingReward() {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (!(yield this.poolToken.hasImpermaxChef()))
-                return 0;
-            const borrowableAddress = yield this.poolToken.getPoolTokenAddress();
-            try {
-                return (yield this.poolToken.getImpermaxChef().methods.pendingReward(borrowableAddress, this.getAccountAddress()).call()) / 1e18;
-            }
-            catch (_a) {
-                console.log("Warning: pending reward negative");
-                return 0;
-            }
-        });
-    }
-    getAvailableFarmingReward() {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (!this.borrowableCache.availableFarmingReward)
-                this.borrowableCache.availableFarmingReward = this.initializeAvailableFarmingReward();
-            return this.borrowableCache.availableFarmingReward;
-        });
-    }
-    initializeAvailableRewarderReward() {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (!(yield this.poolToken.hasRewarder()))
-                return 0;
-            const borrowableAddress = yield this.poolToken.getPoolTokenAddress();
-            const rewarder = yield this.poolToken.getRewarder();
-            try {
-                return (yield rewarder.methods.pendingReward(borrowableAddress, this.getAccountAddress()).call()) / 1e18;
-            }
-            catch (_a) {
-                console.log("Warning: pending reward negative");
-                return 0;
-            }
-        });
-    }
-    getAvailableRewarderReward() {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (!this.borrowableCache.availableRewarderReward)
-                this.borrowableCache.availableRewarderReward = this.initializeAvailableRewarderReward();
-            return this.borrowableCache.availableRewarderReward;
-        });
-    }
 }
 exports.default = OnchainAccountBorrowable;

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

@@ -4,7 +4,22 @@ import { OnchainBorrowableV2 } from "../../impermaxFactory/lendingPool";
 export default class OnchainAccountBorrowableV2 extends OnchainAccountBorrowable {
     protected readonly lendingPool: OnchainAccountLendingPoolV2;
     protected readonly poolToken: OnchainBorrowableV2;
+    protected borrowableCache: {
+        borrowed?: Promise<number>;
+        farmingShares?: Promise<number>;
+        availableFarmingReward?: Promise<number>;
+        availableRewarderReward?: Promise<number>;
+    };
     getLendingPool: () => OnchainAccountLendingPoolV2;
     getPoolToken: () => OnchainBorrowableV2;
+    private initializeBorrowed;
+    getBorrowed(): Promise<number>;
+    getBorrowedUSD(): Promise<number>;
     getMaxBorrowable(): Promise<number>;
+    private initializeFarmingShares;
+    getFarmingShares(): Promise<number>;
+    private initializeAvailableFarmingReward;
+    getAvailableFarmingReward(): Promise<number>;
+    private initializeAvailableRewarderReward;
+    getAvailableRewarderReward(): Promise<number>;
 }

package/lib/onchain/account/lendingPool/onchainAccountBorrowableV2.js

@@ -17,9 +17,35 @@ const onchainAccountBorrowable_1 = __importDefault(require("./onchainAccountBorr
 class OnchainAccountBorrowableV2 extends onchainAccountBorrowable_1.default {
     constructor() {
         super(...arguments);
+        this.borrowableCache = {};
         this.getLendingPool = () => this.lendingPool;
         this.getPoolToken = () => this.poolToken;
     }
+    // Borrowed
+    initializeBorrowed() {
+        return __awaiter(this, void 0, void 0, function* () {
+            const borrowable = yield this.poolToken.getPoolToken();
+            const balance = yield borrowable.methods.borrowBalance(this.getAccountAddress()).call();
+            const storedAmount = yield yield this.poolToken.normalize(balance);
+            const accrualTimestamp = yield this.getAccrualTimestamp();
+            const borrowRate = yield this.getBorrowRate();
+            return storedAmount * (1 + (Date.now() / 1000 - accrualTimestamp) * borrowRate);
+        });
+    }
+    getBorrowed() {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (!this.borrowableCache.borrowed)
+                this.borrowableCache.borrowed = this.initializeBorrowed();
+            return this.borrowableCache.borrowed;
+        });
+    }
+    getBorrowedUSD() {
+        return __awaiter(this, void 0, void 0, function* () {
+            const borrowed = yield this.getBorrowed();
+            const tokenPrice = yield this.getTokenPriceAccurate();
+            return borrowed * tokenPrice;
+        });
+    }
     // Max OffchainBorrowable
     // binary search approach
     getMaxBorrowable() {
@@ -51,5 +77,64 @@ class OnchainAccountBorrowableV2 extends onchainAccountBorrowable_1.default {
             return bestAmount;
         });
     }
+    // Farming Shares
+    initializeFarmingShares() {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (!(yield this.poolToken.hasImpermaxChef()))
+                return 0;
+            return (yield this.poolToken.getImpermaxChef().methods.userInfo(yield this.poolToken.getPoolTokenAddress(), this.getAccountAddress()).call()).shares;
+        });
+    }
+    getFarmingShares() {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (!this.borrowableCache.farmingShares)
+                this.borrowableCache.farmingShares = this.initializeFarmingShares();
+            return this.borrowableCache.farmingShares;
+        });
+    }
+    // Available Reward
+    initializeAvailableFarmingReward() {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (!(yield this.poolToken.hasImpermaxChef()))
+                return 0;
+            const borrowableAddress = yield this.poolToken.getPoolTokenAddress();
+            try {
+                return (yield this.poolToken.getImpermaxChef().methods.pendingReward(borrowableAddress, this.getAccountAddress()).call()) / 1e18;
+            }
+            catch (_a) {
+                console.log("Warning: pending reward negative");
+                return 0;
+            }
+        });
+    }
+    getAvailableFarmingReward() {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (!this.borrowableCache.availableFarmingReward)
+                this.borrowableCache.availableFarmingReward = this.initializeAvailableFarmingReward();
+            return this.borrowableCache.availableFarmingReward;
+        });
+    }
+    initializeAvailableRewarderReward() {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (!(yield this.poolToken.hasRewarder()))
+                return 0;
+            const borrowableAddress = yield this.poolToken.getPoolTokenAddress();
+            const rewarder = yield this.poolToken.getRewarder();
+            try {
+                return (yield rewarder.methods.pendingReward(borrowableAddress, this.getAccountAddress()).call()) / 1e18;
+            }
+            catch (_a) {
+                console.log("Warning: pending reward negative");
+                return 0;
+            }
+        });
+    }
+    getAvailableRewarderReward() {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (!this.borrowableCache.availableRewarderReward)
+                this.borrowableCache.availableRewarderReward = this.initializeAvailableRewarderReward();
+            return this.borrowableCache.availableRewarderReward;
+        });
+    }
 }
 exports.default = OnchainAccountBorrowableV2;

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

@@ -4,7 +4,14 @@ import OnchainAccountLendingPoolV3 from "./onchainAccountLendingPoolV3";
 export default class OnchainAccountBorrowableV3 extends OnchainAccountBorrowable {
     protected readonly lendingPool: OnchainAccountLendingPoolV3;
     protected readonly poolToken: OnchainBorrowableV3;
+    protected borrowableCache: {
+        borrowed?: {
+            [keys in number]: Promise<number>;
+        };
+    };
     getLendingPool: () => OnchainAccountLendingPoolV3;
     getPoolToken: () => OnchainBorrowableV3;
-    getMaxBorrowable(): Promise<number>;
+    private initializeBorrowed;
+    getBorrowed(tokenId: number): Promise<number>;
+    getBorrowedUSD(tokenId: number): Promise<number>;
 }

package/lib/onchain/account/lendingPool/onchainAccountBorrowableV3.js

@@ -16,12 +16,32 @@ const onchainAccountBorrowable_1 = __importDefault(require("./onchainAccountBorr
 class OnchainAccountBorrowableV3 extends onchainAccountBorrowable_1.default {
     constructor() {
         super(...arguments);
+        this.borrowableCache = {};
         this.getLendingPool = () => this.lendingPool;
         this.getPoolToken = () => this.poolToken;
     }
-    getMaxBorrowable() {
+    // Borrowed
+    initializeBorrowed(tokenId) {
         return __awaiter(this, void 0, void 0, function* () {
-            return 0;
+            const borrowable = yield this.poolToken.getPoolToken();
+            const balance = yield borrowable.methods.currentBorrowBalance(tokenId).call();
+            return this.poolToken.normalize(balance);
+        });
+    }
+    getBorrowed(tokenId) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (!this.borrowableCache.borrowed)
+                this.borrowableCache.borrowed = {};
+            if (!this.borrowableCache.borrowed[tokenId])
+                this.borrowableCache.borrowed[tokenId] = this.initializeBorrowed(tokenId);
+            return this.borrowableCache.borrowed[tokenId];
+        });
+    }
+    getBorrowedUSD(tokenId) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const borrowed = yield this.getBorrowed(tokenId);
+            const tokenPrice = yield this.getTokenPriceAccurate();
+            return borrowed * tokenPrice;
         });
     }
 }

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

@@ -6,5 +6,4 @@ export default abstract class OnchainAccountCollateral {
     getAccount: () => import("..").default;
     getInteractionsCollateral(): import("../../..").OnchainInteractionsCollateral;
     getOffchainAccountCollateral(): Promise<OffchainAccountCollateral>;
-    abstract getDepositedUSD(): Promise<number>;
 }

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

@@ -17,5 +17,5 @@ export default class OnchainAccountCollateralV3 extends OnchainAccountCollateral
     getInteractionsCollateral(): OnchainInteractionsCollateralV3;
     getOffchainAccountCollateral(): Promise<OffchainAccountCollateral>;
     cleanCache(): void;
-    getDepositedUSD(): Promise<number>;
+    getDepositedUSD(tokenId: number): Promise<number>;
 }

package/lib/onchain/account/lendingPool/onchainAccountCollateralV3.js

@@ -37,7 +37,7 @@ class OnchainAccountCollateralV3 extends onchainAccountCollateral_1.default {
     cleanCache() {
         this.collateralCache = {};
     }
-    getDepositedUSD() {
+    getDepositedUSD(tokenId) {
         return __awaiter(this, void 0, void 0, function* () {
             return 0;
         });

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

@@ -2,7 +2,6 @@ import OnchainAccount from '../index';
 import { Borrowable } from '../../../config/types';
 import OnchainAccountCollateral from './onchainAccountCollateral';
 import OnchainAccountBorrowable from './onchainAccountBorrowable';
-import { PendingRewardUI } from '../../onchainTypes';
 import OnchainLendingPool from '../../impermaxFactory/lendingPool';
 import OnchainInteractionsLendingPool from '../../interactions/lendingPool';
 import OffchainAccountLendingPool from '../../../offchain/account/lendingPool';
@@ -32,11 +31,6 @@ export default abstract class OnchainAccountLendingPool {
     getUiMargin: () => number;
     getInteractionsLendingPool(): OnchainInteractionsLendingPool;
     getOffchainAccountLendingPool(): Promise<OffchainAccountLendingPool>;
-    getBalanceUSD(): Promise<number>;
     getSuppliedUSD(): Promise<number>;
-    getDebtUSD(): Promise<number>;
-    getEquityUSD(): Promise<number>;
-    getLPEquityUSD(): Promise<number>;
     getAccountAPR(): Promise<number>;
-    getAvailableReward(): Promise<PendingRewardUI[]>;
 }

package/lib/onchain/account/lendingPool/onchainAccountLendingPool.js

@@ -45,15 +45,6 @@ class OnchainAccountLendingPool {
     getOffchainAccountLendingPool() {
         return this.account.getOffchainAccount().getLendingPool(this.getFactory(), this.getId());
     }
-    // Balance
-    getBalanceUSD() {
-        return __awaiter(this, void 0, void 0, function* () {
-            const depositedAUSD = yield this.getBorrowableA().getDepositedUSD();
-            const depositedBUSD = yield this.getBorrowableB().getDepositedUSD();
-            const depositedCUSD = yield this.getCollateral().getDepositedUSD();
-            return depositedAUSD + depositedBUSD + depositedCUSD;
-        });
-    }
     // Supplied
     getSuppliedUSD() {
         return __awaiter(this, void 0, void 0, function* () {
@@ -62,29 +53,6 @@ class OnchainAccountLendingPool {
             return depositedAUSD + depositedBUSD;
         });
     }
-    // Debt
-    getDebtUSD() {
-        return __awaiter(this, void 0, void 0, function* () {
-            const borrowedAUSD = yield this.getBorrowableA().getBorrowedUSD();
-            const borrowedBUSD = yield this.getBorrowableB().getBorrowedUSD();
-            return borrowedAUSD + borrowedBUSD;
-        });
-    }
-    // Equity
-    getEquityUSD() {
-        return __awaiter(this, void 0, void 0, function* () {
-            const balanceUSD = yield this.getBalanceUSD();
-            const debtUSD = yield this.getDebtUSD();
-            return balanceUSD - debtUSD;
-        });
-    }
-    getLPEquityUSD() {
-        return __awaiter(this, void 0, void 0, function* () {
-            const collateralUSD = yield this.getCollateral().getDepositedUSD();
-            const debtUSD = yield this.getDebtUSD();
-            return collateralUSD - debtUSD;
-        });
-    }
     // APR
     getAccountAPR() {
         return __awaiter(this, void 0, void 0, function* () {
@@ -96,47 +64,5 @@ class OnchainAccountLendingPool {
             return totalSupplied > 0 ? (depositedAUSD * supplyAPRA + depositedBUSD * supplyAPRB) / totalSupplied : 0;
         });
     }
-    // Available Reward
-    getAvailableReward() {
-        return __awaiter(this, void 0, void 0, function* () {
-            const result = [];
-            const farmingAmount = (yield this.getBorrowableA().getAvailableFarmingReward()) + (yield this.getBorrowableB().getAvailableFarmingReward());
-            if (farmingAmount > 0) {
-                const farmingSymbol = yield this.getBorrowableA().getPoolToken().getFarmingTokenSymbol();
-                result.push({
-                    symbol: farmingSymbol,
-                    amount: farmingAmount
-                });
-            }
-            const rewarderSymbols = [
-                yield this.getBorrowableA().getPoolToken().getRewarderTokenSymbol(),
-                yield this.getBorrowableB().getPoolToken().getRewarderTokenSymbol()
-            ];
-            const rewarderAmounts = [
-                yield this.getBorrowableA().getAvailableRewarderReward(),
-                yield this.getBorrowableB().getAvailableRewarderReward()
-            ];
-            if (rewarderSymbols[0] === rewarderSymbols[1]) {
-                const rewarderAmount = rewarderAmounts[0] + rewarderAmounts[1];
-                if (rewarderAmount === 0)
-                    return result;
-                result.push({
-                    symbol: rewarderSymbols[0],
-                    amount: rewarderAmount
-                });
-            }
-            else {
-                for (let i = 0; i < 2; i++) {
-                    if (rewarderAmounts[i] === 0)
-                        continue;
-                    result.push({
-                        symbol: rewarderSymbols[i],
-                        amount: rewarderAmounts[i]
-                    });
-                }
-            }
-            return result;
-        });
-    }
 }
 exports.default = OnchainAccountLendingPool;

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

@@ -20,6 +20,10 @@ export default class OnchainAccountLendingPoolV2 extends OnchainAccountLendingPo
     getBorrowableB: () => OnchainAccountBorrowableV2;
     getCollateral: () => OnchainAccountCollateralV2;
     getInteractionsLendingPool(): OnchainInteractionsLendingPoolV2;
+    getBalanceUSD(): Promise<number>;
+    getDebtUSD(): Promise<number>;
+    getEquityUSD(): Promise<number>;
+    getLPEquityUSD(): Promise<number>;
     getLPEquity(): Promise<number>;
     getValuesFromPrice(changes: Changes, priceA: number, priceB: number): Promise<{
         valueCollateral: number;

package/lib/onchain/account/lendingPool/onchainAccountLendingPoolV2.js

@@ -39,6 +39,38 @@ class OnchainAccountLendingPoolV2 extends onchainAccountLendingPool_1.default {
     getInteractionsLendingPool() {
         return this.account.getInteractions().getLendingPool(this.getFactory(), this.getId());
     }
+    // Balance
+    getBalanceUSD() {
+        return __awaiter(this, void 0, void 0, function* () {
+            const depositedAUSD = yield this.getBorrowableA().getDepositedUSD();
+            const depositedBUSD = yield this.getBorrowableB().getDepositedUSD();
+            const depositedCUSD = yield this.getCollateral().getDepositedUSD();
+            return depositedAUSD + depositedBUSD + depositedCUSD;
+        });
+    }
+    // Debt
+    getDebtUSD() {
+        return __awaiter(this, void 0, void 0, function* () {
+            const borrowedAUSD = yield this.getBorrowableA().getBorrowedUSD();
+            const borrowedBUSD = yield this.getBorrowableB().getBorrowedUSD();
+            return borrowedAUSD + borrowedBUSD;
+        });
+    }
+    // Equity
+    getEquityUSD() {
+        return __awaiter(this, void 0, void 0, function* () {
+            const balanceUSD = yield this.getBalanceUSD();
+            const debtUSD = yield this.getDebtUSD();
+            return balanceUSD - debtUSD;
+        });
+    }
+    getLPEquityUSD() {
+        return __awaiter(this, void 0, void 0, function* () {
+            const collateralUSD = yield this.getCollateral().getDepositedUSD();
+            const debtUSD = yield this.getDebtUSD();
+            return collateralUSD - debtUSD;
+        });
+    }
     // LP equity number in LPs
     getLPEquity() {
         return __awaiter(this, void 0, void 0, function* () {

package/lib/onchain/account/onchainAccount.d.ts

@@ -1,8 +1,8 @@
 import OnChain from '../index';
-import { Address, Factory, FactoryIndex, LendingPoolIndex } from '../../config/types';
+import { Address, Factory } from '../../config/types';
 import OnchainAccountLendingPool from './lendingPool';
 import OnchainAccountLendingVault from './onchainAccountLendingVault';
-import { AirdropData, PendingRewardUI } from '../onchainTypes';
+import { AirdropData } from '../onchainTypes';
 export default class OnchainAccount {
     private readonly onchain;
     private readonly accountAddress;
@@ -19,7 +19,6 @@ export default class OnchainAccount {
     getLendingPool(factory: Factory, pair: Address): OnchainAccountLendingPool;
     private initializeLendingVault;
     getLendingVault(vaultAddress: Address): OnchainAccountLendingVault;
-    getMassAvailableReward(pairs: FactoryIndex<Address[]>): Promise<LendingPoolIndex<PendingRewardUI[]>>;
     private initializeAirdropData;
     private getAirdropData;
     getIbexAirdropData(): Promise<AirdropData>;

package/lib/onchain/account/onchainAccount.js

@@ -61,32 +61,30 @@ class OnchainAccount {
             this.lendingVaults[vaultAddress] = this.initializeLendingVault(vaultAddress);
         return this.lendingVaults[vaultAddress];
     }
+    /*
     // Mass Available Reward (only supports ImpermaxChef)
-    getMassAvailableReward(pairs) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const result = {};
-            if (!pairs)
-                return result;
-            const requests = [];
-            for (const factory in pairs) {
-                const requestsLocal = [];
-                for (const pairAddress of pairs[factory]) {
-                    requestsLocal.push((yield this.getLendingPool(factory, pairAddress)).getAvailableReward());
-                }
-                requests.push(Promise.all(requestsLocal));
-            }
-            const data = yield Promise.all(requests);
-            let i = 0;
-            for (const factory in pairs) {
-                result[factory] = {};
-                for (let j = 0; j < pairs[factory].length; j++) {
-                    result[factory][pairs[factory][j]] = data[i][j];
-                }
-                i++;
-            }
-            return result;
-        });
-    }
+    public async getMassAvailableReward(pairs: FactoryIndex<Address[]>) : Promise<LendingPoolIndex<PendingRewardUI[]>> {
+      const result: LendingPoolIndex<PendingRewardUI[]> = {};
+      if (!pairs) return result;
+      const requests: Array<Promise<PendingRewardUI[][]>> = [];
+      for (const factory in pairs) {
+        const requestsLocal: Promise<PendingRewardUI[]>[] = [];
+        for (const pairAddress of pairs[factory]) {
+          requestsLocal.push((await this.getLendingPool(factory as Factory, pairAddress)).getAvailableReward());
+        }
+        requests.push(Promise.all(requestsLocal));
+      }
+      const data = await Promise.all(requests);
+      let i = 0;
+      for (const factory in pairs) {
+        result[factory] = {};
+        for (let j = 0; j < pairs[factory].length; j++) {
+          result[factory][pairs[factory][j]] = data[i][j];
+        }
+        i++;
+      }
+      return result;
+    }*/
     // Airdrop Data
     initializeAirdropData(airdropURL, merkleDistributor) {
         return __awaiter(this, void 0, void 0, function* () {

package/lib/onchain/interactions/lendingPool/onchainInteractionsLendingPool.d.ts

@@ -27,5 +27,4 @@ export default abstract class OnchainInteractionsLendingPool {
     getAccountAddress: () => string;
     getAccountLendingPool(): OnchainAccountLendingPool;
     send: (method: any, onTransactionHash: Function) => Promise<any>;
-    trackBorrows(onTransactionHash: Function): Promise<any>;
 }

package/lib/onchain/interactions/lendingPool/onchainInteractionsLendingPool.js

@@ -1,13 +1,4 @@
 "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());
-    });
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 const types_1 = require("../../../config/types");
 class OnchainInteractionsLendingPool {
@@ -35,19 +26,5 @@ class OnchainInteractionsLendingPool {
     getAccountLendingPool() {
         return this.interactions.getAccount().getLendingPool(this.getFactory(), this.getId());
     }
-    trackBorrows(onTransactionHash) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const account = this.getAccountAddress();
-            const claimAggregator = this.interactions.getOnchain().getContractHelper().claimAggregator;
-            const toTrack = [];
-            const accountLendingPool = yield this.getAccountLendingPool();
-            for (const b of [accountLendingPool.getBorrowableA(), accountLendingPool.getBorrowableB()]) {
-                if ((yield b.getBorrowed()) === 0 || (yield b.getFarmingShares()) > 0)
-                    continue;
-                toTrack.push(yield b.getPoolToken().getPoolTokenAddress());
-            }
-            return this.send(claimAggregator.methods.trackBorrows(account, toTrack), onTransactionHash);
-        });
-    }
 }
 exports.default = OnchainInteractionsLendingPool;

package/lib/onchain/interactions/lendingPool/onchainInteractionsLendingPoolV2.d.ts

@@ -39,4 +39,5 @@ export default class OnchainInteractionsLendingPoolV2 extends OnchainInteraction
     }>;
     deleverage(tokens: BigNumber, amountAMin: BigNumber, amountBMin: BigNumber, permitData: PermitData, onTransactionHash: Function): Promise<any>;
     reinvest(onTransactionHash: Function): Promise<any>;
+    trackBorrows(onTransactionHash: Function): Promise<any>;
 }

package/lib/onchain/interactions/lendingPool/onchainInteractionsLendingPoolV2.js

@@ -110,5 +110,19 @@ class OnchainInteractionsLendingPoolV2 extends onchainInteractionsLendingPool_1.
             return this.send(stakedLPToken.methods.reinvest(), onTransactionHash);
         });
     }
+    trackBorrows(onTransactionHash) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const account = this.getAccountAddress();
+            const claimAggregator = this.interactions.getOnchain().getContractHelper().claimAggregator;
+            const toTrack = [];
+            const accountLendingPool = yield this.getAccountLendingPool();
+            for (const b of [accountLendingPool.getBorrowableA(), accountLendingPool.getBorrowableB()]) {
+                if ((yield b.getBorrowed()) === 0 || (yield b.getFarmingShares()) > 0)
+                    continue;
+                toTrack.push(yield b.getPoolToken().getPoolTokenAddress());
+            }
+            return this.send(claimAggregator.methods.trackBorrows(account, toTrack), onTransactionHash);
+        });
+    }
 }
 exports.default = OnchainInteractionsLendingPoolV2;

package/lib/onchain/interactions/onchainInteractions.d.ts

@@ -1,5 +1,5 @@
 import Onchain from '../index';
-import { Address, Factory, FactoryIndex } from '../../config/types';
+import { Address, Factory } from '../../config/types';
 import OnchainInteractionsLendingPool from './lendingPool';
 import OnchainInteractionsLendingVault from './onchainInteractionsLendingVault';
 import { AirdropData, Contract } from '../onchainTypes';
@@ -27,6 +27,5 @@ export default class OnchainInteractions {
     getDefaultRouterContract(): any;
     getPoolTokenRouter(): any;
     claimAirdrop(airdropData: AirdropData, merkleDistributor: Contract, onTransactionHash: Function): Promise<any>;
-    claims(pairAddresses: FactoryIndex<Address[]>, onTransactionHash: Function): Promise<any>;
     claimDistributor(claimableAddress: Address, onTransactionHash: Function): Promise<any>;
 }

package/lib/onchain/interactions/onchainInteractions.js

@@ -103,41 +103,45 @@ class OnchainInteractions {
             return this.send(merkleDistributor.methods.claim(airdropData.index, this.accountAddress, airdropData.amount, airdropData.proof), onTransactionHash);
         });
     }
-    claims(pairAddresses, onTransactionHash) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const requests = [];
-            for (const factory in pairAddresses) {
-                for (const pairAddress of pairAddresses[factory]) {
-                    const accountLendingPool = yield this.getAccount().getLendingPool(factory, pairAddress);
-                    for (const accountBorrowable of [
-                        accountLendingPool.getBorrowableA(),
-                        accountLendingPool.getBorrowableB(),
-                    ]) {
-                        requests.push((() => __awaiter(this, void 0, void 0, function* () {
-                            const borrowable = accountBorrowable.getPoolToken();
-                            const pendingReward = (yield accountBorrowable.getAvailableFarmingReward()) + (yield accountBorrowable.getAvailableRewarderReward());
-                            return {
-                                hasPendingReward: pendingReward > 0,
-                                hasImpermaxChef: yield borrowable.hasImpermaxChef(),
-                                borrowableAddress: yield borrowable.getPoolTokenAddress(),
-                            };
-                        }))());
-                    }
-                }
-            }
-            const data = yield Promise.all(requests);
-            const toClaim = [];
-            for (const borrowable of data) {
-                if (!borrowable.hasPendingReward)
-                    continue;
-                toClaim.push(borrowable.borrowableAddress);
-            }
-            if (toClaim.length > 0) {
-                const impermaxChef = this.onchain.getContractHelper().impermaxChef;
-                return this.send(impermaxChef.methods.massHarvest(toClaim, this.accountAddress), onTransactionHash);
-            }
-        });
-    }
+    /*
+    public async claims(pairAddresses: FactoryIndex<Address[]>, onTransactionHash: Function) {
+      const requests: Array<Promise<{
+        hasPendingReward: boolean,
+        hasImpermaxChef: boolean,
+        borrowableAddress: Address,
+      }>> = [];
+      for (const factory in pairAddresses) {
+        for (const pairAddress of pairAddresses[factory]) {
+          const accountLendingPool = await this.getAccount().getLendingPool(factory as Factory, pairAddress);
+          for (const accountBorrowable of [
+            accountLendingPool.getBorrowableA(),
+            accountLendingPool.getBorrowableB(),
+          ]) {
+            requests.push((async () => {
+              const borrowable = accountBorrowable.getPoolToken();
+              const pendingReward = await accountBorrowable.getAvailableFarmingReward() + await accountBorrowable.getAvailableRewarderReward();
+              return {
+                hasPendingReward: pendingReward > 0,
+                hasImpermaxChef: await borrowable.hasImpermaxChef(),
+                borrowableAddress: await borrowable.getPoolTokenAddress(),
+              }
+            })());
+          }
+        }
+      }
+      const data = await Promise.all(requests);
+  
+      const toClaim: Address[] = [];
+      for (const borrowable of data) {
+        if (!borrowable.hasPendingReward) continue;
+        toClaim.push(borrowable.borrowableAddress);
+      }
+  
+      if (toClaim.length > 0) {
+        const impermaxChef = this.onchain.getContractHelper().impermaxChef;
+        return this.send(impermaxChef.methods.massHarvest(toClaim, this.accountAddress), onTransactionHash);
+      }
+    }*/
     claimDistributor(claimableAddress, onTransactionHash) {
         return __awaiter(this, void 0, void 0, function* () {
             const claimable = this.onchain.getContractHelper().newClaimable(claimableAddress);

package/package.json

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