@1delta/margin-fetcher 0.0.214 → 0.0.216

package/dist/index.d.ts

@@ -13,7 +13,7 @@ export { computeEModeAnalysis } from './lending/margin/e-mode';
 export type { EModeResult, EModeAssets } from './lending/margin/e-mode';
 export type { LoopPostTradeMetrics, LendingMode } from './lending/margin/loop';
 export type { SumerPositionInput, GroupAccumulator, } from './lending/margin/base';
-export type { LenderYieldComplete, LenderCrossPoolMeta, LenderToLenderCrossPoolMeta, CompoundV2Metadata, AaveMetadata, InitMetadata, EulerV2Metadata, ProtocolParams, } from './lending/user-data/utils/types';
+export type { LenderYieldComplete, LenderCrossPoolMeta, LenderToLenderCrossPoolMeta, CompoundV2Metadata, AaveMetadata, AaveV4Metadata, InitMetadata, EulerV2Metadata, ProtocolParams, } from './lending/user-data/utils/types';
 export { computeSumerWaterfall, buildSumerAccumulators, applyPositionDelta, } from './lending/margin/base/sumer/waterfall';
 export { computeSumerDepositDelta, computeSumerWithdrawDelta, computeSumerBorrowDelta, computeSumerRepayDelta, } from './lending/margin/base/sumer';
 export { fetchEulerSubAccountIndexes, getSubAccountAddress, getSubAccountIndex, } from './lending/user-data/euler/userCallBuild';

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}

package/dist/index.js

@@ -17893,14 +17893,18 @@ var getEulerV2ReservesDataConverter = (lender, chainId, prices, additionalYields
 };
 
 // src/lending/public-data/aave-v4-type/publicCallBuild.ts
-var CALLS_PER_RESERVE = 6;
+var BASE_CALLS_PER_RESERVE = 5;
 var CALLS_PER_SPOKE_TAIL = 2;
