@1delta/margin-fetcher 0.0.151 → 0.0.153

package/dist/index.js

@@ -1,9 +1,9 @@
-import { formatEther, BaseError, formatUnits } from './chunk-GJEFCA2S.js';
+import { formatEther, BaseError, encodeFunctionData, formatUnits, decodeFunctionResult, decodeAbiParameters } from './chunk-CEH73TVJ.js';
 import './chunk-BYTNVMX7.js';
 import './chunk-PR4QN5HX.js';
 import { Lender, AAVE_V3_LENDERS, AAVE_V2_LENDERS, AAVE_V32_LENDERS, COMPOUND_V2_LENDERS, VENUS_LENDERS } from '@1delta/lender-registry';
 import lodash from 'lodash';
-import { getEvmClientUniversal, multicallRetry } from '@1delta/providers';
+import { getEvmChain, getEvmClientUniversal, multicallRetry } from '@1delta/providers';
 import { BALANCER_V2_FORKS, BALANCER_V3_FORKS, UNISWAP_V4_FORKS, FLASH_LOAN_IDS } from '@1delta/dex-registry';
 
 // src/abis/aave-v2/ProtocolDataProvider.ts
@@ -6256,11 +6256,14 @@ globalThis[GLOBAL_LENDER_DATA_KEY] = {
   compoundV3BaseData: {},
   compoundV2Pools: {},
   compoundV2Tokens: {},
+  compoundV2TokenArray: {},
   initConfig: {},
   aaveReserves: {},
   compoundV2Reserves: {},
   compoundV3Reserves: {},
   aaveOracles: {},
+  compoundV2Oracles: {},
+  compoundV3Oracles: {},
   morphoOracles: {},
   morphoTypeOracles: {},
   morphoTypeMarkets: {}
@@ -6272,6 +6275,8 @@ function initializeLenderData({
   aaveTokensOverride,
   aavePoolsOverride,
   aaveOraclesOverride,
+  compoundV2OraclesOverride,
+  compoundV3OraclesOverride,
   compoundV3PoolsOverride,
   compoundV3BaseDataOverride,
   morphoPoolsOverride,
@@ -6289,6 +6294,8 @@ function initializeLenderData({
   const data = getGlobalData2();
   if (aaveTokensOverride) data.aaveTokens = aaveTokensOverride;
   if (aaveOraclesOverride) data.aaveOracles = aaveOraclesOverride;
+  if (compoundV2OraclesOverride) data.compoundV2Oracles = compoundV2OraclesOverride;
+  if (compoundV3OraclesOverride) data.compoundV3Oracles = compoundV3OraclesOverride;
   if (aavePoolsOverride) data.aavePools = aavePoolsOverride;
   if (compoundV3PoolsOverride) data.compoundV3Pools = compoundV3PoolsOverride;
   if (morphoPoolsOverride) data.morphoPools = morphoPoolsOverride;
@@ -6307,6 +6314,8 @@ function initializeLenderData({
 var aaveTokens = () => getGlobalData2()?.aaveTokens;
 var aavePools = () => getGlobalData2()?.aavePools;
 var aaveOracles = () => getGlobalData2()?.aaveOracles;
+var compoundV2Oracles = () => getGlobalData2()?.compoundV2Oracles;
+var compoundV3Oracles = () => getGlobalData2()?.compoundV3Oracles;
 var morphoTypeOracles = () => getGlobalData2()?.morphoTypeOracles;
 var morphoTypeMarkets = () => getGlobalData2()?.morphoTypeMarkets;
 var aaveReserves = () => getGlobalData2()?.aaveReserves;
@@ -6319,6 +6328,13 @@ var compoundV2Pools = () => getGlobalData2()?.compoundV2Pools;
 var compoundV2Tokens = () => getGlobalData2()?.compoundV2Tokens;
 var compoundV2TokenArray = () => getGlobalData2()?.compoundV2TokenArray;
 var initConfig = () => getGlobalData2()?.initConfig;
+
+// src/utils/marketUid.ts
+function createMarketUid(chainId, lender, refAddress) {
+  return `${lender}:${chainId}:${refAddress.toLowerCase()}`;
+}
+
+// src/utils/index.ts
 var { uniq } = lodash;
 var COMPOUND_V3_KEY = "COMPOUND_V3";
 function isCompoundV3(lender) {
@@ -6440,7 +6456,7 @@ function getAaveTypePoolAddress(chainId, lender) {
   return aavePools()?.[lender]?.[chainId]?.pool;
 }
 var toOracleKey = (a) => {
-  return a;
+  return a ?? "";
 };
 var toGenericPriceKey = (assetAddress, chainId) => {
   return chainId + "-" + assetAddress;
@@ -7581,7 +7597,7 @@ var AAVE_V3_EMODES = (chain, lender) => {
     if (lender === Lender.AAVE_V3) return range(12);
   }
   if (chain === Chain.PLASMA_MAINNET) {
-    if (lender === Lender.AAVE_V3) return range(12);
+    if (lender === Lender.AAVE_V3) return range(17);
   }
   return [0, 1, 2, 3, 4, 5, 6];
 };
@@ -7740,6 +7756,20 @@ var addressesInitCore = {
     [Chain.MANTLE]: "0xDf75fF0452eDf4897B051A54b406eB384503Ac39"
   }
 };
+function getInitPools(chainId, lender) {
+  const poolData = initConfig()?.[lender]?.[chainId]?.poolData;
+  if (!poolData) return [];
+  return Object.entries(poolData).map(([poolId, value]) => ({
+    poolId,
+    underlying: value.underlying
+  }));
+}
+function getInitUnderlyingToPoolMap(chainId, lender) {
+  return getInitPools(chainId, lender).reduce((map, { underlying, poolId }) => {
+    map.set(underlying, poolId);
+    return map;
+  }, /* @__PURE__ */ new Map());
+}
 
 // src/lending/init/publicCallBuild.ts
 var INIT_MODES = [1, 2, 3, 4, 5, 6];
@@ -8614,6 +8644,7 @@ var INIT_EMODE_LABELS = {
 };
 var getInitReservesDataConverter = (lender, chainId, prices, additionalYields, tokenList = {}) => {
   const expectedNumberOfCalls = INIT_MODES.length;
+  const underlyingToPoolMap = getInitUnderlyingToPoolMap(chainId, lender);
   return [
     (data) => {
       if (data.length !== expectedNumberOfCalls) {
@@ -8636,6 +8667,8 @@ var getInitReservesDataConverter = (lender, chainId, prices, additionalYields, t
           const oracleKey = toOracleKey(meta?.assetGroup) ?? toGenericPriceKey(asset, chainId);
           const price = prices[oracleKey];
           const liquidity = Number(totalDeposits) - Number(totalDebt);
+          const poolId = underlyingToPoolMap.get(asset);
+          const params = !!poolId ? { metadata: { poolId } } : void 0;
           return {
             [asset]: {
               poolId: asset,
@@ -8666,7 +8699,8 @@ var getInitReservesDataConverter = (lender, chainId, prices, additionalYields, t
               stakingYield: additionalYields.intrinsicYields[oracleKey] ?? 0,
               rewards: {},
               config: {},
-              borrowingEnabled: totalDebt !== "0"
+              borrowingEnabled: totalDebt !== "0",
+              params
             }
           };
         })
@@ -10748,9 +10782,14 @@ var apyToApr2 = (apy) => {
   return ((apy + 1) ** (1 / SECONDS_PER_YEAR2) - 1) * SECONDS_PER_YEAR2;
 };
 
+// src/lending/user-data/utils/types.ts
+function getMarketUidsFromMeta(meta) {
+  return Object.keys(meta);
+}
+
 // src/lending/user-data/utils/createGeneralUserState.ts
 function createBaseTypeUserState(payload, lenderData, totalDeposits24h = 0, totalDebt24h = 0) {
-  let assetKeys = Object.keys(payload.lendingPositions["0"] ?? {});
+  let assetKeys = getMarketUidsFromMeta(lenderData);
   const { chainId, account } = payload;
   const mode = Number(payload.userEMode ?? 0);
   const isWhitelisted = !Boolean(payload?.notWhitelisted ?? false);
@@ -10768,17 +10807,19 @@ function createBaseTypeUserState(payload, lenderData, totalDeposits24h = 0, tota
   let collateralAllActive = 0;
   let rewardsPerAsset = {};
   for (let i = 0; i < assetKeys.length; i++) {
-    const asset = assetKeys[i];
-    if (!lenderData?.[asset]) continue;
-    const { depositsUSD, debtStableUSD, debtUSD, collateralEnabled } = payload.lendingPositions["0"][asset];
+    const marketUid = assetKeys[i];
+    if (!lenderData?.[marketUid] || !payload.lendingPositions["0"][marketUid])
+      continue;
+    const { depositsUSD, debtStableUSD, debtUSD, collateralEnabled } = payload.lendingPositions["0"][marketUid];
     const {
       depositRate,
-      stakingYield,
+      intrinsicYield,
       variableBorrowRate,
       stableBorrowRate,
       rewards,
-      collateralActive
-    } = lenderData[asset];
+      flags,
+      configs
+    } = lenderData[marketUid];
     deposits += depositsUSD;
     debt += debtStableUSD;
     debt += debtUSD;
@@ -10794,76 +10835,75 @@ function createBaseTypeUserState(payload, lenderData, totalDeposits24h = 0, tota
         if (rewDebt > 0) rewardsPerAsset[key].borrowApr += rewDebt;
       }
     );
-    stakingDepositAccrual += (stakingYield ?? 0) * depositsUSD;
-    stakingBorrowAccrual += (stakingYield ?? 0) * (debtStableUSD + debtUSD);
-    if (collateralActive) {
+    stakingDepositAccrual += (intrinsicYield ?? 0) * depositsUSD;
+    stakingBorrowAccrual += (intrinsicYield ?? 0) * (debtStableUSD + debtUSD);
+    if (flags?.collateralActive) {
       if (collateralEnabled) {
-        collateral += (lenderData[asset].config[mode]?.collateralFactor ?? 1) * depositsUSD;
-        borrowDiscountedCollateral += (lenderData[asset].config[mode]?.borrowCollateralFactor ?? 1) * depositsUSD;
+        collateral += (configs[mode]?.collateralFactor ?? 1) * depositsUSD;
+        borrowDiscountedCollateral += (configs[mode]?.borrowCollateralFactor ?? 1) * depositsUSD;
       }
-      borrowDiscountedCollateralAllActive += (lenderData[asset].config[mode]?.borrowCollateralFactor ?? 1) * depositsUSD;
-      collateralAllActive += (lenderData[asset].config[mode]?.collateralFactor ?? 1) * depositsUSD;
+      borrowDiscountedCollateralAllActive += (configs[mode]?.borrowCollateralFactor ?? 1) * depositsUSD;
+      collateralAllActive += (configs[mode]?.collateralFactor ?? 1) * depositsUSD;
     }
     depositInterest += depositRate * depositsUSD;
     borrowInterest += debtStableUSD * stableBorrowRate + debtUSD * variableBorrowRate;
   }
   const nav = deposits - debt;
   const balanceData2 = {
-    "0": {
-      borrowDiscountedCollateral,
-      borrowDiscountedCollateralAllActive,
-      collateral,
-      collateralAllActive,
-      deposits,
-      debt,
-      adjustedDebt: debt,
-      nav,
-      deposits24h: totalDeposits24h,
-      debt24h: totalDebt24h,
-      nav24h: totalDeposits24h - totalDebt24h,
-      ...payload.rewards ? { rewards: payload.rewards } : {}
-    }
+    borrowDiscountedCollateral,
+    borrowDiscountedCollateralAllActive,
+    collateral,
+    collateralAllActive,
+    deposits,
+    debt,
+    adjustedDebt: debt,
+    nav,
+    deposits24h: totalDeposits24h,
+    debt24h: totalDebt24h,
+    nav24h: totalDeposits24h - totalDebt24h,
+    ...payload.rewards ? { rewards: payload.rewards } : {}
   };
   const aprData2 = {
-    "0": {
-      apr: safeDivide(depositInterest - borrowInterest, nav),
-      borrowApr: safeDivide(borrowInterest, debt),
-      depositApr: safeDivide(depositInterest, deposits),
-      rewards: divideAccrualsToAprs(rewardsPerAsset, nav, deposits, debt),
-      rewardApr: safeDivide(rewardDepositAccrual + rewardBorrowAccrual, nav),
-      rewardDepositApr: safeDivide(rewardDepositAccrual, deposits),
-      rewardBorrowApr: safeDivide(rewardBorrowAccrual, debt),
-      stakingApr: safeDivide(stakingDepositAccrual - stakingBorrowAccrual, nav),
-      stakingDepositApr: safeDivide(stakingDepositAccrual, deposits),
-      stakingBorrowApr: safeDivide(stakingBorrowAccrual, debt)
-    }
-  };
-  const userConfigs = {
-    "0": { selectedMode: mode, id: account, isWhitelisted }
+    apr: safeDivide(depositInterest - borrowInterest, nav),
+    borrowApr: safeDivide(borrowInterest, debt),
+    depositApr: safeDivide(depositInterest, deposits),
+    rewards: divideAccrualsToAprs(rewardsPerAsset, nav, deposits, debt),
+    rewardApr: safeDivide(rewardDepositAccrual + rewardBorrowAccrual, nav),
+    rewardDepositApr: safeDivide(rewardDepositAccrual, deposits),
+    rewardBorrowApr: safeDivide(rewardBorrowAccrual, debt),
+    stakingApr: safeDivide(stakingDepositAccrual - stakingBorrowAccrual, nav),
+    stakingDepositApr: safeDivide(stakingDepositAccrual, deposits),
+    stakingBorrowApr: safeDivide(stakingBorrowAccrual, debt)
   };
+  const userConfig = { selectedMode: mode, id: account, isWhitelisted };
   return {
     account,
     chainId,
-    balanceData: balanceData2,
-    aprData: aprData2,
-    userConfigs
+    data: [
+      {
+        health: balanceData2.adjustedDebt === 0 ? null : balanceData2.borrowDiscountedCollateral / balanceData2.adjustedDebt,
+        accountId: "0",
+        balanceData: balanceData2,
+        aprData: aprData2,
+        userConfig,
+        positions: Object.values(payload.lendingPositions["0"])
+      }
+    ]
   };
 }
 
 // src/lending/user-data/utils/createMultiAccountStyleUserState.ts
 function createMultiAccountTypeUserState(payload, lenderData, histData) {
   const positionKeys = Object.keys(payload.lendingPositions ?? {});
-  let assetKeys = payload.assets;
+  let marketUids = getMarketUidsFromMeta(lenderData);
   const { chainId, account } = payload;
-  let userConfigs = {};
-  let balanceData2 = {};
-  let aprData2 = {};
+  let data = [];
   for (let j = 0; j < positionKeys.length; j++) {
     const posId = positionKeys[j];
     const position = payload.lendingPositions[posId];
     const { mode: posMode } = position;
     const mode = posMode ?? LENDER_MODE_NO_MODE;
-    userConfigs[posId] = {
+    const userConfig = {
       id: posId,
       selectedMode: mode,
       isWhitelisted: true
@@ -10879,20 +10919,27 @@ function createMultiAccountTypeUserState(payload, lenderData, histData) {
     let collateral = 0;
     let borrowDiscountedCollateral = 0;
     let adjustedDebt = 0;
-    for (let i = 0; i < assetKeys.length; i++) {
-      const asset = assetKeys[i];
-      const { depositsUSD, debtUSD } = payload.lendingPositions[posId][asset];
-      if (!lenderData?.[asset]) continue;
-      const { depositRate, stakingYield, variableBorrowRate, rewards } = lenderData[asset];
+    for (let i = 0; i < marketUids.length; i++) {
+      const marketUid = marketUids[i];
+      if (!lenderData?.[marketUid] || !payload.lendingPositions[posId][marketUid])
+        continue;
+      const { depositsUSD, debtUSD } = payload.lendingPositions[posId][marketUid];
+      const {
+        depositRate,
+        intrinsicYield,
+        variableBorrowRate,
+        rewards,
+        configs
+      } = lenderData[marketUid];
       deposits += depositsUSD;
       debt += debtUSD;
       Object.entries(rewards ?? {}).map(([key, rewardData]) => {
         rewardDepositAccrual += rewardData.depositRate * depositsUSD;
         rewardBorrowAccrual += rewardData.variableBorrowRate * debtUSD + rewardData.stableBorrowRate * debtUSD;
       });
-      stakingDepositAccrual += (stakingYield ?? 0) * depositsUSD;
-      stakingBorrowAccrual += (stakingYield ?? 0) * debtUSD;
-      const config = lenderData[asset].config[mode];
+      stakingDepositAccrual += (intrinsicYield ?? 0) * depositsUSD;
+      stakingBorrowAccrual += (intrinsicYield ?? 0) * debtUSD;
+      const config = configs?.[mode];
       collateral += (config?.collateralFactor ?? 1) * depositsUSD;
       borrowDiscountedCollateral += (config?.borrowCollateralFactor ?? 1) * depositsUSD;
       adjustedDebt += (config?.borrowFactor ?? 1) * debtUSD;
@@ -10900,7 +10947,7 @@ function createMultiAccountTypeUserState(payload, lenderData, histData) {
       borrowInterest += debtUSD * variableBorrowRate;
     }
     const nav = deposits - debt;
-    balanceData2[posId] = {
+    const balanceData2 = {
       borrowDiscountedCollateral,
       borrowDiscountedCollateralAllActive: borrowDiscountedCollateral,
       collateral,
@@ -10913,7 +10960,7 @@ function createMultiAccountTypeUserState(payload, lenderData, histData) {
       debt24h: histData[posId]?.totalDebt24h,
       nav24h: histData[posId]?.totalDeposits24h - histData[posId]?.totalDebt24h
     };
-    aprData2[posId] = {
+    const aprData2 = {
       apr: safeDivide(depositInterest - borrowInterest, nav),
       borrowApr: safeDivide(borrowInterest, debt),
       depositApr: safeDivide(depositInterest, deposits),
@@ -10922,15 +10969,24 @@ function createMultiAccountTypeUserState(payload, lenderData, histData) {
       rewardBorrowApr: safeDivide(rewardBorrowAccrual, debt),
       stakingApr: safeDivide(stakingDepositAccrual - stakingBorrowAccrual, nav),
       stakingDepositApr: safeDivide(stakingDepositAccrual, deposits),
-      stakingBorrowApr: safeDivide(stakingBorrowAccrual, debt)
+      stakingBorrowApr: safeDivide(stakingBorrowAccrual, debt),
+      rewards: {}
     };
+    data.push({
+      accountId: posId,
+      health: balanceData2.adjustedDebt === 0 ? null : balanceData2.borrowDiscountedCollateral / balanceData2.adjustedDebt,
+      userConfig,
+      // aggregated balance data
+      balanceData: balanceData2,
+      // aggregated apr data
+      aprData: aprData2,
+      positions: Object.values(payload.lendingPositions[posId])
+    });
   }
   return {
     account,
     chainId,
-    balanceData: balanceData2,
-    aprData: aprData2,
-    userConfigs
+    data
   };
 }
 
@@ -13526,7 +13582,7 @@ var getAbi = (lender) => {
   if (isCompoundV2Type(lender)) return VenusLensAbi;
   return [];
 };
-var getLenderPublicData = async (chainId, lenders, prices, additionalYields, multicallRetry2, tokenList = async () => {
+var getLenderPublicData = async (chainId, lenders, prices, additionalYields, multicallRetry3, tokenList = async () => {
   return {};
 }) => {
   let calls = [];
@@ -13537,7 +13593,7 @@ var getLenderPublicData = async (chainId, lenders, prices, additionalYields, mul
     calls = [...calls, ...mappedCalls];
   }
   const [rawResults, list] = await Promise.all([
-    multicallRetry2(
+    multicallRetry3(
       chainId,
       calls.map((call) => call.call),
       calls.map((call) => call.abi)
@@ -13649,7 +13705,7 @@ function lenderCanUseApi(lender, chainId) {
   }
   return false;
 }
-var getLenderPublicDataAll = async (chainId, lenders, prices, additionalYields, multicallRetry2, tokenList) => {
+var getLenderPublicDataAll = async (chainId, lenders, prices, additionalYields, multicallRetry3, tokenList) => {
   const lendersApi = lenders.filter((l) => lenderCanUseApi(l, chainId));
   const lendersOnChain = lenders.filter((l) => !lenderCanUseApi(l, chainId));
   const onChain = getLenderPublicData(
@@ -13657,7 +13713,7 @@ var getLenderPublicDataAll = async (chainId, lenders, prices, additionalYields,
     lendersOnChain,
     prices,
     additionalYields,
-    multicallRetry2,
+    multicallRetry3,
     tokenList
   );
   const api = getLenderPublicDataViaApi(
@@ -13670,8 +13726,85 @@ var getLenderPublicDataAll = async (chainId, lenders, prices, additionalYields,
   const [onChainRes, apiRes] = await Promise.all([onChain, api]);
   return { ...onChainRes, ...apiRes };
 };
-var { isArray } = lodash;
+
+// src/utils/constants.ts
 var MULTICALL_DEFAULT_BATCH_SIZE = 4096;
+var CELO_MULTICALL_ADDRESS = "0x633987602DE5C4F337e3DbF265303A1080324204";
+var BNB_MULTICALL_ADDRESS = "0x963Df249eD09c358A4819E39d9Cd5736c3087184";
+var MANTLE_MULTICALL_ADDRESS = "0x2A51f2F647E1883F88C992244dEd171238693107";
+var ARBITRUM_ONE_MULTICALL_ADDRESS = "0xadF885960B47eA2CD9B55E6DAc6B42b7Cb2806dB";
+var LINEA_MULTICALL_ADDRESS = "0xac1cE734566f390A94b00eb9bf561c2625BF44ea";
+var AVALANCHE_MULTICALL_ADDRESS = "0x0139141Cd4Ee88dF3Cdb65881D411bAE271Ef0C2";
+var BASE_MULTICALL_ADDRESS = "0x091e99cb1C49331a94dD62755D168E941AbD0693";
+var BLAST_MULTICALL_ADDRESS = "0xdC7f370de7631cE9e2c2e1DCDA6B3B5744Cf4705";
+var TAIKO_MULTICALL_ADDRESS = "0x8E24CfC19c6C00c524353CB8816f5f1c2F33c201";
+var HEMI_MULTICALL_ADDRESS = "0x352A86168e6988A1aDF9A15Cb00017AAd3B67155";
+var GNOSIS_MULTICALL_ADDRESS = "0x4dfa9a980efE4802E969AC33968E3d6E59B8a19e";
+var MODE_MULTICALL_ADDRESS = "0xAB39cE30D98a59DFDa40A630b074170800bfF179";
+var FANTOM_MULTICALL_ADDRESS = "0xDb51CffFf3B989d0cB6b58AbF173371b6F2d0D24";
+var SCROLL_MULTICALL_ADDRESS = "0x3b615B1AC55bc34e51a81D3dea67467F32bcb8C2";
+var SHAPE_MULTICALL_ADDRESS = "0x356A450B32f5030ae7083702b86FaFbBe7490411";
+var SONIC_MULTICALL_ADDRESS = "0x5d6b0f5335ec95cD2aB7E52f2A0750dd86502435";
+var INK_MULTICALL_ADDRESS = "0xA0fCec583AeE6176527C07B198e5561722332014";
+var METIS_MULTICALL_ADDRESS = "0x7a59ddbB76521E8982Fa3A08598C9a83b14A6C07";
+var IOTA_MULTICALL_ADDRESS = "0x9683D433621A83aA7dd290106e1da85251317F55";
+var KAVA_MULTICALL_ADDRESS = "0x8B741B0D79BE80E135C880F7583d427B4D41F015";
+var CORN_MULTICALL_ADDRESS = "0x5d6b0f5335ec95cD2aB7E52f2A0750dd86502435";
+var SAGA_MULTICALL_ADDRESS = "0x743E03cceB4af2efA3CC76838f6E8B50B63F184c";
+var CYBER_MULTICALL_ADDRESS = "0x906d6eB9CF8f64e100e44f8f491b833a8d40B530";
+var METAL_MULTICALL_ADDRESS = "0x5d6b0f5335ec95cD2aB7E52f2A0750dd86502435";
+var ZERO_MULTICALL_ADDRESS = "0x9CA4dcb2505fbf536F6c54AA0a77C79f4fBC35C0";
+var BOB_MULTICALL_ADDRESS = "0x5d6b0f5335ec95cD2aB7E52f2A0750dd86502435";
+var WORLDCHAIN_MULTICALL_ADDRESS = "0x0a22c04215c97E3F532F4eF30e0aD9458792dAB9";
+var LISK_MULTICALL_ADDRESS = "0xE3dbcD53f4Ce1b06Ab200f4912BD35672e68f1FA";
+var REDSTONE_MULTICALL_ADDRESS = "0xd57B52452a0FDfE3ff8e0A40Bd10D00D0bfe0723";
+var MANTA_MULTICALL_ADDRESS = "0x52dFC0D9960F11A9Ca9FF616e791B91188446a60";
+var ZORA_MULTICALL_ADDRESS = "0xA51c76bEE6746cB487a7e9312E43e2b8f4A37C15";
+var CORE_MULTICALL_ADDRESS = "0xFe9F82D820757787895Da00B1dBD35c3B8b04894";
+var MORPH_MULTICALL_ADDRESS = "0xAcD82113982479B25E7c1D09858F0130921Dbbca";
+var TELOS_MULTICALL_ADDRESS = "0x5d6b0f5335ec95cD2aB7E52f2A0750dd86502435";
+var MULTICALL_ADDRESS = {
+  [Chain.OP_MAINNET]: "0x1F98415757620B543A52E61c46B32eB19261F984",
+  [Chain.POLYGON_MAINNET]: "0x1F98415757620B543A52E61c46B32eB19261F984",
+  [Chain.ETHEREUM_MAINNET]: "0x1F98415757620B543A52E61c46B32eB19261F984",
+  [Chain.ARBITRUM_ONE]: ARBITRUM_ONE_MULTICALL_ADDRESS,
+  [Chain.BASE]: BASE_MULTICALL_ADDRESS,
+  [Chain.CELO_MAINNET]: CELO_MULTICALL_ADDRESS,
+  [Chain.BNB_SMART_CHAIN_MAINNET]: BNB_MULTICALL_ADDRESS,
+  [Chain.MANTLE]: MANTLE_MULTICALL_ADDRESS,
+  [Chain.BLAST]: BLAST_MULTICALL_ADDRESS,
+  [Chain.LINEA]: LINEA_MULTICALL_ADDRESS,
+  [Chain.AVALANCHE_C_CHAIN]: AVALANCHE_MULTICALL_ADDRESS,
+  [Chain.TAIKO_ALETHIA]: TAIKO_MULTICALL_ADDRESS,
+  [Chain.HEMI_NETWORK]: HEMI_MULTICALL_ADDRESS,
+  [Chain.GNOSIS]: GNOSIS_MULTICALL_ADDRESS,
+  [Chain.CORE_BLOCKCHAIN_MAINNET]: CORE_MULTICALL_ADDRESS,
+  [Chain.METIS_ANDROMEDA_MAINNET]: METIS_MULTICALL_ADDRESS,
+  [Chain.MODE]: MODE_MULTICALL_ADDRESS,
+  [Chain.INK]: INK_MULTICALL_ADDRESS,
+  [Chain.IOTA_EVM]: IOTA_MULTICALL_ADDRESS,
+  [Chain.CORN]: CORN_MULTICALL_ADDRESS,
+  [Chain.SONIC_MAINNET]: SONIC_MULTICALL_ADDRESS,
+  [Chain.FANTOM_OPERA]: FANTOM_MULTICALL_ADDRESS,
+  [Chain.SCROLL]: SCROLL_MULTICALL_ADDRESS,
+  [Chain.SHAPE]: SHAPE_MULTICALL_ADDRESS,
+  [Chain.CYBER_MAINNET]: CYBER_MULTICALL_ADDRESS,
+  [Chain.ZORA]: ZORA_MULTICALL_ADDRESS,
+  [Chain.MANTA_PACIFIC_MAINNET]: MANTA_MULTICALL_ADDRESS,
+  [Chain.REDSTONE]: REDSTONE_MULTICALL_ADDRESS,
+  [Chain.KAVA]: KAVA_MULTICALL_ADDRESS,
+  [Chain.METAL_L2]: METAL_MULTICALL_ADDRESS,
+  [Chain.LISK]: LISK_MULTICALL_ADDRESS,
+  [Chain.BOB]: BOB_MULTICALL_ADDRESS,
+  [Chain.ZERO_NETWORK]: ZERO_MULTICALL_ADDRESS,
+  [Chain.SAGA]: SAGA_MULTICALL_ADDRESS,
+  [Chain.MORPH]: MORPH_MULTICALL_ADDRESS,
+  [Chain.TELOS_EVM_MAINNET]: TELOS_MULTICALL_ADDRESS,
+  [Chain.WORLD_CHAIN]: WORLDCHAIN_MULTICALL_ADDRESS
+};
+
+// src/utils/multicall.ts
+var { isArray } = lodash;
 var maxRetries = 3;
 var multicallViemAbiArray = async (chainId, abi, calls, getEvmClient2, retry = true, providerId = 0, retries = maxRetries, allowFailure = true, batchSize = MULTICALL_DEFAULT_BATCH_SIZE, logs = false) => {
   try {
@@ -13711,6 +13844,117 @@ var multicallViemAbiArray = async (chainId, abi, calls, getEvmClient2, retry = t
     );
   }
 };
+function prepareMulticallInputs(abi, calls) {
+  const abiIsArray = isArray(abi[0]);
+  return calls.map(({ address, name, params }, i) => ({
+    address,
+    functionName: name,
+    params: params || [],
+    abi: abiIsArray ? abi[i] : abi
+  }));
+}
+
+// src/utils/rpcCall.ts
+var multicall3Abi = [
+  {
+    type: "function",
+    name: "aggregate3",
+    stateMutability: "payable",
+    inputs: [
+      {
+        name: "calls",
+        type: "tuple[]",
+        components: [
+          { name: "target", type: "address" },
+          { name: "allowFailure", type: "bool" },
+          { name: "callData", type: "bytes" }
+        ]
+      }
+    ],
+    outputs: [
+      {
+        name: "returnData",
+        type: "tuple[]",
+        components: [
+          { name: "success", type: "bool" },
+          { name: "returnData", type: "bytes" }
+        ]
+      }
+    ]
+  }
+];
+function createRawRpcCalls(preparedCalls, batchSize = MULTICALL_DEFAULT_BATCH_SIZE, blockTag = "latest") {
+  const batches = [];
+  for (let i = 0; i < preparedCalls.length; i += batchSize) {
+    const batchCalls = preparedCalls.slice(i, i + batchSize);
+    const rpcCalls = batchCalls.map((call, idx) => {
+      const data = encodeFunctionData({
+        abi: call.abi,
+        functionName: call.functionName,
+        args: call.params
+      });
+      return {
+        jsonrpc: "2.0",
+        id: i + idx + 1,
+        method: "eth_call",
+        params: [
+          {
+            to: call.address,
+            data
+          },
+          blockTag
+        ]
+      };
+    });
+    batches.push({
+      batchIndex: Math.floor(i / batchSize),
+      calls: rpcCalls,
+      callMetadata: batchCalls
+    });
+  }
+  return batches;
+}
+function createMulticallRpcCall(preparedCalls, multicallAddress, batchSize = MULTICALL_DEFAULT_BATCH_SIZE, blockTag = "latest", allowFailure = true) {
+  const batches = [];
+  for (let i = 0; i < preparedCalls.length; i += batchSize) {
+    const batchCalls = preparedCalls.slice(i, i + batchSize);
+    const aggregate3Calls = batchCalls.map((call) => {
+      const callData = encodeFunctionData({
+        abi: call.abi,
+        functionName: call.functionName,
+        args: call.params
+      });
+      return {
+        target: call.address,
+        allowFailure,
+        callData
+      };
+    });
+    const multicallData = encodeFunctionData({
+      abi: multicall3Abi,
+      functionName: "aggregate3",
+      args: [aggregate3Calls]
+    });
+    const rpcCall = {
+      jsonrpc: "2.0",
+      id: Math.floor(i / batchSize) + 1,
+      method: "eth_call",
+      params: [
+        {
+          to: multicallAddress,
+          data: multicallData
+        },
+        blockTag
+      ]
+    };
+    batches.push({
+      batchIndex: Math.floor(i / batchSize),
+      call: rpcCall,
+      callMetadata: batchCalls
+    });
+  }
+  return batches;
+}
 function organizeUserQueries(queries) {
   const morphos = queries.filter((q) => isMorphoType(q.lender));
   if (morphos.length === 0) return queries;
@@ -13747,10 +13991,12 @@ var getBaseAaveV2Calls = (chainId, account, lender, assetsToQuery) => {
     }
   ]);
 };
-var buildAaveV2UserCall = (chainId, lender, account, assets) => {
+var buildAaveV2UserCall = (chainId, lender, account) => {
   switch (lender) {
     default: {
-      const assetsToQuery = getAaveAssets(chainId, lender);
+      const assetsToQuery = getAaveAssets(chainId, lender).sort(
+        (a, b) => a.toLowerCase().localeCompare(b.toLowerCase())
+      );
       return getBaseAaveV2Calls(chainId, account, lender, assetsToQuery);
     }
   }
@@ -13766,8 +14012,10 @@ var getBaseAaveV3Calls = (chainId, account, lender, assetsToQuery) => {
     }
   ]);
 };
-var buildAaveV3UserCall = (chainId, lender, account, assets) => {
-  const assetsToQuery = assets ?? getAaveAssets(chainId, lender);
+var buildAaveV3UserCall = (chainId, lender, account) => {
+  const assetsToQuery = getAaveAssets(chainId, lender).sort(
+    (a, b) => a.toLowerCase().localeCompare(b.toLowerCase())
+  );
   const calls = [...getBaseAaveV3Calls(chainId, account, lender, assetsToQuery)];
   if (!isYLDR(lender)) {
     const callDataEmode = {
@@ -13800,10 +14048,12 @@ var buildInitUserCall = (chainId, lender, account) => {
 };
 
 // src/lending/user-data/compound-v3/userCallBuild.ts
-var buildCompoundV3UserCall = (chainId, lender, account, assetsOverride) => {
+var buildCompoundV3UserCall = (chainId, lender, account) => {
   const baseAsset = getCompoundV3BaseAsset(lender, chainId)?.baseAsset;
   const cometContractAddress = getCompoundV3CometAddress(chainId, lender);
-  const assets = assetsOverride ?? getLenderAssets(chainId, lender);
+  const assets = getLenderAssets(chainId, lender).sort(
+    (a, b) => a.toLowerCase().localeCompare(b.toLowerCase())
+  );
   const assetsNoBase = assets.filter((a) => a !== baseAsset);
   const baseCalls = [
     {
@@ -18225,10 +18475,12 @@ var getAbi2 = (lender) => {
 };
 
 // src/lending/user-data/aave-v2-type/userCallParse.ts
-var getAaveV2UserDataConverter = (lender, chainId, account, prices, pricesHist, lenderData) => {
+var getAaveV2UserDataConverter = (lender, chainId, account, metaMap) => {
   switch (lender) {
     default: {
-      const assetsToQuery = Object.keys(lenderData);
+      const assetsToQuery = getAaveAssets(chainId, lender).sort(
+        (a, b) => a.toLowerCase().localeCompare(b.toLowerCase())
+      );
       const expectedNumberOfCalls = assetsToQuery.length;
       return [
         (data) => {
@@ -18240,19 +18492,13 @@ var getAaveV2UserDataConverter = (lender, chainId, account, prices, pricesHist,
           let totalDeposits24h = 0;
           for (let i = 0; i < assetsToQuery.length; i++) {
             const asset = assetsToQuery[i];
-            const { dataForAsset, addedDebt, addedDeposits } = createAaveV2Entry(
-              i,
-              data,
-              chainId,
-              lenderData[asset].asset,
-              prices,
-              pricesHist,
-              0
-            );
+            const key = createMarketUid(chainId, lender, asset);
+            const metaEntity = metaMap?.[key];
+            const { dataForAsset, addedDebt, addedDeposits } = createAaveV2Entry(i, data, key, metaEntity, 0);
             if (!dataForAsset) continue;
             totalDebt24h += addedDebt;
             totalDeposits24h += addedDeposits;
-            lendingPositions[asset] = dataForAsset;
+            lendingPositions[key] = dataForAsset;
           }
           const payload = {
             chainId,
@@ -18262,21 +18508,18 @@ var getAaveV2UserDataConverter = (lender, chainId, account, prices, pricesHist,
           };
           const userData = createBaseTypeUserState(
             payload,
-            lenderData,
+            metaMap,
             totalDeposits24h,
             totalDebt24h
           );
-          return {
-            ...payload,
-            ...userData
-          };
+          return userData;
         },
         expectedNumberOfCalls
       ];
     }
   }
 };
-function createAaveV2Entry(i, data, chainId, asset, prices, pricesHist, claimableRewards) {
+function createAaveV2Entry(i, data, key, meta, claimableRewards) {
   const reserveData = data[i];
   const currentATokenBalanceRaw = reserveData[0 /* currentATokenBalance */]?.toString();
   const currentStableDebtRaw = reserveData[1 /* currentStableDebt */]?.toString();
@@ -18288,7 +18531,7 @@ function createAaveV2Entry(i, data, chainId, asset, prices, pricesHist, claimabl
       addedDebt: 0
     };
   }
-  const assetMeta = asset;
+  const assetMeta = meta.asset;
   const decimals = assetMeta?.decimals ?? 18;
   const currentATokenBalance = Number(
     parseRawAmount(currentATokenBalanceRaw, decimals)
@@ -18299,12 +18542,11 @@ function createAaveV2Entry(i, data, chainId, asset, prices, pricesHist, claimabl
   const currentVariableDebt = Number(
     parseRawAmount(currentVariableDebtRaw, decimals)
   );
-  const key = toOracleKey(assetMeta?.assetGroup) ?? toGenericPriceKey(asset.address, chainId);
-  const price = prices[key] ?? 1;
-  const priceHist = pricesHist?.[key] ?? price;
+  const price = meta?.price?.priceUsd ?? 1;
+  const priceHist = meta?.price?.priceUsd24h ?? price;
   const dataForAsset = {
-    poolId: asset.address,
-    underlying: asset.address,
+    poolId: key,
+    underlying: assetMeta.address,
     deposits: currentATokenBalance,
     depositsRaw: currentATokenBalanceRaw,
     debtStable: currentStableDebt,
@@ -18326,8 +18568,10 @@ function createAaveV2Entry(i, data, chainId, asset, prices, pricesHist, claimabl
 }
 
 // src/lending/user-data/aave-v3-type/userCallParse.ts
-var getAaveV3UserDataConverter = (lender, chainId, account, prices, pricesHist, lenderData) => {
-  const assetsToQuery = Object.keys(lenderData);
+var getAaveV3UserDataConverter = (lender, chainId, account, metaMap) => {
+  const assetsToQuery = getAaveAssets(chainId, lender).sort(
+    (a, b) => a.toLowerCase().localeCompare(b.toLowerCase())
+  );
   const expectedNumberOfCalls = assetsToQuery.length + 1;
   return [
     (data) => {
@@ -18340,18 +18584,18 @@ var getAaveV3UserDataConverter = (lender, chainId, account, prices, pricesHist,
       let totalDeposits24h = 0;
       for (let i = 0; i < assetsToQuery.length; i++) {
         const asset = assetsToQuery[i];
+        const key = createMarketUid(chainId, lender, asset);
+        const metaEntity = metaMap?.[key];
         const { dataForAsset, addedDebt, addedDeposits } = createAaveV3Entry(
           i,
           data,
-          chainId,
-          lenderData[asset].asset,
-          prices,
-          pricesHist
+          key,
+          metaEntity
         );
         if (!dataForAsset) continue;
         totalDebt24h += addedDebt;
         totalDeposits24h += addedDeposits;
-        lendingPositions[asset] = dataForAsset;
+        lendingPositions[key] = dataForAsset;
       }
       const payload = {
         chainId,
@@ -18362,19 +18606,16 @@ var getAaveV3UserDataConverter = (lender, chainId, account, prices, pricesHist,
       };
       const userData = createBaseTypeUserState(
         payload,
-        lenderData,
+        metaMap,
         totalDeposits24h,
         totalDebt24h
       );
-      return {
-        ...payload,
-        ...userData
-      };
+      return userData;
     },
     expectedNumberOfCalls
   ];
 };
-function createAaveV3Entry(i, data, chainId, asset, prices, pricesHist) {
+function createAaveV3Entry(i, data, key, meta) {
   const reserveData = data[i];
   const currentATokenBalanceRaw = reserveData[0 /* currentATokenBalance */]?.toString();
   const currentStableDebtRaw = reserveData[1 /* currentStableDebt */]?.toString();
@@ -18386,17 +18627,16 @@ function createAaveV3Entry(i, data, chainId, asset, prices, pricesHist) {
       addedDebt: 0
     };
   }
-  const assetMeta = asset;
+  const assetMeta = meta.asset;
   const decimals = assetMeta?.decimals ?? 18;
   const currentATokenBalance = parseRawAmount(currentATokenBalanceRaw, decimals);
   const currentStableDebt = parseRawAmount(currentStableDebtRaw, decimals);
   const currentVariableDebt = parseRawAmount(currentVariableDebtRaw, decimals);
-  const key = toOracleKey(assetMeta?.assetGroup) ?? toGenericPriceKey(asset.address, chainId);
-  const price = prices[key] ?? 1;
-  const priceHist = pricesHist?.[key] ?? price;
+  const price = meta?.price?.priceUsd ?? 1;
+  const priceHist = meta?.price?.priceUsd24h ?? price;
   const dataForAsset = {
-    poolId: asset.address,
-    underlying: asset.address,
+    poolId: key,
+    underlying: assetMeta.address,
     deposits: currentATokenBalance,
     depositsRaw: currentATokenBalanceRaw,
     debtStable: currentStableDebt,
@@ -18418,7 +18658,7 @@ function createAaveV3Entry(i, data, chainId, asset, prices, pricesHist) {
 }
 
 // src/lending/user-data/init/userCallParse.ts
-var getInitUserDataConverter = (lender, chainId, account, prices, pricesHist, lenderData) => {
+var getInitUserDataConverter = (lender, chainId, account, metaMap) => {
   const validOwner = account.toLowerCase();
   const brokerAddress = getInitFlashAggregatorAddress(chainId) ?? "";
   const expectedNumberOfCalls = 1;
@@ -18431,8 +18671,8 @@ var getInitUserDataConverter = (lender, chainId, account, prices, pricesHist, le
       const indexes = data[0 /* posMeta */].map((e, i) => {
         return { e, i };
       }).filter((a) => a.e.owner.toLowerCase() === validOwner).map((a) => a.i);
-      const assets = Object.keys(lenderData);
       let histData = {};
+      let allPools = {};
       const result = Object.assign(
         {},
         ...indexes.map((index) => {
@@ -18443,11 +18683,14 @@ var getInitUserDataConverter = (lender, chainId, account, prices, pricesHist, le
             {},
             ...data[1 /* collaterals */][index].map(
               (c) => {
-                const asset = c.underlying.toLowerCase();
-                const decimals = lenderData[asset].asset?.decimals ?? 18;
+                const pool = c.pool.toLowerCase();
+                allPools[pool] = c.underlying.toLowerCase();
+                const key = createMarketUid(chainId, lender, pool);
+                const metaEntity = metaMap?.[key];
+                const decimals = metaEntity.asset?.decimals ?? 18;
                 const depositsRaw = c.amount.toString();
                 return {
-                  [asset]: {
+                  [pool]: {
                     deposits: parseRawAmount(depositsRaw, decimals),
                     depositsRaw
                   }
@@ -18459,10 +18702,13 @@ var getInitUserDataConverter = (lender, chainId, account, prices, pricesHist, le
             {},
             ...data[2 /* debts */][index].map(
               (c) => {
-                const asset = c.underlying.toLowerCase();
-                const decimals = lenderData[asset]?.asset?.decimals ?? 18;
+                const pool = c.pool.toLowerCase();
+                allPools[pool] = c.underlying.toLowerCase();
+                const key = createMarketUid(chainId, lender, pool);
+                const metaEntity = metaMap?.[key];
+                const decimals = metaEntity.asset?.decimals ?? 18;
                 return {
-                  [asset]: {
+                  [pool]: {
                     debt: parseRawAmount(c.amount.toString(), decimals)
                   }
                 };
@@ -18474,36 +18720,39 @@ var getInitUserDataConverter = (lender, chainId, account, prices, pricesHist, le
               mode,
               ...Object.assign(
                 {},
-                ...assets.map((a) => {
-                  const ams = toOracleKey(lenderData[a]?.asset?.assetGroup);
-                  const price = prices[ams] ?? 1;
-                  const priceHist = pricesHist?.[ams] ?? price;
-                  if (!histData[id])
-                    histData[id] = {
-                      totalDebt24h: 0,
-                      totalDeposits24h: 0
+                ...Object.entries(allPools).map(
+                  ([pool, underlying]) => {
+                    const key = createMarketUid(chainId, lender, pool);
+                    const metaEntity = metaMap?.[key];
+                    const price = metaEntity?.price?.priceUsd ?? 1;
+                    const priceHist = metaEntity?.price?.priceUsd24h ?? price;
+                    if (!histData[id])
+                      histData[id] = {
+                        totalDebt24h: 0,
+                        totalDeposits24h: 0
+                      };
+                    const debt = debtData[pool]?.debt ?? 0;
+                    const deposits = collatData[pool]?.deposits ?? 0;
+                    const depositsRaw = collatData[pool]?.depositsRaw ?? "0";
+                    histData[id].totalDebt24h += Number(debt) * priceHist;
+                    histData[id].totalDeposits24h += Number(deposits) * priceHist;
+                    return {
+                      [key]: {
+                        poolId: key,
+                        underlying,
+                        deposits,
+                        depositsRaw,
+                        debt,
+                        debtStable: "0",
+                        debtStableUSD: 0,
+                        depositsUSD: price * Number(deposits),
+                        debtUSD: price * Number(debt),
+                        collateralEnabled: true,
+                        isAllowed: entry.approved.toLowerCase() === brokerAddress.toLowerCase()
+                      }
                     };
-                  const debt = debtData[a]?.debt ?? 0;
-                  const deposits = collatData[a]?.deposits ?? 0;
-                  const depositsRaw = collatData[a]?.depositsRaw ?? "0";
-                  histData[id].totalDebt24h += Number(debt) * priceHist;
-                  histData[id].totalDeposits24h += Number(deposits) * priceHist;
-                  return {
-                    [a]: {
-                      poolId: a,
-                      underlying: a,
-                      deposits,
-                      depositsRaw,
-                      debt,
-                      debtStable: "0",
-                      debtStableUSD: 0,
-                      depositsUSD: price * Number(deposits),
-                      debtUSD: price * Number(debt),
-                      collateralEnabled: true,
-                      isAllowed: entry.approved.toLowerCase() === brokerAddress.toLowerCase()
-                    }
-                  };
-                })
+                  }
+                )
               )
             }
           };
@@ -18515,24 +18764,23 @@ var getInitUserDataConverter = (lender, chainId, account, prices, pricesHist, le
         account
       };
       const userState = createMultiAccountTypeUserState(
-        { ...payload, assets },
-        lenderData,
+        payload,
+        metaMap,
         histData
       );
-      return {
-        ...payload,
-        ...userState
-      };
+      return userState;
     },
     expectedNumberOfCalls
   ];
 };
 
 // src/lending/user-data/compound-v3/userCallParse.ts
-var getCompoundV3UserDataConverter = (lender, chainId, account, prices, pricesHist, lenderData) => {
-  const assetAddresses = Object.keys(lenderData);
+var getCompoundV3UserDataConverter = (lender, chainId, account, metaMap) => {
   const baseAsset = getCompoundV3BaseAsset(lender, chainId)?.baseAsset;
-  const assetsNoBase = assetAddresses.filter((a) => a !== baseAsset);
+  const assets = getLenderAssets(chainId, lender).sort(
+    (a, b) => a.toLowerCase().localeCompare(b.toLowerCase())
+  );
+  const assetsNoBase = assets.filter((a) => a !== baseAsset);
   const expectedNumberOfCalls = assetsNoBase.length + 2 + 1;
   return [
     (data) => {
@@ -18544,20 +18792,21 @@ var getCompoundV3UserDataConverter = (lender, chainId, account, prices, pricesHi
       let result = {};
       for (let i = 0; i < assetsNoBase.length; i++) {
         const asset = assetsNoBase[i];
-        const assetMeta = lenderData[asset].asset;
+        const key2 = createMarketUid(chainId, lender, asset);
+        const metaEntity2 = metaMap?.[key2];
+        const assetMeta = metaEntity2.asset;
         const decimals = assetMeta?.decimals ?? 18;
         const depositsRaw2 = data[i][0]?.toString();
         if (depositsRaw2 === "0") continue;
         const deposits2 = parseRawAmount(depositsRaw2, decimals);
-        const key = toOracleKey(assetMeta?.assetGroup) ?? toGenericPriceKey(asset, chainId);
-        const price = prices[key] ?? 1;
-        const priceHist = pricesHist?.[key] ?? price;
-        totalDeposits24h += Number(deposits2) * priceHist;
-        result[asset] = {
-          poolId: asset,
+        const price2 = metaEntity2?.price?.priceUsd ?? 1;
+        const priceHist2 = metaEntity2?.price?.priceUsd24h ?? price2;
+        totalDeposits24h += Number(deposits2) * priceHist2;
+        result[key2] = {
+          poolId: key2,
           underlying: asset,
           deposits: deposits2,
-          depositsUSD: Number(deposits2) * price,
+          depositsUSD: Number(deposits2) * price2,
           debtStableUSD: 0,
           debt: "0",
           debtStable: "0",
@@ -18570,23 +18819,24 @@ var getCompoundV3UserDataConverter = (lender, chainId, account, prices, pricesHi
       }
       const depositsRaw = data[assetsNoBase.length]?.toString();
       const debtRaw = data[assetsNoBase.length + 1]?.toString();
-      const baseMeta = lenderData[baseAsset].asset;
+      const key = createMarketUid(chainId, lender, baseAsset);
+      const metaEntity = metaMap?.[key];
+      const baseMeta = metaEntity.asset;
       const baseDecimals = baseMeta.decimals ?? 18;
       const deposits = parseRawAmount(depositsRaw, baseDecimals);
       const debt = parseRawAmount(debtRaw, baseDecimals);
-      const oracleKeyBase = toOracleKey(baseMeta?.assetGroup) ?? toGenericPriceKey(baseMeta.baseAsset, chainId);
-      const priceBase = prices[oracleKeyBase];
-      const priceBaseHist = pricesHist?.[oracleKeyBase] ?? priceBase;
-      totalDebt24h += Number(debt) * priceBaseHist;
-      totalDeposits24h += Number(deposits) * priceBaseHist;
-      const resultBase = {
-        [baseAsset]: {
-          poolId: baseAsset,
+      const price = metaEntity?.price?.priceUsd ?? 1;
+      const priceHist = metaEntity?.price?.priceUsd24h ?? price;
+      totalDebt24h += Number(debt) * priceHist;
+      totalDeposits24h += Number(deposits) * priceHist;
+      const resultBase = depositsRaw === "0" && debtRaw === "0" ? {} : {
+        [key]: {
+          poolId: key,
           underlying: baseAsset,
           deposits,
           debt,
-          depositsUSD: Number(deposits) * priceBase,
-          debtUSD: Number(debt) * priceBase,
+          depositsUSD: Number(deposits) * price,
+          debtUSD: Number(debt) * price,
           // populate values for totals
           debtStable: "0",
           debtStableUSD: 0,
@@ -18601,9 +18851,8 @@ var getCompoundV3UserDataConverter = (lender, chainId, account, prices, pricesHi
         parseRawAmount(earnedBalances?.owed?.toString(), 18)
       );
       const payload = {
-        lendingPositions: { [0]: { ...result, ...resultBase } },
+        lendingPositions: { "0": { ...result, ...resultBase } },
         chainId,
-        baseAsset,
         rewards: {
           ["COMP"]: {
             totalRewards: compRewards,
@@ -18614,22 +18863,21 @@ var getCompoundV3UserDataConverter = (lender, chainId, account, prices, pricesHi
       };
       const userData = createBaseTypeUserState(
         payload,
-        lenderData,
+        metaMap,
         totalDeposits24h,
         totalDebt24h
       );
-      return {
-        ...payload,
-        ...userData
-      };
+      return userData;
     },
     expectedNumberOfCalls
   ];
 };
 
 // src/lending/user-data/aave-v3-type/userCallParseYldr.ts
-var getYldrUserDataConverter = (lender, chainId, account, prices, pricesHist, lenderData) => {
-  const assetsToQuery = Object.keys(lenderData);
+var getYldrUserDataConverter = (lender, chainId, account, metaMap) => {
+  const assetsToQuery = getAaveAssets(chainId, lender).sort(
+    (a, b) => a.toLowerCase().localeCompare(b.toLowerCase())
+  );
   const expectedNumberOfCalls = assetsToQuery.length;
   return [
     (data) => {
@@ -18641,18 +18889,18 @@ var getYldrUserDataConverter = (lender, chainId, account, prices, pricesHist, le
       let totalDeposits24h = 0;
       for (let i = 0; i < assetsToQuery.length; i++) {
         const asset = assetsToQuery[i];
+        const key = createMarketUid(chainId, lender, asset);
+        const metaEntity = metaMap?.[key];
         const { dataForAsset, addedDebt, addedDeposits } = createAaveV3Entry2(
           i,
           data,
-          chainId,
-          lenderData[asset].asset,
-          prices,
-          pricesHist
+          key,
+          metaEntity
         );
         if (!dataForAsset) continue;
         totalDebt24h += addedDebt;
         totalDeposits24h += addedDeposits;
-        lendingPositions[asset] = dataForAsset;
+        lendingPositions[key] = dataForAsset;
       }
       const payload = {
         chainId,
@@ -18663,19 +18911,16 @@ var getYldrUserDataConverter = (lender, chainId, account, prices, pricesHist, le
       };
       const userData = createBaseTypeUserState(
         payload,
-        lenderData,
+        metaMap,
         totalDeposits24h,
         totalDebt24h
       );
-      return {
-        ...payload,
-        ...userData
-      };
+      return userData;
     },
     expectedNumberOfCalls
   ];
 };
-function createAaveV3Entry2(i, data, chainId, asset, prices, pricesHist) {
+function createAaveV3Entry2(i, data, key, meta) {
   const reserveData = data[i];
   const currentATokenBalanceRaw = reserveData[0 /* currentYTokenBalance */]?.toString();
   const currentVariableDebtRaw = reserveData[1 /* currentVariableDebt */]?.toString();
@@ -18686,16 +18931,15 @@ function createAaveV3Entry2(i, data, chainId, asset, prices, pricesHist) {
       addedDebt: 0
     };
   }
-  const assetMeta = asset;
+  const assetMeta = meta.asset;
   const decimals = assetMeta?.decimals ?? 18;
   const currentATokenBalance = parseRawAmount(currentATokenBalanceRaw, decimals);
   const currentVariableDebt = parseRawAmount(currentVariableDebtRaw, decimals);
-  const key = toOracleKey(assetMeta?.assetGroup) ?? toGenericPriceKey(asset.address, chainId);
-  const price = prices[key] ?? 1;
-  const priceHist = pricesHist?.[key] ?? price;
+  const price = meta?.price?.priceUsd ?? 1;
+  const priceHist = meta?.price?.priceUsd24h ?? price;
   const dataForAsset = {
-    poolId: asset.address,
-    underlying: asset.address,
+    poolId: key,
+    underlying: assetMeta.address,
     deposits: currentATokenBalance,
     depositsRaw: currentATokenBalanceRaw,
     debtStable: "0",
@@ -18799,65 +19043,66 @@ function decodePackedListaUserDataset(hex, marketsCount) {
 
 // src/lending/user-data/morpho/userCallParse.ts
 var CHUNK_SIZE = 100;
+function createLenderKey(lender, marketId) {
+  if (marketId.startsWith(lender)) return marketId;
+  return `${lender}_${marketId.replace("0x", "").toUpperCase()}`;
+}
 var balanceData = {
-  "0": {
-    borrowDiscountedCollateral: 0,
-    borrowDiscountedCollateralAllActive: 0,
-    collateral: 0,
-    deposits: 0,
-    debt: 0,
-    adjustedDebt: 0,
-    nav: 0,
-    deposits24h: 0,
-    debt24h: 0,
-    nav24h: 0
-  }
+  borrowDiscountedCollateral: 0,
+  borrowDiscountedCollateralAllActive: 0,
+  collateral: 0,
+  deposits: 0,
+  debt: 0,
+  adjustedDebt: 0,
+  nav: 0,
+  deposits24h: 0,
+  debt24h: 0,
+  nav24h: 0
 };
 var aprData = {
-  "0": {
-    apr: 0,
-    borrowApr: 0,
-    depositApr: 0,
-    rewards: 0,
-    rewardApr: 0,
-    rewardDepositApr: 0,
-    rewardBorrowApr: 0,
-    stakingApr: 0,
-    stakingDepositApr: 0,
-    stakingBorrowApr: 0
-  }
+  apr: 0,
+  borrowApr: 0,
+  depositApr: 0,
+  rewards: 0,
+  rewardApr: 0,
+  rewardDepositApr: 0,
+  rewardBorrowApr: 0,
+  stakingApr: 0,
+  stakingDepositApr: 0,
+  stakingBorrowApr: 0
 };
 var userDataEmpty = (account, chainId, notWhitelisted = false) => {
   return {
     account,
     chainId,
-    balanceData,
-    aprData,
-    userConfigs: {
-      "0": { selectedMode: 0, id: account, notWhitelisted }
-    }
+    data: [
+      {
+        health: null,
+        accouintId: "0",
+        balanceData,
+        aprData,
+        positions: [],
+        userConfig: { selectedMode: 0, id: account, notWhitelisted }
+      }
+    ]
   };
 };
-var getMorphoTypeUserDataConverterWithlens = (lender, chainId, account, markets, prices, pricesHist, lenderData) => {
+var getMorphoTypeUserDataConverterWithlens = (lender, chainId, account, markets, metaMap) => {
   return !isLista(lender) ? getMorphoUserDataConverterWithlens(
     lender,
     chainId,
     account,
     markets,
-    prices,
-    pricesHist,
-    lenderData
+    metaMap
   ) : getListaUserDataConverterWithlens(
     lender,
     chainId,
     account,
     markets,
-    prices,
-    pricesHist,
-    lenderData
+    metaMap
   );
 };
-var getMorphoUserDataConverterWithlens = (lender, chainId, account, markets, prices, pricesHist, lenderData) => {
+var getMorphoUserDataConverterWithlens = (lender, chainId, account, markets, metaMap) => {
   const expectedNumberOfCalls = Math.ceil(markets.length / CHUNK_SIZE);
   return [
     (data) => {
@@ -18872,16 +19117,12 @@ var getMorphoUserDataConverterWithlens = (lender, chainId, account, markets, pri
       for (let i = 0; i < data.length; i++) {
         const balanceDatas = decodePackedMorphoUserDataset(data[i]);
         balanceDatas.forEach((balanceData2) => {
-          const markeId = markets[mapMarketToChunk(balanceData2.index, i)];
-          marketsHandled.push(markeId);
-          const market = lenderData[markeId]?.params?.market;
+          const marketId = markets[mapMarketToChunk(balanceData2.index, i)];
+          marketsHandled.push(marketId);
+          const lenderKey = createLenderKey(lender, marketId);
           const { dataForMarket, addedDebt, addedDeposits } = createMorphoEntryFromMarketWithLens(
             balanceData2,
-            chainId,
-            market,
-            lenderData[markeId].data,
-            prices,
-            pricesHist
+            metaMap?.[lenderKey]
           );
           const payload = {
             chainId,
@@ -18892,41 +19133,24 @@ var getMorphoUserDataConverterWithlens = (lender, chainId, account, markets, pri
           };
           const userData = createBaseTypeUserState(
             payload,
-            lenderData[markeId].data,
+            metaMap?.[lenderKey],
             addedDeposits,
             addedDebt
           );
-          datas[market.lender] = {
-            ...payload,
-            ...userData,
-            id: market.id
-          };
+          datas[lenderKey] = userData;
         });
       }
       for (const marketId of markets) {
-        const pubData = lenderData[marketId];
         if (marketsHandled.includes(marketId)) continue;
-        const payload = {
-          chainId,
-          account,
-          lendingPositions: { "0": {} },
-          rewards: {},
-          userEMode: 0
-        };
         const userData = userDataEmpty(account, chainId);
-        datas[marketId] = {
-          ...payload,
-          ...userData,
-          // @ts-ignore
-          id: pubData?.params?.market.id
-        };
+        datas[marketId] = userData;
       }
       return datas;
     },
     expectedNumberOfCalls
   ];
 };
-var getListaUserDataConverterWithlens = (lender, chainId, account, markets, prices, pricesHist, lenderData) => {
+var getListaUserDataConverterWithlens = (lender, chainId, account, markets, metaMap) => {
   const expectedNumberOfCalls = Math.ceil(markets.length / CHUNK_SIZE);
   return [
     (data) => {
@@ -18948,16 +19172,12 @@ var getListaUserDataConverterWithlens = (lender, chainId, account, markets, pric
           whitelistedFlags[markets[mapMarketToChunk(index, i)]] = flag;
         });
         balances.forEach((balanceData2) => {
-          const markeId = markets[mapMarketToChunk(balanceData2.index, i)];
-          marketsHandled.push(markeId);
-          const market = lenderData[markeId]?.params?.market;
+          const marketId = markets[mapMarketToChunk(balanceData2.index, i)];
+          marketsHandled.push(marketId);
+          const lenderKey = createLenderKey(lender, marketId);
           const { dataForMarket, addedDebt, addedDeposits } = createMorphoEntryFromMarketWithLens(
             balanceData2,
-            chainId,
-            market,
-            lenderData[markeId].data,
-            prices,
-            pricesHist
+            metaMap?.[lenderKey]
           );
           const payload = {
             chainId,
@@ -18965,55 +19185,46 @@ var getListaUserDataConverterWithlens = (lender, chainId, account, markets, pric
             lendingPositions: { "0": dataForMarket },
             rewards: {},
             userEMode: 0,
-            notWhitelisted: !whitelistedFlags[markeId]
+            notWhitelisted: !whitelistedFlags[marketId]
           };
           const userData = createBaseTypeUserState(
             payload,
-            lenderData[markeId].data,
+            metaMap?.[lenderKey],
             addedDeposits,
             addedDebt
           );
-          datas[market.lender] = {
+          datas[lenderKey] = {
             ...payload,
             ...userData,
-            id: market.id
+            id: marketId
           };
         });
       }
       for (const marketId of markets) {
-        const pubData = lenderData[marketId];
         if (marketsHandled.includes(marketId)) continue;
-        const payload = {
-          chainId,
-          account,
-          lendingPositions: { "0": {} },
-          rewards: {},
-          userEMode: 0,
-          notWhitelisted: !whitelistedFlags[marketId]
-        };
         const userData = userDataEmpty(
           account,
           chainId,
           !whitelistedFlags[marketId]
         );
-        datas[marketId] = {
-          ...payload,
-          ...userData,
-          // @ts-ignore
-          id: pubData?.params?.market.id
-        };
+        datas[marketId] = userData;
       }
       return datas;
     },
     expectedNumberOfCalls
   ];
 };
-function createMorphoEntryFromMarketWithLens(balanceInfo, chainId, market, lenderData, prices, pricesHist) {
-  const loanAddress = market.loanAddress.toLowerCase();
-  const loanMeta = lenderData[loanAddress].asset;
-  const loanKey = toOracleKey(loanMeta?.assetGroup) ?? toGenericPriceKey(loanAddress, chainId);
-  const priceLoan = prices[loanKey] ?? 1;
-  const priceHistLoan = pricesHist?.[loanKey] ?? priceLoan;
+function createMorphoEntryFromMarketWithLens(balanceInfo, metaMap) {
+  const morphoPair = metaMap;
+  const _assets = Object.entries(
+    morphoPair ?? {}
+  );
+  const [loanKey, loanAssetMeta] = _assets[0][1].flags?.borrowingEnabled ? _assets[0] : _assets[1];
+  const [collateralKey, collateralAssetMeta] = !_assets[0][1].flags?.borrowingEnabled ? _assets[0] : _assets[1];
+  const loanAddress = loanAssetMeta?.asset?.address?.toLowerCase();
+  const loanAsset = loanAssetMeta?.asset;
+  const priceLoan = loanAssetMeta?.price?.priceUsd ?? 1;
+  const priceHistLoan = loanAssetMeta?.price?.priceUsd24h ?? priceLoan;
   const deposits = balanceInfo.supplyAssets;
   const borrow = balanceInfo.borrowAssets;
   const collateral = balanceInfo.collateral;
@@ -19023,18 +19234,15 @@ function createMorphoEntryFromMarketWithLens(balanceInfo, chainId, market, lende
       addedDeposits: 0,
       addedDebt: 0
     };
-  const collateralAddress = market.collateralAddress.toLowerCase();
-  const collateralAssetMeta = lenderData[collateralAddress].asset;
+  const collateralAddress = collateralAssetMeta?.asset?.address?.toLowerCase();
+  const collateralAsset = collateralAssetMeta?.asset;
   const loanDepositNumber = parseRawAmount(
     deposits.toString(),
-    market.loanDecimals ?? loanMeta?.decimals ?? 18
+    loanAsset?.decimals ?? 18
   );
-  const decimals = market.collateralDecimals ?? collateralAssetMeta?.decimals ?? 18;
+  const decimals = collateralAsset?.decimals ?? 18;
   const collateralDec = parseRawAmount(collateral.toString(), decimals);
-  const borrowDec = parseRawAmount(
-    borrow.toString(),
-    market.loanDecimals ?? loanMeta?.decimals ?? 18
-  );
+  const borrowDec = parseRawAmount(borrow.toString(), loanAsset?.decimals ?? 18);
   const dataForLoanAsset = {
     poolId: loanAddress,
     underlying: loanAddress,
@@ -19049,9 +19257,8 @@ function createMorphoEntryFromMarketWithLens(balanceInfo, chainId, market, lende
     collateralEnabled: false,
     claimableRewards: 0
   };
-  const key = toOracleKey(collateralAssetMeta?.assetGroup) ?? toGenericPriceKey(collateralAddress, chainId);
-  const price = prices[key] ?? 1;
-  const priceHist = pricesHist?.[key] ?? price;
+  const price = collateralAssetMeta?.price.priceUsd ?? 1;
+  const priceHist = collateralAssetMeta?.price.priceUsd24h ?? price;
   const dataForCollateralAsset = {
     poolId: collateralAddress,
     underlying: collateralAddress,
@@ -19068,8 +19275,8 @@ function createMorphoEntryFromMarketWithLens(balanceInfo, chainId, market, lende
   };
   return {
     dataForMarket: {
-      [loanAddress]: dataForLoanAsset,
-      [collateralAddress]: dataForCollateralAsset
+      [loanKey]: dataForLoanAsset,
+      [collateralKey]: dataForCollateralAsset
     },
     addedDeposits: Number(loanDepositNumber) * priceHistLoan + Number(collateralDec) * priceHist,
     addedDebt: Number(borrowDec) * priceHistLoan
@@ -19077,17 +19284,19 @@ function createMorphoEntryFromMarketWithLens(balanceInfo, chainId, market, lende
 }
 
 // src/lending/user-data/compound-v2/userCallBuild.ts
-var buildCompoundV2UserCall = (chainId, lender, account, assetsOverride) => {
-  const collateralTokens = getCompoundV2CollateralTokens(chainId, lender);
+var buildCompoundV2UserCall = (chainId, lender, account) => {
+  const tokens = getCompoundV2Tokens(chainId, lender).sort(
+    (a, b) => a.cToken.toLowerCase().localeCompare(b.cToken.toLowerCase())
+  );
   const comptroller = getCompoundV2Comptroller(chainId, lender);
-  let calls = Object.values(collateralTokens).flatMap((tk) => [
+  let calls = tokens.flatMap((tk) => [
     {
-      address: tk,
+      address: tk.cToken,
       name: "balanceOfUnderlying",
       params: [account]
     },
     {
-      address: tk,
+      address: tk.cToken,
       name: "borrowBalanceCurrent",
       params: [account]
     }
@@ -19104,12 +19313,13 @@ var buildCompoundV2UserCall = (chainId, lender, account, assetsOverride) => {
 };
 
 // src/lending/user-data/compound-v2/userCallParse.ts
-var getCompoundV2UserDataConverter = (lender, chainId, account, prices, pricesHist, lenderData) => {
+var getCompoundV2UserDataConverter = (lender, chainId, account, metaMap) => {
   switch (lender) {
     default: {
-      const assetsToQuery = Object.keys(lenderData);
-      const vTokens = getCompoundV2CollateralTokens(chainId, lender);
-      const expectedNumberOfCalls = assetsToQuery.length * 2 + 1;
+      const tokens = getCompoundV2Tokens(chainId, lender).sort(
+        (a, b) => a.cToken.toLowerCase().localeCompare(b.cToken.toLowerCase())
+      );
+      const expectedNumberOfCalls = tokens.length * 2 + 1;
       return [
         (data) => {
           if (data.length !== expectedNumberOfCalls) {
@@ -19119,22 +19329,22 @@ var getCompoundV2UserDataConverter = (lender, chainId, account, prices, pricesHi
           let totalDebt24h = 0;
           let totalDeposits24h = 0;
           const asstsIn = data[data.length - 1].map((a) => a.toLowerCase());
-          for (let i = 0; i < assetsToQuery.length; i++) {
-            const asset = assetsToQuery[i];
+          for (let i = 0; i < tokens.length; i++) {
+            const { cToken } = tokens[i];
+            const key = createMarketUid(chainId, lender, cToken);
             const { dataForAsset, addedDebt, addedDeposits } = createCompoundV2Entry(
               i,
               data,
+              key,
               asstsIn,
-              vTokens[asset],
-              lenderData[asset].asset,
-              prices,
-              pricesHist,
+              cToken,
+              metaMap[key],
               0
             );
             if (!dataForAsset) continue;
             totalDebt24h += addedDebt;
             totalDeposits24h += addedDeposits;
-            lendingPositions[asset] = dataForAsset;
+            lendingPositions[key] = dataForAsset;
           }
           const payload = {
             chainId,
@@ -19144,21 +19354,18 @@ var getCompoundV2UserDataConverter = (lender, chainId, account, prices, pricesHi
           };
           const userData = createBaseTypeUserState(
             payload,
-            lenderData,
+            metaMap,
             totalDeposits24h,
             totalDebt24h
           );
-          return {
-            ...payload,
-            ...userData
-          };
+          return userData;
         },
         expectedNumberOfCalls
       ];
     }
   }
 };
-function createCompoundV2Entry(i, data, assetsIn, vToken, asset, prices, pricesHist, claimableRewards) {
+function createCompoundV2Entry(i, data, key, assetsIn, vToken, meta, claimableRewards) {
   const depositsRaw = data[2 * i].toString();
   const borrowsRaw = data[2 * i + 1].toString();
   const collateralEnabled = Boolean(assetsIn?.includes(vToken));
@@ -19169,16 +19376,15 @@ function createCompoundV2Entry(i, data, assetsIn, vToken, asset, prices, pricesH
       addedDebt: 0
     };
   }
-  const assetMeta = asset;
+  const assetMeta = meta.asset;
   const decimals = assetMeta?.decimals ?? 18;
   const currentATokenBalance = Number(parseRawAmount(depositsRaw, decimals));
   const currentVariableDebt = Number(parseRawAmount(borrowsRaw, decimals));
-  const key = toOracleKey(assetMeta?.assetGroup) ?? toGenericPriceKey(asset.address, asset.chainId);
-  const price = prices[key] ?? 1;
-  const priceHist = pricesHist?.[key] ?? price;
+  const price = meta?.price?.priceUsd ?? 1;
+  const priceHist = meta?.price?.priceUsd24h ?? price;
   const dataForAsset = {
-    poolId: asset.address,
-    underlying: asset.address,
+    poolId: key,
+    underlying: assetMeta.address,
     deposits: currentATokenBalance,
     depositsRaw,
     debtStable: 0,
@@ -19297,84 +19503,48 @@ function unflattenLenderData(pools) {
   }
   return result;
 }
-function buildUserCall(chainId, lender, account, params, assets) {
-  if (isAaveV2Type(lender))
-    return buildAaveV2UserCall(chainId, lender, account);
-  if (isAaveV3Type(lender))
-    return buildAaveV3UserCall(chainId, lender, account, assets);
+function buildUserCall(chainId, lender, account, params) {
+  if (isAaveV2Type(lender)) return buildAaveV2UserCall(chainId, lender, account);
+  if (isAaveV3Type(lender)) return buildAaveV3UserCall(chainId, lender, account);
   if (isInit(lender)) return buildInitUserCall(chainId, lender, account);
   if (isMorphoType(lender))
     return buildMorphoTypeUserCallWithLens(chainId, account, lender, params);
   if (isCompoundV3Type(lender))
-    return buildCompoundV3UserCall(chainId, lender, account, assets);
+    return buildCompoundV3UserCall(chainId, lender, account);
   return buildCompoundV2UserCall(chainId, lender, account);
 }
-function getUserDataConverter(lender, chainId, account, prices, pricesHist, lenderPublicState, params) {
+function getUserDataConverter(lender, chainId, account, params, meta) {
   if (isYLDR(lender))
-    return getYldrUserDataConverter(
-      lender,
-      chainId,
-      account,
-      prices,
-      pricesHist,
-      lenderPublicState?.data?.[lender]?.data
-    );
+    return getYldrUserDataConverter(lender, chainId, account, meta?.[lender]);
   if (isAaveV2Type(lender))
-    return getAaveV2UserDataConverter(
-      lender,
-      chainId,
-      account,
-      prices,
-      pricesHist,
-      lenderPublicState?.data?.[lender]?.data
-    );
+    return getAaveV2UserDataConverter(lender, chainId, account, meta?.[lender]);
   if (isAaveV3Type(lender))
-    return getAaveV3UserDataConverter(
-      lender,
-      chainId,
-      account,
-      prices,
-      pricesHist,
-      lenderPublicState?.data?.[lender]?.data
-    );
+    return getAaveV3UserDataConverter(lender, chainId, account, meta?.[lender]);
   if (isInit(lender))
-    return getInitUserDataConverter(
-      lender,
-      chainId,
-      account,
-      prices,
-      pricesHist,
-      lenderPublicState?.data?.[lender]?.data
-    );
+    return getInitUserDataConverter(lender, chainId, account, meta?.[lender]);
   if (isMorphoType(lender))
     return getMorphoTypeUserDataConverterWithlens(
       lender,
       chainId,
       account,
       params,
-      prices,
-      pricesHist,
-      lenderPublicState?.data
+      meta
     );
   if (isCompoundV3Type(lender))
     return getCompoundV3UserDataConverter(
       lender,
       chainId,
       account,
-      prices,
-      pricesHist,
-      lenderPublicState?.data?.[lender]?.data
+      meta?.[lender]
     );
   return getCompoundV2UserDataConverter(
     lender,
     chainId,
     account,
-    prices,
-    pricesHist,
-    lenderPublicState?.data?.[lender]?.data
+    meta?.[lender]
   );
 }
-var getLenderUserDataResult = async (chainId, queriesRaw, getEvmClient2, allowFailure = true, batchSize = MULTICALL_DEFAULT_BATCH_SIZE, retries = 3, logs = false) => {
+var getLenderUserDataResult = async (chainId, queriesRaw, getEvmClient2, allowFailure = true, batchSize = MULTICALL_DEFAULT_BATCH_SIZE, retries = 3, logs = false, meta) => {
   let calls = [];
   const queries = organizeUserQueries(queriesRaw);
   for (const query2 of queries) {
@@ -19383,8 +19553,7 @@ var getLenderUserDataResult = async (chainId, queriesRaw, getEvmClient2, allowFa
       chainId,
       query2.lender,
       query2.account,
-      query2.params,
-      query2.assets
+      query2.params
     );
     const mappedCalls = callData.map((call) => ({ call, abi }));
     calls = [...calls, ...mappedCalls];
@@ -19402,19 +19571,51 @@ var getLenderUserDataResult = async (chainId, queriesRaw, getEvmClient2, allowFa
     logs
   );
 };
-var convertLenderUserDataResult = (chainId, queriesRaw, rawResults, prices, pricesHist, lenderState) => {
+var prepareLenderUserDataRpcCalls = (chainId, queriesRaw, batchSize = MULTICALL_DEFAULT_BATCH_SIZE, blockTag = "latest", meta, allowFailure = true) => {
+  let calls = [];
+  const multicallAddress = getEvmChain(chainId).contracts?.multicall3?.address;
   const queries = organizeUserQueries(queriesRaw);
-  const lenderData = {};
-  let currentSlice = 0;
+  for (const query2 of queries) {
+    const abi = getAbi2(query2.lender);
+    const callData = buildUserCall(
+      chainId,
+      query2.lender,
+      query2.account,
+      query2.params
+    );
+    const mappedCalls = callData.map((call) => ({ call, abi }));
+    calls = [...calls, ...mappedCalls];
+  }
+  const preparedCalls = prepareMulticallInputs(
+    calls.map((c) => c.abi),
+    calls.map((c) => c.call)
+  );
+  const batches = createMulticallRpcCall(
+    preparedCalls,
+    multicallAddress,
+    batchSize,
+    blockTag,
+    allowFailure
+  );
+  const rpcCalls = batches.map((batch) => batch.call);
+  return {
+    batches,
+    preparedCalls,
+    queries,
+    rpcCalls
+  };
+};
+var convertLenderUserDataResult = (chainId, queriesRaw, rawResults, lenderState) => {
+  const queries = organizeUserQueries(queriesRaw);
+  const lenderData = {};
+  let currentSlice = 0;
   for (const query2 of queries) {
     const [converter, sliceLength] = getUserDataConverter(
       query2.lender,
       chainId,
       query2.account,
-      prices,
-      pricesHist,
-      lenderState[chainId],
-      query2.params
+      query2.params,
+      lenderState
     );
     try {
       const data = rawResults.slice(currentSlice, currentSlice + sliceLength);
@@ -19422,17 +19623,10 @@ var convertLenderUserDataResult = (chainId, queriesRaw, rawResults, prices, pric
       if (convertedData) {
         if (isMultiMarket(query2.lender)) {
           Object.keys(convertedData).forEach((market) => {
-            lenderData[market] = {
-              ...lenderData[market],
-              // @ts-ignore
-              [query2.account.toLowerCase()]: convertedData[market]
-            };
+            lenderData[market] = convertedData[market];
           });
         } else {
-          lenderData[query2.lender] = {
-            ...lenderData[query2.lender],
-            [query2.account.toLowerCase()]: convertedData
-          };
+          lenderData[query2.lender] = convertedData;
         }
       }
     } catch (e) {
@@ -19447,7 +19641,7 @@ var DEFAULT_OPTIONS = {
   retries: 3,
   logs: false
 };
-async function getLenderUserDataMulti(account, chainQueries, prices = {}, pricesHist = {}, lenderState) {
+async function getLenderUserDataMulti(account, chainQueries, lenderState) {
   const parsedLenderState = Array.isArray(lenderState) ? unflattenLenderData(lenderState) : lenderState;
   const cleanChainQueries = chainQueries.map(
     ({ chainId, queries, providerOptions }) => {
@@ -19489,8 +19683,6 @@ async function getLenderUserDataMulti(account, chainQueries, prices = {}, prices
         chainId,
         queries,
         data[i],
-        prices,
-        pricesHist,
         parsedLenderState
       );
       returndata[chainId] = dataForChain;
@@ -19509,7 +19701,9 @@ var aavePools2 = baseUrl + "/config/aave-pools.json";
 var aaveOracles2 = baseUrl + "/data/aave-oracles.json";
 var morphoTypeOracles2 = baseUrl + "/data/morpho-type-oracles.json";
 var compoundV2Pools2 = baseUrl + "/config/compound-v2-pools.json";
+var compoundV2Oracles2 = baseUrl + "/data/compound-v2-oracles.json";
 var compoundV3Pools2 = baseUrl + "/config/compound-v3-pools.json";
+var compoundV3Oracles2 = baseUrl + "/data/compound-v3-oracles.json";
 var morphoPools2 = baseUrl + "/config/morpho-pools.json";
 var morphoTypeMarkets2 = baseUrl + "/config/morpho-type-markets.json";
 var aaveReserves2 = baseUrl + "/data/aave-reserves.json";
@@ -19543,6 +19737,8 @@ async function fetchLenderMetaFromDirAndInitialize() {
     compoundV2TokenArrayOverride,
     compoundV3BaseDataOverride,
     aaveOraclesOverride,
+    compoundV2OraclesOverride,
+    compoundV3OraclesOverride,
     morphoTypeOraclesOverride,
     morphoTypeMarketsOverride,
     chainsOverride
@@ -19561,6 +19757,8 @@ async function fetchLenderMetaFromDirAndInitialize() {
     compoundV3ReservesOverride,
     compoundV2ReservesOverride,
     aaveOraclesOverride,
+    compoundV2OraclesOverride,
+    compoundV3OraclesOverride,
     morphoTypeOraclesOverride,
     morphoTypeMarketsOverride
   });
@@ -19582,6 +19780,8 @@ async function fetchLenderMetaFromDir() {
     compoundV2TokenArray2,
     compoundV3Base,
     aaveOracles2,
+    compoundV2Oracles2,
+    compoundV3Oracles2,
     morphoTypeOracles2,
     morphoTypeMarkets2,
     chains
@@ -19601,6 +19801,8 @@ async function fetchLenderMetaFromDir() {
     compoundV2TokenArrayOverride,
     compoundV3BaseDataOverride,
     aaveOraclesOverride,
+    compoundV2OraclesOverride,
+    compoundV3OraclesOverride,
     morphoTypeOraclesOverride,
     morphoTypeMarketsOverride,
     chainsOverride
@@ -19620,6 +19822,8 @@ async function fetchLenderMetaFromDir() {
     compoundV2TokenArrayOverride,
     compoundV3BaseDataOverride,
     aaveOraclesOverride,
+    compoundV2OraclesOverride,
+    compoundV3OraclesOverride,
     morphoTypeOraclesOverride,
     morphoTypeMarketsOverride,
     chainsOverride
@@ -22207,6 +22411,10 @@ var fetchMainPrices = async (chainIds, rpcOverrides, lists = {}, retries = 3, ba
       );
     if (chainId === Chain.SCROLL)
       aaveForks = aaveForks?.filter((a) => a !== Lender.LORE);
+    if (chainId === Chain.TAIKO_ALETHIA)
+      aaveForks = aaveForks?.filter(
+        (a) => a !== Lender.TAKOTAKO && a !== Lender.TAKOTAKO_ETH
+      );
     if (chainId === Chain.BNB_SMART_CHAIN_MAINNET)
       aaveForks = aaveForks?.filter((a) => a !== Lender.AVALON_USDX);
     if (chainId === Chain.MANTA_PACIFIC_MAINNET)
@@ -23471,6 +23679,665 @@ var parseRWADynamicOracleResults = (chainId, data, assetName) => {
     }
   }
 };
+var AAVE_LENDER_OVERRIDES = {
+  [Lender.KLAYBANK]: {
+    [Chain.KAIA_MAINNET]: {
+      // KLAYBANK on KAIA uses WKLAY as base asset
+      baseAsset: "0x19aac5f612f524b754ca7e7c41cbfa2e981a4432",
+      // BASE_CURRENCY_UNIT call reverts, oracle returns 18 decimals
+      baseCurrencyUnit: 1000000000000000000n,
+      // Use RHOMBUS oracle for WKLAY USD price
+      baseAssetSource: Lender.AVALON
+    }
+  },
+  [Lender.KLAP]: {
+    [Chain.KAIA_MAINNET]: {
+      // BASE_CURRENCY_UNIT call reverts, oracle returns 18 decimals (USD denominated)
+      baseCurrencyUnit: 1000000000000000000n
+    }
+  }
+};
+function getAaveLendersForChain(chainId) {
+  const oracles = aaveOracles() ?? {};
+  const reserves = aaveReserves() ?? {};
+  const lenders = [];
+  for (const [lender, chains2] of Object.entries(oracles)) {
+    if (chains2[chainId] && reserves[lender]?.[chainId]?.length > 0) {
+      lenders.push(lender);
+    }
+  }
+  return lenders;
+}
+function getAaveCalls2(chainId) {
+  const lenders = getAaveLendersForChain(chainId);
+  const oracles = aaveOracles() ?? {};
+  const reserves = aaveReserves() ?? {};
+  const results = [];
+  for (const lender of lenders) {
+    const oracle = oracles[lender]?.[chainId];
+    const assets = reserves[lender]?.[chainId] ?? [];
+    if (!oracle || assets.length === 0) continue;
+    const calls = [];
+    calls.push({
+      address: oracle,
+      name: "BASE_CURRENCY_UNIT",
+      params: []
+    });
+    for (const asset of assets) {
+      calls.push({
+        address: oracle,
+        name: "getAssetPrice",
+        params: [asset]
+      });
+    }
+    const lenderOverride = AAVE_LENDER_OVERRIDES[lender]?.[chainId];
+    results.push({
+      calls,
+      meta: {
+        oracle,
+        assets,
+        fork: lender,
+        baseCurrencyUnitIndex: 0,
+        assetCallCount: assets.length,
+        baseAssetOverride: lenderOverride?.baseAsset,
+        baseCurrencyUnitOverride: lenderOverride?.baseCurrencyUnit,
+        baseAssetSource: lenderOverride?.baseAssetSource
+      },
+      lender
+    });
+  }
+  return results;
+}
+function parseAaveResults2(data, meta, context) {
+  const { chainId, usdPrices, tokenList } = context;
+  const entries = [];
+  if (data.length === 0) return entries;
+  let baseCurrencyUnitValue = data[meta.baseCurrencyUnitIndex];
+  if (!baseCurrencyUnitValue || baseCurrencyUnitValue === "0x") {
+    if (meta.baseCurrencyUnitOverride) {
+      baseCurrencyUnitValue = meta.baseCurrencyUnitOverride;
+    } else {
+      return entries;
+    }
+  }
+  let decimals;
+  try {
+    const baseCurrencyUnitBigInt = BigInt(baseCurrencyUnitValue.toString());
+    decimals = Math.round(Math.log10(Number(baseCurrencyUnitBigInt)));
+  } catch {
+    return entries;
+  }
+  let baseAssetUSD = 1;
+  if (meta.baseAssetOverride) {
+    const baseAssetLc = meta.baseAssetOverride.toLowerCase();
+    const baseOracleKey = tokenList?.[baseAssetLc]?.assetGroup ?? `${chainId}-${baseAssetLc}`;
+    baseAssetUSD = usdPrices[baseOracleKey] ?? usdPrices[baseAssetLc] ?? 1;
+  }
+  for (let i = 0; i < meta.assetCallCount; i++) {
+    const priceIndex = meta.baseCurrencyUnitIndex + 1 + i;
+    const rawPrice = data[priceIndex];
+    const asset = meta.assets[i];
+    if (rawPrice === void 0 || rawPrice === "0x" || !asset) continue;
+    try {
+      const rawPriceNum = Number(
+        formatUnits(BigInt(rawPrice.toString()), decimals)
+      );
+      if (isNaN(rawPriceNum) || rawPriceNum === 0) continue;
+      const priceUSD = rawPriceNum * baseAssetUSD;
+      entries.push({
+        asset: asset.toLowerCase(),
+        price: rawPriceNum,
+        // Raw price (in base asset terms)
+        priceUSD
+      });
+    } catch {
+      continue;
+    }
+  }
+  return entries;
+}
+function getAaveAbi() {
+  return AaveOracleAbi;
+}
+var aaveFetcher = {
+  getCalls: getAaveCalls2,
+  parse: parseAaveResults2,
+  getAbi: getAaveAbi
+};
+function generateMarketId(oracle) {
+  return oracle.replace(/^0x/i, "").toUpperCase();
+}
+function generateMorphoLenderKey(marketId) {
+  return `${Lender.MORPHO_BLUE}_${marketId}`;
+}
+function getMorphoMarketsForChain(chainId, marketOverrides) {
+  const oracles = morphoTypeOracles() ?? {};
+  const chainOracles = oracles[chainId] ?? {};
+  const queries = [];
+  for (const [fork, markets] of Object.entries(chainOracles)) {
+    if (fork !== Lender.MORPHO_BLUE) continue;
+    for (const market of markets) {
+      const marketId = generateMarketId(market.oracle);
+      queries.push({
+        oracle: market.oracle,
+        loanAsset: market.loanAsset,
+        collateralAsset: market.collateralAsset,
+        loanAssetDecimals: market.loanAssetDecimals,
+        collateralAssetDecimals: market.collateralAssetDecimals,
+        fork,
+        marketId
+      });
+    }
+  }
+  const chainOverrides = marketOverrides?.[chainId] ?? [];
+  for (const override of chainOverrides) {
+    const marketId = override.marketId ?? generateMarketId(override.oracle);
+    queries.push({
+      oracle: override.oracle,
+      loanAsset: override.loanAsset,
+      collateralAsset: override.collateralAsset,
+      loanAssetDecimals: override.loanAssetDecimals,
+      collateralAssetDecimals: override.collateralAssetDecimals,
+      fork: Lender.MORPHO_BLUE,
+      marketId
+    });
+  }
+  return queries;
+}
+function getMorphoCalls2(chainId, context) {
+  const queries = getMorphoMarketsForChain(chainId, context?.marketOverrides);
+  if (queries.length === 0) return [];
+  return queries.map((query2) => {
+    const call = {
+      address: query2.oracle,
+      name: "price",
+      params: []
+    };
+    return {
+      calls: [call],
+      meta: query2,
+      lender: generateMorphoLenderKey(query2.marketId)
+    };
+  });
+}
+function parseMorphoResults2(data, meta, context) {
+  const { chainId, usdPrices, tokenList } = context;
+  const entries = [];
+  const rawPrice = data[0];
+  if (!rawPrice || rawPrice === void 0 || rawPrice === "0x") return entries;
+  const loanAsset = meta.loanAsset.toLowerCase();
+  const collateralAsset = meta.collateralAsset.toLowerCase();
+  const loanAssetDecimals = meta.loanAssetDecimals ?? tokenList?.[loanAsset]?.decimals ?? 18;
+  const collateralAssetDecimals = meta.collateralAssetDecimals ?? tokenList?.[collateralAsset]?.decimals ?? 18;
+  const priceDebtToCollateral = formatMorphoPrice(
+    rawPrice.toString(),
+    loanAssetDecimals,
+    collateralAssetDecimals
+  );
+  if (isNaN(priceDebtToCollateral) || priceDebtToCollateral === 0) return entries;
+  const loanOracleKey = tokenList?.[loanAsset]?.assetGroup ?? `${chainId}-${loanAsset}`;
+  const collateralOracleKey = tokenList?.[collateralAsset]?.assetGroup ?? `${chainId}-${collateralAsset}`;
+  const loanAssetUSD = usdPrices[loanOracleKey] ?? usdPrices[loanAsset];
+  const collateralAssetUSD = usdPrices[collateralOracleKey] ?? usdPrices[collateralAsset];
+  if (loanAssetUSD) {
+    const collateralPriceUSD = priceDebtToCollateral * loanAssetUSD;
+    entries.push({
+      asset: collateralAsset,
+      price: priceDebtToCollateral,
+      // Raw: collateral price in loan asset terms
+      priceUSD: collateralPriceUSD
+    });
+  }
+  if (collateralAssetUSD) {
+    const loanPriceUSD = collateralAssetUSD / priceDebtToCollateral;
+    entries.push({
+      asset: loanAsset,
+      price: 1 / priceDebtToCollateral,
+      // Raw: loan price in collateral terms
+      priceUSD: loanPriceUSD
+    });
+  }
+  return entries;
+}
+function getMorphoAbi() {
+  return ProxyOracleAbi;
+}
+var morphoFetcher = {
+  getCalls: getMorphoCalls2,
+  parse: parseMorphoResults2,
+  getAbi: getMorphoAbi
+};
+
+// src/prices/oracle-prices/fetchers/compoundV2.ts
+var CompoundV2OracleAbi = [
+  {
+    inputs: [{ internalType: "address", name: "cToken", type: "address" }],
+    name: "getUnderlyingPrice",
+    outputs: [{ internalType: "uint256", name: "", type: "uint256" }],
+    stateMutability: "view",
+    type: "function"
+  }
+];
+function getCompoundV2Calls2(chainId) {
+  const oracles = compoundV2Oracles() ?? {};
+  const tokenArrays = compoundV2TokenArray() ?? {};
+  const results = [];
+  for (const [lender, chainOracles] of Object.entries(oracles)) {
+    const oracleAddress = chainOracles[chainId];
+    const tokens = tokenArrays[lender]?.[chainId] ?? [];
+    if (!oracleAddress || tokens.length === 0) continue;
+    const calls = [];
+    const meta = [];
+    for (const token of tokens) {
+      calls.push({
+        address: oracleAddress,
+        name: "getUnderlyingPrice",
+        params: [token.cToken]
+      });
+      meta.push({
+        cToken: token.cToken,
+        underlying: token.underlying,
+        lender
+      });
+    }
+    if (calls.length > 0) {
+      results.push({
+        calls,
+        meta,
+        lender
+      });
+    }
+  }
+  return results;
+}
+function parseCompoundV2Results2(data, meta, context) {
+  const { tokenList } = context;
+  const entries = [];
+  data.forEach((rawResult, index) => {
+    const queryMeta = meta[index];
+    if (!queryMeta || rawResult === void 0 || rawResult === "0x") return;
+    try {
+      const underlyingLc = queryMeta.underlying.toLowerCase();
+      const underlyingDecimals = tokenList?.[underlyingLc]?.decimals ?? 18;
+      const scalingDecimals = 36 - underlyingDecimals;
+      const priceUSD = Number(formatUnits(BigInt(rawResult.toString()), scalingDecimals));
+      if (isNaN(priceUSD) || priceUSD === 0) return;
+      entries.push({
+        asset: underlyingLc,
+        price: priceUSD,
+        // For Compound V2, raw price is already USD denominated
+        priceUSD
+      });
+    } catch {
+    }
+  });
+  return entries;
+}
+function getCompoundV2Abi() {
+  return CompoundV2OracleAbi;
+}
+var compoundV2Fetcher = {
+  getCalls: getCompoundV2Calls2,
+  parse: parseCompoundV2Results2,
+  getAbi: getCompoundV2Abi
+};
+
+// src/prices/oracle-prices/fetchers/compoundV3.ts
+var ChainlinkAggregatorAbi = [
+  {
+    inputs: [],
+    name: "latestRoundData",
+    outputs: [
+      { internalType: "uint80", name: "roundId", type: "uint80" },
+      { internalType: "int256", name: "answer", type: "int256" },
+      { internalType: "uint256", name: "startedAt", type: "uint256" },
+      { internalType: "uint256", name: "updatedAt", type: "uint256" },
+      { internalType: "uint80", name: "answeredInRound", type: "uint80" }
+    ],
+    stateMutability: "view",
+    type: "function"
+  }
+];
+var ANSWER_INDEX = 1;
+var CHAINLINK_DECIMALS = 8;
+function getCompoundV3Calls(chainId) {
+  const oracles = compoundV3Oracles() ?? {};
+  const baseData = compoundV3BaseData() ?? {};
+  const results = [];
+  for (const [lender, chainOracles] of Object.entries(oracles)) {
+    const assetOracles = chainOracles[chainId];
+    if (!assetOracles) continue;
+    const baseAsset = baseData[lender]?.[chainId]?.baseAsset?.toLowerCase();
+    const calls = [];
+    const meta = [];
+    for (const [asset, oracleAddress] of Object.entries(assetOracles)) {
+      calls.push({
+        address: oracleAddress,
+        name: "latestRoundData",
+        params: []
+      });
+      meta.push({
+        asset,
+        oracle: oracleAddress,
+        baseAsset
+      });
+    }
+    if (calls.length > 0) {
+      results.push({
+        calls,
+        meta,
+        lender
+      });
+    }
+  }
+  return results;
+}
+function parseCompoundV3Results(data, meta, context) {
+  const { chainId, usdPrices, tokenList } = context;
+  const entries = [];
+  data.forEach((rawResult, index) => {
+    const queryMeta = meta[index];
+    if (!queryMeta || rawResult === void 0 || rawResult === "0x") return;
+    try {
+      const answer = Array.isArray(rawResult) ? rawResult[ANSWER_INDEX] : rawResult;
+      if (!answer) return;
+      const rawPrice = Number(formatUnits(BigInt(answer.toString()), CHAINLINK_DECIMALS));
+      if (isNaN(rawPrice) || rawPrice === 0) return;
+      const assetLc = queryMeta.asset.toLowerCase();
+      let priceUSD = rawPrice;
+      if (queryMeta.baseAsset) {
+        const baseAssetLc = queryMeta.baseAsset.toLowerCase();
+        const baseOracleKey = tokenList?.[baseAssetLc]?.assetGroup ?? `${chainId}-${baseAssetLc}`;
+        const baseAssetUSD = usdPrices[baseOracleKey] ?? usdPrices[baseAssetLc];
+        if (baseAssetUSD) {
+          priceUSD = rawPrice * baseAssetUSD;
+        }
+      }
+      entries.push({
+        asset: assetLc,
+        price: rawPrice,
+        // Raw price (in base asset terms if applicable)
+        priceUSD
+      });
+    } catch {
+    }
+  });
+  return entries;
+}
+function getCompoundV3Abi() {
+  return ChainlinkAggregatorAbi;
+}
+var compoundV3Fetcher = {
+  getCalls: getCompoundV3Calls,
+  parse: parseCompoundV3Results,
+  getAbi: getCompoundV3Abi
+};
+var LISTA_DECIMALS = 8;
+function generateMarketId2(oracle) {
+  return oracle.replace(/^0x/i, "").toUpperCase();
+}
+function generateListaLenderKey(marketId) {
+  return `${Lender.LISTA_DAO}_${marketId}`;
+}
+function getListaMarketsForChain(chainId, marketOverrides) {
+  const oracles = morphoTypeOracles() ?? {};
+  const chainOracles = oracles[chainId] ?? {};
+  const markets = [];
+  const processedMarketIds = /* @__PURE__ */ new Set();
+  for (const [fork, marketList] of Object.entries(chainOracles)) {
+    if (fork !== Lender.LISTA_DAO) continue;
+    for (const market of marketList) {
+      const marketId = generateMarketId2(market.oracle);
+      if (processedMarketIds.has(marketId)) continue;
+      processedMarketIds.add(marketId);
+      markets.push({
+        oracle: market.oracle,
+        collateralAsset: market.collateralAsset,
+        loanAsset: market.loanAsset,
+        marketId
+      });
+    }
+  }
+  const chainOverrides = marketOverrides?.[chainId] ?? [];
+  for (const override of chainOverrides) {
+    const marketId = override.marketId ?? generateMarketId2(override.oracle);
+    if (processedMarketIds.has(marketId)) continue;
+    processedMarketIds.add(marketId);
+    markets.push({
+      oracle: override.oracle,
+      collateralAsset: override.collateralAsset,
+      loanAsset: override.loanAsset,
+      marketId
+    });
+  }
+  return markets;
+}
+function getListaCalls(chainId, context) {
+  const markets = getListaMarketsForChain(chainId, context?.marketOverrides);
+  if (markets.length === 0) return [];
+  return markets.map((market) => {
+    const calls = [
+      // Call for collateral asset
+      {
+        address: market.oracle,
+        name: "peek",
+        params: [market.collateralAsset]
+      },
+      // Call for loan asset
+      {
+        address: market.oracle,
+        name: "peek",
+        params: [market.loanAsset]
+      }
+    ];
+    const meta = [
+      {
+        oracle: market.oracle,
+        asset: market.collateralAsset,
+        marketId: market.marketId
+      },
+      {
+        oracle: market.oracle,
+        asset: market.loanAsset,
+        marketId: market.marketId
+      }
+    ];
+    return {
+      calls,
+      meta,
+      lender: generateListaLenderKey(market.marketId)
+    };
+  });
+}
+function parseListaResults2(data, meta, _context) {
+  const entries = [];
+  const processedAssets = /* @__PURE__ */ new Set();
+  data.forEach((rawPrice, index) => {
+    const query2 = meta[index];
+    if (!query2 || rawPrice === void 0 || rawPrice === "0x") return;
+    const asset = query2.asset.toLowerCase();
+    if (processedAssets.has(asset)) return;
+    try {
+      const priceUSD = Number(formatUnits(BigInt(rawPrice.toString()), LISTA_DECIMALS));
+      if (isNaN(priceUSD) || priceUSD === 0) return;
+      entries.push({
+        asset,
+        price: priceUSD,
+        // Raw price is already in USD
+        priceUSD
+      });
+      processedAssets.add(asset);
+    } catch {
+    }
+  });
+  return entries;
+}
+function getListaAbi() {
+  return ProxyOracleAbi;
+}
+var listaFetcher = {
+  getCalls: getListaCalls,
+  parse: parseListaResults2,
+  getAbi: getListaAbi
+};
+
+// src/prices/oracle-prices/fetchOraclePrices.ts
+async function fetchOraclePrices(chainIds, rpcOverrides, lists = {}, retries = 3, batchSize = void 0, allowFailure = true, basePrices = {}, morphoMarketOverrides, listaMarketOverrides) {
+  const result = {};
+  const combinedAbi = [
+    ...AaveOracleAbi,
+    ...ProxyOracleAbi,
+    ...CompoundV2OracleAbi,
+    ...ChainlinkAggregatorAbi
+  ];
+  const chainPromises = chainIds.map(async (chainId) => {
+    const chainResult = {};
+    const tokenList = lists[chainId] ?? {};
+    const aaveResults = aaveFetcher.getCalls(chainId);
+    const compoundV2Results = compoundV2Fetcher.getCalls(chainId);
+    const compoundV3Results = compoundV3Fetcher.getCalls(chainId);
+    const listaResults = listaFetcher.getCalls(chainId, {
+      marketOverrides: listaMarketOverrides
+    });
+    const morphoResults = morphoFetcher.getCalls(chainId, {
+      marketOverrides: morphoMarketOverrides
+    });
+    const allCalls = [];
+    const fetcherTracker = [];
+    for (const fr of aaveResults) {
+      fetcherTracker.push({
+        lender: fr.lender,
+        meta: fr.meta,
+        offset: allCalls.length,
+        count: fr.calls.length,
+        parse: aaveFetcher.parse
+      });
+      allCalls.push(...fr.calls);
+    }
+    for (const fr of compoundV2Results) {
+      fetcherTracker.push({
+        lender: fr.lender,
+        meta: fr.meta,
+        offset: allCalls.length,
+        count: fr.calls.length,
+        parse: compoundV2Fetcher.parse
+      });
+      allCalls.push(...fr.calls);
+    }
+    for (const fr of compoundV3Results) {
+      fetcherTracker.push({
+        lender: fr.lender,
+        meta: fr.meta,
+        offset: allCalls.length,
+        count: fr.calls.length,
+        parse: compoundV3Fetcher.parse
+      });
+      allCalls.push(...fr.calls);
+    }
+    for (const fr of listaResults) {
+      fetcherTracker.push({
+        lender: fr.lender,
+        meta: fr.meta,
+        offset: allCalls.length,
+        count: fr.calls.length,
+        parse: listaFetcher.parse
+      });
+      allCalls.push(...fr.calls);
+    }
+    for (const fr of morphoResults) {
+      fetcherTracker.push({
+        lender: fr.lender,
+        meta: fr.meta,
+        offset: allCalls.length,
+        count: fr.calls.length,
+        parse: morphoFetcher.parse
+      });
+      allCalls.push(...fr.calls);
+    }
+    if (allCalls.length === 0) {
+      return { chainId, data: chainResult };
+    }
+    const multicallResult = await multicallRetry(
+      chainId,
+      allCalls,
+      combinedAbi,
+      batchSize,
+      retries,
+      0,
+      allowFailure,
+      rpcOverrides
+    );
+    const usdPrices = { ...basePrices };
+    const parseTracker = (tracker) => {
+      const dataSlice = multicallResult.slice(
+        tracker.offset,
+        tracker.offset + tracker.count
+      );
+      const context = {
+        chainId,
+        usdPrices,
+        tokenList
+      };
+      const entries = tracker.parse(dataSlice, tracker.meta, context);
+      if (!chainResult[tracker.lender]) {
+        chainResult[tracker.lender] = [];
+      }
+      chainResult[tracker.lender].push(...entries);
+      for (const entry of entries) {
+        const oracleKey = tokenList[entry.asset]?.assetGroup ?? `${chainId}-${entry.asset}`;
+        usdPrices[oracleKey] = entry.priceUSD;
+        usdPrices[entry.asset] = entry.priceUSD;
+      }
+    };
+    const nonMorphoTrackers = fetcherTracker.filter(
+      (t) => t.parse !== morphoFetcher.parse
+    );
+    const aaveSourceTrackers = nonMorphoTrackers.filter(
+      (t) => t.parse === aaveFetcher.parse && !t.meta.baseAssetSource
+    );
+    const aaveDependentTrackers = nonMorphoTrackers.filter(
+      (t) => t.parse === aaveFetcher.parse && t.meta.baseAssetSource
+    );
+    const otherTrackers = nonMorphoTrackers.filter(
+      (t) => t.parse !== aaveFetcher.parse
+    );
+    for (const tracker of aaveSourceTrackers) {
+      parseTracker(tracker);
+    }
+    for (const tracker of otherTrackers) {
+      parseTracker(tracker);
+    }
+    for (const tracker of aaveDependentTrackers) {
+      parseTracker(tracker);
+    }
+    const morphoTrackers = fetcherTracker.filter(
+      (t) => t.parse === morphoFetcher.parse
+    );
+    for (const tracker of morphoTrackers) {
+      parseTracker(tracker);
+    }
+    return { chainId, data: chainResult };
+  });
+  const chainResults = await Promise.all(chainPromises);
+  for (const { chainId, data } of chainResults) {
+    result[chainId] = data;
+  }
+  return result;
+}
+function flattenToUSDPriceMap(structuredPrices, lists = {}) {
+  const flatPrices = {};
+  for (const [chainId, lenders] of Object.entries(structuredPrices)) {
+    const tokenList = lists[chainId] ?? {};
+    for (const [_lender, entries] of Object.entries(lenders)) {
+      for (const entry of entries) {
+        const oracleKey = tokenList[entry.asset]?.assetGroup ?? `${chainId}-${entry.asset}`;
+        flatPrices[oracleKey] = entry.priceUSD;
+        flatPrices[entry.asset] = entry.priceUSD;
+      }
+    }
+  }
+  return flatPrices;
+}
 var { uniq: uniq2 } = lodash;
 function createAssetArrayPerChain() {
   let assetsPerChain = {};
@@ -23600,83 +24467,6 @@ var FlashAbi = [
     type: "function"
   }
 ];
-
-// src/utils/constants.ts
-var CELO_MULTICALL_ADDRESS = "0x633987602DE5C4F337e3DbF265303A1080324204";
-var BNB_MULTICALL_ADDRESS = "0x963Df249eD09c358A4819E39d9Cd5736c3087184";
-var MANTLE_MULTICALL_ADDRESS = "0x2A51f2F647E1883F88C992244dEd171238693107";
-var ARBITRUM_ONE_MULTICALL_ADDRESS = "0xadF885960B47eA2CD9B55E6DAc6B42b7Cb2806dB";
-var LINEA_MULTICALL_ADDRESS = "0xac1cE734566f390A94b00eb9bf561c2625BF44ea";
-var AVALANCHE_MULTICALL_ADDRESS = "0x0139141Cd4Ee88dF3Cdb65881D411bAE271Ef0C2";
-var BASE_MULTICALL_ADDRESS = "0x091e99cb1C49331a94dD62755D168E941AbD0693";
-var BLAST_MULTICALL_ADDRESS = "0xdC7f370de7631cE9e2c2e1DCDA6B3B5744Cf4705";
-var TAIKO_MULTICALL_ADDRESS = "0x8E24CfC19c6C00c524353CB8816f5f1c2F33c201";
-var HEMI_MULTICALL_ADDRESS = "0x352A86168e6988A1aDF9A15Cb00017AAd3B67155";
-var GNOSIS_MULTICALL_ADDRESS = "0x4dfa9a980efE4802E969AC33968E3d6E59B8a19e";
-var MODE_MULTICALL_ADDRESS = "0xAB39cE30D98a59DFDa40A630b074170800bfF179";
-var FANTOM_MULTICALL_ADDRESS = "0xDb51CffFf3B989d0cB6b58AbF173371b6F2d0D24";
-var SCROLL_MULTICALL_ADDRESS = "0x3b615B1AC55bc34e51a81D3dea67467F32bcb8C2";
-var SHAPE_MULTICALL_ADDRESS = "0x356A450B32f5030ae7083702b86FaFbBe7490411";
-var SONIC_MULTICALL_ADDRESS = "0x5d6b0f5335ec95cD2aB7E52f2A0750dd86502435";
-var INK_MULTICALL_ADDRESS = "0xA0fCec583AeE6176527C07B198e5561722332014";
-var METIS_MULTICALL_ADDRESS = "0x7a59ddbB76521E8982Fa3A08598C9a83b14A6C07";
-var IOTA_MULTICALL_ADDRESS = "0x9683D433621A83aA7dd290106e1da85251317F55";
-var KAVA_MULTICALL_ADDRESS = "0x8B741B0D79BE80E135C880F7583d427B4D41F015";
-var CORN_MULTICALL_ADDRESS = "0x5d6b0f5335ec95cD2aB7E52f2A0750dd86502435";
-var SAGA_MULTICALL_ADDRESS = "0x743E03cceB4af2efA3CC76838f6E8B50B63F184c";
-var CYBER_MULTICALL_ADDRESS = "0x906d6eB9CF8f64e100e44f8f491b833a8d40B530";
-var METAL_MULTICALL_ADDRESS = "0x5d6b0f5335ec95cD2aB7E52f2A0750dd86502435";
-var ZERO_MULTICALL_ADDRESS = "0x9CA4dcb2505fbf536F6c54AA0a77C79f4fBC35C0";
-var BOB_MULTICALL_ADDRESS = "0x5d6b0f5335ec95cD2aB7E52f2A0750dd86502435";
-var WORLDCHAIN_MULTICALL_ADDRESS = "0x0a22c04215c97E3F532F4eF30e0aD9458792dAB9";
-var LISK_MULTICALL_ADDRESS = "0xE3dbcD53f4Ce1b06Ab200f4912BD35672e68f1FA";
-var REDSTONE_MULTICALL_ADDRESS = "0xd57B52452a0FDfE3ff8e0A40Bd10D00D0bfe0723";
-var MANTA_MULTICALL_ADDRESS = "0x52dFC0D9960F11A9Ca9FF616e791B91188446a60";
-var ZORA_MULTICALL_ADDRESS = "0xA51c76bEE6746cB487a7e9312E43e2b8f4A37C15";
-var CORE_MULTICALL_ADDRESS = "0xFe9F82D820757787895Da00B1dBD35c3B8b04894";
-var MORPH_MULTICALL_ADDRESS = "0xAcD82113982479B25E7c1D09858F0130921Dbbca";
-var TELOS_MULTICALL_ADDRESS = "0x5d6b0f5335ec95cD2aB7E52f2A0750dd86502435";
-var MULTICALL_ADDRESS = {
-  [Chain.OP_MAINNET]: "0x1F98415757620B543A52E61c46B32eB19261F984",
-  [Chain.POLYGON_MAINNET]: "0x1F98415757620B543A52E61c46B32eB19261F984",
-  [Chain.ETHEREUM_MAINNET]: "0x1F98415757620B543A52E61c46B32eB19261F984",
-  [Chain.ARBITRUM_ONE]: ARBITRUM_ONE_MULTICALL_ADDRESS,
-  [Chain.BASE]: BASE_MULTICALL_ADDRESS,
-  [Chain.CELO_MAINNET]: CELO_MULTICALL_ADDRESS,
-  [Chain.BNB_SMART_CHAIN_MAINNET]: BNB_MULTICALL_ADDRESS,
-  [Chain.MANTLE]: MANTLE_MULTICALL_ADDRESS,
-  [Chain.BLAST]: BLAST_MULTICALL_ADDRESS,
-  [Chain.LINEA]: LINEA_MULTICALL_ADDRESS,
-  [Chain.AVALANCHE_C_CHAIN]: AVALANCHE_MULTICALL_ADDRESS,
-  [Chain.TAIKO_ALETHIA]: TAIKO_MULTICALL_ADDRESS,
-  [Chain.HEMI_NETWORK]: HEMI_MULTICALL_ADDRESS,
-  [Chain.GNOSIS]: GNOSIS_MULTICALL_ADDRESS,
-  [Chain.CORE_BLOCKCHAIN_MAINNET]: CORE_MULTICALL_ADDRESS,
-  [Chain.METIS_ANDROMEDA_MAINNET]: METIS_MULTICALL_ADDRESS,
-  [Chain.MODE]: MODE_MULTICALL_ADDRESS,
-  [Chain.INK]: INK_MULTICALL_ADDRESS,
-  [Chain.IOTA_EVM]: IOTA_MULTICALL_ADDRESS,
-  [Chain.CORN]: CORN_MULTICALL_ADDRESS,
-  [Chain.SONIC_MAINNET]: SONIC_MULTICALL_ADDRESS,
-  [Chain.FANTOM_OPERA]: FANTOM_MULTICALL_ADDRESS,
-  [Chain.SCROLL]: SCROLL_MULTICALL_ADDRESS,
-  [Chain.SHAPE]: SHAPE_MULTICALL_ADDRESS,
-  [Chain.CYBER_MAINNET]: CYBER_MULTICALL_ADDRESS,
-  [Chain.ZORA]: ZORA_MULTICALL_ADDRESS,
-  [Chain.MANTA_PACIFIC_MAINNET]: MANTA_MULTICALL_ADDRESS,
-  [Chain.REDSTONE]: REDSTONE_MULTICALL_ADDRESS,
-  [Chain.KAVA]: KAVA_MULTICALL_ADDRESS,
-  [Chain.METAL_L2]: METAL_MULTICALL_ADDRESS,
-  [Chain.LISK]: LISK_MULTICALL_ADDRESS,
-  [Chain.BOB]: BOB_MULTICALL_ADDRESS,
-  [Chain.ZERO_NETWORK]: ZERO_MULTICALL_ADDRESS,
-  [Chain.SAGA]: SAGA_MULTICALL_ADDRESS,
-  [Chain.MORPH]: MORPH_MULTICALL_ADDRESS,
-  [Chain.TELOS_EVM_MAINNET]: TELOS_MULTICALL_ADDRESS,
-  [Chain.WORLD_CHAIN]: WORLDCHAIN_MULTICALL_ADDRESS
-};
-
-// src/flash-liquidity/fetchLiquidity.ts
 var DEFAULT_BATCH_SIZE = 4096;
 var FLASHLOAN_ENABLED_MASK = BigInt(
   "0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF7FFFFFFFFFFFFFFF"
@@ -23684,7 +24474,7 @@ var FLASHLOAN_ENABLED_MASK = BigInt(
 function getFlashLoanEnabled(data) {
   return (data & ~FLASHLOAN_ENABLED_MASK) !== BigInt(0);
 }
-async function fetchFlashLiquidityForChain(chain, multicallRetry2, list = {}) {
+async function fetchFlashLiquidityForChain(chain, multicallRetry3, list = {}) {
   let callLengths = {};
   let aaveAssets = {};
   let aaveCalls = [];
@@ -23799,7 +24589,7 @@ async function fetchFlashLiquidityForChain(chain, multicallRetry2, list = {}) {
     ...balancerV3Calls,
     ...uniswapV4Calls
   ];
-  const rawResults = await multicallRetry2(
+  const rawResults = await multicallRetry3(
     chain,
     calls,
     FlashAbi,
@@ -23940,6 +24730,111 @@ function attachPricesToFlashLiquidity(chainId, liq, prices, list = {}) {
   return liqCopy;
 }
 
-export { MORPHO_LENS, MorphoLensAbi, attachPricesToFlashLiquidity, buildMorphoTypeCall, buildMorphoTypeUserCallWithLens, convertLenderUserDataResult, decodeListaMarkets, decodeMarkets, decodePackedListaUserDataset, decodePackedMorphoUserDataset, fetchDefillamaData, fetchDefillamaHistData, fetchFlashLiquidityForChain, fetchGeneralYields, fetchLenderMetaFromDir, fetchLenderMetaFromDirAndInitialize, fetchMainPrices, fetchPendlePrices, filterLendersByProtocol, generateLendingPairs, generateLendingPools, getAavesForChain, getLenderAssets, getLenderPublicData, getLenderPublicDataAll, getLenderPublicDataViaApi, getLenderUserDataMulti, getLenderUserDataResult, getLendersForChain, getMorphoTypeMarketConverter, getTopPairs, inititalizeAllData, isAaveType, isAaveV2Type, isAaveV32Type, isAaveV3Type, isCompoundV3, isCompoundV3Type, isInit, isMorphoType, isMultiMarket, isYLDR, normalizeToBytes, unflattenLenderData };
+// src/utils/rpcParse.ts
+function parseRawRpcResponses(responses, callMetadata, allowFailure = true) {
+  const sortedResponses = [...responses].sort((a, b) => a.id - b.id);
+  return sortedResponses.map((response, idx) => {
+    const metadata = callMetadata[idx];
+    if (response.error || !response.result) {
+      if (!allowFailure) {
+        throw new Error(
+          `RPC call failed for ${metadata.functionName}: ${response.error?.message || "No result"}`
+        );
+      }
+      return "0x";
+    }
+    try {
+      const decoded = decodeFunctionResult({
+        abi: metadata.abi,
+        functionName: metadata.functionName,
+        data: response.result
+      });
+      return decoded;
+    } catch (error) {
+      if (!allowFailure) {
+        throw new Error(
+          `Failed to decode result for ${metadata.functionName}: ${error}`
+        );
+      }
+      return "0x";
+    }
+  });
+}
+function parseRawRpcBatchResponses(batches, batchResponses, allowFailure = true) {
+  const allResults = [];
+  batches.forEach((batch, batchIdx) => {
+    const responses = batchResponses[batchIdx];
+    const parsed = parseRawRpcResponses(
+      responses,
+      batch.callMetadata,
+      allowFailure
+    );
+    allResults.push(...parsed);
+  });
+  return allResults;
+}
+function parseMulticallRpcResponses(responses, batches, allowFailure = true) {
+  const allResults = [];
+  const sortedResponses = [...responses].sort((a, b) => a.id - b.id);
+  sortedResponses.forEach((response, batchIdx) => {
+    const batch = batches[batchIdx];
+    if (response.error || !response.result) {
+      if (!allowFailure) {
+        throw new Error(
+          `Multicall RPC failed: ${response.error?.message || "No result"}`
+        );
+      }
+      batch.callMetadata.forEach(() => allResults.push("0x"));
+      return;
+    }
+    try {
+      const decoded = decodeAbiParameters(
+        [
+          {
+            type: "tuple[]",
+            components: [
+              { name: "success", type: "bool" },
+              { name: "returnData", type: "bytes" }
+            ]
+          }
+        ],
+        response.result
+      )[0];
+      decoded.forEach((result, idx) => {
+        const metadata = batch.callMetadata[idx];
+        if (!result.success || result.returnData === "0x") {
+          if (!allowFailure) {
+            throw new Error(`Call failed for ${metadata.functionName}`);
+          }
+          allResults.push("0x");
+          return;
+        }
+        try {
+          const decodedResult = decodeFunctionResult({
+            abi: metadata.abi,
+            functionName: metadata.functionName,
+            data: result.returnData
+          });
+          allResults.push(decodedResult);
+        } catch (error) {
+          if (!allowFailure) {
+            throw new Error(
+              `Failed to decode result for ${metadata.functionName}: ${error}`
+            );
+          }
+          allResults.push("0x");
+        }
+      });
+    } catch (error) {
+      if (!allowFailure) {
+        throw new Error(`Failed to decode multicall response: ${error}`);
+      }
+      batch.callMetadata.forEach(() => allResults.push("0x"));
+    }
+  });
+  return allResults;
+}
+
+export { MORPHO_LENS, MorphoLensAbi, attachPricesToFlashLiquidity, buildMorphoTypeCall, buildMorphoTypeUserCallWithLens, convertLenderUserDataResult, createMarketUid, createMulticallRpcCall, createRawRpcCalls, decodeListaMarkets, decodeMarkets, decodePackedListaUserDataset, decodePackedMorphoUserDataset, fetchDefillamaData, fetchDefillamaHistData, fetchFlashLiquidityForChain, fetchGeneralYields, fetchLenderMetaFromDir, fetchLenderMetaFromDirAndInitialize, fetchMainPrices, fetchOraclePrices, fetchPendlePrices, filterLendersByProtocol, flattenToUSDPriceMap, generateLendingPairs, generateLendingPools, getAavesForChain, getLenderAssets, getLenderPublicData, getLenderPublicDataAll, getLenderPublicDataViaApi, getLenderUserDataMulti, getLenderUserDataResult, getLendersForChain, getMorphoTypeMarketConverter, getTopPairs, inititalizeAllData, isAaveType, isAaveV2Type, isAaveV32Type, isAaveV3Type, isCompoundV3, isCompoundV3Type, isInit, isMorphoType, isMultiMarket, isYLDR, multicall3Abi, normalizeToBytes, parseMulticallRpcResponses, parseRawRpcBatchResponses, parseRawRpcResponses, prepareLenderUserDataRpcCalls, prepareMulticallInputs, unflattenLenderData };
 //# sourceMappingURL=index.js.map
 //# sourceMappingURL=index.js.map