@defisaver/positions-sdk 2.1.168-stable-pair-dev → 2.1.169-custom-fetching-dev

package/esm/portfolio/index.js

@@ -7,862 +7,29 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-import Dec from 'decimal.js';
-import { NetworkNumber } from '../types/common';
-import { AaveMarkets, AaveV4Spokes, CompoundMarkets, CrvUsdMarkets, LiquityV2Markets, LlamaLendMarkets, MakerActiveIlks, MorphoBlueMarkets, MorphoMidnightMarkets, 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 { ZERO_ADDRESS } from '../constants';
-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 { _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 { PortfolioProtocol } from '../types';
+import { getCustomDeFiData } from './customDeFiData';
 export 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 === NetworkNumber.Eth;
-        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));
-        const aaveV2Markets = [AaveVersions.AaveV2].map((version) => AaveMarkets(network)[version]).filter((market) => market.chainIds.includes(network));
-        const compoundV2Markets = [CompoundVersions.CompoundV2].map((version) => CompoundMarkets(network)[version]).filter((market) => market.chainIds.includes(network));
-        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 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,
-        };
-        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 _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;
-            })),
-            ...compoundV3Markets.map((market) => __awaiter(this, void 0, void 0, function* () {
-                const marketData = yield _getCompoundV3MarketsData(client, network, market, defaultClient);
-                compoundV3MarketsData[market.value] = marketData;
-            })),
-            ...sparkMarkets.map((market) => __awaiter(this, void 0, void 0, function* () {
-                const marketData = yield _getSparkMarketsData(client, network, market);
-                sparkMarketsData[market.value] = marketData;
-            })),
-            ...aaveV3Markets.map((market) => __awaiter(this, void 0, void 0, function* () {
-                const marketData = yield _getAaveV3MarketData(client, network, market);
-                aaveV3MarketsData[market.value] = marketData;
-            })),
-            ...aaveV4Spokes.map((spoke) => __awaiter(this, void 0, void 0, function* () {
-                const spokeData = yield _getAaveV4SpokeData(client, network, spoke);
-                aaveV4SpokesData[spoke.value] = spokeData;
-            })),
-            ...aaveV2Markets.map((market) => __awaiter(this, void 0, void 0, function* () {
-                const marketData = yield _getAaveV2MarketsData(client, network, market);
-                aaveV2MarketsData[market.value] = marketData;
-            })),
-            ...compoundV2Markets.map((market) => __awaiter(this, void 0, void 0, function* () {
-                const marketData = yield _getCompoundV2MarketsData(client, network);
-                compoundV2MarketsData[market.value] = marketData;
-            })),
-            ...crvUsdMarkets.map((market) => __awaiter(this, void 0, void 0, function* () {
-                const marketData = yield _getCurveUsdGlobalData(client, network, market);
-                crvUsdMarketsData[market.value] = marketData;
-            })),
-            ...llamaLendMarkets.map((market) => __awaiter(this, void 0, void 0, function* () {
-                const marketData = yield _getLlamaLendGlobalData(client, network, market);
-                llamaLendMarketsData[market.value] = marketData;
-            })),
-            ...liquityV2Markets.map((market) => __awaiter(this, void 0, void 0, function* () {
-                const marketData = yield _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 _getUserCdps(client, network, address);
-                makerCdps[address.toLowerCase()] = makerCdp;
-            })),
-            ...addresses.map((address) => __awaiter(this, 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: {},
-                    };
-                }
-            })),
-            // === 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 _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 };
-                }
-            })),
-            ...addresses.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 };
-                }
-            })),
-            ...addresses.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 };
-                }
-            })),
-            ...addresses.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 => addresses.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 addresses) {
-                            rewardsData[address.toLowerCase()].king = { error: '', data: [] };
-                        }
-                        return;
-                    }
-                    const kingRewards = yield getKingRewards(client, network, addresses);
-                    for (const address of addresses) {
-                        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 addresses) {
-                        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 addresses) {
-                            rewardsData[address.toLowerCase()].uniswap = { error: '', data: [] };
-                        }
-                        return;
-                    }
-                    const uniswapRewards = yield 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 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,
-                        };
-                    }
-                }
-            }))(),
-            ...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;
-                    }
-                    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(),
-            ...addresses.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 => addresses.map((address) => __awaiter(this, void 0, void 0, function* () {
-                try {
-                    const aaveData = yield getUnclaimedRewardsForAllMarkets(client, network, address, market.providerAddress);
-                    rewardsData[address.toLowerCase()].aaveV3[market.value] = { error: '', data: aaveData };
-                }
-                catch (error) {
-                    console.error(`Error fetching Aave V3 Merit rewards data for address ${address}:`, error);
-                    rewardsData[address.toLowerCase()].aaveV3 = { error: `Error fetching Aave V3 rewards data for address ${address}`, data: null };
-                }
-            }))).flat(),
-            // Batch Spark Airdrop rewards
-            (() => __awaiter(this, void 0, void 0, function* () {
-                try {
-                    if (!isMainnet) {
-                        for (const address of addresses) {
-                            rewardsData[address.toLowerCase()].spk = { error: '', data: [] };
-                        }
-                        return;
-                    }
-                    const sparkAirdropRewards = yield fetchSparkAirdropRewards(client, network, addresses);
-                    for (const address of addresses) {
-                        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,
-                        };
-                    }
-                }
-            }))(),
-            (() => __awaiter(this, void 0, void 0, function* () {
-                try {
-                    if (!isMainnet) {
-                        return;
-                    }
-                    const ethenaAirdropRewards = yield fetchEthenaAirdropRewards(addresses);
-                    for (const address of addresses) {
-                        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 addresses) {
-                        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* () {
-                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 };
-                }
-                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* () {
-                try {
-                    const accData = yield _getAaveV4AccountData(client, network, aaveV4SpokesData[spoke.value], address);
-                    if (new Dec(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([
-                        _getMorphoBlueAccountData(client, network, address, market, morphoMarketsData[market.value]),
-                        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 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,
-                            };
-                        }
-                    }
-                }
-                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 });
-                    if (new Dec(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 _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 };
-                }
-                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 _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 };
-                }
-            }))).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);
-                    if (new Dec(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 _getCompoundV2AccountData(client, network, address, compoundV2MarketsData[market.value].assetsData);
-                    if (new Dec(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 _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 };
-                }
-            })),
-            ...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, 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: accData };
-                    }
-                }
-                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 _getLlamaLendUserData(client, network, address, market, 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 }) };
-                    }
-                }
-                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 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,
-        };
+        return getCustomDeFiData(provider, network, defaultProvider, addresses, {
+            fetchStaking: true,
+            fetchRewards: true,
+            isSim,
+        });
     });
 }
 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 isFluidSupported = [NetworkNumber.Eth, NetworkNumber.Arb, NetworkNumber.Base, NetworkNumber.Plasma].includes(network);
