@defisaver/positions-sdk 2.1.161-portfolio-api-2-dev → 2.1.161-portfolio-api-3-dev

package/esm/portfolio/index.js

@@ -9,41 +9,534 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 import Dec from 'decimal.js';
 import { NetworkNumber } from '../types/common';
-import { AaveMarkets, AaveV4Spokes, CompoundMarkets, CrvUsdMarkets, LiquityV2Markets, LlamaLendMarkets, MorphoBlueMarkets, MorphoMidnightMarkets, SparkMarkets, } from '../markets';
+import { AaveMarkets, AaveV4Spokes, CompoundMarkets, CrvUsdMarkets, LiquityV2Markets, LlamaLendMarkets, MakerActiveIlks, MorphoBlueMarkets, SparkMarkets, } from '../markets';
 import { _getMorphoBlueAccountData, _getMorphoBluePortfolioMarketData, getMorphoEarn } from '../morphoBlue';
-import { _getMorphoMidnightAccountData, _getMorphoMidnightMarketData } from '../morphoMidnight';
 import { AaveVersions, CompoundVersions, } from '../types';
 import { _getCompoundV3AccountData, _getCompoundV3MarketsData } from '../compoundV3';
 import { _getSparkAccountData, _getSparkMarketsData } from '../spark';
 import { _getCurveUsdGlobalData, _getCurveUsdUserData } from '../curveUsd';
 import { _getLlamaLendGlobalData, _getLlamaLendUserData } from '../llamaLend';
 import { _getAaveV3AccountData, _getAaveV3MarketData, getStakeAaveData } from '../aaveV3';
+import { _getAaveV4AccountData, _getAaveV4SpokeData } from '../aaveV4';
 import { ZERO_ADDRESS } from '../constants';
-import { _getMakerCdpData, _getUserCdps } from '../maker';
+import { _getMakerCdpData, _getMakerIlksData, _getUserCdps } from '../maker';
 import { _getAaveV2AccountData, _getAaveV2MarketsData } from '../aaveV2';
 import { _getCompoundV2AccountData, _getCompoundV2MarketsData } from '../compoundV2';
 import { getViemProvider } from '../services/viem';
 import { _getLiquityTroveInfo, getLiquityStakingData } from '../liquity';
-import { _getLiquityV2MarketData, getLiquitySAndYBold, getLiquityV2Staking } from '../liquityV2';
-import { _getAllUserEarnPositionsWithFTokens, _getUserPositionsPortfolio } from '../fluid';
+import { _getLiquityV2MarketData, _getLiquityV2TroveData, _getLiquityV2UsersTroveIds, getLiquitySAndYBold, getLiquityV2Staking, } from '../liquityV2';
+import { _getAllFluidMarketDataPortfolio, _getAllUserEarnPositionsWithFTokens, _getUserPositionsPortfolio } from '../fluid';
 import { getUmbrellaData } from '../umbrella';
 import { getMerklUnclaimedRewards, getUnclaimedRewardsForAllMarkets } from '../claiming/aaveV3';
 import { fetchSparkAirdropRewards, fetchSparkRewards } from '../claiming/spark';
 import { getKingRewards } from '../claiming/king';
 import { fetchEthenaAirdropRewards } from '../claiming/ethena';
-import { _getAaveV4AccountData, _getAaveV4SpokeData } from '../aaveV4';
 import { getUniswapRewards } from '../claiming/uniswap';
