@1delta/margin-fetcher 0.0.268 → 0.0.270

package/dist/index.js

@@ -5,7 +5,7 @@ import { Lender, isAaveType, isCompoundV3, isMultiMarket, isSiloV2Type, isSiloV3
 export { isAaveType, isAaveV2Type, isAaveV32Type, isAaveV3Type, isCompoundV3, isCompoundV3Type, isInit, isMorphoType, isMultiMarket, isYLDR } from '@1delta/lender-registry';
 import lodash from 'lodash';
 import { getEvmChain, getEvmClient, getEvmClientUniversal, multicallRetryUniversal, getEvmClientWithCustomRpcsUniversal } from '@1delta/providers';
-import { FluidLendingResolverAbi, MetaMorphoAbi, MoolahVaultAbi, MorphoLensAbi, AaveV4SpokeAbi, AaveV4OracleAbi, AaveV4HubAbi, FluidVaultResolverAbi, DolomiteMarginAbi, GearboxMarketCompressorV310Abi, MorphoBlueAbi, GearboxCreditAccountCompressorV310Abi } from '@1delta/abis';
+import { FluidLendingResolverAbi, FluidVaultResolverAbi, MetaMorphoAbi, MoolahVaultAbi, MorphoBlueAbi, MorphoLensAbi, AaveV4SpokeAbi, AaveV4OracleAbi, AaveV4HubAbi, DolomiteMarginAbi, GearboxMarketCompressorV310Abi, GearboxCreditAccountCompressorV310Abi } from '@1delta/abis';
 export { MorphoLensAbi } from '@1delta/abis';
 import { prepareDebitDataMulticall, prepareLenderDebitMulticall, parseDebitDataResult, parseLenderDebitResult, getPermit2ContractAddress, getCompoundV3CometAddress as getCompoundV3CometAddress$1, getMorphoAddress, getAaveCollateralTokenAddress, getSiloHalfForUnderlying, InitMarginAddresses, getLstAcceptedInputs } from '@1delta/calldata-sdk';
 import { proxyNativeFetch } from '@1delta/proxy-fetch';
@@ -12487,17 +12487,17 @@ function convertMarketsToMorphoResponse(response, chainId, additionalYields = {
 var query = (first, skip, chainId, includeUnlisted = false) => `
 query GetMarkets {
   markets(first: ${first}, skip: ${skip}, where:  {
-     chainId_in: [${chainId}]${includeUnlisted ? "" : ",\n     whitelisted: true"}
+     chainId_in: [${chainId}]${includeUnlisted ? "" : ",\n     listed: true"}
   },
   orderBy: SupplyAssetsUsd,
   orderDirection: Desc
   ) {
     items {
-      uniqueKey
+      uniqueKey: marketId
       irmAddress
       oracleAddress
       lltv
-      whitelisted
+      whitelisted: listed
       loanAsset {
         address
         name
@@ -12537,6 +12537,13 @@ query GetMarkets {
 }
 `;
 var BASE_URL = "https://blue-api.morpho.org/graphql";
+function assertNoGraphQLErrors(json) {
+  if (json?.errors?.length) {
+    throw new Error(
+      `Morpho markets API GraphQL error: ${json.errors.map((e) => e?.message).join("; ")}`
+    );
+  }
+}
 async function fetchMorphoMarkets(chainId, includeUnlisted = false) {
   if (chainId !== Chain.ETHEREUM_MAINNET) {
     const requestBody = {
@@ -12556,6 +12563,7 @@ async function fetchMorphoMarkets(chainId, includeUnlisted = false) {
       );
     }
     const data = await response.json();
+    assertNoGraphQLErrors(data);
     return data.data;
   }
   const requestBody0 = {
@@ -12582,6 +12590,8 @@ async function fetchMorphoMarkets(chainId, includeUnlisted = false) {
       body: JSON.stringify(requestBody1)
     }).then((x) => x.json())
   ]);
+  assertNoGraphQLErrors(data0);
+  assertNoGraphQLErrors(data1);
   return {
     markets: {
       items: [...data0.data.markets.items, ...data1.data.markets.items]
@@ -19873,8 +19883,8 @@ var getDolomitePublicDataConverter = (lender, chainId, _prices, additionalYields
         const isClosing = Boolean(data[base + 1 /* isClosing */]);
         const config = buildDolomiteConfigs(marketId, p, R, isClosing, emode);
         const liquidity = Number(totalDeposits) - Number(totalDebt);
-        const marketUid = createMarketUid(chainId, lender, underlying);
-        result[underlying] = {
+        const marketUid = createMarketUid(chainId, lender, String(marketId));
+        result[marketUid] = {
           marketUid,
           name: lenderShortName(lender) + " " + (meta?.symbol ?? ""),
           poolId: underlying,
@@ -20932,8 +20942,8 @@ function convertDolomiteSubgraphMarkets(raw, chainId, prices, additionalYields,
       isClosing,
       emode
     );
-    const marketUid = createMarketUid(chainId, LENDER, underlying);
-    result[underlying] = {
+    const marketUid = createMarketUid(chainId, LENDER, String(info.token.marketId));
+    result[marketUid] = {
       marketUid,
       name: lenderShortName(LENDER) + " " + (meta?.symbol ?? info.token.symbol ?? ""),
       poolId: underlying,
@@ -23935,6 +23945,7 @@ var getDolomiteUserDataConverter = (lender, chainId, account, metaMap) => {
         const marketIds = res?.[0 /* markets */] ?? [];
         const tokens = res?.[1 /* tokens */] ?? [];
         const weis = res?.[3 /* weis */] ?? [];
+        const pars = res?.[2 /* pars */] ?? [];
         modes[id] = resolveDolomiteMode(
           marketIds.map((m) => String(m)),
           emode
@@ -23943,7 +23954,7 @@ var getDolomiteUserDataConverter = (lender, chainId, account, metaMap) => {
           const wei = weis[k];
           if (!wei) return;
           const underlying = normalizeUnderlying3(token);
-          const key = createMarketUid(chainId, lender, underlying);
+          const key = createMarketUid(chainId, lender, String(marketIds[k]));
           const meta = metaMap?.[key];
           if (!meta) return;
           const decimals = meta.asset?.decimals ?? 18;
@@ -23951,6 +23962,7 @@ var getDolomiteUserDataConverter = (lender, chainId, account, metaMap) => {
           const isSupply = wei.sign;
           const deposits = isSupply ? amount : "0";
           const debt = isSupply ? "0" : amount;
+          const debtPar = isSupply ? "0" : pars[k]?.value?.toString() ?? "0";
           const price2 = getDisplayPrice(meta);
           const oPrice = getOraclePrice(meta);
           const priceHist = meta?.price?.priceUsd24h ?? price2;
@@ -23961,6 +23973,7 @@ var getDolomiteUserDataConverter = (lender, chainId, account, metaMap) => {
             underlying,
             deposits,
             debt,
+            debtPar,
             debtStable: "0",
             debtStableUSD: 0,
             depositsUSD: price2 * Number(deposits),
@@ -29277,10 +29290,12 @@ var buildApiQuery = (account, chainId) => `
 {
   userByAddress(address: "${account}", chainId: ${chainId}) {
     marketPositions {
-      market { uniqueKey }
-      supplyShares
-      borrowShares
-      collateral
+      market { uniqueKey: marketId }
+      state {
+        supplyShares
+        borrowShares
+        collateral
+      }
     }
   }
 }`;
@@ -29413,14 +29428,17 @@ async function fetchBalancesFromApi(chainId, account, proxyConfig) {
   const positions = json.data?.userByAddress?.marketPositions ?? [];
   const result = [];
   for (const pos of positions) {
-    if (!isNonZero(pos.supplyShares) && !isNonZero(pos.borrowShares) && !isNonZero(pos.collateral)) {
+    const supplyShares = pos.state?.supplyShares ?? 0;
+    const borrowShares = pos.state?.borrowShares ?? 0;
+    const collateral = pos.state?.collateral ?? 0;
+    if (!isNonZero(supplyShares) && !isNonZero(borrowShares) && !isNonZero(collateral)) {
       continue;
     }
     result.push({
       marketId: pos.market.uniqueKey.toLowerCase(),
-      supplyShares: String(pos.supplyShares),
-      borrowShares: String(pos.borrowShares),
-      collateral: String(pos.collateral)
+      supplyShares: String(supplyShares),
+      borrowShares: String(borrowShares),
+      collateral: String(collateral)
     });
   }
   return result;
@@ -32928,13 +32946,13 @@ var MORPHO_GRAPHQL_URL = "https://blue-api.morpho.org/graphql";
 var PRICE_QUERY = (first, skip, chainId) => `
 query GetMarketPrices {
   markets(first: ${first}, skip: ${skip}, where: {
-    chainId_in: [${chainId}]${chainId != Chain.ETHEREUM_MAINNET ? `,whitelisted: true` : ""}
+    chainId_in: [${chainId}]${chainId != Chain.ETHEREUM_MAINNET ? `,listed: true` : ""}
   },
   orderBy: SupplyAssetsUsd,
   orderDirection: Desc
   ) {
     items {
-      uniqueKey
+      uniqueKey: marketId
       oracleAddress
       loanAsset {
         address
@@ -34145,7 +34163,7 @@ function parseDolomiteResults(data, meta, context) {
         asset,
         price: priceUSD,
         priceUSD,
-        marketUid: createMarketUid(chainId, LENDER2, asset),
+        marketUid: createMarketUid(chainId, LENDER2, String(mkt.marketId)),
         targetLender: LENDER2
       });
     } catch {
@@ -35602,6 +35620,30 @@ function attachPricesToFlashLiquidity(chainId, liq, prices, list = {}) {
   return liqCopy;
 }
 
+// src/vaults/exposure.ts
+var IDLE_MARKET_ID = "idle";
+function withIdleExposure(exposures, totalAssetsFormatted, pricePerUnit) {
+  if (!(totalAssetsFormatted > 0)) return exposures;
+  const deployed = exposures.reduce((sum, e) => sum + e.assets, 0);
+  const idleAssets = totalAssetsFormatted - deployed;
+  if (idleAssets <= totalAssetsFormatted * 1e-9) return exposures;
+  const out = [
+    ...exposures,
+    {
+      marketId: IDLE_MARKET_ID,
+      collateralAddress: "",
+      collateral: void 0,
+      assets: idleAssets,
+      assetsUsd: idleAssets * pricePerUnit,
+      weightPct: idleAssets / totalAssetsFormatted * 100,
+      supplyApr: 0,
+      idle: true
+    }
+  ];
+  out.sort((a, b) => b.weightPct - a.weightPct);
+  return out;
+}
+
 // src/vaults/fluid/publicCallBuild.ts
 var buildFluidFTokensCall = (chainId) => {
   const resolvers = fluidResolvers()?.[chainId];
@@ -35706,8 +35748,80 @@ var fetchFluidFTokens = async (chainId, multicallRetry, prices = {}, tokenList =
     abi: calls.map(() => FluidLendingResolverAbi)
   });
   const [converter] = getFluidFTokensConverter(chainId, prices, tokenList);
-  return converter(raw) ?? {};
+  const fTokens = converter(raw) ?? {};
+  try {
+    const exposuresByUnderlying = await fetchFluidExposures(
+      chainId,
+      multicallRetry,
+      prices,
+      tokenList
+    );
+    for (const underlying of Object.keys(fTokens)) {
+      const exposures = exposuresByUnderlying.get(underlying);
+      if (exposures?.length) fTokens[underlying].exposures = exposures;
+    }
+  } catch {
+  }
+  return fTokens;
 };
+async function fetchFluidExposures(chainId, multicallRetry, prices, tokenList) {
+  const out = /* @__PURE__ */ new Map();
+  const vaultCalls = buildFluidCall(chainId);
+  if (vaultCalls.length === 0) return out;
+  const rawVaults = await multicallRetry({
+    chain: chainId,
+    calls: vaultCalls,
+    abi: vaultCalls.map(() => FluidVaultResolverAbi)
+  });
+  const [convert] = getFluidPublicDataConverter(
+    "FLUID",
+    chainId,
+    prices,
+    { intrinsicYields: {}},
+    tokenList
+  );
+  const lenderMap = convert(rawVaults) ?? {};
+  const rowsByLoan = /* @__PURE__ */ new Map();
+  for (const lender of Object.keys(lenderMap)) {
+    const entry = lenderMap[lender];
+    const vault = entry?.params?.vault;
+    if (!vault) continue;
+    const loanAddress = (vault.loanAddress ?? "").toLowerCase();
+    const collateralAddress = (vault.collateralAddress ?? "").toLowerCase();
+    if (!loanAddress) continue;
+    const loanEntry = Object.values(entry.data ?? {}).find(
+      (d) => d?.borrowingEnabled && d?.underlying === loanAddress
+    );
+    if (!loanEntry) continue;
+    const assets = Number(loanEntry.totalDebt ?? 0);
+    if (!(assets > 0)) continue;
+    const assetsUsd = Number(loanEntry.totalDebtUSD ?? 0) || 0;
+    const row = {
+      marketId: (vault.vaultAddress ?? "").toLowerCase(),
+      collateralAddress,
+      collateral: collateralAddress ? tokenList[collateralAddress] : void 0,
+      assets,
+      assetsUsd,
+      supplyApr: Number(loanEntry.variableBorrowRate ?? 0) || 0
+    };
+    const list = rowsByLoan.get(loanAddress);
+    if (list) list.push(row);
+    else rowsByLoan.set(loanAddress, [row]);
+  }
+  for (const [loanAddress, rows] of rowsByLoan) {
+    const totalUsd = rows.reduce((s, r) => s + r.assetsUsd, 0);
+    const totalAssets = rows.reduce((s, r) => s + r.assets, 0);
+    const useUsd = totalUsd > 0;
+    const denom = useUsd ? totalUsd : totalAssets;
+    if (denom <= 0) continue;
+    const exposures = rows.map((r) => ({
+      ...r,
+      weightPct: (useUsd ? r.assetsUsd : r.assets) / denom * 100
+    })).sort((a, b) => b.weightPct - a.weightPct);
+    out.set(loanAddress, exposures);
+  }
+  return out;
+}
 
 // src/vaults/gearbox/publicCallBuild.ts
 var buildGearboxV3PoolsCall = (chainId) => {
@@ -35832,7 +35946,7 @@ query GetVaults {
   vaults(
     first: ${first},
     skip: ${skip},
-    where: { chainId_in: [${chainId}], whitelisted: true },
+    where: { chainId_in: [${chainId}], listed: true },
     orderBy: TotalAssetsUsd,
     orderDirection: Desc
   ) {
@@ -35840,7 +35954,7 @@ query GetVaults {
       address
       symbol
       name
-      whitelisted
+      whitelisted: listed
       asset {
         address
         name
@@ -35892,6 +36006,11 @@ async function fetchPage(chainId, first, skip) {
     );
   }
   const json = await response.json();
+  if (json?.errors?.length) {
+    throw new Error(
+      `Morpho vaults API GraphQL error: ${json.errors.map((e) => e?.message).join("; ")}`
+    );
+  }
   return json?.data?.vaults?.items ?? [];
 }
 var parseCurators = (curators) => {
@@ -36238,7 +36357,12 @@ function parseVault4(entry, results, chainId, prices, tokenList) {
     liquidityUsd: totalAssetsFormatted * priceUsd
   };
 }
+var { chunk: chunk5 } = lodash;
 var LISTA_PROTOCOL = "LISTA_DAO";
+var LISTA_LENS_ABI = parseAbi([
+  "function getListaMarketDataCompact(address morpho, bytes32[] calldata marketsIds) external view returns (bytes memory data)"
+]);
+var LISTA_MARKET_CHUNK = 100;
 var PHASE1_CALLS = [
   "name",
   "symbol",
@@ -36247,9 +36371,11 @@ var PHASE1_CALLS = [
   "totalSupply",
   "fee",
   "feeRecipient",
-  "CURATOR"
+  "CURATOR",
+  "withdrawQueueLength"
 ];
 var PHASE1_PER_VAULT = PHASE1_CALLS.length;
+var WITHDRAW_QUEUE_LENGTH_INDEX = 8;
 var FEE_SCALE2 = 1e18;
 var isHex402 = (addr) => typeof addr === "string" && /^0x[0-9a-f]{40}$/i.test(addr);
 var lcOrUndefined2 = (addr) => {
@@ -36296,42 +36422,209 @@ var fetchListaVaultsFromChain = async (chainId, multicallRetry, prices = {}, tok
     allowFailure: true
   });
   const curatorRoleByVault = [];
+  const queueLenByVault = [];
   for (let i = 0; i < entries.length; i++) {
     const role = phase1[i * PHASE1_PER_VAULT + 7];
     curatorRoleByVault.push(isHex64(role) ? role : void 0);
+    queueLenByVault.push(
+      toNumberSafe2(phase1[i * PHASE1_PER_VAULT + WITHDRAW_QUEUE_LENGTH_INDEX])
+    );
   }
-  const phase2Calls = entries.map((entry, i) => ({
-    address: entry.vault,
-    name: "getRoleMember",
-    params: [curatorRoleByVault[i] ?? zeroHash, 0n]
-  }));
+  const phase2Calls = [];
+  const phase2Meta = [];
+  entries.forEach((entry, i) => {
+    phase2Calls.push({
+      address: entry.vault,
+      name: "getRoleMember",
+      params: [curatorRoleByVault[i] ?? zeroHash, 0n]
+    });
+    phase2Meta.push({ kind: "curator", vault: i });
+    for (let q = 0; q < queueLenByVault[i]; q++) {
+      phase2Calls.push({
+        address: entry.vault,
+        name: "withdrawQueue",
+        params: [BigInt(q)]
+      });
+      phase2Meta.push({ kind: "queue", vault: i });
+    }
+  });
   const phase2 = await multicallRetry({
     chain: chainId,
     calls: phase2Calls,
     abi: phase2Calls.map(() => MoolahVaultAbi),
     allowFailure: true
   });
+  const curatorAddrByVault = entries.map(() => void 0);
+  const marketIdsByVault = entries.map(() => []);
+  phase2.forEach((res, k) => {
+    const meta = phase2Meta[k];
+    if (meta.kind === "curator") {
+      if (curatorRoleByVault[meta.vault]) curatorAddrByVault[meta.vault] = res;
+    } else if (isHex64(res)) {
+      marketIdsByVault[meta.vault].push(res.toLowerCase());
+    }
+  });
+  const moolah = morphoPools()?.[LISTA_PROTOCOL]?.[chainId];
+  const allMarketIds = [...new Set(marketIdsByVault.flat())];
+  const [rateMap, positionMap] = await Promise.all([
+    fetchListaMarketRates(chainId, moolah, allMarketIds, multicallRetry),
+    fetchVaultSupplyShares(
+      chainId,
+      moolah,
+      entries,
+      marketIdsByVault,
+      multicallRetry
+    )
+  ]);
   const out = {};
   for (let i = 0; i < entries.length; i++) {
     const entry = entries[i];
-    const slice = phase1.slice(
-      i * PHASE1_PER_VAULT,
-      (i + 1) * PHASE1_PER_VAULT
-    );
-    const curatorAddrRaw = curatorRoleByVault[i] ? phase2[i] : void 0;
+    const slice = phase1.slice(i * PHASE1_PER_VAULT, (i + 1) * PHASE1_PER_VAULT);
     const parsed = parseVault5(
       entry,
       slice,
-      curatorAddrRaw,
+      curatorAddrByVault[i],
       chainId,
       prices,
-      tokenList
+      tokenList,
+      marketIdsByVault[i],
+      rateMap,
+      positionMap
     );
     if (parsed) out[parsed.address] = parsed;
   }
   return out;
 };
-function parseVault5(entry, results, curatorAddrRaw, chainId, prices, tokenList) {
+async function fetchListaMarketRates(chainId, moolah, marketIds, multicallRetry) {
+  const map = /* @__PURE__ */ new Map();
+  const lens = MORPHO_LENS[chainId];
+  if (!moolah || !lens || marketIds.length === 0) return map;
+  const groups = chunk5(marketIds, LISTA_MARKET_CHUNK);
+  const calls = groups.map((group) => ({
+    address: lens,
+    name: "getListaMarketDataCompact",
+    params: [moolah, group]
+  }));
+  const raw = await multicallRetry({
+    chain: chainId,
+    calls,
+    abi: calls.map(() => LISTA_LENS_ABI),
+    allowFailure: true
+  });
+  groups.forEach((group, c) => {
+    const bytes = raw[c];
+    if (!bytes || bytes === "0x") return;
+    let decoded;
+    try {
+      decoded = decodeMarkets(bytes);
+    } catch {
+      return;
+    }
+    decoded.forEach((mkt, j) => {
+      const id = group[j]?.toLowerCase();
+      if (!id) return;
+      const utilization = MathLib.getUtilization({
+        totalSupplyAssets: mkt.totalSupplyAssets,
+        totalBorrowAssets: mkt.totalBorrowAssets
+      });
+      let supplyApy = 0n;
+      try {
+        const borrowApy = MathLib.getListaBorrowApy(
+          mkt.rateAtTarget,
+          utilization,
+          void 0,
+          Number(mkt.lastUpdate),
+          mkt.rateCap,
+          mkt.rateFloor
+        );
+        supplyApy = MathLib.getSupplyApy(borrowApy, utilization, mkt.fee);
+      } catch {
+      }
+      map.set(id, {
+        supplyApr: apyToApr(Number(formatEther(supplyApy))) * 100,
+        totalSupplyAssets: mkt.totalSupplyAssets,
+        totalSupplyShares: mkt.totalSupplyShares,
+        collateralAddress: (mkt.collateralToken ?? "").toLowerCase()
+      });
+    });
+  });
+  return map;
+}
+async function fetchVaultSupplyShares(chainId, moolah, entries, marketIdsByVault, multicallRetry) {
+  const map = /* @__PURE__ */ new Map();
+  if (!moolah) return map;
+  const calls = [];
+  const keys = [];
+  entries.forEach((entry, i) => {
+    const vault = entry.vault.toLowerCase();
+    for (const id of marketIdsByVault[i]) {
+      calls.push({
+        address: moolah,
+        name: "position",
+        params: [id, entry.vault]
+      });
+      keys.push(`${vault}:${id}`);
+    }
+  });
+  if (calls.length === 0) return map;
+  const res = await multicallRetry({
+    chain: chainId,
+    calls,
+    abi: calls.map(() => MorphoBlueAbi),
+    allowFailure: true
+  });
+  res.forEach((r, k) => {
+    const supplyShares = Array.isArray(r) ? r[0] : r?.supplyShares;
+    if (supplyShares == null) return;
+    try {
+      map.set(keys[k], BigInt(supplyShares));
+    } catch {
+    }
+  });
+  return map;
+}
+function computeVaultAllocation(vaultAddress, decimals, totalAssetsFormatted, feePercent, priceUsd, marketIds, rateMap, positionMap, tokenList) {
+  if (totalAssetsFormatted <= 0) {
+    return { depositRate: 0, exposures: [] };
+  }
+  if (marketIds.length === 0) {
+    return {
+      depositRate: 0,
+      exposures: withIdleExposure([], totalAssetsFormatted, priceUsd)
+    };
+  }
+  let weighted = 0;
+  const exposures = [];
+  for (const id of marketIds) {
+    const rate = rateMap.get(id);
+    if (!rate || rate.totalSupplyShares === 0n) continue;
+    const shares = positionMap.get(`${vaultAddress}:${id}`);
+    if (!shares || shares === 0n) continue;
+    const allocAssetsRaw = shares * rate.totalSupplyAssets / rate.totalSupplyShares;
+    const allocAssets = Number(
+      parseRawAmount(allocAssetsRaw.toString(), decimals)
+    );
+    if (allocAssets <= 0) continue;
+    weighted += allocAssets * rate.supplyApr;
+    exposures.push({
+      marketId: id,
+      collateralAddress: rate.collateralAddress,
+      collateral: tokenList[rate.collateralAddress],
+      assets: allocAssets,
+      assetsUsd: allocAssets * priceUsd,
+      weightPct: allocAssets / totalAssetsFormatted * 100,
+      supplyApr: rate.supplyApr
+    });
+  }
+  exposures.sort((a, b) => b.weightPct - a.weightPct);
+  const grossApr = weighted / totalAssetsFormatted;
+  return {
+    depositRate: grossApr * (1 - feePercent / 100),
+    // Tag uninvested deposits as an idle entry so the breakdown sums to ~100%.
+    exposures: withIdleExposure(exposures, totalAssetsFormatted, priceUsd)
+  };
+}
+function parseVault5(entry, results, curatorAddrRaw, chainId, prices, tokenList, marketIds, rateMap, positionMap) {
   const address = entry?.vault?.toLowerCase();
   const underlying = entry?.underlying?.toLowerCase();
   if (!address || !underlying) return null;
@@ -36343,9 +36636,9 @@ function parseVault5(entry, results, curatorAddrRaw, chainId, prices, tokenList)
     totalSupplyRaw,
     feeRaw,
     /* feeRecipientRaw */
-    ,
     /* curatorRoleRaw */
     ,
+    ,
   ] = results;
   const assetMeta = tokenList[underlying];
   const decimals = Number(decimalsRaw ?? assetMeta?.decimals ?? 18);
@@ -36358,6 +36651,17 @@ function parseVault5(entry, results, curatorAddrRaw, chainId, prices, tokenList)
   const fallbackName = onchainName || (entry.name ?? "").trim();
   const symbol = toStringSafe2(symbolRaw);
   const fee = toNumberSafe2(feeRaw) / FEE_SCALE2 * 100;
+  const { depositRate, exposures } = computeVaultAllocation(
+    address,
+    decimals,
+    totalAssetsFormatted,
+    fee,
+    priceUsd,
+    marketIds,
+    rateMap,
+    positionMap,
+    tokenList
+  );
   return {
     address,
     underlying,
@@ -36372,9 +36676,9 @@ function parseVault5(entry, results, curatorAddrRaw, chainId, prices, tokenList)
     decimals,
     totalAssets,
     totalSupply,
-    supplyRate: 0,
+    supplyRate: depositRate,
     rewardsRate: 0,
-    depositRate: 0,
+    depositRate,
     fee,
     timelock: 0,
     whitelisted: true,
@@ -36387,7 +36691,8 @@ function parseVault5(entry, results, curatorAddrRaw, chainId, prices, tokenList)
     totalAssetsUsd: totalAssetsFormatted * priceUsd,
     liquidity: totalAssets,
     liquidityFormatted: totalAssetsFormatted,
-    liquidityUsd: totalAssetsFormatted * priceUsd
+    liquidityUsd: totalAssetsFormatted * priceUsd,
+    exposures: exposures.length > 0 ? exposures : void 0
   };
 }
 
@@ -36418,8 +36723,55 @@ query GetSiloVaults {
       userApr
     }
   }
+  positions(where: {chainId_in: [${chainId}], isVaultAllocation: true, isOpen: true}, limit: ${limit}) {
+    items {
+      accountId
+      marketId
+      sTokenBalance
+    }
+  }
+  markets(where: {chainId_in: [${chainId}]}, limit: ${limit}) {
+    items {
+      id
+      depositRate
+      collateralSharesSupply
+      collateralAssetsSupply
+      otherMarket { inputToken { id } }
+    }
+  }
 }
 `;
+function buildExposures(vaultId, totalAssetsFormatted, pricePerUnit, positionsByVault, marketMeta, tokenList) {
+  if (totalAssetsFormatted <= 0) return void 0;
+  const rows = positionsByVault.get(vaultId) ?? [];
+  const exposures = [];
+  for (const row of rows) {
+    const marketId = (row.marketId ?? "").toLowerCase();
+    if (!marketId) continue;
+    const meta = marketMeta.get(marketId);
+    if (!meta || meta.collateralShares <= 0) continue;
+    const shares = Number(row.sTokenBalance ?? 0);
+    if (!Number.isFinite(shares) || shares <= 0) continue;
+    const assets = shares * meta.collateralAssets / meta.collateralShares;
+    if (!(assets > 0) || assets > totalAssetsFormatted * 1.01) continue;
+    exposures.push({
+      marketId,
+      collateralAddress: meta.collateralAddress,
+      collateral: meta.collateralAddress ? tokenList[meta.collateralAddress] : void 0,
+      assets,
+      assetsUsd: assets * pricePerUnit,
+      weightPct: assets / totalAssetsFormatted * 100,
+      supplyApr: meta.supplyApr
+    });
+  }
+  exposures.sort((a, b) => b.weightPct - a.weightPct);
+  const withIdle = withIdleExposure(
+    exposures,
+    totalAssetsFormatted,
+    pricePerUnit
+  );
+  return withIdle.length > 0 ? withIdle : void 0;
+}
 var PERFORMANCE_FEE_SCALE = 1e16;
 var toRawAmount = (decimalString, decimals) => {
   if (!decimalString) return "0";
@@ -36429,7 +36781,7 @@ var toRawAmount = (decimalString, decimals) => {
     return "0";
   }
 };
-function parseVault6(v, chainId, prices, tokenList) {
+function parseVault6(v, chainId, prices, tokenList, exposures) {
   const address = (v?.id ?? "").toLowerCase();
   const assetAddr = (v?.asset?.id ?? "").toLowerCase();
   if (!address || !assetAddr) return null;
@@ -36485,7 +36837,8 @@ function parseVault6(v, chainId, prices, tokenList) {
     // Morpho / Fluid / Gearbox. Not suitable for hard withdraw validation.
     liquidity: totalAssetsRaw,
     liquidityFormatted: totalAssetsFormatted,
-    liquidityUsd: totalAssetsUsd
+    liquidityUsd: totalAssetsUsd,
+    exposures
   };
 }
 var fetchSiloVaults = async (chainId, prices = {}, tokenList = {}, options) => {
@@ -36508,12 +36861,46 @@ var fetchSiloVaults = async (chainId, prices = {}, tokenList = {}, options) => {
     );
   }
   const items = payload?.data?.vaults?.items ?? [];
+  const positions = payload?.data?.positions?.items ?? [];
+  const positionsByVault = /* @__PURE__ */ new Map();
+  for (const row of positions) {
+    const accountId = (row.accountId ?? "").toLowerCase();
+    if (!accountId) continue;
+    const list = positionsByVault.get(accountId);
+    if (list) list.push(row);
+    else positionsByVault.set(accountId, [row]);
+  }
+  const markets = payload?.data?.markets?.items ?? [];
+  const marketMeta = /* @__PURE__ */ new Map();
+  for (const m of markets) {
+    const id = (m.id ?? "").toLowerCase();
+    if (!id) continue;
+    const apr = Number(m.depositRate ?? 0);
+    marketMeta.set(id, {
+      collateralAddress: (m.otherMarket?.inputToken?.id ?? "").toLowerCase(),
+      supplyApr: Number.isFinite(apr) ? apr : 0,
+      collateralShares: Number(m.collateralSharesSupply ?? 0) || 0,
+      collateralAssets: Number(m.collateralAssetsSupply ?? 0) || 0
+    });
+  }
   const out = {};
   for (const v of items) {
     if (options?.protocolVersion && v.protocol?.protocolVersion !== options.protocolVersion) {
       continue;
     }
-    const parsed = parseVault6(v, chainId, prices, tokenList);
+    const vaultId = (v.id ?? "").toLowerCase();
+    const totalAssetsFormatted = Number(v.totalAssets ?? 0) || 0;
+    const apiTotalAssetsUsd = Number(v.totalAssetsUsd ?? 0) || 0;
+    const pricePerUnit = totalAssetsFormatted > 0 && apiTotalAssetsUsd > 0 ? apiTotalAssetsUsd / totalAssetsFormatted : prices[(v.asset?.id ?? "").toLowerCase()] ?? 0;
+    const exposures = buildExposures(
+      vaultId,
+      totalAssetsFormatted,
+      pricePerUnit,
+      positionsByVault,
+      marketMeta,
+      tokenList
+    );
+    const parsed = parseVault6(v, chainId, prices, tokenList, exposures);
     if (parsed) out[parsed.address] = parsed;
   }
   return out;
@@ -45115,6 +45502,6 @@ async function fetchTokenBalances(chainId, account, tokens, options = {}) {
   return parseTokenBalanceResult(rawResult, prepared.query);
 }
 
-export { EMPTY_BALANCE, GMX_API_HOSTS, GMX_READ_CONTRACTS, GMX_SUPPORTED_CHAINS, HYPERCORE_VAULT_REGISTRY, INTERFACE_IDS, LAGOON_API_URL, LAGOON_CHAIN_IDS, MORPHO_LENS, MaxParamThresholds, STABLECOIN_SYMBOLS, VAULT_SHARE_PRICE_PROBE, VOLATILE_VAULT_OVERRIDES, accountDepositListKey, accountWithdrawalListKey, appendSnapshot, applyPositionDelta, attachPricesToFlashLiquidity, buildFluidFTokensCall, buildLoopResult, buildMorphoTypeCall, buildMorphoTypeUserCallWithLens, buildPortfolioTotals, buildSumerAccumulators, buildSummaries, buildVaultLookup, calculateLeverage, calculateNetApr, calculateOverallNetApr, calculateWeightedAverage, classifyVault, computeBorrowDelta2 as computeBorrowDelta, computeCloseTradeDeltas, computeCollateralSwapDeltas, computeDebtSwapDeltas, computeDepositDelta2 as computeDepositDelta, computeEModeAnalysis, computeOpenTradeDeltas, computePostTradeMetrics, computeRepayDelta2 as computeRepayDelta, computeSumerBorrowDelta, computeSumerDepositDelta, computeSumerRepayDelta, computeSumerWaterfall, computeSumerWithdrawDelta, computeVaultApr, computeWithdrawDelta2 as computeWithdrawDelta, computeZapTradeDeltas, convertLenderUserDataResult, createMarketUid, createMulticallRpcCall, createRawRpcCalls, decodeListaMarkets, decodeMarkets, decodePackedListaUserDataset, decodePackedMorphoUserDataset, detectInterfaceKinds, encodeBalanceFetcherCalldata, fetchEulerEarnVaults, fetchEulerEarnVaultsFromSubgraph, fetchEulerSubAccountIndexes, fetchFlashLiquidityForChain, fetchFluidFTokens, fetchGeneralYields, fetchGeneralYieldsByMarketUid, fetchGmxExecutionFees, fetchGmxTickerPrices, fetchGmxVaults, fetchHypercoreVaults, fetchLagoonApiVaults, fetchLagoonVaults, fetchListaVaultsFromChain, fetchMorphoUserBalances, fetchMorphoUserPositionMarkets, fetchMorphoVaults, fetchMorphoVaultsFromApi, fetchMorphoVaultsFromChain, fetchMorphoVaultsFromSubgraph, fetchOraclePrices, fetchPendlePrices, fetchSiloVaults, fetchTokenBalances, fetchTokenMetadata, filterActiveLenders, filterLendersByProtocol, fuseLenderData, generateLendingPools, getAavesForChain, getAssetConfig, getBalanceForMarketUid, getBorrowCapacity, getFluidFTokensConverter, getGmxApiHost, getGmxReadContracts, getGmxUserPositions, getHealthFactor, getHypercoreUserPositions, getHypercoreVaultRegistry, getLenderAssets, getLenderPublicData, getLenderPublicDataAll, getLenderPublicDataViaApi, getLenderUserDataMulti, getLenderUserDataResult, getLendersForChain, getLstWithdrawalRegistry, getLstWithdrawalRequests, getMaxAmountClose, getMaxAmountCollateralSwap, getMaxAmountDebtSwap, getMaxAmountOpen, getMergedUserData, getMorphoTypeMarketConverter, getSubAccountAddress, getSubAccountIndex, getVaultPublicDataAll, getVaultWithdrawalRequests, hasEulerEarnVaultSubgraph, hasLagoonVaults, hasMorphoPositionIndex, hasMorphoUserApi, hasMorphoUserSubgraph, hasMorphoVaultSubgraph, isStablecoinSymbol, keysFromMaps, multicall3Abi, nanTo, needsLenderApproval, needsTokenApproval, noOpResult, normalizeToBytes, parseBalanceFetcherResult, parseMergedResult, parseMulticallRpcResponses, parseRawRpcBatchResponses, parseRawRpcResponses, parseTokenBalanceResult, positivePart2 as positivePart, prepareLenderUserDataRpcCalls, prepareMergedMulticallParams, prepareMergedRpcCalls, prepareMulticallInputs, prepareTokenBalanceRpcCalls, priceGlvVaults, priceGmMarkets, readVaultSharePrices, selectAssetGroupPrices, stampVaultClassification, unflattenLenderData };
+export { EMPTY_BALANCE, GMX_API_HOSTS, GMX_READ_CONTRACTS, GMX_SUPPORTED_CHAINS, HYPERCORE_VAULT_REGISTRY, IDLE_MARKET_ID, INTERFACE_IDS, LAGOON_API_URL, LAGOON_CHAIN_IDS, MORPHO_LENS, MaxParamThresholds, STABLECOIN_SYMBOLS, VAULT_SHARE_PRICE_PROBE, VOLATILE_VAULT_OVERRIDES, accountDepositListKey, accountWithdrawalListKey, appendSnapshot, applyPositionDelta, attachPricesToFlashLiquidity, buildFluidFTokensCall, buildLoopResult, buildMorphoTypeCall, buildMorphoTypeUserCallWithLens, buildPortfolioTotals, buildSumerAccumulators, buildSummaries, buildVaultLookup, calculateLeverage, calculateNetApr, calculateOverallNetApr, calculateWeightedAverage, classifyVault, computeBorrowDelta2 as computeBorrowDelta, computeCloseTradeDeltas, computeCollateralSwapDeltas, computeDebtSwapDeltas, computeDepositDelta2 as computeDepositDelta, computeEModeAnalysis, computeOpenTradeDeltas, computePostTradeMetrics, computeRepayDelta2 as computeRepayDelta, computeSumerBorrowDelta, computeSumerDepositDelta, computeSumerRepayDelta, computeSumerWaterfall, computeSumerWithdrawDelta, computeVaultApr, computeWithdrawDelta2 as computeWithdrawDelta, computeZapTradeDeltas, convertLenderUserDataResult, createMarketUid, createMulticallRpcCall, createRawRpcCalls, decodeListaMarkets, decodeMarkets, decodePackedListaUserDataset, decodePackedMorphoUserDataset, detectInterfaceKinds, encodeBalanceFetcherCalldata, fetchDolomiteAccountNumbers, fetchEulerEarnVaults, fetchEulerEarnVaultsFromSubgraph, fetchEulerSubAccountIndexes, fetchFlashLiquidityForChain, fetchFluidFTokens, fetchGeneralYields, fetchGeneralYieldsByMarketUid, fetchGmxExecutionFees, fetchGmxTickerPrices, fetchGmxVaults, fetchHypercoreVaults, fetchLagoonApiVaults, fetchLagoonVaults, fetchListaVaultsFromChain, fetchMorphoUserBalances, fetchMorphoUserPositionMarkets, fetchMorphoVaults, fetchMorphoVaultsFromApi, fetchMorphoVaultsFromChain, fetchMorphoVaultsFromSubgraph, fetchOraclePrices, fetchPendlePrices, fetchSiloVaults, fetchTokenBalances, fetchTokenMetadata, filterActiveLenders, filterLendersByProtocol, fuseLenderData, generateLendingPools, getAavesForChain, getAssetConfig, getBalanceForMarketUid, getBorrowCapacity, getFluidFTokensConverter, getGmxApiHost, getGmxReadContracts, getGmxUserPositions, getHealthFactor, getHypercoreUserPositions, getHypercoreVaultRegistry, getLenderAssets, getLenderPublicData, getLenderPublicDataAll, getLenderPublicDataViaApi, getLenderUserDataMulti, getLenderUserDataResult, getLendersForChain, getLstWithdrawalRegistry, getLstWithdrawalRequests, getMaxAmountClose, getMaxAmountCollateralSwap, getMaxAmountDebtSwap, getMaxAmountOpen, getMergedUserData, getMorphoTypeMarketConverter, getResolvedDolomiteAccountNumbers, getSubAccountAddress, getSubAccountIndex, getVaultPublicDataAll, getVaultWithdrawalRequests, hasEulerEarnVaultSubgraph, hasLagoonVaults, hasMorphoPositionIndex, hasMorphoUserApi, hasMorphoUserSubgraph, hasMorphoVaultSubgraph, isStablecoinSymbol, keysFromMaps, multicall3Abi, nanTo, needsLenderApproval, needsTokenApproval, noOpResult, normalizeToBytes, parseBalanceFetcherResult, parseMergedResult, parseMulticallRpcResponses, parseRawRpcBatchResponses, parseRawRpcResponses, parseTokenBalanceResult, positivePart2 as positivePart, prepareLenderUserDataRpcCalls, prepareMergedMulticallParams, prepareMergedRpcCalls, prepareMulticallInputs, prepareTokenBalanceRpcCalls, priceGlvVaults, priceGmMarkets, readVaultSharePrices, selectAssetGroupPrices, stampVaultClassification, unflattenLenderData };
 //# sourceMappingURL=index.js.map
 //# sourceMappingURL=index.js.map