impermax-sdk 1.1.37 → 1.1.38

package/lib/index.d.ts

@@ -1,5 +1,5 @@
-import Offchain from './offchain';
-import Onchain from './onchain';
+import Offchain, { OffchainAccount, OffchainLendingPool, OffchainLendingVault, OffchainPoolToken, OffchainPriceHelper, OffchainSolidexHelper } from './offchain';
+import Onchain, { OnchainAccount, OnchainContractsHelper, OnchainImpermaxFactory, OnchainInteractions, OnchainLendingVault, OnchainPoolToken } from './onchain';
 import * as offchain from './offchain';
 import * as onchain from './onchain';
 import { CLAIM_AGGREGATOR } from './config/contracts/claim-aggregators';
@@ -18,6 +18,14 @@ import { FarmIndex, Farms, getFarmByStakedLPFactory, hrFarms, STAKED_LP_FACTORY
 import { APPROVE_AMOUNT, DEADLINE, NOT_SYNCED, ZERO } from './config/general';
 import { BLOCKS_SUBGRAPH_URL, IMPERMAX_CHEF_SUBGRAPH_URL, IMPERMAX_SUBGRAPH_URL, XIMX_SUBGRAPH_URL } from './config/subgraphs';
 import { Address, AddressIndex, AmmIndex, DistributorDetails, Factory, FactoryIndex, LendingPoolIndex, NetworkFactoryIndex, NetworkIndex, Networks, PoolTokenType } from './config/types';
-import { AirdropData, ApprovalType, Changes, Contract, OnchainConfig, NO_CHANGES, PendingRewardUI, PermitData, Values } from './onchain/types';
-import { BorrowableData, BorrowablePastData, BorrowPosition, CollateralData, CollateralPosition, FarmingPoolData, LendingPoolData, LendingPoolPastData, PairData, PoolTokenData, RewardData, SupplyPosition, TokenData, TvlData, UserData, XimxData } from './offchain/types';
-export { offchain, Offchain, PoolTokenData, BorrowableData, CollateralData, BorrowablePastData, TokenData, RewardData, PairData, FarmingPoolData, LendingPoolPastData, LendingPoolData, CollateralPosition, SupplyPosition, BorrowPosition, UserData, TvlData, XimxData, onchain, Onchain, Contract, ApprovalType, PermitData, OnchainConfig, Changes, NO_CHANGES, Values, AirdropData, PendingRewardUI, CLAIM_AGGREGATOR, IMPERMAX_CHEF, IMX, MERKLE_DISTRIBUTOR_IBEX, MERKLE_DISTRIBUTOR_IBEX_2, MERKLE_DISTRIBUTOR_ETH, ROUTER, SIMPLE_UNISWAP_ORACLE, WETH, MERKLE_URL_ETH, MERKLE_URL_IBEX, MERKLE_URL_IBEX_2, hrAmms, AMM_FACTORY, getAmmByFactory, AMM_SUBGRAPH_URLS, ADD_LIQUIDITY_URLS, AMM_LP_FEE, DEBANK_IDS, ETH_SYMBOL, ETH_NAME, SOLIDEX_FACTORIES, BORROW_FEE_FACTORIES, OLD_KINK_MULTIPLIER_FACTORIES, LIQUIDATION_FEE_FACTORIES, V2_FACTORIES, Farms, hrFarms, FarmIndex, STAKED_LP_FACTORY, getFarmByStakedLPFactory, NOT_SYNCED, DEADLINE, ZERO, APPROVE_AMOUNT, IMPERMAX_SUBGRAPH_URL, IMPERMAX_CHEF_SUBGRAPH_URL, BLOCKS_SUBGRAPH_URL, XIMX_SUBGRAPH_URL, Networks, Factory, PoolTokenType, Amms, Address, NetworkIndex, FactoryIndex, AddressIndex, NetworkFactoryIndex, LendingPoolIndex, AmmIndex, DistributorDetails, };
+import { AirdropData, ApprovalType, Changes, Contract, OnchainConfig, NO_CHANGES, PendingRewardUI, PermitData, Values } from './onchain/onchainTypes';
+import { BorrowableData, BorrowablePastData, BorrowPosition, CollateralData, CollateralPosition, FarmingPoolData, LendingPoolData, LendingPoolPastData, PairData, PoolTokenData, RewardData, SupplyPosition, TokenData, TvlData, UserData, XimxData } from './offchain/offchainTypes';
+import { OffchainBorrowable, OffchainCollateral } from './offchain/lendingPool';
+import OffchainAccountLendingPool, { OffchainAccountBorrowable, OffchainAccountCollateral } from './offchain/account/lendingPool';
+import { OffchainAccountLendingVault, OffchainAccountPoolToken } from './offchain/account';
+import OnchainLendingPool, { OnchainBorrowable, OnchainCollateral } from './onchain/impermaxFactory/lendingPool';
+import { OnchainAccountLendingPool, OnchainAccountLendingVault, OnchainAccountPoolToken } from './onchain/account';
+import { OnchainAccountBorrowable, OnchainAccountCollateral } from './onchain/account/lendingPool';
+import { OnchainInteractionsLendingPool, OnchainInteractionsLendingVault, OnchainInteractionsPoolToken } from './onchain/interactions';
+import { OnchainInteractionsBorrowable, OnchainInteractionsCollateral } from './onchain/interactions/lendingPool';
+export { offchain, Offchain, OffchainLendingPool, OffchainPoolToken, OffchainCollateral, OffchainBorrowable, OffchainLendingVault, OffchainAccount, OffchainAccountLendingPool, OffchainAccountPoolToken, OffchainAccountCollateral, OffchainAccountBorrowable, OffchainAccountLendingVault, OffchainPriceHelper, OffchainSolidexHelper, PoolTokenData, BorrowableData, CollateralData, BorrowablePastData, TokenData, RewardData, PairData, FarmingPoolData, LendingPoolPastData, LendingPoolData, CollateralPosition, SupplyPosition, BorrowPosition, UserData, TvlData, XimxData, onchain, Onchain, OnchainLendingPool, OnchainPoolToken, OnchainBorrowable, OnchainCollateral, OnchainLendingVault, OnchainAccount, OnchainAccountLendingPool, OnchainAccountPoolToken, OnchainAccountBorrowable, OnchainAccountCollateral, OnchainAccountLendingVault, OnchainContractsHelper, OnchainImpermaxFactory, OnchainInteractions, OnchainInteractionsLendingPool, OnchainInteractionsPoolToken, OnchainInteractionsCollateral, OnchainInteractionsBorrowable, OnchainInteractionsLendingVault, Contract, ApprovalType, PermitData, OnchainConfig, Changes, NO_CHANGES, Values, AirdropData, PendingRewardUI, CLAIM_AGGREGATOR, IMPERMAX_CHEF, IMX, MERKLE_DISTRIBUTOR_IBEX, MERKLE_DISTRIBUTOR_IBEX_2, MERKLE_DISTRIBUTOR_ETH, ROUTER, SIMPLE_UNISWAP_ORACLE, WETH, MERKLE_URL_ETH, MERKLE_URL_IBEX, MERKLE_URL_IBEX_2, hrAmms, AMM_FACTORY, getAmmByFactory, AMM_SUBGRAPH_URLS, ADD_LIQUIDITY_URLS, AMM_LP_FEE, DEBANK_IDS, ETH_SYMBOL, ETH_NAME, SOLIDEX_FACTORIES, BORROW_FEE_FACTORIES, OLD_KINK_MULTIPLIER_FACTORIES, LIQUIDATION_FEE_FACTORIES, V2_FACTORIES, Farms, hrFarms, FarmIndex, STAKED_LP_FACTORY, getFarmByStakedLPFactory, NOT_SYNCED, DEADLINE, ZERO, APPROVE_AMOUNT, IMPERMAX_SUBGRAPH_URL, IMPERMAX_CHEF_SUBGRAPH_URL, BLOCKS_SUBGRAPH_URL, XIMX_SUBGRAPH_URL, Networks, Factory, PoolTokenType, Amms, Address, NetworkIndex, FactoryIndex, AddressIndex, NetworkFactoryIndex, LendingPoolIndex, AmmIndex, DistributorDetails, };

package/lib/index.js

@@ -22,15 +22,25 @@ var __importStar = (this && this.__importStar) || function (mod) {
     __setModuleDefault(result, mod);
     return result;
 };
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Amms = exports.PoolTokenType = exports.Factory = exports.Networks = exports.XIMX_SUBGRAPH_URL = exports.BLOCKS_SUBGRAPH_URL = exports.IMPERMAX_CHEF_SUBGRAPH_URL = exports.IMPERMAX_SUBGRAPH_URL = exports.APPROVE_AMOUNT = exports.ZERO = exports.DEADLINE = exports.NOT_SYNCED = exports.getFarmByStakedLPFactory = exports.STAKED_LP_FACTORY = exports.hrFarms = exports.Farms = exports.V2_FACTORIES = exports.LIQUIDATION_FEE_FACTORIES = exports.OLD_KINK_MULTIPLIER_FACTORIES = exports.BORROW_FEE_FACTORIES = exports.SOLIDEX_FACTORIES = exports.ETH_NAME = exports.ETH_SYMBOL = exports.DEBANK_IDS = exports.AMM_LP_FEE = exports.ADD_LIQUIDITY_URLS = exports.AMM_SUBGRAPH_URLS = exports.getAmmByFactory = exports.AMM_FACTORY = exports.hrAmms = exports.MERKLE_URL_IBEX_2 = exports.MERKLE_URL_IBEX = exports.MERKLE_URL_ETH = exports.WETH = exports.SIMPLE_UNISWAP_ORACLE = exports.ROUTER = exports.MERKLE_DISTRIBUTOR_ETH = exports.MERKLE_DISTRIBUTOR_IBEX_2 = exports.MERKLE_DISTRIBUTOR_IBEX = exports.IMX = exports.IMPERMAX_CHEF = exports.CLAIM_AGGREGATOR = exports.NO_CHANGES = exports.ApprovalType = exports.Onchain = exports.onchain = exports.Offchain = exports.offchain = void 0;
-const offchain_1 = __importDefault(require("./offchain"));
+exports.MERKLE_URL_IBEX_2 = exports.MERKLE_URL_IBEX = exports.MERKLE_URL_ETH = exports.WETH = exports.SIMPLE_UNISWAP_ORACLE = exports.ROUTER = exports.MERKLE_DISTRIBUTOR_ETH = exports.MERKLE_DISTRIBUTOR_IBEX_2 = exports.MERKLE_DISTRIBUTOR_IBEX = exports.IMX = exports.IMPERMAX_CHEF = exports.CLAIM_AGGREGATOR = exports.NO_CHANGES = exports.ApprovalType = exports.OnchainInteractionsLendingVault = exports.OnchainInteractionsBorrowable = exports.OnchainInteractionsCollateral = exports.OnchainInteractionsPoolToken = exports.OnchainInteractionsLendingPool = exports.OnchainInteractions = exports.OnchainImpermaxFactory = exports.OnchainContractsHelper = exports.OnchainAccountLendingVault = exports.OnchainAccountCollateral = exports.OnchainAccountBorrowable = exports.OnchainAccountPoolToken = exports.OnchainAccountLendingPool = exports.OnchainAccount = exports.OnchainLendingVault = exports.OnchainCollateral = exports.OnchainBorrowable = exports.OnchainPoolToken = exports.OnchainLendingPool = exports.Onchain = exports.onchain = exports.OffchainSolidexHelper = exports.OffchainPriceHelper = exports.OffchainAccountLendingVault = exports.OffchainAccountBorrowable = exports.OffchainAccountCollateral = exports.OffchainAccountPoolToken = exports.OffchainAccountLendingPool = exports.OffchainAccount = exports.OffchainLendingVault = exports.OffchainBorrowable = exports.OffchainCollateral = exports.OffchainPoolToken = exports.OffchainLendingPool = exports.Offchain = exports.offchain = void 0;
+exports.Amms = exports.PoolTokenType = exports.Factory = exports.Networks = exports.XIMX_SUBGRAPH_URL = exports.BLOCKS_SUBGRAPH_URL = exports.IMPERMAX_CHEF_SUBGRAPH_URL = exports.IMPERMAX_SUBGRAPH_URL = exports.APPROVE_AMOUNT = exports.ZERO = exports.DEADLINE = exports.NOT_SYNCED = exports.getFarmByStakedLPFactory = exports.STAKED_LP_FACTORY = exports.hrFarms = exports.Farms = exports.V2_FACTORIES = exports.LIQUIDATION_FEE_FACTORIES = exports.OLD_KINK_MULTIPLIER_FACTORIES = exports.BORROW_FEE_FACTORIES = exports.SOLIDEX_FACTORIES = exports.ETH_NAME = exports.ETH_SYMBOL = exports.DEBANK_IDS = exports.AMM_LP_FEE = exports.ADD_LIQUIDITY_URLS = exports.AMM_SUBGRAPH_URLS = exports.getAmmByFactory = exports.AMM_FACTORY = exports.hrAmms = void 0;
+const offchain_1 = __importStar(require("./offchain"));
 exports.Offchain = offchain_1.default;
-const onchain_1 = __importDefault(require("./onchain"));
+Object.defineProperty(exports, "OffchainAccount", { enumerable: true, get: function () { return offchain_1.OffchainAccount; } });
+Object.defineProperty(exports, "OffchainLendingPool", { enumerable: true, get: function () { return offchain_1.OffchainLendingPool; } });
+Object.defineProperty(exports, "OffchainLendingVault", { enumerable: true, get: function () { return offchain_1.OffchainLendingVault; } });
+Object.defineProperty(exports, "OffchainPoolToken", { enumerable: true, get: function () { return offchain_1.OffchainPoolToken; } });
+Object.defineProperty(exports, "OffchainPriceHelper", { enumerable: true, get: function () { return offchain_1.OffchainPriceHelper; } });
+Object.defineProperty(exports, "OffchainSolidexHelper", { enumerable: true, get: function () { return offchain_1.OffchainSolidexHelper; } });
+const onchain_1 = __importStar(require("./onchain"));
 exports.Onchain = onchain_1.default;
+Object.defineProperty(exports, "OnchainAccount", { enumerable: true, get: function () { return onchain_1.OnchainAccount; } });
+Object.defineProperty(exports, "OnchainContractsHelper", { enumerable: true, get: function () { return onchain_1.OnchainContractsHelper; } });
+Object.defineProperty(exports, "OnchainImpermaxFactory", { enumerable: true, get: function () { return onchain_1.OnchainImpermaxFactory; } });
+Object.defineProperty(exports, "OnchainInteractions", { enumerable: true, get: function () { return onchain_1.OnchainInteractions; } });
+Object.defineProperty(exports, "OnchainLendingVault", { enumerable: true, get: function () { return onchain_1.OnchainLendingVault; } });
+Object.defineProperty(exports, "OnchainPoolToken", { enumerable: true, get: function () { return onchain_1.OnchainPoolToken; } });
 const offchain = __importStar(require("./offchain"));
 exports.offchain = offchain;
 const onchain = __importStar(require("./onchain"));
@@ -93,6 +103,34 @@ const types_1 = require("./config/types");
 Object.defineProperty(exports, "Factory", { enumerable: true, get: function () { return types_1.Factory; } });
 Object.defineProperty(exports, "Networks", { enumerable: true, get: function () { return types_1.Networks; } });
 Object.defineProperty(exports, "PoolTokenType", { enumerable: true, get: function () { return types_1.PoolTokenType; } });
-const types_2 = require("./onchain/types");
-Object.defineProperty(exports, "ApprovalType", { enumerable: true, get: function () { return types_2.ApprovalType; } });
-Object.defineProperty(exports, "NO_CHANGES", { enumerable: true, get: function () { return types_2.NO_CHANGES; } });
+const onchainTypes_1 = require("./onchain/onchainTypes");
+Object.defineProperty(exports, "ApprovalType", { enumerable: true, get: function () { return onchainTypes_1.ApprovalType; } });
+Object.defineProperty(exports, "NO_CHANGES", { enumerable: true, get: function () { return onchainTypes_1.NO_CHANGES; } });
+const lendingPool_1 = require("./offchain/lendingPool");
+Object.defineProperty(exports, "OffchainBorrowable", { enumerable: true, get: function () { return lendingPool_1.OffchainBorrowable; } });
+Object.defineProperty(exports, "OffchainCollateral", { enumerable: true, get: function () { return lendingPool_1.OffchainCollateral; } });
+const lendingPool_2 = __importStar(require("./offchain/account/lendingPool"));
+exports.OffchainAccountLendingPool = lendingPool_2.default;
+Object.defineProperty(exports, "OffchainAccountBorrowable", { enumerable: true, get: function () { return lendingPool_2.OffchainAccountBorrowable; } });
+Object.defineProperty(exports, "OffchainAccountCollateral", { enumerable: true, get: function () { return lendingPool_2.OffchainAccountCollateral; } });
+const account_1 = require("./offchain/account");
+Object.defineProperty(exports, "OffchainAccountLendingVault", { enumerable: true, get: function () { return account_1.OffchainAccountLendingVault; } });
+Object.defineProperty(exports, "OffchainAccountPoolToken", { enumerable: true, get: function () { return account_1.OffchainAccountPoolToken; } });
+const lendingPool_3 = __importStar(require("./onchain/impermaxFactory/lendingPool"));
+exports.OnchainLendingPool = lendingPool_3.default;
+Object.defineProperty(exports, "OnchainBorrowable", { enumerable: true, get: function () { return lendingPool_3.OnchainBorrowable; } });
+Object.defineProperty(exports, "OnchainCollateral", { enumerable: true, get: function () { return lendingPool_3.OnchainCollateral; } });
+const account_2 = require("./onchain/account");
+Object.defineProperty(exports, "OnchainAccountLendingPool", { enumerable: true, get: function () { return account_2.OnchainAccountLendingPool; } });
+Object.defineProperty(exports, "OnchainAccountLendingVault", { enumerable: true, get: function () { return account_2.OnchainAccountLendingVault; } });
+Object.defineProperty(exports, "OnchainAccountPoolToken", { enumerable: true, get: function () { return account_2.OnchainAccountPoolToken; } });
+const lendingPool_4 = require("./onchain/account/lendingPool");
+Object.defineProperty(exports, "OnchainAccountBorrowable", { enumerable: true, get: function () { return lendingPool_4.OnchainAccountBorrowable; } });
+Object.defineProperty(exports, "OnchainAccountCollateral", { enumerable: true, get: function () { return lendingPool_4.OnchainAccountCollateral; } });
+const interactions_1 = require("./onchain/interactions");
+Object.defineProperty(exports, "OnchainInteractionsLendingPool", { enumerable: true, get: function () { return interactions_1.OnchainInteractionsLendingPool; } });
+Object.defineProperty(exports, "OnchainInteractionsLendingVault", { enumerable: true, get: function () { return interactions_1.OnchainInteractionsLendingVault; } });
+Object.defineProperty(exports, "OnchainInteractionsPoolToken", { enumerable: true, get: function () { return interactions_1.OnchainInteractionsPoolToken; } });
+const lendingPool_5 = require("./onchain/interactions/lendingPool");
+Object.defineProperty(exports, "OnchainInteractionsBorrowable", { enumerable: true, get: function () { return lendingPool_5.OnchainInteractionsBorrowable; } });
+Object.defineProperty(exports, "OnchainInteractionsCollateral", { enumerable: true, get: function () { return lendingPool_5.OnchainInteractionsCollateral; } });

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

@@ -1,24 +1,7 @@
 import * as lendingPool from './lendingPool';
-import LendingPool from "./lendingPool";
-import PoolToken from "./poolToken";
-import LendingVault from './lendingVault';
-import Offchain from '../index';
-import { Address, AddressIndex, Factory, FactoryIndex, LendingPoolIndex } from '../../config/types';
-import { UserData } from '../types';
-export { lendingPool, LendingPool, PoolToken, LendingVault, };
-export default class Account {
-    offchain: Offchain;
-    account: Address;
-    accountLLPs: LendingPoolIndex<Promise<LendingPool>>;
-    accountLVs: AddressIndex<Promise<LendingVault>>;
-    constructor(offchain: Offchain, account: Address);
-    private initializeAccountLendingPool;
-    getAccountLendingPool(factory: Factory, pair: Address): Promise<LendingPool>;
-    private initializeAccountLendingVault;
-    getAccountLendingVault(vaultAddress: Address): Promise<LendingVault>;
-    getUserData(): Promise<FactoryIndex<UserData> | null>;
-    getBorrowPositions(): Promise<FactoryIndex<Address[]>>;
-    getSupplyPositions(): Promise<FactoryIndex<Address[]>>;
-    getLendingVaultsSuppliedUSD(): Promise<number>;
-    getLendingVaultsEarningsUSD(): Promise<number>;
-}
+import OffchainAccountLendingPool from "./lendingPool";
+import OffchainAccountPoolToken from "./offchainAccountPoolToken";
+import OffchainAccountLendingVault from './offchainAccountLendingVault';
+import OffchainAccount from './offchainAccount';
+export { lendingPool, OffchainAccountLendingPool, OffchainAccountPoolToken, OffchainAccountLendingVault, };
+export default OffchainAccount;

package/lib/offchain/account/index.js

@@ -22,102 +22,18 @@ var __importStar = (this && this.__importStar) || function (mod) {
     __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) {
-        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 });
-exports.LendingVault = exports.PoolToken = exports.LendingPool = exports.lendingPool = void 0;
+exports.OffchainAccountLendingVault = exports.OffchainAccountPoolToken = exports.OffchainAccountLendingPool = exports.lendingPool = void 0;
 const lendingPool = __importStar(require("./lendingPool"));
 exports.lendingPool = lendingPool;
 const lendingPool_1 = __importDefault(require("./lendingPool"));