+import { aaveV3Lending, LENDING_PROTOCOLS, morphoBlueLending, requireMarket, sparkLending, } from './lendingProtocols';
+/** The markets of the protocols read by their own code below; LENDING_PROTOCOLS has the others'. */
+const getPortfolioMarkets = (network) => ({
+    liquityV2Markets: [NetworkNumber.Eth].includes(network) ? Object.values(LiquityV2Markets(network)) : [],
+    liquityV2MarketsStaking: [NetworkNumber.Eth].includes(network) ? Object.values(LiquityV2Markets(network)).filter(market => !market.isLegacy) : [],
+});
+const getPortfolioClients = (provider, defaultProvider, network, isSim) => {
+    // batchSize is viem's cap on a batch's raw subcall calldata (bytes); the JSON-RPC body ends up
+    // ~4x larger (hex + aggregate3 ABI + JSON overhead) and RPC providers reject bodies over
+    // ~2.5MB with HTTP 413, so keep this small enough that no single body gets near that.
+    // 250k gives the largest body of around 1.26MB - if we bump, we can save maybe 2-3 rpc calls but scaling takes a hit
+    // (e.g. adding new markets may result in body size going over alchemy body size limit)
+    const args = [network, { batch: { multicall: { batchSize: isSim ? 2000 : 250000 } } }];
+    return {
+        client: getViemProvider(provider, ...args),
+        defaultClient: getViemProvider(defaultProvider, ...args),
+    };
+};
+const _getPortfolioMarketsData = (client, defaultClient, network) => __awaiter(void 0, void 0, void 0, function* () {
+    const { liquityV2Markets } = getPortfolioMarkets(network);
+    const markets = {
+        morphoMarketsData: {},
+        morphoMidnightMarketsData: {},
+        compoundV3MarketsData: {},
+        sparkMarketsData: {},
+        aaveV3MarketsData: {},
+        aaveV2MarketsData: {},
+        compoundV2MarketsData: {},
+        crvUsdMarketsData: {},
+        llamaLendMarketsData: {},
+        liquityV2MarketsData: {},
+        aaveV4SpokesData: {},
+    };
+    const liquityV2Failed = {};
+    const [lendingFailed] = yield Promise.all([
+        Promise.all(LENDING_PROTOCOLS.map((protocol) => __awaiter(void 0, void 0, void 0, function* () { return [protocol.marketsKey, yield protocol.readMarkets({ client, defaultClient, network }, markets)]; }))),
+        // Liquity V2's markets: its troves are read by their own code below.
+        ...liquityV2Markets.map((market) => __awaiter(void 0, void 0, void 0, function* () {
+            try {
+                markets.liquityV2MarketsData[market.value] = yield _getLiquityV2MarketData(client, network, market);
+            }
+            catch (error) {
+                console.error(`Error fetching liquityV2MarketsData for market ${market.value}:`, error);
+                liquityV2Failed[market.value] = `Error fetching liquityV2MarketsData for market ${market.value}`;
+            }
+        })),
+    ]);
+    // A market that failed is left out of markets and named here, under its protocol's key.
+    const errors = {};
+    for (const [key, failed] of [...lendingFailed, ['liquityV2MarketsData', liquityV2Failed]]) {
+        if (Object.keys(failed).length)
+            errors[key] = failed;
+    }
+    return { markets, errors };
+});
+const _getPortfolioUserData = (client, network, addresses, marketsData, isSim, options) => __awaiter(void 0, void 0, void 0, function* () {
+    const isMainnet = network === NetworkNumber.Eth;
+    const includePositions = options.positions !== false;
+    const includeStaking = options.staking !== false;
+    const includeRewards = options.rewards !== false;
+    const includeLiquityV2 = includePositions && options.liquityV2 === true;
+    // The addresses positions, staking, rewards and Liquity V2 troves are read for: none when left out, so their fetches
+    // below make no calls.
+    const positionsAddresses = includePositions ? addresses : [];
+    const stakingAddresses = includeStaking ? addresses : [];
+    const rewardsAddresses = includeRewards ? addresses : [];
+    const liquityV2Addresses = includeLiquityV2 ? addresses : [];
+    const isFluidSupported = [NetworkNumber.Eth, NetworkNumber.Arb, NetworkNumber.Base, NetworkNumber.Plasma].includes(network);
+    const { liquityV2Markets, liquityV2MarketsStaking } = getPortfolioMarkets(network);
+    const positions = {};
+    const stakingPositions = {};
+    const rewardsData = {};
+    const makerCdpsErrors = {};
+    for (const address of positionsAddresses) {
+        positions[address.toLowerCase()] = Object.assign(Object.assign(Object.assign({}, Object.fromEntries(LENDING_PROTOCOLS.map((protocol) => [protocol.key, {}]))), { maker: {}, liquity: {}, fluid: {
+                error: '',
+                data: {},
+            } }), (includeLiquityV2 ? { liquityV2: {} } : {}));
+    }
+    // TODO: check default values, probably needed when fetching portfolio on unsupported networks
+    for (const address of stakingAddresses) {
+        stakingPositions[address.toLowerCase()] = {
+            aaveV3: {},
+            morphoBlue: {},
+            compoundV3: {},
+            spark: {},
+            aaveV2: {},
+            compoundV2: {},
+            liquity: {},
+            liquityV2: {},
+            fluid: {
+                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 },
+            aaveV3: {},
+            spark: {},
+            spk: { error: '', data: null },
+            king: { error: '', data: null },
+            ethena: {},
+            uniswap: { error: '', data: null },
+        };
+    }
+    // Everything starts at once; a read that needs a market's data waits for marketsData.
+    yield Promise.all([
+        // === POSITIONS THAT DO NOT NEED MARKET DATA ===
+        // Maker: the address's vault list, then each vault. A failed list is reported in errors.makerCdps: maker stays {},
+        // which would otherwise read as "no vaults".
+        ...positionsAddresses.map((address) => __awaiter(void 0, void 0, void 0, function* () {
+            if (!isMainnet)
+                return; // Maker CDPs are only available on mainnet
+            let cdps;
+            try {
+                cdps = yield _getUserCdps(client, network, address);
+            }
+            catch (error) {
+                console.error(`Error fetching Maker CDPs for address ${address}:`, error);
+                makerCdpsErrors[address.toLowerCase()] = `Error fetching Maker CDPs for address ${address}`;
+                return;
+            }
+            yield Promise.all(cdps.map((cdpInfo) => __awaiter(void 0, void 0, void 0, function* () {
+                try {
+                    const cdpData = yield _getMakerCdpData(client, network, cdpInfo);
+                    if (cdpData) {
+                        positions[address.toLowerCase()].maker[cdpInfo.id] = { error: '', data: cdpData };
+                    }
+                }
+                catch (error) {
+                    console.error(`Error fetching Maker CDP data for address ${address} with ID ${cdpInfo.id}:`, error);
+                    positions[address.toLowerCase()].maker[cdpInfo.id] = { error: `Error fetching Maker CDP data for address ${address} with ID ${cdpInfo.id}`, data: null };
+                }
+            })));
+        })),
+        ...positionsAddresses.map((address) => __awaiter(void 0, void 0, void 0, function* () {
+            try {
+                if (!isFluidSupported)
+                    return; // Fluid is not available on Optimism
+                const userPositions = (yield _getUserPositionsPortfolio(client, network, address));
+                for (const position of userPositions) {
+                    if (position.userData && new Dec(position.userData.suppliedUsd).gt(0)) {
+                        positions[address.toLowerCase()].fluid.data[position.userData.nftId] = position.userData;
+                    }
+                }
+            }
+            catch (error) {
+                console.error(`Error fetching Fluid positions for address ${address}:`, error);
+                positions[address.toLowerCase()].fluid = {
+                    error: `Error fetching Fluid positions for address ${address}`,
+                    data: {},
+                };
+            }
+        })),
+        ...positionsAddresses.map((address) => __awaiter(void 0, void 0, void 0, function* () {
+            try {
+                if (!isMainnet)
+                    return; // Liquity trove info is only available on mainnet
+                const troveInfo = yield _getLiquityTroveInfo(client, network, address);
+                if (new Dec(troveInfo.collateral).gt(0))
+                    positions[address.toLowerCase()].liquity = { error: '', data: troveInfo };
+            }
+            catch (error) {
+                console.error(`Error fetching Liquity trove info for address ${address}:`, error);
+                positions[address.toLowerCase()].liquity = { error: `Error fetching Liquity trove info for address ${address}`, data: null };
+            }
+        })),
+        // === STAKING DATA (independent of market data; Morpho Earn is with the positions below) ===
+        ...stakingAddresses.map((address) => __awaiter(void 0, void 0, void 0, function* () {
+            try {
+                if (!isFluidSupported)
+                    return;
+                stakingPositions[address.toLowerCase()].fluid = yield _getAllUserEarnPositionsWithFTokens(client, network, address);
+            }
+            catch (error) {
+                console.error(`Error fetching Fluid lend data for address ${address}:`, error);
+                stakingPositions[address.toLowerCase()].fluid = { error: `Error fetching Fluid lend data for address ${address}`, data: null };
+            }
+        })),
+        ...stakingAddresses.map((address) => __awaiter(void 0, void 0, void 0, function* () {
+            try {
+                if (!isMainnet)
+                    return;
+                stakingPositions[address.toLowerCase()].liquity = yield getLiquityStakingData(client, network, address);
+            }
+            catch (error) {
+                console.error(`Error fetching Liquity staking data for address ${address}:`, error);
+                stakingPositions[address.toLowerCase()].liquity = { error: `Error fetching Liquity staking data for address ${address}`, data: null };
+            }
+        })),
+        ...stakingAddresses.map((address) => __awaiter(void 0, void 0, void 0, function* () {
+            try {
+                if (!isMainnet)
+                    return;
+                stakingPositions[address.toLowerCase()].aaveV3 = yield getStakeAaveData(client, network, address);
+            }
+            catch (error) {
+                console.error(`Error fetching Aave V3 staking data for address ${address}:`, error);
+                stakingPositions[address.toLowerCase()].aaveV3 = { error: `Error fetching Aave V3 staking data for address ${address}`, data: null };
+            }
+        })),
+        ...stakingAddresses.map((address) => __awaiter(void 0, void 0, void 0, function* () {
+            try {
+                if (!isMainnet)
+                    return;
+                stakingPositions[address.toLowerCase()].umbrella = yield getUmbrellaData(client, network, address);
+            }
+            catch (error) {
+                console.error(`Error fetching Umbrella staking data for address ${address}:`, error);
+                stakingPositions[address.toLowerCase()].umbrella = { error: `Error fetching Umbrella staking data for address ${address}`, data: null };
+            }
+        })),
+        // Liquity V2 stability pools, then sBOLD/yBOLD, which reads them.
+        ...stakingAddresses.map((address) => __awaiter(void 0, void 0, void 0, function* () {
+            yield Promise.all(liquityV2MarketsStaking.map((market) => __awaiter(void 0, void 0, void 0, function* () {
+                try {
+                    if (!isMainnet) {
+                        stakingPositions[address.toLowerCase()].liquityV2[market.value] = { error: '', data: null };
+                        return;
+                    }
+                    const liquityV2StakingData = yield getLiquityV2Staking(client, network, market.value, address);
+                    stakingPositions[address.toLowerCase()].liquityV2[market.value] = { error: '', data: liquityV2StakingData };
+                }
+                catch (error) {
+                    console.error(`Error fetching Liquity V2 staking data for address ${address}, market ${market.value}:`, error);
+                    stakingPositions[address.toLowerCase()].liquityV2[market.value] = { error: `Error fetching Liquity V2 staking data for address ${address}`, data: null };
+                }
+            })));
+            try {
+                if (!isMainnet) {
+                    stakingPositions[address.toLowerCase()].liquityV2SBoldYBold = { error: '', data: null };
+                    return;
+                }
+                const data = yield getLiquitySAndYBold(client, network, stakingPositions[address.toLowerCase()].liquityV2, address);
+                stakingPositions[address.toLowerCase()].liquityV2SBoldYBold = { error: '', data };
+            }
+            catch (error) {
+                console.error(`Error fetching SBold/YBold data for address ${address}:`, error);
+                stakingPositions[address.toLowerCase()].liquityV2SBoldYBold = { error: `Error fetching sBold/yBold data for address ${address}`, data: null };
+            }
+        })),
+        // === REWARDS DATA (independent of market data) ===
+        // Batch King rewards
+        (() => __awaiter(void 0, void 0, void 0, function* () {
+            try {
+                if (!isMainnet) {
+                    for (const address of rewardsAddresses) {
+                        rewardsData[address.toLowerCase()].king = { error: '', data: [] };
+                    }
+                    return;
+                }
+                const kingRewards = yield getKingRewards(client, network, rewardsAddresses);
+                for (const address of rewardsAddresses) {
+                    const lowerAddress = address.toLowerCase();
+                    rewardsData[lowerAddress].king = {
+                        error: '',
+                        data: kingRewards[lowerAddress] || [],
+                    };
+                }
+            }
+            catch (error) {
+                console.error('Error fetching King rewards data in batch:', error);
+                for (const address of rewardsAddresses) {
+                    rewardsData[address.toLowerCase()].king = {
+                        error: 'Error fetching King rewards data in batch',
+                        data: null,
+                    };
+                }
+            }
+        }))(),
+        // Batch UNI rewards
+        (() => __awaiter(void 0, void 0, void 0, function* () {
+            try {
+                if (!isMainnet) {
+                    for (const address of rewardsAddresses) {
+                        rewardsData[address.toLowerCase()].uniswap = { error: '', data: [] };
+                    }
+                    return;
+                }
+                const uniswapRewards = yield getUniswapRewards(client, network, rewardsAddresses);
+                for (const address of rewardsAddresses) {
+                    const lowerAddress = address.toLowerCase();
+                    rewardsData[lowerAddress].uniswap = {
+                        error: '',
+                        data: uniswapRewards[lowerAddress] || [],
+                    };
+                }
+            }
+            catch (error) {
+                console.error('Error fetching Uniswap rewards data in batch:', error);
+                for (const address of rewardsAddresses) {
+                    rewardsData[address.toLowerCase()].uniswap = {
+                        error: 'Error fetching Uniswap rewards data in batch',
+                        data: null,
+                    };
+                }
+            }
+        }))(),
+        ...sparkLending.markets(network).map((market) => rewardsAddresses.map((address) => __awaiter(void 0, void 0, void 0, function* () {
+            try {
+                if (!isMainnet) {
+                    rewardsData[address.toLowerCase()].spark[market.value] = { error: '', data: [] };
+                    return;
+                }
+                const sparkData = yield fetchSparkRewards(client, network, address, market.providerAddress);
+                rewardsData[address.toLowerCase()].spark[market.value] = { error: '', data: sparkData };
+            }
+            catch (error) {
+                console.error(`Error fetching Spark rewards data for address ${address}, market ${market.value}:`, error);
+                rewardsData[address.toLowerCase()].spark[market.value] = { error: `Error fetching Spark rewards data for address ${address}`, data: null };
+            }
+        }))).flat(),
+        ...rewardsAddresses.map((address) => __awaiter(void 0, void 0, void 0, function* () {
+            try {
+                const merklData = yield getMerklUnclaimedRewards(address, network);
+                rewardsData[address.toLowerCase()].merkl = { error: '', data: merklData };
+            }
+            catch (error) {
+                console.error(`Error fetching Merkl rewards data for address ${address}:`, error);
+                rewardsData[address.toLowerCase()].merkl = { error: `Error fetching Merkl rewards data for address ${address}`, data: null };
+            }
+        })),
+        ...aaveV3Lending.markets(network).map(market => rewardsAddresses.map((address) => __awaiter(void 0, 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 };
+            }
+        }))).flat(),
+        // Batch Spark Airdrop rewards
+        (() => __awaiter(void 0, void 0, void 0, function* () {
+            try {
+                if (!isMainnet) {
+                    for (const address of rewardsAddresses) {
+                        rewardsData[address.toLowerCase()].spk = { error: '', data: [] };
+                    }
+                    return;
+                }
+                const sparkAirdropRewards = yield fetchSparkAirdropRewards(client, network, rewardsAddresses);
+                for (const address of rewardsAddresses) {
+                    const lowerAddress = address.toLowerCase();
+                    rewardsData[lowerAddress].spk = {
+                        error: '',
+                        data: sparkAirdropRewards[lowerAddress] || [],
+                    };
+                }
+            }
+            catch (error) {
+                console.error('Error fetching Spark Airdrop rewards data in batch:', error);
+                for (const address of rewardsAddresses) {
+                    rewardsData[address.toLowerCase()].spk = {
+                        error: 'Error fetching Spark Airdrop rewards data in batch',
+                        data: null,
+                    };
+                }
+            }
+        }))(),
+        (() => __awaiter(void 0, void 0, void 0, function* () {
+            try {
+                if (!isMainnet) {
+                    return;
+                }
+                const ethenaAirdropRewards = yield fetchEthenaAirdropRewards(rewardsAddresses);
+                for (const address of rewardsAddresses) {
+                    const lowerAddress = address.toLowerCase();
+                    rewardsData[lowerAddress].ethena = {
+                        error: '',
+                        data: ethenaAirdropRewards[lowerAddress] || [],
+                    };
+                }
+            }
+            catch (error) {
+                console.error('Error fetching Ethena Airdrop rewards data:', error);
+                for (const address of rewardsAddresses) {
+                    rewardsData[address.toLowerCase()].ethena = {
+                        error: 'Error fetching Ethena Airdrop rewards data in batch',
+                        data: null,
+                    };
+                }
+            }
+        }))(),
+        // === POSITIONS ON MARKETS (each waits for its market's data) ===
+        ...LENDING_PROTOCOLS.flatMap((protocol) => protocol.readPositions({ client, network }, positionsAddresses, marketsData, positions)),
+        // Morpho Blue Earn: a supply without a borrow, kept as staking, read on the same markets as Morpho Blue's positions.
+        ...morphoBlueLending.markets(network).flatMap((market) => stakingAddresses.map((address) => __awaiter(void 0, void 0, void 0, function* () {
+            try {
+                const marketData = requireMarket((yield marketsData).morphoMarketsData, market.value);
+                const earnData = yield getMorphoEarn(client, network, address, market, marketData);
+                if (earnData && new Dec(earnData.amount).gt(0)) {
+                    stakingPositions[address.toLowerCase()].morphoBlue[market.value] = { error: '', data: earnData };
+                }
+            }
+            catch (error) {
+                console.error(`Error fetching MorphoBlue earn data for address ${address} on market ${market.value}:`, error);
+                stakingPositions[address.toLowerCase()].morphoBlue[market.value] = { error: `Error fetching MorphoBlue earn data for address ${address} on market ${market.value}`, data: null };
+            }
+        }))),
+        // Liquity V2 troves: one market's trove ids for every address at once, then each trove's data. A failure is the
+        // market's error; the troves that did load stay in its data.
+        ...(liquityV2Addresses.length ? liquityV2Markets : []).map((market) => __awaiter(void 0, void 0, void 0, function* () {
+            const setEntry = (address, entry) => {
+                positions[address.toLowerCase()].liquityV2[market.value] = entry;
+            };
+            const failAll = (error) => liquityV2Addresses.forEach((address) => setEntry(address, { error, data: {} }));
+            const allMarketsData = (yield marketsData).liquityV2MarketsData;
+            const marketData = allMarketsData[market.value];
+            if (!marketData) {
+                failAll(`Error fetching Liquity V2 market data for market ${market.value}`);
+                return;
+            }
+            let troveIds;
+            try {
+                troveIds = yield _getLiquityV2UsersTroveIds(client, network, market, marketData.marketData.troveNFTAddress, isSim, liquityV2Addresses);
+            }
+            catch (error) {
+                console.error(`Error fetching Liquity V2 trove ids on market ${market.value}:`, error);
+                failAll(`Error fetching Liquity V2 troves on market ${market.value}`);
+                return;
+            }
+            yield Promise.all(liquityV2Addresses.map((address) => __awaiter(void 0, void 0, void 0, function* () {
+                var _a;
+                const entry = { error: '', data: {} };
+                const failed = [];
+                yield Promise.all(((_a = troveIds[address]) !== null && _a !== void 0 ? _a : []).map((troveId) => __awaiter(void 0, void 0, void 0, function* () {
+                    try {
+                        entry.data[troveId] = yield _getLiquityV2TroveData(client, network, {
+                            selectedMarket: market,
+                            assetsData: marketData.assetsData,
+                            troveId,
+                            allMarketsData: allMarketsData,
+                        });
+                    }
+                    catch (error) {
+                        console.error(`Error fetching Liquity V2 trove ${troveId} for address ${address} on market ${market.value}:`, error);
+                        failed.push(troveId);
+                    }
+                })));
+                if (failed.length)
+                    entry.error = `Error fetching Liquity V2 troves ${failed.join(', ')} for address ${address} on market ${market.value}`;
+                setEntry(address, entry);
+            })));
+        })),
+    ]);
+    return {
+        positions,
+        stakingPositions,
+        rewardsData,
+        errors: Object.keys(makerCdpsErrors).length ? { makerCdps: makerCdpsErrors } : {},
+    };
+});
+/**
+ * Every market the portfolio reads on a network — the markets half of getPortfolioData, for a caller that keeps
+ * markets apart from what it reads per address (a cache shared by many addresses). A market that fails is left out
+ * of `markets` and named in `errors`.
+ */
+export function getPortfolioMarketsData(provider_1, network_1, defaultProvider_1) {
+    return __awaiter(this, arguments, void 0, function* (provider, network, defaultProvider, isSim = false) {
+        const { client, defaultClient } = getPortfolioClients(provider, defaultProvider, network, isSim);
+        return _getPortfolioMarketsData(client, defaultClient, network);
+    });
+}
+/**
+ * What the portfolio reads per address — the other half of getPortfolioData — against `markets` from
+ * getPortfolioMarketsData. `markets` can be a promise: reads that do not need a market (Maker, Fluid, Liquity, staking,
+ * rewards) start at once, and each read on a market waits for it. A position on a market missing from `markets` is an
+ * entry with an error.
+ */
+export function getPortfolioUserData(provider_1, network_1, addresses_1, markets_1) {
+    return __awaiter(this, arguments, void 0, function* (provider, network, addresses, markets, isSim = false, options = {}) {
+        const { client } = getPortfolioClients(provider, provider, network, isSim);
+        return _getPortfolioUserData(client, network, addresses, Promise.resolve(markets), isSim, options);
+    });
+}
 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 = {}) {
+        // One pair of clients for both halves, so their calls batch together.
+        const { client, defaultClient } = getPortfolioClients(provider, defaultProvider, network, isSim);
+        const marketsResult = _getPortfolioMarketsData(client, defaultClient, network);
+        const [{ markets, errors: marketsErrors }, userData] = yield Promise.all([
+            marketsResult,
+            _getPortfolioUserData(client, network, addresses, marketsResult.then((result) => result.markets), isSim, options),
+        ]);
+        return {
+            positions: userData.positions,
+            stakingPositions: userData.stakingPositions,
+            rewardsData: userData.rewardsData,
+            markets,
+            errors: Object.assign(Object.assign({}, (Object.keys(marketsErrors).length ? { markets: marketsErrors } : {})), userData.errors),
+        };
+    });
+}
+export function getShifterPortfolioData(provider_1, network_1, defaultProvider_1, addresses_1) {
+    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));
         const compoundV3Markets = Object.values(CompoundMarkets(network)).filter((market) => market.chainIds.includes(network) && market.value !== CompoundVersions.CompoundV2);
         const sparkMarkets = Object.values(SparkMarkets(network)).filter((market) => market.chainIds.includes(network));
         const aaveV3Markets = [AaveVersions.AaveV3, AaveVersions.AaveV3Lido, AaveVersions.AaveV3Etherfi].map((version) => AaveMarkets(network)[version]).filter((market) => market.chainIds.includes(network));
