@1delta/margin-fetcher 0.0.217 → 0.0.218

package/dist/index.js

@@ -8471,18 +8471,18 @@ var populateEModes32 = (borrowCollateralFactor, collateralFactor, collateralBitm
         data[e].borrowCollateralFactor = borrowCollateralFactor;
         data[e].debtDisabled = !!eModeConfigs[e];
         if (eModeConfigs[e]) {
-          data[e] = {
-            ...data[e],
-            category: e,
-            borrowCollateralFactor: eModeConfigs[e]?.borrowCollateralFactor ?? 0,
-            collateralFactor: eModeConfigs[e]?.collateralFactor ?? 0,
-            borrowFactor: 1,
-            collateralDisabled: !isReserveEnabledOnBitmap(
-              collateralBitmap[e],
-              assetIndex
-            ),
-            debtDisabled: !isReserveEnabledOnBitmap(debtBitmap[e], assetIndex)
-          };
+          data[e].category = e;
+          data[e].borrowCollateralFactor = eModeConfigs[e]?.borrowCollateralFactor ?? 0;
+          data[e].collateralFactor = eModeConfigs[e]?.collateralFactor ?? 0;
+          data[e].borrowFactor = 1;
+          data[e].collateralDisabled = !isReserveEnabledOnBitmap(
+            collateralBitmap[e],
+            assetIndex
+          );
+          data[e].debtDisabled = !isReserveEnabledOnBitmap(
+            debtBitmap[e],
+            assetIndex
+          );
         }
       }
     }
@@ -8777,65 +8777,61 @@ var getInitReservesDataConverter = (lender, chainId, prices, additionalYields, t
         return void 0;
       }
       const modeOne = 0;
