impermax-sdk 2.1.310 → 2.1.311

package/lib/index.d.ts

@@ -67,4 +67,5 @@ import OnchainNftlp from './onchain/impermaxFactory/lendingPool/nftlp';
 import OnchainAccountNftlp from './onchain/account/lendingPool/nftlp';
 import OffchainAccountBorrowableV3 from './offchain/account/lendingPool/offchainAccountBorrowableV3';
 import { PairState } from "./config/whitelist";
-export { offchain, OffchainMultichain, Offchain, OffchainPoolToken, OffchainLendingPool, OffchainCollateral, OffchainBorrowable, OffchainLendingPoolV2, OffchainCollateralV2, OffchainBorrowableV2, OffchainLendingPoolV3, OffchainCollateralV3, OffchainBorrowableV3, OffchainNftlp, OffchainNftlpUniswapV3, OffchainVault, OffchainLeveragedVault, OffchainLendingVault, OffchainHedgedVault, OffchainConfigManager, OffchainPairConfig, OffchainProposal, OffchainMultichainAccount, OffchainAccount, OffchainAccountPoolToken, OffchainAccountLendingPool, OffchainAccountCollateral, OffchainAccountBorrowable, OffchainAccountLendingPoolV2, OffchainAccountCollateralV2, OffchainAccountBorrowableV2, OffchainAccountLendingPoolV3, OffchainAccountCollateralV3, OffchainAccountBorrowableV3, OffchainAccountNftlp, OffchainAccountNftlpUniswapV3, OffchainLeveragedPosition, OffchainAccountVault, OffchainPriceHelper, OffchainSolidexHelper, PoolTokenData, BorrowableData, CollateralData, BorrowablePastData, TokenData, RewardData, PairData, FarmingPoolData, LendingPoolPastData, LendingPoolData, CollateralPosition, SupplyPosition, BorrowPosition, UserData, TvlData, XimxData, LendingVaultData, VaultPosition, PairConfigData, ProposalData, ProposalMetadata, VaultRisk, VaultType, onchain, Onchain, OnchainImpermaxFactory, OnchainImpermaxFactoryV2, OnchainImpermaxFactoryV3, OnchainPoolToken, OnchainLendingPool, OnchainBorrowable, OnchainCollateral, OnchainLendingPoolV2, OnchainBorrowableV2, OnchainCollateralV2, OnchainLendingPoolV3, OnchainBorrowableV3, OnchainCollateralV3, OnchainNftlp, OnchainNftlpUniswapV3, OnchainLendingVault, OnchainConfigManager, OnchainProposal, OnchainPairConfig, OnchainAccount, OnchainAccountPoolToken, OnchainAccountLendingPool, OnchainAccountBorrowable, OnchainAccountCollateral, OnchainAccountLendingPoolV2, OnchainAccountBorrowableV2, OnchainAccountCollateralV2, OnchainAccountLendingPoolV3, OnchainAccountBorrowableV3, OnchainAccountCollateralV3, OnchainAccountNftlp, OnchainAccountNftlpUniswapV3, OnchainAccountLendingVault, OnchainContractsHelper, OnchainInteractions, OnchainInteractionsPoolToken, OnchainInteractionsLendingPool, OnchainInteractionsCollateral, OnchainInteractionsBorrowable, OnchainInteractionsLendingPoolV2, OnchainInteractionsCollateralV2, OnchainInteractionsBorrowableV2, OnchainInteractionsLendingPoolV3, OnchainInteractionsCollateralV3, OnchainInteractionsBorrowableV3, OnchainInteractionsNftlp, OnchainInteractionsNftlpUniswapV3, OnchainInteractionsLendingVault, OnchainInteractionsConfigManager, Contract, ApprovalType, PermitData, OnchainConfig, Changes, NO_CHANGES, Values, AirdropData, PendingRewardUI, CollateralConfig, BorrowableV2Config, BorrowableV3Config, PairConfig, CLAIM_AGGREGATOR, IMPERMAX_CHEF, IMX, IMPERMAX_FACTORY, getNetworkFactories, getFactoryByAddress, LENDING_VAULT_WATCHER, 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, Extension, PoolTokenType, Amms, Address, NetworkIndex, FactoryIndex, AddressIndex, NetworkFactoryIndex, LendingPoolIndex, AmmIndex, DistributorDetails, ProposalState, WhitelistState, VaultListOrderBy, VaultListParams, LendingPoolListOrderBy, LendingPoolListParams, SortDirection, LendingPoolVersion, PositionType, AccountPosition, PermitType, Permits, Permit, Borrowable, decimalToBalance, MAX_TICK, MIN_TICK, formatPriceSqrtX96, uniV3TickToPrice, isV3Factory, UniswapV3Position, UniswapV2Position, Position, BorrowableEntity, PairState, SupplyPositionsParams, BorrowPositionsParams, TopPositionsParams, VaultPositionsParams, AccountEarningsParams };
+import { AccountMarketData } from './offchain/account/offchainAccount';
+export { offchain, OffchainMultichain, Offchain, OffchainPoolToken, OffchainLendingPool, OffchainCollateral, OffchainBorrowable, OffchainLendingPoolV2, OffchainCollateralV2, OffchainBorrowableV2, OffchainLendingPoolV3, OffchainCollateralV3, OffchainBorrowableV3, OffchainNftlp, OffchainNftlpUniswapV3, OffchainVault, OffchainLeveragedVault, OffchainLendingVault, OffchainHedgedVault, OffchainConfigManager, OffchainPairConfig, OffchainProposal, OffchainMultichainAccount, OffchainAccount, OffchainAccountPoolToken, OffchainAccountLendingPool, OffchainAccountCollateral, OffchainAccountBorrowable, OffchainAccountLendingPoolV2, OffchainAccountCollateralV2, OffchainAccountBorrowableV2, OffchainAccountLendingPoolV3, OffchainAccountCollateralV3, OffchainAccountBorrowableV3, OffchainAccountNftlp, OffchainAccountNftlpUniswapV3, OffchainLeveragedPosition, OffchainAccountVault, OffchainPriceHelper, OffchainSolidexHelper, PoolTokenData, BorrowableData, CollateralData, BorrowablePastData, TokenData, RewardData, PairData, FarmingPoolData, LendingPoolPastData, LendingPoolData, CollateralPosition, SupplyPosition, BorrowPosition, UserData, TvlData, XimxData, LendingVaultData, VaultPosition, PairConfigData, ProposalData, ProposalMetadata, VaultRisk, VaultType, onchain, Onchain, OnchainImpermaxFactory, OnchainImpermaxFactoryV2, OnchainImpermaxFactoryV3, OnchainPoolToken, OnchainLendingPool, OnchainBorrowable, OnchainCollateral, OnchainLendingPoolV2, OnchainBorrowableV2, OnchainCollateralV2, OnchainLendingPoolV3, OnchainBorrowableV3, OnchainCollateralV3, OnchainNftlp, OnchainNftlpUniswapV3, OnchainLendingVault, OnchainConfigManager, OnchainProposal, OnchainPairConfig, OnchainAccount, OnchainAccountPoolToken, OnchainAccountLendingPool, OnchainAccountBorrowable, OnchainAccountCollateral, OnchainAccountLendingPoolV2, OnchainAccountBorrowableV2, OnchainAccountCollateralV2, OnchainAccountLendingPoolV3, OnchainAccountBorrowableV3, OnchainAccountCollateralV3, OnchainAccountNftlp, OnchainAccountNftlpUniswapV3, OnchainAccountLendingVault, OnchainContractsHelper, OnchainInteractions, OnchainInteractionsPoolToken, OnchainInteractionsLendingPool, OnchainInteractionsCollateral, OnchainInteractionsBorrowable, OnchainInteractionsLendingPoolV2, OnchainInteractionsCollateralV2, OnchainInteractionsBorrowableV2, OnchainInteractionsLendingPoolV3, OnchainInteractionsCollateralV3, OnchainInteractionsBorrowableV3, OnchainInteractionsNftlp, OnchainInteractionsNftlpUniswapV3, OnchainInteractionsLendingVault, OnchainInteractionsConfigManager, Contract, ApprovalType, PermitData, OnchainConfig, Changes, NO_CHANGES, Values, AirdropData, PendingRewardUI, CollateralConfig, BorrowableV2Config, BorrowableV3Config, PairConfig, CLAIM_AGGREGATOR, IMPERMAX_CHEF, IMX, IMPERMAX_FACTORY, getNetworkFactories, getFactoryByAddress, LENDING_VAULT_WATCHER, 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, Extension, PoolTokenType, Amms, Address, NetworkIndex, FactoryIndex, AddressIndex, NetworkFactoryIndex, LendingPoolIndex, AmmIndex, DistributorDetails, ProposalState, WhitelistState, VaultListOrderBy, VaultListParams, LendingPoolListOrderBy, LendingPoolListParams, SortDirection, LendingPoolVersion, PositionType, AccountPosition, PermitType, Permits, Permit, Borrowable, decimalToBalance, MAX_TICK, MIN_TICK, formatPriceSqrtX96, uniV3TickToPrice, isV3Factory, UniswapV3Position, UniswapV2Position, Position, BorrowableEntity, PairState, SupplyPositionsParams, BorrowPositionsParams, TopPositionsParams, VaultPositionsParams, AccountEarningsParams, AccountMarketData };

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