-exports.LendingPool = lendingPool_1.default;
-const poolToken_1 = __importDefault(require("./poolToken"));
-exports.PoolToken = poolToken_1.default;
-const lendingVault_1 = __importDefault(require("./lendingVault"));
-exports.LendingVault = lendingVault_1.default;
-class Account {
-    constructor(offchain, account) {
-        this.offchain = offchain;
-        this.account = account;
-        this.accountLLPs = {};
-        this.accountLVs = {};
-    }
-    initializeAccountLendingPool(factory, pair) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const lendingPool = yield this.offchain.getLendingPool(factory, pair);
-            return new lendingPool_1.default(this, lendingPool);
-        });
-    }
-    getAccountLendingPool(factory, pair) {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (!this.accountLLPs[factory])
-                this.accountLLPs[factory] = {};
-            const accountLLPsOfFactory = this.accountLLPs[factory];
-            if (!accountLLPsOfFactory[pair])
-                accountLLPsOfFactory[pair] = this.initializeAccountLendingPool(factory, pair);
-            return accountLLPsOfFactory[pair];
-        });
-    }
-    initializeAccountLendingVault(vaultAddress) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const lendingVault = yield this.offchain.getLendingVault(vaultAddress);
-            return new lendingVault_1.default(this, lendingVault);
-        });
-    }
-    getAccountLendingVault(vaultAddress) {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (!this.accountLVs[vaultAddress])
-                this.accountLVs[vaultAddress] = this.initializeAccountLendingVault(vaultAddress);
-            return this.accountLVs[vaultAddress];
-        });
-    }
-    getUserData() {
-        return __awaiter(this, void 0, void 0, function* () {
-            return this.offchain.getUserData(this.account);
-        });
-    }
-    getBorrowPositions() {
-        return __awaiter(this, void 0, void 0, function* () {
-            const result = {};
-            const userData = yield this.getUserData();
-            if (userData === null)
-                return result;
-            for (const factory in userData) {
-                result[factory] = Object.keys(userData[factory].collateralPositions);
-            }
-            return result;
-        });
-    }
-    getSupplyPositions() {
-        return __awaiter(this, void 0, void 0, function* () {
-            const result = {};
-            const userData = yield this.getUserData();
-            if (userData === null)
-                return result;
-            for (const factory in userData) {
-                result[factory] = Object.keys(userData[factory].supplyPositions);
-            }
-            return result;
-        });
-    }
-    getLendingVaultsSuppliedUSD() {
-        return __awaiter(this, void 0, void 0, function* () {
-            return 0;
-        });
-    }
-    getLendingVaultsEarningsUSD() {
-        return __awaiter(this, void 0, void 0, function* () {
-            return 0;
-        });
-    }
-}
-exports.default = Account;
+exports.OffchainAccountLendingPool = lendingPool_1.default;
+const offchainAccountPoolToken_1 = __importDefault(require("./offchainAccountPoolToken"));
+exports.OffchainAccountPoolToken = offchainAccountPoolToken_1.default;
+const offchainAccountLendingVault_1 = __importDefault(require("./offchainAccountLendingVault"));
+exports.OffchainAccountLendingVault = offchainAccountLendingVault_1.default;
+const offchainAccount_1 = __importDefault(require("./offchainAccount"));
+exports.default = offchainAccount_1.default;

