@1delta/margin-fetcher 0.0.219 → 0.0.221

package/dist/index.js

@@ -6308,6 +6308,12 @@ 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")) {
+    throw new Error(`aaveV4SpokeLenderKey: invalid spoke address ${spoke}`);
+  }
+  return `${baseHubLender}_${spoke.slice(2).toUpperCase()}`;
+}
 var getListUrl = (chainId) => `https://raw.githubusercontent.com/1delta-DAO/token-lists/main/${chainId}.json`;
 async function fetchTokenList(chainId) {
   const data = await fetch(getListUrl(chainId));
@@ -8220,6 +8226,7 @@ var getAaveV2ReservesDataConverter = (lender, chainId, prices, additionalYields,
               // flags
               collateralActive,
               borrowingEnabled,
+              depositsEnabled: true,
               hasStable: configData?.[7 /* stableBorrowRateEnabled */],
               isActive: configData?.[8 /* isActive */],
               isFrozen: configData?.[9 /* isFrozen */]
@@ -8372,6 +8379,7 @@ var getAaveV3ReservesDataConverter = (lender, chainId, prices, additionalYields,
               // flags
               collateralActive: usageAsCollateralEnabled,
               borrowingEnabled,
+              depositsEnabled: true,
               hasStable: configData?.[7 /* stableBorrowRateEnabled */],
               isActive: configData?.[8 /* isActive */],
               isFrozen: configData?.[9 /* isFrozen */],
@@ -8580,6 +8588,7 @@ function parseYLDRCall(chainId, lender, additionalYields, prices, tokenList) {
           // flags
           collateralActive: usageAsCollateralEnabled,
           borrowingEnabled,
+          depositsEnabled: true,
           hasStable: false,
           isActive: configData?.[7 /* isActive */],
           isFrozen: configData?.[8 /* isFrozen */]
@@ -8600,8 +8609,7 @@ function parseYLDRCall(chainId, lender, additionalYields, prices, tokenList) {
       }
       return {
         data: resultReserves,
-        chainId,
-        eModes: {}
+        chainId
       };
     },
     expectedNumberOfCalls
@@ -8721,6 +8729,7 @@ function parseAave32(chainId, lender, prices, additionalYields, tokenList) {
           // flags
           collateralActive: usageAsCollateralEnabled,
           borrowingEnabled,
+          depositsEnabled: true,
           hasStable: configData?.[7 /* stableBorrowRateEnabled */],
           isActive: configData?.[8 /* isActive */],
           isFrozen: configData?.[9 /* isFrozen */],
@@ -8830,6 +8839,7 @@ var getInitReservesDataConverter = (lender, chainId, prices, additionalYields, t
           rewards: [],
           config: {},
           borrowingEnabled: totalDebt !== "0",
+          depositsEnabled: true,
           params
         };
       });
@@ -8962,7 +8972,8 @@ var getCompoundV3ReservesDataConverter = (lender, chainId, prices, additionalYie
           collateralActive: true,
           isActive: true,
           isFrozen: false,
-          borrowingEnabled: false
+          borrowingEnabled: false,
+          depositsEnabled: true
         };
       }
       const baseMeta = tokenList[baseAssetData.baseAsset];
@@ -9037,6 +9048,7 @@ var getCompoundV3ReservesDataConverter = (lender, chainId, prices, additionalYie
             }
           ] : [],
           borrowingEnabled: true,
+          depositsEnabled: true,
           collateralActive: false,
           isActive: true,
           isFrozen: false,
