impermax-sdk 2.1.331 → 2.1.332

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

@@ -28,7 +28,7 @@ export default class OffchainAccount {
     getOffchain: () => Offchain;
     getAccountAddress: () => string;
     private initializeLendingPool;
-    getLendingPool(factory: Factory, pair: Address): Promise<OffchainAccountLendingPool>;
+    getLendingPool(factory: Factory, pair: Address): Promise<OffchainAccountLendingPool | null>;
     private initializeVault;
     getVault(vaultAddress: Address): Promise<OffchainAccountVault>;
     getUserData(): Promise<FactoryIndex<UserData> | null>;

package/lib/offchain/account/offchainAccount.js

@@ -17,7 +17,11 @@ class OffchainAccount {
     }
     async initializeLendingPool(factory, pair) {
         const lendingPool = await this.offchain.getLendingPool(factory, pair);
-        return lendingPool.getNewAccountLendingPoolObject(this);
+        if (!lendingPool) {
+            console.error("AccountLendingPool is null:", pair, factory, this.offchain.network);
+            return null;
+        }
+        return lendingPool?.getNewAccountLendingPoolObject(this);
     }
     async getLendingPool(factory, pair) {
         if (!this.lendingPools[factory])
@@ -151,6 +155,8 @@ class OffchainAccount {
             // Get pools of this factory
             for (const poolAddress of poolsOfFactory) {
                 const pool = await this.getLendingPool(factory, poolAddress);
+                if (!pool)
+                    return 0;
                 // Don't take into account earnings with blacklisted pools
                 if (pool.getLendingPool().isBlacklisted())
                     continue;
@@ -176,6 +182,8 @@ class OffchainAccount {
             // Get pools of this factory
             for (const poolAddress of poolsOfFactory) {
                 const pool = await this.getLendingPool(factory, poolAddress);
+                if (!pool)
+                    continue;
                 lendingPools.push(pool);
             }
         }
@@ -209,6 +217,8 @@ class OffchainAccount {
             // Get pools of this factory
             for (const poolAddress of poolsOfFactory) {
                 const pool = await this.getLendingPool(factory, poolAddress);
+                if (!pool)
+                    continue;
                 lendingPools.push(pool);
             }
         }
@@ -237,6 +247,8 @@ class OffchainAccount {
             // Get pools of this factory
             for (const poolAddress of poolsOfFactory) {
                 const pool = await this.getLendingPool(factory, poolAddress);
+                if (!pool)
+                    continue;
                 lendingPools.push(pool);
             }
         }
@@ -260,6 +272,11 @@ class OffchainAccount {
     async getAccountMarketData(factory, poolAddress) {
         // Get market
         const pool = await this.getLendingPool(factory, poolAddress);
+        if (!pool)
+            return {
+                lending: { totalBalanceUSD: 0, totalAPR: 0 },
+                borrowing: { totalBalanceUSD: 0, totalAPR: 0 },
+            };
         // 1. Lending
         const [valueA, valueB, aprA, aprB] = await Promise.all([
             pool.getBorrowableA().getValue(),
@@ -314,6 +331,8 @@ class OffchainAccount {
     async getMarketDailyProfitUSD(factory, poolAddress) {
         // Get market
         const pool = await this.getLendingPool(factory, poolAddress);
+        if (!pool)
+            return 0;
         // Escape if blacklisted pool
         if (!pool.getLendingPool().isBlacklisted())
             return 0;

package/lib/offchain/account/offchainMultichainAccount.js

@@ -59,7 +59,8 @@ class OffchainMultichainAccount {
             }
             return Promise.all(positions);
         });
-        let results = (await Promise.all(networkPromises)).flat();
+        const accountLendingPools = (await Promise.all(networkPromises)).flat();
+        let results = accountLendingPools.filter(x => x);
         // Apply filters
         if (params.pairState)
             results = this.filterPairState(results, params.pairState);
@@ -87,7 +88,8 @@ class OffchainMultichainAccount {
             }
             return Promise.all(positions);
         });
-        let results = (await Promise.all(networkPromises)).flat();
+        const accountLendingPools = (await Promise.all(networkPromises)).flat();
+        let results = accountLendingPools.filter(x => x);
         // Apply filters
         if (params.pairState)
             results = this.filterPairState(results, params.pairState);
@@ -114,7 +116,8 @@ class OffchainMultichainAccount {
             }
             return Promise.all(positions);
         });
-        let results = (await Promise.all(networkPromises)).flat();
+        const accountLendingPools = (await Promise.all(networkPromises)).flat();
+        let results = accountLendingPools.filter(x => x);
         // Apply filters
         if (params.pairState)
             results = this.filterPairState(results, params.pairState);

package/lib/offchain/configManager/offchainPairConfig.d.ts

@@ -14,7 +14,7 @@ export default class OffchainPairConfig {
     protected getProposalParamFloat(param: string): number;
     getFactory(): Promise<Factory>;
     getPairAddress(): Promise<string>;
-    getLendingPool(): Promise<OffchainLendingPool>;
+    getLendingPool(): Promise<OffchainLendingPool | null>;
     getSafetyMargin(): Promise<number>;
     getLiquidationIncentive(): Promise<number>;
     getLiquidationFee(): Promise<number>;

package/lib/offchain/initializer/user/lendingPools.js

@@ -53,7 +53,12 @@ async function initializeUserData(account) {
             // Don't include supply positions if lending pool is not in pair list
             // if (pairs.length > 0 && !pairs.includes(lendingPoolId)) continue
             const underlyingId = supplyPosition.borrowable.underlying.id;
-            const borrowableA = (await this.getLendingPool(factory, lendingPoolId)).getBorrowableA();
+            const lendingPool = await this.getLendingPool(factory, lendingPoolId);
+            if (!lendingPool) {
+                console.error("Can't resolve supplyPosition because lendingPool is null. Lending pool:", lendingPoolId, this.network);
+                continue;
+            }
+            const borrowableA = lendingPool.getBorrowableA();
             const addressA = await borrowableA.getUnderlyingAddress();
             const poolTokenType = underlyingId === addressA
                 ? types_1.PoolTokenType.BorrowableA

package/lib/offchain/initializer/user/positionsV2.js

@@ -22,7 +22,12 @@ async function initializeV2Positions(offchain, factory, rawUserData, pairs) {
         if (pairs.length > 0 && !pairs.includes(lendingPoolId))
             continue;
         const underlyingId = borrowPosition.borrowable.underlying.id;
-        const borrowableA = (await offchain.getLendingPool(factory, lendingPoolId)).getBorrowableA();
+        const lendingPool = await offchain.getLendingPool(factory, lendingPoolId);
+        if (!lendingPool) {
+            console.error("Can't resolve v2 position because lendingPool is null. Lending pool:", lendingPoolId, offchain.network);
+            continue;
+        }
+        const borrowableA = lendingPool.getBorrowableA();
         const addressA = await borrowableA.getUnderlyingAddress();
         const poolTokenType = underlyingId === addressA
             ? types_1.PoolTokenType.BorrowableA

package/lib/offchain/offchain.d.ts

@@ -53,7 +53,7 @@ export default class Offchain {
     protected borrowersList: Promise<OffchainAccount[]> | null;
     constructor(offchainMultichain: OffchainMultichain, network: Networks);
     cleanCache(): void;
-    getLendingPool(factory: Factory, pairAddress: Address): Promise<OffchainLendingPool>;
+    getLendingPool(factory: Factory, pairAddress: Address): Promise<OffchainLendingPool | null>;
     getVault(vaultAddress: Address): Promise<OffchainVault>;
     getAccount(accountAddress: Address): OffchainAccount;
     getSolidexHelper: () => OffchainSolidexHelper;

package/lib/offchain/offchainMultichain.js

@@ -115,8 +115,13 @@ class OffchainMultichain {
             const lendingPoolsData = await offchain.getLendingPoolsData();
             // Factories
             const factoryPromises = Object.entries(lendingPoolsData).map(async ([factory, pools]) => {
-                const poolPromises = Object.keys(pools).map((poolId) => offchain.getLendingPool(factory, poolId));
-                return Promise.all(poolPromises);
+                const poolPromises = Object.keys(pools).map(async (poolId) => {
+                    const lendingPool = await offchain.getLendingPool(factory, poolId);
+                    if (!lendingPool)
+                        console.error("Can't include", poolId, factory, network, "in pools list");
+                    return lendingPool;
+                });
+                return (await Promise.all(poolPromises)).filter(x => x);
             });
             const factoryResults = await Promise.all(factoryPromises);
             return factoryResults.flat();

package/lib/offchain/vault/offchainLendingVault.js

@@ -49,6 +49,8 @@ class OffchainLendingVault extends offchainVault_1.default {
             if (pair) {
                 const account = this.getOffchain().getAccount(this.getVaultAddress());
                 const lendingPool = await account.getLendingPool(factory, borrowable.pairAddress);
+                if (!lendingPool)
+                    continue;
                 const underlyingAddress = await this.getUnderlyingAddress();
                 const underlyingAddressA = await lendingPool.getLendingPool().getBorrowableA().getUnderlyingAddress();
                 if (underlyingAddress.toLowerCase() === underlyingAddressA.toLowerCase())

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

@@ -38,6 +38,7 @@ class OnchainAccountCollateralV2 extends onchainAccountPoolToken_1.default {
         //if (await this.getLendingPool().getLendingPool().isStable()) {
         // TODO return stablePosition
         //} else {
+        const offchainLendingPool = await this.getLendingPool().getLendingPool().getOffchainLendingPool();
         return new position_1.UniswapV2Position({
             liquidity: await this.getLiquidity(),
             debtX: await this.getLendingPool().getBorrowableA().getBorrowed(),
@@ -48,7 +49,7 @@ class OnchainAccountCollateralV2 extends onchainAccountPoolToken_1.default {
             liquidationPenalty: await this.getLendingPool().getLiquidationPenalty(),
             borrowableX: await this.getLendingPool().getLendingPool().getBorrowableA().createBorrowableObject(lockStateChange),
             borrowableY: await this.getLendingPool().getLendingPool().getBorrowableB().createBorrowableObject(lockStateChange),
-            baseRate: (await (await this.getLendingPool().getLendingPool().getOffchainLendingPool()).getTotalAPR()) / utils_1.SECONDS_IN_YEAR,
+            baseRate: offchainLendingPool ? (await offchainLendingPool.getTotalAPR()) / utils_1.SECONDS_IN_YEAR : 0,
             lockStateChange,
         });
         //}

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

@@ -33,8 +33,11 @@ class OnchainAccountLendingPool {
     getInteractionsLendingPool() {
         return this.account.getInteractions().getLendingPool(this.getFactory(), this.getId());
     }
-    getOffchainAccountLendingPool() {
-        return this.account.getOffchainAccount().getLendingPool(this.getFactory(), this.getId());
+    async getOffchainAccountLendingPool() {
+        const accountLendingPool = await this.account.getOffchainAccount().getLendingPool(this.getFactory(), this.getId());
+        if (!accountLendingPool)
+            throw new Error("getOffchainAccountLendingPool");
+        return accountLendingPool;
     }
     // Supplied
     async getSuppliedUSD() {

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

@@ -25,6 +25,8 @@ class OnchainBorrowable extends onchainPoolToken_1.default {
     }
     async getOffchainPoolToken() {
         const lendingPool = await this.lendingPool.getOffchainLendingPool();
+        if (!lendingPool)
+            throw new Error("getOffchainPoolToken");
         return lendingPool.getBorrowable(this.borrowable);
     }
     async initializeToken() {

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

@@ -5,6 +5,7 @@ import OnchainBorrowable from './onchainBorrowable';
 import OnchainAccountLendingPool from "../../account/lendingPool";
 import OnchainInteractions, { OnchainInteractionsLendingPool } from "../../interactions";
 import OnchainAccount from "../../account";
+import { OffchainLendingPool } from "../../../offchain";
 export default abstract class OnchainLendingPool {
     protected readonly id: Address;
     protected readonly impermaxFactory: OnchainImpermaxFactory;
@@ -34,7 +35,7 @@ export default abstract class OnchainLendingPool {
     getCollateral: () => OnchainCollateral;
     protected getContractHelper: () => import("../..").OnchainContractsHelper;
     cleanCache(): void;
-    getOffchainLendingPool(): Promise<import("../../..").OffchainLendingPool>;
+    getOffchainLendingPool(): Promise<OffchainLendingPool>;
     private initializeLendingPoolAddresses;
     private getLendingPoolAddresses;
     getCollateralAddress(): Promise<string>;

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

@@ -27,7 +27,10 @@ class OnchainLendingPool {
         this.getCollateral().cleanCache();
     }
     async getOffchainLendingPool() {
-        return this.impermaxFactory.getOnchain().getOffchain().getLendingPool(this.impermaxFactory.getFactory(), this.id);
+        const lendingPool = await this.impermaxFactory.getOnchain().getOffchain().getLendingPool(this.impermaxFactory.getFactory(), this.id);
+        if (!lendingPool)
+            throw new Error("getOffchainLendingPool");
+        return lendingPool;
     }
     async initializeLendingPoolAddresses() {
         const lPool = await (await this.impermaxFactory.getFactoryContract()).methods.getLendingPool(this.id).call();

package/package.json

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