-      let result = Object.assign(
-        {},
-        ...data[modeOne]?.map((dat) => {
-          const asset = dat?.underlying.toLowerCase();
-          const meta = tokenList[asset];
-          const totalDeposits = parseRawAmount(
-            dat?.totalSupply.toString(),
-            meta?.decimals
-          );
-          const totalDebt = parseRawAmount(
-            dat?.totalDebt.toString(),
+      const result = {};
+      data[modeOne]?.forEach((dat) => {
+        const asset = dat?.underlying.toLowerCase();
+        const meta = tokenList[asset];
+        const totalDeposits = parseRawAmount(
+          dat?.totalSupply.toString(),
+          meta?.decimals
+        );
+        const totalDebt = parseRawAmount(
+          dat?.totalDebt.toString(),
+          meta.decimals
+        );
+        const oracleKey = toOracleKey(meta?.assetGroup) ?? toGenericPriceKey(asset, chainId);
+        const price = prices[oracleKey];
+        const liquidity = Number(totalDeposits) - Number(totalDebt);
+        const poolId = underlyingToPoolMap.get(asset);
+        const params = !!poolId ? { metadata: { poolId } } : void 0;
+        if (!poolId) return;
+        const marketUid = createMarketUid(chainId, lender, poolId);
+        const name = INIT_POOL_NAME_OVERRIDES[poolId.toLowerCase()] ?? lenderShortName(lender) + " " + (meta?.symbol ?? "");
+        result[asset] = {
+          marketUid,
+          name,
+          poolId: asset,
+          underlying: asset,
+          asset: meta,
+          borrowCap: parseRawAmount(
+            dat?.borrowCap.toString(),
             meta.decimals
-          );
-          const oracleKey = toOracleKey(meta?.assetGroup) ?? toGenericPriceKey(asset, chainId);
-          const price = prices[oracleKey];
-          const liquidity = Number(totalDeposits) - Number(totalDebt);
-          const poolId = underlyingToPoolMap.get(asset);
-          const params = !!poolId ? { metadata: { poolId } } : void 0;
-          if (!poolId) return;
-          const marketUid = createMarketUid(chainId, lender, poolId);
-          const name = INIT_POOL_NAME_OVERRIDES[poolId.toLowerCase()] ?? lenderShortName(lender) + " " + (meta?.symbol ?? "");
-          return {
-            [asset]: {
-              marketUid,
-              name,
-              poolId: asset,
-              underlying: asset,
-              asset: meta,
-              borrowCap: parseRawAmount(
-                dat?.borrowCap.toString(),
-                meta.decimals
-              ),
-              canBurn: Boolean(dat?.canBurn),
-              canFlash: Boolean(dat?.canFlash),
-              canMint: Boolean(dat?.canMint),
-              canRepay: Boolean(dat?.canRepay),
-              totalDeposits,
-              totalDebt,
-              totalDepositsUSD: price * Number(totalDeposits),
-              totalDebtUSD: price * Number(totalDebt),
-              totalLiquidity: liquidity,
-              totalLiquidityUSD: liquidity * price,
-              depositRate: convertRateToApr(
-                Number(parseRawAmount(dat?.supplyRate.toString(), 18))
-              ),
-              variableBorrowRate: convertRateToApr(
-                Number(parseRawAmount(dat?.borrowRate.toString(), 18))
-              ),
-              stableBorrowRate: 0,
-              collateralActive: true,
-              intrinsicYield: additionalYields?.intrinsicYields?.[oracleKey] ?? 0,
-              rewards: [],
-              config: {},
-              borrowingEnabled: totalDebt !== "0",
-              params
-            }
-          };
-        })
-      );
+          ),
+          canBurn: Boolean(dat?.canBurn),
+          canFlash: Boolean(dat?.canFlash),
+          canMint: Boolean(dat?.canMint),
+          canRepay: Boolean(dat?.canRepay),
+          totalDeposits,
+          totalDebt,
+          totalDepositsUSD: price * Number(totalDeposits),
+          totalDebtUSD: price * Number(totalDebt),
+          totalLiquidity: liquidity,
+          totalLiquidityUSD: liquidity * price,
+          depositRate: convertRateToApr(
+            Number(parseRawAmount(dat?.supplyRate.toString(), 18))
+          ),
+          variableBorrowRate: convertRateToApr(
+            Number(parseRawAmount(dat?.borrowRate.toString(), 18))
+          ),
+          stableBorrowRate: 0,
+          collateralActive: true,
+          intrinsicYield: additionalYields?.intrinsicYields?.[oracleKey] ?? 0,
+          rewards: [],
+          config: {},
+          borrowingEnabled: totalDebt !== "0",
+          params
+        };
+      });
       let eModes = {};
       INIT_MODES.forEach((mode, index) => {
         data[index]?.forEach((multicallData) => {
@@ -8859,11 +8855,12 @@ var getInitReservesDataConverter = (lender, chainId, prices, additionalYields, t
           result[asset].config[mode] = modeData;
         });
       });
-      Object.entries(eModes).forEach(([modeId, data2]) => {
-        Object.entries(result)?.forEach(([key, _3]) => {
+      Object.entries(eModes).forEach(([modeId, modeData]) => {
+        Object.entries(result).forEach(([key, _3]) => {
           if (!result[key].config[modeId]) {
-            let mode = {
-              ...data2,
+            result[key].config[modeId] = {
+              label: modeData.label,
+              category: modeData.category,
               debtDisabled: true,
               collateralDisabled: true,
               collateralFactor: 0,
@@ -8871,7 +8868,6 @@ var getInitReservesDataConverter = (lender, chainId, prices, additionalYields, t
               borrowFactor: 3402823669209385e5
               // disabled flag
             };
-            result[key].config[modeId] = mode;
           }
         });
       });
@@ -17899,6 +17895,7 @@ var getEulerV2ReservesDataConverter = (lender, chainId, prices, additionalYields
 // src/lending/public-data/aave-v4-type/publicCallBuild.ts
 var BASE_CALLS_PER_RESERVE = 5;
 var CALLS_PER_SPOKE_TAIL = 2;
+var MAX_HUB_ASSETS = 25;
 function isValidAddress(addr) {
   return !!addr && addr !== "0x" && addr.length > 2;
 }
@@ -17914,8 +17911,6 @@ var buildAaveV4LenderReserveCall = (chainId, lender) => {
   const reservesMap = aaveV4Reserves()?.[lender]?.[chainId] ?? {};
   if (spokes.length === 0) return [];
   const calls = [];
-  const hubAssetKeys = /* @__PURE__ */ new Set();
-  const hubAssetList = [];
   for (const spokeEntry of spokes) {
     if (!isValidAddress(spokeEntry.spoke)) continue;
     const spokeAddr = spokeEntry.spoke;
@@ -17957,17 +17952,6 @@ var buildAaveV4LenderReserveCall = (chainId, lender) => {
           params: [rid, key]
         });
       }
-      if (typeof entry === "object" && spokeEntry.hub && entry.assetId !== void 0) {
-        const hubLc = spokeEntry.hub.toLowerCase();
-        const key = `${hubLc}:${entry.assetId}`;
-        if (!hubAssetKeys.has(key)) {
-          hubAssetKeys.add(key);
-          hubAssetList.push({
-            hub: hubLc,
-            assetId: entry.assetId
-          });
-        }
-      }
     }
     calls.push(
       {
@@ -17984,10 +17968,7 @@ var buildAaveV4LenderReserveCall = (chainId, lender) => {
   }
   for (const spokeEntry of spokes) {
     if (!isValidAddress(spokeEntry.spoke)) continue;
-    const reserves = getSpokeReserves(
-      reservesMap,
-      spokeEntry.spoke
-    );
+    const reserves = getSpokeReserves(reservesMap, spokeEntry.spoke);
     const rids = reserves.map(
       (e) => typeof e === "number" ? e : e.reserveId
     );
@@ -17999,24 +17980,33 @@ var buildAaveV4LenderReserveCall = (chainId, lender) => {
       });
     }
   }
-  for (const { hub, assetId } of hubAssetList) {
-    calls.push(
-      {
-        address: hub,
-        name: "getAsset",
-        params: [assetId]
-      },
-      {
-        address: hub,
-        name: "getAddedAssets",
-        params: [assetId]
-      },
-      {
-        address: hub,
-        name: "getAssetTotalOwed",
-        params: [assetId]
-      }
-    );
+  const hubEntry = aaveV4Hubs()?.[lender]?.[chainId];
+  if (hubEntry?.hub && isValidAddress(hubEntry.hub)) {
+    const hubAddr = hubEntry.hub.toLowerCase();
+    calls.push({
+      address: hubAddr,
+      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]
+        }
+      );
+    }
   }
   return calls;
 };
@@ -18024,13 +18014,9 @@ var getAaveV4ExpectedCallCount = (chainId, lender) => {
   const spokes = aaveV4Spokes()?.[lender]?.[chainId] ?? [];
   const reservesMap = aaveV4Reserves()?.[lender]?.[chainId] ?? {};
   let count = 0;
-  const hubAssetKeys = /* @__PURE__ */ new Set();
   for (const spokeEntry of spokes) {
     if (!isValidAddress(spokeEntry.spoke)) continue;
-    const reserves = getSpokeReserves(
-      reservesMap,
-      spokeEntry.spoke
-    );
+    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(
@@ -18039,15 +18025,11 @@ var getAaveV4ExpectedCallCount = (chainId, lender) => {
     if (rids.length > 0 && isValidAddress(spokeEntry.oracle)) {
       count += 1;
     }
-    for (const entry of reserves) {
-      if (typeof entry === "object" && spokeEntry.hub && entry.assetId !== void 0) {
-        hubAssetKeys.add(
-          `${spokeEntry.hub.toLowerCase()}:${entry.assetId}`
-        );
-      }
-    }
   }
-  count += hubAssetKeys.size * 3;
+  const hubEntry = aaveV4Hubs()?.[lender]?.[chainId];
+  if (hubEntry?.hub && isValidAddress(hubEntry.hub)) {
+    count += 1 + MAX_HUB_ASSETS * 3;
+  }
   return count;
 };
 
@@ -18062,9 +18044,10 @@ function toTokenNumber(raw, decimals) {
   return Number(raw) / 10 ** decimals;
 }
 var RAY2 = 1e27;
+var SECONDS_PER_YEAR4 = 31536e3;
 function rayRateToApr(rateRay) {
   if (rateRay === 0n) return 0;
-  return Number(rateRay) / RAY2 * 100;
+  return (Number(rateRay) / RAY2 - 1) * SECONDS_PER_YEAR4 * 100;
 }
 function normalizeAaveV4(spokeDataList, chainId, lender, prices, additionalYields, tokenList, lenderShortNameFn, createMarketUidFn, toOracleKeyFn, toGenericPriceKeyFn, expectedHub) {
   const data = {};
@@ -18098,9 +18081,7 @@ function normalizeAaveV4(spokeDataList, chainId, lender, prices, additionalYield
         continue;
       const underlying = reserve.reserve.underlying.toLowerCase();
       const decimals = reserve.reserve.decimals;
-      const hubAddr = reserve.reserve.hub.toLowerCase();
-      const refAddress = `${hubAddr}:${underlying}`;
-      const marketUid = createMarketUidFn(chainId, lender, refAddress);
+      const marketUid = createMarketUidFn(chainId, lender, underlying);
       const assetMeta = tokenList[underlying];
       const oracleKey = toOracleKeyFn(assetMeta?.assetGroup ?? null) ?? toGenericPriceKeyFn(underlying, chainId);
       let price = 0;
@@ -18162,47 +18143,59 @@ function normalizeAaveV4(spokeDataList, chainId, lender, prices, additionalYield
           debtDisabled: !reserve.config.borrowable || reserve.config.paused
         };
       }
-      data[marketUid] = {
-        marketUid,
-        name: lenderShortNameFn(lender) + " " + (assetMeta?.symbol ?? ""),
-        poolId: underlying,
-        underlying,
-        asset: assetMeta,
-        totalDeposits,
-        totalDebtStable: "0",
-        totalDebt,
-        totalLiquidity: liquidity,
-        totalDepositsUSD: totalDepositsNum * price,
-        totalDebtStableUSD: 0,
-        totalDebtUSD: totalDebtNum * price,
-        totalLiquidityUSD: liquidity * price,
-        depositRate,
-        variableBorrowRate,
-        stableBorrowRate: 0,
-        intrinsicYield: additionalYields?.intrinsicYields?.[oracleKey] ?? 0,
-        rewards: [],
-        decimals,
-        config,
-        collateralActive: Object.values(reserve.dynamicConfigs).some(
-          (c) => c.collateralFactor > 0
-        ),
-        borrowingEnabled: reserve.config.borrowable,
-        hasStable: false,
-        isActive: !reserve.config.paused,
-        isFrozen: reserve.config.frozen,
-        borrowCap: 0,
-        supplyCap: 0,
-        debtCeiling: 0,
-        params: {
-          metadata: {
-            spoke: spokeAddr,
-            hub: reserve.reserve.hub.toLowerCase(),
-            assetId: reserve.reserve.assetId,
-            reserveId: reserve.reserveId,
-            oracle: spokeData.oracle.toLowerCase()
-          }
+      if (data[marketUid]) {
+        Object.assign(data[marketUid].config, config);
+        if (!data[marketUid].collateralActive) {
+          data[marketUid].collateralActive = Object.values(reserve.dynamicConfigs).some(
+            (c) => c.collateralFactor > 0
+          );
         }
-      };
+        if (!data[marketUid].borrowingEnabled) {
+          data[marketUid].borrowingEnabled = reserve.config.borrowable;
+        }
+      } else {
+        data[marketUid] = {
+          marketUid,
+          name: lenderShortNameFn(lender) + " " + (assetMeta?.symbol ?? ""),
+          poolId: underlying,
+          underlying,
+          asset: assetMeta,
+          totalDeposits,
+          totalDebtStable: "0",
+          totalDebt,
+          totalLiquidity: liquidity,
+          totalDepositsUSD: totalDepositsNum * price,
+          totalDebtStableUSD: 0,
+          totalDebtUSD: totalDebtNum * price,
+          totalLiquidityUSD: liquidity * price,
+          depositRate,
+          variableBorrowRate,
+          stableBorrowRate: 0,
+          intrinsicYield: additionalYields?.intrinsicYields?.[oracleKey] ?? 0,
+          rewards: [],
+          decimals,
+          config,
+          collateralActive: Object.values(reserve.dynamicConfigs).some(
+            (c) => c.collateralFactor > 0
+          ),
+          borrowingEnabled: reserve.config.borrowable,
+          hasStable: false,
+          isActive: !reserve.config.paused,
+          isFrozen: reserve.config.frozen,
+          borrowCap: 0,
+          supplyCap: 0,
+          debtCeiling: 0,
+          params: {
+            metadata: {
+              spoke: spokeAddr,
+              hub: reserve.reserve.hub.toLowerCase(),
+              assetId: reserve.reserve.assetId,
+              reserveId: reserve.reserveId,
+              oracle: spokeData.oracle.toLowerCase()
+            }
+          }
+        };
+      }
     }
   }
   return { data, chainId, eModes };
@@ -18223,8 +18216,6 @@ var getAaveV4ReservesDataConverter = (lender, chainId, prices, additionalYields,
     const reservesMap = aaveV4Reserves()?.[lender]?.[chainId] ?? {};
     let offset = 0;
     const spokeDataList = [];
-    const hubAssetKeys = /* @__PURE__ */ new Set();
-    const hubAssetList = [];
     for (const spokeEntry of spokes) {
       if (!isValidAddress2(spokeEntry.spoke)) continue;
       const spokeAddr = spokeEntry.spoke;
@@ -18286,17 +18277,6 @@ var getAaveV4ReservesDataConverter = (lender, chainId, prices, additionalYields,
         } else {
           drawnDebt = BigInt(rawDebt ?? 0);
         }
-        if (spokeEntry.hub && typeof entry === "object" && entry.assetId !== void 0) {
-          const hubLc = spokeEntry.hub.toLowerCase();
-          const key = `${hubLc}:${entry.assetId}`;
-          if (!hubAssetKeys.has(key)) {
-            hubAssetKeys.add(key);
-            hubAssetList.push({
-              hub: hubLc,
-              assetId: entry.assetId
-            });
-          }
-        }
         parsedReserves.push({
           reserveId,
           reserve,
@@ -18350,40 +18330,51 @@ var getAaveV4ReservesDataConverter = (lender, chainId, prices, additionalYields,
         }
       }
     }
+    const hubEntry = aaveV4Hubs()?.[lender]?.[chainId];
     const hubAssetMap = /* @__PURE__ */ new Map();
-    for (let hi = 0; hi < hubAssetList.length; hi++) {
-      const baseIdx = offset + hi * 3;
-      const rawHubAsset = data[baseIdx];
-      const rawAddedAssets = data[baseIdx + 1];
-      const rawTotalOwed = data[baseIdx + 2];
-      if (!rawHubAsset || rawHubAsset === "0x") continue;
-      const underlying = (rawHubAsset?.underlying ?? "").toLowerCase();
-      const key = underlying || `${hubAssetList[hi].hub}:${hubAssetList[hi].assetId}`;
-      hubAssetMap.set(key, {
-        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
-        ),
-        drawnShares: BigInt(rawHubAsset?.drawnShares ?? 0),
-        premiumShares: BigInt(rawHubAsset?.premiumShares ?? 0),
-        liquidityFee: Number(rawHubAsset?.liquidityFee ?? 0),
-        drawnIndex: BigInt(rawHubAsset?.drawnIndex ?? 0),
-        drawnRate: BigInt(rawHubAsset?.drawnRate ?? 0),
-        lastUpdateTimestamp: Number(
-          rawHubAsset?.lastUpdateTimestamp ?? 0
-        ),
-        underlying: rawHubAsset?.underlying ?? "",
-        irStrategy: rawHubAsset?.irStrategy ?? "",
-        reinvestmentController: rawHubAsset?.reinvestmentController ?? "",
-        feeReceiver: rawHubAsset?.feeReceiver ?? "",
-        deficitRay: BigInt(rawHubAsset?.deficitRay ?? 0),
-        totalAddedAssets: BigInt(rawAddedAssets ?? 0),
-        totalOwedAssets: BigInt(rawTotalOwed ?? 0)
-      });
+    if (hubEntry?.hub && isValidAddress2(hubEntry.hub)) {
+      const rawAssetCount = data[offset];
+      offset += 1;
+      const assetCount = Math.min(
+        Number(rawAssetCount ?? 0),
+        MAX_HUB_ASSETS
+      );
+      for (let i = 0; i < MAX_HUB_ASSETS; i++) {
+        const baseIdx = offset + i * 3;
+        const rawHubAsset = data[baseIdx];
+        const rawAddedAssets = data[baseIdx + 1];
+        const rawTotalOwed = data[baseIdx + 2];
+        if (i >= assetCount || !rawHubAsset || rawHubAsset === "0x")
+          continue;
+        const underlying = (rawHubAsset?.underlying ?? "").toLowerCase();
+        if (!underlying) continue;
+        hubAssetMap.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
+          ),
+          drawnShares: BigInt(rawHubAsset?.drawnShares ?? 0),
+          premiumShares: BigInt(rawHubAsset?.premiumShares ?? 0),
+          liquidityFee: Number(rawHubAsset?.liquidityFee ?? 0),
+          drawnIndex: BigInt(rawHubAsset?.drawnIndex ?? 0),
+          drawnRate: BigInt(rawHubAsset?.drawnRate ?? 0),
+          lastUpdateTimestamp: Number(
+            rawHubAsset?.lastUpdateTimestamp ?? 0
+          ),
+          underlying: rawHubAsset?.underlying ?? "",
+          irStrategy: rawHubAsset?.irStrategy ?? "",
+          reinvestmentController: rawHubAsset?.reinvestmentController ?? "",
+          feeReceiver: rawHubAsset?.feeReceiver ?? "",
+          deficitRay: BigInt(rawHubAsset?.deficitRay ?? 0),
+          totalAddedAssets: BigInt(rawAddedAssets ?? 0),
+          totalOwedAssets: BigInt(rawTotalOwed ?? 0)
+        });
+      }
+      offset += MAX_HUB_ASSETS * 3;
     }
     for (const spokeData of spokeDataList) {
       for (const reserve of spokeData.reserves) {
@@ -18396,7 +18387,6 @@ var getAaveV4ReservesDataConverter = (lender, chainId, prices, additionalYields,
         }
       }
     }
-    const hubEntry = aaveV4Hubs()?.[lender]?.[chainId];
     const expectedHub = hubEntry?.hub;
     return normalizeAaveV4(
       spokeDataList,
@@ -18549,7 +18539,7 @@ var getLenderPublicData = async (chainId, lenders, prices, additionalYields, mul
     const abi = getAbi(lender);
     const callData = buildLenderCall(chainId, lender);
     const mappedCalls = callData.map((call) => ({ call, abi: call.abi ?? abi }));
-    calls = [...calls, ...mappedCalls];
+    calls.push(...mappedCalls);
   }
   const [rawResults, list] = await Promise.all([
     multicallRetry({
@@ -18558,7 +18548,7 @@ var getLenderPublicData = async (chainId, lenders, prices, additionalYields, mul
       abi: calls.map((call) => call.abi),
       batchSize: chainId === Chain.ETHEREUM_MAINNET ? 500 : void 0
     }),
-    await tokenList()
+    tokenList()
   ]);
   const invalidLenders = [];
   let lenderData = {};
@@ -18579,7 +18569,7 @@ var getLenderPublicData = async (chainId, lenders, prices, additionalYields, mul
           if (!convertedData) {
             invalidLenders.push(lender);
           } else {
-            lenderData = { ...lenderData, ...convertedData };
+            Object.assign(lenderData, convertedData);
           }
         } else {
           if (!convertedData) {
@@ -18652,9 +18642,7 @@ var getLenderPublicDataViaApi = async (chainId, lenders, prices, additionalYield
           additionalYields,
           list
         );
-        Object.keys(converted).forEach((marketId) => {
-          lenderData[marketId] = converted[marketId];
-        });
+        Object.assign(lenderData, converted);
       } else {
         lenderData[lender] = convertLenderDataFromApi(
           lender,
@@ -20283,10 +20271,15 @@ function resolveV4Config(configs, userConfigKey) {
   const spokeAddr = key.split(":")[0];
   return { config, spokeAddr };
 }
-function getConfigScopedPrice(meta, spokeAddr, configPriceMap) {
+function getConfigScopedPrice(meta, spokeAddr) {
+  if (spokeAddr) {
+    const byConfig = meta?.oraclePrice?.byConfig;
+    const configPrice = byConfig?.[spokeAddr]?.oraclePriceUsd;
+    if (configPrice != null && configPrice > 0) return configPrice;
+  }
   return getOraclePrice(meta);
 }
-function createAaveV4UserState(payload, lenderData, totalDeposits24h = 0, totalDebt24h = 0, configPriceMap) {
+function createAaveV4UserState(payload, lenderData, totalDeposits24h = 0, totalDebt24h = 0) {
   const assetKeys = getMarketUidsFromMeta(lenderData);
   const { chainId, account } = payload;
   let depositInterest = 0;
@@ -20395,7 +20388,7 @@ function createAaveV4UserState(payload, lenderData, totalDeposits24h = 0, totalD
       configs,
       pos ? pos.userConfigKey : void 0
     );
-    const price = getConfigScopedPrice(meta);
+    const price = getConfigScopedPrice(meta, spokeAddr);
     const bcf = config?.borrowCollateralFactor ?? 1;
     const bf = config?.borrowFactor ?? 1;
     if (pos) {
@@ -20490,7 +20483,6 @@ var getAaveV4UserDataConverter = (lender, chainId, account, metaMap) => {
       reserveEntries.push({
         spokeAddr,
         reserveId: rid,
-        hub: (spokeEntry.hub ?? "").toLowerCase(),
         underlying
       });
     }
@@ -20512,28 +20504,25 @@ var getAaveV4UserDataConverter = (lender, chainId, account, metaMap) => {
       let totalDebt24h = 0;
       let totalDeposits24h = 0;
       for (let i = 0; i < reserveEntries.length; i++) {
-        const { hub, underlying, spokeAddr } = reserveEntries[i];
-        let key;
-        if (hub) {
-          key = createMarketUid(chainId, lender, `${hub}:${underlying}`);
-        } else {
-          key = underlyingToUid.get(underlying) ?? createMarketUid(chainId, lender, `:${underlying}`);
-        }
+        const { underlying, spokeAddr } = reserveEntries[i];
+        const key = underlying ? createMarketUid(chainId, lender, underlying) : underlyingToUid.get(underlying) ?? "";
         const metaEntity = metaMap?.[key];
         if (!metaEntity) continue;
         const base = i * USER_CALLS_PER_RESERVE;
+        const spokeLc = spokeAddr.toLowerCase();
+        const userPositionResult = data[base + 3];
+        const userDynConfigKey = Number(
+          userPositionResult?.dynamicConfigKey ?? 0
+        );
         const { dataForAsset, addedDebt, addedDeposits } = createAaveV4Entry(
           base,
           data,
           key,
-          metaEntity
+          metaEntity,
+          spokeLc
         );
         if (!dataForAsset) continue;
-        const userPositionResult = data[base + 3];
-        const userDynConfigKey = Number(
-          userPositionResult?.dynamicConfigKey ?? 0
-        );
-        dataForAsset.userConfigKey = `${spokeAddr.toLowerCase()}:${userDynConfigKey}`;
+        dataForAsset.userConfigKey = `${spokeLc}:${userDynConfigKey}`;
         totalDebt24h += addedDebt;
         totalDeposits24h += addedDeposits;
         lendingPositions[key] = dataForAsset;
@@ -20554,7 +20543,15 @@ var getAaveV4UserDataConverter = (lender, chainId, account, metaMap) => {
     expectedNumberOfCalls
   ];
 };
-function createAaveV4Entry(base, data, key, meta) {
+function getConfigOraclePrice(meta, spokeAddr) {
+  if (spokeAddr) {
+    const byConfig = meta?.oraclePrice?.byConfig;
+    const configPrice = byConfig?.[spokeAddr]?.oraclePriceUsd;
+    if (configPrice != null && configPrice > 0) return configPrice;
+  }
+  return getOraclePrice(meta);
+}
+function createAaveV4Entry(base, data, key, meta, spokeAddr) {
   const rawSupply = data[base];
   const debtResult = data[base + 1];
   const statusResult = data[base + 2];
@@ -20575,7 +20572,7 @@ function createAaveV4Entry(base, data, key, meta) {
   const currentDebt = parseRawAmount(totalDebtRaw, decimals);
   const collateralEnabled = Boolean(statusResult?.[0]);
   const price = getDisplayPrice(meta);
-  const oPrice = getOraclePrice(meta);
+  const oPrice = getConfigOraclePrice(meta, spokeAddr);
   const priceHist = meta?.price?.priceUsd24h ?? price;
   const dataForAsset = {
     marketUid: key,
@@ -25413,19 +25410,20 @@ function unflattenLenderData(pools) {
   return result;
 }
 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) {
-    const abi = getAbi2(query2.lender);
-    const callData = await buildUserCall(
-      chainId,
-      query2.lender,
-      query2.account,
-      query2.params
-    );
-    const mappedCalls = callData.map((call) => ({ call, abi }));
-    calls = [...calls, ...mappedCalls];
-  }
+  const builtCalls = await Promise.all(
+    queries.map(async (query2) => {
+      const abi = getAbi2(query2.lender);
+      const callData = await buildUserCall(
+        chainId,
+        query2.lender,
+        query2.account,
+        query2.params
+      );
+      return callData.map((call) => ({ call, abi }));
+    })
+  );
+  const calls = builtCalls.flat();
   return await multicallViemAbiArray(
     chainId,
     calls.map((call) => call.abi),
@@ -25440,20 +25438,21 @@ var getLenderUserDataResult = async (chainId, queriesRaw, getEvmClient3, allowFa
   );
 };
 var prepareLenderUserDataRpcCalls = async (chainId, queriesRaw, batchSize = MULTICALL_DEFAULT_BATCH_SIZE, blockTag = "latest", allowFailure = true) => {
-  let calls = [];
   const multicallAddress = getEvmChain(chainId).contracts?.multicall3?.address;
   const queries = organizeUserQueries(queriesRaw);
-  for (const query2 of queries) {
-    const abi = getAbi2(query2.lender);
-    const callData = await buildUserCall(
-      chainId,
-      query2.lender,
-      query2.account,
-      query2.params
-    );
-    const mappedCalls = callData.map((call) => ({ call, abi }));
-    calls = [...calls, ...mappedCalls];
-  }
+  const builtCalls = await Promise.all(
+    queries.map(async (query2) => {
+      const abi = getAbi2(query2.lender);
+      const callData = await buildUserCall(
+        chainId,
+        query2.lender,
+        query2.account,
+        query2.params
+      );
+      return callData.map((call) => ({ call, abi }));
+    })
+  );
+  const calls = builtCalls.flat();
   const preparedCalls = prepareMulticallInputs(
     calls.map((c) => c.abi),
     calls.map((c) => c.call)