@defisaver/positions-sdk 2.1.169-portfolio-api-dev → 2.1.169

package/cjs/portfolio/index.js

@@ -27,21 +27,19 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getWalletLendingSummaries = void 0;
-exports.getPortfolioMarketsData = getPortfolioMarketsData;
-exports.getPortfolioUserData = getPortfolioUserData;
 exports.getPortfolioData = getPortfolioData;
 exports.getShifterPortfolioData = getShifterPortfolioData;
 const decimal_js_1 = __importDefault(require("decimal.js"));
 const common_1 = require("../types/common");
 const markets_1 = require("../markets");
 const morphoBlue_1 = require("../morphoBlue");
+const morphoMidnight_1 = require("../morphoMidnight");
 const types_1 = require("../types");
 const compoundV3_1 = require("../compoundV3");
 const spark_1 = require("../spark");
 const curveUsd_1 = require("../curveUsd");
 const llamaLend_1 = require("../llamaLend");
 const aaveV3_1 = require("../aaveV3");
-const aaveV4_1 = require("../aaveV4");
 const constants_1 = require("../constants");
 const maker_1 = require("../maker");
 const aaveV2_1 = require("../aaveV2");
@@ -55,227 +53,225 @@ const aaveV3_2 = require("../claiming/aaveV3");
 const spark_2 = require("../claiming/spark");
 const king_1 = require("../claiming/king");
 const ethena_1 = require("../claiming/ethena");
+const aaveV4_1 = require("../aaveV4");
 const uniswap_1 = require("../claiming/uniswap");