@@ -52,51 +545,33 @@ export function getPortfolioData(provider_1, network_1, defaultProvider_1, addre
         const crvUsdMarkets = Object.values(CrvUsdMarkets(network)).filter((market) => market.chainIds.includes(network));
         const llamaLendMarkets = [NetworkNumber.Eth, NetworkNumber.Arb].includes(network) ? Object.values(LlamaLendMarkets(network)).filter((market) => market.chainIds.includes(network)) : [];
         const liquityV2Markets = [NetworkNumber.Eth].includes(network) ? Object.values(LiquityV2Markets(network)) : [];
-        const liquityV2MarketsStaking = [NetworkNumber.Eth].includes(network) ? Object.values(LiquityV2Markets(network)).filter(market => !market.isLegacy) : [];
         const aaveV4Spokes = Object.values(AaveV4Spokes(network)).filter((market) => market.chainIds.includes(network));
-        // batchSize is viem's cap on a batch's raw subcall calldata (bytes); the JSON-RPC body ends up
-        // ~4x larger (hex + aggregate3 ABI + JSON overhead) and RPC providers reject bodies over
-        // ~2.5MB with HTTP 413, so keep this small enough that no single body gets near that.
-        // 250k gives the largest body of around 1.26MB - if we bump, we can save maybe 2-3 rpc calls but scaling takes a hit
-        // (e.g. adding new markets may result in body size going over alchemy body size limit)
-        const args = [network, { batch: { multicall: { batchSize: isSim ? 2000 : 250000 } } }];
+        const args = [network, { batch: { multicall: { batchSize: isSim ? 2000 : 2500000 } } }];
         const client = getViemProvider(provider, ...args);
         const defaultClient = getViemProvider(defaultProvider, ...args);
-        const morphoMarketsData = {};
-        const morphoMidnightMarketsData = {};
-        const compoundV3MarketsData = {};
-        const sparkMarketsData = {};
-        const aaveV3MarketsData = {};
-        const makerCdps = {};
-        const aaveV2MarketsData = {};
-        const compoundV2MarketsData = {};
-        const crvUsdMarketsData = {};
-        const llamaLendMarketsData = {};
-        const liquityV2MarketsData = {};
-        const aaveV4SpokesData = {};
         const markets = {
-            morphoMarketsData,
-            morphoMidnightMarketsData,
-            compoundV3MarketsData,
-            sparkMarketsData,
-            aaveV3MarketsData,
-            aaveV2MarketsData,
-            compoundV2MarketsData,
-            crvUsdMarketsData,
-            llamaLendMarketsData,
-            liquityV2MarketsData,
-            aaveV4SpokesData,
+            morphoMarketsData: {},
+            morphoMidnightMarketsData: {}, // Morpho Midnight is not fetched for the shifter; key kept so the payload shape is stable
+            compoundV3MarketsData: {},
+            sparkMarketsData: {},
+            aaveV3MarketsData: {},
+            aaveV2MarketsData: {},
+            compoundV2MarketsData: {},
+            crvUsdMarketsData: {},
+            llamaLendMarketsData: {},
+            liquityV2MarketsData: {},
+            aaveV4SpokesData: {},
+            fluidMarketsData: {},
+            makerMarketsData: {},
         };
+        const makerCdps = {};
         const positions = {};
-        const stakingPositions = {};
-        const rewardsData = {};
-        const allAddresses = [...addresses];
-        for (const address of allAddresses) {
+        for (const address of addresses) {
             positions[address.toLowerCase()] = {
                 aaveV3: {},
                 aaveV4: {},
                 morphoBlue: {},
-                morphoMidnight: {},
+                morphoMidnight: {}, // not fetched for the shifter (see markets above)
                 compoundV3: {},
                 spark: {},
                 maker: {},
@@ -111,83 +586,58 @@ 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) {
-            stakingPositions[address.toLowerCase()] = {
-                aaveV3: {},
-                morphoBlue: {},
-                compoundV3: {},
-                spark: {},
-                aaveV2: {},
-                compoundV2: {},
-                liquity: {},
-                liquityV2: {},
-                fluid: {
-                    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 },
-                aaveV3: {},
-                spark: {},
-                spk: { error: '', data: null },
-                king: { error: '', data: null },
-                ethena: {},
-                uniswap: { error: '', data: null },
-            };
-        }
         yield Promise.allSettled([
             // === MARKET DATA (needs to be fetched first) ===
             ...morphoMarkets.map((market) => __awaiter(this, void 0, void 0, function* () {
-                const marketData = yield _getMorphoBluePortfolioMarketData(client, network, market);
-                morphoMarketsData[market.value] = marketData;
-            })),
-            ...morphoMidnightMarkets.map((market) => __awaiter(this, void 0, void 0, function* () {
-                const marketData = yield _getMorphoMidnightMarketData(client, network, market);
-                morphoMidnightMarketsData[market.value] = marketData;
+                markets.morphoMarketsData[market.value] = yield _getMorphoBluePortfolioMarketData(client, network, market);
             })),
             ...compoundV3Markets.map((market) => __awaiter(this, void 0, void 0, function* () {
-                const marketData = yield _getCompoundV3MarketsData(client, network, market, defaultClient);
-                compoundV3MarketsData[market.value] = marketData;
+                markets.compoundV3MarketsData[market.value] = yield _getCompoundV3MarketsData(client, network, market, defaultClient);
             })),
             ...sparkMarkets.map((market) => __awaiter(this, void 0, void 0, function* () {
-                const marketData = yield _getSparkMarketsData(client, network, market);
-                sparkMarketsData[market.value] = marketData;
+                markets.sparkMarketsData[market.value] = yield _getSparkMarketsData(client, network, market);
             })),
             ...aaveV3Markets.map((market) => __awaiter(this, void 0, void 0, function* () {
-                const marketData = yield _getAaveV3MarketData(client, network, market);
-                aaveV3MarketsData[market.value] = marketData;
+                markets.aaveV3MarketsData[market.value] = yield _getAaveV3MarketData(client, network, market);
             })),
             ...aaveV4Spokes.map((spoke) => __awaiter(this, void 0, void 0, function* () {
-                const spokeData = yield _getAaveV4SpokeData(client, network, spoke);
-                aaveV4SpokesData[spoke.value] = spokeData;
+                markets.aaveV4SpokesData[spoke.value] = yield _getAaveV4SpokeData(client, network, spoke);
             })),
             ...aaveV2Markets.map((market) => __awaiter(this, void 0, void 0, function* () {
-                const marketData = yield _getAaveV2MarketsData(client, network, market);
-                aaveV2MarketsData[market.value] = marketData;
+                markets.aaveV2MarketsData[market.value] = yield _getAaveV2MarketsData(client, network, market);
             })),
             ...compoundV2Markets.map((market) => __awaiter(this, void 0, void 0, function* () {
-                const marketData = yield _getCompoundV2MarketsData(client, network);
-                compoundV2MarketsData[market.value] = marketData;
+                markets.compoundV2MarketsData[market.value] = yield _getCompoundV2MarketsData(client, network);
             })),
             ...crvUsdMarkets.map((market) => __awaiter(this, void 0, void 0, function* () {
-                const marketData = yield _getCurveUsdGlobalData(client, network, market);
-                crvUsdMarketsData[market.value] = marketData;
+                markets.crvUsdMarketsData[market.value] = yield _getCurveUsdGlobalData(client, network, market);
             })),
             ...llamaLendMarkets.map((market) => __awaiter(this, void 0, void 0, function* () {
-                const marketData = yield _getLlamaLendGlobalData(client, network, market);
-                llamaLendMarketsData[market.value] = marketData;
+                markets.llamaLendMarketsData[market.value] = yield _getLlamaLendGlobalData(client, network, market);
             })),
             ...liquityV2Markets.map((market) => __awaiter(this, void 0, void 0, function* () {
-                const marketData = yield _getLiquityV2MarketData(client, network, market);
-                liquityV2MarketsData[market.value] = marketData;
+                markets.liquityV2MarketsData[market.value] = yield _getLiquityV2MarketData(client, network, market);
             })),
+            (() => __awaiter(this, void 0, void 0, function* () {
+                if (!isFluidSupported)
+                    return;
+                try {
+                    markets.fluidMarketsData = yield _getAllFluidMarketDataPortfolio(client, network);
+                }
+                catch (error) {
+                    console.error('Error fetching Fluid markets data:', error);
+                }
+            }))(),
+            (() => __awaiter(this, void 0, void 0, function* () {
+                if (!isMainnet)
+                    return; // Maker CDPs are only available on mainnet
+                try {
+                    markets.makerMarketsData = yield _getMakerIlksData(client, network, MakerActiveIlks);
+                }
+                catch (error) {
+                    console.error('Error fetching Maker ilks data:', error);
+                }
+            }))(),
             // === INDEPENDENT USER DATA (doesn't depend on market data) ===
             ...addresses.map((address) => __awaiter(this, void 0, void 0, function* () {
                 if (!isMainnet)
@@ -214,226 +664,22 @@ 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* () {
-                try {
-                    if (!isFluidSupported)
-                        return;
-                    stakingPositions[address.toLowerCase()].fluid = yield _getAllUserEarnPositionsWithFTokens(client, network, address);
-                }
-                catch (error) {
-                    console.error(`Error fetching Fluid lend data for address ${address}:`, error);
-                    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* () {
-                try {
-                    if (!isMainnet)
-                        return;
-                    stakingPositions[address.toLowerCase()].liquity = yield getLiquityStakingData(client, network, address);
-                }
-                catch (error) {
-                    console.error(`Error fetching Liquity staking data for address ${address}:`, error);
-                    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* () {
-                try {
-                    if (!isMainnet)
-                        return;
-                    stakingPositions[address.toLowerCase()].aaveV3 = yield getStakeAaveData(client, network, address);
-                }
-                catch (error) {
-                    console.error(`Error fetching Aave V3 staking data for address ${address}:`, error);
-                    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* () {
-                try {
-                    if (!isMainnet)
-                        return;
-                    stakingPositions[address.toLowerCase()].umbrella = yield getUmbrellaData(client, network, address);
-                }
-                catch (error) {
-                    console.error(`Error fetching Umbrella staking data for address ${address}:`, error);
-                    stakingPositions[address.toLowerCase()].umbrella = { error: `Error fetching Umbrella staking data for address ${address}`, data: null };
-                }
-            })),
-            // Liquity V2 staking
-            ...liquityV2MarketsStaking.map(market => stakingAddresses.map((address) => __awaiter(this, void 0, void 0, function* () {
-                try {
-                    if (!isMainnet) {
-                        stakingPositions[address.toLowerCase()].liquityV2[market.value] = { error: '', data: null };
-                        return;
-                    }
-                    const liquityV2StakingData = yield getLiquityV2Staking(client, network, market.value, address);
-                    stakingPositions[address.toLowerCase()].liquityV2[market.value] = { error: '', data: liquityV2StakingData };
-                }
-                catch (error) {
-                    console.error(`Error fetching Liquity V2 staking data for address ${address}, market ${market.value}:`, error);
-                    stakingPositions[address.toLowerCase()].liquityV2[market.value] = { error: `Error fetching Liquity V2 staking data for address ${address}`, data: null };
-                }
-            }))).flat(),
-            // === REWARDS DATA (independent of market data) ===
-            // Batch King rewards
-            (() => __awaiter(this, void 0, void 0, function* () {
-                try {
-                    if (!isMainnet) {
-                        for (const address of rewardsAddresses) {
-                            rewardsData[address.toLowerCase()].king = { error: '', data: [] };
-                        }
-                        return;
-                    }
-                    const kingRewards = yield getKingRewards(client, network, rewardsAddresses);
-                    for (const address of rewardsAddresses) {
-                        const lowerAddress = address.toLowerCase();
-                        rewardsData[lowerAddress].king = {
-                            error: '',
-                            data: kingRewards[lowerAddress] || [],
-                        };
-                    }
-                }
-                catch (error) {
-                    console.error('Error fetching King rewards data in batch:', error);
-                    for (const address of rewardsAddresses) {
-                        rewardsData[address.toLowerCase()].king = {
-                            error: 'Error fetching King rewards data in batch',
-                            data: null,
-                        };
-                    }
-                }
-            }))(),
-            // Batch UNI rewards
-            (() => __awaiter(this, void 0, void 0, function* () {
-                try {
-                    if (!isMainnet) {
-                        for (const address of rewardsAddresses) {
-                            rewardsData[address.toLowerCase()].uniswap = { error: '', data: [] };
-                        }
-                        return;
-                    }
-                    const uniswapRewards = yield getUniswapRewards(client, network, rewardsAddresses);
-                    for (const address of rewardsAddresses) {
-                        const lowerAddress = address.toLowerCase();
-                        rewardsData[lowerAddress].uniswap = {
-                            error: '',
-                            data: uniswapRewards[lowerAddress] || [],
-                        };
-                    }
-                }
-                catch (error) {
-                    console.error('Error fetching Uniswap rewards data in batch:', error);
-                    for (const address of rewardsAddresses) {
-                        rewardsData[address.toLowerCase()].uniswap = {
-                            error: 'Error fetching Uniswap rewards data in batch',
-                            data: null,
-                        };
-                    }
-                }
-            }))(),
-            ...sparkMarkets.map((market) => rewardsAddresses.map((address) => __awaiter(this, void 0, void 0, function* () {
-                try {
-                    if (!isMainnet) {
-                        rewardsData[address.toLowerCase()].spark[market.value] = { error: '', data: [] };
-                        return;
-                    }
-                    const sparkData = yield fetchSparkRewards(client, network, address, market.providerAddress);
-                    rewardsData[address.toLowerCase()].spark[market.value] = { error: '', data: sparkData };
-                }
-                catch (error) {
-                    console.error(`Error fetching Spark rewards data for address ${address}, market ${market.value}:`, error);
-                    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* () {
-                try {
-                    const merklData = yield getMerklUnclaimedRewards(address, network);
-                    rewardsData[address.toLowerCase()].merkl = { error: '', data: merklData };
-                }
-                catch (error) {
-                    console.error(`Error fetching Merkl rewards data for address ${address}:`, error);
-                    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* () {
-                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 };
-                }
-            }))).flat(),
-            // Batch Spark Airdrop rewards
-            (() => __awaiter(this, void 0, void 0, function* () {
-                try {
-                    if (!isMainnet) {
-                        for (const address of rewardsAddresses) {
-                            rewardsData[address.toLowerCase()].spk = { error: '', data: [] };
-                        }
-                        return;
-                    }
-                    const sparkAirdropRewards = yield fetchSparkAirdropRewards(client, network, rewardsAddresses);
-                    for (const address of rewardsAddresses) {
-                        const lowerAddress = address.toLowerCase();
-                        rewardsData[lowerAddress].spk = {
-                            error: '',
-                            data: sparkAirdropRewards[lowerAddress] || [],
-                        };
-                    }
-                }
-                catch (error) {
-                    console.error('Error fetching Spark Airdrop rewards data in batch:', error);
-                    for (const address of rewardsAddresses) {
-                        rewardsData[address.toLowerCase()].spk = {
-                            error: 'Error fetching Spark Airdrop rewards data in batch',
-                            data: null,
-                        };
-                    }
-                }
-            }))(),
-            (() => __awaiter(this, void 0, void 0, function* () {
-                try {
-                    if (!isMainnet) {
-                        return;
-                    }
-                    const ethenaAirdropRewards = yield fetchEthenaAirdropRewards(rewardsAddresses);
-                    for (const address of rewardsAddresses) {
-                        const lowerAddress = address.toLowerCase();
-                        rewardsData[lowerAddress].ethena = {
-                            error: '',
-                            data: ethenaAirdropRewards[lowerAddress] || [],
-                        };
-                    }
-                }
-                catch (error) {
-                    console.error('Error fetching Ethena Airdrop rewards data:', error);
-                    for (const address of rewardsAddresses) {
-                        rewardsData[address.toLowerCase()].ethena = {
-                            error: 'Error fetching Ethena Airdrop rewards data in batch',
-                            data: null,
-                        };
-                    }
-                }
-            }))(),
         ]);
         yield Promise.all([
-            ...aaveV3Markets.map((market) => allAddresses.map((address) => __awaiter(this, void 0, void 0, function* () {
+            ...aaveV3Markets.map((market) => addresses.map((address) => __awaiter(this, void 0, void 0, function* () {
                 try {
-                    const accData = yield _getAaveV3AccountData(client, network, address, Object.assign({ selectedMarket: market }, aaveV3MarketsData[market.value]));
-                    if (new Dec(accData.suppliedUsd).gt(0))
-                        positions[address.toLowerCase()].aaveV3[market.value] = { error: '', data: accData };
+                    const accData = yield _getAaveV3AccountData(client, network, address, Object.assign({ selectedMarket: market }, markets.aaveV3MarketsData[market.value]));
+                    // Always store the position (even with no supply) so the eMode category is available to the shifter
+                    positions[address.toLowerCase()].aaveV3[market.value] = { error: '', data: accData };
                 }
                 catch (error) {
                     console.error(`Error fetching AaveV3 account data for address ${address} on market ${market.value}:`, error);
                     positions[address.toLowerCase()].aaveV3[market.value] = { error: `Error fetching AaveV3 account data for address ${address} on market ${market.value}`, data: null };
                 }
             }))).flat(),
-            ...aaveV4Spokes.map((spoke) => allAddresses.map((address) => __awaiter(this, void 0, void 0, function* () {
+            ...aaveV4Spokes.map((spoke) => addresses.map((address) => __awaiter(this, void 0, void 0, function* () {
                 try {
-                    const accData = yield _getAaveV4AccountData(client, network, aaveV4SpokesData[spoke.value], address);
+                    const accData = yield _getAaveV4AccountData(client, network, markets.aaveV4SpokesData[spoke.value], address);
                     if (new Dec(accData.suppliedUsd).gt(0))
                         positions[address.toLowerCase()].aaveV4[spoke.value] = { error: '', data: accData };
                 }
@@ -444,57 +690,18 @@ export function getPortfolioData(provider_1, network_1, defaultProvider_1, addre
             }))).flat(),
             ...morphoMarkets.map((market) => addresses.map((address) => __awaiter(this, void 0, void 0, function* () {
                 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,
-                    ]);
-                    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 };
-                    }
-                    if (accDataPromise.status !== 'rejected') {
-                        const accData = accDataPromise.value;
-                        if (new Dec(accData.suppliedUsd).gt(0))
-                            positions[address.toLowerCase()].morphoBlue[market.value] = { error: '', data: accData };
-                    }
-                    if (earnDataPromise.status !== 'rejected') {
-                        const earnData = earnDataPromise.value;
-                        if (earnData && new Dec(earnData.amount).gt(0)) {
-                            stakingPositions[address.toLowerCase()].morphoBlue[market.value] = {
-                                error: '',
-                                data: earnData,
-                            };
-                        }
-                    }
+                    const accData = yield _getMorphoBlueAccountData(client, network, address, market, markets.morphoMarketsData[market.value]);
+                    if (new Dec(accData.suppliedUsd).gt(0))
+                        positions[address.toLowerCase()].morphoBlue[market.value] = { error: '', data: accData };
                 }
                 catch (error) {
                     console.error(`Error fetching MorphoBlue account data for address ${address} on market ${market.value}:`, error);
                     positions[address.toLowerCase()].morphoBlue[market.value] = { error: `Error fetching MorphoBlue account data for address ${address} on market ${market.value}`, data: null };
                 }
             }))).flat(),
-            ...morphoMidnightMarkets.map((market) => addresses.map((address) => __awaiter(this, void 0, void 0, function* () {
-                var _a;
-                try {
-                    // Markets are created lazily on the first position, so an uncreated one can hold no position.
-                    if (!((_a = morphoMidnightMarketsData[market.value]) === null || _a === void 0 ? void 0 : _a.isCreated))
-                        return;
-                    const accData = yield _getMorphoMidnightAccountData(client, network, address, market, morphoMidnightMarketsData[market.value]);
-                    if (new Dec(accData.suppliedUsd).gt(0))
-                        positions[address.toLowerCase()].morphoMidnight[market.value] = { error: '', data: accData };
-                }
-                catch (error) {
-                    console.error(`Error fetching MorphoMidnight account data for address ${address} on market ${market.value}:`, error);
-                    positions[address.toLowerCase()].morphoMidnight[market.value] = { error: `Error fetching MorphoMidnight account data for address ${address} on market ${market.value}`, data: null };
-                }
-            }))).flat(),
             ...compoundV3Markets.map((market) => addresses.map((address) => __awaiter(this, void 0, void 0, function* () {
                 try {
-                    const accData = yield _getCompoundV3AccountData(client, network, address, ZERO_ADDRESS, { selectedMarket: market, assetsData: compoundV3MarketsData[market.value].assetsData });
+                    const accData = yield _getCompoundV3AccountData(client, network, address, ZERO_ADDRESS, { selectedMarket: market, assetsData: markets.compoundV3MarketsData[market.value].assetsData });
                     if (new Dec(accData.suppliedUsd).gt(0))
                         positions[address.toLowerCase()].compoundV3[market.value] = { error: '', data: accData };
                 }
@@ -503,37 +710,33 @@ export function getPortfolioData(provider_1, network_1, defaultProvider_1, addre
                     positions[address.toLowerCase()].compoundV3[market.value] = { error: `Error fetching CompoundV3 account data for address ${address} on market ${market.value}`, data: null };
                 }
             }))).flat(),
-            ...sparkMarkets.map((market) => allAddresses.map((address) => __awaiter(this, void 0, void 0, function* () {
+            ...sparkMarkets.map((market) => addresses.map((address) => __awaiter(this, void 0, void 0, function* () {
                 try {
-                    const accData = yield _getSparkAccountData(client, network, address, { selectedMarket: market, assetsData: sparkMarketsData[market.value].assetsData, eModeCategoriesData: sparkMarketsData[market.value].eModeCategoriesData });
-                    if (new Dec(accData.suppliedUsd).gt(0))
-                        positions[address.toLowerCase()].spark[market.value] = { error: '', data: accData };
+                    const accData = yield _getSparkAccountData(client, network, address, { selectedMarket: market, assetsData: markets.sparkMarketsData[market.value].assetsData, eModeCategoriesData: markets.sparkMarketsData[market.value].eModeCategoriesData });
+                    // Always store the position (even with no supply) so the eMode category is available to the shifter
+                    positions[address.toLowerCase()].spark[market.value] = { error: '', data: accData };
                 }
                 catch (error) {
                     console.error(`Error fetching Spark account data for address ${address} on market ${market.value}:`, error);
                     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) => {
-                var _a;
-                return ((_a = makerCdps[address.toLowerCase()]) !== null && _a !== void 0 ? _a : []).map((cdpInfo) => __awaiter(this, void 0, void 0, function* () {
-                    try {
-                        const cdpData = yield _getMakerCdpData(client, network, cdpInfo);
-                        if (cdpData) {
-                            positions[address.toLowerCase()].maker[cdpInfo.id] = { error: '', data: cdpData };
-                        }
-                    }
-                    catch (error) {
-                        console.error(`Error fetching Maker CDP data for address ${address} with ID ${cdpInfo.id}:`, error);
-                        positions[address.toLowerCase()].maker[cdpInfo.id] = { error: `Error fetching Maker CDP data for address ${address} with ID ${cdpInfo.id}`, data: null };
+            ...addresses.map((address) => (makerCdps[address.toLowerCase()] || []).map((cdpInfo) => __awaiter(this, void 0, void 0, function* () {
+                try {
+                    // reuse ilk data fetched for the markets payload; ilks outside the active set are fetched on demand
+                    const cdpData = yield _getMakerCdpData(client, network, cdpInfo, markets.makerMarketsData[cdpInfo.ilkLabel]);
+                    if (cdpData) {
+                        positions[address.toLowerCase()].maker[cdpInfo.id] = { error: '', data: cdpData };
                     }
-                }));
-            }),
+                }
+                catch (error) {
+                    console.error(`Error fetching Maker CDP data for address ${address} with ID ${cdpInfo.id}:`, error);
+                    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);
+                    const accData = yield _getAaveV2AccountData(client, network, address, markets.aaveV2MarketsData[market.value].assetsData, market);
                     if (new Dec(accData.suppliedUsd).gt(0))
                         positions[address.toLowerCase()].aaveV2[market.value] = { error: '', data: accData };
                 }
@@ -544,7 +747,7 @@ export function getPortfolioData(provider_1, network_1, defaultProvider_1, addre
             }))).flat(),
             ...compoundV2Markets.map((market) => addresses.map((address) => __awaiter(this, void 0, void 0, function* () {
                 try {
-                    const accData = yield _getCompoundV2AccountData(client, network, address, compoundV2MarketsData[market.value].assetsData);
+                    const accData = yield _getCompoundV2AccountData(client, network, address, markets.compoundV2MarketsData[market.value].assetsData);
                     if (new Dec(accData.suppliedUsd).gt(0))
                         positions[address.toLowerCase()].compoundV2[market.value] = { error: '', data: accData };
                 }
@@ -568,9 +771,9 @@ export function getPortfolioData(provider_1, network_1, defaultProvider_1, addre
             })),
             ...crvUsdMarkets.map((market) => addresses.map((address) => __awaiter(this, void 0, void 0, function* () {
                 try {
-                    const accData = yield _getCurveUsdUserData(client, network, address, market, crvUsdMarketsData[market.value].activeBand);
+                    const accData = yield _getCurveUsdUserData(client, network, address, market, markets.crvUsdMarketsData[market.value].activeBand, markets.crvUsdMarketsData[market.value].borrowRate);
                     if (new Dec(accData.suppliedUsd).gt(0) || new Dec(accData.borrowedUsd).gt(0)) {
-                        positions[address.toLowerCase()].crvUsd[market.value] = { error: '', data: Object.assign(Object.assign({}, accData), { borrowRate: crvUsdMarketsData[market.value].borrowRate }) };
+                        positions[address.toLowerCase()].crvUsd[market.value] = { error: '', data: accData };
                     }
                 }
                 catch (error) {
@@ -580,9 +783,9 @@ export function getPortfolioData(provider_1, network_1, defaultProvider_1, addre
             }))).flat(),
             ...llamaLendMarkets.map((market) => addresses.map((address) => __awaiter(this, void 0, void 0, function* () {
                 try {
-                    const accData = yield _getLlamaLendUserData(client, network, address, market, llamaLendMarketsData[market.value]);
+                    const accData = yield _getLlamaLendUserData(client, network, address, market, markets.llamaLendMarketsData[market.value]);
                     if (new Dec(accData.suppliedUsd).gt(0) || new Dec(accData.borrowedUsd).gt(0)) {
-                        positions[address.toLowerCase()].llamaLend[market.value] = { error: '', data: Object.assign(Object.assign({}, accData), { borrowRate: llamaLendMarketsData[market.value].borrowRate }) };
+                        positions[address.toLowerCase()].llamaLend[market.value] = { error: '', data: Object.assign(Object.assign({}, accData), { borrowRate: markets.llamaLendMarketsData[market.value].borrowRate }) };
                     }
                 }
                 catch (error) {
@@ -590,26 +793,9 @@ export function getPortfolioData(provider_1, network_1, defaultProvider_1, addre
                     positions[address.toLowerCase()].llamaLend[market.value] = { error: `Error fetching LlamaLend account data for address ${address} on market ${market.value}`, data: null };
                 }
             }))).flat(),
-            // liquity sBold/yBold and staking options
-            ...stakingAddresses.map((address) => __awaiter(this, void 0, void 0, function* () {
-                try {
-                    if (!isMainnet) {
-                        stakingPositions[address.toLowerCase()].liquityV2SBoldYBold = { error: '', data: null };
-                        return;
-                    }
-                    const data = yield getLiquitySAndYBold(client, network, stakingPositions[address.toLowerCase()].liquityV2, address);
-                    stakingPositions[address.toLowerCase()].liquityV2SBoldYBold = { error: '', data };
-                }
-                catch (error) {
-                    console.error(`Error fetching SBold/YBold data for address ${address}:`, error);
-                    stakingPositions[address.toLowerCase()].liquityV2SBoldYBold = { error: `Error fetching sBold/yBold data for address ${address}`, data: null };
-                }
-            })),
         ]);
         return {
             positions,
-            stakingPositions,
-            rewardsData,
             markets,
         };
     });