@defisaver/positions-sdk 2.1.161-portfolio-api-2-dev → 2.1.162-npm-token-dev

package/esm/claiming/king.d.ts

@@ -1,5 +1,4 @@
 import { Client } from 'viem';
 import { EthAddress, NetworkNumber } from '../types/common';
-import { KingRewardsClaimableToken } from '../types/claiming';
 export declare const fetchKingRewards: (walletAddress: EthAddress) => Promise<any>;
-export declare const getKingRewards: (provider: Client, network: NetworkNumber, walletAddresses: EthAddress[]) => Promise<Record<string, KingRewardsClaimableToken[]>>;
+export declare const getKingRewards: (provider: Client, network: NetworkNumber, walletAddresses: EthAddress[]) => Promise<Record<string, any[]>>;

package/esm/claiming/spark.d.ts

@@ -1,6 +1,6 @@
 import { Client } from 'viem';
 import { EthAddress, NetworkNumber } from '../types/common';
-import { SparkAirdropClaimableToken, SparkRewardsClaimableToken } from '../types/claiming';
+import { SparkRewardsClaimableToken } from '../types/claiming';
 export declare const fetchSpkAirdropRewards: (walletAddress: EthAddress) => Promise<any>;
-export declare const fetchSparkAirdropRewards: (provider: Client, network: NetworkNumber, walletAddresses: EthAddress[]) => Promise<Record<string, SparkAirdropClaimableToken[]>>;
+export declare const fetchSparkAirdropRewards: (provider: Client, network: NetworkNumber, walletAddresses: EthAddress[]) => Promise<Record<string, any[]>>;
 export declare const fetchSparkRewards: (provider: Client, network: NetworkNumber, walletAddress: EthAddress, marketAddress: EthAddress) => Promise<SparkRewardsClaimableToken[]>;

package/esm/claiming/spark.js

@@ -10,7 +10,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 import { assetAmountInEth, getAssetInfoByAddress } from '@defisaver/tokens';
 import Dec from 'decimal.js';
 import { createViemContractFromConfigFunc, SparkIncentiveDataProviderContractViem, SparkRewardsControllerViem, } from '../contracts';
-import { ClaimType, SparkAirdropType, } from '../types/claiming';
+import { ClaimType, SparkAirdropType } from '../types/claiming';
 import { compareAddresses, getEthAmountForDecimals } from '../services/utils';
 const IGNITION_REWARDS = '0xCBA0C0a2a0B6Bb11233ec4EA85C5bFfea33e724d';
 const PFL3_REWARDS = '0x7ac96180C4d6b2A328D3a19ac059D0E7Fc3C6d41';

package/esm/fluid/index.d.ts

@@ -1,6 +1,6 @@
 import { Client, PublicClient } from 'viem';
 import { EthAddress, EthereumProvider, NetworkNumber } from '../types/common';