@@ -3,6 +3,22 @@ import { Address, AddressIndex, Factory, FactoryIndex } from "../../config/types
 import OffchainAccountLendingPool from "./lendingPool";
 import OffchainAccountVault from "./vault/offchainAccountVault";
 import { VaultPosition, UserData } from "../offchainTypes";
+import { PairState } from '../../config/whitelist';
+import { Networks } from "../../config/types";
+export type AccountEarningsParams = {
+    networks?: Array<Networks>;
+    pairState?: PairState;
+};
+export interface AccountMarketData {
+    borrowing: {
+        totalBalanceUSD: number;
+        totalAPR: number;
+    };
+    lending: {
+        totalBalanceUSD: number;
+        totalAPR: number;
+    };
+}
 export default class OffchainAccount {
     private readonly offchain;
     private readonly accountAddress;
@@ -22,12 +38,20 @@ export default class OffchainAccount {
     getVaultsSuppliedUSD(): Promise<number>;
     getNftlpPositions(): Promise<FactoryIndex<Address[]>>;
     getVaultsEarningsUSD(): Promise<number>;
-    getVaultsYearlyYieldUSD(): Promise<number>;
+    getVaultsYearlyYieldUSD(params?: AccountEarningsParams): Promise<number>;
     getVaultsDailyYieldUSD(): Promise<number>;
     getSupplyEarningsUSD(): Promise<number>;
-    getSupplyYearlyYieldUSD(): Promise<number>;
+    getSupplyYearlyYieldUSD(params?: AccountEarningsParams): Promise<number>;
     getSupplyDailyYieldUSD(): Promise<number>;
+    getV2PositionsYearlyYieldUSD(params?: AccountEarningsParams): Promise<number>;
+    getV3PositionsYearlyYieldUSD(params?: AccountEarningsParams): Promise<number>;
+    getAccountMarketData(factory: Factory, poolAddress: Address): Promise<AccountMarketData>;
+    getMarketDailyProfitUSD(factory: Factory, poolAddress: Address): Promise<number>;
     getTotalEarningsUSD(): Promise<number>;
-    getTotalYearlyYieldUSD(): Promise<number>;
+    getTotalYearlyYieldUSD(params?: AccountEarningsParams): Promise<number>;
     getTotalDailyYieldUSD(): Promise<number>;
+    /**
+     * 1. Filter by whitelisted/deprecated/blacklisted pairs
+     */
+    filterPairState(offchainAccountLendingPools: Array<OffchainAccountLendingPool>, pairState: PairState): OffchainAccountLendingPool[];
 }

package/lib/offchain/account/offchainAccount.js

@@ -5,8 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const offchainAccountVault_1 = __importDefault(require("./vault/offchainAccountVault"));
 const offchainTypes_1 = require("../offchainTypes");
-// NOTE: Skipping supply positions earnings from blacklisted pools
-// TODO: Vault earnings the same, move vault whitelist to sdk
+const offchainLendingPool_1 = require("../lendingPool/offchainLendingPool");
 class OffchainAccount {
     constructor(offchain, account) {
         this.getOffchain = () => this.offchain;
@@ -118,7 +117,7 @@ class OffchainAccount {
         }
         return earningsUSD;
     }
-    async getVaultsYearlyYieldUSD() {
+    async getVaultsYearlyYieldUSD(params = {}) {
         let yieldUSD = 0;
         const vaultsUserData = await this.getVaultsUserData();
         if (!vaultsUserData)
@@ -165,30 +164,32 @@ class OffchainAccount {
         }
         return earningsUSD;
     }
-    async getSupplyYearlyYieldUSD() {
+    async getSupplyYearlyYieldUSD(params = {}) {
         let yieldUSD = 0;
         const positionsUserData = await this.getSupplyPositions();
         if (!positionsUserData)
             return 0;
+        const lendingPools = [];
         // Get positions by factory  
         for (const factory in positionsUserData) {
             const poolsOfFactory = positionsUserData[factory];
             // Get pools of this factory
             for (const poolAddress of poolsOfFactory) {
                 const pool = await this.getLendingPool(factory, poolAddress);
-                // Don't take into account earnings with blacklisted pools
-                if (pool.getLendingPool().isBlacklisted())
-                    continue;
-                // Get yearly yield = value * APR
-                const [valueA, valueB, aprA, aprB] = await Promise.all([
-                    pool.getBorrowableA().getValue(),
-                    pool.getBorrowableB().getValue(),
-                    pool.getBorrowableA().getPoolToken().getSupplyAPR(),
-                    pool.getBorrowableB().getPoolToken().getSupplyAPR()
-                ]);
-                yieldUSD += valueA * aprA + valueB * aprB;
+                lendingPools.push(pool);
             }
         }
+        const filteredPools = this.filterPairState(lendingPools, params.pairState ?? { whitelisted: true, deprecated: true });
+        for (const pool of filteredPools) {
+            // Get yearly yield = value * APR
+            const [valueA, valueB, aprA, aprB] = await Promise.all([
+                pool.getBorrowableA().getValue(),
+                pool.getBorrowableB().getValue(),
+                pool.getBorrowableA().getPoolToken().getSupplyAPR(),
+                pool.getBorrowableB().getPoolToken().getSupplyAPR()
+            ]);
+            yieldUSD += valueA * aprA + valueB * aprB;
+        }
         return yieldUSD;
     }
     async getSupplyDailyYieldUSD() {
@@ -196,10 +197,162 @@ class OffchainAccount {
         const yearlyYield = await this.getSupplyYearlyYieldUSD();
         return yearlyYield / 365;
     }
-    // TODO: Collaterals
-    //
-    // Overview
-    //
+    async getV2PositionsYearlyYieldUSD(params = {}) {
+        let yieldUSD = 0;
+        const positionsUserData = await this.getBorrowPositions();
+        if (!positionsUserData)
+            return 0;
+        const lendingPools = [];
+        // Get positions by factory  
+        for (const factory in positionsUserData) {
+            const poolsOfFactory = positionsUserData[factory];
+            // Get pools of this factory
+            for (const poolAddress of poolsOfFactory) {
+                const pool = await this.getLendingPool(factory, poolAddress);
+                lendingPools.push(pool);
+            }
+        }
+        const filteredPools = this.filterPairState(lendingPools, params.pairState ?? { whitelisted: true, deprecated: true });
+        for (const pool of filteredPools) {
+            const [position, priceX, priceY] = await Promise.all([
+                pool.getCollateral().getPositionObject(),
+                pool.getBorrowableA().getPoolToken().getTokenPriceAccurate(),
+                pool.getBorrowableB().getPoolToken().getTokenPriceAccurate(),
+            ]);
+            const poolYieldUSD = position.getLeveragedApr() * (position.getNetX() * priceX + position.getNetY() * priceY);
+            // NaN issue
+            yieldUSD += (poolYieldUSD || 0);
+        }
+        return yieldUSD;
+    }
+    async getV3PositionsYearlyYieldUSD(params = {}) {
+        let yieldUSD = 0;
+        const positionsUserData = await this.getNftlpPositions();
+        if (!positionsUserData)
+            return 0;
+        const lendingPools = [];
+        // Get positions by factory  
+        for (const factory in positionsUserData) {
+            const poolsOfFactory = positionsUserData[factory];
+            // Get pools of this factory
+            for (const poolAddress of poolsOfFactory) {
+                const pool = await this.getLendingPool(factory, poolAddress);
+                lendingPools.push(pool);
+            }
+        }
+        const filteredPools = this.filterPairState(lendingPools, params.pairState ?? { whitelisted: true, deprecated: true });
+        for (const pool of filteredPools) {
+            const nftlp = pool.getCollateral().getNftlp();
+            const [priceX, priceY, tokenIds] = await Promise.all([
+                pool.getBorrowableA().getPoolToken().getTokenPriceAccurate(),
+                pool.getBorrowableB().getPoolToken().getTokenPriceAccurate(),
+                nftlp.getTokenPositions()
+            ]);
+            const nftlpPromises = Object.values(tokenIds).map(async (i) => {
+                const position = await nftlp.getPositionObject(Number(i.tokenId));
+                const poolYieldUSD = position.getLeveragedApr() * (position.getNetX() * priceX + position.getNetY() * priceY);
+                return yieldUSD += (poolYieldUSD || 0);
+            });
+            await Promise.all([...nftlpPromises]);
+        }
+        return yieldUSD;
+    }
+    async getAccountMarketData(factory, poolAddress) {
+        // Get market
+        const pool = await this.getLendingPool(factory, poolAddress);
+        // 1. Lending
+        const [valueA, valueB, aprA, aprB] = await Promise.all([
+            pool.getBorrowableA().getValue(),
+            pool.getBorrowableB().getValue(),
+            pool.getBorrowableA().getPoolToken().getSupplyAPR(),
+            pool.getBorrowableB().getPoolToken().getSupplyAPR()
+        ]);
+        const lending = {
+            totalBalanceUSD: valueA + valueB,
+            totalAPR: (valueA * aprA + valueB * aprB) / (valueA + valueB)
+        };
+        let collateralBalanceUSD = 0;
+        let collateralAPR = 0;
+        // 2. Borrowing
+        if (pool.getLendingPool().getLendingPoolVersion() === offchainLendingPool_1.LendingPoolVersion.V3) {
+            const nftlp = pool.getCollateral().getNftlp();
+            // Weighted APR of all nftlp positions
+            let totalWeightedAPR = 0;
+            const [priceX, priceY, tokenIds] = await Promise.all([
+                pool.getBorrowableA().getPoolToken().getTokenPriceAccurate(),
+                pool.getBorrowableB().getPoolToken().getTokenPriceAccurate(),
+                nftlp.getTokenPositions(),
+            ]);
+            await Promise.all([...Object.values(tokenIds).map(async (i) => {
+                    const position = await nftlp.getPositionObject(Number(i.tokenId));
+                    const positionValueUSD = position.getNetX() * priceX + position.getNetY() * priceY;
+                    collateralBalanceUSD += positionValueUSD;
+                    totalWeightedAPR += positionValueUSD * position.getLeveragedApr();
+                    return;
+                })]);
+            collateralAPR = collateralBalanceUSD > 0 ? totalWeightedAPR / collateralBalanceUSD : 0;
+        }
+        else {
+            // For V2 just get position and add yto collateralYields
+            const collateral = pool.getCollateral();
+            ;
+            const [position, priceX, priceY] = await Promise.all([
+                collateral.getPositionObject(),
+                pool.getBorrowableA().getPoolToken().getTokenPriceAccurate(),
+                pool.getBorrowableB().getPoolToken().getTokenPriceAccurate(),
+            ]);
+            collateralBalanceUSD += (position.getNetX() * priceX + position.getNetY() * priceY);
+            collateralAPR = position.getLeveragedApr();
+        }
+        const borrowing = {
+            totalBalanceUSD: collateralBalanceUSD,
+            totalAPR: collateralAPR
+        };
+        return { borrowing, lending };
+    }
+    async getMarketDailyProfitUSD(factory, poolAddress) {
+        // Get market
+        const pool = await this.getLendingPool(factory, poolAddress);
+        // Escape if blacklisted pool
+        if (!pool.getLendingPool().isBlacklisted())
+            return 0;
+        // 1. Market Supply Yearly Yields
+        const [valueA, valueB, aprA, aprB] = await Promise.all([
+            pool.getBorrowableA().getValue(),
+            pool.getBorrowableB().getValue(),
+            pool.getBorrowableA().getPoolToken().getSupplyAPR(),
+            pool.getBorrowableB().getPoolToken().getSupplyAPR()
+        ]);
+        const yearlyMarketSupplyYields = valueA * aprA + valueB * aprB;
+        // 2. Collateral yearly yields
+        let yearlyMarketCollateralYields = 0;
+        // For V3, loop through all token Ids and add to collateralYields
+        if (pool.getLendingPool().getLendingPoolVersion() === offchainLendingPool_1.LendingPoolVersion.V3) {
+            const nftlp = pool.getCollateral().getNftlp();
+            const [priceX, priceY, tokenIds] = await Promise.all([
+                pool.getBorrowableA().getPoolToken().getTokenPriceAccurate(),
+                pool.getBorrowableB().getPoolToken().getTokenPriceAccurate(),
+                nftlp.getTokenPositions(),
+            ]);
+            await Promise.all([...Object.values(tokenIds).map(async (i) => {
+                    const position = await nftlp.getPositionObject(Number(i.tokenId));
+                    return yearlyMarketCollateralYields += position.getLeveragedApr() * (position.getNetX() * priceX + position.getNetY() * priceY);
+                })]);
+        }
+        else {
+            // For V2 just get position and add yto collateralYields
+            const collateral = pool.getCollateral();
+            ;
+            const [position, priceX, priceY] = await Promise.all([
+                collateral.getPositionObject(),
+                pool.getBorrowableA().getPoolToken().getTokenPriceAccurate(),
+                pool.getBorrowableB().getPoolToken().getTokenPriceAccurate(),
+            ]);
+            yearlyMarketCollateralYields += position.getLeveragedApr() * (position.getNetX() * priceX + position.getNetY() * priceY);
+        }
+        return (yearlyMarketCollateralYields + yearlyMarketSupplyYields) / 365;
+    }
+    // TODO: Collateral earnings? Not using this atm i think for anything other than vaults?
     async getTotalEarningsUSD() {
         const [supplyEarnings, vaultEarnings] = await Promise.all([
             this.getSupplyEarningsUSD(),
@@ -207,16 +360,33 @@ class OffchainAccount {
         ]);
         return supplyEarnings + vaultEarnings;
     }
-    async getTotalYearlyYieldUSD() {
-        const [supplyYield, vaultYield] = await Promise.all([
-            this.getSupplyYearlyYieldUSD(),
-            this.getVaultsYearlyYieldUSD()
+    async getTotalYearlyYieldUSD(params = {}) {
+        const [supplyYield, vaultYield, v2PositionYields, v3PositionYields] = await Promise.all([
+            this.getSupplyYearlyYieldUSD(params),
+            this.getVaultsYearlyYieldUSD(params),
+            this.getV2PositionsYearlyYieldUSD(params),
+            this.getV3PositionsYearlyYieldUSD(params),
         ]);
-        return supplyYield + vaultYield;
+        return supplyYield + vaultYield + v2PositionYields + v3PositionYields;
     }
     async getTotalDailyYieldUSD() {
         const yearlyYield = await this.getTotalYearlyYieldUSD();
         return yearlyYield / 365;
     }
+    /**
+     * 1. Filter by whitelisted/deprecated/blacklisted pairs
+     */
+    filterPairState(offchainAccountLendingPools, pairState) {
+        if (!pairState.whitelisted && !pairState.blacklisted && !pairState.deprecated)
+            return offchainAccountLendingPools;
+        const pools = [];
+        if (pairState.whitelisted)
+            pools.push(...offchainAccountLendingPools.filter(i => i.getLendingPool().isWhitelisted()));
+        if (pairState.blacklisted)
+            pools.push(...offchainAccountLendingPools.filter(i => i.getLendingPool().isBlacklisted()));
+        if (pairState.deprecated)
+            pools.push(...offchainAccountLendingPools.filter(i => i.getLendingPool().isDeprecated()));
+        return pools;
+    }
 }
 exports.default = OffchainAccount;

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

@@ -85,6 +85,7 @@ export default class OffchainMultichainAccount {
     getCollateralV2BalanceUSD(): Promise<number>;
     getNetAPR(): Promise<number>;
     getVaultsEarningsUSD(params?: AccountEarningsParams): Promise<number>;
+    getCollateralV2EarningsUSD(params?: AccountEarningsParams): Promise<number>;
     getSupplyEarningsUSD(params?: AccountEarningsParams): Promise<number>;
     getTotalEarningsUSD(params?: AccountEarningsParams): Promise<number>;
     getTotalYearlyYieldUSD(params?: AccountEarningsParams): Promise<number>;

package/lib/offchain/account/offchainMultichainAccount.js

@@ -178,7 +178,7 @@ class OffchainMultichainAccount {
                 pool.getLendingPool().getLendingPoolData(),
                 pool.getLendingPool().getFactory(),
             ]);
-            const totalValue = position.getNetX() * priceX + position.getNetY() * priceY;
+            const totalValue = (position.getNetX() * priceX + position.getNetY() * priceY) || 0;
             return {
                 name: `${symbolA}/${symbolB}`,
                 value: totalValue,
@@ -190,7 +190,7 @@ class OffchainMultichainAccount {
         }));
         const v3PositionValues = await Promise.all(v3Positions.map(async (pool) => {
             const nftlp = pool.getCollateral().getNftlp();
-            const [priceX, priceY, symbolA, symbolB, network, data, factory] = await Promise.all([
+            const [priceX, priceY, symbolA, symbolB, network, data, factory, tokenIds] = await Promise.all([
                 pool.getBorrowableA().getPoolToken().getTokenPriceAccurate(),
                 pool.getBorrowableB().getPoolToken().getTokenPriceAccurate(),
                 pool.getBorrowableA().getPoolToken().getSymbol(),
@@ -198,14 +198,14 @@ class OffchainMultichainAccount {
                 pool.getLendingPool().getOffchain().network,
                 pool.getLendingPool().getLendingPoolData(),
                 pool.getLendingPool().getFactory(),
+                nftlp.getTokenPositions()
             ]);
-            const tokenIds = await nftlp.getTokenPositions();
             const nftlpPromises = Object.values(tokenIds).map(async (i) => {
                 const position = await nftlp.getPositionObject(Number(i.tokenId));
                 return position.getNetX() * priceX + position.getNetY() * priceY;
             });
             const nftlpValues = await Promise.all([...nftlpPromises]);
-            const totalValue = nftlpValues.reduce((acc, val) => acc + val, 0);
+            const totalValue = nftlpValues.reduce((acc, val) => acc + val, 0) || 0;
             return {
                 name: `${symbolA}/${symbolB}`,
                 value: totalValue,
@@ -226,7 +226,7 @@ class OffchainMultichainAccount {
                 pool.getLendingPool().getLendingPoolData(),
                 pool.getLendingPool().getFactory(),
             ]);
-            const totalValue = valueA + valueB;
+            const totalValue = (valueA + valueB) || 0;
             return {
                 name: `${symbolA}/${symbolB}`,
                 value: totalValue,
@@ -341,6 +341,15 @@ class OffchainMultichainAccount {
         const results = await Promise.all(networkPromises);
         return results.reduce((acc, val) => acc + val, 0);
     }
+    async getCollateralV2EarningsUSD(params = {}) {
+        const allNetworks = params.networks ?? Object.values(types_1.Networks);
+        const networkPromises = allNetworks.map(async (network) => {
+            const offchainAccount = this.getOffchainAccount(network);
+            return offchainAccount.getSupplyEarningsUSD();
+        });
+        const results = await Promise.all(networkPromises);
+        return results.reduce((acc, val) => acc + val, 0);
+    }
     async getSupplyEarningsUSD(params = {}) {
         const allNetworks = params.networks ?? Object.values(types_1.Networks);
         const networkPromises = allNetworks.map(async (network) => {
@@ -363,7 +372,7 @@ class OffchainMultichainAccount {
         const allNetworks = params.networks ?? Object.values(types_1.Networks);
         const networkPromises = allNetworks.map(async (network) => {
             const offchainAccount = this.getOffchainAccount(network);
-            return offchainAccount.getTotalYearlyYieldUSD();
+            return offchainAccount.getTotalYearlyYieldUSD(params);
         });
         const results = await Promise.all(networkPromises);
         return results.reduce((acc, val) => acc + val, 0);

package/package.json

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