package/lib/offchain/account/lendingPool/borrowable.js

@@ -21,13 +21,13 @@ class Borrowable extends poolToken_1.default {
     }
     getSupplyPosition() {
         return __awaiter(this, void 0, void 0, function* () {
-            const userData = yield this.accountLendingPool.getUserData();
+            const userData = yield this.lendingPool.getUserData();
             if (!userData)
                 return undefined;
-            const supplyPositions = userData.supplyPositions[this.poolToken.lendingPool.pairAddress];
+            const supplyPositions = userData.supplyPositions[this.offchainPoolToken.lendingPool.pairAddress];
             if (!supplyPositions)
                 return undefined;
-            return supplyPositions[this.poolToken.poolTokenType];
+            return supplyPositions[this.offchainPoolToken.poolTokenType];
         });
     }
     getAmount() {
@@ -35,26 +35,26 @@ class Borrowable extends poolToken_1.default {
             const supplyPosition = yield this.getSupplyPosition();
             if (!supplyPosition)
                 return 0;
-            const exchangeRate = yield this.poolToken.getExchangeRate();
+            const exchangeRate = yield this.offchainPoolToken.getExchangeRate();
             const supplyBalance = parseFloat(supplyPosition.balance);
             return supplyBalance * exchangeRate;
         });
     }
     getBorrowPosition() {
         return __awaiter(this, void 0, void 0, function* () {
-            const userData = yield this.accountLendingPool.getUserData();
+            const userData = yield this.lendingPool.getUserData();
             if (!userData)
                 return undefined;
-            const borrowPositions = userData.borrowPositions[this.poolToken.lendingPool.pairAddress];
+            const borrowPositions = userData.borrowPositions[this.offchainPoolToken.lendingPool.pairAddress];
             if (!borrowPositions)
                 return undefined;
-            return borrowPositions[this.poolToken.poolTokenType];
+            return borrowPositions[this.offchainPoolToken.poolTokenType];
         });
     }
     getBorrowedAmount() {
         return __awaiter(this, void 0, void 0, function* () {
             const borrowPosition = yield this.getBorrowPosition();
-            const borrowIndex = yield this.poolToken.getBorrowIndex();
+            const borrowIndex = yield this.offchainPoolToken.getBorrowIndex();
             if (!borrowPosition)
                 return 0;
             const borrowBalance = parseFloat(borrowPosition.borrowBalance);
@@ -64,7 +64,7 @@ class Borrowable extends poolToken_1.default {
     }
     getBorrowedValue() {
         return __awaiter(this, void 0, void 0, function* () {
-            const tokenPrice = yield this.poolToken.getTokenPriceAccurate();
+            const tokenPrice = yield this.offchainPoolToken.getTokenPriceAccurate();
             const borrowedAmount = yield this.getBorrowedAmount();
             return borrowedAmount * tokenPrice;
         });

package/lib/offchain/account/lendingPool/collateral.js

@@ -22,10 +22,10 @@ class Collateral extends poolToken_1.default {
     }
     getCollateralPosition() {
         return __awaiter(this, void 0, void 0, function* () {
-            const userData = yield this.accountLendingPool.getUserData();
+            const userData = yield this.lendingPool.getUserData();
             if (!userData)
                 return undefined;
-            return userData.collateralPositions[this.poolToken.lendingPool.pairAddress];
+            return userData.collateralPositions[this.offchainPoolToken.lendingPool.pairAddress];
         });
     }
     getAmount() {
@@ -33,7 +33,7 @@ class Collateral extends poolToken_1.default {
             const collateralPosition = yield this.getCollateralPosition();
             if (!collateralPosition)
                 return 0;
-            const exchangeRate = yield this.poolToken.lendingPool.poolTokens[types_1.PoolTokenType.Collateral].getExchangeRate();
+            const exchangeRate = yield this.offchainPoolToken.lendingPool.poolTokens[types_1.PoolTokenType.Collateral].getExchangeRate();
             const collateralBalance = parseFloat(collateralPosition.balance);
             return collateralBalance * exchangeRate;
         });

package/lib/offchain/account/lendingPool/index.d.ts

@@ -1,21 +1,5 @@
-import { PoolTokenType } from '../../../config/types';
-import { UserData } from '../../types';
-import Collateral from './collateral';
-import Borrowable from './borrowable';
-import Account from '../index';
-import PoolToken from '../poolToken';
-import * as offchain from "../../";
-export { Borrowable, Collateral, };
-export default class LendingPool {
-    account: Account;
-    lendingPool: offchain.LendingPool;
-    accountPoolTokens: {
-        [PoolTokenType.Collateral]: Collateral;
-        [PoolTokenType.BorrowableA]: Borrowable;
-        [PoolTokenType.BorrowableB]: Borrowable;
-    };
-    constructor(account: Account, lendingPool: offchain.LendingPool);
-    getAccountPoolToken(poolTokenType: PoolTokenType): PoolToken;
-    getUserData(): Promise<UserData | undefined>;
-    getBorrowerEquityValue(): Promise<number>;
-}
+import OffchainAccountCollateral from './offchainAccountCollateral';
+import OffchainAccountBorrowable from './offchainAccountBorrowable';
+import OffchainAccountLendingPool from './offchainAccountLendingPool';
+export { OffchainAccountBorrowable, OffchainAccountCollateral, };
+export default OffchainAccountLendingPool;

package/lib/offchain/account/lendingPool/index.js

@@ -1,51 +1,12 @@
 "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 });
-exports.Collateral = exports.Borrowable = void 0;
-const types_1 = require("../../../config/types");
-const collateral_1 = __importDefault(require("./collateral"));
-exports.Collateral = collateral_1.default;
-const borrowable_1 = __importDefault(require("./borrowable"));
-exports.Borrowable = borrowable_1.default;
-class LendingPool {
-    constructor(account, lendingPool) {
-        this.account = account;
-        this.lendingPool = lendingPool;
-        this.accountPoolTokens = {
-            [types_1.PoolTokenType.Collateral]: new collateral_1.default(this, types_1.PoolTokenType.Collateral),
-            [types_1.PoolTokenType.BorrowableA]: new borrowable_1.default(this, types_1.PoolTokenType.BorrowableA),
-            [types_1.PoolTokenType.BorrowableB]: new borrowable_1.default(this, types_1.PoolTokenType.BorrowableB),
-        };
-    }
-    getAccountPoolToken(poolTokenType) {
-        return this.accountPoolTokens[poolTokenType];
-    }
-    getUserData() {
-        return __awaiter(this, void 0, void 0, function* () {
-            const userData = yield this.account.getUserData();
-            if (!userData)
-                return undefined;
-            return userData[this.lendingPool.factory];
-        });
-    }
-    getBorrowerEquityValue() {
-        return __awaiter(this, void 0, void 0, function* () {
-            const collateralValue = yield this.accountPoolTokens[types_1.PoolTokenType.Collateral].getValue();
-            const borrowedValueA = yield this.accountPoolTokens[types_1.PoolTokenType.BorrowableA].getBorrowedValue();
-            const borrowedValueB = yield this.accountPoolTokens[types_1.PoolTokenType.BorrowableB].getBorrowedValue();
-            return collateralValue - borrowedValueA - borrowedValueB;
-        });
-    }
-}
-exports.default = LendingPool;
+exports.OffchainAccountCollateral = exports.OffchainAccountBorrowable = void 0;
+const offchainAccountCollateral_1 = __importDefault(require("./offchainAccountCollateral"));
+exports.OffchainAccountCollateral = offchainAccountCollateral_1.default;
+const offchainAccountBorrowable_1 = __importDefault(require("./offchainAccountBorrowable"));
+exports.OffchainAccountBorrowable = offchainAccountBorrowable_1.default;
+const offchainAccountLendingPool_1 = __importDefault(require("./offchainAccountLendingPool"));
+exports.default = offchainAccountLendingPool_1.default;

package/lib/offchain/account/lendingPool/offchainAccountBorrowable.d.ts

@@ -0,0 +1,16 @@
+import { PoolTokenType } from '../../../config/types';
+import OffchainAccountLendingPool from './index';
+import OffchainAccountPoolToken from '../offchainAccountPoolToken';
+import OffchainBorrowable from '../../lendingPool/offchainBorrowable';
+export default class OffchainAccountBorrowable extends OffchainAccountPoolToken {
+    private readonly lendingPool;
+    private readonly poolTokenType;
+    protected readonly poolToken: OffchainBorrowable;
+    constructor(lendingPool: OffchainAccountLendingPool, poolTokenType: PoolTokenType);
+    getLendingPool: () => OffchainAccountLendingPool;
+    private getSupplyPosition;
+    getAmount(): Promise<number>;
+    private getBorrowPosition;
+    getBorrowedAmount(): Promise<number>;
+    getBorrowedValue(): Promise<number>;
+}

package/lib/offchain/account/lendingPool/offchainAccountBorrowable.js

@@ -0,0 +1,69 @@
+"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 offchainAccountPoolToken_1 = __importDefault(require("../offchainAccountPoolToken"));
+class OffchainAccountBorrowable extends offchainAccountPoolToken_1.default {
+    constructor(lendingPool, poolTokenType) {
+        super();
+        this.getLendingPool = () => this.lendingPool;
+        this.lendingPool = lendingPool;
+        this.poolTokenType = poolTokenType;
+        this.poolToken = lendingPool.getLendingPool().getPoolToken(poolTokenType);
+    }
+    getSupplyPosition() {
+        return __awaiter(this, void 0, void 0, function* () {
+            const lendingPoolPosition = yield this.lendingPool.getLendingPoolPosition();
+            if (!lendingPoolPosition)
+                return undefined;
+            return lendingPoolPosition.supplyPositions[this.poolTokenType];
+        });
+    }
+    getAmount() {
+        return __awaiter(this, void 0, void 0, function* () {
+            const supplyPosition = yield this.getSupplyPosition();
+            if (!supplyPosition)
+                return 0;
+            const exchangeRate = yield this.poolToken.getExchangeRate();
+            const supplyBalance = parseFloat(supplyPosition.balance);
+            return supplyBalance * exchangeRate;
+        });
+    }
+    getBorrowPosition() {
+        return __awaiter(this, void 0, void 0, function* () {
+            const lendingPoolPosition = yield this.lendingPool.getLendingPoolPosition();
+            if (!lendingPoolPosition)
+                return undefined;
+            return lendingPoolPosition.borrowPositions[this.poolTokenType];
+        });
+    }
+    getBorrowedAmount() {
+        return __awaiter(this, void 0, void 0, function* () {
+            const borrowPosition = yield this.getBorrowPosition();
+            const borrowIndex = yield this.poolToken.getBorrowIndex();
+            if (!borrowPosition)
+                return 0;
+            const borrowBalance = parseFloat(borrowPosition.borrowBalance);
+            const userBorrowIndex = parseFloat(borrowPosition.borrowIndex);
+            return borrowBalance * borrowIndex / userBorrowIndex;
+        });
+    }
+    getBorrowedValue() {
+        return __awaiter(this, void 0, void 0, function* () {
+            const tokenPrice = yield this.poolToken.getTokenPriceAccurate();
+            const borrowedAmount = yield this.getBorrowedAmount();
+            return borrowedAmount * tokenPrice;
+        });
+    }
+}
+exports.default = OffchainAccountBorrowable;

package/lib/offchain/account/lendingPool/offchainAccountCollateral.d.ts

@@ -0,0 +1,12 @@
+import { CollateralPosition } from "../../offchainTypes";
+import OffchainAccountLendingPool from './index';
+import OffchainAccountPoolToken from '../offchainAccountPoolToken';
+import { OffchainCollateral } from '../../lendingPool';
+export default class OffchainAccountCollateral extends OffchainAccountPoolToken {
+    private readonly lendingPool;
+    protected readonly poolToken: OffchainCollateral;
+    constructor(lendingPool: OffchainAccountLendingPool);
+    getLendingPool: () => OffchainAccountLendingPool;
+    getCollateralPosition(): Promise<CollateralPosition | undefined>;
+    getAmount(): Promise<number>;
+}

package/lib/offchain/account/lendingPool/offchainAccountCollateral.js

@@ -0,0 +1,42 @@
+"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 offchainAccountPoolToken_1 = __importDefault(require("../offchainAccountPoolToken"));
+class OffchainAccountCollateral extends offchainAccountPoolToken_1.default {
+    constructor(lendingPool) {
+        super();
+        this.getLendingPool = () => this.lendingPool;
+        this.lendingPool = lendingPool;
+        this.poolToken = lendingPool.getLendingPool().getCollateral();
+    }
+    getCollateralPosition() {
+        return __awaiter(this, void 0, void 0, function* () {
+            const lendingPoolPosition = yield this.lendingPool.getLendingPoolPosition();
+            if (!lendingPoolPosition)
+                return undefined;
+            return lendingPoolPosition.collateralPosition;
+        });
+    }
+    getAmount() {
+        return __awaiter(this, void 0, void 0, function* () {
+            const collateralPosition = yield this.getCollateralPosition();
+            if (!collateralPosition)
+                return 0;
+            const exchangeRate = yield this.poolToken.getExchangeRate();
+            const collateralBalance = parseFloat(collateralPosition.balance);
+            return collateralBalance * exchangeRate;
+        });
+    }
+}
+exports.default = OffchainAccountCollateral;

package/lib/offchain/account/lendingPool/offchainAccountLendingPool.d.ts

@@ -0,0 +1,21 @@
+import OffchainAccount from '../index';
+import { PoolTokenType } from '../../../config/types';
+import OffchainAccountCollateral from './offchainAccountCollateral';
+import OffchainAccountBorrowable from './offchainAccountBorrowable';
+import OffchainAccountPoolToken from '../offchainAccountPoolToken';
+import { LendingPoolPosition } from '../../offchainTypes';
+import OffchainLendingPool from '../../lendingPool';
+export default class OffchainAccountLendingPool {
+    private readonly account;
+    private readonly lendingPool;
+    private readonly poolTokens;
+    constructor(account: OffchainAccount, lendingPool: OffchainLendingPool);
+    getAccount: () => OffchainAccount;
+    getLendingPool: () => OffchainLendingPool;
+    getPoolToken(poolTokenType: PoolTokenType): OffchainAccountPoolToken;
+    getBorrowableA: () => OffchainAccountBorrowable;
+    getBorrowableB: () => OffchainAccountBorrowable;
+    getCollateral: () => OffchainAccountCollateral;
+    getLendingPoolPosition(): Promise<LendingPoolPosition | undefined>;
+    getBorrowerEquityValue(): Promise<number>;
+}