impermax-sdk 1.1.36 → 1.1.37

package/lib/offchain/account/index.js

@@ -44,7 +44,6 @@ const poolToken_1 = __importDefault(require("./poolToken"));
 exports.PoolToken = poolToken_1.default;
 const lendingVault_1 = __importDefault(require("./lendingVault"));
 exports.LendingVault = lendingVault_1.default;
-const assert = require("assert");
 class Account {
     constructor(offchain, account) {
         this.offchain = offchain;
@@ -63,12 +62,9 @@ class Account {
             if (!this.accountLLPs[factory])
                 this.accountLLPs[factory] = {};
             const accountLLPsOfFactory = this.accountLLPs[factory];
-            assert(accountLLPsOfFactory);
             if (!accountLLPsOfFactory[pair])
                 accountLLPsOfFactory[pair] = this.initializeAccountLendingPool(factory, pair);
-            const accountLendingPool = accountLLPsOfFactory[pair];
-            assert(accountLendingPool);
-            return accountLendingPool;
+            return accountLLPsOfFactory[pair];
         });
     }
     initializeAccountLendingVault(vaultAddress) {

package/lib/offchain/index.d.ts

@@ -21,9 +21,7 @@ export default class Offchain {
     whitelistedPairs: FactoryIndex<Address[]>;
     lendingPools: LendingPoolIndex<LendingPool>;
     lendingVaults: AddressIndex<LendingVault>;
-    accounts: {
-        [key in Address]: Account;
-    };
+    accounts: AddressIndex<Account>;
     priceHelper: PriceHelper;
     solidexHelper: SolidexHelper;
     lendingPoolsData: Promise<LendingPoolIndex<LendingPoolData>> | null;

package/lib/offchain/initializer.d.ts

@@ -3,7 +3,7 @@ import Offchain from "./index";
 import { DocumentNode } from "graphql";
 import { Address, AddressIndex, Factory, FactoryIndex, LendingPoolIndex } from '../config/types';
 import { Amms } from '../config/amms';
-import { BorrowPosition, CollateralPosition, LendingPoolData, SupplyPosition, TvlData, UserData, XimxData } from './types';
+import { LendingPoolData, RawUserData, TvlData, UserData, XimxData } from './types';
 export declare function apolloFetcher(subgraphUrl: string, query: DocumentNode): Promise<ApolloQueryResult<any>>;
 export declare function fetchBlockByTimestamp(this: Offchain, timestamp: number): Promise<number | null>;
 export declare function fetchLendingPools(this: Offchain): Promise<FactoryIndex<LendingPoolData[]>>;
@@ -25,11 +25,7 @@ export declare function getLendingPoolsData(this: Offchain): Promise<LendingPool
 export declare function getLendingPoolData(this: Offchain, factory: Factory, uniswapV2PairAddress: Address): Promise<LendingPoolData>;
 export declare function initializeTvlData(this: Offchain): Promise<TvlData>;
 export declare function getTvlData(this: Offchain): Promise<TvlData>;
-export declare function fetchUserData(this: Offchain, account: Address): Promise<FactoryIndex<{
-    collateralPositions: CollateralPosition[];
-    supplyPositions: SupplyPosition[];
-    borrowPositions: BorrowPosition[];
-}>>;
+export declare function fetchUserData(this: Offchain, account: Address): Promise<FactoryIndex<RawUserData>>;
 export declare function initializeUserData(this: Offchain, account: Address): Promise<FactoryIndex<UserData> | null>;
 export declare function getUserData(this: Offchain, account: Address): Promise<FactoryIndex<UserData> | null>;
 export declare function initializeXimxData(this: Offchain): Promise<XimxData>;

package/lib/offchain/initializer.js

@@ -44,7 +44,6 @@ const lendingPool_1 = __importDefault(require("./lendingPool"));
 const subgraphs_1 = require("../config/subgraphs");
 const types_1 = require("../config/types");
 const amms_1 = require("../config/amms");
-const assert = require("assert");
 const SECONDS_IN_YEAR = 60 * 60 * 24 * 365;
 function apolloFetcher(subgraphUrl, query) {
     return __awaiter(this, void 0, void 0, function* () {
@@ -262,7 +261,6 @@ function initializeLendingPoolsData() {
                 if (!lendingPoolsByAmm[amm])
                     lendingPoolsByAmm[amm] = [];
                 const lendingPoolsOfAmm = lendingPoolsByAmm[amm];
-                assert(lendingPoolsOfAmm !== undefined);
                 lendingPoolsOfAmm.push(lendingPool);
             }
         }
@@ -447,9 +445,8 @@ function getLendingPoolsData() {
 exports.getLendingPoolsData = getLendingPoolsData;
 function getLendingPoolData(factory, uniswapV2PairAddress) {
     return __awaiter(this, void 0, void 0, function* () {
-        const lendingPoolsDataOfFactory = (yield this.getLendingPoolsData())[factory];
-        assert(lendingPoolsDataOfFactory);
-        return lendingPoolsDataOfFactory[uniswapV2PairAddress.toLowerCase()];
+        const lendingPoolsData = (yield this.getLendingPoolsData())[factory];
+        return lendingPoolsData[uniswapV2PairAddress.toLowerCase()];
     });
 }
 exports.getLendingPoolData = getLendingPoolData;
@@ -572,35 +569,29 @@ function initializeUserData(account) {
                 supplyPositions: {},
                 borrowPositions: {},
             };
-            const data = userData[factory];
-            assert(data);
-            for (const collateralPosition of data.collateralPositions) {
+            const rawUserData = userData[factory];
+            for (const collateralPosition of rawUserData.collateralPositions) {
                 const resultOfFactory = result[factory];
-                assert(resultOfFactory);
                 resultOfFactory.collateralPositions[collateralPosition.collateral.lendingPool.id] = collateralPosition;
             }
-            for (const supplyPositions of data.supplyPositions) {
+            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)).poolTokens[types_1.PoolTokenType.BorrowableA];
-                assert(borrowableA);
                 const addressA = yield borrowableA.getUnderlyingAddress();
                 const poolTokenType = underlyingAddress === addressA ? types_1.PoolTokenType.BorrowableA : types_1.PoolTokenType.BorrowableB;
                 const resultOfFactory = result[factory];
-                assert(resultOfFactory);
                 if (!(uniswapV2PairAddress in resultOfFactory.supplyPositions))
                     resultOfFactory.supplyPositions[uniswapV2PairAddress] = {};
                 resultOfFactory.supplyPositions[uniswapV2PairAddress][poolTokenType] = supplyPositions;
             }
-            for (const borrowPositions of data.borrowPositions) {
+            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)).poolTokens[types_1.PoolTokenType.BorrowableA];
-                assert(borrowableA);
                 const addressA = yield borrowableA.getUnderlyingAddress();
                 const poolTokenType = underlyingAddress === addressA ? types_1.PoolTokenType.BorrowableA : types_1.PoolTokenType.BorrowableB;
                 const resultOfFactory = result[factory];
-                assert(resultOfFactory);
                 if (!(uniswapV2PairAddress in resultOfFactory.borrowPositions))
                     resultOfFactory.borrowPositions[uniswapV2PairAddress] = {};
                 resultOfFactory.borrowPositions[uniswapV2PairAddress][poolTokenType] = borrowPositions;
@@ -614,9 +605,7 @@ function getUserData(account) {
     return __awaiter(this, void 0, void 0, function* () {
         if (!(account in this.usersData))
             this.usersData[account] = this.initializeUserData(account);
-        const userData = this.usersData[account];
-        assert(userData !== undefined);
-        return userData;
+        return this.usersData[account];
     });
 }
 exports.getUserData = getUserData;

package/lib/offchain/priceHelper.js

@@ -10,7 +10,6 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const debank_ids_1 = require("../config/debank-ids");
-const assert = require("assert");
 // coingecko has priority over debank for initialized tokens
 const coingecko_ids = {
     // Arbitrum
@@ -164,7 +163,6 @@ class PriceHelper {
             if (!this.debankTokensPrice[tokenAddress])
                 this.debankTokensPrice[tokenAddress] = this.initializeDebankTokenPrice(tokenAddress);
             const tokenPrice = yield this.debankTokensPrice[tokenAddress];
-            assert(tokenPrice !== undefined);
             if (tokenPrice === 0) {
                 //manual fallback
                 if (tokenAddress.toLowerCase() === '0xaaa6c1e32c55a7bfa8066a6fae9b42650f262418') { // fix for RAM

package/lib/offchain/types.d.ts

@@ -116,6 +116,11 @@ export interface BorrowPosition {
         };
     };
 }
+export interface RawUserData {
+    collateralPositions: CollateralPosition[];
+    supplyPositions: SupplyPosition[];
+    borrowPositions: BorrowPosition[];
+}
 export interface UserData {
     collateralPositions: {
         [key in Address]: CollateralPosition;

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

@@ -11,6 +11,7 @@ export { lendingPool, interactions, LendingPool, Interactions, PoolToken, Lendin
 export default class Account {
     router: OnChain;
     account: Address;
+    interactions: Interactions;
     accountLLPs: LendingPoolIndex<Promise<LendingPool>>;
     accountLVs: AddressIndex<Promise<LendingVault>>;
     cache: {
@@ -23,6 +24,7 @@ export default class Account {
     };
     constructor(router: OnChain, account: Address);
     cleanCache(): Promise<void>;
+    getInteractions(): Interactions;
     private initializeAccountLendingPool;
     getAccountLendingPool(factory: Factory, pair: Address): Promise<LendingPool>;
     private initializeAccountLendingVault;

package/lib/onchain/account/index.js

@@ -55,6 +55,7 @@ class Account {
         this.cache = { airdropData: {}, claimableIBEX: {} };
         this.router = router;
         this.account = account;
+        this.interactions = new interactions_1.default(this);
         this.accountLLPs = {};
         this.accountLVs = {};
     }
@@ -69,11 +70,14 @@ class Account {
             for (const vaultAddress in this.accountLVs) {
                 (yield this.accountLVs[vaultAddress]).cleanCache();
             }
+            this.interactions.cleanCache();
         });
     }
+    getInteractions() {
+        return this.interactions;
+    }
     initializeAccountLendingPool(factory, pair) {
         return __awaiter(this, void 0, void 0, function* () {
-            const facto = this.router.getFactory(factory);
             const lendingPool = yield this.router.getFactory(factory).getLendingPool(pair);
             return new lendingPool_1.default(this, lendingPool);
         });

package/lib/onchain/account/interactions/index.d.ts

@@ -15,6 +15,7 @@ export default class Interactions {
         defaultRouterContract?: Contract;
     };
     constructor(account: Account);
+    cleanCache(): Promise<void>;
     private initializeInteractionsLendingPool;
     getInteractionsLendingPool(factory: Factory, pair: Address): Promise<LendingPool>;
     private initializeInteractionsLendingVault;

package/lib/onchain/account/interactions/index.js

@@ -55,6 +55,11 @@ class Interactions {
         this.interactionsLLPs = {};
         this.interactionsLVs = {};
     }
+    cleanCache() {
+        return __awaiter(this, void 0, void 0, function* () {
+            this.cache = {};
+        });
+    }
     initializeInteractionsLendingPool(factory, pair) {
         return __awaiter(this, void 0, void 0, function* () {
             const lendingPool = yield this.account.getAccountLendingPool(factory, pair);

package/lib/onchain/account/interactions/lendingPool/index.js

@@ -20,7 +20,6 @@ const collateral_1 = __importDefault(require("./collateral"));
 exports.Collateral = collateral_1.default;
 const borrowable_1 = __importDefault(require("./borrowable"));
 exports.Borrowable = borrowable_1.default;
-const assert = require("assert");
 class LendingPool {
     constructor(interactions, accountLendingPool) {
         this.getRouterLendingPool = () => this.accountLendingPool.lendingPool;
@@ -113,9 +112,7 @@ class LendingPool {
     }
     reinvest(onTransactionHash) {
         return __awaiter(this, void 0, void 0, function* () {
-            const account = this.accountLendingPool.account.account;
             const stakedLPToken = yield this.getRouterLendingPool().getStakedLPToken();
-            assert(stakedLPToken);
             return this.send(stakedLPToken.methods.reinvest(), onTransactionHash);
         });
     }

package/lib/onchain/impermaxFactory/index.d.ts

@@ -5,7 +5,7 @@ import { Address, Factory } from '../../config/types';
 import { Contract } from '../types';
 export { lendingPool, LendingPool, };
 export default class ImpermaxFactory {
-    router: OnChain;
+    onchain: OnChain;
     factory: Factory;
     lendingPools: {
         [key in Address]: LendingPool;

package/lib/onchain/impermaxFactory/index.js

@@ -36,7 +36,7 @@ const routers_1 = require("../../config/contracts/routers");
 class ImpermaxFactory {
     constructor(router, factory) {
         this.cache = {};
-        this.router = router;
+        this.onchain = router;
         this.factory = factory;
         this.lendingPools = {};
     }
@@ -48,23 +48,23 @@ class ImpermaxFactory {
     }
     getSimpleUniswapOracle() {
         if (!this.cache.simpleUniswapOracleContract) {
-            const address = simple_uniswap_oracles_1.SIMPLE_UNISWAP_ORACLE[this.router.network][this.factory];
+            const address = simple_uniswap_oracles_1.SIMPLE_UNISWAP_ORACLE[this.onchain.network][this.factory];
             if (!address) {
                 console.error("SimpleUniswapOracle address not found");
                 return null;
             }
-            this.cache.simpleUniswapOracleContract = this.router.contractsHelper.newSimpleUniswapOracle(address);
+            this.cache.simpleUniswapOracleContract = this.onchain.contractsHelper.newSimpleUniswapOracle(address);
         }
         return this.cache.simpleUniswapOracleContract;
     }
     getRouter() {
         if (!this.cache.routerContract) {
-            const address = routers_1.ROUTER[this.router.network][this.factory];
+            const address = routers_1.ROUTER[this.onchain.network][this.factory];
             if (!address) {
                 console.error("SimpleUniswapOracle address not found");
                 return null;
             }
-            this.cache.routerContract = this.router.contractsHelper.newRouter(address);
+            this.cache.routerContract = this.onchain.contractsHelper.newRouter(address);
         }
         return this.cache.routerContract;
     }

package/lib/onchain/impermaxFactory/lendingPool/borrowable.js

@@ -18,7 +18,7 @@ class Borrowable extends poolToken_1.default {
     constructor(lendingPool, poolTokenType) {
         super();
         this.borrowableCache = {};
-        this.getContractHelper = () => this.lendingPool.factory.router.contractsHelper;
+        this.getContractHelper = () => this.lendingPool.factory.onchain.contractsHelper;
         // Impermax Chef
         this.getImpermaxChef = () => this.getContractHelper().impermaxChef;
         this.lendingPool = lendingPool;

package/lib/onchain/impermaxFactory/lendingPool/collateral.js

@@ -17,7 +17,7 @@ class Collateral extends poolToken_1.default {
     constructor(lendingPool, poolTokenType) {
         super();
         this.collateralCache = {};
-        this.getContractHelper = () => this.lendingPool.factory.router.contractsHelper;
+        this.getContractHelper = () => this.lendingPool.factory.onchain.contractsHelper;
         this.lendingPool = lendingPool;
         this.poolTokenType = poolTokenType;
     }

package/lib/onchain/impermaxFactory/lendingPool/index.js

@@ -45,7 +45,7 @@ class LendingPool {
     }
     getOffchainLendingPool() {
         return __awaiter(this, void 0, void 0, function* () {
-            return this.factory.router.offchain.getLendingPool(this.factory.factory, this.pairAddress);
+            return this.factory.onchain.offchain.getLendingPool(this.factory.factory, this.pairAddress);
         });
     }
     initializePoolTokenAddresses() {
@@ -86,7 +86,7 @@ class LendingPool {
         return __awaiter(this, void 0, void 0, function* () {
             if (!(yield this.getIsStakedLPToken()))
                 return null;
-            return this.factory.router.contractsHelper.newStakedLPToken(this.pairAddress);
+            return this.factory.onchain.contractsHelper.newStakedLPToken(this.pairAddress);
         });
     }
     getStakedLPToken() {
@@ -99,7 +99,7 @@ class LendingPool {
     initializeUniswapV2Pair() {
         return __awaiter(this, void 0, void 0, function* () {
             const stakedLPToken = yield this.getStakedLPToken();
-            return this.factory.router.contractsHelper.newUniswapV2Pair(stakedLPToken
+            return this.factory.onchain.contractsHelper.newUniswapV2Pair(stakedLPToken
                 ? yield (stakedLPToken.methods.underlying().call())
                 : this.pairAddress);
         });
@@ -179,7 +179,7 @@ class LendingPool {
     getMarketPrice() {
         return __awaiter(this, void 0, void 0, function* () {
             const [reserve0, reserve1] = yield this.getReserves();
-            return this.factory.router.priceInverted ? 1 * reserve0 / reserve1 : 1 * reserve1 / reserve0;
+            return this.factory.onchain.priceInverted ? 1 * reserve0 / reserve1 : 1 * reserve1 / reserve0;
         });
     }
     // TWAP Price
@@ -208,7 +208,7 @@ class LendingPool {
         return __awaiter(this, void 0, void 0, function* () {
             if (!this.cache.TWAPPrice)
                 this.cache.TWAPPrice = this.initializeTWAPPrice();
-            return !this.factory.router.priceInverted ? (yield this.cache.TWAPPrice) : 1 / (yield this.cache.TWAPPrice);
+            return !this.factory.onchain.priceInverted ? (yield this.cache.TWAPPrice) : 1 / (yield this.cache.TWAPPrice);
         });
     }
     // Exchange rate
@@ -234,7 +234,7 @@ class LendingPool {
             if (!stakedLPToken)
                 return null;
             const rewardTokenAddress = yield stakedLPToken.methods.rewardsToken().call();
-            const rewardToken = this.factory.router.contractsHelper.newERC20(rewardTokenAddress);
+            const rewardToken = this.factory.onchain.contractsHelper.newERC20(rewardTokenAddress);
             const decimals = yield rewardToken.methods.decimals().call();
             let result = {
                 amount: 0,
@@ -247,7 +247,7 @@ class LendingPool {
             catch (_a) {
                 try {
                     const stakingRewardsAddress = yield stakedLPToken.methods.stakingRewards().call();
-                    const stakingRewards = this.factory.router.contractsHelper.newStakingRewards(stakingRewardsAddress);
+                    const stakingRewards = this.factory.onchain.contractsHelper.newStakingRewards(stakingRewardsAddress);
                     const earned = yield stakingRewards.methods.earned(stakedLPToken._address).call();
                     result.amount = earned / Math.pow(10, decimals);
                 }

package/lib/onchain/index.d.ts

@@ -17,6 +17,7 @@ export default class Onchain {
     contractsHelper: ContractsHelper;
     factories: FactoryIndex<ImpermaxFactory>;
     lendingVaults: AddressIndex<LendingVault>;
+    accounts: AddressIndex<Account>;
     uiMargin: number;
     dust: number;
     priceInverted: boolean;
@@ -25,4 +26,5 @@ export default class Onchain {
     setPriceInverted(priceInverted: boolean): void;
     getFactory(factory: Factory): ImpermaxFactory;
     getLendingVault(vaultAddress: Address): LendingVault;
+    getAccount(accountAddress: Address): Account;
 }

package/lib/onchain/index.js

@@ -41,7 +41,6 @@ const lendingVault_1 = __importDefault(require("./lendingVault"));
 exports.LendingVault = lendingVault_1.default;
 const poolToken_1 = __importDefault(require("./poolToken"));
 exports.PoolToken = poolToken_1.default;
-const assert = require("assert");
 class Onchain {
     constructor(cfg) {
         this.network = cfg.network;
@@ -53,6 +52,7 @@ class Onchain {
         this.priceInverted = cfg.priceInverted ? cfg.priceInverted : false;
         this.contractsHelper = new contractsHelper_1.default(this);
         this.factories = {};
+        this.accounts = {};
     }
     cleanCache() {
         for (const factory in this.factories) {
@@ -61,6 +61,9 @@ class Onchain {
         for (const vaultAddress in this.lendingVaults) {
             this.lendingVaults[vaultAddress].cleanCache();
         }
+        for (const accountAddress in this.accounts) {
+            this.accounts[accountAddress].cleanCache();
+        }
     }
     setPriceInverted(priceInverted) {
         this.priceInverted = priceInverted;
@@ -68,14 +71,17 @@ class Onchain {
     getFactory(factory) {
         if (!this.factories[factory])
             this.factories[factory] = new impermaxFactory_1.default(this, factory);
-        const impermaxFactory = this.factories[factory];
-        assert(impermaxFactory);
-        return impermaxFactory;
+        return this.factories[factory];
     }
     getLendingVault(vaultAddress) {
         if (!this.lendingVaults[vaultAddress])
             this.lendingVaults[vaultAddress] = new lendingVault_1.default(this, vaultAddress);
         return this.lendingVaults[vaultAddress];
     }
+    getAccount(accountAddress) {
+        if (!this.accounts[accountAddress])
+            this.accounts[accountAddress] = new account_1.default(this, accountAddress);
+        return this.accounts[accountAddress];
+    }
 }
 exports.default = Onchain;

package/package.json

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