@1delta/margin-fetcher 0.0.221 → 0.0.222

package/dist/index.js

@@ -6275,9 +6275,7 @@ globalThis[GLOBAL_LENDER_DATA_KEY] = {
   compoundV3Bulker: {},
   eulerConfigs: {},
   eulerVaults: {},
-  aaveV4Hubs: {},
   aaveV4Spokes: {},
-  aaveV4Reserves: {},
   aaveV4Oracles: {},
   aaveV4Peripherals: {}
 };
@@ -6304,15 +6302,18 @@ var initConfig = () => getGlobalData2()?.initConfig;
 var aaveOraclesConfig = () => getGlobalData2()?.aaveOraclesConfig;
 var eulerConfigs = () => getGlobalData2()?.eulerConfigs;
 var eulerVaults = () => getGlobalData2()?.eulerVaults;
-var aaveV4Hubs = () => getGlobalData2()?.aaveV4Hubs;
 var aaveV4Spokes = () => getGlobalData2()?.aaveV4Spokes;
-var aaveV4Reserves = () => getGlobalData2()?.aaveV4Reserves;
 var aaveV4Oracles = () => getGlobalData2()?.aaveV4Oracles;
-function aaveV4SpokeLenderKey(baseHubLender, spoke) {
-  if (!spoke || spoke.length < 4 || !spoke.startsWith("0x")) {
+function aaveV4SpokeLenderKey(spoke) {
+  if (!spoke || !spoke.startsWith("0x") || spoke.length !== 42) {
     throw new Error(`aaveV4SpokeLenderKey: invalid spoke address ${spoke}`);
   }
-  return `${baseHubLender}_${spoke.slice(2).toUpperCase()}`;
+  return `AAVE_V4_${spoke.slice(2).toUpperCase()}`;
+}
+function parseAaveV4SpokeLenderKey(lenderKey) {
+  const match = lenderKey.match(/^AAVE_V4_([0-9A-F]{40})$/);
+  if (!match) return void 0;
+  return { spokeAddrLower: "0x" + match[1].toLowerCase() };
 }
 var getListUrl = (chainId) => `https://raw.githubusercontent.com/1delta-DAO/token-lists/main/${chainId}.json`;
 async function fetchTokenList(chainId) {
@@ -7544,9 +7545,10 @@ var getLendersForChain = (c) => {
       if (data[c]?.length > 0) lenders.push(l);
     });
   }
-  Object.entries(aaveV4Spokes() ?? {}).forEach(([l, data]) => {
-    if (data[c]?.length > 0) lenders.push(l);
-  });
+  const v4ChainSpokes = aaveV4Spokes()?.[c] ?? {};
+  for (const spokeAddr of Object.keys(v4ChainSpokes)) {
+    lenders.push(aaveV4SpokeLenderKey(spokeAddr));
+  }
   return lenders;
 };
 var filterLendersByProtocol = (allLenders, protocolList) => {
@@ -17925,156 +17927,106 @@ var MAX_HUB_ASSETS = 25;
 function isValidAddress(addr) {
   return !!addr && addr !== "0x" && addr.length > 2;
 }
-function getSpokeReserves(reservesMap, spokeAddr) {
-  return reservesMap[spokeAddr.toLowerCase()] ?? reservesMap[spokeAddr] ?? [];
-}
-function getReserveAssetId(entry) {
-  if (typeof entry === "object" && entry != null) {
-    const v = entry.assetId;
-    if (typeof v === "number") return v;
-  }
-  return void 0;
-}
 function getDynamicConfigCount(spokeEntry) {
-  const max = spokeEntry.dynamicConfigKeyMax ?? 0;
+  const max = spokeEntry?.dynamicConfigKeyMax ?? 0;
   return max + 1;
 }
+function resolveSpokeEntry(chainId, lender) {
+  const parsed = parseAaveV4SpokeLenderKey(lender);
+  if (!parsed) return void 0;
+  return aaveV4Spokes()?.[chainId]?.[parsed.spokeAddrLower];
+}
+function distinctHubsInOrder(reserves) {
+  const seen = /* @__PURE__ */ new Set();
+  const out = [];
+  for (const r of reserves) {
+    const h = (r?.hub ?? "").toLowerCase();
+    if (!h || !isValidAddress(h)) continue;
+    if (seen.has(h)) continue;
+    seen.add(h);
+    out.push(h);
+  }
+  return out;
+}
 var buildAaveV4LenderReserveCall = (chainId, lender) => {
-  const spokes = aaveV4Spokes()?.[lender]?.[chainId] ?? [];
-  const reservesMap = aaveV4Reserves()?.[lender]?.[chainId] ?? {};
-  if (spokes.length === 0) return [];
+  const spokeEntry = resolveSpokeEntry(chainId, lender);
+  if (!spokeEntry) return [];
+  const spokeAddr = spokeEntry.spoke.toLowerCase();
+  if (!isValidAddress(spokeAddr)) return [];
+  const reserves = spokeEntry.reserves ?? [];
+  const dynConfigCount = getDynamicConfigCount(spokeEntry);
   const calls = [];
-  for (const spokeEntry of spokes) {
-    if (!isValidAddress(spokeEntry.spoke)) continue;
-    const spokeAddr = spokeEntry.spoke;
-    const reserves = getSpokeReserves(reservesMap, spokeAddr);
-    const dynConfigCount = getDynamicConfigCount(spokeEntry);
-    for (const entry of reserves) {
-      const rid = typeof entry === "number" ? entry : entry.reserveId;
-      calls.push(
-        {
-          address: spokeAddr,
-          name: "getReserve",
-          params: [rid]
-        },
-        {
-          address: spokeAddr,
-          name: "getReserveConfig",
-          params: [rid]
-        },
-        {
-          address: spokeAddr,
-          name: "getReserveSuppliedAssets",
-          params: [rid]
-        },
-        {
-          address: spokeAddr,
-          name: "getReserveDebt",
-          params: [rid]
-        },
-        {
-          address: spokeAddr,
-          name: "getReserveTotalDebt",
-          params: [rid]
-        }
-      );
-      for (let key = 0; key < dynConfigCount; key++) {
-        calls.push({
-          address: spokeAddr,
-          name: "getDynamicReserveConfig",
-          params: [rid, key]
-        });
-      }
-    }
-    calls.push({
-      address: spokeAddr,
-      name: "getLiquidationConfig",
-      params: []
-    });
-  }
-  for (const spokeEntry of spokes) {
-    if (!isValidAddress(spokeEntry.spoke)) continue;
-    const reserves = getSpokeReserves(reservesMap, spokeEntry.spoke);
-    const rids = reserves.map(
-      (e) => typeof e === "number" ? e : e.reserveId
+  for (const r of reserves) {
+    const rid = r.reserveId;
+    calls.push(
+      { address: spokeAddr, name: "getReserve", params: [rid] },
+      { address: spokeAddr, name: "getReserveConfig", params: [rid] },
+      { address: spokeAddr, name: "getReserveSuppliedAssets", params: [rid] },
+      { address: spokeAddr, name: "getReserveDebt", params: [rid] },
+      { address: spokeAddr, name: "getReserveTotalDebt", params: [rid] }
     );
-    if (rids.length > 0 && isValidAddress(spokeEntry.oracle)) {
+    for (let key = 0; key < dynConfigCount; key++) {
       calls.push({
-        address: spokeEntry.oracle,
-        name: "getReservesPrices",
-        params: [rids]
+        address: spokeAddr,
+        name: "getDynamicReserveConfig",
+        params: [rid, key]
       });
     }
   }
-  const hubEntry = aaveV4Hubs()?.[lender]?.[chainId];
-  if (hubEntry?.hub && isValidAddress(hubEntry.hub)) {
-    const hubAddr = hubEntry.hub.toLowerCase();
+  calls.push({
+    address: spokeAddr,
+    name: "getLiquidationConfig",
+    params: []
+  });
+  const reserveIds = reserves.map((r) => r.reserveId);
+  if (reserveIds.length > 0 && isValidAddress(spokeEntry.oracle)) {
     calls.push({
-      address: hubAddr,
-      name: "getAssetCount",
-      params: []
+      address: spokeEntry.oracle.toLowerCase(),
+      name: "getReservesPrices",
+      params: [reserveIds]
     });
+  }
+  const distinctHubs = distinctHubsInOrder(reserves);
+  for (const hub of distinctHubs) {
+    calls.push({ address: hub, name: "getAssetCount", params: [] });
     for (let i = 0; i < MAX_HUB_ASSETS; i++) {
       calls.push(
-        {
-          address: hubAddr,
-          name: "getAsset",
-          params: [i]
-        },
-        {
-          address: hubAddr,
-          name: "getAddedAssets",
-          params: [i]
-        },
-        {
-          address: hubAddr,
-          name: "getAssetTotalOwed",
-          params: [i]
-        }
+        { address: hub, name: "getAsset", params: [i] },
+        { address: hub, name: "getAddedAssets", params: [i] },
+        { address: hub, name: "getAssetTotalOwed", params: [i] }
       );
     }
-    for (const spokeEntry of spokes) {
-      if (!isValidAddress(spokeEntry.spoke)) continue;
-      const spokeAddr = spokeEntry.spoke;
-      const reserves = getSpokeReserves(reservesMap, spokeAddr);
-      for (const entry of reserves) {
-        const assetId = getReserveAssetId(entry);
-        if (assetId == null) continue;
-        calls.push({
-          address: hubAddr,
-          name: "getSpoke",
-          params: [assetId, spokeAddr]
-        });
-      }
+    for (const r of reserves) {
+      if ((r?.hub ?? "").toLowerCase() !== hub) continue;
+      const assetId = r.assetId;
+      if (typeof assetId !== "number") continue;
+      calls.push({
+        address: hub,
+        name: "getSpoke",
+        params: [assetId, spokeAddr]
+      });
     }
   }
   return calls;
 };
 var getAaveV4ExpectedCallCount = (chainId, lender) => {
-  const spokes = aaveV4Spokes()?.[lender]?.[chainId] ?? [];
-  const reservesMap = aaveV4Reserves()?.[lender]?.[chainId] ?? {};
+  const spokeEntry = resolveSpokeEntry(chainId, lender);
+  if (!spokeEntry) return 0;
+  if (!isValidAddress(spokeEntry.spoke)) return 0;
+  const reserves = spokeEntry.reserves ?? [];
+  const dynConfigCount = getDynamicConfigCount(spokeEntry);
   let count = 0;
-  for (const spokeEntry of spokes) {
-    if (!isValidAddress(spokeEntry.spoke)) continue;
-    const reserves = getSpokeReserves(reservesMap, spokeEntry.spoke);
-    const dynConfigCount = getDynamicConfigCount(spokeEntry);
-    count += reserves.length * (BASE_CALLS_PER_RESERVE + dynConfigCount) + CALLS_PER_SPOKE_TAIL;
-    const rids = reserves.map(
-      (e) => typeof e === "number" ? e : e.reserveId
-    );
-    if (rids.length > 0 && isValidAddress(spokeEntry.oracle)) {
-      count += 1;
-    }
+  count += reserves.length * (BASE_CALLS_PER_RESERVE + dynConfigCount);
+  count += CALLS_PER_SPOKE_TAIL;
+  if (reserves.length > 0 && isValidAddress(spokeEntry.oracle)) {
+    count += 1;
   }
-  const hubEntry = aaveV4Hubs()?.[lender]?.[chainId];
-  if (hubEntry?.hub && isValidAddress(hubEntry.hub)) {
+  const distinctHubs = distinctHubsInOrder(reserves);
+  for (const hub of distinctHubs) {
     count += 1 + MAX_HUB_ASSETS * 3;
-    for (const spokeEntry of spokes) {
-      if (!isValidAddress(spokeEntry.spoke)) continue;
-      const reserves = getSpokeReserves(reservesMap, spokeEntry.spoke);
-      for (const entry of reserves) {
-        if (getReserveAssetId(entry) != null) count += 1;
-      }
+    for (const r of reserves) {
+      if ((r?.hub ?? "").toLowerCase() !== hub) continue;
+      if (typeof r.assetId === "number") count += 1;
     }
   }
   return count;
@@ -18109,23 +18061,24 @@ function rayRateToApr(rateRay) {
   if (rateRay === 0n) return 0;
   return Number(rateRay) / RAY2 * 100;
 }
-function normalizeAaveV4(spokeDataList, chainId, baseHubLender, prices, additionalYields, tokenList, lenderShortNameFn, createMarketUidFn, toOracleKeyFn, toGenericPriceKeyFn, expectedHub) {
-  const out = {};
-  const hubFilter = expectedHub?.toLowerCase();
-  for (const spokeData of spokeDataList) {
+function normalizeAaveV4(spokeDataList, chainId, spokeLenderKeyArg, prices, additionalYields, tokenList, lenderShortNameFn, createMarketUidFn, toOracleKeyFn, toGenericPriceKeyFn) {
+  const spokeData = spokeDataList[0];
+  if (!spokeData) return void 0;
+  {
     const spokeAddr = spokeData.spoke.toLowerCase();
-    const spokeLenderKey = aaveV4SpokeLenderKey(baseHubLender, spokeAddr);
-    let spokeHub = "";
+    const parsedFromArg = parseAaveV4SpokeLenderKey(spokeLenderKeyArg);
+    const spokeLenderKey = parsedFromArg && parsedFromArg.spokeAddrLower === spokeAddr ? spokeLenderKeyArg : aaveV4SpokeLenderKey(spokeAddr);
     const spokeReserves = spokeData.reserves;
     const data = {};
     for (const reserve of spokeReserves) {
-      const reserveHub = reserve.reserve.hub?.toLowerCase();
-      if (hubFilter && reserveHub && reserveHub !== hubFilter)
-        continue;
-      if (!spokeHub) spokeHub = reserveHub ?? "";
+      const reserveHub = (reserve.reserve.hub ?? "").toLowerCase();
       const underlying = reserve.reserve.underlying.toLowerCase();
       const decimals = reserve.reserve.decimals;
-      const marketUid = createMarketUidFn(chainId, spokeLenderKey, underlying);
+      const marketUid = createMarketUidFn(
+        chainId,
+        spokeLenderKey,
+        String(reserve.reserveId)
+      );
       const assetMeta = tokenList[underlying];
       const oracleKey = toOracleKeyFn(assetMeta?.assetGroup ?? null) ?? toGenericPriceKeyFn(underlying, chainId);
       let price = 0;
@@ -18180,7 +18133,7 @@ function normalizeAaveV4(spokeDataList, chainId, baseHubLender, prices, addition
         reserve.dynamicConfigs
       )) {
         config[keyStr] = {
-          category: keyStr,
+          category: Number(keyStr),
           label: `${spokeData.label} / Config ${keyStr}`,
           borrowCollateralFactor: dynCfg.collateralFactor / BPS,
           collateralFactor: dynCfg.collateralFactor / BPS,
@@ -18191,7 +18144,7 @@ function normalizeAaveV4(spokeDataList, chainId, baseHubLender, prices, addition
       }
       if (Object.keys(config).length === 0) {
         config["0"] = {
-          category: "0",
+          category: 0,
           label: `${spokeData.label} / Default`,
           borrowCollateralFactor: 0,
           collateralFactor: 0,
@@ -18205,7 +18158,7 @@ function normalizeAaveV4(spokeDataList, chainId, baseHubLender, prices, addition
       );
       data[marketUid] = {
         marketUid,
-        name: lenderShortNameFn(baseHubLender) + " " + (assetMeta?.symbol ?? ""),
+        name: lenderShortNameFn(spokeLenderKey) + " " + (assetMeta?.symbol ?? ""),
         poolId: underlying,
         underlying,
         asset: assetMeta,
@@ -18238,167 +18191,155 @@ function normalizeAaveV4(spokeDataList, chainId, baseHubLender, prices, addition
         params: {
           metadata: {
             assetId: reserve.reserve.assetId,
-            reserveId: reserve.reserveId
+            reserveId: reserve.reserveId,
+            hub: reserveHub
           }
         },
         collateralRiskBps,
         riskPremiumThresholdBps
       };
     }
-    if (Object.keys(data).length > 0) {
-      out[spokeLenderKey] = {
-        data,
-        chainId,
-        params: {
-          spoke: spokeAddr,
-          hub: spokeHub,
-          oracle: spokeData.oracle.toLowerCase(),
-          baseHubLender,
-          label: spokeData.label
-        }
-      };
-    }
+    if (Object.keys(data).length === 0) return void 0;
+    return {
+      data,
+      chainId,
+      params: {
+        spoke: spokeAddr,
+        oracle: spokeData.oracle.toLowerCase(),
+        label: spokeData.label
+      }
+    };
   }
-  return out;
 }
 
 // src/lending/public-data/aave-v4-type/publicCallParse.ts
 function isValidAddress2(addr) {
   return !!addr && addr !== "0x" && addr.length > 2;
 }
-function getSpokeReserves2(reservesMap, spokeAddr) {
-  return reservesMap[spokeAddr.toLowerCase()] ?? reservesMap[spokeAddr] ?? [];
-}
 var getAaveV4ReservesDataConverter = (lender, chainId, prices, additionalYields, tokenList = {}) => {
   const expectedCalls = getAaveV4ExpectedCallCount(chainId, lender);
   const converter = (data) => {
     if (data.length !== expectedCalls) return void 0;
-    const spokes = aaveV4Spokes()?.[lender]?.[chainId] ?? [];
-    const reservesMap = aaveV4Reserves()?.[lender]?.[chainId] ?? {};
+    const parsed = parseAaveV4SpokeLenderKey(lender);
+    if (!parsed) return void 0;
+    const spokeEntry = aaveV4Spokes()?.[chainId]?.[parsed.spokeAddrLower];
+    if (!spokeEntry) return void 0;
+    const spokeAddr = spokeEntry.spoke.toLowerCase();
+    const reserves = spokeEntry.reserves ?? [];
+    const dynConfigCount = (spokeEntry.dynamicConfigKeyMax ?? 0) + 1;
     let offset = 0;
-    const spokeDataList = [];
-    for (const spokeEntry of spokes) {
-      if (!isValidAddress2(spokeEntry.spoke)) continue;
-      const spokeAddr = spokeEntry.spoke;
-      const reserves = getSpokeReserves2(reservesMap, spokeAddr);
-      const dynConfigCount = (spokeEntry.dynamicConfigKeyMax ?? 0) + 1;
-      const parsedReserves = [];
-      for (let i = 0; i < reserves.length; i++) {
-        const entry = reserves[i];
-        const reserveId = typeof entry === "number" ? entry : entry.reserveId;
-        const rawReserve = data[offset];
-        const rawConfig = data[offset + 1];
-        const rawSupplied = data[offset + 2];
-        const rawDebt = data[offset + 3];
-        const rawTotalDebt = data[offset + 4];
-        offset += BASE_CALLS_PER_RESERVE;
-        const dynamicConfigs = {};
-        for (let key = 0; key < dynConfigCount; key++) {
-          const rawDynConfig = data[offset];
-          offset += 1;
-          if (rawDynConfig && rawDynConfig !== "0x") {
-            dynamicConfigs[key] = {
-              collateralFactor: Number(
-                rawDynConfig?.collateralFactor ?? 0
-              ),
-              maxLiquidationBonus: Number(
-                rawDynConfig?.maxLiquidationBonus ?? 0
-              ),
-              liquidationFee: Number(
-                rawDynConfig?.liquidationFee ?? 0
-              )
-            };
-          }
-        }
-        const reserve = {
-          underlying: rawReserve?.underlying ?? "",
-          hub: rawReserve?.hub ?? "",
-          assetId: Number(rawReserve?.assetId ?? 0),
-          decimals: Number(rawReserve?.decimals ?? 18),
-          collateralRisk: Number(
-            rawReserve?.collateralRisk ?? 0
-          ),
-          flags: Number(rawReserve?.flags ?? 0),
-          dynamicConfigKey: Number(
-            rawReserve?.dynamicConfigKey ?? 0
-          )
-        };
-        const config = {
-          collateralRisk: Number(rawConfig?.collateralRisk ?? 0),
-          paused: rawConfig?.paused ?? false,
-          frozen: rawConfig?.frozen ?? false,
-          borrowable: rawConfig?.borrowable ?? false,
-          receiveSharesEnabled: rawConfig?.receiveSharesEnabled ?? false
-        };
-        let drawnDebt = 0n;
-        let premiumDebt = 0n;
-        if (Array.isArray(rawDebt)) {
-          drawnDebt = BigInt(rawDebt[0] ?? 0);
-          premiumDebt = BigInt(rawDebt[1] ?? 0);
-        } else {
-          drawnDebt = BigInt(rawDebt ?? 0);
+    const parsedReserves = [];
+    for (const r of reserves) {
+      const reserveId = r.reserveId;
+      const rawReserve = data[offset];
+      const rawConfig = data[offset + 1];
+      const rawSupplied = data[offset + 2];
+      const rawDebt = data[offset + 3];
+      const rawTotalDebt = data[offset + 4];
+      offset += BASE_CALLS_PER_RESERVE;
+      const dynamicConfigs = {};
+      for (let key = 0; key < dynConfigCount; key++) {
+        const rawDynConfig = data[offset];
+        offset += 1;
+        if (rawDynConfig && rawDynConfig !== "0x") {
+          dynamicConfigs[key] = {
+            collateralFactor: Number(rawDynConfig?.collateralFactor ?? 0),
+            maxLiquidationBonus: Number(
+              rawDynConfig?.maxLiquidationBonus ?? 0
+            ),
+            liquidationFee: Number(rawDynConfig?.liquidationFee ?? 0)
+          };
         }
-        parsedReserves.push({
-          reserveId,
-          reserve,
-          config,
-          dynamicConfigs,
-          suppliedAssets: BigInt(rawSupplied ?? 0),
-          drawnDebt,
-          premiumDebt,
-          totalDebt: BigInt(rawTotalDebt ?? 0),
-          hubAsset: { drawnRate: 0n },
-          price: 0n
-        });
       }
-      const rawLiqConfig = data[offset];
-      offset += CALLS_PER_SPOKE_TAIL;
-      const liquidationConfig = {
-        targetHealthFactor: BigInt(
-          rawLiqConfig?.targetHealthFactor ?? 0
-        ),
-        healthFactorForMaxBonus: BigInt(
-          rawLiqConfig?.healthFactorForMaxBonus ?? 0
-        ),
-        liquidationBonusFactor: Number(
-          rawLiqConfig?.liquidationBonusFactor ?? 0
-        )
+      const onChainHub = (rawReserve?.hub ?? "").toLowerCase();
+      const reserveHub = isValidAddress2(onChainHub) ? onChainHub : (r.hub ?? "").toLowerCase();
+      const reserve = {
+        underlying: rawReserve?.underlying ?? r.underlying ?? "",
+        hub: reserveHub,
+        assetId: Number(rawReserve?.assetId ?? r.assetId ?? 0),
+        decimals: Number(rawReserve?.decimals ?? 18),
+        collateralRisk: Number(rawReserve?.collateralRisk ?? 0),
+        flags: Number(rawReserve?.flags ?? 0),
+        dynamicConfigKey: Number(rawReserve?.dynamicConfigKey ?? 0)
       };
-      spokeDataList.push({
-        spoke: spokeAddr,
-        oracle: spokeEntry.oracle,
-        label: spokeEntry.label,
-        oracleDecimals: 8,
-        liquidationConfig,
-        reserves: parsedReserves
+      const config = {
+        collateralRisk: Number(rawConfig?.collateralRisk ?? 0),
+        paused: rawConfig?.paused ?? false,
+        frozen: rawConfig?.frozen ?? false,
+        borrowable: rawConfig?.borrowable ?? false,
+        receiveSharesEnabled: rawConfig?.receiveSharesEnabled ?? false
+      };
+      let drawnDebt = 0n;
+      let premiumDebt = 0n;
+      if (Array.isArray(rawDebt)) {
+        drawnDebt = BigInt(rawDebt[0] ?? 0);
+        premiumDebt = BigInt(rawDebt[1] ?? 0);
+      } else {
+        drawnDebt = BigInt(rawDebt ?? 0);
+      }
+      parsedReserves.push({
+        reserveId,
+        reserve,
+        config,
+        dynamicConfigs,
+        suppliedAssets: BigInt(rawSupplied ?? 0),
+        drawnDebt,
+        premiumDebt,
+        totalDebt: BigInt(rawTotalDebt ?? 0),
+        hubAsset: { drawnRate: 0n },
+        price: 0n
       });
     }
-    for (let si = 0; si < spokeDataList.length; si++) {
-      const sd = spokeDataList[si];
-      const reserves = getSpokeReserves2(reservesMap, sd.spoke);
-      const rids = reserves.map(
-        (e) => typeof e === "number" ? e : e.reserveId
-      );
-      if (rids.length > 0 && isValidAddress2(sd.oracle)) {
-        const rawPrices = data[offset];
-        offset += 1;
-        const priceArray = Array.isArray(rawPrices) ? rawPrices : [];
-        for (let ri = 0; ri < sd.reserves.length; ri++) {
-          if (ri < priceArray.length) {
-            sd.reserves[ri].price = BigInt(priceArray[ri] ?? 0);
-          }
+    const rawLiqConfig = data[offset];
+    offset += CALLS_PER_SPOKE_TAIL;
+    const liquidationConfig = {
+      targetHealthFactor: BigInt(rawLiqConfig?.targetHealthFactor ?? 0),
+      healthFactorForMaxBonus: BigInt(
+        rawLiqConfig?.healthFactorForMaxBonus ?? 0
+      ),
+      liquidationBonusFactor: Number(
+        rawLiqConfig?.liquidationBonusFactor ?? 0
+      )
+    };
+    const spokeData = {
+      spoke: spokeAddr,
+      oracle: spokeEntry.oracle,
+      label: spokeEntry.label,
+      oracleDecimals: 8,
+      liquidationConfig,
+      reserves: parsedReserves
+    };
+    if (parsedReserves.length > 0 && isValidAddress2(spokeEntry.oracle)) {
+      const rawPrices = data[offset];
+      offset += 1;
+      const priceArray = Array.isArray(rawPrices) ? rawPrices : [];
+      for (let ri = 0; ri < parsedReserves.length; ri++) {
+        if (ri < priceArray.length) {
+          parsedReserves[ri].price = BigInt(priceArray[ri] ?? 0);
         }
       }
     }
-    const hubEntry = aaveV4Hubs()?.[lender]?.[chainId];
+    const distinctHubs = [];
+    {
+      const seen = /* @__PURE__ */ new Set();
+      for (const r of reserves) {
+        const h = (r?.hub ?? "").toLowerCase();
+        if (!h || !isValidAddress2(h)) continue;
+        if (seen.has(h)) continue;
+        seen.add(h);
+        distinctHubs.push(h);
+      }
+    }
     const hubAssetMap = /* @__PURE__ */ new Map();
-    if (hubEntry?.hub && isValidAddress2(hubEntry.hub)) {
+    for (const hub of distinctHubs) {
       const rawAssetCount = data[offset];
       offset += 1;
       const assetCount = Math.min(
         Number(rawAssetCount ?? 0),
         MAX_HUB_ASSETS
       );
+      const inner = /* @__PURE__ */ new Map();
+      hubAssetMap.set(hub, inner);
       for (let i = 0; i < MAX_HUB_ASSETS; i++) {
         const baseIdx = offset + i * 3;
         const rawHubAsset = data[baseIdx];
@@ -18408,15 +18349,13 @@ var getAaveV4ReservesDataConverter = (lender, chainId, prices, additionalYields,
           continue;
         const underlying = (rawHubAsset?.underlying ?? "").toLowerCase();
         if (!underlying) continue;
-        hubAssetMap.set(underlying, {
+        inner.set(underlying, {
           liquidity: BigInt(rawHubAsset?.liquidity ?? 0),
           realizedFees: BigInt(rawHubAsset?.realizedFees ?? 0),
           decimals: Number(rawHubAsset?.decimals ?? 18),
           addedShares: BigInt(rawHubAsset?.addedShares ?? 0),
           swept: BigInt(rawHubAsset?.swept ?? 0),
-          premiumOffsetRay: BigInt(
-            rawHubAsset?.premiumOffsetRay ?? 0
-          ),
+          premiumOffsetRay: BigInt(rawHubAsset?.premiumOffsetRay ?? 0),
           drawnShares: BigInt(rawHubAsset?.drawnShares ?? 0),
           premiumShares: BigInt(rawHubAsset?.premiumShares ?? 0),
           liquidityFee: Number(rawHubAsset?.liquidityFee ?? 0),
@@ -18435,49 +18374,36 @@ var getAaveV4ReservesDataConverter = (lender, chainId, prices, additionalYields,
         });
       }
       offset += MAX_HUB_ASSETS * 3;
-      for (const spokeData of spokeDataList) {
-        const spokeReservesMeta = getSpokeReserves2(
-          reservesMap,
-          spokeData.spoke
+      for (const r of reserves) {
+        if ((r?.hub ?? "").toLowerCase() !== hub) continue;
+        if (typeof r.assetId !== "number") continue;
+        const rawBinding = data[offset];
+        offset += 1;
+        if (!rawBinding || rawBinding === "0x") continue;
+        const binding = {
+          riskPremiumThreshold: Number(
+            rawBinding?.riskPremiumThreshold ?? 0
+          ),
+          active: Boolean(rawBinding?.active ?? false),
+          halted: Boolean(rawBinding?.halted ?? false),
+          addCap: Number(rawBinding?.addCap ?? 0),
+          drawCap: Number(rawBinding?.drawCap ?? 0)
+        };
+        const target = parsedReserves.find(
+          (pr) => pr.reserveId === r.reserveId
         );
-        for (let ri = 0; ri < spokeReservesMeta.length; ri++) {
-          const meta = spokeReservesMeta[ri];
-          const assetId = typeof meta === "object" && meta != null ? meta.assetId : void 0;
-          if (typeof assetId !== "number") continue;
-          const rawBinding = data[offset];
-          offset += 1;
-          if (!rawBinding || rawBinding === "0x") continue;
-          const binding = {
-            riskPremiumThreshold: Number(
-              rawBinding?.riskPremiumThreshold ?? 0
-            ),
-            active: Boolean(rawBinding?.active ?? false),
-            halted: Boolean(rawBinding?.halted ?? false),
-            addCap: Number(rawBinding?.addCap ?? 0),
-            drawCap: Number(rawBinding?.drawCap ?? 0)
-          };
-          const targetReserveId = typeof meta === "number" ? meta : meta.reserveId;
-          const target = spokeData.reserves.find(
-            (r) => r.reserveId === targetReserveId
-          );
-          if (target) target.spokeBinding = binding;
-        }
+        if (target) target.spokeBinding = binding;
       }
     }
-    for (const spokeData of spokeDataList) {
-      for (const reserve of spokeData.reserves) {
-        const underlying = reserve.reserve.underlying?.toLowerCase?.() ?? "";
-        if (underlying) {
-          const hubAsset = hubAssetMap.get(underlying);
-          if (hubAsset) {
-            reserve.hubAsset = hubAsset;
-          }
-        }
-      }
+    for (const pr of parsedReserves) {
+      const hub = pr.reserve.hub?.toLowerCase?.() ?? "";
+      const underlying = pr.reserve.underlying?.toLowerCase?.() ?? "";
+      if (!hub || !underlying) continue;
+      const hubAsset = hubAssetMap.get(hub)?.get(underlying);
+      if (hubAsset) pr.hubAsset = hubAsset;
     }
-    const expectedHub = hubEntry?.hub;
     return normalizeAaveV4(
-      spokeDataList,
+      [spokeData],
       chainId,
       lender,
       prices,
@@ -18486,8 +18412,7 @@ var getAaveV4ReservesDataConverter = (lender, chainId, prices, additionalYields,
       lenderShortName,
       createMarketUid,
       toOracleKey,
-      toGenericPriceKey,
-      expectedHub
+      toGenericPriceKey
     );
   };
   return [converter, expectedCalls];
@@ -19145,40 +19070,42 @@ var buildEulerUserCall = async (chainId, lender, account, subAccountIndexes) =>
 
 // src/lending/user-data/aave-v4-type/userCallBuild.ts
 var USER_CALLS_PER_RESERVE = 4;
+function resolveSpokeEntry2(chainId, lender) {
+  const parsed = parseAaveV4SpokeLenderKey(lender);
+  if (!parsed) return void 0;
+  return aaveV4Spokes()?.[chainId]?.[parsed.spokeAddrLower];
+}
 var buildAaveV4UserCall = (chainId, lender, account) => {
-  const spokes = aaveV4Spokes()?.[lender]?.[chainId] ?? [];
-  const reservesMap = aaveV4Reserves()?.[lender]?.[chainId] ?? {};
-  if (spokes.length === 0) return [];
+  const spokeEntry = resolveSpokeEntry2(chainId, lender);
+  if (!spokeEntry) return [];
+  const spokeAddr = spokeEntry.spoke;
+  if (!spokeAddr || spokeAddr === "0x" || spokeAddr.length <= 2) return [];
+  const reserves = spokeEntry.reserves ?? [];
   const calls = [];
-  for (const spokeEntry of spokes) {
-    const spokeAddr = spokeEntry.spoke;
-    if (!spokeAddr || spokeAddr === "0x" || spokeAddr.length <= 2) continue;
-    const reserveIds = reservesMap[spokeAddr.toLowerCase()] ?? reservesMap[spokeAddr] ?? [];
-    for (const entry of reserveIds) {
-      const rid = typeof entry === "number" ? entry : entry.reserveId;
-      calls.push(
-        {
-          address: spokeAddr,
-          name: "getUserSuppliedAssets",
-          params: [rid, account]
-        },
-        {
-          address: spokeAddr,
-          name: "getUserDebt",
-          params: [rid, account]
-        },
-        {
-          address: spokeAddr,
-          name: "getUserReserveStatus",
-          params: [rid, account]
-        },
-        {
-          address: spokeAddr,
-          name: "getUserPosition",
-          params: [rid, account]
-        }
-      );
-    }
+  for (const r of reserves) {
+    const rid = r.reserveId;
+    calls.push(
+      {
+        address: spokeAddr,
+        name: "getUserSuppliedAssets",
+        params: [rid, account]
+      },
+      {
+        address: spokeAddr,
+        name: "getUserDebt",
+        params: [rid, account]
+      },
+      {
+        address: spokeAddr,
+        name: "getUserReserveStatus",
+        params: [rid, account]
+      },
+      {
+        address: spokeAddr,
+        name: "getUserPosition",
+        params: [rid, account]
+      }
+    );
   }
   return calls;
 };
@@ -20582,61 +20509,30 @@ function createAaveV4UserState(payload, lenderData, totalDeposits24h = 0, totalD
 }
 
 // src/lending/user-data/aave-v4-type/userCallParse.ts
-var getAaveV4UserDataConverter = (lender, chainId, account, metaMap) => {
-  const spokes = aaveV4Spokes()?.[lender]?.[chainId] ?? [];
-  const reservesMap = aaveV4Reserves()?.[lender]?.[chainId] ?? {};
-  const flatMeta = {};
-  if (metaMap) {
-    const expectedPrefix = lender + "_";
-    for (const [topKey, lenderMetaSubMap] of Object.entries(metaMap)) {
-      if (!topKey.startsWith(expectedPrefix)) continue;
-      for (const [marketUid, meta] of Object.entries(
-        lenderMetaSubMap
-      )) {
-        flatMeta[marketUid] = meta;
-      }
-    }
-  }
-  const oracleEntries = aaveV4Oracles()?.[lender]?.[chainId] ?? [];
-  const spokeReserveToUnderlying = /* @__PURE__ */ new Map();
-  for (const oe of oracleEntries) {
-    if (oe.underlying && oe.spoke) {
-      spokeReserveToUnderlying.set(
-        `${oe.spoke.toLowerCase()}:${oe.reserveId}`,
-        oe.underlying.toLowerCase()
-      );
-    }
-  }
-  const reserveEntries = [];
-  for (const spokeEntry of spokes) {
-    const spokeAddr = spokeEntry.spoke;
-    if (!spokeAddr || spokeAddr === "0x" || spokeAddr.length <= 2) continue;
-    const spokeAddrLc = spokeAddr.toLowerCase();
-    const spokeLenderKey = aaveV4SpokeLenderKey(lender, spokeAddrLc);
-    const reserves = reservesMap[spokeAddrLc] ?? reservesMap[spokeAddr] ?? [];
-    for (const entry of reserves) {
-      const rid = typeof entry === "number" ? entry : entry.reserveId;
-      const underlying = ((typeof entry === "object" ? entry.underlying : void 0) ?? spokeReserveToUnderlying.get(`${spokeAddrLc}:${rid}`) ?? "").toLowerCase();
-      reserveEntries.push({
-        spokeAddr,
-        spokeAddrLc,
-        spokeLenderKey,
-        reserveId: rid,
-        underlying
-      });
-    }
-  }
-  const expectedNumberOfCalls = reserveEntries.length * USER_CALLS_PER_RESERVE;
+var getAaveV4UserDataConverter = (lender, chainId, account, meta) => {
+  const parsed = parseAaveV4SpokeLenderKey(lender);
+  const spokeEntry = parsed ? aaveV4Spokes()?.[chainId]?.[parsed.spokeAddrLower] : void 0;
+  if (!spokeEntry) {
+    return [() => void 0, 0];
+  }
+  const spokeAddr = spokeEntry.spoke;
+  const spokeAddrLc = spokeAddr.toLowerCase();
+  const reserves = spokeEntry.reserves ?? [];
+  const flatMeta = meta ?? {};
+  const expectedNumberOfCalls = reserves.length * USER_CALLS_PER_RESERVE;
   return [
     (data) => {
       if (data.length !== expectedNumberOfCalls) {
         return void 0;
       }
-      const perSpoke = {};
-      for (let i = 0; i < reserveEntries.length; i++) {
-        const { underlying, spokeAddrLc, spokeLenderKey } = reserveEntries[i];
+      const lendingPositions = {};
+      let totalDeposits24h = 0;
+      let totalDebt24h = 0;
+      for (let i = 0; i < reserves.length; i++) {
+        const r = reserves[i];
+        const underlying = (r.underlying ?? "").toLowerCase();
         if (!underlying) continue;
-        const key = createMarketUid(chainId, spokeLenderKey, underlying);
+        const key = createMarketUid(chainId, lender, String(r.reserveId));
         const metaEntity = flatMeta[key];
         if (!metaEntity) continue;
         const base = i * USER_CALLS_PER_RESERVE;
@@ -20653,30 +20549,21 @@ var getAaveV4UserDataConverter = (lender, chainId, account, metaMap) => {
         );
         if (!dataForAsset) continue;
         dataForAsset.userConfigKey = String(userDynConfigKey);
-        const bucket = perSpoke[spokeLenderKey] ?? (perSpoke[spokeLenderKey] = {
-          lendingPositions: {},
-          totalDebt24h: 0,
-          totalDeposits24h: 0
-        });
-        bucket.totalDebt24h += addedDebt;
-        bucket.totalDeposits24h += addedDeposits;
-        bucket.lendingPositions[key] = dataForAsset;
-      }
-      const out = {};
-      for (const [spokeLenderKey, bucket] of Object.entries(perSpoke)) {
-        const payload = {
-          chainId,
-          account,
-          lendingPositions: bucket.lendingPositions,
-          rewards: []};
-        out[spokeLenderKey] = createAaveV4UserState(
-          payload,
-          flatMeta,
-          bucket.totalDeposits24h,
-          bucket.totalDebt24h
-        );
+        totalDebt24h += addedDebt;
+        totalDeposits24h += addedDeposits;
+        lendingPositions[key] = dataForAsset;
       }
-      return out;
+      const payload = {
+        chainId,
+        account,
+        lendingPositions,
+        rewards: []};
+      return createAaveV4UserState(
+        payload,
+        flatMeta,
+        totalDeposits24h,
+        totalDebt24h
+      );
     },
     expectedNumberOfCalls
   ];
@@ -20738,7 +20625,12 @@ function createAaveV4Entry(base, data, key, meta, spokeAddr) {
 // src/lending/user-data/fetch-balances/parse.ts
 function getUserDataConverter(lender, chainId, account, params, meta) {
   if (isAaveV4Type(lender))
-    return getAaveV4UserDataConverter(lender, chainId, account, meta);
+    return getAaveV4UserDataConverter(
+      lender,
+      chainId,
+      account,
+      meta?.[lender]
+    );
   if (isYLDR(lender))
     return getYldrUserDataConverter(lender, chainId, account, meta?.[lender]);
   if (isAaveV2Type(lender))
@@ -32265,49 +32157,33 @@ var eulerV2Fetcher = {
   getAbi: getEulerV2Abi
 };
 function getAaveV4OracleGroups(chainId) {
-  const oracles = aaveV4Oracles() ?? {};
-  const spokes = aaveV4Spokes() ?? {};
-  const groups = [];
-  for (const [fork, chains] of Object.entries(oracles)) {
-    const oracleEntries = chains[chainId] ?? [];
-    if (oracleEntries.length === 0) continue;
-    const spokeToHub = /* @__PURE__ */ new Map();
-    for (const s of spokes[fork]?.[chainId] ?? []) {
-      if (s.hub) spokeToHub.set(s.spoke.toLowerCase(), s.hub.toLowerCase());
-    }
-    const byOracle = /* @__PURE__ */ new Map();
-    for (const entry of oracleEntries) {
-      if (!entry.oracle || entry.oracle === "0x") continue;
-      const key = entry.oracle.toLowerCase();
-      let group = byOracle.get(key);
-      if (!group) {
-        group = { decimals: entry.decimals ?? 8, entries: [] };
-        byOracle.set(key, group);
-      }
-      const spokeLc = entry.spoke.toLowerCase();
-      const hub = spokeToHub.get(spokeLc) ?? "";
-      group.entries.push({
-        underlying: entry.underlying.toLowerCase(),
-        hub,
-        reserveId: entry.reserveId,
-        spoke: spokeLc
-      });
-    }
-    for (const [oracle, group] of byOracle) {
-      groups.push({
-        fork,
-        oracle,
-        decimals: group.decimals,
-        entries: group.entries
-      });
+  const oracleEntries = aaveV4Oracles()?.[chainId] ?? [];
+  const byOracle = /* @__PURE__ */ new Map();
+  for (const entry of oracleEntries) {
+    if (!entry?.oracle || entry.oracle === "0x") continue;
+    if (!entry.spoke) continue;
+    const key = entry.oracle.toLowerCase();
+    let group = byOracle.get(key);
+    if (!group) {
+      group = { decimals: entry.decimals ?? 8, entries: [] };
+      byOracle.set(key, group);
     }
+    group.entries.push({
+      underlying: entry.underlying.toLowerCase(),
+      reserveId: entry.reserveId,
+      spoke: entry.spoke.toLowerCase()
+    });
+  }
+  const groups = [];
+  for (const [oracle, group] of byOracle) {
+    groups.push({ oracle, decimals: group.decimals, entries: group.entries });
   }
   return groups;
 }
 function getAaveV4Calls(chainId) {
   const groups = getAaveV4OracleGroups(chainId);
   const results = [];
-  for (const { fork, oracle, decimals, entries } of groups) {
+  for (const { oracle, decimals, entries } of groups) {
     const calls = entries.map((e) => ({
       address: oracle,
       name: "getReservePrice",
@@ -32318,10 +32194,9 @@ function getAaveV4Calls(chainId) {
       meta: {
         oracle,
         oracleDecimals: decimals,
-        entries,
-        fork
+        entries
       },
-      lender: fork
+      lender: "AAVE_V4"
     });
   }
   return results;
@@ -32338,12 +32213,16 @@ function parseAaveV4Results(data, meta, context) {
     try {
       const priceNum = Number(BigInt(rawPrice.toString())) / divisor;
       if (isNaN(priceNum) || priceNum === 0) continue;
-      const spokeLenderKey = aaveV4SpokeLenderKey(meta.fork, entry.spoke);
+      const spokeLenderKey = aaveV4SpokeLenderKey(entry.spoke);
       entries.push({
         asset: entry.underlying,
         price: priceNum,
         priceUSD: priceNum,
-        marketUid: createMarketUid(chainId, spokeLenderKey, entry.underlying),
+        marketUid: createMarketUid(
+          chainId,
+          spokeLenderKey,
+          String(entry.reserveId)
+        ),
         // Route into the per-spoke lender bucket so price entries live under
         // the same lender key as the lending data (mirrors Morpho's pattern).
         targetLender: spokeLenderKey,