@@ -12165,6 +12177,7 @@ function convertMarketsToMorphoResponse(response, chainId, additionalYields = {
         },
         collateralActive: false,
         borrowingEnabled: true,
+        depositsEnabled: true,
         hasStable: false,
         isActive: true,
         isFrozen: false
@@ -12215,6 +12228,7 @@ function convertMarketsToMorphoResponse(response, chainId, additionalYields = {
         },
         collateralActive: true,
         borrowingEnabled: false,
+        depositsEnabled: true,
         hasStable: false,
         isActive: true,
         isFrozen: false
@@ -12915,6 +12929,7 @@ function getListaMarketDataConverter(lender, chainId, prices, additionalYields =
             },
             collateralActive: false,
             borrowingEnabled: true,
+            depositsEnabled: true,
             hasStable: false,
             isActive: true,
             isFrozen: false
@@ -12955,6 +12970,7 @@ function getListaMarketDataConverter(lender, chainId, prices, additionalYields =
             },
             collateralActive: true,
             borrowingEnabled: false,
+            depositsEnabled: true,
             hasStable: false,
             isActive: true,
             isFrozen: false
@@ -13122,6 +13138,7 @@ function getMorphoMarketDataConverter(lender, chainId, prices, additionalYields
             },
             collateralActive: false,
             borrowingEnabled: true,
+            depositsEnabled: true,
             hasStable: false,
             isActive: true,
             isFrozen: false
@@ -13167,6 +13184,7 @@ function getMorphoMarketDataConverter(lender, chainId, prices, additionalYields
             },
             collateralActive: true,
             borrowingEnabled: false,
+            depositsEnabled: true,
             hasStable: false,
             isActive: true,
             isFrozen: false
@@ -15764,6 +15782,7 @@ function convertSingleEntry(opts) {
     rewards: [],
     collateralActive,
     borrowingEnabled,
+    depositsEnabled: !pausedActions[0 /* MINT */],
     params: {
       metadata: {
         cToken,
@@ -15854,6 +15873,7 @@ function convertSumerEntry(opts) {
     rewards: [],
     collateralActive,
     borrowingEnabled,
+    depositsEnabled: true,
     params: {
       metadata: {
         cToken,
@@ -15925,6 +15945,7 @@ function convertTakaraEntry(opts) {
     rewards: [],
     collateralActive: info.isListed,
     borrowingEnabled: info.isListed,
+    depositsEnabled: true,
     params: {
       metadata: {
         cToken,
@@ -15989,6 +16010,7 @@ function convertTectonicEntry(opts) {
     rewards: [],
     collateralActive: info.asCollateralEnabled,
     borrowingEnabled: info.asCollateralEnabled,
+    depositsEnabled: true,
     params: {
       metadata: {
         cToken,
@@ -16152,6 +16174,7 @@ function convertBenqiEntry(opts) {
     rewards: [],
     collateralActive,
     borrowingEnabled,
+    depositsEnabled: !parsed.mintPaused,
     params: {
       metadata: {
         cToken,
@@ -17733,6 +17756,7 @@ function buildTokenEntry(info, config, collateralActive, borrowVaults, opts) {
     config,
     collateralActive,
     borrowingEnabled: isBorrowVault,
+    depositsEnabled: true,
     hasStable: false,
     isActive: true,
     isFrozen: false,
@@ -17870,6 +17894,7 @@ var getEulerV2ReservesDataConverter = (lender, chainId, prices, additionalYields
             // flags
             collateralActive: entry.collateralActive,
             borrowingEnabled: entry.borrowingEnabled,
+            depositsEnabled: entry.depositsEnabled,
             hasStable: entry.hasStable,
             isActive: entry.isActive,
             isFrozen: entry.isFrozen,
@@ -17895,7 +17920,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 CALLS_PER_SPOKE_TAIL = 1;
 var MAX_HUB_ASSETS = 25;
 function isValidAddress(addr) {
   return !!addr && addr !== "0x" && addr.length > 2;
@@ -17961,18 +17986,11 @@ var buildAaveV4LenderReserveCall = (chainId, lender) => {
         });
       }
     }
-    calls.push(
-      {
-        address: spokeAddr,
-        name: "getLiquidationConfig",
-        params: []
-      },
-      {
-        address: spokeAddr,
-        name: "ORACLE",
-        params: []
-      }
-    );
+    calls.push({
+      address: spokeAddr,
+      name: "getLiquidationConfig",
+      params: []
+    });
   }
   for (const spokeEntry of spokes) {
     if (!isValidAddress(spokeEntry.spoke)) continue;
@@ -18065,51 +18083,49 @@ var getAaveV4ExpectedCallCount = (chainId, lender) => {
 // src/lending/public-data/aave-v4-type/fetcher/normalize.ts
 function toTokenAmount2(raw, decimals) {
   if (raw === 0n) return "0";
-  const divisor = 10 ** decimals;
-  return (Number(raw) / divisor).toString();
+  const negative = raw < 0n;
+  const abs = negative ? -raw : raw;
+  const s = abs.toString();
+  let intPart;
+  let fracPart;
+  if (s.length <= decimals) {
+    intPart = "0";
+    fracPart = "0".repeat(decimals - s.length) + s;
+  } else {
+    intPart = s.slice(0, s.length - decimals);
+    fracPart = s.slice(s.length - decimals);
+  }
+  fracPart = fracPart.replace(/0+$/, "");
+  const out = fracPart ? `${intPart}.${fracPart}` : intPart;
+  return negative ? `-${out}` : out;
 }
 function toTokenNumber(raw, decimals) {
   if (raw === 0n) return 0;
   return Number(raw) / 10 ** decimals;
 }
 var RAY2 = 1e27;
+var MAX_SPOKE_CAP = 2 ** 40 - 1;
 function rayRateToApr(rateRay) {
   if (rateRay === 0n) return 0;
   return Number(rateRay) / RAY2 * 100;
 }
-function normalizeAaveV4(spokeDataList, chainId, lender, prices, additionalYields, tokenList, lenderShortNameFn, createMarketUidFn, toOracleKeyFn, toGenericPriceKeyFn, expectedHub) {
-  const data = {};
-  const eModes = {};
+function normalizeAaveV4(spokeDataList, chainId, baseHubLender, prices, additionalYields, tokenList, lenderShortNameFn, createMarketUidFn, toOracleKeyFn, toGenericPriceKeyFn, expectedHub) {
+  const out = {};
   const hubFilter = expectedHub?.toLowerCase();
   for (const spokeData of spokeDataList) {
     const spokeAddr = spokeData.spoke.toLowerCase();
+    const spokeLenderKey = aaveV4SpokeLenderKey(baseHubLender, spokeAddr);
+    let spokeHub = "";
     const spokeReserves = spokeData.reserves;
+    const data = {};
     for (const reserve of spokeReserves) {
       const reserveHub = reserve.reserve.hub?.toLowerCase();
       if (hubFilter && reserveHub && reserveHub !== hubFilter)
         continue;
-      for (const [keyStr, dynCfg] of Object.entries(
-        reserve.dynamicConfigs
-      )) {
-        const configKey = `${spokeAddr}:${keyStr}`;
-        if (!eModes[configKey] && dynCfg.collateralFactor > 0) {
-          eModes[configKey] = {
-            category: configKey,
-            label: `${spokeData.label} / Config ${keyStr}`,
-            borrowCollateralFactor: dynCfg.collateralFactor / BPS,
-            collateralFactor: dynCfg.collateralFactor / BPS,
-            priceSource: spokeData.oracle
-          };
-        }
-      }
-    }
-    for (const reserve of spokeReserves) {
-      const reserveHub = reserve.reserve.hub?.toLowerCase();
-      if (hubFilter && reserveHub && reserveHub !== hubFilter)
-        continue;
+      if (!spokeHub) spokeHub = reserveHub ?? "";
       const underlying = reserve.reserve.underlying.toLowerCase();
       const decimals = reserve.reserve.decimals;
-      const marketUid = createMarketUidFn(chainId, lender, underlying);
+      const marketUid = createMarketUidFn(chainId, spokeLenderKey, underlying);
       const assetMeta = tokenList[underlying];
       const oracleKey = toOracleKeyFn(assetMeta?.assetGroup ?? null) ?? toGenericPriceKeyFn(underlying, chainId);
       let price = 0;
@@ -18118,21 +18134,34 @@ function normalizeAaveV4(spokeDataList, chainId, lender, prices, additionalYield
       } else {
         price = prices[oracleKey] ?? 0;
       }
-      const totalDeposits = toTokenAmount2(
+      const totalDepositsStr = toTokenAmount2(
         reserve.suppliedAssets,
         decimals
       );
-      const totalDebt = toTokenAmount2(reserve.totalDebt, decimals);
+      const totalDebtStr = toTokenAmount2(reserve.totalDebt, decimals);
       const totalDepositsNum = toTokenNumber(
         reserve.suppliedAssets,
         decimals
       );
       const totalDebtNum = toTokenNumber(reserve.totalDebt, decimals);
-      const liquidity = totalDepositsNum - totalDebtNum;
-      const variableBorrowRate = rayRateToApr(
-        reserve.hubAsset.drawnRate
-      );
+      const totalDepositsUSD = totalDepositsNum * price;
+      const totalDebtUSD = totalDebtNum * price;
+      const supplyCap = reserve.spokeBinding?.addCap ?? 0;
+      const borrowCap = reserve.spokeBinding?.drawCap ?? 0;
       const hubDecimals = reserve.hubAsset.decimals || decimals;
+      const hubLiquidityNum = toTokenNumber(
+        reserve.hubAsset.liquidity ?? 0n,
+        hubDecimals
+      );
+      let borrowLiquidityNum = hubLiquidityNum;
+      if (borrowCap > 0 && borrowCap < MAX_SPOKE_CAP) {
+        const spokeHeadroom = borrowCap - totalDebtNum;
+        if (spokeHeadroom < borrowLiquidityNum)
+          borrowLiquidityNum = spokeHeadroom;
+      }
+      if (borrowLiquidityNum < 0) borrowLiquidityNum = 0;
+      const borrowLiquidityUSD = borrowLiquidityNum * price;
+      const variableBorrowRate = rayRateToApr(reserve.hubAsset.drawnRate);
       const hubTotalSupply = toTokenNumber(
         reserve.hubAsset.totalAddedAssets ?? 0n,
         hubDecimals
@@ -18150,9 +18179,8 @@ function normalizeAaveV4(spokeDataList, chainId, lender, prices, additionalYield
       for (const [keyStr, dynCfg] of Object.entries(
         reserve.dynamicConfigs
       )) {
-        const configKey = `${spokeAddr}:${keyStr}`;
-        config[configKey] = {
-          category: configKey,
+        config[keyStr] = {
+          category: keyStr,
           label: `${spokeData.label} / Config ${keyStr}`,
           borrowCollateralFactor: dynCfg.collateralFactor / BPS,
           collateralFactor: dynCfg.collateralFactor / BPS,
@@ -18162,9 +18190,8 @@ function normalizeAaveV4(spokeDataList, chainId, lender, prices, additionalYield
         };
       }
       if (Object.keys(config).length === 0) {
-        const defaultKey = `${spokeAddr}:0`;
-        config[defaultKey] = {
-          category: defaultKey,
+        config["0"] = {
+          category: "0",
           label: `${spokeData.label} / Default`,
           borrowCollateralFactor: 0,
           collateralFactor: 0,
@@ -18173,88 +18200,66 @@ function normalizeAaveV4(spokeDataList, chainId, lender, prices, additionalYield
           debtDisabled: !reserve.config.borrowable || reserve.config.paused
         };
       }
-      const collateralEnabledOnThisSpoke = Object.values(
-        reserve.dynamicConfigs
-      ).some((c) => c.collateralFactor > 0);
-      if (data[marketUid]) {
-        Object.assign(data[marketUid].config, config);
-        if (!data[marketUid].collateralActive) {
-          data[marketUid].collateralActive = collateralEnabledOnThisSpoke;
-        }
-        if (!data[marketUid].borrowingEnabled) {
-          data[marketUid].borrowingEnabled = reserve.config.borrowable;
-        }
-        const rp = data[marketUid].params.riskPremium;
-        rp.bySpoke[spokeAddr] = {
-          collateralRiskBps,
-          riskPremiumThresholdBps
-        };
-        if (riskPremiumThresholdBps > rp.maxBps) {
-          rp.maxBps = riskPremiumThresholdBps;
-          rp.maxEffectiveBorrowRate = data[marketUid].variableBorrowRate * (1 + riskPremiumThresholdBps / BPS);
-        }
-        if (collateralEnabledOnThisSpoke) {
-          if (rp.minCollateralRiskBps == null || collateralRiskBps < rp.minCollateralRiskBps) {
-            rp.minCollateralRiskBps = collateralRiskBps;
+      const collateralActive = Object.values(reserve.dynamicConfigs).some(
+        (c) => c.collateralFactor > 0
+      );
+      data[marketUid] = {
+        marketUid,
+        name: lenderShortNameFn(baseHubLender) + " " + (assetMeta?.symbol ?? ""),
+        poolId: underlying,
+        underlying,
+        asset: assetMeta,
+        totalDeposits: totalDepositsStr,
+        totalDebtStable: "0",
+        totalDebt: totalDebtStr,
+        // V4 borrow liquidity comes from the hub, not from local supplies.
+        // See the comment block where `borrowLiquidityNum` is computed.
+        totalLiquidity: borrowLiquidityNum,
+        totalDepositsUSD,
+        totalDebtStableUSD: 0,
+        totalDebtUSD,
+        totalLiquidityUSD: borrowLiquidityUSD,
+        depositRate,
+        variableBorrowRate,
+        stableBorrowRate: 0,
+        intrinsicYield: additionalYields?.intrinsicYields?.[oracleKey] ?? 0,
+        rewards: [],
+        decimals,
+        config,
+        collateralActive,
+        borrowingEnabled: reserve.config.borrowable,
+        depositsEnabled: reserve.config.receiveSharesEnabled && !reserve.config.paused,
+        hasStable: false,
+        isActive: !reserve.config.paused,
+        isFrozen: reserve.config.frozen,
+        borrowCap,
+        supplyCap,
+        debtCeiling: 0,
+        params: {
+          metadata: {
+            assetId: reserve.reserve.assetId,
+            reserveId: reserve.reserveId
           }
+        },
+        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
         }
-      } 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()
-            },
-            riskPremium: {
-              maxBps: riskPremiumThresholdBps,
-              maxEffectiveBorrowRate: variableBorrowRate * (1 + riskPremiumThresholdBps / BPS),
-              minCollateralRiskBps: collateralEnabledOnThisSpoke ? collateralRiskBps : void 0,
-              bySpoke: {
-                [spokeAddr]: {
-                  collateralRiskBps,
-                  riskPremiumThresholdBps
-                }
-              }
-            }
-          }
-        };
-      }
+      };
     }
   }
-  return { data, chainId, eModes };
+  return out;
 }
 
 // src/lending/public-data/aave-v4-type/publicCallParse.ts
@@ -18347,7 +18352,6 @@ var getAaveV4ReservesDataConverter = (lender, chainId, prices, additionalYields,
         });
       }
       const rawLiqConfig = data[offset];
-      const rawOracle = data[offset + 1];
       offset += CALLS_PER_SPOKE_TAIL;
       const liquidationConfig = {
         targetHealthFactor: BigInt(
@@ -18362,7 +18366,7 @@ var getAaveV4ReservesDataConverter = (lender, chainId, prices, additionalYields,
       };
       spokeDataList.push({
         spoke: spokeAddr,
-        oracle: rawOracle ?? spokeEntry.oracle,
+        oracle: spokeEntry.oracle,
         label: spokeEntry.label,
         oracleDecimals: 8,
         liquidationConfig,
@@ -18448,7 +18452,9 @@ var getAaveV4ReservesDataConverter = (lender, chainId, prices, additionalYields,
               rawBinding?.riskPremiumThreshold ?? 0
             ),
             active: Boolean(rawBinding?.active ?? false),
-            halted: Boolean(rawBinding?.halted ?? 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(
@@ -20339,42 +20345,30 @@ 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 resolveDynamicConfig(configs, userConfigKey) {
+  if (!configs) return void 0;
+  if (userConfigKey && configs[userConfigKey]) return configs[userConfigKey];
+  const entries = Object.values(configs);
+  return entries.length > 0 ? entries[0] : void 0;
 }
-function getConfigScopedPrice(meta, spokeAddr) {
-  if (spokeAddr) {
-    const byConfig = meta?.oraclePrice?.byConfig;
-    const configPrice = byConfig?.[spokeAddr]?.oraclePriceUsd;
-    if (configPrice != null && configPrice > 0) return configPrice;
-  }
+function getSpokeScopedPrice(meta) {
   return getOraclePrice(meta);
 }
 function createAaveV4UserState(payload, lenderData, totalDeposits24h = 0, totalDebt24h = 0) {
-  const assetKeys = getMarketUidsFromMeta(lenderData);
   const { chainId, account } = payload;
-  const collateralsBySpoke = /* @__PURE__ */ new Map();
-  const debtBySpoke = /* @__PURE__ */ new Map();
-  for (const marketUid of assetKeys) {
+  const positions = payload.lendingPositions ?? {};
+  const positionMarketUids = Object.keys(positions);
+  const spokeLenderKey = positionMarketUids.length > 0 ? positionMarketUids[0].split(":")[0] : "";
+  const allMarketUids = getMarketUidsFromMeta(lenderData);
+  const spokeMarketUids = spokeLenderKey ? allMarketUids.filter((uid) => uid.startsWith(spokeLenderKey + ":")) : [];
+  const collaterals = [];
+  let totalDebtForPremium = 0;
+  for (const marketUid of positionMarketUids) {
     const meta = lenderData?.[marketUid];
-    const pos = payload.lendingPositions?.[marketUid];
+    const pos = positions[marketUid];
     if (!meta || !pos) continue;
     const userConfigKey = pos.userConfigKey;
-    if (!userConfigKey) continue;
-    const spokeLc = userConfigKey.split(":")[0];
-    if (!spokeLc) continue;
-    const { config: userConfig2 } = resolveV4Config(
+    const userConfig2 = resolveDynamicConfig(
       meta.configs ?? null,
       userConfigKey
     );
@@ -20382,28 +20376,17 @@ function createAaveV4UserState(payload, lenderData, totalDeposits24h = 0, totalD
     const depositsUSDOracle = pos.depositsUSDOracle ?? pos.depositsUSD ?? 0;
     const debtUSDOracle = pos.debtUSDOracle ?? pos.debtUSD ?? 0;
     if (pos.collateralEnabled && !userConfig2?.collateralDisabled && collateralFactor > 0 && depositsUSDOracle > 0) {
-      const riskBps = Number(
-        meta.params?.riskPremium?.bySpoke?.[spokeLc]?.collateralRiskBps ?? 0
-      );
-      const arr = collateralsBySpoke.get(spokeLc) ?? [];
-      arr.push({ riskBps, valueUsd: depositsUSDOracle });
-      collateralsBySpoke.set(spokeLc, arr);
+      const riskBps = Number(meta.collateralRiskBps ?? 0);
+      collaterals.push({ riskBps, valueUsd: depositsUSDOracle });
     }
     if (debtUSDOracle > 0) {
-      debtBySpoke.set(
-        spokeLc,
-        (debtBySpoke.get(spokeLc) ?? 0) + debtUSDOracle
-      );
+      totalDebtForPremium += debtUSDOracle;
     }
   }
-  const riskPremiumBpsBySpoke = {};
-  for (const [spokeLc, totalDebt] of debtBySpoke.entries()) {
-    if (totalDebt <= 0) {
-      riskPremiumBpsBySpoke[spokeLc] = 0;
-      continue;
-    }
-    const sorted = (collateralsBySpoke.get(spokeLc) ?? []).slice().sort((a, b) => a.riskBps - b.riskBps);
-    let debtLeft = totalDebt;
+  let riskPremiumBps = 0;
+  if (totalDebtForPremium > 0) {
+    const sorted = collaterals.slice().sort((a, b) => a.riskBps - b.riskBps);
+    let debtLeft = totalDebtForPremium;
     let weightedSum = 0;
     for (const c of sorted) {
       if (debtLeft <= 0) break;
@@ -20411,14 +20394,9 @@ function createAaveV4UserState(payload, lenderData, totalDeposits24h = 0, totalD
       weightedSum += used * c.riskBps;
       debtLeft -= used;
     }
-    const covered = totalDebt - debtLeft;
-    riskPremiumBpsBySpoke[spokeLc] = covered > 0 ? weightedSum / covered : 0;
+    const covered = totalDebtForPremium - debtLeft;
+    riskPremiumBps = covered > 0 ? weightedSum / covered : 0;
   }
-  const premiumMultiplierForSpoke = (spokeLc) => {
-    if (!spokeLc) return 1;
-    const bps = riskPremiumBpsBySpoke[spokeLc] ?? 0;
-    return 1 + bps / 1e4;
-  };
   let depositInterest = 0;
   let borrowInterest = 0;
   let rewardDepositAccrual = 0;
@@ -20433,10 +20411,10 @@ function createAaveV4UserState(payload, lenderData, totalDeposits24h = 0, totalD
   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];
+  for (const marketUid of positionMarketUids) {
+    const meta = lenderData?.[marketUid];
+    const pos = positions[marketUid];
+    if (!meta || !pos) continue;
     const { depositsUSD, debtStableUSD, debtUSD, collateralEnabled } = pos;
     const depositsUSDOracle = pos.depositsUSDOracle ?? depositsUSD;
     const debtUSDOracle = pos.debtUSDOracle ?? debtUSD;
@@ -20448,12 +20426,19 @@ function createAaveV4UserState(payload, lenderData, totalDeposits24h = 0, totalD
       rewards,
       flags,
       configs
-    } = lenderData[marketUid];
-    const { config: userConfigForAsset, spokeAddr: userSpokeAddr } = resolveV4Config(configs, pos.userConfigKey);
-    const userPremiumMultiplier = premiumMultiplierForSpoke(userSpokeAddr);
+    } = meta;
+    const userConfigForAsset = resolveDynamicConfig(
+      configs,
+      pos.userConfigKey
+    );
+    const positionThresholdBps = Number(
+      meta.riskPremiumThresholdBps ?? 0
+    );
+    const clampedPremiumBps = positionThresholdBps > 0 ? Math.min(riskPremiumBps, positionThresholdBps) : riskPremiumBps;
+    const userPremiumMultiplier = 1 + clampedPremiumBps / 1e4;
     const effectiveVariableBorrowRate = (variableBorrowRate ?? 0) * userPremiumMultiplier;
     pos.variableBorrowRate = effectiveVariableBorrowRate;
-    pos.riskPremiumBps = userSpokeAddr ? riskPremiumBpsBySpoke[userSpokeAddr] ?? 0 : 0;
+    pos.riskPremiumBps = clampedPremiumBps;
     deposits += depositsUSD;
     debt += debtUSD + (debtStableUSD ?? 0);
     oracleDebt += debtUSDOracle + (pos.debtStableUSDOracle ?? debtStableUSD ?? 0);
@@ -20517,16 +20502,16 @@ function createAaveV4UserState(payload, lenderData, totalDeposits24h = 0, totalD
     0,
     borrowDiscountedCollateral - balanceData2.adjustedDebt
   );
-  for (const marketUid of assetKeys) {
-    if (!lenderData?.[marketUid]) continue;
-    const meta = lenderData[marketUid];
+  for (const marketUid of spokeMarketUids) {
+    const meta = lenderData?.[marketUid];
+    if (!meta) continue;
     const { configs, flags, borrowLiquidity, withdrawLiquidity } = meta;
-    const pos = payload.lendingPositions[marketUid];
-    const { config, spokeAddr } = resolveV4Config(
+    const pos = positions[marketUid];
+    const config = resolveDynamicConfig(
       configs,
       pos ? pos.userConfigKey : void 0
     );
-    const price = getConfigScopedPrice(meta, spokeAddr);
+    const price = getSpokeScopedPrice(meta);
     const bcf = config?.borrowCollateralFactor ?? 1;
     const bf = config?.borrowFactor ?? 1;
     if (pos) {
@@ -20562,7 +20547,7 @@ function createAaveV4UserState(payload, lenderData, totalDeposits24h = 0, totalD
       if (borrowLiquidity != null) {
         borrowable = String(Math.min(Number(borrowable), borrowLiquidity));
       }
-      payload.lendingPositions[marketUid] = {
+      positions[marketUid] = {
         marketUid,
         deposits: "0",
         debt: "0",
@@ -20590,7 +20575,7 @@ function createAaveV4UserState(payload, lenderData, totalDeposits24h = 0, totalD
         balanceData: balanceData2,
         aprData: aprData2,
         userConfig,
-        positions: Object.values(payload.lendingPositions)
+        positions: Object.values(positions)
       }
     ]
   };
@@ -20600,6 +20585,18 @@ function createAaveV4UserState(payload, lenderData, totalDeposits24h = 0, totalD
 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) {
@@ -20614,12 +20611,16 @@ var getAaveV4UserDataConverter = (lender, chainId, account, metaMap) => {
   for (const spokeEntry of spokes) {
     const spokeAddr = spokeEntry.spoke;
     if (!spokeAddr || spokeAddr === "0x" || spokeAddr.length <= 2) continue;
-    const reserves = reservesMap[spokeAddr.toLowerCase()] ?? reservesMap[spokeAddr] ?? [];
+    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(`${spokeAddr.toLowerCase()}:${rid}`) ?? "").toLowerCase();
+      const underlying = ((typeof entry === "object" ? entry.underlying : void 0) ?? spokeReserveToUnderlying.get(`${spokeAddrLc}:${rid}`) ?? "").toLowerCase();
       reserveEntries.push({
         spokeAddr,
+        spokeAddrLc,
+        spokeLenderKey,
         reserveId: rid,
         underlying
       });
@@ -20631,23 +20632,14 @@ var getAaveV4UserDataConverter = (lender, chainId, account, metaMap) => {
       if (data.length !== expectedNumberOfCalls) {
         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;
+      const perSpoke = {};
       for (let i = 0; i < reserveEntries.length; i++) {
-        const { underlying, spokeAddr } = reserveEntries[i];
-        const key = underlying ? createMarketUid(chainId, lender, underlying) : underlyingToUid.get(underlying) ?? "";
-        const metaEntity = metaMap?.[key];
+        const { underlying, spokeAddrLc, spokeLenderKey } = reserveEntries[i];
+        if (!underlying) continue;
+        const key = createMarketUid(chainId, spokeLenderKey, underlying);
+        const metaEntity = flatMeta[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
@@ -20657,26 +20649,34 @@ var getAaveV4UserDataConverter = (lender, chainId, account, metaMap) => {
           data,
           key,
           metaEntity,
-          spokeLc
+          spokeAddrLc
         );
         if (!dataForAsset) continue;
-        dataForAsset.userConfigKey = `${spokeLc}:${userDynConfigKey}`;
-        totalDebt24h += addedDebt;
-        totalDeposits24h += addedDeposits;
-        lendingPositions[key] = dataForAsset;
+        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 payload = {
-        chainId,
-        account,
-        lendingPositions,
-        rewards: []};
-      const userData = createAaveV4UserState(
-        payload,
-        metaMap,
-        totalDeposits24h,
-        totalDebt24h
-      );
-      return userData;
+      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
+        );
+      }
+      return out;
     },
     expectedNumberOfCalls
   ];
@@ -20738,7 +20738,7 @@ 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?.[lender]);
+    return getAaveV4UserDataConverter(lender, chainId, account, meta);
   if (isYLDR(lender))
     return getYldrUserDataConverter(lender, chainId, account, meta?.[lender]);
   if (isAaveV2Type(lender))
@@ -25530,7 +25530,6 @@ function unflattenLenderData(pools) {
     if (!result[chainId].data[lender]) {
       result[chainId].data[lender] = {
         data: {},
-        eModes: {},
         chainId: String(chainId)
       };
     }
@@ -27292,7 +27291,7 @@ function generateLendingPairs(lenderData, prices, histPrices) {
             apr: totalApr,
             baseApr,
             rewardApr,
-            eMode: long.eMode?.category ?? 0,
+            eMode: Number(leverageParams.eModeConfigId) || 0,
             eModeConfigId: leverageParams.eModeConfigId,
             borrowCollateralFactorLong: leverageParams.borrowCollateralFactorLong,
             collateralFactorLong: leverageParams.collateralFactorLong,
@@ -32339,15 +32338,15 @@ 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);
       entries.push({
         asset: entry.underlying,
         price: priceNum,
         priceUSD: priceNum,
-        marketUid: createMarketUid(
-          chainId,
-          meta.fork,
-          `${entry.hub}:${entry.underlying}`
-        ),
+        marketUid: createMarketUid(chainId, spokeLenderKey, entry.underlying),
+        // 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,
         configId: entry.spoke
       });
     } catch {