-import { FluidAssetsData, FluidEarnPositionData, FluidMarketData, FluidMarketInfo, FluidUsedAssets, FluidVaultData, InnerFluidMarketData } from '../types';
+import { FluidAssetsData, FluidMarketData, FluidMarketInfo, FluidUsedAssets, FluidVaultData, InnerFluidMarketData } from '../types';
 export { FluidMerklOpportunityType, buildFluidMerklRewardMap, getFluidMerklCampaigns, attachFluidMerklIncentives, } from './merkl';
 export declare const EMPTY_USED_ASSET: {
     isSupplied: boolean;
@@ -71,10 +71,54 @@ export declare const getFluidTokenData: (provider: EthereumProvider, network: Ne
     depositRate: string;
     withdrawRate: string;
 }>;
-export declare const _getFluidDepositData: (provider: Client, network: NetworkNumber, token: string, address: EthAddress) => Promise<FluidEarnPositionData>;
-export declare const getFluidDepositData: (provider: EthereumProvider, network: NetworkNumber, token: string, address: EthAddress) => Promise<FluidEarnPositionData>;
-export declare const _getAllUserEarnPositionsWithFTokens: (provider: Client, network: NetworkNumber, user: EthAddress) => Promise<FluidEarnPositionData[]>;
-export declare const getAllUserEarnPositionsWithFTokens: (provider: EthereumProvider, network: NetworkNumber, user: EthAddress) => Promise<FluidEarnPositionData[]>;
+export declare const _getFluidDepositData: (provider: Client, network: NetworkNumber, token: string, address: EthAddress) => Promise<{
+    fTokenAddress: string | undefined;
+    fTokenSymbol: string;
+    decimals: string;
+    totalDeposited: string;
+    withdrawable: string;
+    apy: string;
+    depositRate: string;
+    withdrawRate: string;
+    deposited: string;
+    depositedShares: string;
+}>;
+export declare const getFluidDepositData: (provider: EthereumProvider, network: NetworkNumber, token: string, address: EthAddress) => Promise<{
+    fTokenAddress: string | undefined;
+    fTokenSymbol: string;
+    decimals: string;
+    totalDeposited: string;
+    withdrawable: string;
+    apy: string;
+    depositRate: string;
+    withdrawRate: string;
+    deposited: string;
+    depositedShares: string;
+}>;
+export declare const _getAllUserEarnPositionsWithFTokens: (provider: Client, network: NetworkNumber, user: EthAddress) => Promise<{
+    fTokenAddress: string | undefined;
+    fTokenSymbol: string;
+    decimals: string;
+    totalDeposited: string;
+    withdrawable: string;
+    apy: string;
+    depositRate: string;
+    withdrawRate: string;
+    deposited: string;
+    depositedShares: string;
+}[]>;
+export declare const getAllUserEarnPositionsWithFTokens: (provider: EthereumProvider, network: NetworkNumber, user: EthAddress) => Promise<{
+    fTokenAddress: string | undefined;
+    fTokenSymbol: string;
+    decimals: string;
+    totalDeposited: string;
+    withdrawable: string;
+    apy: string;
+    depositRate: string;
+    withdrawRate: string;
+    deposited: string;
+    depositedShares: string;
+}[]>;
 export declare const _getUserPositions: (provider: PublicClient, network: NetworkNumber, user: EthAddress) => Promise<{
     marketData: FluidMarketData | undefined;
     userData: {

package/esm/helpers/aaveHelpers/index.d.ts

@@ -1,4 +1,4 @@
-import { AaveHelperCommon, AaveMarketInfo, AaveV3AggregatedPositionData, AaveV3AssetsData, AaveV3UsedAsset, AaveV3UsedAssets, AaveVersions } from '../../types';
+import { AaveHelperCommon, AaveMarketInfo, AaveV3AggregatedPositionData, AaveV3AssetsData, AaveV3UsedAsset, AaveV3UsedAssets, AaveVersions, EModeCategoriesData } from '../../types';
 import { EthereumProvider, NetworkNumber } from '../../types/common';
 export declare const AAVE_V3_MARKETS: AaveVersions[];
 export declare const isAaveV2: ({ selectedMarket }: {
@@ -15,6 +15,14 @@ export declare const aaveV3IsInSiloedMode: ({ usedAssets, assetsData }: {
     usedAssets: AaveV3UsedAssets;
     assetsData: AaveV3AssetsData;
 }) => boolean;
+export declare const aaveV3IsEmodeIsolated: ({ eModeCategory, eModeCategoriesData }: {
+    eModeCategory: number;
+    eModeCategoriesData?: EModeCategoriesData;
+}) => boolean;
+export declare const aaveV3CanBeCollateralInEmode: ({ eModeCategory, eModeCategoriesData }: {
+    eModeCategory: number;
+    eModeCategoriesData?: EModeCategoriesData;
+}, _asset: string) => boolean;
 export declare const aaveAnyGetCollSuppliedAssets: ({ usedAssets }: {
     usedAssets: AaveV3UsedAssets;
 }) => AaveV3UsedAsset[];

package/esm/helpers/aaveHelpers/index.js

@@ -33,6 +33,12 @@ export const isAaveV2 = ({ selectedMarket }) => selectedMarket.value === AaveVer
 export const isAaveV3 = ({ selectedMarket }) => AAVE_V3_MARKETS.includes(selectedMarket.value);
 export const aaveV3IsInIsolationMode = ({ usedAssets, assetsData }) => Object.values(usedAssets).some(({ symbol, collateral }) => collateral && assetsData[symbol].isIsolated);
 export const aaveV3IsInSiloedMode = ({ usedAssets, assetsData }) => Object.values(usedAssets).some(({ symbol, debt }) => debt && assetsData[symbol].isSiloed);
+export const aaveV3IsEmodeIsolated = ({ eModeCategory, eModeCategoriesData }) => { var _a; return eModeCategory !== 0 && !!((_a = eModeCategoriesData === null || eModeCategoriesData === void 0 ? void 0 : eModeCategoriesData[eModeCategory]) === null || _a === void 0 ? void 0 : _a.isolated); };
+export const aaveV3CanBeCollateralInEmode = ({ eModeCategory, eModeCategoriesData }, _asset) => {
+    if (!aaveV3IsEmodeIsolated({ eModeCategory, eModeCategoriesData }))
+        return true;
+    return eModeCategoriesData[eModeCategory].collateralAssets.includes(getNativeAssetFromWrapped(_asset));
+};
 export const aaveAnyGetCollSuppliedAssets = ({ usedAssets }) => Object.values(usedAssets)
     .filter(({ isSupplied, collateral }) => isSupplied && collateral);
 export const aaveAnyGetSuppliableAssets = (_a) => {
@@ -40,13 +46,16 @@ export const aaveAnyGetSuppliableAssets = (_a) => {
     const data = Object.assign({ usedAssets, eModeCategory, assetsData, selectedMarket, network }, rest);
     const collAccountAssets = aaveAnyGetCollSuppliedAssets(data);
     const marketAssets = Object.values(assetsData);
-    if (collAccountAssets.length === 0 || !isAaveV3(data))
+    if (!isAaveV3(data))
         return marketAssets.filter(({ canBeSupplied }) => canBeSupplied).map(({ symbol }) => ({ symbol, canBeCollateral: true }));
+    const canBeCollateralInEmode = (symbol) => aaveV3CanBeCollateralInEmode(data, symbol);
+    if (collAccountAssets.length === 0)
+        return marketAssets.filter(({ canBeSupplied }) => canBeSupplied).map(({ symbol }) => ({ symbol, canBeCollateral: canBeCollateralInEmode(symbol) }));
     if (aaveV3IsInIsolationMode(data)) {
         const collAsset = collAccountAssets[0].symbol;
-        return marketAssets.filter(d => d.canBeSupplied).map(({ symbol }) => ({ symbol, canBeCollateral: symbol === collAsset }));
+        return marketAssets.filter(d => d.canBeSupplied).map(({ symbol }) => ({ symbol, canBeCollateral: symbol === collAsset && canBeCollateralInEmode(symbol) }));
     }
-    return marketAssets.filter(d => d.canBeSupplied).map(({ symbol, isIsolated }) => ({ symbol, canBeCollateral: !isIsolated }));
+    return marketAssets.filter(d => d.canBeSupplied).map(({ symbol, isIsolated }) => ({ symbol, canBeCollateral: !isIsolated && canBeCollateralInEmode(symbol) }));
 };
 export const aaveAnyGetSuppliableAsCollAssets = (_a) => {
     var { usedAssets, eModeCategory, assetsData, selectedMarket, network } = _a, rest = __rest(_a, ["usedAssets", "eModeCategory", "assetsData", "selectedMarket", "network"]);
@@ -56,12 +65,15 @@ export const aaveAnyGetEmodeMutableProps = ({ eModeCategory, eModeCategoriesData
     const asset = getNativeAssetFromWrapped(_asset);
     const assetData = assetsData[asset];
     const eModeCategoryData = (eModeCategoriesData === null || eModeCategoriesData === void 0 ? void 0 : eModeCategoriesData[eModeCategory]) || {
-        collateralAssets: [], ltvZeroAssets: [], collateralFactor: '0', liquidationRatio: '0',
+        collateralAssets: [], ltvZeroAssets: [], collateralFactor: '0', liquidationRatio: '0', isolated: false,
     };
     if (eModeCategory === 0
         || !eModeCategoryData.collateralAssets.includes(asset)
         || new Dec(eModeCategoryData.collateralFactor || 0).eq(0)) {
         const { liquidationRatio, collateralFactor } = assetData;
+        if (eModeCategory !== 0 && eModeCategoryData.isolated && !eModeCategoryData.collateralAssets.includes(asset)) {
+            return ({ liquidationRatio, collateralFactor: '0' });
+        }
         return ({ liquidationRatio, collateralFactor });
     }
     if (eModeCategoryData.ltvZeroAssets.includes(asset))
@@ -96,7 +108,10 @@ export const aaveAnyGetUserReserveLtvAndLltv = ({ eModeCategory, eModeCategories
         || !eModeCategoryData
         || !eModeCategoryData.collateralAssets.includes(asset)
         || new Dec(eModeCategoryData.collateralFactor || 0).eq(0)) {
-        return { ltv: assetData.collateralFactor, lltv: assetData.liquidationRatio };
+        const ltv = eModeCategory !== 0 && (eModeCategoryData === null || eModeCategoryData === void 0 ? void 0 : eModeCategoryData.isolated) && !eModeCategoryData.collateralAssets.includes(asset)
+            ? '0'
+            : assetData.collateralFactor;
+        return { ltv, lltv: assetData.liquidationRatio };
     }
     const ltv = eModeCategoryData.ltvZeroAssets.includes(asset) ? '0' : eModeCategoryData.collateralFactor;
     return { ltv, lltv: eModeCategoryData.liquidationRatio };

package/esm/liquity/index.d.ts

@@ -1,6 +1,6 @@
 import { Client } from 'viem';
 import { Blockish, EthAddress, EthereumProvider, NetworkNumber, PositionBalances } from '../types/common';
-import { LiquityStakingData, LiquityTroveInfo } from '../types';
+import { LiquityTroveInfo } from '../types';
 export declare const LIQUITY_NORMAL_MODE_RATIO = 110;
 export declare const LIQUITY_RECOVERY_MODE_RATIO = 150;
 export declare const _getLiquityAccountBalances: (provider: Client, network: NetworkNumber, block: Blockish, addressMapping: boolean, address: EthAddress) => Promise<PositionBalances>;
@@ -8,4 +8,14 @@ export declare const getLiquityAccountBalances: (provider: EthereumProvider, net
 export declare const getDebtInFront: (provider: EthereumProvider, address: EthAddress) => Promise<string>;
 export declare const _getLiquityTroveInfo: (provider: Client, network: NetworkNumber, address: EthAddress) => Promise<LiquityTroveInfo>;
 export declare const getLiquityTroveInfo: (provider: EthereumProvider, network: NetworkNumber, address: EthAddress) => Promise<LiquityTroveInfo>;
-export declare const getLiquityStakingData: (provider: Client, network: NetworkNumber, address: EthAddress) => Promise<LiquityStakingData>;
+export declare const getLiquityStakingData: (provider: Client, network: NetworkNumber, address: EthAddress) => Promise<{
+    totalLUSDDeposited: string;
+    totalLQTYStaked: string;
+    stakedLQTY: string;
+    stakedLUSDBalance: string;
+    rewardETH: string;
+    rewardLUSD: string;
+    stabilityRewardETH: string;
+    stabilityRewardLQTY: string;
+    showStakingBalances: boolean;
+}>;

package/esm/liquityV2/index.d.ts

@@ -1,6 +1,6 @@
 import { Client, PublicClient } from 'viem';
 import { EthAddress, EthereumProvider, NetworkNumber } from '../types/common';
-import { LiquityV2AssetsData, LiquityV2MarketData, LiquityV2MarketInfo, LiquityV2SBoldYBoldData, LiquityV2StakingData, LiquityV2TroveData, LiquityV2Versions } from '../types';
+import { LiquityV2AssetsData, LiquityV2MarketData, LiquityV2MarketInfo, LiquityV2TroveData, LiquityV2Versions } from '../types';
 export type SPYieldGainParameters = {
     P: string;
     aggWeightedDebtSum: string;
@@ -44,5 +44,25 @@ export type sBoldYieldParameters = {
     wsETH: string;
     rETH: string;
 };
-export declare const getLiquityV2Staking: (provider: Client, network: NetworkNumber, market: LiquityV2Versions, user: EthAddress) => Promise<LiquityV2StakingData>;
-export declare const getLiquitySAndYBold: (provider: Client, network: NetworkNumber, markets: any, user: EthAddress) => Promise<LiquityV2SBoldYBoldData>;
+export declare const getLiquityV2Staking: (provider: Client, network: NetworkNumber, market: LiquityV2Versions, user: EthAddress) => Promise<{
+    totalBOLDDeposited: string;
+    stakedBOLDBalance: string;
+    stabilityRewardColl: string;
+    stabilityRewardYield: string;
+    showStakingBalances: boolean;
+    debtTokenBalance: string;
+    stabilityPoolApy: string;
+}>;
+export declare const getLiquitySAndYBold: (provider: Client, network: NetworkNumber, markets: any, user: EthAddress) => Promise<{
+    spApy: string;
+    yBoldApy: string;
+    totalBoldDepositedSBold: string;
+    boldRateSBold: string;
+    maxWithdrawSBold: string;
+    totalBoldDepositedYBold: string;
+    boldRateYBold: string;
+    maxWithdrawYBold: string;
+    sBoldBalance: string;
+    yBoldBalance: string;
+    stYBoldBalance: string;
+}>;

package/esm/portfolio/index.d.ts

@@ -1,9 +1,9 @@
 import { EthAddress, EthereumProvider, NetworkNumber } from '../types/common';
-import { PortfolioDataOptions, PortfolioMarketsData, PortfolioPositionsData, PortfolioRewardsData, PortfolioStakingPositionsData } from '../types';
-export declare function getPortfolioData(provider: EthereumProvider, network: NetworkNumber, defaultProvider: EthereumProvider, addresses: EthAddress[], isSim?: boolean, options?: PortfolioDataOptions): Promise<{
+import { PortfolioPositionsData } from '../types';
+export declare function getPortfolioData(provider: EthereumProvider, network: NetworkNumber, defaultProvider: EthereumProvider, addresses: EthAddress[], isSim?: boolean): Promise<{
     positions: PortfolioPositionsData;
-    stakingPositions: PortfolioStakingPositionsData;
-    rewardsData: PortfolioRewardsData;
-    markets: PortfolioMarketsData;
+    stakingPositions: any;
+    rewardsData: any;
+    markets: any;
 }>;
 export * from './discovery';

package/esm/portfolio/index.js

@@ -34,13 +34,8 @@ import { fetchEthenaAirdropRewards } from '../claiming/ethena';
 import { _getAaveV4AccountData, _getAaveV4SpokeData } from '../aaveV4';
 import { getUniswapRewards } from '../claiming/uniswap';
 export function getPortfolioData(provider_1, network_1, defaultProvider_1, addresses_1) {
-    return __awaiter(this, arguments, void 0, function* (provider, network, defaultProvider, addresses, isSim = false, options = {}) {
+    return __awaiter(this, arguments, void 0, function* (provider, network, defaultProvider, addresses, isSim = false) {
         const isMainnet = network === NetworkNumber.Eth;
-        const includeStaking = options.staking !== false;
-        const includeRewards = options.rewards !== false;
-        // The addresses staking and rewards are read for: none when left out, so their fetches below make no calls.
-        const stakingAddresses = includeStaking ? addresses : [];
-        const rewardsAddresses = includeRewards ? addresses : [];
         const isFluidSupported = [NetworkNumber.Eth, NetworkNumber.Arb, NetworkNumber.Base, NetworkNumber.Plasma].includes(network);
         const morphoMarkets = Object.values(MorphoBlueMarkets(network)).filter((market) => market.chainIds.includes(network));
         const morphoMidnightMarkets = Object.values(MorphoMidnightMarkets(network)).filter((market) => market.chainIds.includes(network));
@@ -112,7 +107,7 @@ export function getPortfolioData(provider_1, network_1, defaultProvider_1, addre
             };
         }
         // TODO: check default values, probably needed when fetching portfolio on unsupported networks
-        for (const address of stakingAddresses) {
+        for (const address of addresses) {
             stakingPositions[address.toLowerCase()] = {
                 aaveV3: {},
                 morphoBlue: {},
@@ -126,20 +121,14 @@ export function getPortfolioData(provider_1, network_1, defaultProvider_1, addre
                     error: '',
                     data: {},
                 },
-                // Set by the sBOLD/yBOLD fetch below, whether it succeeds or fails.
-                liquityV2SBoldYBold: { error: '', data: null },
             };
-        }
-        for (const address of rewardsAddresses) {
-            // merkl, spk, king and uniswap are set by their fetches below, whether they succeed or fail.
             rewardsData[address.toLowerCase()] = {
-                merkl: { error: '', data: null },
+                merkl: {},
                 aaveV3: {},
                 spark: {},
-                spk: { error: '', data: null },
-                king: { error: '', data: null },
+                spk: {},
+                king: {},
                 ethena: {},
-                uniswap: { error: '', data: null },
             };
         }
         yield Promise.allSettled([
@@ -215,7 +204,7 @@ export function getPortfolioData(provider_1, network_1, defaultProvider_1, addre
                 }
             })),
             // === STAKING DATA (independent of market data) ===
-            ...stakingAddresses.map((address) => __awaiter(this, void 0, void 0, function* () {
+            ...addresses.map((address) => __awaiter(this, void 0, void 0, function* () {
                 try {
                     if (!isFluidSupported)
                         return;
@@ -226,7 +215,7 @@ export function getPortfolioData(provider_1, network_1, defaultProvider_1, addre
                     stakingPositions[address.toLowerCase()].fluid = { error: `Error fetching Fluid lend data for address ${address}`, data: null };
                 }
             })),
-            ...stakingAddresses.map((address) => __awaiter(this, void 0, void 0, function* () {
+            ...addresses.map((address) => __awaiter(this, void 0, void 0, function* () {
                 try {
                     if (!isMainnet)
                         return;
@@ -237,7 +226,7 @@ export function getPortfolioData(provider_1, network_1, defaultProvider_1, addre
                     stakingPositions[address.toLowerCase()].liquity = { error: `Error fetching Liquity staking data for address ${address}`, data: null };
                 }
             })),
-            ...stakingAddresses.map((address) => __awaiter(this, void 0, void 0, function* () {
+            ...addresses.map((address) => __awaiter(this, void 0, void 0, function* () {
                 try {
                     if (!isMainnet)
                         return;
@@ -248,7 +237,7 @@ export function getPortfolioData(provider_1, network_1, defaultProvider_1, addre
                     stakingPositions[address.toLowerCase()].aaveV3 = { error: `Error fetching Aave V3 staking data for address ${address}`, data: null };
                 }
             })),
-            ...stakingAddresses.map((address) => __awaiter(this, void 0, void 0, function* () {
+            ...addresses.map((address) => __awaiter(this, void 0, void 0, function* () {
                 try {
                     if (!isMainnet)
                         return;
@@ -260,7 +249,7 @@ export function getPortfolioData(provider_1, network_1, defaultProvider_1, addre
                 }
             })),
             // Liquity V2 staking
-            ...liquityV2MarketsStaking.map(market => stakingAddresses.map((address) => __awaiter(this, void 0, void 0, function* () {
+            ...liquityV2MarketsStaking.map(market => addresses.map((address) => __awaiter(this, void 0, void 0, function* () {
                 try {
                     if (!isMainnet) {
                         stakingPositions[address.toLowerCase()].liquityV2[market.value] = { error: '', data: null };
@@ -279,13 +268,13 @@ export function getPortfolioData(provider_1, network_1, defaultProvider_1, addre
             (() => __awaiter(this, void 0, void 0, function* () {
                 try {
                     if (!isMainnet) {
-                        for (const address of rewardsAddresses) {
+                        for (const address of addresses) {
                             rewardsData[address.toLowerCase()].king = { error: '', data: [] };
                         }
                         return;
                     }
-                    const kingRewards = yield getKingRewards(client, network, rewardsAddresses);
-                    for (const address of rewardsAddresses) {
+                    const kingRewards = yield getKingRewards(client, network, addresses);
+                    for (const address of addresses) {
                         const lowerAddress = address.toLowerCase();
                         rewardsData[lowerAddress].king = {
                             error: '',
@@ -295,7 +284,7 @@ export function getPortfolioData(provider_1, network_1, defaultProvider_1, addre
                 }
                 catch (error) {
                     console.error('Error fetching King rewards data in batch:', error);
-                    for (const address of rewardsAddresses) {
+                    for (const address of addresses) {
                         rewardsData[address.toLowerCase()].king = {
                             error: 'Error fetching King rewards data in batch',
                             data: null,
@@ -307,13 +296,13 @@ export function getPortfolioData(provider_1, network_1, defaultProvider_1, addre
             (() => __awaiter(this, void 0, void 0, function* () {
                 try {
                     if (!isMainnet) {
-                        for (const address of rewardsAddresses) {
+                        for (const address of addresses) {
                             rewardsData[address.toLowerCase()].uniswap = { error: '', data: [] };
                         }
                         return;
                     }
-                    const uniswapRewards = yield getUniswapRewards(client, network, rewardsAddresses);
-                    for (const address of rewardsAddresses) {
+                    const uniswapRewards = yield getUniswapRewards(client, network, addresses);
+                    for (const address of addresses) {
                         const lowerAddress = address.toLowerCase();
                         rewardsData[lowerAddress].uniswap = {
                             error: '',
@@ -323,7 +312,7 @@ export function getPortfolioData(provider_1, network_1, defaultProvider_1, addre
                 }
                 catch (error) {
                     console.error('Error fetching Uniswap rewards data in batch:', error);
-                    for (const address of rewardsAddresses) {
+                    for (const address of addresses) {
                         rewardsData[address.toLowerCase()].uniswap = {
                             error: 'Error fetching Uniswap rewards data in batch',
                             data: null,
@@ -331,7 +320,7 @@ export function getPortfolioData(provider_1, network_1, defaultProvider_1, addre
                     }
                 }
             }))(),
-            ...sparkMarkets.map((market) => rewardsAddresses.map((address) => __awaiter(this, void 0, void 0, function* () {
+            ...sparkMarkets.map((market) => addresses.map((address) => __awaiter(this, void 0, void 0, function* () {
                 try {
                     if (!isMainnet) {
                         rewardsData[address.toLowerCase()].spark[market.value] = { error: '', data: [] };
@@ -345,7 +334,7 @@ export function getPortfolioData(provider_1, network_1, defaultProvider_1, addre
                     rewardsData[address.toLowerCase()].spark[market.value] = { error: `Error fetching Spark rewards data for address ${address}`, data: null };
                 }
             }))).flat(),
-            ...rewardsAddresses.map((address) => __awaiter(this, void 0, void 0, function* () {
+            ...addresses.map((address) => __awaiter(this, void 0, void 0, function* () {
                 try {
                     const merklData = yield getMerklUnclaimedRewards(address, network);
                     rewardsData[address.toLowerCase()].merkl = { error: '', data: merklData };
@@ -355,28 +344,27 @@ export function getPortfolioData(provider_1, network_1, defaultProvider_1, addre
                     rewardsData[address.toLowerCase()].merkl = { error: `Error fetching Merkl rewards data for address ${address}`, data: null };
                 }
             })),
-            ...aaveV3Markets.map(market => rewardsAddresses.map((address) => __awaiter(this, void 0, void 0, function* () {
+            ...aaveV3Markets.map(market => addresses.map((address) => __awaiter(this, void 0, void 0, function* () {
                 try {
                     const aaveData = yield getUnclaimedRewardsForAllMarkets(client, network, address, market.providerAddress);
                     rewardsData[address.toLowerCase()].aaveV3[market.value] = { error: '', data: aaveData };
                 }
                 catch (error) {
                     console.error(`Error fetching Aave V3 Merit rewards data for address ${address}:`, error);
-                    // This market only: the other markets keep their rewards.
-                    rewardsData[address.toLowerCase()].aaveV3[market.value] = { error: `Error fetching Aave V3 rewards data for address ${address} on market ${market.value}`, data: null };
+                    rewardsData[address.toLowerCase()].aaveV3 = { error: `Error fetching Aave V3 rewards data for address ${address}`, data: null };
                 }
             }))).flat(),
             // Batch Spark Airdrop rewards
             (() => __awaiter(this, void 0, void 0, function* () {
                 try {
                     if (!isMainnet) {
-                        for (const address of rewardsAddresses) {
+                        for (const address of addresses) {
                             rewardsData[address.toLowerCase()].spk = { error: '', data: [] };
                         }
                         return;
                     }
-                    const sparkAirdropRewards = yield fetchSparkAirdropRewards(client, network, rewardsAddresses);
-                    for (const address of rewardsAddresses) {
+                    const sparkAirdropRewards = yield fetchSparkAirdropRewards(client, network, addresses);
+                    for (const address of addresses) {
                         const lowerAddress = address.toLowerCase();
                         rewardsData[lowerAddress].spk = {
                             error: '',
@@ -386,7 +374,7 @@ export function getPortfolioData(provider_1, network_1, defaultProvider_1, addre
                 }
                 catch (error) {
                     console.error('Error fetching Spark Airdrop rewards data in batch:', error);
-                    for (const address of rewardsAddresses) {
+                    for (const address of addresses) {
                         rewardsData[address.toLowerCase()].spk = {
                             error: 'Error fetching Spark Airdrop rewards data in batch',
                             data: null,
@@ -399,8 +387,8 @@ export function getPortfolioData(provider_1, network_1, defaultProvider_1, addre
                     if (!isMainnet) {
                         return;
                     }
-                    const ethenaAirdropRewards = yield fetchEthenaAirdropRewards(rewardsAddresses);
-                    for (const address of rewardsAddresses) {
+                    const ethenaAirdropRewards = yield fetchEthenaAirdropRewards(addresses);
+                    for (const address of addresses) {
                         const lowerAddress = address.toLowerCase();
                         rewardsData[lowerAddress].ethena = {
                             error: '',
@@ -410,7 +398,7 @@ export function getPortfolioData(provider_1, network_1, defaultProvider_1, addre
                 }
                 catch (error) {
                     console.error('Error fetching Ethena Airdrop rewards data:', error);
-                    for (const address of rewardsAddresses) {
+                    for (const address of addresses) {
                         rewardsData[address.toLowerCase()].ethena = {
                             error: 'Error fetching Ethena Airdrop rewards data in batch',
                             data: null,
@@ -446,16 +434,15 @@ export function getPortfolioData(provider_1, network_1, defaultProvider_1, addre
                 try {
                     const [accDataPromise, earnDataPromise] = yield Promise.allSettled([
                         _getMorphoBlueAccountData(client, network, address, market, morphoMarketsData[market.value]),
-                        includeStaking ? getMorphoEarn(client, network, address, market, morphoMarketsData[market.value]) : null,
+                        getMorphoEarn(client, network, address, market, morphoMarketsData[market.value]),
                     ]);
                     if (accDataPromise.status === 'rejected') {
                         console.error(`Error fetching MorphoBlue account data for address ${address} on market ${market.value}:`, accDataPromise.reason);
                         positions[address.toLowerCase()].morphoBlue[market.value] = { error: `Error fetching MorphoBlue account data for address ${address} on market ${market.value}`, data: null };
                     }
                     if (earnDataPromise.status === 'rejected') {
-                        // An Earn failure belongs to the staking entry: the lending position is not the one that failed.
-                        console.error(`Error fetching MorphoBlue earn data for address ${address} on market ${market.value}:`, earnDataPromise.reason);
-                        stakingPositions[address.toLowerCase()].morphoBlue[market.value] = { error: `Error fetching MorphoBlue earn data for address ${address} on market ${market.value}`, data: null };
+                        console.error(`Error fetching MorphoBlue account data for address ${address} on market ${market.value}:`, earnDataPromise.reason);
+                        positions[address.toLowerCase()].morphoBlue[market.value] = { error: `Error fetching MorphoBlue account data for address ${address} on market ${market.value}`, data: null };
                     }
                     if (accDataPromise.status !== 'rejected') {
                         const accData = accDataPromise.value;
@@ -514,11 +501,9 @@ export function getPortfolioData(provider_1, network_1, defaultProvider_1, addre
                     positions[address.toLowerCase()].spark[market.value] = { error: `Error fetching Spark account data for address ${address} on market ${market.value}`, data: null };
                 }
             }))).flat(),
-            // flatMap, not map: each CDP's fetch has to be one of the awaited promises, or getPortfolioData can return
-            // before a vault's data lands and the vault is missing from the result.
-            ...addresses.flatMap((address) => {
+            ...addresses.map((address) => __awaiter(this, void 0, void 0, function* () {
                 var _a;
-                return ((_a = makerCdps[address.toLowerCase()]) !== null && _a !== void 0 ? _a : []).map((cdpInfo) => __awaiter(this, void 0, void 0, function* () {
+                return (_a = makerCdps[address.toLowerCase()]) === null || _a === void 0 ? void 0 : _a.map((cdpInfo) => __awaiter(this, void 0, void 0, function* () {
                     try {
                         const cdpData = yield _getMakerCdpData(client, network, cdpInfo);
                         if (cdpData) {
@@ -530,7 +515,7 @@ export function getPortfolioData(provider_1, network_1, defaultProvider_1, addre
                         positions[address.toLowerCase()].maker[cdpInfo.id] = { error: `Error fetching Maker CDP data for address ${address} with ID ${cdpInfo.id}`, data: null };
                     }
                 }));
-            }),
+            })).flat(),
             ...aaveV2Markets.map((market) => addresses.map((address) => __awaiter(this, void 0, void 0, function* () {
                 try {
                     const accData = yield _getAaveV2AccountData(client, network, address, aaveV2MarketsData[market.value].assetsData, market);
@@ -591,7 +576,7 @@ export function getPortfolioData(provider_1, network_1, defaultProvider_1, addre
                 }
             }))).flat(),
             // liquity sBold/yBold and staking options
-            ...stakingAddresses.map((address) => __awaiter(this, void 0, void 0, function* () {
+            ...addresses.map((address) => __awaiter(this, void 0, void 0, function* () {
                 try {
                     if (!isMainnet) {
                         stakingPositions[address.toLowerCase()].liquityV2SBoldYBold = { error: '', data: null };

package/esm/savings/index.js

@@ -18,7 +18,8 @@ import * as summerVaults from './summerVaults';
 import * as yearnV3Vaults from './yearnV3Vaults';
 export { morphoVaults, yearnVaults, makerDsr, skyOptions, sparkSavingsVaults, summerVaults, yearnV3Vaults, };
 export const getSavingsData = (provider, network, accounts) => __awaiter(void 0, void 0, void 0, function* () {
-    const morphoVaultsList = Object.keys(morphoVaults.morphoVaultsOptions.MORPHO_VAULTS);
+    const morphoVaultsList = Object.keys(morphoVaults.morphoVaultsOptions.MORPHO_VAULTS)
+        .filter((key) => morphoVaults.morphoVaultsOptions.getMorphoVault(key).network === network);
     const yearnVaultsList = Object.keys(yearnVaults.yearnVaultsOptions.YEARN_VAULTS);
     const sparkSavingsVaultsList = Object.keys(sparkSavingsVaults.sparkSavingsVaultsOptions.SPARK_SAVINGS_VAULTS);
     const yearnV3VaultsList = Object.keys(yearnV3Vaults.yearnV3VaultsOptions.YEARN_V3_VAULTS);
@@ -26,7 +27,7 @@ export const getSavingsData = (provider, network, accounts) => __awaiter(void 0,
         .filter((key) => summerVaults.summerVaultsOptions.getSummerVault(key).network === network);
     const savingsData = {};
     yield Promise.all([
-        ...(network === NetworkNumber.Eth ? [
+        ...(morphoVaultsList.length ? [
             (() => __awaiter(void 0, void 0, void 0, function* () {
                 try {
                     const vaults = morphoVaultsList.map((vaultKey) => morphoVaults.morphoVaultsOptions.getMorphoVault(vaultKey));
@@ -37,6 +38,8 @@ export const getSavingsData = (provider, network, accounts) => __awaiter(void 0,
                     console.error('[getSavingsData] Error fetching morpho vaults:', err);
                 }
             }))(),
+        ] : []),
+        ...(network === NetworkNumber.Eth ? [
             ...yearnVaultsList.map((vaultKey) => __awaiter(void 0, void 0, void 0, function* () {
                 try {
                     const vault = yearnVaults.yearnVaultsOptions.getYearnVault(vaultKey);

package/esm/savings/morphoVaults/index.d.ts

@@ -3,7 +3,7 @@ import * as morphoVaultsOptions from './options';
 import { EthAddress, EthereumProvider, NetworkNumber, MorphoVault, MorphoVaultType, SavingsVaultData } from '../../types';
 export { morphoVaultsOptions, };
 /**
- * Fetches liquidity for all given vaults in a single API request (chunked if over the page cap),
+ * Fetches liquidity for all given vaults, one API request per vault version (chunked if over the page cap),
  * returned as a map keyed by lowercased vault address. A vault missing from the API response is
  * absent from the map.
  */