-const lendingProtocols_1 = require("./lendingProtocols");
-/** The markets of the protocols read by their own code below; LENDING_PROTOCOLS has the others'. */
-const getPortfolioMarkets = (network) => ({
-    liquityV2Markets: [common_1.NetworkNumber.Eth].includes(network) ? Object.values((0, markets_1.LiquityV2Markets)(network)) : [],
-    liquityV2MarketsStaking: [common_1.NetworkNumber.Eth].includes(network) ? Object.values((0, markets_1.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: (0, viem_1.getViemProvider)(provider, ...args),
-        defaultClient: (0, viem_1.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(lendingProtocols_1.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 (0, liquityV2_1._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 === common_1.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 = [common_1.NetworkNumber.Eth, common_1.NetworkNumber.Arb, common_1.NetworkNumber.Base, common_1.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(lendingProtocols_1.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 },
+function getPortfolioData(provider_1, network_1, defaultProvider_1, addresses_1) {
+    return __awaiter(this, arguments, void 0, function* (provider, network, defaultProvider, addresses, isSim = false) {
+        const isMainnet = network === common_1.NetworkNumber.Eth;
+        const isFluidSupported = [common_1.NetworkNumber.Eth, common_1.NetworkNumber.Arb, common_1.NetworkNumber.Base, common_1.NetworkNumber.Plasma].includes(network);
+        const morphoMarkets = Object.values((0, markets_1.MorphoBlueMarkets)(network)).filter((market) => market.chainIds.includes(network));
+        const morphoMidnightMarkets = Object.values((0, markets_1.MorphoMidnightMarkets)(network)).filter((market) => market.chainIds.includes(network));
+        const compoundV3Markets = Object.values((0, markets_1.CompoundMarkets)(network)).filter((market) => market.chainIds.includes(network) && market.value !== types_1.CompoundVersions.CompoundV2);
+        const sparkMarkets = Object.values((0, markets_1.SparkMarkets)(network)).filter((market) => market.chainIds.includes(network));
+        const aaveV3Markets = [types_1.AaveVersions.AaveV3, types_1.AaveVersions.AaveV3Lido, types_1.AaveVersions.AaveV3Etherfi].map((version) => (0, markets_1.AaveMarkets)(network)[version]).filter((market) => market.chainIds.includes(network));
+        const aaveV2Markets = [types_1.AaveVersions.AaveV2].map((version) => (0, markets_1.AaveMarkets)(network)[version]).filter((market) => market.chainIds.includes(network));
+        const compoundV2Markets = [types_1.CompoundVersions.CompoundV2].map((version) => (0, markets_1.CompoundMarkets)(network)[version]).filter((market) => market.chainIds.includes(network));
+        const crvUsdMarkets = Object.values((0, markets_1.CrvUsdMarkets)(network)).filter((market) => market.chainIds.includes(network));
+        const llamaLendMarkets = [common_1.NetworkNumber.Eth, common_1.NetworkNumber.Arb].includes(network) ? Object.values((0, markets_1.LlamaLendMarkets)(network)).filter((market) => market.chainIds.includes(network)) : [];
+        const liquityV2Markets = [common_1.NetworkNumber.Eth].includes(network) ? Object.values((0, markets_1.LiquityV2Markets)(network)) : [];
+        const liquityV2MarketsStaking = [common_1.NetworkNumber.Eth].includes(network) ? Object.values((0, markets_1.LiquityV2Markets)(network)).filter(market => !market.isLegacy) : [];
+        const aaveV4Spokes = Object.values((0, markets_1.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 client = (0, viem_1.getViemProvider)(provider, ...args);
+        const defaultClient = (0, viem_1.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,
         };
-    }
-    // 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 (0, maker_1._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* () {
+        const positions = {};
+        const stakingPositions = {};
+        const rewardsData = {};
+        const allAddresses = [...addresses];
+        for (const address of allAddresses) {
+            positions[address.toLowerCase()] = {
+                aaveV3: {},
+                aaveV4: {},
+                morphoBlue: {},
+                morphoMidnight: {},
+                compoundV3: {},
+                spark: {},
+                maker: {},
+                aaveV2: {},
+                compoundV2: {},
+                liquity: {},
+                crvUsd: {},
+                llamaLend: {},
+                fluid: {
+                    error: '',
+                    data: {},
+                },
+            };
+        }
+        // TODO: check default values, probably needed when fetching portfolio on unsupported networks
+        for (const address of addresses) {
+            stakingPositions[address.toLowerCase()] = {
+                aaveV3: {},
+                morphoBlue: {},
+                compoundV3: {},
+                spark: {},
+                aaveV2: {},
+                compoundV2: {},
+                liquity: {},
+                liquityV2: {},
+                fluid: {
+                    error: '',
+                    data: {},
+                },
+            };
+            rewardsData[address.toLowerCase()] = {
+                merkl: {},
+                aaveV3: {},
+                spark: {},
+                spk: {},
+                king: {},
+                ethena: {},
+            };
+        }
+        yield Promise.allSettled([
+            // === MARKET DATA (needs to be fetched first) ===
+            ...morphoMarkets.map((market) => __awaiter(this, void 0, void 0, function* () {
+                const marketData = yield (0, morphoBlue_1._getMorphoBluePortfolioMarketData)(client, network, market);
+                morphoMarketsData[market.value] = marketData;
+            })),
+            ...morphoMidnightMarkets.map((market) => __awaiter(this, void 0, void 0, function* () {
+                const marketData = yield (0, morphoMidnight_1._getMorphoMidnightMarketData)(client, network, market);
+                morphoMidnightMarketsData[market.value] = marketData;
+            })),
+            ...compoundV3Markets.map((market) => __awaiter(this, void 0, void 0, function* () {
+                const marketData = yield (0, compoundV3_1._getCompoundV3MarketsData)(client, network, market, defaultClient);
+                compoundV3MarketsData[market.value] = marketData;
+            })),
+            ...sparkMarkets.map((market) => __awaiter(this, void 0, void 0, function* () {
+                const marketData = yield (0, spark_1._getSparkMarketsData)(client, network, market);
+                sparkMarketsData[market.value] = marketData;
+            })),
+            ...aaveV3Markets.map((market) => __awaiter(this, void 0, void 0, function* () {
+                const marketData = yield (0, aaveV3_1._getAaveV3MarketData)(client, network, market);
+                aaveV3MarketsData[market.value] = marketData;
+            })),
+            ...aaveV4Spokes.map((spoke) => __awaiter(this, void 0, void 0, function* () {
+                const spokeData = yield (0, aaveV4_1._getAaveV4SpokeData)(client, network, spoke);
+                aaveV4SpokesData[spoke.value] = spokeData;
+            })),
+            ...aaveV2Markets.map((market) => __awaiter(this, void 0, void 0, function* () {
+                const marketData = yield (0, aaveV2_1._getAaveV2MarketsData)(client, network, market);
+                aaveV2MarketsData[market.value] = marketData;
+            })),
+            ...compoundV2Markets.map((market) => __awaiter(this, void 0, void 0, function* () {
+                const marketData = yield (0, compoundV2_1._getCompoundV2MarketsData)(client, network);
+                compoundV2MarketsData[market.value] = marketData;
+            })),
+            ...crvUsdMarkets.map((market) => __awaiter(this, void 0, void 0, function* () {
+                const marketData = yield (0, curveUsd_1._getCurveUsdGlobalData)(client, network, market);
+                crvUsdMarketsData[market.value] = marketData;
+            })),
+            ...llamaLendMarkets.map((market) => __awaiter(this, void 0, void 0, function* () {
+                const marketData = yield (0, llamaLend_1._getLlamaLendGlobalData)(client, network, market);
+                llamaLendMarketsData[market.value] = marketData;
+            })),
+            ...liquityV2Markets.map((market) => __awaiter(this, void 0, void 0, function* () {
+                const marketData = yield (0, liquityV2_1._getLiquityV2MarketData)(client, network, market);
+                liquityV2MarketsData[market.value] = marketData;
+            })),
+            // === INDEPENDENT USER DATA (doesn't depend on market data) ===
+            ...addresses.map((address) => __awaiter(this, void 0, void 0, function* () {
+                if (!isMainnet)
+                    return; // Maker CDPs are only available on mainnet
+                const makerCdp = yield (0, maker_1._getUserCdps)(client, network, address);
+                makerCdps[address.toLowerCase()] = makerCdp;
+            })),
+            ...addresses.map((address) => __awaiter(this, void 0, void 0, function* () {
                 try {
-                    const cdpData = yield (0, maker_1._getMakerCdpData)(client, network, cdpInfo);
-                    if (cdpData) {
-                        positions[address.toLowerCase()].maker[cdpInfo.id] = { error: '', data: cdpData };
+                    if (!isFluidSupported)
+                        return; // Fluid is not available on Optimism
+                    const userPositions = (yield (0, fluid_1._getUserPositionsPortfolio)(client, network, address));
+                    for (const position of userPositions) {
+                        if (position.userData && new decimal_js_1.default(position.userData.suppliedUsd).gt(0)) {
+                            positions[address.toLowerCase()].fluid.data[position.userData.nftId] = position.userData;
+                        }
                     }
                 }
                 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 };
+                    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 (!isFluidSupported)
-                    return; // Fluid is not available on Optimism
-                const userPositions = (yield (0, fluid_1._getUserPositionsPortfolio)(client, network, address));
-                for (const position of userPositions) {
-                    if (position.userData && new decimal_js_1.default(position.userData.suppliedUsd).gt(0)) {
-                        positions[address.toLowerCase()].fluid.data[position.userData.nftId] = position.userData;
-                    }
+            })),
+            // === STAKING DATA (independent of market data) ===
+            ...addresses.map((address) => __awaiter(this, void 0, void 0, function* () {
+                try {
+                    if (!isFluidSupported)
+                        return;
+                    stakingPositions[address.toLowerCase()].fluid = yield (0, fluid_1._getAllUserEarnPositionsWithFTokens)(client, network, address);
                 }
-            }
-            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 (0, liquity_1._getLiquityTroveInfo)(client, network, address);
-                if (new decimal_js_1.default(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 (0, fluid_1._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 (0, liquity_1.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 (0, aaveV3_1.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 (0, umbrella_1.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* () {
+                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 };
+                }
+            })),
+            ...addresses.map((address) => __awaiter(this, void 0, void 0, function* () {
+                try {
+                    if (!isMainnet)
+                        return;
+                    stakingPositions[address.toLowerCase()].liquity = yield (0, liquity_1.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 };
+                }
+            })),
+            ...addresses.map((address) => __awaiter(this, void 0, void 0, function* () {
+                try {
+                    if (!isMainnet)
+                        return;
+                    stakingPositions[address.toLowerCase()].aaveV3 = yield (0, aaveV3_1.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 };
+                }
+            })),
+            ...addresses.map((address) => __awaiter(this, void 0, void 0, function* () {
+                try {
+                    if (!isMainnet)
+                        return;
+                    stakingPositions[address.toLowerCase()].umbrella = yield (0, umbrella_1.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 => addresses.map((address) => __awaiter(this, void 0, void 0, function* () {
                 try {
                     if (!isMainnet) {
                         stakingPositions[address.toLowerCase()].liquityV2[market.value] = { error: '', data: null };
@@ -288,271 +284,337 @@ const _getPortfolioUserData = (client, network, addresses, marketsData, isSim, o
                     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;
+            }))).flat(),
+            // === REWARDS DATA (independent of market data) ===
+            // Batch King rewards
+            (() => __awaiter(this, void 0, void 0, function* () {
+                try {
+                    if (!isMainnet) {
+                        for (const address of addresses) {
+                            rewardsData[address.toLowerCase()].king = { error: '', data: [] };
+                        }
+                        return;
+                    }
+                    const kingRewards = yield (0, king_1.getKingRewards)(client, network, addresses);
+                    for (const address of addresses) {
+                        const lowerAddress = address.toLowerCase();
+                        rewardsData[lowerAddress].king = {
+                            error: '',
+                            data: kingRewards[lowerAddress] || [],
+                        };
+                    }
                 }
-                const data = yield (0, liquityV2_1.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: [] };
+                catch (error) {
+                    console.error('Error fetching King rewards data in batch:', error);
+                    for (const address of addresses) {
+                        rewardsData[address.toLowerCase()].king = {
+                            error: 'Error fetching King rewards data in batch',
+                            data: null,
+                        };
                     }
-                    return;
                 }
-                const kingRewards = yield (0, king_1.getKingRewards)(client, network, rewardsAddresses);
-                for (const address of rewardsAddresses) {
-                    const lowerAddress = address.toLowerCase();
-                    rewardsData[lowerAddress].king = {
-                        error: '',
-                        data: kingRewards[lowerAddress] || [],
-                    };
+            }))(),
+            // Batch UNI rewards
+            (() => __awaiter(this, void 0, void 0, function* () {
+                try {
+                    if (!isMainnet) {
+                        for (const address of addresses) {
+                            rewardsData[address.toLowerCase()].uniswap = { error: '', data: [] };
+                        }
+                        return;
+                    }
+                    const uniswapRewards = yield (0, uniswap_1.getUniswapRewards)(client, network, addresses);
+                    for (const address of addresses) {
+                        const lowerAddress = address.toLowerCase();
+                        rewardsData[lowerAddress].uniswap = {
+                            error: '',
+                            data: uniswapRewards[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,
-                    };
+                catch (error) {
+                    console.error('Error fetching Uniswap rewards data in batch:', error);
+                    for (const address of addresses) {
+                        rewardsData[address.toLowerCase()].uniswap = {
+                            error: 'Error fetching Uniswap 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: [] };
+            }))(),
+            ...sparkMarkets.map((market) => addresses.map((address) => __awaiter(this, void 0, void 0, function* () {
+                try {
+                    if (!isMainnet) {
+                        rewardsData[address.toLowerCase()].spark[market.value] = { error: '', data: [] };
+                        return;
                     }
-                    return;
+                    const sparkData = yield (0, spark_2.fetchSparkRewards)(client, network, address, market.providerAddress);
+                    rewardsData[address.toLowerCase()].spark[market.value] = { error: '', data: sparkData };
                 }
-                const uniswapRewards = yield (0, uniswap_1.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 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 };
                 }
-            }
-            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,
-                    };
+            }))).flat(),
+            ...addresses.map((address) => __awaiter(this, void 0, void 0, function* () {
+                try {
+                    const merklData = yield (0, aaveV3_2.getMerklUnclaimedRewards)(address, network);
+                    rewardsData[address.toLowerCase()].merkl = { error: '', data: merklData };
                 }
-            }
-        }))(),
-        ...lendingProtocols_1.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;
+                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 => addresses.map((address) => __awaiter(this, void 0, void 0, function* () {
+                try {
+                    const aaveData = yield (0, aaveV3_2.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);
+                    rewardsData[address.toLowerCase()].aaveV3 = { error: `Error fetching Aave V3 rewards data for address ${address}`, data: null };
                 }
-                const sparkData = yield (0, spark_2.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 (0, aaveV3_2.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 };
-            }
-        })),
-        ...lendingProtocols_1.aaveV3Lending.markets(network).map(market => rewardsAddresses.map((address) => __awaiter(void 0, void 0, void 0, function* () {
-            try {
-                const aaveData = yield (0, aaveV3_2.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: [] };
+            }))).flat(),
+            // Batch Spark Airdrop rewards
+            (() => __awaiter(this, void 0, void 0, function* () {
+                try {
+                    if (!isMainnet) {
+                        for (const address of addresses) {
+                            rewardsData[address.toLowerCase()].spk = { error: '', data: [] };
+                        }
+                        return;
+                    }
+                    const sparkAirdropRewards = yield (0, spark_2.fetchSparkAirdropRewards)(client, network, addresses);
+                    for (const address of addresses) {
+                        const lowerAddress = address.toLowerCase();
+                        rewardsData[lowerAddress].spk = {
+                            error: '',
+                            data: sparkAirdropRewards[lowerAddress] || [],
+                        };
                     }
-                    return;
                 }
-                const sparkAirdropRewards = yield (0, spark_2.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 addresses) {
+                        rewardsData[address.toLowerCase()].spk = {
+                            error: 'Error fetching Spark Airdrop rewards data in batch',
+                            data: null,
+                        };
+                    }
                 }
-            }
-            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 (0, ethena_1.fetchEthenaAirdropRewards)(addresses);
+                    for (const address of addresses) {
+                        const lowerAddress = address.toLowerCase();
+                        rewardsData[lowerAddress].ethena = {
+                            error: '',
+                            data: ethenaAirdropRewards[lowerAddress] || [],
+                        };
+                    }
                 }
-            }
-        }))(),
-        (() => __awaiter(void 0, void 0, void 0, function* () {
-            try {
-                if (!isMainnet) {
-                    return;
+                catch (error) {
+                    console.error('Error fetching Ethena Airdrop rewards data:', error);
+                    for (const address of addresses) {
+                        rewardsData[address.toLowerCase()].ethena = {
+                            error: 'Error fetching Ethena Airdrop rewards data in batch',
+                            data: null,
+                        };
+                    }
                 }
-                const ethenaAirdropRewards = yield (0, ethena_1.fetchEthenaAirdropRewards)(rewardsAddresses);
-                for (const address of rewardsAddresses) {
-                    const lowerAddress = address.toLowerCase();
-                    rewardsData[lowerAddress].ethena = {
-                        error: '',
-                        data: ethenaAirdropRewards[lowerAddress] || [],
-                    };
+            }))(),
+        ]);
+        yield Promise.all([
+            ...aaveV3Markets.map((market) => allAddresses.map((address) => __awaiter(this, void 0, void 0, function* () {
+                try {
+                    const accData = yield (0, aaveV3_1._getAaveV3AccountData)(client, network, address, Object.assign({ selectedMarket: market }, aaveV3MarketsData[market.value]));
+                    if (new decimal_js_1.default(accData.suppliedUsd).gt(0))
+                        positions[address.toLowerCase()].aaveV3[market.value] = { error: '', data: accData };
                 }
-            }
-            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,
-                    };
+                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 };
                 }
-            }
-        }))(),
-        // === POSITIONS ON MARKETS (each waits for its market's data) ===
-        ...lendingProtocols_1.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.
-        ...lendingProtocols_1.morphoBlueLending.markets(network).flatMap((market) => stakingAddresses.map((address) => __awaiter(void 0, void 0, void 0, function* () {
-            try {
-                const marketData = (0, lendingProtocols_1.requireMarket)((yield marketsData).morphoMarketsData, market.value);
-                const earnData = yield (0, morphoBlue_1.getMorphoEarn)(client, network, address, market, marketData);
-                if (earnData && new decimal_js_1.default(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 (0, liquityV2_1._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* () {
+            }))).flat(),
+            ...aaveV4Spokes.map((spoke) => allAddresses.map((address) => __awaiter(this, void 0, void 0, function* () {
+                try {
+                    const accData = yield (0, aaveV4_1._getAaveV4AccountData)(client, network, aaveV4SpokesData[spoke.value], address);
+                    if (new decimal_js_1.default(accData.suppliedUsd).gt(0))
+                        positions[address.toLowerCase()].aaveV4[spoke.value] = { error: '', data: accData };
+                }
+                catch (error) {
+                    console.error(`Error fetching AaveV4 account data for address ${address} on spoke ${spoke.value}:`, error);
+                    positions[address.toLowerCase()].aaveV4[spoke.value] = { error: `Error fetching AaveV4 account data for address ${address} on spoke ${spoke.value}`, data: null };
+                }
+            }))).flat(),
+            ...morphoMarkets.map((market) => addresses.map((address) => __awaiter(this, void 0, void 0, function* () {
+                try {
+                    const [accDataPromise, earnDataPromise] = yield Promise.allSettled([
+                        (0, morphoBlue_1._getMorphoBlueAccountData)(client, network, address, market, morphoMarketsData[market.value]),
+                        (0, morphoBlue_1.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') {
+                        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;
+                        if (new decimal_js_1.default(accData.suppliedUsd).gt(0))
+                            positions[address.toLowerCase()].morphoBlue[market.value] = { error: '', data: accData };
+                    }
+                    if (earnDataPromise.status !== 'rejected') {
+                        const earnData = earnDataPromise.value;
+                        if (earnData && new decimal_js_1.default(earnData.amount).gt(0)) {
+                            stakingPositions[address.toLowerCase()].morphoBlue[market.value] = {
+                                error: '',
+                                data: earnData,
+                            };
+                        }
+                    }
+                }
+                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;
-                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 (0, liquityV2_1._getLiquityV2TroveData)(client, network, {
-                            selectedMarket: market,
-                            assetsData: marketData.assetsData,
-                            troveId,
-                            allMarketsData: allMarketsData,
-                        });
+                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 (0, morphoMidnight_1._getMorphoMidnightAccountData)(client, network, address, market, morphoMidnightMarketsData[market.value]);
+                    if (new decimal_js_1.default(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 (0, compoundV3_1._getCompoundV3AccountData)(client, network, address, constants_1.ZERO_ADDRESS, { selectedMarket: market, assetsData: compoundV3MarketsData[market.value].assetsData });
+                    if (new decimal_js_1.default(accData.suppliedUsd).gt(0))
+                        positions[address.toLowerCase()].compoundV3[market.value] = { error: '', data: accData };
+                }
+                catch (error) {
+                    console.error(`Error fetching CompoundV3 account data for address ${address} on market ${market.value}:`, error);
+                    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* () {
+                try {
+                    const accData = yield (0, spark_1._getSparkAccountData)(client, network, address, { selectedMarket: market, assetsData: sparkMarketsData[market.value].assetsData, eModeCategoriesData: sparkMarketsData[market.value].eModeCategoriesData });
+                    if (new decimal_js_1.default(accData.suppliedUsd).gt(0))
+                        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(),
+            ...addresses.map((address) => (makerCdps[address.toLowerCase()] || []).map((cdpInfo) => __awaiter(this, void 0, void 0, function* () {
+                try {
+                    const cdpData = yield (0, maker_1._getMakerCdpData)(client, network, cdpInfo);
+                    if (cdpData) {
+                        positions[address.toLowerCase()].maker[cdpInfo.id] = { error: '', data: cdpData };
                     }
-                    catch (error) {
-                        console.error(`Error fetching Liquity V2 trove ${troveId} for address ${address} on market ${market.value}:`, error);
-                        failed.push(troveId);
+                }
+                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 (0, aaveV2_1._getAaveV2AccountData)(client, network, address, aaveV2MarketsData[market.value].assetsData, market);
+                    if (new decimal_js_1.default(accData.suppliedUsd).gt(0))
+                        positions[address.toLowerCase()].aaveV2[market.value] = { error: '', data: accData };
+                }
+                catch (error) {
+                    console.error(`Error fetching AaveV2 account data for address ${address}:`, error);
+                    positions[address.toLowerCase()].aaveV2[market.value] = { error: `Error fetching AaveV2 account data for address ${address}`, data: null };
+                }
+            }))).flat(),
+            ...compoundV2Markets.map((market) => addresses.map((address) => __awaiter(this, void 0, void 0, function* () {
+                try {
+                    const accData = yield (0, compoundV2_1._getCompoundV2AccountData)(client, network, address, compoundV2MarketsData[market.value].assetsData);
+                    if (new decimal_js_1.default(accData.suppliedUsd).gt(0))
+                        positions[address.toLowerCase()].compoundV2[market.value] = { error: '', data: accData };
+                }
+                catch (error) {
+                    console.error(`Error fetching CompoundV2 account data for address ${address}:`, error);
+                    positions[address.toLowerCase()].compoundV2[market.value] = { error: `Error fetching CompoundV2 account data for address ${address}`, data: null };
+                }
+            }))).flat(),
+            ...addresses.map((address) => __awaiter(this, void 0, void 0, function* () {
+                try {
+                    if (!isMainnet)
+                        return; // Liquity trove info is only available on mainnet
+                    const troveInfo = yield (0, liquity_1._getLiquityTroveInfo)(client, network, address);
+                    if (new decimal_js_1.default(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 };
+                }
+            })),
+            ...crvUsdMarkets.map((market) => addresses.map((address) => __awaiter(this, void 0, void 0, function* () {
+                try {
+                    const accData = yield (0, curveUsd_1._getCurveUsdUserData)(client, network, address, market, crvUsdMarketsData[market.value].activeBand, crvUsdMarketsData[market.value].borrowRate);
+                    if (new decimal_js_1.default(accData.suppliedUsd).gt(0) || new decimal_js_1.default(accData.borrowedUsd).gt(0)) {
+                        positions[address.toLowerCase()].crvUsd[market.value] = { error: '', data: accData };
                     }
-                })));
-                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`.
- */
-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.
- */
-function getPortfolioUserData(provider_1, network_1, addresses_1, markets_2) {
-    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);
-    });
-}
-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),
+                }
+                catch (error) {
+                    console.error(`Error fetching Curve USD account data for address ${address} on market ${market.value}:`, error);
+                    positions[address.toLowerCase()].crvUsd[market.value] = { error: `Error fetching Curve USD account data for address ${address} on market ${market.value}`, data: null };
+                }
+            }))).flat(),
+            ...llamaLendMarkets.map((market) => addresses.map((address) => __awaiter(this, void 0, void 0, function* () {
+                try {
+                    const accData = yield (0, llamaLend_1._getLlamaLendUserData)(client, network, address, market, llamaLendMarketsData[market.value]);
+                    if (new decimal_js_1.default(accData.suppliedUsd).gt(0) || new decimal_js_1.default(accData.borrowedUsd).gt(0)) {
+                        positions[address.toLowerCase()].llamaLend[market.value] = { error: '', data: Object.assign(Object.assign({}, accData), { borrowRate: llamaLendMarketsData[market.value].borrowRate }) };
+                    }
+                }
+                catch (error) {
+                    console.error(`Error fetching LlamaLend account data for address ${address} on market ${market.value}:`, error);
+                    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
+            ...addresses.map((address) => __awaiter(this, void 0, void 0, function* () {
+                try {
+                    if (!isMainnet) {
+                        stakingPositions[address.toLowerCase()].liquityV2SBoldYBold = { error: '', data: null };
+                        return;
+                    }
+                    const data = yield (0, liquityV2_1.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: userData.positions,
-            stakingPositions: userData.stakingPositions,
-            rewardsData: userData.rewardsData,
+            positions,
+            stakingPositions,
+            rewardsData,
             markets,
-            errors: Object.assign(Object.assign({}, (Object.keys(marketsErrors).length ? { markets: marketsErrors } : {})), userData.errors),
         };
     });
 }