-function hasValidOracle(oracle) {
-  return !!oracle && oracle !== "0x" && oracle.length > 2;
+function isValidAddress(addr) {
+  return !!addr && addr !== "0x" && addr.length > 2;
 }
 function getSpokeReserves(reservesMap, spokeAddr) {
   return reservesMap[spokeAddr.toLowerCase()] ?? reservesMap[spokeAddr] ?? [];
 }
+function getDynamicConfigCount(spokeEntry) {
+  const max = spokeEntry.dynamicConfigKeyMax ?? 0;
+  return max + 1;
+}
 var buildAaveV4LenderReserveCall = (chainId, lender) => {
   const spokes = aaveV4Spokes()?.[lender]?.[chainId] ?? [];
   const reservesMap = aaveV4Reserves()?.[lender]?.[chainId] ?? {};
@@ -17909,8 +17913,10 @@ var buildAaveV4LenderReserveCall = (chainId, lender) => {
   const hubAssetKeys = /* @__PURE__ */ new Set();
   const hubAssetList = [];
   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(
@@ -17938,19 +17944,22 @@ var buildAaveV4LenderReserveCall = (chainId, lender) => {
           address: spokeAddr,
           name: "getReserveTotalDebt",
           params: [rid]
-        },
-        {
-          address: spokeAddr,
-          name: "getDynamicReserveConfig",
-          params: [rid, 0]
         }
       );
+      for (let key = 0; key < dynConfigCount; key++) {
+        calls.push({
+          address: spokeAddr,
+          name: "getDynamicReserveConfig",
+          params: [rid, key]
+        });
+      }
       if (typeof entry === "object" && spokeEntry.hub && entry.assetId !== void 0) {
-        const key = `${spokeEntry.hub}:${entry.assetId}`;
+        const hubLc = spokeEntry.hub.toLowerCase();
+        const key = `${hubLc}:${entry.assetId}`;
         if (!hubAssetKeys.has(key)) {
           hubAssetKeys.add(key);
           hubAssetList.push({
-            hub: spokeEntry.hub,
+            hub: hubLc,
             assetId: entry.assetId
           });
         }
@@ -17970,6 +17979,7 @@ var buildAaveV4LenderReserveCall = (chainId, lender) => {
     );
   }
   for (const spokeEntry of spokes) {
+    if (!isValidAddress(spokeEntry.spoke)) continue;
     const reserves = getSpokeReserves(
       reservesMap,
       spokeEntry.spoke
@@ -17977,7 +17987,7 @@ var buildAaveV4LenderReserveCall = (chainId, lender) => {
     const rids = reserves.map(
       (e) => typeof e === "number" ? e : e.reserveId
     );
-    if (rids.length > 0 && hasValidOracle(spokeEntry.oracle)) {
+    if (rids.length > 0 && isValidAddress(spokeEntry.oracle)) {
       calls.push({
         address: spokeEntry.oracle,
         name: "getReservesPrices",
@@ -18012,20 +18022,24 @@ var getAaveV4ExpectedCallCount = (chainId, lender) => {
   let count = 0;
   const hubAssetKeys = /* @__PURE__ */ new Set();
   for (const spokeEntry of spokes) {
+    if (!isValidAddress(spokeEntry.spoke)) continue;
     const reserves = getSpokeReserves(
       reservesMap,
       spokeEntry.spoke
     );
-    count += reserves.length * CALLS_PER_RESERVE + CALLS_PER_SPOKE_TAIL;
+    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 && hasValidOracle(spokeEntry.oracle)) {
+    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}:${entry.assetId}`);
+        hubAssetKeys.add(
+          `${spokeEntry.hub.toLowerCase()}:${entry.assetId}`
+        );
       }
     }
   }
@@ -18073,7 +18087,8 @@ function normalizeAaveV4(spokeDataList, chainId, lender, prices, additionalYield
     for (const reserve of spokeReserves) {
       const underlying = reserve.reserve.underlying.toLowerCase();
       const decimals = reserve.reserve.decimals;
-      const refAddress = `${spokeAddr}:${reserve.reserveId}`;
+      const hubAddr = reserve.reserve.hub.toLowerCase();
+      const refAddress = `${hubAddr}:${underlying}`;
       const marketUid = createMarketUidFn(chainId, lender, refAddress);
       const assetMeta = tokenList[underlying];
       const oracleKey = toOracleKeyFn(assetMeta?.assetGroup ?? null) ?? toGenericPriceKeyFn(underlying, chainId);
@@ -18183,8 +18198,8 @@ function normalizeAaveV4(spokeDataList, chainId, lender, prices, additionalYield
 }
 
 // src/lending/public-data/aave-v4-type/publicCallParse.ts
-function hasValidOracle2(oracle) {
-  return !!oracle && oracle !== "0x" && oracle.length > 2;
+function isValidAddress2(addr) {
+  return !!addr && addr !== "0x" && addr.length > 2;
 }
 function getSpokeReserves2(reservesMap, spokeAddr) {
   return reservesMap[spokeAddr.toLowerCase()] ?? reservesMap[spokeAddr] ?? [];
@@ -18200,20 +18215,38 @@ var getAaveV4ReservesDataConverter = (lender, chainId, prices, additionalYields,
     const hubAssetKeys = /* @__PURE__ */ new Set();
     const hubAssetList = [];
     for (const spokeEntry of spokes) {
+      if (!isValidAddress2(spokeEntry.spoke)) continue;
       const spokeAddr = spokeEntry.spoke;
       const reserves = getSpokeReserves2(reservesMap, spokeAddr);
-      const reserveCount = reserves.length;
+      const dynConfigCount = (spokeEntry.dynamicConfigKeyMax ?? 0) + 1;
       const parsedReserves = [];
-      for (let i = 0; i < reserveCount; i++) {
+      for (let i = 0; i < reserves.length; i++) {
         const entry = reserves[i];
         const reserveId = typeof entry === "number" ? entry : entry.reserveId;
-        const baseIdx = offset + i * CALLS_PER_RESERVE;
-        const rawReserve = data[baseIdx];
-        const rawConfig = data[baseIdx + 1];
-        const rawSupplied = data[baseIdx + 2];
-        const rawDebt = data[baseIdx + 3];
-        const rawTotalDebt = data[baseIdx + 4];
-        const rawDynConfig = data[baseIdx + 5];
+        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 ?? "",
@@ -18242,26 +18275,13 @@ var getAaveV4ReservesDataConverter = (lender, chainId, prices, additionalYields,
         } else {
           drawnDebt = BigInt(rawDebt ?? 0);
         }
-        const dynamicConfigs = {};
-        if (rawDynConfig && rawDynConfig !== "0x") {
-          dynamicConfigs[0] = {
-            collateralFactor: Number(
-              rawDynConfig?.collateralFactor ?? 0
-            ),
-            maxLiquidationBonus: Number(
-              rawDynConfig?.maxLiquidationBonus ?? 0
-            ),
-            liquidationFee: Number(
-              rawDynConfig?.liquidationFee ?? 0
-            )
-          };
-        }
         if (spokeEntry.hub && typeof entry === "object" && entry.assetId !== void 0) {
-          const key = `${spokeEntry.hub}:${entry.assetId}`;
+          const hubLc = spokeEntry.hub.toLowerCase();
+          const key = `${hubLc}:${entry.assetId}`;
           if (!hubAssetKeys.has(key)) {
             hubAssetKeys.add(key);
             hubAssetList.push({
-              hub: spokeEntry.hub,
+              hub: hubLc,
               assetId: entry.assetId
             });
           }
@@ -18279,7 +18299,6 @@ var getAaveV4ReservesDataConverter = (lender, chainId, prices, additionalYields,
           price: 0n
         });
       }
-      offset += reserveCount * CALLS_PER_RESERVE;
       const rawLiqConfig = data[offset];
       const rawOracle = data[offset + 1];
       offset += CALLS_PER_SPOKE_TAIL;
@@ -18303,23 +18322,19 @@ var getAaveV4ReservesDataConverter = (lender, chainId, prices, additionalYields,
         reserves: parsedReserves
       });
     }
-    for (let si = 0; si < spokes.length; si++) {
-      const reserves = getSpokeReserves2(
-        reservesMap,
-        spokes[si].spoke
-      );
+    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 && hasValidOracle2(spokes[si].oracle)) {
+      if (rids.length > 0 && isValidAddress2(sd.oracle)) {
         const rawPrices = data[offset];
         offset += 1;
         const priceArray = Array.isArray(rawPrices) ? rawPrices : [];
-        for (let ri = 0; ri < spokeDataList[si].reserves.length; ri++) {
+        for (let ri = 0; ri < sd.reserves.length; ri++) {
           if (ri < priceArray.length) {
-            spokeDataList[si].reserves[ri].price = BigInt(
-              priceArray[ri] ?? 0
-            );
+            sd.reserves[ri].price = BigInt(priceArray[ri] ?? 0);
           }
         }
       }
@@ -19039,7 +19054,7 @@ var buildEulerUserCall = async (chainId, lender, account, subAccountIndexes) =>
 };
 
 // src/lending/user-data/aave-v4-type/userCallBuild.ts
-var USER_CALLS_PER_RESERVE = 3;
+var USER_CALLS_PER_RESERVE = 4;
 var buildAaveV4UserCall = (chainId, lender, account) => {
   const spokes = aaveV4Spokes()?.[lender]?.[chainId] ?? [];
   const reservesMap = aaveV4Reserves()?.[lender]?.[chainId] ?? {};
@@ -19047,6 +19062,7 @@ var buildAaveV4UserCall = (chainId, lender, account) => {
   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;
@@ -19065,6 +19081,11 @@ var buildAaveV4UserCall = (chainId, lender, account) => {
           address: spokeAddr,
           name: "getUserReserveStatus",
           params: [rid, account]
+        },
+        {
+          address: spokeAddr,
+          name: "getUserPosition",
+          params: [rid, account]
         }
       );
     }
@@ -20233,17 +20254,231 @@ var getEulerUserDataConverter = (lender, chainId, account, metaMap, subAccountIn
   ];
 };
 
+// src/lending/user-data/aave-v4-type/createAaveV4UserState.ts
+function resolveV4Config(configs, userConfigKey) {
+  if (!configs) return { config: void 0, spokeAddr: void 0 };
+  if (userConfigKey && configs[userConfigKey]) {
+    return {
+      config: configs[userConfigKey],
+      spokeAddr: userConfigKey.split(":")[0]
+    };
+  }
+  const entries = Object.entries(configs);
+  if (entries.length === 0) return { config: void 0, spokeAddr: void 0 };
+  const [key, config] = entries[0];
+  const spokeAddr = key.split(":")[0];
+  return { config, spokeAddr };
+}
+function getConfigScopedPrice(meta, spokeAddr, configPriceMap) {
+  return getOraclePrice(meta);
+}
+function createAaveV4UserState(payload, lenderData, totalDeposits24h = 0, totalDebt24h = 0, configPriceMap) {
+  const assetKeys = getMarketUidsFromMeta(lenderData);
+  const { chainId, account } = payload;
+  let depositInterest = 0;
+  let borrowInterest = 0;
+  let rewardDepositAccrual = 0;
+  let rewardBorrowAccrual = 0;
+  let stakingDepositAccrual = 0;
+  let stakingBorrowAccrual = 0;
+  let deposits = 0;
+  let debt = 0;
+  let oracleDebt = 0;
+  let collateral = 0;
+  let borrowDiscountedCollateral = 0;
+  let borrowDiscountedCollateralAllActive = 0;
+  let collateralAllActive = 0;
+  let rewardsPerAsset = {};
+  for (const marketUid of assetKeys) {
+    if (!lenderData?.[marketUid] || !payload.lendingPositions[marketUid])
+      continue;
+    const pos = payload.lendingPositions[marketUid];
+    const { depositsUSD, debtStableUSD, debtUSD, collateralEnabled } = pos;
+    const depositsUSDOracle = pos.depositsUSDOracle ?? depositsUSD;
+    const debtUSDOracle = pos.debtUSDOracle ?? debtUSD;
+    const {
+      depositRate,
+      intrinsicYield,
+      variableBorrowRate,
+      stableBorrowRate,
+      rewards,
+      flags,
+      configs
+    } = lenderData[marketUid];
+    const { config: userConfigForAsset } = resolveV4Config(
+      configs,
+      pos.userConfigKey
+    );
+    deposits += depositsUSD;
+    debt += debtUSD + (debtStableUSD ?? 0);
+    oracleDebt += debtUSDOracle + (pos.debtStableUSDOracle ?? debtStableUSD ?? 0);
+    (rewards ?? []).forEach((rewardData) => {
+      const key = rewardData.asset;
+      rewardDepositAccrual += rewardData.depositRate * depositsUSD;
+      rewardBorrowAccrual += rewardData.variableBorrowRate * debtUSD;
+      const rewDepo = rewardData.depositRate * depositsUSD;
+      const rewDebt = rewardData.variableBorrowRate * debtUSD;
+      if (!rewardsPerAsset[key])
+        rewardsPerAsset[key] = { depositApr: 0, borrowApr: 0 };
+      if (rewDepo > 0) rewardsPerAsset[key].depositApr += rewDepo;
+      if (rewDebt > 0) rewardsPerAsset[key].borrowApr += rewDebt;
+    });
+    stakingDepositAccrual += (intrinsicYield ?? 0) * depositsUSD;
+    stakingBorrowAccrual += (intrinsicYield ?? 0) * debtUSD;
+    if (flags?.collateralActive || userConfigForAsset && !userConfigForAsset.collateralDisabled) {
+      if (collateralEnabled) {
+        collateral += (userConfigForAsset?.collateralFactor ?? 1) * depositsUSDOracle;
+        borrowDiscountedCollateral += (userConfigForAsset?.borrowCollateralFactor ?? 1) * depositsUSDOracle;
+      }
+      borrowDiscountedCollateralAllActive += (userConfigForAsset?.borrowCollateralFactor ?? 1) * depositsUSDOracle;
+      collateralAllActive += (userConfigForAsset?.collateralFactor ?? 1) * depositsUSDOracle;
+    }
+    depositInterest += (depositRate ?? 0) * depositsUSD;
+    borrowInterest += debtUSD * (variableBorrowRate ?? 0) + (debtStableUSD ?? 0) * (stableBorrowRate ?? 0);
+  }
+  const nav = deposits - debt;
+  const balanceData2 = {
+    borrowDiscountedCollateral,
+    borrowDiscountedCollateralAllActive,
+    collateral,
+    collateralAllActive,
+    deposits,
+    debt,
+    adjustedDebt: oracleDebt,
+    nav,
+    deposits24h: totalDeposits24h,
+    debt24h: totalDebt24h,
+    nav24h: totalDeposits24h - totalDebt24h,
+    ...payload.rewards ? { rewards: payload.rewards } : {}
+  };
+  const aprData2 = {
+    apr: safeDivide(depositInterest - borrowInterest, nav),
+    borrowApr: safeDivide(borrowInterest, debt),
+    depositApr: safeDivide(depositInterest, deposits),
+    rewards: divideAccrualsToAprs(rewardsPerAsset, nav, deposits, debt),
+    rewardApr: safeDivide(rewardDepositAccrual + rewardBorrowAccrual, nav),
+    rewardDepositApr: safeDivide(rewardDepositAccrual, deposits),
+    rewardBorrowApr: safeDivide(rewardBorrowAccrual, debt),
+    intrinsicApr: safeDivide(stakingDepositAccrual - stakingBorrowAccrual, nav),
+    intrinsicDepositApr: safeDivide(stakingDepositAccrual, deposits),
+    intrinsicBorrowApr: safeDivide(stakingBorrowAccrual, debt)
+  };
+  const userConfig = {
+    selectedMode: "0",
+    id: account,
+    isWhitelisted: true
+  };
+  const creditLine = Math.max(
+    0,
+    borrowDiscountedCollateral - balanceData2.adjustedDebt
+  );
+  for (const marketUid of assetKeys) {
+    if (!lenderData?.[marketUid]) continue;
+    const meta = lenderData[marketUid];
+    const { configs, flags, borrowLiquidity, withdrawLiquidity } = meta;
+    const pos = payload.lendingPositions[marketUid];
+    const { config, spokeAddr } = resolveV4Config(
+      configs,
+      pos ? pos.userConfigKey : void 0
+    );
+    const price = getConfigScopedPrice(meta);
+    const bcf = config?.borrowCollateralFactor ?? 1;
+    const bf = config?.borrowFactor ?? 1;
+    if (pos) {
+      let withdrawable;
+      if (!pos.collateralEnabled || config?.collateralDisabled) {
+        withdrawable = String(pos.deposits);
+      } else if (balanceData2.debt === 0) {
+        withdrawable = String(pos.deposits);
+      } else {
+        const withdrawableUSD = Math.max(creditLine / bcf, 0);
+        withdrawable = String(
+          Math.min(withdrawableUSD / price, Number(pos.deposits))
+        );
+      }
+      if (withdrawLiquidity != null) {
+        withdrawable = String(Math.min(Number(withdrawable), withdrawLiquidity));
+      }
+      let borrowable;
+      if (!flags?.borrowingEnabled || flags?.isFrozen || config?.debtDisabled) {
+        borrowable = "0";
+      } else {
+        const borrowableUSD = Math.max(creditLine / bf, 0);
+        borrowable = String(borrowableUSD / price);
+      }
+      if (borrowLiquidity != null) {
+        borrowable = String(Math.min(Number(borrowable), borrowLiquidity));
+      }
+      pos.withdrawable = withdrawable;
+      pos.borrowable = borrowable;
+      pos.underlyingInfo = buildUnderlyingInfo(meta);
+    } else if ((deposits > 0 || debt > 0) && flags?.borrowingEnabled && !flags?.isFrozen && !config?.debtDisabled) {
+      let borrowable = String(Math.max(creditLine / bf, 0) / price);
+      if (borrowLiquidity != null) {
+        borrowable = String(Math.min(Number(borrowable), borrowLiquidity));
+      }
+      payload.lendingPositions[marketUid] = {
+        marketUid,
+        deposits: "0",
+        debt: "0",
+        debtStable: "0",
+        depositsUSD: 0,
+        debtUSD: 0,
+        debtStableUSD: 0,
+        collateralEnabled: false,
+        claimableRewards: 0,
+        withdrawable: "0",
+        borrowable,
+        underlyingInfo: buildUnderlyingInfo(meta)
+      };
+    }
+  }
+  return {
+    lender: "",
+    account,
+    chainId,
+    data: [
+      {
+        health: balanceData2.debt === 0 ? null : balanceData2.adjustedDebt > 0 ? balanceData2.collateral / balanceData2.adjustedDebt : balanceData2.collateral / balanceData2.debt,
+        borrowCapacityUSD: creditLine,
+        accountId: "0",
+        balanceData: balanceData2,
+        aprData: aprData2,
+        userConfig,
+        positions: Object.values(payload.lendingPositions)
+      }
+    ]
+  };
+}
+
 // 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 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;
-    const reserveIds = reservesMap[spokeAddr.toLowerCase()] ?? reservesMap[spokeAddr] ?? [];
-    for (const entry of reserveIds) {
+    if (!spokeAddr || spokeAddr === "0x" || spokeAddr.length <= 2) continue;
+    const reserves = reservesMap[spokeAddr.toLowerCase()] ?? reservesMap[spokeAddr] ?? [];
+    for (const entry of reserves) {
       const rid = typeof entry === "number" ? entry : entry.reserveId;
-      reserveEntries.push({ spokeAddr, reserveId: rid });
+      const underlying = ((typeof entry === "object" ? entry.underlying : void 0) ?? spokeReserveToUnderlying.get(`${spokeAddr.toLowerCase()}:${rid}`) ?? "").toLowerCase();
+      reserveEntries.push({
+        spokeAddr,
+        reserveId: rid,
+        hub: (spokeEntry.hub ?? "").toLowerCase(),
+        underlying
+      });
     }
   }
   const expectedNumberOfCalls = reserveEntries.length * USER_CALLS_PER_RESERVE;
@@ -20253,12 +20488,23 @@ var getAaveV4UserDataConverter = (lender, chainId, account, metaMap) => {
         return void 0;
       }
       const lendingPositions = {};
+      const underlyingToUid = /* @__PURE__ */ new Map();
+      if (metaMap) {
+        for (const [uid, meta] of Object.entries(metaMap)) {
+          const addr = (meta?.underlying ?? "").toLowerCase();
+          if (addr) underlyingToUid.set(addr, uid);
+        }
+      }
       let totalDebt24h = 0;
       let totalDeposits24h = 0;
       for (let i = 0; i < reserveEntries.length; i++) {
-        const { spokeAddr, reserveId } = reserveEntries[i];
-        const refAddress = `${spokeAddr.toLowerCase()}:${reserveId}`;
-        const key = createMarketUid(chainId, lender, refAddress);
+        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 metaEntity = metaMap?.[key];
         if (!metaEntity) continue;
         const base = i * USER_CALLS_PER_RESERVE;
@@ -20269,6 +20515,11 @@ var getAaveV4UserDataConverter = (lender, chainId, account, metaMap) => {
           metaEntity
         );
         if (!dataForAsset) continue;
+        const userPositionResult = data[base + 3];
+        const userDynConfigKey = Number(
+          userPositionResult?.dynamicConfigKey ?? 0
+        );
+        dataForAsset.userConfigKey = `${spokeAddr.toLowerCase()}:${userDynConfigKey}`;
         totalDebt24h += addedDebt;
         totalDeposits24h += addedDeposits;
         lendingPositions[key] = dataForAsset;
@@ -20277,10 +20528,8 @@ var getAaveV4UserDataConverter = (lender, chainId, account, metaMap) => {
         chainId,
         account,
         lendingPositions,
-        rewards: [],
-        userEMode: 0
-      };
-      const userData = createBaseTypeUserState(
+        rewards: []};
+      const userData = createAaveV4UserState(
         payload,
         metaMap,
         totalDeposits24h,
@@ -31877,10 +32126,15 @@ var eulerV2Fetcher = {
 };
 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;
@@ -31890,10 +32144,13 @@ function getAaveV4OracleGroups(chainId) {
         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(),
-        spoke: entry.spoke.toLowerCase(),
-        reserveId: entry.reserveId
+        hub,
+        reserveId: entry.reserveId,
+        spoke: spokeLc
       });
     }
     for (const [oracle, group] of byOracle) {
@@ -31948,8 +32205,9 @@ function parseAaveV4Results(data, meta, context) {
         marketUid: createMarketUid(
           chainId,
           meta.fork,
-          `${entry.spoke}:${entry.reserveId}`
-        )
+          `${entry.hub}:${entry.underlying}`
+        ),
+        configId: entry.spoke
       });
     } catch {
       continue;