-        const morphoMarkets = Object.values(MorphoBlueMarkets(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));
-        const aaveV2Markets = [AaveVersions.AaveV2].map((version) => AaveMarkets(network)[version]).filter((market) => market.chainIds.includes(network));
-        const compoundV2Markets = [CompoundVersions.CompoundV2].map((version) => CompoundMarkets(network)[version]).filter((market) => market.chainIds.includes(network));
-        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 aaveV4Spokes = Object.values(AaveV4Spokes(network)).filter((market) => market.chainIds.includes(network));
-        const args = [network, { batch: { multicall: { batchSize: isSim ? 2000 : 2500000 } } }];
-        const client = getViemProvider(provider, ...args);
-        const defaultClient = getViemProvider(defaultProvider, ...args);
-        const markets = {
-            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 = {};
-        for (const address of addresses) {
-            positions[address.toLowerCase()] = {
-                aaveV3: {},
-                aaveV4: {},
-                morphoBlue: {},
-                morphoMidnight: {}, // not fetched for the shifter (see markets above)
-                compoundV3: {},
-                spark: {},
-                maker: {},
-                aaveV2: {},
-                compoundV2: {},
-                liquity: {},
-                crvUsd: {},
-                llamaLend: {},
-                fluid: {
-                    error: '',
-                    data: {},
-                },
-            };
-        }
-        yield Promise.allSettled([
-            // === MARKET DATA (needs to be fetched first) ===
-            ...morphoMarkets.map((market) => __awaiter(this, void 0, void 0, function* () {
-                markets.morphoMarketsData[market.value] = yield _getMorphoBluePortfolioMarketData(client, network, market);
-            })),
-            ...compoundV3Markets.map((market) => __awaiter(this, void 0, void 0, function* () {
-                markets.compoundV3MarketsData[market.value] = yield _getCompoundV3MarketsData(client, network, market, defaultClient);
-            })),
-            ...sparkMarkets.map((market) => __awaiter(this, void 0, void 0, function* () {
-                markets.sparkMarketsData[market.value] = yield _getSparkMarketsData(client, network, market);
-            })),
-            ...aaveV3Markets.map((market) => __awaiter(this, void 0, void 0, function* () {
-                markets.aaveV3MarketsData[market.value] = yield _getAaveV3MarketData(client, network, market);
-            })),
-            ...aaveV4Spokes.map((spoke) => __awaiter(this, void 0, void 0, function* () {
-                markets.aaveV4SpokesData[spoke.value] = yield _getAaveV4SpokeData(client, network, spoke);
-            })),
-            ...aaveV2Markets.map((market) => __awaiter(this, void 0, void 0, function* () {
-                markets.aaveV2MarketsData[market.value] = yield _getAaveV2MarketsData(client, network, market);
-            })),
-            ...compoundV2Markets.map((market) => __awaiter(this, void 0, void 0, function* () {
-                markets.compoundV2MarketsData[market.value] = yield _getCompoundV2MarketsData(client, network);
-            })),
-            ...crvUsdMarkets.map((market) => __awaiter(this, void 0, void 0, function* () {
-                markets.crvUsdMarketsData[market.value] = yield _getCurveUsdGlobalData(client, network, market);
-            })),
-            ...llamaLendMarkets.map((market) => __awaiter(this, void 0, void 0, function* () {
-                markets.llamaLendMarketsData[market.value] = yield _getLlamaLendGlobalData(client, network, market);
-            })),
-            ...liquityV2Markets.map((market) => __awaiter(this, void 0, void 0, function* () {
-                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)
-                    return; // Maker CDPs are only available on mainnet
-                const makerCdp = yield _getUserCdps(client, network, address);
-                makerCdps[address.toLowerCase()] = makerCdp;
-            })),
-            ...addresses.map((address) => __awaiter(this, 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: {},
-                    };
-                }
-            })),
-        ]);
-        yield Promise.all([
-            ...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 }, 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) => addresses.map((address) => __awaiter(this, void 0, void 0, function* () {
-                try {
-                    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 };
-                }
-                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 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(),
-            ...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: markets.compoundV3MarketsData[market.value].assetsData });
-                    if (new Dec(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) => addresses.map((address) => __awaiter(this, void 0, void 0, function* () {
-                try {
-                    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(),
-            ...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, markets.aaveV2MarketsData[market.value].assetsData, market);
-                    if (new Dec(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 _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 };
-                }
-                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 _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 };
-                }
-            })),
-            ...crvUsdMarkets.map((market) => addresses.map((address) => __awaiter(this, void 0, void 0, function* () {
-                try {
-                    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: accData };
-                    }
-                }
-                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 _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: markets.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(),
-        ]);
-        return {
-            positions,
-            markets,
-        };
+        const { positions, markets } = yield getCustomDeFiData(provider, network, defaultProvider, addresses, {
+            protocols: Object.values(PortfolioProtocol).filter((p) => p !== PortfolioProtocol.MorphoMidnight),
+            returnEmptyEModePositions: true,
+            fetchFluidMarkets: true,
+            isSim,
+            batchSize: isSim ? 2000 : 2500000,
+        });
+        return { positions, markets };
     });
 }
 export * from './discovery';
+export * from './customDeFiData';
 export { getWalletLendingSummaries } from './lendingSummaries';