@1delta/margin-fetcher 0.0.154 → 0.0.155

package/dist/index.js

@@ -1,9 +1,9 @@
-import { formatEther, BaseError, encodeFunctionData, formatUnits, decodeFunctionResult, decodeAbiParameters } from './chunk-ODBGQEBG.js';
+import { formatEther, BaseError, encodeFunctionData, formatUnits, decodeFunctionResult, decodeAbiParameters, AbiEncodingLengthMismatchError, concatHex, isAddress, InvalidAddressError, pad, stringToHex, boolToHex, integerRegex, numberToHex, bytesRegex, BytesSizeMismatchError, arrayRegex, UnsupportedPackedAbiType } from './chunk-2TBRXA5J.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 { getEvmChain, multicallRetry, getEvmClientUniversal } from '@1delta/providers';
+import { getEvmChain, multicallRetry, getEvmClient, getEvmClientUniversal } 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
@@ -6244,9 +6244,6 @@ var IrgetterAbi = [
 // ../data-sdk/dist/index.mjs
 var GLOBAL_CHAIN_DATA_KEY = "__1delta_chain_registry__";
 globalThis[GLOBAL_CHAIN_DATA_KEY] = {};
-function initializeChainData({ chainsOverride }) {
-  if (chainsOverride) globalThis[GLOBAL_CHAIN_DATA_KEY] = chainsOverride;
-}
 var GLOBAL_LENDER_DATA_KEY = "__1delta_lender_registry__";
 globalThis[GLOBAL_LENDER_DATA_KEY] = {
   aaveTokens: {},
@@ -6271,46 +6268,6 @@ globalThis[GLOBAL_LENDER_DATA_KEY] = {
 function getGlobalData2() {
   return globalThis[GLOBAL_LENDER_DATA_KEY];
 }
-function initializeLenderData({
-  aaveTokensOverride,
-  aavePoolsOverride,
-  aaveOraclesOverride,
-  compoundV2OraclesOverride,
-  compoundV3OraclesOverride,
-  compoundV3PoolsOverride,
-  compoundV3BaseDataOverride,
-  morphoPoolsOverride,
-  compoundV2TokensOverride,
-  compoundV2TokenArrayOverride,
-  compoundV2PoolsOverride,
-  initConfigOverride,
-  aaveReservesOverride,
-  compoundV3ReservesOverride,
-  compoundV2ReservesOverride,
-  morphoOraclesOverride,
-  morphoTypeOraclesOverride,
-  morphoTypeMarketsOverride
-}) {
-  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;
-  if (compoundV3BaseDataOverride) data.compoundV3BaseData = compoundV3BaseDataOverride;
-  if (compoundV2TokensOverride) data.compoundV2Tokens = compoundV2TokensOverride;
-  if (compoundV2TokenArrayOverride) data.compoundV2TokenArray = compoundV2TokenArrayOverride;
-  if (compoundV2PoolsOverride) data.compoundV2Pools = compoundV2PoolsOverride;
-  if (initConfigOverride) data.initConfig = initConfigOverride;
-  if (aaveReservesOverride) data.aaveReserves = aaveReservesOverride;
-  if (compoundV3ReservesOverride) data.compoundV3Reserves = compoundV3ReservesOverride;
-  if (compoundV2ReservesOverride) data.compoundV2Reserves = compoundV2ReservesOverride;
-  if (morphoOraclesOverride) data.morphoOracles = morphoOraclesOverride;
-  if (morphoTypeOraclesOverride) data.morphoTypeOracles = morphoTypeOraclesOverride;
-  if (morphoTypeMarketsOverride) data.morphoTypeMarkets = morphoTypeMarketsOverride;
-}
 var aaveTokens = () => getGlobalData2()?.aaveTokens;
 var aavePools = () => getGlobalData2()?.aavePools;
 var aaveOracles = () => getGlobalData2()?.aaveOracles;
@@ -6328,9 +6285,28 @@ var compoundV2Pools = () => getGlobalData2()?.compoundV2Pools;
 var compoundV2Tokens = () => getGlobalData2()?.compoundV2Tokens;
 var compoundV2TokenArray = () => getGlobalData2()?.compoundV2TokenArray;
 var initConfig = () => getGlobalData2()?.initConfig;
+var getListUrl = (chainId) => `https://raw.githubusercontent.com/1delta-DAO/token-lists/main/${chainId}.json`;
+async function fetchTokenList(chainId) {
+  const data = await fetch(getListUrl(chainId));
+  if (!data.ok) throw new Error(`HTTP error! status: ${data.status}`);
+  return (await data.json()).list;
+}
+async function fetchTokenLists(chainIds) {
+  const promises = chainIds.map(async (chainId) => {
+    const list = await fetchTokenList(chainId);
+    return [chainId, list];
+  });
+  const results = await Promise.all(promises);
+  return Object.fromEntries(results);
+}
 
 // src/utils/marketUid.ts
 function createMarketUid(chainId, lender, refAddress) {
+  if (!refAddress || !lender || !chainId) {
+    throw new Error(
+      `Invalid marketUid parameters: lender=${lender}, chainId=${chainId}, refAddress=${refAddress}`
+    );
+  }
   return `${lender}:${chainId}:${refAddress.toLowerCase()}`;
 }
 
@@ -6383,22 +6359,22 @@ var ENABLED_COMPOUNDS = [
 var getLendersForChain = (c) => {
   let lenders = [];
   Object.entries(aavePools() ?? {}).forEach(([l, data]) => {
-    const chains2 = Object.keys(data);
-    if (chains2.includes(c)) lenders.push(l);
+    const chains = Object.keys(data);
+    if (chains.includes(c)) lenders.push(l);
   });
   if (compoundV3Pools()?.[c])
     lenders = [...lenders, ...Object.keys(compoundV3Pools()?.[c])];
   Object.entries(initConfig() ?? {}).forEach(([l, data]) => {
-    const chains2 = Object.keys(data);
-    if (chains2.includes(c)) lenders.push(l);
+    const chains = Object.keys(data);
+    if (chains.includes(c)) lenders.push(l);
   });
   Object.entries(morphoPools() ?? {}).forEach(([l, data]) => {
-    const chains2 = Object.keys(data);
-    if (chains2.includes(c)) lenders.push(l);
+    const chains = Object.keys(data);
+    if (chains.includes(c)) lenders.push(l);
   });
   Object.entries(compoundV2Pools() ?? {}).forEach(([l, data]) => {
-    const chains2 = Object.keys(data);
-    if (chains2.includes(c) && ENABLED_COMPOUNDS.includes(l)) lenders.push(l);
+    const chains = Object.keys(data);
+    if (chains.includes(c) && ENABLED_COMPOUNDS.includes(l)) lenders.push(l);
   });
   return lenders;
 };
@@ -6462,7 +6438,7 @@ var toGenericPriceKey = (assetAddress, chainId) => {
   return chainId + "-" + assetAddress;
 };
 
-// src/lending/aave-v2-type/publicCallBuild.ts
+// src/lending/public-data/aave-v2-type/publicCallBuild.ts
 var buildAaveV2StyleLenderReserveCall = (chainId, lender) => {
   const providerAddress = getAaveTypePoolDataProviderAddress(chainId, lender);
   const underlyingTokensArray = getAaveAssets(chainId, lender);
@@ -7581,7 +7557,7 @@ var Chain = /* @__PURE__ */ ((Chain2) => {
   return Chain2;
 })(Chain || {});
 
-// src/lending/aave-v3-type/publicCallBuild.ts
+// src/lending/public-data/aave-v3-type/publicCallBuild.ts
 function range(n) {
   return Array.from({ length: n + 1 }, (_2, i) => i);
 }
@@ -7732,7 +7708,7 @@ var buildAaveV3StyleLenderReserveCall = (chainId, lender) => {
   }
 };
 
-// src/lending/addresses/init.ts
+// src/lending/public-data/addresses/init.ts
 function getInitLensAddress(chainId) {
   return addressesInitCore.PublicLens[chainId];
 }
@@ -7771,7 +7747,7 @@ function getInitUnderlyingToPoolMap(chainId, lender) {
   }, /* @__PURE__ */ new Map());
 }
 
-// src/lending/init/publicCallBuild.ts
+// src/lending/public-data/init/publicCallBuild.ts
 var INIT_MODES = [1, 2, 3, 4, 5, 6];
 var buildInitStyleLenderReserveCall = (chainId, lender) => {
   const lensAddress = getInitLensAddress(chainId);
@@ -7822,7 +7798,7 @@ function getCompoundV3BaseAsset(lender, chainId) {
   return compoundV3BaseData()?.[lender]?.[chainId];
 }
 
-// src/lending/compound-v3/publicCallBuild.ts
+// src/lending/public-data/compound-v3/publicCallBuild.ts
 var buildCompoundV3StyleLenderReserveCall = (chainId, lender) => {
   const baseAssetData = getCompoundV3BaseAsset(lender, chainId);
   const underlyingArray = getCompoundV3Assets(chainId, lender);
@@ -7889,6 +7865,69 @@ var buildCompoundV3StyleLenderReserveCall = (chainId, lender) => {
   return calls;
 };
 
+// ../../node_modules/.pnpm/viem@2.45.1_bufferutil@4.1.0_typescript@5.9.3_utf-8-validate@5.0.10_zod@4.3.6/node_modules/viem/_esm/utils/abi/encodePacked.js
+function encodePacked(types, values) {
+  if (types.length !== values.length)
+    throw new AbiEncodingLengthMismatchError({
+      expectedLength: types.length,
+      givenLength: values.length
+    });
+  const data = [];
+  for (let i = 0; i < types.length; i++) {
+    const type = types[i];
+    const value = values[i];
+    data.push(encode(type, value));
+  }
+  return concatHex(data);
+}
+function encode(type, value, isArray2 = false) {
+  if (type === "address") {
+    const address = value;
+    if (!isAddress(address))
+      throw new InvalidAddressError({ address });
+    return pad(address.toLowerCase(), {
+      size: isArray2 ? 32 : null
+    });
+  }
+  if (type === "string")
+    return stringToHex(value);
+  if (type === "bytes")
+    return value;
+  if (type === "bool")
+    return pad(boolToHex(value), { size: isArray2 ? 32 : 1 });
+  const intMatch = type.match(integerRegex);
+  if (intMatch) {
+    const [_type, baseType, bits = "256"] = intMatch;
+    const size = Number.parseInt(bits, 10) / 8;
+    return numberToHex(value, {
+      size: isArray2 ? 32 : size,
+      signed: baseType === "int"
+    });
+  }
+  const bytesMatch = type.match(bytesRegex);
+  if (bytesMatch) {
+    const [_type, size] = bytesMatch;
+    if (Number.parseInt(size, 10) !== (value.length - 2) / 2)
+      throw new BytesSizeMismatchError({
+        expectedSize: Number.parseInt(size, 10),
+        givenSize: (value.length - 2) / 2
+      });
+    return pad(value, { dir: "right", size: isArray2 ? 32 : null });
+  }
+  const arrayMatch = type.match(arrayRegex);
+  if (arrayMatch && Array.isArray(value)) {
+    const [_type, childType] = arrayMatch;
+    const data = [];
+    for (let i = 0; i < value.length; i++) {
+      data.push(encode(childType, value[i], true));
+    }
+    if (data.length === 0)
+      return "0x";
+    return concatHex(data);
+  }
+  throw new UnsupportedPackedAbiType(type);
+}
+
 // ../../node_modules/.pnpm/viem@2.45.1_bufferutil@4.1.0_typescript@5.9.3_utf-8-validate@5.0.10_zod@4.3.6/node_modules/viem/_esm/errors/unit.js
 var InvalidDecimalNumberError = class extends BaseError {
   constructor({ value }) {
@@ -8009,7 +8048,7 @@ var formatMorphoPrice = (price, collateralDec, debtDec) => {
   }
 };
 
-// src/lending/aave-v2-type/publicCallParse.ts
+// src/lending/public-data/aave-v2-type/publicCallParse.ts
 var getAaveV2ReservesDataConverter = (lender, chainId, prices, additionalYields, tokenList = {}) => {
   switch (lender) {
     /** AAVE V2 style with rewards from state */
@@ -8050,7 +8089,9 @@ var getAaveV2ReservesDataConverter = (lender, chainId, prices, additionalYields,
             const totalDebtUSD = Number(totalVariableDebt) * price;
             const collateralActive = configData?.[5 /* usageAsCollateralEnabled */];
             const borrowingEnabled = configData?.[6 /* borrowingEnabled */];
+            const marketUid = createMarketUid(chainId, lender, asset);
             resultReserves[asset] = {
+              marketUid,
               poolId: asset,
               underlying: asset,
               asset: assetMeta,
@@ -8111,15 +8152,15 @@ var getAaveV2ReservesDataConverter = (lender, chainId, prices, additionalYields,
               isActive: configData?.[8 /* isActive */],
               isFrozen: configData?.[9 /* isFrozen */]
             };
-            const aaveTokens3 = aaveTokenMap[asset];
-            if (!!aaveTokens3) {
+            const aaveTokens2 = aaveTokenMap[asset];
+            if (!!aaveTokens2) {
               resultReserves[asset] = {
                 ...resultReserves[asset],
                 params: {
                   metadata: {
-                    aToken: aaveTokens3.aToken,
-                    vToken: aaveTokens3.vToken,
-                    sToken: aaveTokens3.sToken
+                    aToken: aaveTokens2.aToken,
+                    vToken: aaveTokens2.vToken,
+                    sToken: aaveTokens2.sToken
                   }
                 }
               };
@@ -8208,7 +8249,9 @@ var getAaveV3ReservesDataConverter = (lender, chainId, prices, additionalYields,
             const price = prices[toOracleKey(assetMeta?.assetGroup) ?? toGenericPriceKey(asset, chainId)] ?? 0;
             const usageAsCollateralEnabled = configData?.[5 /* usageAsCollateralEnabled */];
             const borrowingEnabled = configData?.[6 /* borrowingEnabled */];
+            const marketUid = createMarketUid(chainId, lender, asset);
             resultReserves[asset] = {
+              marketUid,
               poolId: asset,
               underlying: asset,
               asset: assetMeta,
@@ -8269,15 +8312,15 @@ var getAaveV3ReservesDataConverter = (lender, chainId, prices, additionalYields,
                 )
               )
             };
-            const aaveTokens3 = aaveTokenMap[asset];
-            if (!!aaveTokens3) {
+            const aaveTokens2 = aaveTokenMap[asset];
+            if (!!aaveTokens2) {
               resultReserves[asset] = {
                 ...resultReserves[asset],
                 params: {
                   metadata: {
-                    aToken: aaveTokens3.aToken,
-                    vToken: aaveTokens3.vToken,
-                    sToken: aaveTokens3.sToken
+                    aToken: aaveTokens2.aToken,
+                    vToken: aaveTokens2.vToken,
+                    sToken: aaveTokens2.sToken
                   }
                 }
               };
@@ -8463,15 +8506,15 @@ function parseYLDRCall(chainId, lender, additionalYields, prices, tokenList) {
           isActive: configData?.[7 /* isActive */],
           isFrozen: configData?.[8 /* isFrozen */]
         };
-        const aaveTokens3 = aaveTokenMap[asset];
-        if (!!aaveTokens3) {
+        const aaveTokens2 = aaveTokenMap[asset];
+        if (!!aaveTokens2) {
           resultReserves[asset] = {
             ...resultReserves[asset],
             params: {
               metadata: {
-                aToken: aaveTokens3.aToken,
-                vToken: aaveTokens3.vToken,
-                sToken: aaveTokens3.sToken
+                aToken: aaveTokens2.aToken,
+                vToken: aaveTokens2.vToken,
+                sToken: aaveTokens2.sToken
               }
             }
           };
@@ -8610,15 +8653,15 @@ function parseAave32(chainId, lender, prices, additionalYields, tokenList) {
             )
           )
         };
-        const aaveTokens3 = aaveTokenMap[asset];
-        if (!!aaveTokens3) {
+        const aaveTokens2 = aaveTokenMap[asset];
+        if (!!aaveTokens2) {
           resultReserves[asset] = {
             ...resultReserves[asset],
             params: {
               metadata: {
-                aToken: aaveTokens3.aToken,
-                vToken: aaveTokens3.vToken,
-                sToken: aaveTokens3.sToken
+                aToken: aaveTokens2.aToken,
+                vToken: aaveTokens2.vToken,
+                sToken: aaveTokens2.sToken
               }
             }
           };
@@ -8633,7 +8676,7 @@ function parseAave32(chainId, lender, prices, additionalYields, tokenList) {
   ];
 }
 
-// src/lending/init/publicCallParse.ts
+// src/lending/public-data/init/publicCallParse.ts
 var INIT_EMODE_LABELS = {
   [1]: "Default",
   [2]: "Blue Chip Volatile",
@@ -8669,8 +8712,11 @@ var getInitReservesDataConverter = (lender, chainId, prices, additionalYields, t
           const liquidity = Number(totalDeposits) - Number(totalDebt);
           const poolId = underlyingToPoolMap.get(asset);
           const params = !!poolId ? { metadata: { poolId } } : void 0;
+          if (!poolId) return;
+          const marketUid = createMarketUid(chainId, lender, poolId);
           return {
             [asset]: {
+              marketUid,
               poolId: asset,
               underlying: asset,
               asset: meta,
@@ -8750,7 +8796,7 @@ var getInitReservesDataConverter = (lender, chainId, prices, additionalYields, t
   ];
 };
 
-// src/lending/compound-v3/publicCallParse.ts
+// src/lending/public-data/compound-v3/publicCallParse.ts
 var COMET_RISK_DECIMALS = 18;
 var SECONDS_PER_DAY = 3600 * 24;
 var DAYS_IN_YEAR = 365;
@@ -8777,7 +8823,9 @@ var getCompoundV3ReservesDataConverter = (lender, chainId, prices, additionalYie
         const totals = parseRawAmount(resultsTotals[0], decimals2);
         const oracleKey = toOracleKey(assetMeta?.assetGroup) ?? toGenericPriceKey(asset, chainId);
         const totalUsd = Number(totals) * (prices[oracleKey] ?? 0);
+        const marketUid = createMarketUid(chainId, lender, asset);
         result[asset] = {
+          marketUid,
           poolId: asset,
           underlying: asset,
           asset: assetMeta,
@@ -8844,8 +8892,10 @@ var getCompoundV3ReservesDataConverter = (lender, chainId, prices, additionalYie
       const price = prices[oracleKeyBase] ?? 1;
       const liquidity = Number(resultsSupply) - Number(resultsBorrow);
       const compPrice = prices["COMP"];
+      const baseMarketUid = createMarketUid(chainId, lender, baseAssetData.baseAsset);
       const baseData = {
         [baseAssetData.baseAsset]: {
+          marketUid: baseMarketUid,
           poolId: baseAssetData.baseAsset,
           underlying: baseAssetData.baseAsset,
           asset: baseMeta,
@@ -10736,7 +10786,7 @@ var MORPHO_LENS = {
   [Chain.KATANA]: "0xCe434378adacC51d54312c872113D687Ac19B516",
   [Chain.HYPEREVM]: "0x6Bc6aCB905c1216B0119C87Bf9E178ce298310FA",
   [Chain.SONEIUM]: "0x4b5458BB47dCBC1a41B31b41e1a8773dE312BE9d",
-  [Chain.ETHEREUM_MAINNET]: "0xb8F4283733588E8036273F06fB375dF59ee5e258",
+  [Chain.ETHEREUM_MAINNET]: "0x5c4f2eacbdc1eb38f839bddd7620e250a36819d4",
   [Chain.PLASMA_MAINNET]: "0xcB6Eb8df68153cebF60E1872273Ef52075a5C297",
   [Chain.BERACHAIN]: "0x7a59ddbB76521E8982Fa3A08598C9a83b14A6C07",
   [Chain.BNB_SMART_CHAIN_MAINNET]: "0x3375B2EF9C4D2c6434d39BBE5234c5101218500d",
@@ -10876,12 +10926,48 @@ function createBaseTypeUserState(payload, lenderData, totalDeposits24h = 0, tota
     stakingBorrowApr: safeDivide(stakingBorrowAccrual, debt)
   };
   const userConfig = { selectedMode: mode, id: account, isWhitelisted };
+  const creditLine = Math.max(
+    0,
+    borrowDiscountedCollateral - balanceData2.adjustedDebt
+  );
+  for (let i = 0; i < assetKeys.length; i++) {
+    const marketUid = assetKeys[i];
+    const pos = payload.lendingPositions["0"][marketUid];
+    if (!pos || !lenderData?.[marketUid]) continue;
+    const { configs, flags, price: priceInfo } = lenderData[marketUid];
+    const config = configs?.[mode];
+    const price = priceInfo?.priceUsd ?? 1;
+    const bcf = config?.borrowCollateralFactor ?? 1;
+    const bf = config?.borrowFactor ?? 1;
+    let withdrawable;
+    if (!pos.collateralEnabled || config?.collateralDisabled) {
+      withdrawable = String(pos.deposits);
+    } else if (balanceData2.debt === 0) {
+      withdrawable = String(pos.deposits);
+    } else {
+      const withdrawableUSD = Math.max(creditLine / bcf, 0);
+      withdrawable = String(
+        Math.min(withdrawableUSD / price, Number(pos.deposits))
+      );
+    }
+    let borrowable;
+    if (!flags?.borrowingEnabled || flags?.isFrozen || config?.debtDisabled) {
+      borrowable = "0";
+    } else {
+      const borrowableUSD = Math.max(creditLine / bf, 0);
+      borrowable = String(borrowableUSD / price);
+    }
+    pos.withdrawable = withdrawable;
+    pos.borrowable = borrowable;
+  }
   return {
+    lender: "",
     account,
     chainId,
     data: [
       {
-        health: balanceData2.adjustedDebt === 0 ? null : balanceData2.borrowDiscountedCollateral / balanceData2.adjustedDebt,
+        health: balanceData2.debt === 0 ? null : balanceData2.adjustedDebt > 0 ? balanceData2.borrowDiscountedCollateral / balanceData2.adjustedDebt : balanceData2.collateral / balanceData2.debt,
+        borrowCapacityUSD: creditLine,
         accountId: "0",
         balanceData: balanceData2,
         aprData: aprData2,
@@ -10900,8 +10986,7 @@ function createMultiAccountTypeUserState(payload, lenderData, histData) {
   let data = [];
   for (let j = 0; j < positionKeys.length; j++) {
     const posId = positionKeys[j];
-    const position = payload.lendingPositions[posId];
-    const { mode: posMode } = position;
+    const posMode = payload.modes?.[posId];
     const mode = posMode ?? LENDER_MODE_NO_MODE;
     const userConfig = {
       id: posId,
@@ -10972,9 +11057,39 @@ function createMultiAccountTypeUserState(payload, lenderData, histData) {
       stakingBorrowApr: safeDivide(stakingBorrowAccrual, debt),
       rewards: {}
     };
+    const creditLine = Math.max(0, borrowDiscountedCollateral - adjustedDebt);
+    for (let i = 0; i < marketUids.length; i++) {
+      const marketUid = marketUids[i];
+      const pos = payload.lendingPositions[posId]?.[marketUid];
+      if (!pos || !lenderData?.[marketUid]) continue;
+      const { configs, flags, price: priceInfo } = lenderData[marketUid];
+      const config = configs?.[mode];
+      const price = priceInfo?.priceUsd ?? 1;
+      const bcf = config?.borrowCollateralFactor ?? 1;
+      const bf = config?.borrowFactor ?? 1;
+      let withdrawable;
+      if (!pos.collateralEnabled || config?.collateralDisabled) {
+        withdrawable = String(pos.deposits);
+      } else if (balanceData2.debt === 0) {
+        withdrawable = String(pos.deposits);
+      } else {
+        const withdrawableUSD = Math.max(creditLine / bcf, 0);
+        withdrawable = String(Math.min(withdrawableUSD / price, Number(pos.deposits)));
+      }
+      let borrowable;
+      if (!flags?.borrowingEnabled || flags?.isFrozen || config?.debtDisabled) {
+        borrowable = "0";
+      } else {
+        const borrowableUSD = Math.max(creditLine / bf, 0);
+        borrowable = String(borrowableUSD / price);
+      }
+      pos.withdrawable = withdrawable;
+      pos.borrowable = borrowable;
+    }
     data.push({
       accountId: posId,
-      health: balanceData2.adjustedDebt === 0 ? null : balanceData2.borrowDiscountedCollateral / balanceData2.adjustedDebt,
+      health: balanceData2.debt === 0 ? null : balanceData2.adjustedDebt > 0 ? balanceData2.borrowDiscountedCollateral / balanceData2.adjustedDebt : balanceData2.collateral / balanceData2.debt,
+      borrowCapacityUSD: creditLine,
       userConfig,
       // aggregated balance data
       balanceData: balanceData2,
@@ -10984,6 +11099,7 @@ function createMultiAccountTypeUserState(payload, lenderData, histData) {
     });
   }
   return {
+    lender: "",
     account,
     chainId,
     data
@@ -11004,7 +11120,7 @@ function divideAccrualsToAprs(aprs, nav, deposits, debt) {
   return d;
 }
 
-// src/lending/morpho/utils/parsers.ts
+// src/lending/public-data/morpho/utils/parsers.ts
 var SECONDS_PER_YEAR3 = 31556952n;
 var toFixed = (x, decimals) => new Intl.NumberFormat("en-US", {
   style: "decimal",
@@ -11040,7 +11156,7 @@ function formatNr(n, d) {
   return Number(formatUnits(BigInt(n ?? 0), d));
 }
 
-// src/lending/morpho/convertPublic.ts
+// src/lending/public-data/morpho/convertPublic.ts
 function convertMarketsToMorphoResponse(response, chainId, additionalYields = {
   intrinsicYields: {},
   lenderRewards: {},
@@ -11066,6 +11182,7 @@ function convertMarketsToMorphoResponse(response, chainId, additionalYields = {
       const totalDeposits = formatNr(state.supplyAssets, loanAsset.decimals);
       const totalDebt = formatNr(state.borrowAssets, loanAsset.decimals);
       data[m].data[loanAssetAddress] = {
+        marketUid: createMarketUid(chainId, m, loanAssetAddress),
         poolId: loanAssetAddress,
         underlying: loanAssetAddress,
         asset: meta,
@@ -11103,6 +11220,7 @@ function convertMarketsToMorphoResponse(response, chainId, additionalYields = {
       const collateralAssetAddress = collateralAsset.address.toLowerCase();
       const metaCollateral = tokens[collateralAssetAddress] ?? collateralAsset;
       data[m].data[collateralAssetAddress] = {
+        marketUid: createMarketUid(chainId, m, collateralAssetAddress),
         poolId: collateralAssetAddress,
         underlying: collateralAssetAddress,
         asset: metaCollateral,
@@ -11161,7 +11279,7 @@ function convertMarketsToMorphoResponse(response, chainId, additionalYields = {
   return data;
 }
 
-// src/lending/morpho/fetchPublic.ts
+// src/lending/public-data/morpho/fetchPublic.ts
 var query = (first, skip, chainId) => `
 query GetMarkets {
   markets(first: ${first}, skip: ${skip}, where:  {
@@ -11268,7 +11386,7 @@ async function fetchMorphoMarkets(chainId) {
   };
 }
 
-// src/lending/morpho/utils/evmParser.ts
+// src/lending/public-data/morpho/utils/evmParser.ts
 var FIELD_SIZES = {
   addr: 20,
   u128: 16,
@@ -11458,33 +11576,31 @@ function toHex(arr) {
   }
   return s;
 }
-
-// src/lending/lista/publicCallBuild.ts
+var { chunk: chunk2 } = lodash;
+var MARKET_CHUNK_SIZE = 100;
 function buildListaCall(chainId, marketsOverride) {
   const markets = marketsOverride ?? morphoTypeMarkets().LISTA_DAO?.[chainId] ?? [];
   const mb = morphoPools()?.LISTA_DAO?.[chainId];
   if (!mb || markets.length === 0) return [];
-  return [
-    {
-      address: MORPHO_LENS[chainId],
-      name: "getListaMarketDataCompact",
-      params: [mb, markets]
-    }
-  ];
+  const marketChunks = chunk2(markets, MARKET_CHUNK_SIZE);
+  return marketChunks.map((marketGroup) => ({
+    address: MORPHO_LENS[chainId],
+    name: "getListaMarketDataCompact",
+    params: [mb, marketGroup]
+  }));
 }
-
-// src/lending/morpho/publicCallBuild.ts
+var { chunk: chunk3 } = lodash;
+var MARKET_CHUNK_SIZE2 = 50;
 function buildMorphoCall(chainId, marketsOverride) {
   const markets = marketsOverride ?? morphoTypeMarkets()?.MORPHO_BLUE?.[chainId] ?? [];
   const mb = morphoPools()?.MORPHO_BLUE?.[chainId];
   if (!mb || markets.length === 0) return [];
-  return [
-    {
-      address: MORPHO_LENS[chainId],
-      name: "getMarketDataCompact",
-      params: [mb, markets]
-    }
-  ];
+  const marketChunks = chunk3(markets, MARKET_CHUNK_SIZE2);
+  return marketChunks.map((marketGroup) => ({
+    address: MORPHO_LENS[chainId],
+    name: "getMarketDataCompact",
+    params: [mb, marketGroup]
+  }));
 }
 function buildMorphoTypeCall(chainId, lender, marketsOVerride) {
   if (lender.startsWith("LISTA_DAO"))
@@ -11492,7 +11608,7 @@ function buildMorphoTypeCall(chainId, lender, marketsOVerride) {
   return buildMorphoCall(chainId, marketsOVerride);
 }
 
-// src/lending/morpho/utils/mathLib.ts
+// src/lending/public-data/morpho/utils/mathLib.ts
 var MathLib;
 ((MathLib2) => {
   MathLib2.WAD = 1000000000000000000n;
@@ -11706,7 +11822,7 @@ var MathLib;
   MathLib2._getBorrowRate = _getBorrowRate;
 })(MathLib || (MathLib = {}));
 
-// src/lending/morpho/getMarketsFromChain.ts
+// src/lending/public-data/morpho/getMarketsFromChain.ts
 function getMorphoMarketDataConverter(lender, chainId, prices, additionalYields = {
   intrinsicYields: {},
   lenderRewards: {},
@@ -11715,7 +11831,11 @@ function getMorphoMarketDataConverter(lender, chainId, prices, additionalYields
   const markets = marketsOverride ?? morphoTypeMarkets()?.MORPHO_BLUE?.[chainId] ?? [];
   return [
     (rData) => {
-      const decoded = decodeMarkets(rData[0] ?? "0x");
+      let decoded = [];
+      for (let j = 0; j < rData.length; j++) {
+        const chunkDecoded = decodeMarkets(rData[j] ?? "0x");
+        decoded.push(...chunkDecoded);
+      }
       const data = {};
       decoded.forEach((market, i) => {
         const uniqueKey = markets[i];
@@ -11726,30 +11846,29 @@ function getMorphoMarketDataConverter(lender, chainId, prices, additionalYields
           const loanRewards = {};
           const loanAsset = tokens[loanToken.toLowerCase()];
           const collateralAsset = tokens[collateralToken.toLowerCase()];
-          const loanKey = toOracleKey(loanAsset?.assetGroup) ?? toGenericPriceKey(loanAsset?.address, chainId);
+          const loanDecimals = loanAsset?.decimals ?? 18;
+          const collateralDecimals = collateralAsset?.decimals ?? 18;
+          const loanKey = toOracleKey(loanAsset?.assetGroup) ?? toGenericPriceKey(loanAsset?.address ?? loanToken, chainId);
           let loanPrice = prices[loanKey];
           if (!loanPrice) {
-            const collateralKey = toOracleKey(collateralAsset?.assetGroup) ?? toGenericPriceKey(collateralAsset?.address, chainId);
+            const collateralKey = toOracleKey(collateralAsset?.assetGroup) ?? toGenericPriceKey(
+              collateralAsset?.address ?? collateralToken,
+              chainId
+            );
             const collateralPrice = prices[collateralKey];
             if (collateralPrice) {
               const priceDebtToCollateral = formatMorphoPrice(
                 state.price.toString(),
-                loanAsset.decimals,
-                collateralAsset.decimals
+                loanDecimals,
+                collateralDecimals
               );
               loanPrice = collateralPrice / priceDebtToCollateral;
             }
           }
-          const loanTokenAddress = loanAsset?.address.toLowerCase();
+          const loanTokenAddress = (loanAsset?.address ?? loanToken).toLowerCase();
           const meta = tokens[loanTokenAddress] ?? loanAsset;
-          const totalDeposits = formatNr(
-            state.totalSupplyAssets,
-            loanAsset.decimals
-          );
-          const totalDebt = formatNr(
-            state.totalBorrowAssets,
-            loanAsset.decimals
-          );
+          const totalDeposits = formatNr(state.totalSupplyAssets, loanDecimals);
+          const totalDebt = formatNr(state.totalBorrowAssets, loanDecimals);
           const utilization = MathLib.getUtilization({
             totalBorrowAssets: state.totalBorrowAssets,
             totalSupplyAssets: state.totalSupplyAssets
@@ -11769,6 +11888,7 @@ function getMorphoMarketDataConverter(lender, chainId, prices, additionalYields
           const borrowApr = apyToApr2(Number(formatEther(borrowApy))) * 100;
           const depositApr = apyToApr2(Number(formatEther(supplyApy))) * 100;
           data[m].data[loanTokenAddress] = {
+            marketUid: createMarketUid(chainId, m, loanTokenAddress),
             poolId: loanTokenAddress,
             underlying: loanTokenAddress,
             asset: meta,
@@ -11785,7 +11905,7 @@ function getMorphoMarketDataConverter(lender, chainId, prices, additionalYields
             stableBorrowRate: 0,
             stakingYield: additionalYields.intrinsicYields[meta?.assetGroup] ?? 0,
             rewards: Object.keys(loanRewards).length > 0 ? loanRewards : void 0,
-            decimals: loanAsset.decimals,
+            decimals: loanDecimals,
             config: {
               0: {
                 category: 0,
@@ -11803,9 +11923,10 @@ function getMorphoMarketDataConverter(lender, chainId, prices, additionalYields
             isFrozen: false
           };
           const ltv = parseLtv(lltv);
-          const collateralAssetAddress = collateralAsset?.address.toLowerCase();
+          const collateralAssetAddress = (collateralAsset?.address ?? collateralToken).toLowerCase();
           const metaCollateral = tokens[collateralAssetAddress] ?? collateralAsset;
           data[m].data[collateralAssetAddress] = {
+            marketUid: createMarketUid(chainId, m, collateralAssetAddress),
             poolId: collateralAssetAddress,
             underlying: collateralAssetAddress,
             asset: metaCollateral,
@@ -11823,7 +11944,7 @@ function getMorphoMarketDataConverter(lender, chainId, prices, additionalYields
             stableBorrowRate: 0,
             stakingYield: additionalYields.intrinsicYields[metaCollateral?.assetGroup] ?? 0,
             rewards: void 0,
-            decimals: collateralAsset.decimals,
+            decimals: collateralDecimals,
             config: {
               0: {
                 category: 0,
@@ -11843,8 +11964,8 @@ function getMorphoMarketDataConverter(lender, chainId, prices, additionalYields
           data[m].params = {
             market: {
               lender: m,
-              collateralDecimals: collateralAsset.decimals,
-              loanDecimals: loanAsset.decimals,
+              collateralDecimals,
+              loanDecimals,
               id: uniqueKey,
               lltv: lltv.toString(),
               oracle,
@@ -11858,11 +11979,11 @@ function getMorphoMarketDataConverter(lender, chainId, prices, additionalYields
       });
       return data;
     },
-    markets.length > 0 ? 1 : 0
+    markets.length > 0 ? Math.ceil(markets.length / MARKET_CHUNK_SIZE2) : 0
   ];
 }
 
-// src/lending/lista/getMarketsFromChain.ts
+// src/lending/public-data/lista/getMarketsFromChain.ts
 function getListaMarketDataConverter(lender, chainId, prices, additionalYields = {
   intrinsicYields: {},
   lenderRewards: {},
@@ -11871,7 +11992,11 @@ function getListaMarketDataConverter(lender, chainId, prices, additionalYields =
   const markets = marketsOverride ?? morphoTypeMarkets()?.LISTA_DAO?.[chainId] ?? [];
   return [
     (rData) => {
-      const decoded = decodeMarkets(rData[0] ?? "0x");
+      let decoded = [];
+      for (let j = 0; j < rData.length; j++) {
+        const chunkDecoded = decodeMarkets(rData[j] ?? "0x");
+        decoded.push(...chunkDecoded);
+      }
       const data = {};
       decoded.forEach((market, i) => {
         const uniqueKey = markets[i];
@@ -11934,6 +12059,7 @@ function getListaMarketDataConverter(lender, chainId, prices, additionalYields =
           const borrowApr = apyToApr2(Number(formatEther(borrowApy))) * 100;
           const depositApr = apyToApr2(Number(formatEther(supplyApy))) * 100;
           data[m].data[loanTokenAddress] = {
+            marketUid: createMarketUid(chainId, m, loanTokenAddress),
             poolId: loanTokenAddress,
             underlying: loanTokenAddress,
             asset: meta,
@@ -11950,7 +12076,7 @@ function getListaMarketDataConverter(lender, chainId, prices, additionalYields =
             stableBorrowRate: 0,
             stakingYield: additionalYields.intrinsicYields[meta?.assetGroup] ?? 0,
             rewards: Object.keys(loanRewards).length > 0 ? loanRewards : void 0,
-            decimals: loanAsset.decimals,
+            decimals: loanDecimals,
             config: {
               0: {
                 category: 0,
@@ -11970,6 +12096,7 @@ function getListaMarketDataConverter(lender, chainId, prices, additionalYields =
           const ltv = parseLtv(lltv);
           const metaCollateral = tokens[collateralAssetAddress] ?? collateralAsset;
           data[m].data[collateralAssetAddress] = {
+            marketUid: createMarketUid(chainId, m, collateralAssetAddress),
             poolId: collateralAssetAddress,
             underlying: collateralAssetAddress,
             asset: metaCollateral,
@@ -12027,7 +12154,7 @@ function getListaMarketDataConverter(lender, chainId, prices, additionalYields =
       });
       return data;
     },
-    markets.length > 0 ? 1 : 0
+    markets.length > 0 ? Math.ceil(markets.length / MARKET_CHUNK_SIZE2) : 0
   ];
 }
 
@@ -12340,7 +12467,7 @@ var VenusLensLegacyAbi = [
   }
 ];
 
-// src/lending/compound-v2/publicCallBuild.ts
+// src/lending/public-data/compound-v2/publicCallBuild.ts
 var buildCompoundV2StyleLenderReserveCall = (chainId, lender) => {
   const collateralTokens = getCompoundV2CollateralTokens(chainId, lender);
   const getCTokenCall = getCall(lender, chainId);
@@ -12375,7 +12502,7 @@ function getCall(lender, chainId) {
   });
 }
 
-// src/lending/compound-v2/getters/types.ts
+// src/lending/public-data/compound-v2/getters/types.ts
 var CAction = /* @__PURE__ */ ((CAction2) => {
   CAction2[CAction2["MINT"] = 0] = "MINT";
   CAction2[CAction2["REDEEM"] = 1] = "REDEEM";
@@ -12389,7 +12516,7 @@ var CAction = /* @__PURE__ */ ((CAction2) => {
   return CAction2;
 })(CAction || {});
 
-// src/lending/compound-v2/getters/venus.ts
+// src/lending/public-data/compound-v2/getters/venus.ts
 function readVTokenMetadata(meta, token) {
   const pick = (...values) => values.find((v) => v !== void 0);
   return {
@@ -12452,7 +12579,7 @@ function decodePausedActions(bitmap) {
   return result;
 }
 
-// src/lending/compound-v2/getters/moonwell.ts
+// src/lending/public-data/compound-v2/getters/moonwell.ts
 function toBigInt(value) {
   if (typeof value === "bigint") return value;
   if (typeof value === "number") return BigInt(value);
@@ -12545,7 +12672,7 @@ function parseMoonwellMarket(input, token) {
   };
 }
 
-// src/lending/compound-v2/publicCallParse.ts
+// src/lending/public-data/compound-v2/publicCallParse.ts
 var PRICE_DECIMALS = 18;
 var RESERVE_MANTISSA_DECIMALS = 18;
 function convertSingleEntry(opts) {
@@ -12553,6 +12680,8 @@ function convertSingleEntry(opts) {
     entryRaw,
     reader,
     asset,
+    chainId,
+    lender,
     prices,
     additionalYields,
     cToken
@@ -12579,7 +12708,9 @@ function convertSingleEntry(opts) {
   const poolId = asset.address;
   const collateralActive = Boolean(currentEntry?.isListed);
   const borrowingEnabled = Boolean(currentEntry?.isBorrowAllowed) && !pausedActions[2 /* BORROW */];
+  const marketUid = createMarketUid(chainId, lender, cToken);
   return {
+    marketUid,
     poolId,
     asset,
     // interest rates (use lender passed-in, not hardcoded)
@@ -12637,6 +12768,7 @@ var getCompoundV2DataConverter = (lender, chainId, prices, additionalYields, tok
       const out = { data: {}, chainId };
       for (let i = 0; i < compoundV2Tokens2.length; i++) {
         const { underlying, cToken } = compoundV2Tokens2[i];
+        if (!cToken || !underlying) continue;
         const poolId = underlying;
         const asset = tokenList[poolId];
         const entryRaw = data[i];
@@ -12644,6 +12776,8 @@ var getCompoundV2DataConverter = (lender, chainId, prices, additionalYields, tok
           entryRaw,
           reader,
           asset,
+          chainId,
+          lender,
           prices,
           additionalYields,
           cToken
@@ -13476,7 +13610,7 @@ var VenusLensAbi = [
   }
 ];
 
-// src/lending/fetchLender.ts
+// src/lending/public-data/fetchLender.ts
 function getMorphoTypeMarketConverter(lender, chainId, prices, additionalYields, tokenList = {}, marketsOverride) {
   if (lender.startsWith("LISTA_DAO"))
     return getListaMarketDataConverter(
@@ -13641,7 +13775,7 @@ var getLenderPublicData = async (chainId, lenders, prices, additionalYields, mul
   return lenderData;
 };
 
-// src/lending/fetchLenderExt.ts
+// src/lending/public-data/fetchLenderExt.ts
 async function getLenderDataFromApi(lender, chainId, prices, additionalYields) {
   if (isMorphoType(lender)) return await fetchMorphoMarkets(chainId);
   return {};
@@ -13806,9 +13940,9 @@ var 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) => {
+var multicallViemAbiArray = async (chainId, abi, calls, getEvmClient3, retry = true, providerId = 0, retries = maxRetries, allowFailure = true, batchSize = MULTICALL_DEFAULT_BATCH_SIZE, logs = false) => {
   try {
-    const provider = getEvmClient2(chainId, providerId);
+    const provider = getEvmClient3(chainId, providerId);
     const abiIsArray = isArray(abi[0]);
     const returnData = await provider.multicall({
       allowFailure,
@@ -13834,7 +13968,7 @@ var multicallViemAbiArray = async (chainId, abi, calls, getEvmClient2, retry = t
       chainId,
       abi,
       calls,
-      getEvmClient2,
+      getEvmClient3,
       retry,
       providerId,
       retries,
@@ -18533,27 +18667,20 @@ function createAaveV2Entry(i, data, key, meta, claimableRewards) {
   }
   const assetMeta = meta.asset;
   const decimals = assetMeta?.decimals ?? 18;
-  const currentATokenBalance = Number(
-    parseRawAmount(currentATokenBalanceRaw, decimals)
-  );
-  const currentStableDebt = Number(
-    parseRawAmount(currentStableDebtRaw, decimals)
-  );
-  const currentVariableDebt = Number(
-    parseRawAmount(currentVariableDebtRaw, decimals)
-  );
+  const currentATokenBalance = parseRawAmount(currentATokenBalanceRaw, decimals);
+  const currentStableDebt = parseRawAmount(currentStableDebtRaw, decimals);
+  const currentVariableDebt = parseRawAmount(currentVariableDebtRaw, decimals);
   const price = meta?.price?.priceUsd ?? 1;
   const priceHist = meta?.price?.priceUsd24h ?? price;
   const dataForAsset = {
-    poolId: key,
+    marketUid: key,
     underlying: assetMeta.address,
     deposits: currentATokenBalance,
-    depositsRaw: currentATokenBalanceRaw,
     debtStable: currentStableDebt,
     debt: currentVariableDebt,
-    depositsUSD: currentATokenBalance * price,
-    debtStableUSD: currentStableDebt * price,
-    debtUSD: currentVariableDebt * price,
+    depositsUSD: Number(currentATokenBalance) * price,
+    debtStableUSD: Number(currentStableDebt) * price,
+    debtUSD: Number(currentVariableDebt) * price,
     stableBorrowRate: reserveData[5 /* stableBorrowRate */]?.toString(),
     collateralEnabled: Boolean(
       reserveData[8 /* usageAsCollateralEnabled */]
@@ -18562,8 +18689,8 @@ function createAaveV2Entry(i, data, key, meta, claimableRewards) {
   };
   return {
     dataForAsset,
-    addedDeposits: currentATokenBalance * priceHist,
-    addedDebt: (currentVariableDebt + currentStableDebt) * priceHist
+    addedDeposits: Number(currentATokenBalance) * priceHist,
+    addedDebt: (Number(currentVariableDebt) + Number(currentStableDebt)) * priceHist
   };
 }
 
@@ -18635,10 +18762,9 @@ function createAaveV3Entry(i, data, key, meta) {
   const price = meta?.price?.priceUsd ?? 1;
   const priceHist = meta?.price?.priceUsd24h ?? price;
   const dataForAsset = {
-    poolId: key,
+    marketUid: key,
     underlying: assetMeta.address,
     deposits: currentATokenBalance,
-    depositsRaw: currentATokenBalanceRaw,
     debtStable: currentStableDebt,
     debt: currentVariableDebt,
     depositsUSD: Number(currentATokenBalance) * price,
@@ -18672,6 +18798,7 @@ var getInitUserDataConverter = (lender, chainId, account, metaMap) => {
         return { e, i };
       }).filter((a) => a.e.owner.toLowerCase() === validOwner).map((a) => a.i);
       let histData = {};
+      const modes = {};
       let allPools = {};
       const result = Object.assign(
         {},
@@ -18679,6 +18806,7 @@ var getInitUserDataConverter = (lender, chainId, account, metaMap) => {
           const entry = data[0 /* posMeta */][index];
           const mode = entry.mode;
           const id = entry.posId.toString();
+          modes[id] = mode;
           const collatData = Object.assign(
             {},
             ...data[1 /* collaterals */][index].map(
@@ -18691,8 +18819,7 @@ var getInitUserDataConverter = (lender, chainId, account, metaMap) => {
                 const depositsRaw = c.amount.toString();
                 return {
                   [pool]: {
-                    deposits: parseRawAmount(depositsRaw, decimals),
-                    depositsRaw
+                    deposits: parseRawAmount(depositsRaw, decimals)
                   }
                 };
               }
@@ -18716,51 +18843,47 @@ var getInitUserDataConverter = (lender, chainId, account, metaMap) => {
             )
           );
           return {
-            [id]: {
-              mode,
-              ...Object.assign(
-                {},
-                ...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()
-                      }
+            [id]: Object.assign(
+              {},
+              ...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;
+                  histData[id].totalDebt24h += Number(debt) * priceHist;
+                  histData[id].totalDeposits24h += Number(deposits) * priceHist;
+                  return {
+                    [key]: {
+                      marketUid: key,
+                      underlying,
+                      deposits,
+                      debt,
+                      debtStable: "0",
+                      debtStableUSD: 0,
+                      depositsUSD: price * Number(deposits),
+                      debtUSD: price * Number(debt),
+                      collateralEnabled: true,
+                      isAllowed: entry.approved.toLowerCase() === brokerAddress.toLowerCase()
+                    }
+                  };
+                }
               )
-            }
+            )
           };
         })
       );
       const payload = {
         chainId,
         lendingPositions: result,
+        modes,
         account
       };
       const userState = createMultiAccountTypeUserState(
@@ -18803,7 +18926,7 @@ var getCompoundV3UserDataConverter = (lender, chainId, account, metaMap) => {
         const priceHist2 = metaEntity2?.price?.priceUsd24h ?? price2;
         totalDeposits24h += Number(deposits2) * priceHist2;
         result[key2] = {
-          poolId: key2,
+          marketUid: key2,
           underlying: asset,
           deposits: deposits2,
           depositsUSD: Number(deposits2) * price2,
@@ -18811,10 +18934,7 @@ var getCompoundV3UserDataConverter = (lender, chainId, account, metaMap) => {
           debt: "0",
           debtStable: "0",
           debtUSD: 0,
-          collateralEnabled: true,
-          // user depos raw
-          depositsRaw: depositsRaw2
-          // flag for allowance
+          collateralEnabled: true
         };
       }
       const depositsRaw = data[assetsNoBase.length]?.toString();
@@ -18831,7 +18951,7 @@ var getCompoundV3UserDataConverter = (lender, chainId, account, metaMap) => {
       totalDeposits24h += Number(deposits) * priceHist;
       const resultBase = depositsRaw === "0" && debtRaw === "0" ? {} : {
         [key]: {
-          poolId: key,
+          marketUid: key,
           underlying: baseAsset,
           deposits,
           debt,
@@ -18840,10 +18960,7 @@ var getCompoundV3UserDataConverter = (lender, chainId, account, metaMap) => {
           // populate values for totals
           debtStable: "0",
           debtStableUSD: 0,
-          collateralEnabled: false,
-          // user depos raw
-          depositsRaw
-          // flag for allowance
+          collateralEnabled: false
         }
       };
       const earnedBalances = data[expectedNumberOfCalls - 1];
@@ -18938,10 +19055,9 @@ function createAaveV3Entry2(i, data, key, meta) {
   const price = meta?.price?.priceUsd ?? 1;
   const priceHist = meta?.price?.priceUsd24h ?? price;
   const dataForAsset = {
-    poolId: key,
+    marketUid: key,
     underlying: assetMeta.address,
     deposits: currentATokenBalance,
-    depositsRaw: currentATokenBalanceRaw,
     debtStable: "0",
     debt: currentVariableDebt,
     depositsUSD: Number(currentATokenBalance) * price,
@@ -19122,7 +19238,9 @@ var getMorphoUserDataConverterWithlens = (lender, chainId, account, markets, met
           const lenderKey = createLenderKey(lender, marketId);
           const { dataForMarket, addedDebt, addedDeposits } = createMorphoEntryFromMarketWithLens(
             balanceData2,
-            metaMap?.[lenderKey]
+            metaMap?.[lenderKey],
+            chainId,
+            lenderKey
           );
           const payload = {
             chainId,
@@ -19177,7 +19295,9 @@ var getListaUserDataConverterWithlens = (lender, chainId, account, markets, meta
           const lenderKey = createLenderKey(lender, marketId);
           const { dataForMarket, addedDebt, addedDeposits } = createMorphoEntryFromMarketWithLens(
             balanceData2,
-            metaMap?.[lenderKey]
+            metaMap?.[lenderKey],
+            chainId,
+            lenderKey
           );
           const payload = {
             chainId,
@@ -19214,13 +19334,22 @@ var getListaUserDataConverterWithlens = (lender, chainId, account, markets, meta
     expectedNumberOfCalls
   ];
 };
-function createMorphoEntryFromMarketWithLens(balanceInfo, metaMap) {
+function createMorphoEntryFromMarketWithLens(balanceInfo, metaMap, chainId, lenderKey) {
   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 loanEntry = _assets.find(([, meta]) => meta?.flags?.borrowingEnabled);
+  const collateralEntry = _assets.find(([, meta]) => !meta?.flags?.borrowingEnabled);
+  if (!loanEntry || !collateralEntry) {
+    return {
+      dataForMarket: {},
+      addedDeposits: 0,
+      addedDebt: 0
+    };
+  }
+  const [loanKey, loanAssetMeta] = loanEntry;
+  const [collateralKey, collateralAssetMeta] = collateralEntry;
   const loanAddress = loanAssetMeta?.asset?.address?.toLowerCase();
   const loanAsset = loanAssetMeta?.asset;
   const priceLoan = loanAssetMeta?.price?.priceUsd ?? 1;
@@ -19244,10 +19373,9 @@ function createMorphoEntryFromMarketWithLens(balanceInfo, metaMap) {
   const collateralDec = parseRawAmount(collateral.toString(), decimals);
   const borrowDec = parseRawAmount(borrow.toString(), loanAsset?.decimals ?? 18);
   const dataForLoanAsset = {
-    poolId: loanAddress,
+    marketUid: createMarketUid(chainId, lenderKey, loanAddress),
     underlying: loanAddress,
     deposits: loanDepositNumber,
-    depositsRaw: deposits.toString(),
     debtStable: "0",
     debt: borrowDec,
     depositsUSD: Number(loanDepositNumber) * priceLoan,
@@ -19260,10 +19388,9 @@ function createMorphoEntryFromMarketWithLens(balanceInfo, metaMap) {
   const price = collateralAssetMeta?.price.priceUsd ?? 1;
   const priceHist = collateralAssetMeta?.price.priceUsd24h ?? price;
   const dataForCollateralAsset = {
-    poolId: collateralAddress,
+    marketUid: createMarketUid(chainId, lenderKey, collateralAddress),
     underlying: collateralAddress,
     deposits: collateralDec,
-    depositsRaw: balanceInfo.collateral.toString(),
     debtStable: "0",
     debt: "0",
     depositsUSD: Number(collateralDec) * price,
@@ -19378,27 +19505,26 @@ function createCompoundV2Entry(i, data, key, assetsIn, vToken, meta, claimableRe
   }
   const assetMeta = meta.asset;
   const decimals = assetMeta?.decimals ?? 18;
-  const currentATokenBalance = Number(parseRawAmount(depositsRaw, decimals));
-  const currentVariableDebt = Number(parseRawAmount(borrowsRaw, decimals));
+  const currentATokenBalance = parseRawAmount(depositsRaw, decimals);
+  const currentVariableDebt = parseRawAmount(borrowsRaw, decimals);
   const price = meta?.price?.priceUsd ?? 1;
   const priceHist = meta?.price?.priceUsd24h ?? price;
   const dataForAsset = {
-    poolId: key,
+    marketUid: key,
     underlying: assetMeta.address,
     deposits: currentATokenBalance,
-    depositsRaw,
-    debtStable: 0,
+    debtStable: "0",
     debt: currentVariableDebt,
-    depositsUSD: currentATokenBalance * price,
+    depositsUSD: Number(currentATokenBalance) * price,
     debtStableUSD: 0,
-    debtUSD: currentVariableDebt * price,
+    debtUSD: Number(currentVariableDebt) * price,
     collateralEnabled,
     claimableRewards
   };
   return {
     dataForAsset,
-    addedDeposits: currentATokenBalance * priceHist,
-    addedDebt: currentVariableDebt * priceHist
+    addedDeposits: Number(currentATokenBalance) * priceHist,
+    addedDebt: Number(currentVariableDebt) * priceHist
   };
 }
 
@@ -19544,7 +19670,7 @@ function getUserDataConverter(lender, chainId, account, params, meta) {
     meta?.[lender]
   );
 }
-var getLenderUserDataResult = async (chainId, queriesRaw, getEvmClient2, allowFailure = true, batchSize = MULTICALL_DEFAULT_BATCH_SIZE, retries = 3, logs = false, meta) => {
+var getLenderUserDataResult = async (chainId, queriesRaw, getEvmClient3, allowFailure = true, batchSize = MULTICALL_DEFAULT_BATCH_SIZE, retries = 3, logs = false) => {
   let calls = [];
   const queries = organizeUserQueries(queriesRaw);
   for (const query2 of queries) {
@@ -19562,7 +19688,7 @@ var getLenderUserDataResult = async (chainId, queriesRaw, getEvmClient2, allowFa
     chainId,
     calls.map((call) => call.abi),
     calls.map((call) => call.call),
-    getEvmClient2,
+    getEvmClient3,
     true,
     0,
     retries,
@@ -19605,6 +19731,16 @@ var prepareLenderUserDataRpcCalls = (chainId, queriesRaw, batchSize = MULTICALL_
     rpcCalls
   };
 };
+var hasBalanceOrPositions = (entry) => {
+  const hasBalance = entry.balanceData.deposits > 0 || entry.balanceData.debt > 0;
+  const hasPositions = entry.positions && entry.positions.length > 0;
+  return hasBalance || hasPositions;
+};
+var filterEmptyUserData = (userData) => {
+  const filteredData = userData.data.filter(hasBalanceOrPositions);
+  if (filteredData.length === 0) return null;
+  return { ...userData, data: filteredData };
+};
 var convertLenderUserDataResult = (chainId, queriesRaw, rawResults, lenderState) => {
   const queries = organizeUserQueries(queriesRaw);
   const lenderData = {};
@@ -19623,10 +19759,18 @@ var convertLenderUserDataResult = (chainId, queriesRaw, rawResults, lenderState)
       if (convertedData) {
         if (isMultiMarket(query2.lender)) {
           Object.keys(convertedData).forEach((market) => {
-            lenderData[market] = convertedData[market];
+            const filtered = filterEmptyUserData(convertedData[market]);
+            if (filtered) {
+              filtered.lender = market;
+              lenderData[market] = filtered;
+            }
           });
         } else {
-          lenderData[query2.lender] = convertedData;
+          const filtered = filterEmptyUserData(convertedData);
+          if (filtered) {
+            filtered.lender = query2.lender;
+            lenderData[query2.lender] = filtered;
+          }
         }
       }
     } catch (e) {
@@ -19695,140 +19839,277 @@ async function getLenderUserDataMulti(account, chainQueries, lenderState) {
   return returndata;
 }
 
-// src/lending/meta/index.ts
-var baseUrl = "https://raw.githubusercontent.com/1delta-DAO/lender-metadata/main";
-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";
-var compoundV2Reserves2 = baseUrl + "/data/compound-v2-reserves.json";
-var compoundV3Reserves2 = baseUrl + "/data/compound-v3-reserves.json";
-var initConfig2 = baseUrl + "/data/init-config.json";
-var aaveTokens2 = baseUrl + "/data/aave-tokens.json";
-var compoundV2CTokens = baseUrl + "/data/compound-v2-c-tokens.json";
-var compoundV2TokenArray2 = baseUrl + "/data/compound-v2-tokens.json";
-var compoundV3Base = baseUrl + "/data/compound-v3-base-data.json";
-var baseUrlChains = "https://raw.githubusercontent.com/1delta-DAO/chains/main";
-var chains = baseUrlChains + "/data.json";
-function inititalizeAllData(params) {
-  const { chainsOverride, ...lenderOverrides } = params;
-  initializeLenderData(lenderOverrides);
-  initializeChainData({ chainsOverride });
+// src/lending/user-data/summary/utils.ts
+function calculateWeightedAverage(items) {
+  const totalWeight = items.reduce((sum, item) => sum + item.weight, 0);
+  if (totalWeight === 0) return 0;
+  const weightedSum = items.reduce(
+    (sum, item) => sum + item.value * item.weight,
+    0
+  );
+  return weightedSum / totalWeight;
 }
-async function fetchLenderMetaFromDirAndInitialize() {
-  const {
-    aavePoolsOverride,
-    compoundV2PoolsOverride,
-    compoundV3PoolsOverride,
-    // initPoolsOverride,
-    morphoPoolsOverride,
-    aaveReservesOverride,
-    compoundV2ReservesOverride,
-    compoundV3ReservesOverride,
-    initConfigOverride,
-    aaveTokensOverride,
-    compoundV2TokensOverride,
-    compoundV2TokenArrayOverride,
-    compoundV3BaseDataOverride,
-    aaveOraclesOverride,
-    compoundV2OraclesOverride,
-    compoundV3OraclesOverride,
-    morphoTypeOraclesOverride,
-    morphoTypeMarketsOverride,
-    chainsOverride
-  } = await fetchLenderMetaFromDir();
-  initializeLenderData({
-    aaveTokensOverride,
-    aavePoolsOverride,
-    compoundV3PoolsOverride,
-    compoundV3BaseDataOverride,
-    morphoPoolsOverride,
-    compoundV2TokensOverride,
-    compoundV2TokenArrayOverride,
-    compoundV2PoolsOverride,
-    initConfigOverride,
-    aaveReservesOverride,
-    compoundV3ReservesOverride,
-    compoundV2ReservesOverride,
-    aaveOraclesOverride,
-    compoundV2OraclesOverride,
-    compoundV3OraclesOverride,
-    morphoTypeOraclesOverride,
-    morphoTypeMarketsOverride
-  });
-  initializeChainData({ chainsOverride });
+function calculateNetApr(aprData2, balanceData2) {
+  const deposits = balanceData2.deposits;
+  const debt = balanceData2.debt;
+  const nav = deposits - debt;
+  if (nav === 0) return 0;
+  const depositIncome = deposits * (aprData2.depositApr / 100);
+  const borrowCost = debt * (aprData2.borrowApr / 100);
+  const rewardIncome = deposits * (aprData2.rewardDepositApr / 100) + debt * (aprData2.rewardBorrowApr / 100);
+  const netIncome = depositIncome - borrowCost + rewardIncome;
+  return netIncome / nav * 100;
+}
+function calculateLeverage(deposits, netWorth) {
+  return netWorth > 0 ? deposits / netWorth : 0;
+}
+function calculateOverallNetApr(totalDepositsUSD, totalDebtUSD, avgDepositApr, avgBorrowApr) {
+  const totalNetWorth = totalDepositsUSD - totalDebtUSD;
+  if (totalNetWorth === 0) return 0;
+  return (totalDepositsUSD * avgDepositApr - totalDebtUSD * avgBorrowApr) / Math.abs(totalNetWorth) * (totalNetWorth > 0 ? 1 : -1);
+}
+
+// src/lending/user-data/summary/buildPortfolioTotals.ts
+function buildPortfolioTotals(userDataResult) {
+  let totalDepositsUSD = 0;
+  let totalDebtUSD = 0;
+  let totalRewardApr = 0;
+  let totalNav24h = 0;
+  let lenderCount = 0;
+  const aprItems = [];
+  const activeChains = /* @__PURE__ */ new Set();
+  for (const [chainId, lenders] of Object.entries(userDataResult)) {
+    activeChains.add(chainId);
+    for (const [, userData] of Object.entries(lenders)) {
+      lenderCount++;
+      let lenderDeposits = 0;
+      let lenderDebt = 0;
+      let lenderDepositAprSum = 0;
+      let lenderBorrowAprSum = 0;
+      let lenderDepositWeight = 0;
+      let lenderDebtWeight = 0;
+      for (const subAccount of userData.data) {
+        const { balanceData: balanceData2, aprData: aprData2 } = subAccount;
+        lenderDeposits += balanceData2.deposits;
+        lenderDebt += balanceData2.debt;
+        if (balanceData2.deposits > 0) {
+          lenderDepositAprSum += aprData2.depositApr * balanceData2.deposits;
+          lenderDepositWeight += balanceData2.deposits;
+        }
+        if (balanceData2.debt > 0) {
+          lenderBorrowAprSum += aprData2.borrowApr * balanceData2.debt;
+          lenderDebtWeight += balanceData2.debt;
+        }
+        totalNav24h += balanceData2.nav24h ?? 0;
+        totalRewardApr += aprData2.rewardApr + aprData2.rewardDepositApr + aprData2.rewardBorrowApr + aprData2.stakingApr;
+      }
+      totalDepositsUSD += lenderDeposits;
+      totalDebtUSD += lenderDebt;
+      if (lenderDepositWeight > 0) {
+        aprItems.push({
+          depositApr: lenderDepositAprSum / lenderDepositWeight,
+          borrowApr: lenderDebtWeight > 0 ? lenderBorrowAprSum / lenderDebtWeight : 0,
+          deposits: lenderDeposits,
+          debt: lenderDebt
+        });
+      }
+    }
+  }
+  const totalNetWorth = totalDepositsUSD - totalDebtUSD;
+  const totalDepositWeight = aprItems.reduce((sum, a) => sum + a.deposits, 0);
+  const avgDepositApr = totalDepositWeight > 0 ? aprItems.reduce((sum, a) => sum + a.depositApr * a.deposits, 0) / totalDepositWeight : 0;
+  const totalDebtWeight = aprItems.reduce((sum, a) => sum + a.debt, 0);
+  const avgBorrowApr = totalDebtWeight > 0 ? aprItems.filter((a) => a.debt > 0).reduce((sum, a) => sum + a.borrowApr * a.debt, 0) / totalDebtWeight : 0;
+  const avgNetApr = calculateOverallNetApr(
+    totalDepositsUSD,
+    totalDebtUSD,
+    avgDepositApr,
+    avgBorrowApr
+  );
+  const overallLeverage = calculateLeverage(totalDepositsUSD, totalNetWorth);
+  return {
+    totalDepositsUSD,
+    totalDebtUSD,
+    totalNetWorth,
+    totalNetWorth24h: totalNav24h,
+    avgDepositApr,
+    avgBorrowApr,
+    avgNetApr,
+    totalRewardApr,
+    overallLeverage,
+    activeLenders: lenderCount,
+    activeChains: activeChains.size
+  };
+}
+
+// src/lending/user-data/summary/buildSummaries.ts
+function aggregateLenderData(lender, userData) {
+  const { chainId, data } = userData;
+  let totalDepositsUSD = 0;
+  let totalDebtUSD = 0;
+  let totalCollateral = 0;
+  let totalNav24h = 0;
+  const subAccountSummaries = [];
+  const aprItems = [];
+  let totalRewardApr = 0;
+  let healthSum = 0;
+  let healthCount = 0;
+  for (const subAccount of data) {
+    const { balanceData: balanceData2, aprData: aprData2, positions, health, accountId, userConfig } = subAccount;
+    totalDepositsUSD += balanceData2.deposits;
+    totalDebtUSD += balanceData2.debt;
+    totalCollateral += balanceData2.collateral;
+    totalNav24h += balanceData2.nav24h ?? 0;
+    if (balanceData2.deposits > 0) {
+      aprItems.push({
+        depositApr: aprData2.depositApr,
+        borrowApr: aprData2.borrowApr,
+        weight: balanceData2.deposits
+      });
+    }
+    totalRewardApr += aprData2.rewardApr + aprData2.rewardDepositApr + aprData2.rewardBorrowApr + aprData2.stakingApr;
+    if (health !== null && health > 0) {
+      healthSum += health;
+      healthCount++;
+    }
+    subAccountSummaries.push({
+      accountId,
+      health,
+      balanceData: balanceData2,
+      aprData: aprData2,
+      userConfig,
+      positionCount: positions.length
+    });
+  }
+  const netWorth = totalDepositsUSD - totalDebtUSD;
+  const depositApr = calculateWeightedAverage(
+    aprItems.map((a) => ({ value: a.depositApr, weight: a.weight }))
+  );
+  const borrowApr = calculateWeightedAverage(
+    aprItems.map((a) => ({
+      value: a.borrowApr,
+      weight: a.weight * (a.borrowApr > 0 ? 1 : 0)
+    }))
+  );
+  const netApr = netWorth !== 0 ? (totalDepositsUSD * depositApr - totalDebtUSD * borrowApr) / netWorth * (netWorth > 0 ? 1 : -1) : 0;
+  const leverage = calculateLeverage(totalDepositsUSD, netWorth);
+  const healthFactor = healthCount > 0 ? healthSum / healthCount : totalDebtUSD > 0 ? null : null;
+  return {
+    lender,
+    chainId,
+    totalDepositsUSD,
+    totalDebtUSD,
+    netWorth,
+    netWorth24h: totalNav24h,
+    depositApr,
+    borrowApr,
+    netApr,
+    rewardApr: totalRewardApr,
+    healthFactor,
+    leverage,
+    collateral: totalCollateral,
+    subAccounts: subAccountSummaries
+  };
+}
+function buildSummaries(userDataResult) {
+  const lenderSummaries = [];
+  const chainMap = {};
+  let totalDepositsUSD = 0;
+  let totalDebtUSD = 0;
+  let totalRewardApr = 0;
+  let totalNav24h = 0;
+  const aprItems = [];
+  const activeChains = /* @__PURE__ */ new Set();
+  for (const [chainId, lenders] of Object.entries(userDataResult)) {
+    activeChains.add(chainId);
+    if (!chainMap[chainId]) {
+      chainMap[chainId] = {
+        chainId,
+        totalDepositsUSD: 0,
+        totalDebtUSD: 0,
+        netWorth: 0,
+        lenderCount: 0
+      };
+    }
+    for (const [lender, userData] of Object.entries(lenders)) {
+      const summary = aggregateLenderData(lender, userData);
+      lenderSummaries.push(summary);
+      totalDepositsUSD += summary.totalDepositsUSD;
+      totalDebtUSD += summary.totalDebtUSD;
+      totalRewardApr += summary.rewardApr;
+      totalNav24h += summary.netWorth24h;
+      if (summary.totalDepositsUSD > 0) {
+        aprItems.push({
+          depositApr: summary.depositApr,
+          borrowApr: summary.borrowApr,
+          deposits: summary.totalDepositsUSD,
+          debt: summary.totalDebtUSD
+        });
+      }
+      chainMap[chainId].totalDepositsUSD += summary.totalDepositsUSD;
+      chainMap[chainId].totalDebtUSD += summary.totalDebtUSD;
+      chainMap[chainId].lenderCount++;
+    }
+    chainMap[chainId].netWorth = chainMap[chainId].totalDepositsUSD - chainMap[chainId].totalDebtUSD;
+  }
+  const totalNetWorth = totalDepositsUSD - totalDebtUSD;
+  const avgDepositApr = calculateWeightedAverage(
+    aprItems.map((a) => ({ value: a.depositApr, weight: a.deposits }))
+  );
+  const avgBorrowApr = calculateWeightedAverage(
+    aprItems.filter((a) => a.debt > 0).map((a) => ({ value: a.borrowApr, weight: a.debt }))
+  );
+  const avgNetApr = calculateOverallNetApr(
+    totalDepositsUSD,
+    totalDebtUSD,
+    avgDepositApr,
+    avgBorrowApr
+  );
+  const overallLeverage = calculateLeverage(totalDepositsUSD, totalNetWorth);
+  lenderSummaries.sort((a, b) => b.netWorth - a.netWorth);
+  return {
+    totalDepositsUSD,
+    totalDebtUSD,
+    totalNetWorth,
+    totalNetWorth24h: totalNav24h,
+    avgDepositApr,
+    avgBorrowApr,
+    avgNetApr,
+    totalRewardApr,
+    overallLeverage,
+    activeLenders: lenderSummaries.length,
+    activeChains: activeChains.size,
+    lenders: lenderSummaries,
+    chains: Object.values(chainMap)
+  };
 }
-async function fetchLenderMetaFromDir() {
-  const promises = [
-    aavePools2,
-    compoundV2Pools2,
-    compoundV3Pools2,
-    // initPools,
-    morphoPools2,
-    aaveReserves2,
-    compoundV2Reserves2,
-    compoundV3Reserves2,
-    initConfig2,
-    aaveTokens2,
-    compoundV2CTokens,
-    compoundV2TokenArray2,
-    compoundV3Base,
-    aaveOracles2,
-    compoundV2Oracles2,
-    compoundV3Oracles2,
-    morphoTypeOracles2,
-    morphoTypeMarkets2,
-    chains
-  ].map(async (a) => fetch(a).then(async (b) => await b.json()));
-  const [
-    aavePoolsOverride,
-    compoundV2PoolsOverride,
-    compoundV3PoolsOverride,
-    // initPoolsOverride,
-    morphoPoolsOverride,
-    aaveReservesOverride,
-    compoundV2ReservesOverride,
-    compoundV3ReservesOverride,
-    initConfigOverride,
-    aaveTokensOverride,
-    compoundV2TokensOverride,
-    compoundV2TokenArrayOverride,
-    compoundV3BaseDataOverride,
-    aaveOraclesOverride,
-    compoundV2OraclesOverride,
-    compoundV3OraclesOverride,
-    morphoTypeOraclesOverride,
-    morphoTypeMarketsOverride,
-    chainsOverride
-  ] = await Promise.all(promises);
+function filterActiveLenders(summary) {
+  const activeLenders = summary.lenders.filter(
+    (l) => l.totalDepositsUSD > 0 || l.totalDebtUSD > 0
+  );
   return {
-    aavePoolsOverride,
-    compoundV2PoolsOverride,
-    compoundV3PoolsOverride,
-    // initPoolsOverride,
-    morphoPoolsOverride,
-    aaveReservesOverride,
-    compoundV2ReservesOverride,
-    compoundV3ReservesOverride,
-    initConfigOverride,
-    aaveTokensOverride,
-    compoundV2TokensOverride,
-    compoundV2TokenArrayOverride,
-    compoundV3BaseDataOverride,
-    aaveOraclesOverride,
-    compoundV2OraclesOverride,
-    compoundV3OraclesOverride,
-    morphoTypeOraclesOverride,
-    morphoTypeMarketsOverride,
-    chainsOverride
+    ...summary,
+    lenders: activeLenders,
+    activeLenders: activeLenders.length
   };
 }
+function fuseLenderData(userDataResult, summary) {
+  const entries = [];
+  for (const lenderSummary of summary.lenders) {
+    const { lender, chainId, subAccounts: _2, ...summaryFields } = lenderSummary;
+    const userData = userDataResult[chainId]?.[lender];
+    if (!userData) continue;
+    entries.push({
+      ...summaryFields,
+      lender,
+      chainId,
+      account: userData.account,
+      data: userData.data
+    });
+  }
+  entries.sort((a, b) => b.netWorth - a.netWorth);
+  return entries;
+}
 
 // src/assets/liquidityThresholds.ts
 var DEFAULT_LIQUIDITY_THRESHOLDS = {
@@ -20173,375 +20454,198 @@ function getDistinctPairsByShortAsset(pairs) {
   return result;
 }
 
-// src/prices/pendle/fetchPendlePrices.ts
-var PENDLE_API_BASE = "https://api-v2.pendle.finance/core";
-var MARKETS_ENDPOINT = `${PENDLE_API_BASE}/v1/markets/all`;
-var PRICES_ENDPOINT = (types) => `${PENDLE_API_BASE}/v1/prices/assets${types ? `?type=${types.join(",")}` : ""}`;
-async function fetchPendleMarkets() {
-  try {
-    const response = await fetch(MARKETS_ENDPOINT);
-    if (!response.ok) {
-      throw new Error(`Failed to fetch all markets data: ${response.status}`);
-    }
-    const data = await response.json();
-    const marketsByChain = {};
-    if (data.markets) {
-      for (const market of data.markets) {
-        const chainId = market.chainId.toString();
-        if (!marketsByChain[chainId]) {
-          marketsByChain[chainId] = [];
-        }
-        marketsByChain[chainId].push(market);
-      }
-    }
-    return marketsByChain;
-  } catch (error) {
-    console.error("Error fetching all markets data:", error);
-    return {};
-  }
+// src/yields/helpers.ts
+function averageDataLastN(arr, n = 7) {
+  const last = arr.slice(-n);
+  if (last.length === 0) return 0;
+  return last.reduce((sum, x) => sum + x.data, 0) / last.length;
 }
-async function fetchPendlePricesForAllChain(lists = {}, assetType = ["YT", "PT"]) {
+var safeFetch = async (label, fn) => {
   try {
-    const data = await fetchPendlePricesRaw(assetType);
-    let prices = {};
-    Object.entries(data).forEach(([key, val]) => {
-      const [chainId, address] = key.split("-");
-      const assetKey = lists[chainId]?.list?.[address.toLowerCase()]?.assetGroup ?? key;
-      prices[assetKey] = val;
-    });
-    return prices;
-  } catch (error) {
-    console.error(`Error fetching prices pendle prices:`, error);
-    return {};
+    return await fn();
+  } catch (e) {
+    console.error(`Error fetching ${label}:`, e);
+    return void 0;
   }
-}
-async function fetchPendlePricesRaw(assetType = ["YT", "PT"]) {
-  try {
-    const response = await fetch(PRICES_ENDPOINT(assetType));
-    const data = await response.json();
-    return data.prices;
-  } catch (error) {
-    console.error(`Error fetching prices pendle prices:`, error);
-    return {};
+};
+async function getListsMulti(chainIds) {
+  const lists = await fetchTokenLists(chainIds);
+  let res = {};
+  for (const chainId of chainIds) {
+    res[chainId] = { list: lists[chainId] };
   }
+  return res;
 }
-async function fetchPendlePrices(lists = {}, assetType = ["YT", "PT"]) {
-  try {
-    const marketsResponse = await fetchPendleMarkets();
-    if (!Object.keys(marketsResponse).length) {
-      return {};
-    }
-    const allPrices = await fetchPendlePricesForAllChain(lists, assetType);
-    return Object.fromEntries(
-      Object.entries(allPrices).filter(([, price]) => !!price)
-    );
-  } catch (error) {
-    console.error("Error in fetchPendlePrices:", error);
-    return {};
+
+// src/yields/fetchers/lido.ts
+var WSTETH_URL = "https://eth-api.lido.fi/v1/protocol/steth/apr/sma";
+var tETH = "Treehouse ETH::TETH";
+var wstethFetcher = {
+  label: "WSTETH",
+  fetch: async () => {
+    const res = await fetch(WSTETH_URL).then((r) => r.json());
+    const apr = Number(res.data.aprs.at(-1).apr) * 0.9;
+    return {
+      WSTETH: apr,
+      [tETH]: apr
+    };
   }
-}
-async function fetchPendleYields(lists = {}) {
-  try {
-    const marketsResponse = await fetchPendleMarkets();
-    if (!Object.keys(marketsResponse).length) {
-      return {};
-    }
-    const prices = await fetchPendlePricesRaw();
-    let yields = {};
-    const now = /* @__PURE__ */ new Date();
-    Object.entries(marketsResponse).forEach(([chain, dataArr]) => {
-      dataArr.forEach((market) => {
-        const ptPrice = prices[market.pt];
-        const ytPrice = prices[market.yt];
-        if (ytPrice && ytPrice > 0) {
-          const yearFraction = yearFractionToExpiry(market.expiry, now);
-          const apr = ytPrice / ptPrice * 100 / yearFraction;
-          const [chainId, address] = market.pt.split("-");
-          const assetKey = lists[chainId]?.list?.[address.toLowerCase()]?.assetGroup ?? market.pt;
-          yields[assetKey] = apr;
-        }
-      });
-    });
-    return yields;
-  } catch (error) {
-    console.error("Error in fetchPendlePrices:", error);
-    return {};
+};
+var stmaticFetcher = {
+  label: "STMATIC",
+  fetch: async () => {
+    return { STMATIC: 0 };
   }
-}
-function yearFractionToExpiry(expiryISO, now = /* @__PURE__ */ new Date()) {
-  const expiry = new Date(expiryISO);
-  const diffMs = expiry.getTime() - now.getTime();
-  const yearFraction = diffMs / (1e3 * 60 * 60 * 24 * 365.25);
-  return yearFraction;
-}
-
-// src/yields/yieldTypes.ts
-var addressToAssetYearn = {
-  "0xe007ca01894c863d7898045ed5a3b4abf0b18f37": "vbETH yVault::yvvbETH",
-  "0x80c34bd3a3569e126e7055831036aa7b212cb159": "vbUSDC yVault::yvvbUSDC",
-  "0x9a6bd7b6fd5c4f87eb66356441502fc7dcdd185b": "vbUSDT yVault::yvvbUSDT",
-  "0xaa0362ecc584b985056e47812931270b99c91f9d": "vbWBTC yVault::yvvbWBTC",
-  "0x93fec6639717b6215a48e5a72a162c50dcc40d68": "vbAUSD yVault::yvvbAUSD"
 };
 
-// src/yields/index.ts
-var hyUSD = "High Yield USD Base::HYUSD";
-var bsdETH = "Based ETH::BSDETH";
-var wstHype = "Staked HYPE Shares::WSTHYPE";
-var kHYPE = "Kinetiq Staked HYPE::kHYPE";
-var tETH = "Treehouse ETH::TETH";
-var osETH = "StakeWise Staked ETH::OSETH";
-var ethX = "Stader ETHx::ETHx";
-var pufEth = "PUFETH";
-var stUSD = "Angle Staked USDA::stUSD";
-var stEur = "Angle Staked EURA::stEUR";
-var sUsds = "sUSDS::SUSDS";
-var srUsd = "Reservoir srUSD::SRUSD";
-var wsrusd = "Wrapped Savings rUSD::WSRUSD";
-var yusd = "YieldFi yUSD::yUSD";
-var rlp = "Resolv RLP::RLP";
-var wstusr = "Resolv wstUSR::WSTUSR";
-var ethPlus = "ETHPlus::ETH+";
-var woEth = "Wrapped OETH::WOETH";
-var csusdl = "Coinshift USDL Morpho Vault::CSUSDL";
-var sfrxeth = "Staked Frax Ether::sfrxETH";
-var ceth = "cETH::CETH";
-var sfrax = "Staked FRAX::SFRAX";
-var rsweth = "Restaked Swell ETH::RSWETH";
-var ynethx = "ynETH MAX::YNETHX";
-var usdZeroPlus = "Staked USD0::USD0++";
-var ethZero = "ETH0::ETH0";
-var usdThree = "Web 3 Dollar::USD3";
-var jitoSol = "Jito Staked SOL::JitoSOL";
-var thBill = "Theo Short Duration US Treasury Fund::THBILL";
-var ssuperusd = "SuperReturn sSuperUSD::SSUPERUSD";
-var hbhype = "hyperbeat x ether.fi HYPE::beHYPE";
-var hbuhype = "Hyperbeat Ultra Hype::hbHYPE";
-var hlp = "Wrapped HLP::WHLP";
-var yoeth = "Yield Optimizer ETH::YOETH";
-var yobtc = "Yield Optimizer BTC::YOBTC";
-var yousd = "Yield Optimizer USD::YOUSD";
-var yoeur = "Yield Optimizer EUR::yoEUR";
-var hwhlp = "Hyperwave HLP::hwHLP";
-var weeths = "Super Symbiotic LRT::weETHs";
-var gmx_eth_usd = "GMX Market ETH/USD::GM [WETH-USDC]";
-var gmx_btc_usd = "GMX Market BTC/USD::GM [WBTC-USDC]";
-var glv_wbtc_usdc = "GMX Liquidity Vault [WBTC-USDC]::GLV [WBTC-USDC]";
-var glv_weth_usdc = "GMX Liquidity Vault [WETH-USDC]::GLV [WETH-USDC]";
-var gmx_eth_usd_address = "0x70d95587d40a2caf56bd97485ab3eec10bee6336";
-var gmx_btc_usd_address = "0x47c031236e19d024b42f8ae6780e44a573170703";
-var glv_wbtc_usdc_address = "0xdf03eed325b82bc1d4db8b49c30ecc9e05104b96";
-var glv_weth_usdc_address = "0x528a5bac7e746c9a509a1f4f6df58a03d44279f9";
-var susdx = "SUSDX";
-var FeedData = {
-  WSTETH: "https://eth-api.lido.fi/v1/protocol/steth/apr/sma",
-  STMATIC: "https://polygon.lido.fi/api/stats",
-  CBETH: "https://api.exchange.coinbase.com/wrapped-assets/cbeth",
-  MATICX: "https://universe.staderlabs.com/polygon/apy",
-  METH: "https://meth.mantle.xyz/api/stats/apy",
-  SUSDE: "https://yields.llama.fi/poolsEnriched?pool=66985a81-9c51-46ca-9977-42b4fe7bc6df",
-  EZETH: "https://app.renzoprotocol.com/api/stats?chainId=1",
-  RETH: "https://api.rocketpool.net/api/mainnet/payload",
-  WEETH: "https://www.ether.fi/api/apr",
-  WEETHS: "https://api.sevenseas.capital/etherfi/ethereum/performance/0x917ceE801a67f933F2e6b33fC0cD1ED2d5909D88",
-  SAVAX: "https://api.benqi.fi/liquidstaking/apr",
-  RSETH: "https://universe.kelpdao.xyz/rseth/totalApy",
-  TRUMATIC: "https://api.trufin.io/staker/apy?staker=MATIC",
-  RTOKENS: "https://yields.reserve.org/pools",
-  HYPE: "https://api.hyperlend.finance/data/nativeApy",
-  ETHX: "https://universe.staderlabs.com/eth/apy",
-  OSETH: "https://graphs.stakewise.io/mainnet-a/subgraphs/name/stakewise/prod?opName=osTokenApy",
-  PUFETH: "https://api-v2.puffer.fi/backend-for-frontend/tvl/all",
-  ANGLE: "https://exporter.angle.money/v2/savingsApr",
-  SUSDS: "https://info-sky.blockanalitica.com/api/v1/overall/?format=json",
-  SRUSD: "https://app.reservoir.xyz/api/website",
-  YUSD: "https://ctrl.yield.fi/t/yusd/apy",
-  RLP: "https://api.resolv.xyz/apr/rlp/7d",
-  WSTUSR: "https://api.resolv.xyz/apr/staking/7d",
-  MORPHO_VAULTS: "https://blue-api.morpho.org/graphql",
-  // SDEUSD: 'https://api-deusd-prod-public.elixir.xyz/public/deusd_apy',
-  RSWETH: "https://v3-lst.svc.swellnetwork.io/api/tokens/sweth/apr",
-  YNETHX: "https://gateway.yieldnest.finance/api/v1/graphql",
-  USDZEROPLUS: "https://app.usual.money/api/rewards/rates/USD0++",
-  ETHZERO: "https://app.usual.money/api/rewards/rates/ETH0",
-  JITOSOL: "https://www.jito.network/api/getJitoPoolStats/",
-  THBILL: "https://thbill-api.theo.xyz/snapshots",
-  YEARN_KATANA: "https://katana-apr-service.vercel.app/api/vaults",
-  SSUPERUSD: "https://www.superreturn.ai/api/trpc/cmc.getUSDCPrice,rewardBackend.getYield,rewardBackend.getTvlChange?batch=1&input=%7B%220%22%3A%7B%22json%22%3Anull%2C%22meta%22%3A%7B%22values%22%3A%5B%22undefined%22%5D%7D%7D%2C%221%22%3A%7B%22json%22%3Anull%2C%22meta%22%3A%7B%22values%22%3A%5B%22undefined%22%5D%7D%7D%2C%222%22%3A%7B%22json%22%3Anull%2C%22meta%22%3A%7B%22values%22%3A%5B%22undefined%22%5D%7D%7D%7D",
-  HBHYPE: "https://api.hyperbeat.org/api/v1/staking?address=0xCeaD893b162D38e714D82d06a7fe0b0dc3c38E0b",
-  HBUHYPE: "https://app.hyperbeat.org/api/hyperfolio/vault-infos?vaultAddress=0x96C6cBB6251Ee1c257b2162ca0f39AA5Fa44B1FB",
-  HLP: "https://api-ui.hyperliquid.xyz/info",
-  HWHLP: "https://api.hyperwavefi.xyz/stats/latest?asset=hwhlp_999",
-  YO: "https://api.yo.xyz/api/v1/vault/stats",
-  GMX: "https://arbitrum-api.gmxinfra.io/apy?period=1d",
-  SUSDX: "https://app.usdx.money/v1/base/apyInfo"
-};
-function averageDataLastN(arr, n = 7) {
-  const last = arr.slice(-n);
-  if (last.length === 0) return 0;
-  return last.reduce((sum, x) => sum + x.data, 0) / last.length;
-}
-var getListUrl = (chainId) => `https://raw.githubusercontent.com/1delta-DAO/token-lists/main/${chainId}.json`;
-async function getDeltaTokenList(chain) {
-  const data = await fetch(getListUrl(chain));
-  const list = (await data.json()).list;
-  return list;
-}
-async function getListsMulti(chainIds) {
-  const ps = chainIds.map(async (chainId) => await getDeltaTokenList(chainId));
-  const lists = await Promise.all(ps);
-  let res = {};
-  for (let i = 0; i < chainIds.length; i++) {
-    const chainId = chainIds[i];
-    res[chainId] = { list: lists[i] };
+// src/yields/fetchers/renzo.ts
+var EZETH_URL = "https://app.renzoprotocol.com/api/stats?chainId=1";
+var ezethFetcher = {
+  label: "EZETH",
+  fetch: async () => {
+    const res = await fetch(EZETH_URL).then((r) => r.json());
+    return { EZETH: Number(res.data.apr.data.rate) };
   }
-  return res;
-}
-var safeFetch = async (label, fn) => {
-  try {
-    return await fn();
-  } catch (e) {
-    console.error(`Error fetching ${label}:`, e);
-    return void 0;
+};
+
+// src/yields/fetchers/rocketpool.ts
+var RETH_URL = "https://api.rocketpool.net/api/mainnet/payload";
+var rethFetcher = {
+  label: "RETH",
+  fetch: async () => {
+    const res = await fetch(RETH_URL).then((r) => r.json());
+    return { RETH: Number(res.rethAPR) };
   }
 };
-var fetchGeneralYields = async () => {
-  const wstethPromise = safeFetch("WSTETH", async () => {
-    const res = await fetch(FeedData.WSTETH).then((r) => r.json());
-    return Number(res.data.aprs.at(-1).apr) * 0.9;
-  });
-  const ezethPromise = safeFetch("EZETH", async () => {
-    const res = await fetch(FeedData.EZETH).then((r) => r.json());
-    return Number(res.data.apr.data.rate);
-  });
-  const rethPromise = safeFetch("RETH", async () => {
-    const res = await fetch(FeedData.RETH).then((r) => r.json());
-    return Number(res.rethAPR);
-  });
-  const weethPromise = safeFetch("WEETH", async () => {
+
+// src/yields/fetchers/etherfi.ts
+var WEETH_URL = "https://www.ether.fi/api/apr";
+var WEETHS_URL = "https://api.sevenseas.capital/etherfi/ethereum/performance/0x917ceE801a67f933F2e6b33fC0cD1ED2d5909D88";
+var weeths = "Super Symbiotic LRT::weETHs";
+var createWeethFetcher = (wstethPromise) => ({
+  label: "WEETH",
+  fetch: async () => {
     const wstethRes = await wstethPromise;
+    const wstethVal = wstethRes?.WSTETH ?? 0;
     let aYield = 0;
     try {
-      const weethRes = await fetch(FeedData.WEETH).then((r) => r.json());
+      const weethRes = await fetch(WEETH_URL).then((r) => r.json());
       aYield = Number(weethRes.lrt2Apr);
     } catch (e) {
       aYield = 0.5;
     }
-    return aYield + (wstethRes ?? 0);
-  });
-  const stmaticPromise = safeFetch("STMATIC", async () => {
-    return 0;
-  });
-  const savaxPromise = safeFetch("SAVAX", async () => {
-    const res = await fetch(FeedData.SAVAX).then((r) => r.json());
-    return Number(res.apr) * 100;
-  });
-  const weethsPromise = safeFetch("WEETHS", async () => {
-    const res = await fetch(FeedData.WEETHS).then((r) => r.json());
-    return apyToApr(res.Response.apy) * 100;
-  });
-  const methPromise = safeFetch("METH", async () => {
-    const res = await fetch(FeedData.METH).then((r) => r.json());
-    return apyToApr(Number(res.data[0]?.OneDayAPY)) * 100;
-  });
-  const maticxPromise = safeFetch("MATICX", async () => {
-    const res = await fetch(FeedData.MATICX).then((r) => r.json());
-    return Number(res.value) * 0.9;
-  });
-  const susdePromise = safeFetch("SUSDE", async () => {
-    try {
-      const res = await fetch(FeedData.SUSDE).then((r) => r.json());
-      return apyToAprPercent(res?.data[0]?.apy ?? 0);
-    } catch (e) {
-      return 0;
-    }
-  });
-  const hbhypePromise = safeFetch("HBHYPE", async () => {
-    try {
-      const response = await fetch(FeedData.HBHYPE);
-      if (!response.ok) {
-        throw new Error(`HTTP error! Status: ${response.status}`);
-      }
-      const result = await response.json();
-      if (!result.success || !result.data || !Array.isArray(result.data.delegations)) {
-        throw new Error("Invalid response structure");
-      }
-      const delegations = result.data.delegations;
-      const totalApr = delegations.reduce(
-        (sum, validator) => sum + Number(validator.apr ?? 0),
-        0
-      );
-      const averageApr = totalApr / delegations.length;
-      return averageApr;
-    } catch (e) {
-      return 0;
-    }
-  });
-  const hbuhypePromise = safeFetch("HBUHYPE", async () => {
+    return { WEETH: aYield + wstethVal };
+  }
+});
+var weethsFetcher = {
+  label: "WEETHS",
+  fetch: async () => {
+    const res = await fetch(WEETHS_URL).then((r) => r.json());
+    return { [weeths]: apyToApr(res.Response.apy) * 100 };
+  }
+};
+
+// src/yields/fetchers/mantle.ts
+var METH_URL = "https://meth.mantle.xyz/api/stats/apy";
+var methFetcher = {
+  label: "METH",
+  fetch: async () => {
+    const res = await fetch(METH_URL).then((r) => r.json());
+    const apr = apyToApr(Number(res.data[0]?.OneDayAPY)) * 100;
+    return { METH: apr, CMETH: apr };
+  }
+};
+
+// src/yields/fetchers/ethena.ts
+var SUSDE_URL = "https://yields.llama.fi/poolsEnriched?pool=66985a81-9c51-46ca-9977-42b4fe7bc6df";
+var susdeFetcher = {
+  label: "SUSDE",
+  fetch: async () => {
     try {
-      const response = await fetch(FeedData.HBUHYPE);
-      if (!response.ok) {
-        throw new Error(`HTTP error! Status: ${response.status}`);
-      }
-      const result = await response.json();
-      const apy = result.currentAPY?.apy_1d ?? 0;
-      return apyToAprPercent(apy);
+      const res = await fetch(SUSDE_URL).then((r) => r.json());
+      return { SUSDE: apyToAprPercent(res?.data[0]?.apy ?? 0) };
     } catch (e) {
-      return 0;
+      return { SUSDE: 0 };
     }
-  });
-  const ssuperusdPromise = safeFetch("SSUPERUSD", async () => {
+  }
+};
+
+// src/yields/fetchers/stader.ts
+var MATICX_URL = "https://universe.staderlabs.com/polygon/apy";
+var ETHX_URL = "https://universe.staderlabs.com/eth/apy";
+var ethX = "Stader ETHx::ETHx";
+var maticxFetcher = {
+  label: "MATICX",
+  fetch: async () => {
+    const res = await fetch(MATICX_URL).then((r) => r.json());
+    return { MATICX: Number(res.value) * 0.9 };
+  }
+};
+var ethxFetcher = {
+  label: "ETHX",
+  fetch: async () => {
+    const res = await fetch(ETHX_URL).then((r) => r.json());
+    return { [ethX]: apyToAprPercent(res.value) };
+  }
+};
+
+// src/yields/fetchers/savax.ts
+var SAVAX_URL = "https://api.benqi.fi/liquidstaking/apr";
+var savaxFetcher = {
+  label: "SAVAX",
+  fetch: async () => {
+    const res = await fetch(SAVAX_URL).then((r) => r.json());
+    return { SAVAX: Number(res.apr) * 100 };
+  }
+};
+
+// src/yields/fetchers/coinbase.ts
+var CBETH_URL = "https://api.exchange.coinbase.com/wrapped-assets/cbeth";
+var cbethFetcher = {
+  label: "CBETH",
+  fetch: async () => {
     try {
-      const res = await fetch(FeedData.SSUPERUSD, {
-        method: "GET",
-        headers: { Accept: "application/json", "User-Agent": "1delta/yields" }
+      const res = await fetch(CBETH_URL, {
+        headers: {
+          "User-Agent": "1delta/yields",
+          "Content-Type": "application/json"
+        }
       }).then((r) => r.json());
-      return apyToAprPercent(res?.[1]?.result.data.json ?? 0);
+      return { CBETH: apyToAprPercent(res.apy) * 100 };
     } catch (e) {
-      return 0;
+      console.log("CBETH failed", e);
+      return { CBETH: 0 };
     }
-  });
-  const rsethPromise = safeFetch("RSETH", async () => {
-    const res = await fetch(FeedData.RSETH).then((r) => r.json());
-    return apyToAprPercent(res.totalAPY);
-  });
-  const susdxPromise = safeFetch("SUSDX", async () => {
-    const res = await fetch(FeedData.SUSDX).then((r) => r.json());
-    return apyToApr(res.result.susdxApy) * 100;
-  });
-  const trumaticPromise = safeFetch("TRUMATIC", async () => {
-    const res = await fetch(FeedData.TRUMATIC).then((r) => r.json());
-    return apyToAprPercent(res.apy);
-  });
-  const thbillPromise = safeFetch("THBILL", async () => {
-    const res = await fetch(FeedData.THBILL).then((r) => r.json());
-    const entrs = Object.values(res.history[0]?.composition ?? {}).flatMap(
-      (a) => Object.entries(a)
-    );
-    const total = entrs.reduce((acc, b) => acc + Number(b[1]), 0);
-    const val = entrs.filter((a) => a[0] === "ULTRA").reduce((acc, b) => acc + Number(b[1]), 0);
-    return val / total * 4.5;
-  });
-  const ethxPromise = safeFetch("ETHX", async () => {
-    const res = await fetch(FeedData.ETHX).then((r) => r.json());
-    return apyToAprPercent(res.value);
-  });
-  const yearnKatanaPromise = safeFetch("YEARN_KATANA", async () => {
-    const res = await fetch(
-      FeedData.YEARN_KATANA
-    ).then((r) => r.json());
-    let map = {};
-    Object.entries(res).forEach(([addr, data2]) => {
-      const key = addressToAssetYearn[addr.toLowerCase()];
-      if (key) {
-        const apr = ((data2.apr.netAPR ?? 0) + (data2.apr.extra.extrinsicYield ?? 0) + (data2.apr.extra.katanaNativeYield ?? 0)) * 100;
-        map[key] = apr;
-      }
-    });
-    return map;
-  });
-  const osEthPromise = safeFetch("OSETH", async () => {
-    const res = await fetch(FeedData.OSETH, {
+  }
+};
+
+// src/yields/fetchers/kelp.ts
+var RSETH_URL = "https://universe.kelpdao.xyz/rseth/totalApy";
+var rsethFetcher = {
+  label: "RSETH",
+  fetch: async () => {
+    const res = await fetch(RSETH_URL).then((r) => r.json());
+    return { RSETH: apyToAprPercent(res.totalAPY) };
+  }
+};
+
+// src/yields/fetchers/trufin.ts
+var TRUMATIC_URL = "https://api.trufin.io/staker/apy?staker=MATIC";
+var trumaticFetcher = {
+  label: "TRUMATIC",
+  fetch: async () => {
+    const res = await fetch(TRUMATIC_URL).then((r) => r.json());
+    return { TRUMATIC: apyToAprPercent(res.apy) };
+  }
+};
+
+// src/yields/fetchers/stakewise.ts
+var OSETH_URL = "https://graphs.stakewise.io/mainnet-a/subgraphs/name/stakewise/prod?opName=osTokenApy";
+var osETH = "StakeWise Staked ETH::OSETH";
+var osethFetcher = {
+  label: "OSETH",
+  fetch: async () => {
+    const res = await fetch(OSETH_URL, {
       method: "POST",
       headers: { Accept: "application/json" },
       body: JSON.stringify({
@@ -20549,10 +20653,17 @@ var fetchGeneralYields = async () => {
         operationName: "osTokenApy"
       })
     }).then((r) => r.json());
-    return apyToAprPercent(res.data?.osTokens?.[0]?.apy);
-  });
-  const ynethxPromise = safeFetch("YNETHX", async () => {
-    const res = await fetch(FeedData.YNETHX, {
+    return { [osETH]: apyToAprPercent(res.data?.osTokens?.[0]?.apy) };
+  }
+};
+
+// src/yields/fetchers/yieldnest.ts
+var YNETHX_URL = "https://gateway.yieldnest.finance/api/v1/graphql";
+var ynethx = "ynETH MAX::YNETHX";
+var ynethxFetcher = {
+  label: "YNETHX",
+  fetch: async () => {
+    const res = await fetch(YNETHX_URL, {
       method: "POST",
       headers: {
         Accept: "application/json",
@@ -20567,374 +20678,672 @@ var fetchGeneralYields = async () => {
       })
     }).then((r) => r.json());
     const dat = res?.data?.getLRTsData?.tokens.find((x) => x.token === "ynETHx")?.blockchains?.find((b) => b.chainId === 1)?.apr?.apr31d;
-    return Number(dat ?? 0);
-  });
-  const pufEthPromise = safeFetch("PUFETH", async () => {
-    const res = await fetch(FeedData.PUFETH, {
-      method: "GET",
-      headers: { Accept: "application/json" }
-    }).then((r) => r.json());
-    return apyToAprPercent(res.apy);
-  });
-  const usdZeroPlusPromise = safeFetch("USDZEROPLUS", async () => {
-    const res = await fetch(FeedData.USDZEROPLUS, {
+    return { [ynethx]: Number(dat ?? 0) };
+  }
+};
+
+// src/yields/fetchers/puffer.ts
+var PUFETH_URL = "https://api-v2.puffer.fi/backend-for-frontend/tvl/all";
+var pufEth = "PUFETH";
+var pufethFetcher = {
+  label: "PUFETH",
+  fetch: async () => {
+    const res = await fetch(PUFETH_URL, {
       method: "GET",
       headers: { Accept: "application/json" }
     }).then((r) => r.json());
-    return Number(res?.rewards[0]?.apr ?? 0) * 100;
-  });
-  const jitoSolPromise = safeFetch("JITOSOL", async () => {
-    const res = await fetch(FeedData.JITOSOL, {
-      method: "GET",
-      headers: { Accept: "application/json", "User-Agent": "1delta/yields" }
-    }).then((r) => r.json());
-    const val = averageDataLastN(res?.getStakePoolStats?.apy, 7);
-    return apyToApr(val) * 100;
-  });
-  const ethZeroPromise = safeFetch("ETHZERO", async () => {
-    const res = await fetch(FeedData.ETHZERO, {
+    return { [pufEth]: apyToAprPercent(res.apy) };
+  }
+};
+
+// src/yields/fetchers/sky.ts
+var SUSDS_URL = "https://info-sky.blockanalitica.com/api/v1/overall/?format=json";
+var sUsds = "sUSDS::SUSDS";
+var susdsFetcher = {
+  label: "SUSDS",
+  fetch: async () => {
+    const res = await fetch(SUSDS_URL, {
       method: "GET",
       headers: { Accept: "application/json" }
     }).then((r) => r.json());
-    return Number(res?.rewards[0]?.apr ?? 0) * 100;
-  });
-  const yoPromise = safeFetch("YO", async () => {
-    const res = await fetch(FeedData.YO, {
+    return {
+      [sUsds]: apyToApr(Number(res?.[0]?.sky_savings_rate_apy ?? 0)) * 100
+    };
+  }
+};
+
+// src/yields/fetchers/reservoir.ts
+var SRUSD_URL = "https://app.reservoir.xyz/api/website";
+var srUsd = "Reservoir srUSD::SRUSD";
+var wsrusd = "Wrapped Savings rUSD::WSRUSD";
+var srusdFetcher = {
+  label: "SRUSD",
+  fetch: async () => {
+    const res = await fetch(SRUSD_URL, {
       method: "GET",
       headers: { Accept: "application/json" }
     }).then((r) => r.json());
-    const datas = res?.data;
-    const yoETH = datas.find((a) => a.id === "yoETH").yield?.["1d"];
-    const yoBTC = datas.find((a) => a.id === "yoBTC").yield?.["1d"];
-    const yoUSD = datas.find((a) => a.id === "yoUSD").yield?.["1d"];
-    const yoEUR = datas.find((a) => a.id === "yoEUR").yield?.["1d"];
+    const apr = apyToAprPercent(Number(res?.srusdApy ?? 0));
     return {
-      [yoeth]: apyToAprPercent(yoETH),
-      [yobtc]: apyToAprPercent(yoBTC),
-      [yousd]: apyToAprPercent(yoUSD),
-      [yoeur]: apyToAprPercent(yoEUR)
+      [srUsd]: apr,
+      [wsrusd]: apr
     };
-  });
-  const gmxPromise = safeFetch("GMX", async () => {
-    const res = await fetch(FeedData.GMX, {
+  }
+};
+
+// src/yields/fetchers/yieldfi.ts
+var YUSD_URL = "https://ctrl.yield.fi/t/yusd/apy";
+var yusd = "YieldFi yUSD::yUSD";
+var yusdFetcher = {
+  label: "YUSD",
+  fetch: async () => {
+    const res = await fetch(YUSD_URL, {
       method: "GET",
       headers: { Accept: "application/json" }
     }).then((r) => r.json());
-    let rData = {};
-    const markets = res.markets;
-    Object.entries(markets).forEach(([m, d]) => {
-      if (m.toLowerCase() === gmx_eth_usd_address)
-        rData[gmx_eth_usd] = apyToApr(d.apy) * 100;
-      if (m.toLowerCase() === gmx_btc_usd_address)
-        rData[gmx_btc_usd] = apyToApr(d.apy) * 100;
-    });
-    const glvs = res.glvs;
-    Object.entries(glvs).forEach(([m, d]) => {
-      if (m.toLowerCase() === glv_wbtc_usdc_address)
-        rData[glv_wbtc_usdc] = apyToApr(d.apy) * 100;
-      if (m.toLowerCase() === glv_weth_usdc_address)
-        rData[glv_weth_usdc] = apyToApr(d.apy) * 100;
-    });
-    return rData;
-  });
-  const susdsPromise = safeFetch("SUSDS", async () => {
-    const res = await fetch(FeedData.SUSDS, {
-      method: "GET",
-      headers: { Accept: "application/json" }
-    }).then((r) => r.json());
-    return apyToApr(Number(res?.[0]?.sky_savings_rate_apy ?? 0)) * 100;
-  });
-  const srusdPromise = safeFetch("SRUSD", async () => {
-    const res = await fetch(FeedData.SRUSD, {
-      method: "GET",
-      headers: { Accept: "application/json" }
-    }).then((r) => r.json());
-    return apyToAprPercent(Number(res?.srusdApy ?? 0));
-  });
-  const yusdPromise = safeFetch("YUSD", async () => {
-    const res = await fetch(FeedData.YUSD, {
-      method: "GET",
-      headers: { Accept: "application/json" }
-    }).then((r) => r.json());
-    return apyToAprPercent(Number(res?.apy ?? 0));
-  });
-  const rlpPromise = safeFetch("RLP", async () => {
-    const res = await fetch(FeedData.RLP, {
+    return { [yusd]: apyToAprPercent(Number(res?.apy ?? 0)) };
+  }
+};
+
+// src/yields/fetchers/resolv.ts
+var RLP_URL = "https://api.resolv.xyz/apr/rlp/7d";
+var WSTUSR_URL = "https://api.resolv.xyz/apr/staking/7d";
+var rlp = "Resolv RLP::RLP";
+var wstusr = "Resolv wstUSR::WSTUSR";
+var rlpFetcher = {
+  label: "RLP",
+  fetch: async () => {
+    const res = await fetch(RLP_URL, {
       method: "GET",
       headers: {
         Accept: "application/json",
         "User-Agent": "1delta/yields"
       }
     }).then((r) => r.json());
-    return Number(res?.value ?? 0) * 100;
-  });
-  const wstusrPromise = safeFetch("WSTUSR", async () => {
-    const res = await fetch(FeedData.WSTUSR, {
+    return { [rlp]: Number(res?.value ?? 0) * 100 };
+  }
+};
+var wstusrFetcher = {
+  label: "WSTUSR",
+  fetch: async () => {
+    const res = await fetch(WSTUSR_URL, {
       method: "GET",
       headers: {
         Accept: "application/json",
         "User-Agent": "1delta/yields"
       }
     }).then((r) => r.json());
-    return Number(res?.value ?? 0) * 100;
-  });
-  const rswethPromise = safeFetch("RSWETH", async () => {
-    const res = await fetch(FeedData.RSWETH, {
+    return { [wstusr]: Number(res?.value ?? 0) * 100 };
+  }
+};
+
+// src/yields/fetchers/morphoVaults.ts
+var MORPHO_VAULTS_URL = "https://blue-api.morpho.org/graphql";
+var csusdl = "Coinshift USDL Morpho Vault::CSUSDL";
+var csusdlFetcher = {
+  label: "CSUSDL",
+  fetch: async () => {
+    const res = await fetch(MORPHO_VAULTS_URL, {
+      method: "POST",
+      headers: { Accept: "application/json" },
+      body: JSON.stringify({
+        query: "query GetAllCurrentAPYFromVault($address: String!) {\n  vaultByAddress(address: $address) {\n    state {\n      apy\n      netApy\n    }\n    asset {\n      yield {\n        apr\n      }\n    }\n  }\n}",
+        variables: {
+          address: "0xbEeFc011e94f43b8B7b455eBaB290C7Ab4E216f1"
+        }
+      })
+    }).then((r) => r.json());
+    const vba = res?.data?.vaultByAddress;
+    return {
+      [csusdl]: apyToAprPercent(vba.state.apy ?? 0) * 100 + (vba?.asset?.yield.apr ?? 0) * 100
+    };
+  }
+};
+
+// src/yields/fetchers/swell.ts
+var RSWETH_URL = "https://v3-lst.svc.swellnetwork.io/api/tokens/sweth/apr";
+var rsweth = "Restaked Swell ETH::RSWETH";
+var rswethFetcher = {
+  label: "RSWETH",
+  fetch: async () => {
+    const res = await fetch(RSWETH_URL, {
       method: "GET",
       headers: { Accept: "application/json", "User-Agent": "1delta/yields" }
     }).then((r) => r.text());
-    return Number(res) ?? 0;
-  });
-  const hwhlpPromise = safeFetch("HWHLP", async () => {
-    const res = await fetch(FeedData.HWHLP, {
+    return { [rsweth]: Number(res) ?? 0 };
+  }
+};
+
+// src/yields/fetchers/usual.ts
+var USDZEROPLUS_URL = "https://app.usual.money/api/rewards/rates/USD0++";
+var ETHZERO_URL = "https://app.usual.money/api/rewards/rates/ETH0";
+var usdZeroPlus = "Staked USD0::USD0++";
+var ethZero = "ETH0::ETH0";
+var usdZeroPlusFetcher = {
+  label: "USDZEROPLUS",
+  fetch: async () => {
+    const res = await fetch(USDZEROPLUS_URL, {
       method: "GET",
       headers: { Accept: "application/json" }
     }).then((r) => r.json());
-    return Number(res.data?.apr_1d ?? 0);
-  });
-  const csusdlPromise = safeFetch("CSUSDL", async () => {
-    const res = await fetch(FeedData.MORPHO_VAULTS, {
+    return { [usdZeroPlus]: Number(res?.rewards[0]?.apr ?? 0) * 100 };
+  }
+};
+var ethZeroFetcher = {
+  label: "ETHZERO",
+  fetch: async () => {
+    const res = await fetch(ETHZERO_URL, {
+      method: "GET",
+      headers: { Accept: "application/json" }
+    }).then((r) => r.json());
+    return { [ethZero]: Number(res?.rewards[0]?.apr ?? 0) * 100 };
+  }
+};
+
+// src/yields/fetchers/jito.ts
+var JITOSOL_URL = "https://www.jito.network/api/getJitoPoolStats/";
+var jitoSol = "Jito Staked SOL::JitoSOL";
+var jitoSolFetcher = {
+  label: "JITOSOL",
+  fetch: async () => {
+    const res = await fetch(JITOSOL_URL, {
+      method: "GET",
+      headers: { Accept: "application/json", "User-Agent": "1delta/yields" }
+    }).then((r) => r.json());
+    const val = averageDataLastN(res?.getStakePoolStats?.apy, 7);
+    return { [jitoSol]: apyToApr(val) * 100 };
+  }
+};
+
+// src/yields/fetchers/theo.ts
+var THBILL_URL = "https://thbill-api.theo.xyz/snapshots";
+var thBill = "Theo Short Duration US Treasury Fund::THBILL";
+var thbillFetcher = {
+  label: "THBILL",
+  fetch: async () => {
+    const res = await fetch(THBILL_URL).then((r) => r.json());
+    const entrs = Object.values(res.history[0]?.composition ?? {}).flatMap(
+      (a) => Object.entries(a)
+    );
+    const total = entrs.reduce((acc, b) => acc + Number(b[1]), 0);
+    const val = entrs.filter((a) => a[0] === "ULTRA").reduce((acc, b) => acc + Number(b[1]), 0);
+    return { [thBill]: val / total * 4.5 };
+  }
+};
+
+// src/yields/fetchers/superreturn.ts
+var SSUPERUSD_URL = "https://www.superreturn.ai/api/trpc/cmc.getUSDCPrice,rewardBackend.getYield,rewardBackend.getTvlChange?batch=1&input=%7B%220%22%3A%7B%22json%22%3Anull%2C%22meta%22%3A%7B%22values%22%3A%5B%22undefined%22%5D%7D%7D%2C%221%22%3A%7B%22json%22%3Anull%2C%22meta%22%3A%7B%22values%22%3A%5B%22undefined%22%5D%7D%7D%2C%222%22%3A%7B%22json%22%3Anull%2C%22meta%22%3A%7B%22values%22%3A%5B%22undefined%22%5D%7D%7D%7D";
+var ssuperusd = "SuperReturn sSuperUSD::SSUPERUSD";
+var ssuperusdFetcher = {
+  label: "SSUPERUSD",
+  fetch: async () => {
+    try {
+      const res = await fetch(SSUPERUSD_URL, {
+        method: "GET",
+        headers: { Accept: "application/json", "User-Agent": "1delta/yields" }
+      }).then((r) => r.json());
+      return { [ssuperusd]: apyToAprPercent(res?.[1]?.result.data.json ?? 0) };
+    } catch (e) {
+      return { [ssuperusd]: 0 };
+    }
+  }
+};
+
+// src/yields/fetchers/hyperbeat.ts
+var HBHYPE_URL = "https://api.hyperbeat.org/api/v1/staking?address=0xCeaD893b162D38e714D82d06a7fe0b0dc3c38E0b";
+var HBUHYPE_URL = "https://app.hyperbeat.org/api/hyperfolio/vault-infos?vaultAddress=0x96C6cBB6251Ee1c257b2162ca0f39AA5Fa44B1FB";
+var hbhype = "hyperbeat x ether.fi HYPE::beHYPE";
+var hbuhype = "Hyperbeat Ultra Hype::hbHYPE";
+var hbhypeFetcher = {
+  label: "HBHYPE",
+  fetch: async () => {
+    try {
+      const response = await fetch(HBHYPE_URL);
+      if (!response.ok) {
+        throw new Error(`HTTP error! Status: ${response.status}`);
+      }
+      const result = await response.json();
+      if (!result.success || !result.data || !Array.isArray(result.data.delegations)) {
+        throw new Error("Invalid response structure");
+      }
+      const delegations = result.data.delegations;
+      const totalApr = delegations.reduce(
+        (sum, validator) => sum + Number(validator.apr ?? 0),
+        0
+      );
+      const averageApr = totalApr / delegations.length;
+      return { [hbhype]: averageApr };
+    } catch (e) {
+      return { [hbhype]: 0 };
+    }
+  }
+};
+var hbuhypeFetcher = {
+  label: "HBUHYPE",
+  fetch: async () => {
+    try {
+      const response = await fetch(HBUHYPE_URL);
+      if (!response.ok) {
+        throw new Error(`HTTP error! Status: ${response.status}`);
+      }
+      const result = await response.json();
+      const apy = result.currentAPY?.apy_1d ?? 0;
+      return { [hbuhype]: apyToAprPercent(apy) };
+    } catch (e) {
+      return { [hbuhype]: 0 };
+    }
+  }
+};
+
+// src/yields/fetchers/hyperliquid.ts
+var HLP_URL = "https://api-ui.hyperliquid.xyz/info";
+var HWHLP_URL = "https://api.hyperwavefi.xyz/stats/latest?asset=hwhlp_999";
+var hlp = "Wrapped HLP::WHLP";
+var hwhlp = "Hyperwave HLP::hwHLP";
+var hlpFetcher = {
+  label: "HLP",
+  fetch: async () => {
+    const res = await fetch(HLP_URL, {
       method: "POST",
-      headers: { Accept: "application/json" },
+      headers: {
+        Accept: "application/json",
+        "Content-Type": "application/json"
+      },
       body: JSON.stringify({
-        query: "query GetAllCurrentAPYFromVault($address: String!) {\n  vaultByAddress(address: $address) {\n    state {\n      apy\n      netApy\n    }\n    asset {\n      yield {\n        apr\n      }\n    }\n  }\n}",
-        variables: {
-          address: "0xbEeFc011e94f43b8B7b455eBaB290C7Ab4E216f1"
+        type: "vaultDetails",
+        vaultAddress: "0xdfc24b077bc1425ad1dea75bcb6f8158e10df303"
+      })
+    }).then((r) => r.json());
+    let calculated;
+    try {
+      const p = res.portfolio[0][1];
+      const val = p.accountValueHistory[p.accountValueHistory.length - 1][1];
+      const pnl = p.pnlHistory[p.pnlHistory.length - 1][1];
+      calculated = pnl / val * 100;
+    } catch {
+      calculated = (res?.apr ?? 0) * 100;
+    }
+    return { [hlp]: calculated };
+  }
+};
+var hwhlpFetcher = {
+  label: "HWHLP",
+  fetch: async () => {
+    const res = await fetch(HWHLP_URL, {
+      method: "GET",
+      headers: { Accept: "application/json" }
+    }).then((r) => r.json());
+    return { [hwhlp]: Number(res.data?.apr_1d ?? 0) };
+  }
+};
+
+// src/yields/fetchers/usdx.ts
+var SUSDX_URL = "https://app.usdx.money/v1/base/apyInfo";
+var susdx = "SUSDX";
+var susdxFetcher = {
+  label: "SUSDX",
+  fetch: async () => {
+    const res = await fetch(SUSDX_URL).then((r) => r.json());
+    return { [susdx]: apyToApr(res.result.susdxApy) * 100 };
+  }
+};
+
+// src/yields/fetchers/reserve.ts
+var RTOKENS_URL = "https://yields.reserve.org/pools";
+var hyUSD = "High Yield USD Base::HYUSD";
+var bsdETH = "Based ETH::BSDETH";
+var ethPlus = "ETHPlus::ETH+";
+var woEth = "Wrapped OETH::WOETH";
+var sfrxeth = "Staked Frax Ether::sfrxETH";
+var ceth = "cETH::CETH";
+var sfrax = "Staked FRAX::SFRAX";
+var usdThree = "Web 3 Dollar::USD3";
+var rtokensFetcher = {
+  label: "RTOKENS",
+  fetch: async () => {
+    const res = await fetch(RTOKENS_URL).then((r) => r.json());
+    const data = res.rtokens["8453"];
+    const dataMainnet = res.rtokens["1"];
+    const dataMainnetColalterals = res.collaterals["1"];
+    return {
+      [bsdETH]: apyToAprPercent(data.bsdETH / 100) * 100,
+      [hyUSD]: apyToAprPercent(data.hyUSD / 100) * 100,
+      [sfrxeth]: apyToAprPercent(dataMainnetColalterals.sfrxeth / 100) * 100,
+      [sfrax]: apyToAprPercent(dataMainnetColalterals.sfrax / 100) * 100,
+      [ceth]: apyToAprPercent(dataMainnetColalterals.ceth / 100) * 100,
+      [ethPlus]: apyToAprPercent(dataMainnet["ETH+"] / 100) * 100,
+      [usdThree]: apyToAprPercent(dataMainnet["USD3"] / 100) * 100,
+      [woEth]: apyToAprPercent(dataMainnetColalterals.woeth / 100) * 100
+    };
+  }
+};
+
+// src/yields/fetchers/hyperlend.ts
+var HYPE_URL = "https://api.hyperlend.finance/data/nativeApy";
+var wstHype = "Staked HYPE Shares::WSTHYPE";
+var kHYPE = "Kinetiq Staked HYPE::kHYPE";
+var hypeFetcher = {
+  label: "HYPE",
+  fetch: async () => {
+    const res = await fetch(HYPE_URL).then((r) => r.json());
+    return {
+      [wstHype]: res.wstHYPE.latestApr,
+      [kHYPE]: res.kHYPE.latestApr
+    };
+  }
+};
+
+// src/yields/fetchers/angle.ts
+var ANGLE_URL = "https://exporter.angle.money/v2/savingsApr";
+var stUSD = "Angle Staked USDA::stUSD";
+var stEur = "Angle Staked EURA::stEUR";
+var angleFetcher = {
+  label: "ANGLE",
+  fetch: async () => {
+    const now = Math.floor(Date.now() / 1e3);
+    const nowMinusWeek = now - 7 * 24 * 3600;
+    const res = await fetch(
+      ANGLE_URL + `?from=${nowMinusWeek}&to=${now}`
+    ).then((r) => r.json());
+    return {
+      [stEur]: apyToAprPercent(res.EURA) * 100,
+      [stUSD]: apyToAprPercent(res.USDA) * 100
+    };
+  }
+};
+
+// src/yields/yieldTypes.ts
+var addressToAssetYearn = {
+  "0xe007ca01894c863d7898045ed5a3b4abf0b18f37": "vbETH yVault::yvvbETH",
+  "0x80c34bd3a3569e126e7055831036aa7b212cb159": "vbUSDC yVault::yvvbUSDC",
+  "0x9a6bd7b6fd5c4f87eb66356441502fc7dcdd185b": "vbUSDT yVault::yvvbUSDT",
+  "0xaa0362ecc584b985056e47812931270b99c91f9d": "vbWBTC yVault::yvvbWBTC",
+  "0x93fec6639717b6215a48e5a72a162c50dcc40d68": "vbAUSD yVault::yvvbAUSD"
+};
+
+// src/yields/fetchers/yearnKatana.ts
+var YEARN_KATANA_URL = "https://katana-apr-service.vercel.app/api/vaults";
+var yearnKatanaFetcher = {
+  label: "YEARN_KATANA",
+  fetch: async () => {
+    const res = await fetch(
+      YEARN_KATANA_URL
+    ).then((r) => r.json());
+    let map = {};
+    Object.entries(res).forEach(([addr, data]) => {
+      const key = addressToAssetYearn[addr.toLowerCase()];
+      if (key) {
+        const apr = ((data.apr.netAPR ?? 0) + (data.apr.extra.extrinsicYield ?? 0) + (data.apr.extra.katanaNativeYield ?? 0)) * 100;
+        map[key] = apr;
+      }
+    });
+    return map;
+  }
+};
+
+// src/yields/fetchers/yoProtocol.ts
+var YO_URL = "https://api.yo.xyz/api/v1/vault/stats";
+var yoeth = "Yield Optimizer ETH::YOETH";
+var yobtc = "Yield Optimizer BTC::YOBTC";
+var yousd = "Yield Optimizer USD::YOUSD";
+var yoeur = "Yield Optimizer EUR::yoEUR";
+var yoFetcher = {
+  label: "YO",
+  fetch: async () => {
+    const res = await fetch(YO_URL, {
+      method: "GET",
+      headers: { Accept: "application/json" }
+    }).then((r) => r.json());
+    const datas = res?.data;
+    const yoETH = datas.find((a) => a.id === "yoETH").yield?.["1d"];
+    const yoBTC = datas.find((a) => a.id === "yoBTC").yield?.["1d"];
+    const yoUSD = datas.find((a) => a.id === "yoUSD").yield?.["1d"];
+    const yoEUR = datas.find((a) => a.id === "yoEUR").yield?.["1d"];
+    return {
+      [yoeth]: apyToAprPercent(yoETH),
+      [yobtc]: apyToAprPercent(yoBTC),
+      [yousd]: apyToAprPercent(yoUSD),
+      [yoeur]: apyToAprPercent(yoEUR)
+    };
+  }
+};
+
+// src/yields/fetchers/gmx.ts
+var GMX_URL = "https://arbitrum-api.gmxinfra.io/apy?period=1d";
+var gmx_eth_usd = "GMX Market ETH/USD::GM [WETH-USDC]";
+var gmx_btc_usd = "GMX Market BTC/USD::GM [WBTC-USDC]";
+var glv_wbtc_usdc = "GMX Liquidity Vault [WBTC-USDC]::GLV [WBTC-USDC]";
+var glv_weth_usdc = "GMX Liquidity Vault [WETH-USDC]::GLV [WETH-USDC]";
+var gmx_eth_usd_address = "0x70d95587d40a2caf56bd97485ab3eec10bee6336";
+var gmx_btc_usd_address = "0x47c031236e19d024b42f8ae6780e44a573170703";
+var glv_wbtc_usdc_address = "0xdf03eed325b82bc1d4db8b49c30ecc9e05104b96";
+var glv_weth_usdc_address = "0x528a5bac7e746c9a509a1f4f6df58a03d44279f9";
+var gmxFetcher = {
+  label: "GMX",
+  fetch: async () => {
+    const res = await fetch(GMX_URL, {
+      method: "GET",
+      headers: { Accept: "application/json" }
+    }).then((r) => r.json());
+    let rData = {};
+    const markets = res.markets;
+    Object.entries(markets).forEach(([m, d]) => {
+      if (m.toLowerCase() === gmx_eth_usd_address)
+        rData[gmx_eth_usd] = apyToApr(d.apy) * 100;
+      if (m.toLowerCase() === gmx_btc_usd_address)
+        rData[gmx_btc_usd] = apyToApr(d.apy) * 100;
+    });
+    const glvs = res.glvs;
+    Object.entries(glvs).forEach(([m, d]) => {
+      if (m.toLowerCase() === glv_wbtc_usdc_address)
+        rData[glv_wbtc_usdc] = apyToApr(d.apy) * 100;
+      if (m.toLowerCase() === glv_weth_usdc_address)
+        rData[glv_weth_usdc] = apyToApr(d.apy) * 100;
+    });
+    return rData;
+  }
+};
+
+// src/prices/pendle/fetchPendlePrices.ts
+var PENDLE_API_BASE = "https://api-v2.pendle.finance/core";
+var MARKETS_ENDPOINT = `${PENDLE_API_BASE}/v1/markets/all`;
+var PRICES_ENDPOINT = (types) => `${PENDLE_API_BASE}/v1/prices/assets${types ? `?type=${types.join(",")}` : ""}`;
+async function fetchPendleMarkets() {
+  try {
+    const response = await fetch(MARKETS_ENDPOINT);
+    if (!response.ok) {
+      throw new Error(`Failed to fetch all markets data: ${response.status}`);
+    }
+    const data = await response.json();
+    const marketsByChain = {};
+    if (data.markets) {
+      for (const market of data.markets) {
+        const chainId = market.chainId.toString();
+        if (!marketsByChain[chainId]) {
+          marketsByChain[chainId] = [];
+        }
+        marketsByChain[chainId].push(market);
+      }
+    }
+    return marketsByChain;
+  } catch (error) {
+    console.error("Error fetching all markets data:", error);
+    return {};
+  }
+}
+async function fetchPendlePricesForAllChain(lists = {}, assetType = ["YT", "PT"]) {
+  try {
+    const data = await fetchPendlePricesRaw(assetType);
+    let prices = {};
+    Object.entries(data).forEach(([key, val]) => {
+      const [chainId, address] = key.split("-");
+      const assetKey = lists[chainId]?.list?.[address.toLowerCase()]?.assetGroup ?? key;
+      prices[assetKey] = val;
+    });
+    return prices;
+  } catch (error) {
+    console.error(`Error fetching prices pendle prices:`, error);
+    return {};
+  }
+}
+async function fetchPendlePricesRaw(assetType = ["YT", "PT"]) {
+  try {
+    const response = await fetch(PRICES_ENDPOINT(assetType));
+    const data = await response.json();
+    return data.prices;
+  } catch (error) {
+    console.error(`Error fetching prices pendle prices:`, error);
+    return {};
+  }
+}
+async function fetchPendlePrices(lists = {}, assetType = ["YT", "PT"]) {
+  try {
+    const marketsResponse = await fetchPendleMarkets();
+    if (!Object.keys(marketsResponse).length) {
+      return {};
+    }
+    const allPrices = await fetchPendlePricesForAllChain(lists, assetType);
+    return Object.fromEntries(
+      Object.entries(allPrices).filter(([, price]) => !!price)
+    );
+  } catch (error) {
+    console.error("Error in fetchPendlePrices:", error);
+    return {};
+  }
+}
+async function fetchPendleYields(lists = {}) {
+  try {
+    const marketsResponse = await fetchPendleMarkets();
+    if (!Object.keys(marketsResponse).length) {
+      return {};
+    }
+    const prices = await fetchPendlePricesRaw();
+    let yields = {};
+    const now = /* @__PURE__ */ new Date();
+    Object.entries(marketsResponse).forEach(([chain, dataArr]) => {
+      dataArr.forEach((market) => {
+        const ptPrice = prices[market.pt];
+        const ytPrice = prices[market.yt];
+        if (ytPrice && ytPrice > 0) {
+          const yearFraction = yearFractionToExpiry(market.expiry, now);
+          const apr = ytPrice / ptPrice * 100 / yearFraction;
+          const [chainId, address] = market.pt.split("-");
+          const assetKey = lists[chainId]?.list?.[address.toLowerCase()]?.assetGroup ?? market.pt;
+          yields[assetKey] = apr;
         }
-      })
-    }).then((r) => r.json());
-    const vba = res?.data?.vaultByAddress;
-    return apyToAprPercent(vba.state.apy ?? 0) * 100 + (vba?.asset?.yield.apr ?? 0) * 100;
-  });
-  const hlpPromise = safeFetch("HLP", async () => {
-    const res = await fetch(FeedData.HLP, {
-      method: "POST",
+      });
+    });
+    return yields;
+  } catch (error) {
+    console.error("Error in fetchPendlePrices:", error);
+    return {};
+  }
+}
+function yearFractionToExpiry(expiryISO, now = /* @__PURE__ */ new Date()) {
+  const expiry = new Date(expiryISO);
+  const diffMs = expiry.getTime() - now.getTime();
+  const yearFraction = diffMs / (1e3 * 60 * 60 * 24 * 365.25);
+  return yearFraction;
+}
+
+// src/yields/fetchers/pendle.ts
+var pendleFetcher = {
+  label: "PENDLE",
+  fetch: async () => {
+    const lists = await getListsMulti([
+      Chain.PLASMA_MAINNET,
+      Chain.ETHEREUM_MAINNET,
+      Chain.BERACHAIN,
+      Chain.MANTLE,
+      Chain.BASE,
+      Chain.OP_MAINNET,
+      Chain.ARBITRUM_ONE,
+      Chain.SONIC_MAINNET,
+      Chain.HYPEREVM,
+      Chain.BNB_SMART_CHAIN_MAINNET
+    ]);
+    return fetchPendleYields(lists);
+  }
+};
+
+// src/yields/fetchers/usdai.ts
+var USDAI_APY_URL = "https://api.usd.ai/usdai/dashboard/current-apy";
+var usdai = "sUSDai::SUSDAI";
+var usdaiFetcher = {
+  label: "USDai",
+  fetch: async () => {
+    const res = await fetch(USDAI_APY_URL, {
       headers: {
-        Accept: "application/json",
-        "Content-Type": "application/json"
-        // <-- required
-      },
-      body: JSON.stringify({
-        type: "vaultDetails",
-        vaultAddress: "0xdfc24b077bc1425ad1dea75bcb6f8158e10df303"
-      })
+        origin: "https://app.usd.ai",
+        referer: "https://app.usd.ai/"
+      }
     }).then((r) => r.json());
-    let calculated;
-    try {
-      const p = res.portfolio[0][1];
-      const val = p.accountValueHistory[p.accountValueHistory.length - 1][1];
-      const pnl = p.pnlHistory[p.pnlHistory.length - 1][1];
-      calculated = pnl / val * 100;
-    } catch {
-      calculated = (res?.apr ?? 0) * 100;
-    }
-    return calculated;
-  });
-  const rtokensPromise = safeFetch("RTOKENS", async () => {
-    const res = await fetch(FeedData.RTOKENS).then((r) => r.json());
-    const data2 = res.rtokens["8453"];
-    const dataMainnet = res.rtokens["1"];
-    const dataMainnetColalterals = res.collaterals["1"];
-    return {
-      [bsdETH]: apyToAprPercent(data2.bsdETH / 100) * 100,
-      [hyUSD]: apyToAprPercent(data2.hyUSD / 100) * 100,
-      [sfrxeth]: apyToAprPercent(dataMainnetColalterals.sfrxeth / 100) * 100,
-      [sfrax]: apyToAprPercent(dataMainnetColalterals.sfrax / 100) * 100,
-      [ceth]: apyToAprPercent(dataMainnetColalterals.ceth / 100) * 100,
-      [ethPlus]: apyToAprPercent(dataMainnet["ETH+"] / 100) * 100,
-      [usdThree]: apyToAprPercent(dataMainnet["USD3"] / 100) * 100,
-      [woEth]: apyToAprPercent(dataMainnetColalterals.woeth / 100) * 100
-    };
-  });
-  const hypePromise = safeFetch("HYPE", async () => {
-    const res = await fetch(FeedData.HYPE).then((r) => r.json());
-    return {
-      [wstHype]: res.wstHYPE.latestApr,
-      [kHYPE]: res.kHYPE.latestApr
-    };
-  });
-  const anglePromise = safeFetch("ANGLE", async () => {
-    const now = Math.floor(Date.now() / 1e3);
-    const nowMinusWeek = now - 7 * 24 * 3600;
-    const res = await fetch(
-      FeedData.ANGLE + `?from=${nowMinusWeek}&to=${now}`
-    ).then((r) => r.json());
-    return {
-      [stEur]: apyToAprPercent(res.EURA) * 100,
-      [stUSD]: apyToAprPercent(res.USDA) * 100
-    };
-  });
-  const cbethPromise = safeFetch("CBETH", async () => {
-    try {
-      const res = await fetch(FeedData.CBETH, {
-        headers: {
-          "User-Agent": "1delta/yields",
-          "Content-Type": "application/json"
-        }
-      }).then((r) => r.json());
-      return apyToAprPercent(res.apy) * 100;
-    } catch (e) {
-      console.log("CBETH failed", e);
-      return 0;
-    }
-  });
-  const pendlePromise = getListsMulti([
-    Chain.PLASMA_MAINNET,
-    Chain.ETHEREUM_MAINNET,
-    Chain.BERACHAIN,
-    Chain.MANTLE,
-    Chain.BASE,
-    Chain.OP_MAINNET,
-    Chain.ARBITRUM_ONE,
-    Chain.SONIC_MAINNET,
-    Chain.HYPEREVM,
-    Chain.BNB_SMART_CHAIN_MAINNET
-  ]).then((x) => fetchPendleYields(x));
-  const [
-    wstethData,
-    ezethData,
-    rethData,
-    weethData,
-    stmaticData,
-    methData,
-    maticXdata,
-    susdeData,
-    // meridianData,
-    savaxData,
-    cbethData,
-    rsethData,
-    trumaticData,
-    rtokensData,
-    hypeData,
-    osEthData,
-    ethXData,
-    pufEthData,
-    angleData,
-    susdsData,
-    srUsdData,
-    yusdData,
-    rlpData,
-    wstusrData,
-    csusdlData,
-    // sdeusdData,
-    rswethData,
-    ynethxData,
-    ethZeroData,
-    usdZeroPlusData,
-    jitoSolData,
-    thBillData,
-    yearnKatanaData,
-    ssuperusdData,
-    hbhypeData,
-    pendleData,
-    hlpData,
-    yoData,
-    hwhlpData,
-    gmxData,
-    weethsData,
-    hbuhypeData,
-    susdxData
-  ] = await Promise.all([
+    return { [usdai]: apyToAprPercent(Number(res.result)) };
+  }
+};
+
+// src/yields/fetchGeneralYields.ts
+var fetchGeneralYields = async () => {
+  const wstethPromise = safeFetch(wstethFetcher.label, wstethFetcher.fetch);
+  const weethFetcher = createWeethFetcher(wstethPromise);
+  const fetchers = [
+    weethFetcher,
+    stmaticFetcher,
+    ezethFetcher,
+    rethFetcher,
+    methFetcher,
+    susdeFetcher,
+    maticxFetcher,
+    ethxFetcher,
+    savaxFetcher,
+    cbethFetcher,
+    rsethFetcher,
+    trumaticFetcher,
+    osethFetcher,
+    ynethxFetcher,
+    pufethFetcher,
+    susdsFetcher,
+    srusdFetcher,
+    yusdFetcher,
+    rlpFetcher,
+    wstusrFetcher,
+    csusdlFetcher,
+    rswethFetcher,
+    usdZeroPlusFetcher,
+    ethZeroFetcher,
+    jitoSolFetcher,
+    thbillFetcher,
+    ssuperusdFetcher,
+    hbhypeFetcher,
+    hbuhypeFetcher,
+    hlpFetcher,
+    hwhlpFetcher,
+    weethsFetcher,
+    susdxFetcher,
+    rtokensFetcher,
+    hypeFetcher,
+    angleFetcher,
+    yearnKatanaFetcher,
+    yoFetcher,
+    gmxFetcher,
+    pendleFetcher,
+    usdaiFetcher
+  ];
+  const [wstethData, ...results] = await Promise.all([
     wstethPromise,
-    ezethPromise,
-    rethPromise,
-    weethPromise,
-    stmaticPromise,
-    methPromise,
-    maticxPromise,
-    susdePromise,
-    // meridianPromise,
-    savaxPromise,
-    cbethPromise,
-    rsethPromise,
-    trumaticPromise,
-    rtokensPromise,
-    hypePromise,
-    osEthPromise,
-    ethxPromise,
-    pufEthPromise,
-    anglePromise,
-    susdsPromise,
-    srusdPromise,
-    yusdPromise,
-    rlpPromise,
-    wstusrPromise,
-    csusdlPromise,
-    // sdeusdPromise,
-    rswethPromise,
-    ynethxPromise,
-    ethZeroPromise,
-    usdZeroPlusPromise,
-    jitoSolPromise,
-    thbillPromise,
-    yearnKatanaPromise,
-    ssuperusdPromise,
-    hbhypePromise,
-    pendlePromise,
-    hlpPromise,
-    yoPromise,
-    hwhlpPromise,
-    gmxPromise,
-    weethsPromise,
-    hbuhypePromise,
-    susdxPromise
+    ...fetchers.map((f) => safeFetch(f.label, f.fetch))
   ]);
-  const data = {
-    intrinsicYields: {
-      MATICX: maticXdata,
-      METH: methData,
-      CMETH: methData,
-      WSTETH: wstethData,
-      EZETH: ezethData,
-      RETH: rethData,
-      WEETH: weethData,
-      STMATIC: stmaticData,
-      USDY: 4.35,
-      SUSDE: susdeData,
-      SAVAX: savaxData,
-      CBETH: cbethData,
-      RSETH: rsethData,
-      TRUMATIC: trumaticData,
-      [sUsds]: susdsData,
-      [ethZero]: ethZeroData,
-      [usdZeroPlus]: usdZeroPlusData,
-      [csusdl]: csusdlData,
-      [srUsd]: srUsdData,
-      [wsrusd]: srUsdData,
-      // [sdeusd]: sdeusdData,
-      [wstusr]: wstusrData,
-      [yusd]: yusdData,
-      [rlp]: rlpData,
-      [rsweth]: rswethData,
-      [osETH]: osEthData,
-      [ethX]: ethXData,
-      [ynethx]: ynethxData,
-      [tETH]: wstethData,
-      [pufEth]: pufEthData,
-      [jitoSol]: jitoSolData,
-      [thBill]: thBillData,
-      [ssuperusd]: ssuperusdData,
-      [hbhype]: hbhypeData,
-      [hlp]: hlpData,
-      [hwhlp]: hwhlpData,
-      [weeths]: weethsData,
-      [hbuhype]: hbuhypeData,
-      [susdx]: susdxData,
-      ...rtokensData,
-      ...hypeData,
-      ...angleData,
-      ...yearnKatanaData,
-      ...pendleData,
-      ...yoData,
-      ...gmxData
-    },
-    lenderRewards: {
-      // '167000': {
-      //   MERIDIAN: meridianData,
-      // },
-    }
+  const intrinsicYields = {
+    USDY: 4.35
+  };
+  if (wstethData) Object.assign(intrinsicYields, wstethData);
+  for (const result of results) {
+    if (result) Object.assign(intrinsicYields, result);
+  }
+  return {
+    intrinsicYields,
+    lenderRewards: {}
   };
-  return data;
 };
 
 // src/prices/defillama/index.ts
@@ -23695,14 +24104,20 @@ var AAVE_LENDER_OVERRIDES = {
       // BASE_CURRENCY_UNIT call reverts, oracle returns 18 decimals (USD denominated)
       baseCurrencyUnit: 1000000000000000000n
     }
+  },
+  [Lender.MOLEND]: {
+    [Chain.MODE]: {
+      // BASE_CURRENCY_UNIT call reverts, oracle returns 18 decimals (USD denominated)
+      baseCurrencyUnit: 100000000n
+    }
   }
 };
 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) {
+  for (const [lender, chains] of Object.entries(oracles)) {
+    if (chains[chainId] && reserves[lender]?.[chainId]?.length > 0) {
       lenders.push(lender);
     }
   }
@@ -23752,13 +24167,9 @@ function parseAaveResults2(data, meta, context) {
   const { chainId, usdPrices, tokenList } = context;
   const entries = [];
   if (data.length === 0) return entries;
-  let baseCurrencyUnitValue = data[meta.baseCurrencyUnitIndex];
+  let baseCurrencyUnitValue = meta.baseCurrencyUnitOverride ?? data[meta.baseCurrencyUnitIndex];
   if (!baseCurrencyUnitValue || baseCurrencyUnitValue === "0x") {
-    if (meta.baseCurrencyUnitOverride) {
-      baseCurrencyUnitValue = meta.baseCurrencyUnitOverride;
-    } else {
-      return entries;
-    }
+    return entries;
   }
   let decimals;
   try {
@@ -23788,7 +24199,8 @@ function parseAaveResults2(data, meta, context) {
         asset: asset.toLowerCase(),
         price: rawPriceNum,
         // Raw price (in base asset terms)
-        priceUSD
+        priceUSD,
+        marketUid: createMarketUid(chainId, meta.fork, asset)
       });
     } catch {
       continue;
@@ -23804,59 +24216,45 @@ var aaveFetcher = {
   parse: parseAaveResults2,
   getAbi: getAaveAbi
 };
-function generateMarketId(oracle) {
-  return oracle.replace(/^0x/i, "").toUpperCase();
+function generateMarketId(oracle, loanAsset, collateralAsset) {
+  return `${oracle}${loanAsset}${collateralAsset}`.replace(/0x/gi, "").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;
+  return chainOverrides.map((override) => ({
+    oracle: override.oracle,
+    loanAsset: override.loanAsset,
+    collateralAsset: override.collateralAsset,
+    loanAssetDecimals: override.loanAssetDecimals,
+    collateralAssetDecimals: override.collateralAssetDecimals,
+    fork: Lender.MORPHO_BLUE,
+    marketId: override.marketId ?? generateMarketId(override.oracle, override.loanAsset, override.collateralAsset)
+  }));
 }
 function getMorphoCalls2(chainId, context) {
   const queries = getMorphoMarketsForChain(chainId, context?.marketOverrides);
   if (queries.length === 0) return [];
-  return queries.map((query2) => {
+  const oracleGroups = /* @__PURE__ */ new Map();
+  for (const query2 of queries) {
+    const oracleLc = query2.oracle.toLowerCase();
+    if (!oracleGroups.has(oracleLc)) {
+      oracleGroups.set(oracleLc, []);
+    }
+    oracleGroups.get(oracleLc).push(query2);
+  }
+  return Array.from(oracleGroups.values()).map((markets) => {
     const call = {
-      address: query2.oracle,
+      address: markets[0].oracle,
       name: "price",
       params: []
     };
     return {
       calls: [call],
-      meta: query2,
-      lender: generateMorphoLenderKey(query2.marketId)
+      meta: { markets },
+      lender: generateMorphoLenderKey(markets[0].marketId)
     };
   });
 }
@@ -23865,37 +24263,44 @@ function parseMorphoResults2(data, meta, 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
-    });
+  for (const market of meta.markets) {
+    const loanAsset = market.loanAsset.toLowerCase();
+    const collateralAsset = market.collateralAsset.toLowerCase();
+    const loanAssetDecimals = market.loanAssetDecimals ?? tokenList?.[loanAsset]?.decimals ?? 18;
+    const collateralAssetDecimals = market.collateralAssetDecimals ?? tokenList?.[collateralAsset]?.decimals ?? 18;
+    const priceDebtToCollateral = formatMorphoPrice(
+      rawPrice.toString(),
+      loanAssetDecimals,
+      collateralAssetDecimals
+    );
+    if (isNaN(priceDebtToCollateral) || priceDebtToCollateral === 0) continue;
+    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];
+    const lenderKey = generateMorphoLenderKey(market.marketId);
+    if (loanAssetUSD) {
+      const collateralPriceUSD = priceDebtToCollateral * loanAssetUSD;
+      entries.push({
+        asset: collateralAsset,
+        price: priceDebtToCollateral,
+        // Raw: collateral price in loan asset terms
+        priceUSD: collateralPriceUSD,
+        marketUid: createMarketUid(chainId, lenderKey, collateralAsset),
+        targetLender: lenderKey
+      });
+    }
+    if (collateralAssetUSD) {
+      const loanPriceUSD = collateralAssetUSD / priceDebtToCollateral;
+      entries.push({
+        asset: loanAsset,
+        price: 1 / priceDebtToCollateral,
+        // Raw: loan price in collateral terms
+        priceUSD: loanPriceUSD,
+        marketUid: createMarketUid(chainId, lenderKey, loanAsset),
+        targetLender: lenderKey
+      });
+    }
   }
   return entries;
 }
@@ -23907,8 +24312,9 @@ var morphoFetcher = {
   parse: parseMorphoResults2,
   getAbi: getMorphoAbi
 };
-
-// src/prices/oracle-prices/fetchers/compoundV2.ts
+var SCALING_DECIMALS_OVERRIDES = {
+  [Lender.SUMER]: 18
+};
 var CompoundV2OracleAbi = [
   {
     inputs: [{ internalType: "address", name: "cToken", type: "address" }],
@@ -23959,14 +24365,15 @@ function parseCompoundV2Results2(data, meta, context) {
     try {
       const underlyingLc = queryMeta.underlying.toLowerCase();
       const underlyingDecimals = tokenList?.[underlyingLc]?.decimals ?? 18;
-      const scalingDecimals = 36 - underlyingDecimals;
+      const scalingDecimals = SCALING_DECIMALS_OVERRIDES[queryMeta.lender] ?? 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
+        priceUSD,
+        marketUid: createMarketUid(context.chainId, queryMeta.lender, queryMeta.cToken)
       });
     } catch {
     }
@@ -23981,8 +24388,6 @@ var compoundV2Fetcher = {
   parse: parseCompoundV2Results2,
   getAbi: getCompoundV2Abi
 };
-
-// src/prices/oracle-prices/fetchers/compoundV3.ts
 var ChainlinkAggregatorAbi = [
   {
     inputs: [],
@@ -24000,6 +24405,12 @@ var ChainlinkAggregatorAbi = [
 ];
 var ANSWER_INDEX = 1;
 var CHAINLINK_DECIMALS = 8;
+var USD_PRICED_OVERRIDES = {
+  [Lender.COMPOUND_V3_AERO]: /* @__PURE__ */ new Set(["8453"]),
+  // BASE - prices already in USD
+  [Lender.COMPOUND_V3_USDBC]: /* @__PURE__ */ new Set(["8453"])
+  // BASE - prices already in USD
+};
 function getCompoundV3Calls(chainId) {
   const oracles = compoundV3Oracles() ?? {};
   const baseData = compoundV3BaseData() ?? {};
@@ -24007,7 +24418,8 @@ function getCompoundV3Calls(chainId) {
   for (const [lender, chainOracles] of Object.entries(oracles)) {
     const assetOracles = chainOracles[chainId];
     if (!assetOracles) continue;
-    const baseAsset = baseData[lender]?.[chainId]?.baseAsset?.toLowerCase();
+    const skipBaseScaling = USD_PRICED_OVERRIDES[lender]?.has(chainId);
+    const baseAsset = skipBaseScaling ? void 0 : baseData[lender]?.[chainId]?.baseAsset?.toLowerCase();
     const calls = [];
     const meta = [];
     for (const [asset, oracleAddress] of Object.entries(assetOracles)) {
@@ -24019,7 +24431,8 @@ function getCompoundV3Calls(chainId) {
       meta.push({
         asset,
         oracle: oracleAddress,
-        baseAsset
+        baseAsset,
+        lender
       });
     }
     if (calls.length > 0) {
@@ -24041,7 +24454,9 @@ function parseCompoundV3Results(data, meta, context) {
     try {
       const answer = Array.isArray(rawResult) ? rawResult[ANSWER_INDEX] : rawResult;
       if (!answer) return;
-      const rawPrice = Number(formatUnits(BigInt(answer.toString()), CHAINLINK_DECIMALS));
+      const rawPrice = Number(
+        formatUnits(BigInt(answer.toString()), CHAINLINK_DECIMALS)
+      );
       if (isNaN(rawPrice) || rawPrice === 0) return;
       const assetLc = queryMeta.asset.toLowerCase();
       let priceUSD = rawPrice;
@@ -24057,7 +24472,8 @@ function parseCompoundV3Results(data, meta, context) {
         asset: assetLc,
         price: rawPrice,
         // Raw price (in base asset terms if applicable)
-        priceUSD
+        priceUSD,
+        marketUid: createMarketUid(chainId, queryMeta.lender, queryMeta.asset)
       });
     } catch {
     }
@@ -24073,103 +24489,84 @@ var compoundV3Fetcher = {
   getAbi: getCompoundV3Abi
 };
 var LISTA_DECIMALS = 8;
-function generateMarketId2(oracle) {
-  return oracle.replace(/^0x/i, "").toUpperCase();
+function generateMarketId2(oracle, loanAsset, collateralAsset) {
+  return `${oracle}${loanAsset}${collateralAsset}`.replace(/0x/gi, "").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;
+  return chainOverrides.map((override) => ({
+    oracle: override.oracle,
+    collateralAsset: override.collateralAsset,
+    loanAsset: override.loanAsset,
+    marketId: override.marketId ?? generateMarketId2(override.oracle, override.loanAsset, override.collateralAsset)
+  }));
 }
 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
-      {
+  const calls = [];
+  const callIndexMap = {};
+  for (const market of markets) {
+    const oracleLc = market.oracle.toLowerCase();
+    const collateralKey = `${oracleLc}:${market.collateralAsset.toLowerCase()}`;
+    if (!(collateralKey in callIndexMap)) {
+      callIndexMap[collateralKey] = calls.length;
+      calls.push({
         address: market.oracle,
         name: "peek",
         params: [market.collateralAsset]
-      },
-      // Call for loan asset
-      {
+      });
+    }
+    const loanKey = `${oracleLc}:${market.loanAsset.toLowerCase()}`;
+    if (!(loanKey in callIndexMap)) {
+      callIndexMap[loanKey] = calls.length;
+      calls.push({
         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)
-    };
-  });
+      });
+    }
+  }
+  return [{
+    calls,
+    meta: { callIndexMap, markets },
+    lender: generateListaLenderKey(markets[0].marketId)
+  }];
 }
-function parseListaResults2(data, meta, _context) {
+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 {
+  for (const market of meta.markets) {
+    const oracleLc = market.oracle.toLowerCase();
+    const lenderKey = generateListaLenderKey(market.marketId);
+    const processedAssets = /* @__PURE__ */ new Set();
+    const assets = [market.collateralAsset, market.loanAsset];
+    for (const assetRaw of assets) {
+      const asset = assetRaw.toLowerCase();
+      if (processedAssets.has(asset)) continue;
+      const callKey = `${oracleLc}:${asset}`;
+      const callIndex = meta.callIndexMap[callKey];
+      if (callIndex === void 0) continue;
+      const rawPrice = data[callIndex];
+      if (rawPrice === void 0 || rawPrice === "0x") continue;
+      try {
+        const priceUSD = Number(formatUnits(BigInt(rawPrice.toString()), LISTA_DECIMALS));
+        if (isNaN(priceUSD) || priceUSD === 0) continue;
+        entries.push({
+          asset,
+          price: priceUSD,
+          // Raw price is already in USD
+          priceUSD,
+          marketUid: createMarketUid(context.chainId, lenderKey, asset),
+          targetLender: lenderKey
+        });
+        processedAssets.add(asset);
+      } catch {
+      }
     }
-  });
+  }
   return entries;
 }
 function getListaAbi() {
@@ -24268,7 +24665,7 @@ async function fetchOraclePrices(chainIds, rpcOverrides, lists = {}, retries = 3
       rpcOverrides
     );
     const usdPrices = { ...basePrices };
-    const parseTracker = (tracker) => {
+    const parseTracker = (tracker, updatePrices = true) => {
       const dataSlice = multicallResult.slice(
         tracker.offset,
         tracker.offset + tracker.count
@@ -24279,14 +24676,17 @@ async function fetchOraclePrices(chainIds, rpcOverrides, lists = {}, retries = 3
         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 lender = entry.targetLender ?? tracker.lender;
+        if (!chainResult[lender]) {
+          chainResult[lender] = [];
+        }
+        chainResult[lender].push(entry);
+        if (updatePrices) {
+          const oracleKey = tokenList[entry.asset]?.assetGroup ?? `${chainId}-${entry.asset}`;
+          usdPrices[oracleKey] = entry.priceUSD;
+          usdPrices[entry.asset] = entry.priceUSD;
+        }
       }
     };
     const nonMorphoTrackers = fetcherTracker.filter(
@@ -24314,7 +24714,7 @@ async function fetchOraclePrices(chainIds, rpcOverrides, lists = {}, retries = 3
       (t) => t.parse === morphoFetcher.parse
     );
     for (const tracker of morphoTrackers) {
-      parseTracker(tracker);
+      parseTracker(tracker, false);
     }
     return { chainId, data: chainResult };
   });
@@ -24834,7 +25234,237 @@ function parseMulticallRpcResponses(responses, batches, allowFailure = true) {
   });
   return allResults;
 }
+var ERC20MetadataAbi = [
+  {
+    inputs: [],
+    name: "name",
+    outputs: [{ internalType: "string", name: "", type: "string" }],
+    stateMutability: "view",
+    type: "function"
+  },
+  {
+    inputs: [],
+    name: "symbol",
+    outputs: [{ internalType: "string", name: "", type: "string" }],
+    stateMutability: "view",
+    type: "function"
+  },
+  {
+    inputs: [],
+    name: "decimals",
+    outputs: [{ internalType: "uint8", name: "", type: "uint8" }],
+    stateMutability: "view",
+    type: "function"
+  }
+];
+async function fetchTokenMetadata(chain, addrs) {
+  const tokens = {};
+  const client = getEvmClient(chain);
+  const results = await client.multicall({
+    allowFailure: false,
+    batchSize: 300,
+    contracts: addrs.map((addr) => [
+      {
+        abi: ERC20MetadataAbi,
+        functionName: "name",
+        address: addr,
+        args: []
+      },
+      {
+        abi: ERC20MetadataAbi,
+        functionName: "symbol",
+        address: addr,
+        args: []
+      },
+      {
+        abi: ERC20MetadataAbi,
+        functionName: "decimals",
+        address: addr,
+        args: []
+      }
+    ]).flat()
+  });
+  addrs.forEach((addr, i) => {
+    const name = results[i * 3];
+    const symbol = results[i * 3 + 1];
+    const decimals = results[i * 3 + 2];
+    const address = addr.toLowerCase();
+    tokens[address] = {
+      chainId: String(chain),
+      decimals,
+      name,
+      address,
+      symbol,
+      assetGroup: `${symbol}::${name}`,
+      currencyId: `${symbol}::${name}`
+    };
+  });
+  return tokens;
+}
+var BALANCE_FETCHER = "0x60134ad7491101c7fcb343ed8c7599e449430766";
+var BALANCE_FETCHER_SELECTOR = "0x30fb0985";
+function encodeBalanceFetcherCalldata(accounts, tokens) {
+  if (accounts.length < 1 || tokens.length < 1) {
+    return "0x";
+  }
+  const normalizedAccounts = accounts.map((a) => a.toLowerCase());
+  const normalizedTokens = tokens.map((t) => t.toLowerCase());
+  const header = encodePacked(
+    ["uint16", "uint16"],
+    [normalizedTokens.length, normalizedAccounts.length]
+  );
+  const accountsEncoded = encodePacked(
+    normalizedAccounts.map(() => "address"),
+    normalizedAccounts
+  ).slice(2);
+  const tokensEncoded = encodePacked(
+    normalizedTokens.map(() => "address"),
+    normalizedTokens
+  ).slice(2);
+  return header + accountsEncoded + tokensEncoded;
+}
+function decodeAbiEncodedBytes(hexData) {
+  const data = hexData.startsWith("0x") ? hexData.slice(2) : hexData;
+  const lengthHex = data.slice(64, 128);
+  const length = parseInt(lengthHex, 16);
+  const actualData = data.slice(128, 128 + length * 2);
+  return actualData;
+}
+function parseBalanceFetcherResult(hexData, users, tokens) {
+  let data = hexData.startsWith("0x") ? hexData.slice(2) : hexData;
+  if (data.length > 128 && data.slice(0, 64) === "0000000000000000000000000000000000000000000000000000000000000020") {
+    data = decodeAbiEncodedBytes(data);
+  }
+  let offset = 0;
+  const blockNumberHex = data.slice(offset, offset + 16);
+  const blockNumber = BigInt("0x" + blockNumberHex);
+  offset += 16;
+  const results = [];
+  while (offset < data.length) {
+    if (offset + 8 > data.length) break;
+    const userIndexHex = data.slice(offset, offset + 4);
+    const userIndex = parseInt(userIndexHex, 16);
+    offset += 4;
+    const countHex = data.slice(offset, offset + 4);
+    const count = parseInt(countHex, 16);
+    offset += 4;
+    const balances = {};
+    for (let i = 0; i < count; i++) {
+      if (offset + 32 > data.length) break;
+      const tokenIndexHex = data.slice(offset, offset + 4);
+      const tokenIndex = parseInt(tokenIndexHex, 16);
+      offset += 4;
+      const balanceHex = data.slice(offset, offset + 28);
+      const balance = balanceHex ? BigInt("0x" + balanceHex) : 0n;
+      offset += 28;
+      const tokenAddress = tokens[tokenIndex];
+      if (tokenAddress) {
+        balances[tokenAddress] = {
+          tokenIndex,
+          tokenAddress,
+          balance
+        };
+      }
+    }
+    results.push({
+      userIndex,
+      userAddress: users[userIndex],
+      balances
+    });
+  }
+  return {
+    balances: results,
+    blockNumber
+  };
+}
+function prepareTokenBalanceRpcCalls(chainId, account, tokens, blockTag = "latest") {
+  const normalizedAccount = account.toLowerCase();
+  const normalizedTokens = tokens.map((t) => t.toLowerCase());
+  const tokensWithNative = [zeroAddress, ...normalizedTokens];
+  const encodedCalldata = encodeBalanceFetcherCalldata([normalizedAccount], tokensWithNative);
+  const dataLength = (encodedCalldata.length - 2) / 2;
+  const paddedLength = Math.ceil(dataLength / 32) * 32;
+  const offsetHex = "0000000000000000000000000000000000000000000000000000000000000020";
+  const lengthHex = dataLength.toString(16).padStart(64, "0");
+  const dataHex = encodedCalldata.slice(2).padEnd(paddedLength * 2, "0");
+  const fullCalldata = BALANCE_FETCHER_SELECTOR + offsetHex + lengthHex + dataHex;
+  const call = {
+    jsonrpc: "2.0",
+    id: 1,
+    method: "eth_call",
+    params: [
+      {
+        to: BALANCE_FETCHER,
+        data: fullCalldata
+      },
+      blockTag
+    ]
+  };
+  return {
+    call,
+    query: {
+      chainId,
+      account: normalizedAccount,
+      tokens: tokensWithNative
+    },
+    encodedCalldata
+  };
+}
+function parseTokenBalanceResult(rawResult, query2) {
+  if (!rawResult || rawResult === "0x") {
+    return {};
+  }
+  const parsed = parseBalanceFetcherResult(
+    rawResult,
+    [query2.account],
+    query2.tokens
+  );
+  if (parsed.balances.length === 0) {
+    return {};
+  }
+  const result = {};
+  const userBalances = parsed.balances[0].balances;
+  for (const token of query2.tokens) {
+    const balanceEntry = userBalances[token];
+    if (balanceEntry) {
+      result[token] = {
+        balanceRaw: balanceEntry.balance.toString(),
+        balance: balanceEntry.balance
+      };
+    } else {
+      result[token] = {
+        balanceRaw: "0",
+        balance: 0n
+      };
+    }
+  }
+  return result;
+}
+async function fetchTokenBalances(chainId, account, tokens, options = {}) {
+  const { blockTag = "latest", rpcUrl } = options;
+  const prepared = prepareTokenBalanceRpcCalls(chainId, account, tokens, blockTag);
+  const chain = getEvmChain(chainId);
+  const url = rpcUrl || chain.rpcUrls?.default?.http?.[0];
+  if (!url) {
+    throw new Error(`No RPC URL available for chain ${chainId}`);
+  }
+  const response = await fetch(url, {
+    method: "POST",
+    headers: {
+      "Content-Type": "application/json"
+    },
+    body: JSON.stringify(prepared.call)
+  });
+  if (!response.ok) {
+    throw new Error(`RPC request failed: ${response.status} ${response.statusText}`);
+  }
+  const result = await response.json();
+  if (result.error) {
+    throw new Error(`RPC error: ${JSON.stringify(result.error)}`);
+  }
+  return parseTokenBalanceResult(result.result || "0x", prepared.query);
+}
 
-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 };
+export { MORPHO_LENS, MorphoLensAbi, attachPricesToFlashLiquidity, buildMorphoTypeCall, buildMorphoTypeUserCallWithLens, buildPortfolioTotals, buildSummaries, calculateLeverage, calculateNetApr, calculateOverallNetApr, calculateWeightedAverage, convertLenderUserDataResult, createMarketUid, createMulticallRpcCall, createRawRpcCalls, decodeListaMarkets, decodeMarkets, decodePackedListaUserDataset, decodePackedMorphoUserDataset, encodeBalanceFetcherCalldata, fetchDefillamaData, fetchDefillamaHistData, fetchFlashLiquidityForChain, fetchGeneralYields, fetchMainPrices, fetchOraclePrices, fetchPendlePrices, fetchTokenBalances, fetchTokenMetadata, filterActiveLenders, filterLendersByProtocol, flattenToUSDPriceMap, fuseLenderData, generateLendingPairs, generateLendingPools, getAavesForChain, getLenderAssets, getLenderPublicData, getLenderPublicDataAll, getLenderPublicDataViaApi, getLenderUserDataMulti, getLenderUserDataResult, getLendersForChain, getMorphoTypeMarketConverter, getTopPairs, isAaveType, isAaveV2Type, isAaveV32Type, isAaveV3Type, isCompoundV3, isCompoundV3Type, isInit, isMorphoType, isMultiMarket, isYLDR, multicall3Abi, normalizeToBytes, parseBalanceFetcherResult, parseMulticallRpcResponses, parseRawRpcBatchResponses, parseRawRpcResponses, parseTokenBalanceResult, prepareLenderUserDataRpcCalls, prepareMulticallInputs, prepareTokenBalanceRpcCalls, unflattenLenderData };
 //# sourceMappingURL=index.js.map
 //# sourceMappingURL=index.js.map