@1delta/margin-fetcher 0.0.212 → 0.0.214

package/dist/index.js

@@ -1,13 +1,13 @@
 import { parseAbi, formatEther, BaseError, encodeFunctionData, formatUnits, decodeFunctionResult, decodeAbiParameters, AbiEncodingLengthMismatchError, concatHex, isAddress, InvalidAddressError, pad, stringToHex, boolToHex, integerRegex, numberToHex, bytesRegex, BytesSizeMismatchError, arrayRegex, UnsupportedPackedAbiType } from './chunk-ZVIJSUIM.js';
 import './chunk-BYTNVMX7.js';
 import './chunk-PR4QN5HX.js';
-import { Lender, isAaveType, isCompoundV3, isMultiMarket, isInit, isMorphoType, isCompoundV2Type, isVenusType, isSumerType, AAVE_V3_LENDERS, AAVE_V2_LENDERS, isAaveV2Type, isAaveV32Type, isAaveV3Type, isEulerType, isYLDR, isCompoundV3Type, isTectonicType, isBenqiType, isLista } from '@1delta/lender-registry';
+import { Lender, isAaveType, isCompoundV3, isMultiMarket, isInit, isMorphoType, isCompoundV2Type, isVenusType, isSumerType, AAVE_V3_LENDERS, AAVE_V2_LENDERS, isAaveV2Type, isAaveV32Type, isAaveV3Type, isEulerType, isAaveV4Type, isYLDR, isCompoundV3Type, isLista, isTectonicType, isBenqiType } from '@1delta/lender-registry';
 export { isAaveType, isAaveV2Type, isAaveV32Type, isAaveV3Type, isCompoundV3, isCompoundV3Type, isInit, isMorphoType, isMultiMarket, isYLDR } from '@1delta/lender-registry';
 import lodash from 'lodash';
 import { getEvmChain, multicallRetryUniversal, getEvmClient, getEvmClientUniversal } from '@1delta/providers';
-import { MorphoLensAbi, MorphoBlueAbi } from '@1delta/abis';
+import { MorphoLensAbi, AaveV4SpokeAbi, AaveV4OracleAbi, AaveV4HubAbi, MorphoBlueAbi } from '@1delta/abis';
 export { MorphoLensAbi } from '@1delta/abis';
-import { prepareDebitDataMulticall, prepareLenderDebitMulticall, parseDebitDataResult, parseLenderDebitResult, getPermit2ContractAddress, InitMarginAddresses } from '@1delta/calldata-sdk';
+import { prepareDebitDataMulticall, prepareLenderDebitMulticall, parseDebitDataResult, parseLenderDebitResult, getPermit2ContractAddress, getCompoundV3CometAddress as getCompoundV3CometAddress$1, getMorphoAddress, getAaveCollateralTokenAddress, InitMarginAddresses } from '@1delta/calldata-sdk';
 import { BALANCER_V2_FORKS, BALANCER_V3_FORKS, UNISWAP_V4_FORKS, FLASH_LOAN_IDS } from '@1delta/dex-registry';
 
 // src/abis/aave-v2/ProtocolDataProvider.ts
@@ -6268,12 +6268,16 @@ globalThis[GLOBAL_LENDER_DATA_KEY] = {
   morphoOracles: {},
   morphoTypeOracles: {},
   morphoTypeMarkets: {},
+  aaveOraclesConfig: {},
   aaveWethGateway: {},
   morphoBundler3: {},
   listaNativeProvider: {},
   compoundV3Bulker: {},
   eulerConfigs: {},
-  eulerVaults: {}
+  eulerVaults: {},
+  aaveV4Spokes: {},
+  aaveV4Reserves: {},
+  aaveV4Oracles: {}
 };
 function getGlobalData2() {
   return globalThis[GLOBAL_LENDER_DATA_KEY];
@@ -6295,8 +6299,12 @@ var compoundV2Pools = () => getGlobalData2()?.compoundV2Pools;
 var compoundV2Tokens = () => getGlobalData2()?.compoundV2Tokens;
 var compoundV2TokenArray = () => getGlobalData2()?.compoundV2TokenArray;
 var initConfig = () => getGlobalData2()?.initConfig;
+var aaveOraclesConfig = () => getGlobalData2()?.aaveOraclesConfig;
 var eulerConfigs = () => getGlobalData2()?.eulerConfigs;
 var eulerVaults = () => getGlobalData2()?.eulerVaults;
+var aaveV4Spokes = () => getGlobalData2()?.aaveV4Spokes;
+var aaveV4Reserves = () => getGlobalData2()?.aaveV4Reserves;
+var aaveV4Oracles = () => getGlobalData2()?.aaveV4Oracles;
 var getListUrl = (chainId) => `https://raw.githubusercontent.com/1delta-DAO/token-lists/main/${chainId}.json`;
 async function fetchTokenList(chainId) {
   const data = await fetch(getListUrl(chainId));
@@ -7527,6 +7535,9 @@ var getLendersForChain = (c) => {
       if (data[c]?.length > 0) lenders.push(l);
     });
   }
+  Object.entries(aaveV4Spokes() ?? {}).forEach(([l, data]) => {
+    if (data[c]?.length > 0) lenders.push(l);
+  });
   return lenders;
 };
 var filterLendersByProtocol = (allLenders, protocolList) => {
@@ -17881,7 +17892,499 @@ var getEulerV2ReservesDataConverter = (lender, chainId, prices, additionalYields
   ];
 };
 
-// src/lending/public-data/fetchLender.ts
+// src/lending/public-data/aave-v4-type/publicCallBuild.ts
+var CALLS_PER_RESERVE = 6;
+var CALLS_PER_SPOKE_TAIL = 2;
+function hasValidOracle(oracle) {
+  return !!oracle && oracle !== "0x" && oracle.length > 2;
+}
+function getSpokeReserves(reservesMap, spokeAddr) {
+  return reservesMap[spokeAddr.toLowerCase()] ?? reservesMap[spokeAddr] ?? [];
+}
+var buildAaveV4LenderReserveCall = (chainId, lender) => {
+  const spokes = aaveV4Spokes()?.[lender]?.[chainId] ?? [];
+  const reservesMap = aaveV4Reserves()?.[lender]?.[chainId] ?? {};
+  if (spokes.length === 0) return [];
+  const calls = [];
+  const hubAssetKeys = /* @__PURE__ */ new Set();
+  const hubAssetList = [];
+  for (const spokeEntry of spokes) {
+    const spokeAddr = spokeEntry.spoke;
+    const reserves = getSpokeReserves(reservesMap, spokeAddr);
+    for (const entry of reserves) {
+      const rid = typeof entry === "number" ? entry : entry.reserveId;
+      calls.push(
+        {
+          address: spokeAddr,
+          name: "getReserve",
+          params: [rid]
+        },
+        {
+          address: spokeAddr,
+          name: "getReserveConfig",
+          params: [rid]
+        },
+        {
+          address: spokeAddr,
+          name: "getReserveSuppliedAssets",
+          params: [rid]
+        },
+        {
+          address: spokeAddr,
+          name: "getReserveDebt",
+          params: [rid]
+        },
+        {
+          address: spokeAddr,
+          name: "getReserveTotalDebt",
+          params: [rid]
+        },
+        {
+          address: spokeAddr,
+          name: "getDynamicReserveConfig",
+          params: [rid, 0]
+        }
+      );
+      if (typeof entry === "object" && spokeEntry.hub && entry.assetId !== void 0) {
+        const key = `${spokeEntry.hub}:${entry.assetId}`;
+        if (!hubAssetKeys.has(key)) {
+          hubAssetKeys.add(key);
+          hubAssetList.push({
+            hub: spokeEntry.hub,
+            assetId: entry.assetId
+          });
+        }
+      }
+    }
+    calls.push(
+      {
+        address: spokeAddr,
+        name: "getLiquidationConfig",
+        params: []
+      },
+      {
+        address: spokeAddr,
+        name: "ORACLE",
+        params: []
+      }
+    );
+  }
+  for (const spokeEntry of spokes) {
+    const reserves = getSpokeReserves(
+      reservesMap,
+      spokeEntry.spoke
+    );
+    const rids = reserves.map(
+      (e) => typeof e === "number" ? e : e.reserveId
+    );
+    if (rids.length > 0 && hasValidOracle(spokeEntry.oracle)) {
+      calls.push({
+        address: spokeEntry.oracle,
+        name: "getReservesPrices",
+        params: [rids]
+      });
+    }
+  }
+  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]
+      }
+    );
+  }
+  return calls;
+};
+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) {
+    const reserves = getSpokeReserves(
+      reservesMap,
+      spokeEntry.spoke
+    );
+    count += reserves.length * CALLS_PER_RESERVE + CALLS_PER_SPOKE_TAIL;
+    const rids = reserves.map(
+      (e) => typeof e === "number" ? e : e.reserveId
+    );
+    if (rids.length > 0 && hasValidOracle(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}`);
+      }
+    }
+  }
+  count += hubAssetKeys.size * 3;
+  return count;
+};
+
+// 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();
+}
+function toTokenNumber(raw, decimals) {
+  if (raw === 0n) return 0;
+  return Number(raw) / 10 ** decimals;
+}
+var RAY2 = 1e27;
+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) {
+  const data = {};
+  const eModes = {};
+  for (const spokeData of spokeDataList) {
+    const spokeAddr = spokeData.spoke.toLowerCase();
+    const spokeReserves = spokeData.reserves;
+    for (const reserve of spokeReserves) {
+      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 underlying = reserve.reserve.underlying.toLowerCase();
+      const decimals = reserve.reserve.decimals;
+      const refAddress = `${spokeAddr}:${reserve.reserveId}`;
+      const marketUid = createMarketUidFn(chainId, lender, refAddress);
+      const assetMeta = tokenList[underlying];
+      const oracleKey = toOracleKeyFn(assetMeta?.assetGroup ?? null) ?? toGenericPriceKeyFn(underlying, chainId);
+      let price = 0;
+      if (reserve.price > 0n) {
+        price = Number(reserve.price) / 10 ** spokeData.oracleDecimals;
+      } else {
+        price = prices[oracleKey] ?? 0;
+      }
+      const totalDeposits = toTokenAmount2(
+        reserve.suppliedAssets,
+        decimals
+      );
+      const totalDebt = 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 hubDecimals = reserve.hubAsset.decimals || decimals;
+      const hubTotalSupply = toTokenNumber(
+        reserve.hubAsset.totalAddedAssets ?? 0n,
+        hubDecimals
+      );
+      const hubTotalOwed = toTokenNumber(
+        reserve.hubAsset.totalOwedAssets ?? 0n,
+        hubDecimals
+      );
+      const hubUtilization = hubTotalSupply > 0 ? hubTotalOwed / hubTotalSupply : 0;
+      const feeRate = reserve.hubAsset.liquidityFee ? reserve.hubAsset.liquidityFee / BPS : 0;
+      const depositRate = variableBorrowRate * hubUtilization * (1 - feeRate);
+      const config = {};
+      for (const [keyStr, dynCfg] of Object.entries(
+        reserve.dynamicConfigs
+      )) {
+        const configKey = `${spokeAddr}:${keyStr}`;
+        config[configKey] = {
+          category: configKey,
+          label: `${spokeData.label} / Config ${keyStr}`,
+          borrowCollateralFactor: dynCfg.collateralFactor / BPS,
+          collateralFactor: dynCfg.collateralFactor / BPS,
+          borrowFactor: 1,
+          collateralDisabled: dynCfg.collateralFactor === 0 || reserve.config.paused,
+          debtDisabled: !reserve.config.borrowable || reserve.config.paused
+        };
+      }
+      if (Object.keys(config).length === 0) {
+        const defaultKey = `${spokeAddr}:0`;
+        config[defaultKey] = {
+          category: defaultKey,
+          label: `${spokeData.label} / Default`,
+          borrowCollateralFactor: 0,
+          collateralFactor: 0,
+          borrowFactor: 1,
+          collateralDisabled: true,
+          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()
+          }
+        }
+      };
+    }
+  }
+  return { data, chainId, eModes };
+}
+
+// src/lending/public-data/aave-v4-type/publicCallParse.ts
+function hasValidOracle2(oracle) {
+  return !!oracle && oracle !== "0x" && oracle.length > 2;
+}
+function getSpokeReserves2(reservesMap, spokeAddr) {
+  return reservesMap[spokeAddr.toLowerCase()] ?? reservesMap[spokeAddr] ?? [];
+}
+var getAaveV4ReservesDataConverter = (lender, chainId, prices, additionalYields, tokenList = {}) => {
+  const expectedCalls = getAaveV4ExpectedCallCount(chainId, lender);
+  const converter = (data) => {
+    if (data.length !== expectedCalls) return void 0;
+    const spokes = aaveV4Spokes()?.[lender]?.[chainId] ?? [];
+    const reservesMap = aaveV4Reserves()?.[lender]?.[chainId] ?? {};
+    let offset = 0;
+    const spokeDataList = [];
+    const hubAssetKeys = /* @__PURE__ */ new Set();
+    const hubAssetList = [];
+    for (const spokeEntry of spokes) {
+      const spokeAddr = spokeEntry.spoke;
+      const reserves = getSpokeReserves2(reservesMap, spokeAddr);
+      const reserveCount = reserves.length;
+      const parsedReserves = [];
+      for (let i = 0; i < reserveCount; 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 reserve = {
+          underlying: rawReserve?.underlying ?? "",
+          hub: rawReserve?.hub ?? "",
+          assetId: Number(rawReserve?.assetId ?? 0),
+          decimals: Number(rawReserve?.decimals ?? 18),
+          collateralRisk: Number(
+            rawReserve?.collateralRisk ?? 0
+          ),
+          flags: Number(rawReserve?.flags ?? 0),
+          dynamicConfigKey: Number(
+            rawReserve?.dynamicConfigKey ?? 0
+          )
+        };
+        const config = {
+          collateralRisk: Number(rawConfig?.collateralRisk ?? 0),
+          paused: rawConfig?.paused ?? false,
+          frozen: rawConfig?.frozen ?? false,
+          borrowable: rawConfig?.borrowable ?? false,
+          receiveSharesEnabled: rawConfig?.receiveSharesEnabled ?? false
+        };
+        let drawnDebt = 0n;
+        let premiumDebt = 0n;
+        if (Array.isArray(rawDebt)) {
+          drawnDebt = BigInt(rawDebt[0] ?? 0);
+          premiumDebt = BigInt(rawDebt[1] ?? 0);
+        } else {
+          drawnDebt = BigInt(rawDebt ?? 0);
+        }
+        const 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}`;
+          if (!hubAssetKeys.has(key)) {
+            hubAssetKeys.add(key);
+            hubAssetList.push({
+              hub: spokeEntry.hub,
+              assetId: entry.assetId
+            });
+          }
+        }
+        parsedReserves.push({
+          reserveId,
+          reserve,
+          config,
+          dynamicConfigs,
+          suppliedAssets: BigInt(rawSupplied ?? 0),
+          drawnDebt,
+          premiumDebt,
+          totalDebt: BigInt(rawTotalDebt ?? 0),
+          hubAsset: { drawnRate: 0n },
+          price: 0n
+        });
+      }
+      offset += reserveCount * CALLS_PER_RESERVE;
+      const rawLiqConfig = data[offset];
+      const rawOracle = data[offset + 1];
+      offset += CALLS_PER_SPOKE_TAIL;
+      const liquidationConfig = {
+        targetHealthFactor: BigInt(
+          rawLiqConfig?.targetHealthFactor ?? 0
+        ),
+        healthFactorForMaxBonus: BigInt(
+          rawLiqConfig?.healthFactorForMaxBonus ?? 0
+        ),
+        liquidationBonusFactor: Number(
+          rawLiqConfig?.liquidationBonusFactor ?? 0
+        )
+      };
+      spokeDataList.push({
+        spoke: spokeAddr,
+        oracle: rawOracle ?? spokeEntry.oracle,
+        label: spokeEntry.label,
+        oracleDecimals: 8,
+        liquidationConfig,
+        reserves: parsedReserves
+      });
+    }
+    for (let si = 0; si < spokes.length; si++) {
+      const reserves = getSpokeReserves2(
+        reservesMap,
+        spokes[si].spoke
+      );
+      const rids = reserves.map(
+        (e) => typeof e === "number" ? e : e.reserveId
+      );
+      if (rids.length > 0 && hasValidOracle2(spokes[si].oracle)) {
+        const rawPrices = data[offset];
+        offset += 1;
+        const priceArray = Array.isArray(rawPrices) ? rawPrices : [];
+        for (let ri = 0; ri < spokeDataList[si].reserves.length; ri++) {
+          if (ri < priceArray.length) {
+            spokeDataList[si].reserves[ri].price = BigInt(
+              priceArray[ri] ?? 0
+            );
+          }
+        }
+      }
+    }
+    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)
+      });
+    }
+    for (const spokeData of spokeDataList) {
+      for (const reserve of spokeData.reserves) {
+        const underlying = reserve.reserve.underlying?.toLowerCase?.() ?? "";
+        if (underlying) {
+          const hubAsset = hubAssetMap.get(underlying);
+          if (hubAsset) {
+            reserve.hubAsset = hubAsset;
+          }
+        }
+      }
+    }
+    return normalizeAaveV4(
+      spokeDataList,
+      chainId,
+      lender,
+      prices,
+      additionalYields,
+      tokenList,
+      lenderShortName,
+      createMarketUid,
+      toOracleKey,
+      toGenericPriceKey
+    );
+  };
+  return [converter, expectedCalls];
+};
 function getMorphoTypeMarketConverter(lender, chainId, prices, additionalYields, tokenList = {}, marketsOverride) {
   if (lender.startsWith("LISTA_DAO"))
     return getListaMarketDataConverter(
@@ -17915,6 +18418,7 @@ function buildLenderCall(chainId, lender) {
   if (isCompoundV2Type(lender))
     return buildCompoundV2StyleLenderReserveCall(chainId, lender);
   if (isEulerType(lender)) return buildEulerV2LenderReserveCall(chainId, lender);
+  if (isAaveV4Type(lender)) return buildAaveV4LenderReserveCall(chainId, lender);
   return [];
 }
 function getLenderDataConverter(lender, chainId, prices, additionalYields, tokenList = {}) {
@@ -17975,6 +18479,14 @@ function getLenderDataConverter(lender, chainId, prices, additionalYields, token
       additionalYields,
       tokenList
     );
+  if (isAaveV4Type(lender))
+    return getAaveV4ReservesDataConverter(
+      lender,
+      chainId,
+      prices,
+      additionalYields,
+      tokenList
+    );
   return [() => null, 0];
 }
 var getAbi = (lender) => {
@@ -17994,6 +18506,7 @@ var getAbi = (lender) => {
   if (isInit(lender)) return InitLensAbi;
   if (isMorphoType(lender)) return MorphoLensAbi;
   if (isEulerType(lender)) return vaultLensAbi;
+  if (isAaveV4Type(lender)) return [...AaveV4SpokeAbi, ...AaveV4OracleAbi, ...AaveV4HubAbi];
   if (isSumerType(lender)) return [...SumerLensAbi, ...SumerComptrollerAbi];
   if (lender === Lender.TAKARA) return [...TakaraMarketStateAbi];
   if (isCompoundV2Type(lender)) return VenusLensAbi;
@@ -18525,8 +19038,43 @@ var buildEulerUserCall = async (chainId, lender, account, subAccountIndexes) =>
   }));
 };
 
+// src/lending/user-data/aave-v4-type/userCallBuild.ts
+var USER_CALLS_PER_RESERVE = 3;
+var buildAaveV4UserCall = (chainId, lender, account) => {
+  const spokes = aaveV4Spokes()?.[lender]?.[chainId] ?? [];
+  const reservesMap = aaveV4Reserves()?.[lender]?.[chainId] ?? {};
+  if (spokes.length === 0) return [];
+  const calls = [];
+  for (const spokeEntry of spokes) {
+    const spokeAddr = spokeEntry.spoke;
+    const reserveIds = reservesMap[spokeAddr.toLowerCase()] ?? reservesMap[spokeAddr] ?? [];
+    for (const entry of reserveIds) {
+      const rid = typeof entry === "number" ? entry : entry.reserveId;
+      calls.push(
+        {
+          address: spokeAddr,
+          name: "getUserSuppliedAssets",
+          params: [rid, account]
+        },
+        {
+          address: spokeAddr,
+          name: "getUserDebt",
+          params: [rid, account]
+        },
+        {
+          address: spokeAddr,
+          name: "getUserReserveStatus",
+          params: [rid, account]
+        }
+      );
+    }
+  }
+  return calls;
+};
+
 // src/lending/user-data/fetch-balances/prepare.ts
 async function buildUserCall(chainId, lender, account, params) {
+  if (isAaveV4Type(lender)) return buildAaveV4UserCall(chainId, lender, account);
   if (isAaveV2Type(lender)) return buildAaveV2UserCall(chainId, lender, account);
   if (isAaveV3Type(lender)) return buildAaveV3UserCall(chainId, lender, account);
   if (isInit(lender)) return buildInitUserCall(chainId, lender, account);
@@ -19685,8 +20233,114 @@ var getEulerUserDataConverter = (lender, chainId, account, metaMap, subAccountIn
   ];
 };
 
+// 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 reserveEntries = [];
+  for (const spokeEntry of spokes) {
+    const spokeAddr = spokeEntry.spoke;
+    const reserveIds = reservesMap[spokeAddr.toLowerCase()] ?? reservesMap[spokeAddr] ?? [];
+    for (const entry of reserveIds) {
+      const rid = typeof entry === "number" ? entry : entry.reserveId;
+      reserveEntries.push({ spokeAddr, reserveId: rid });
+    }
+  }
+  const expectedNumberOfCalls = reserveEntries.length * USER_CALLS_PER_RESERVE;
+  return [
+    (data) => {
+      if (data.length !== expectedNumberOfCalls) {
+        return void 0;
+      }
+      const lendingPositions = {};
+      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 metaEntity = metaMap?.[key];
+        if (!metaEntity) continue;
+        const base = i * USER_CALLS_PER_RESERVE;
+        const { dataForAsset, addedDebt, addedDeposits } = createAaveV4Entry(
+          base,
+          data,
+          key,
+          metaEntity
+        );
+        if (!dataForAsset) continue;
+        totalDebt24h += addedDebt;
+        totalDeposits24h += addedDeposits;
+        lendingPositions[key] = dataForAsset;
+      }
+      const payload = {
+        chainId,
+        account,
+        lendingPositions,
+        rewards: [],
+        userEMode: 0
+      };
+      const userData = createBaseTypeUserState(
+        payload,
+        metaMap,
+        totalDeposits24h,
+        totalDebt24h
+      );
+      return userData;
+    },
+    expectedNumberOfCalls
+  ];
+};
+function createAaveV4Entry(base, data, key, meta) {
+  const rawSupply = data[base];
+  const debtResult = data[base + 1];
+  const statusResult = data[base + 2];
+  const suppliedRaw = rawSupply === "0x" || rawSupply === void 0 ? "0" : rawSupply.toString();
+  const drawnDebtRaw = Array.isArray(debtResult) ? debtResult[0]?.toString() ?? "0" : "0";
+  const premiumDebtRaw = Array.isArray(debtResult) ? debtResult[1]?.toString() ?? "0" : "0";
+  const totalDebtRaw = (BigInt(drawnDebtRaw || "0") + BigInt(premiumDebtRaw || "0")).toString();
+  if ((suppliedRaw === "0" || !suppliedRaw) && totalDebtRaw === "0") {
+    return {
+      dataForAsset: void 0,
+      addedDeposits: 0,
+      addedDebt: 0
+    };
+  }
+  const assetMeta = meta.asset;
+  const decimals = assetMeta?.decimals ?? 18;
+  const currentDeposits = parseRawAmount(suppliedRaw, decimals);
+  const currentDebt = parseRawAmount(totalDebtRaw, decimals);
+  const collateralEnabled = Boolean(statusResult?.[0]);
+  const price = getDisplayPrice(meta);
+  const oPrice = getOraclePrice(meta);
+  const priceHist = meta?.price?.priceUsd24h ?? price;
+  const dataForAsset = {
+    marketUid: key,
+    underlying: assetMeta.address,
+    deposits: currentDeposits,
+    debtStable: "0",
+    debt: currentDebt,
+    depositsUSD: Number(currentDeposits) * price,
+    debtStableUSD: 0,
+    debtUSD: Number(currentDebt) * price,
+    depositsUSDOracle: Number(currentDeposits) * oPrice,
+    debtStableUSDOracle: 0,
+    debtUSDOracle: Number(currentDebt) * oPrice,
+    stableBorrowRate: 0,
+    collateralEnabled,
+    claimableRewards: 0
+  };
+  return {
+    dataForAsset,
+    addedDeposits: Number(currentDeposits) * priceHist,
+    addedDebt: Number(currentDebt) * priceHist
+  };
+}
+
 // 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]);
   if (isYLDR(lender))
     return getYldrUserDataConverter(lender, chainId, account, meta?.[lender]);
   if (isAaveV2Type(lender))
@@ -24365,6 +25019,7 @@ var accountLensAbi = [
 
 // src/lending/user-data/abis.ts
 var getAbi2 = (lender) => {
+  if (isAaveV4Type(lender)) return [...AaveV4SpokeAbi];
   if (isAaveV2Type(lender))
     return [
       ...AavePoolAndDataProviderAbi,
@@ -24805,12 +25460,27 @@ function resolveDebitDataKey(chainId, lender, tokenAddress, cToken) {
       if (resolved) return resolved.toLowerCase();
     }
   }
+  if (isCompoundV3Type(lender)) {
+    const comet = getCompoundV3CometAddress$1(chainId, lender);
+    if (comet) return comet;
+  }
+  if (isMorphoType(lender)) {
+    const comet = getMorphoAddress(
+      chainId,
+      isLista(lender) ? Lender.LISTA_DAO : Lender.MORPHO_BLUE
+    );
+    if (comet) return comet;
+  }
+  if (isAaveType(lender)) {
+    const aToken = getAaveCollateralTokenAddress(chainId, lender, tokenAddress);
+    if (aToken) return aToken;
+  }
   return tokenAddress.toLowerCase();
 }
 function needsLenderApproval(params) {
   const { lender, lenderDebitData, tokenAddress, amount, chainId, cToken } = params;
   if (!lenderDebitData) return true;
-  if (isInit(lender) || isMorphoType(lender)) {
+  if (isInit(lender) || isMorphoType(lender) || isCompoundV3(lender)) {
     const entry2 = Object.values(lenderDebitData)[0];
     if (!entry2 || entry2.amount === void 0) return true;
     return entry2.amount === 0n;
@@ -30396,38 +31066,8 @@ var parseRWADynamicOracleResults = (chainId, data, assetName) => {
     }
   }
 };
-var AAVE_LENDER_OVERRIDES = {
-  [Lender.KLAYBANK]: {
-    [Chain.KAIA_MAINNET]: {
-      // KLAYBANK on KAIA uses WKLAY as base asset
-      baseAsset: "0x19aac5f612f524b754ca7e7c41cbfa2e981a4432",
-      // BASE_CURRENCY_UNIT call reverts, oracle returns 18 decimals
-      baseCurrencyUnit: 1000000000000000000n,
-      // Use RHOMBUS oracle for WKLAY USD price
-      baseAssetSource: Lender.AVALON
-    }
-  },
-  [Lender.KLAP]: {
-    [Chain.KAIA_MAINNET]: {
-      // BASE_CURRENCY_UNIT call reverts, oracle returns 18 decimals (USD denominated)
-      baseCurrencyUnit: 1000000000000000000n
-    }
-  },
-  [Lender.MOLEND]: {
-    [Chain.MODE]: {
-      // BASE_CURRENCY_UNIT call reverts, oracle returns 18 decimals (USD denominated)
-      baseCurrencyUnit: 100000000n
-    }
-  },
-  [Lender.MOOLA]: {
-    [Chain.CELO_MAINNET]: {
-      baseAsset: "0x471ece3750da237f93b8e339c536989b8978a438",
-      // BASE_CURRENCY_UNIT call reverts, oracle returns 18 decimals
-      baseCurrencyUnit: 1000000000000000000n,
-      baseAssetSource: Lender.AAVE_V3
-    }
-  }
-};
+
+// src/prices/oracle-prices/fetchers/aave.ts
 function getAaveLendersForChain(chainId) {
   const oracles = aaveOracles() ?? {};
   const reserves = aaveReserves() ?? {};
@@ -30461,7 +31101,8 @@ function getAaveCalls2(chainId) {
         params: [asset]
       });
     }
-    const lenderOverride = AAVE_LENDER_OVERRIDES[lender]?.[chainId];
+    const config = aaveOraclesConfig() ?? {};
+    const lenderOverride = config[lender]?.[chainId];
     results.push({
       calls,
       meta: {
@@ -30471,7 +31112,7 @@ function getAaveCalls2(chainId) {
         baseCurrencyUnitIndex: 0,
         assetCallCount: assets.length,
         baseAssetOverride: lenderOverride?.baseAsset,
-        baseCurrencyUnitOverride: lenderOverride?.baseCurrencyUnit,
+        baseCurrencyUnitOverride: lenderOverride?.baseCurrencyUnit ? BigInt(lenderOverride.baseCurrencyUnit) : void 0,
         baseAssetSource: lenderOverride?.baseAssetSource
       },
       lender
@@ -30511,13 +31152,15 @@ function parseAaveResults2(data, meta, context) {
       );
       if (isNaN(rawPriceNum) || rawPriceNum === 0) continue;
       const priceUSD = rawPriceNum * baseAssetUSD;
+      const isBaseAsset = meta.baseAssetOverride && asset.toLowerCase() === meta.baseAssetOverride.toLowerCase();
       entries.push({
         asset: asset.toLowerCase(),
         price: rawPriceNum,
         // Raw price (in base asset terms)
         priceUSD,
         marketUid: createMarketUid(chainId, meta.fork, asset),
-        staticBase: meta.baseAssetOverride
+        staticBase: isBaseAsset || void 0,
+        baseAsset: meta.baseAssetOverride
       });
     } catch {
       continue;
@@ -30626,7 +31269,8 @@ function parseMorphoResults2(data, meta, context) {
         marketUid: createMarketUid(chainId, lenderKey, loanAsset),
         targetLender: lenderKey,
         description: "Morpho loan asset",
-        staticBase: loanAsset
+        staticBase: true,
+        baseAsset: loanAsset
       });
       const collateralPriceUSD = priceDebtToCollateral * loanAssetUSD;
       entries.push({
@@ -30636,7 +31280,7 @@ function parseMorphoResults2(data, meta, context) {
         priceUSD: collateralPriceUSD,
         marketUid: createMarketUid(chainId, lenderKey, collateralAsset),
         targetLender: lenderKey,
-        staticBase: loanAsset
+        baseAsset: loanAsset
       });
     }
   }
@@ -30753,7 +31397,7 @@ function processMarketsToEntries(chainId, allMarkets, source) {
         priceUSD: resolvedCollateralUSD,
         marketUid: createMarketUid(chainId, lenderKey, collateralAsset),
         targetLender: lenderKey,
-        staticBase: loanAsset
+        baseAsset: loanAsset
       });
     }
     if (resolvedLoanUSD > 0) {
@@ -30764,7 +31408,8 @@ function processMarketsToEntries(chainId, allMarkets, source) {
         marketUid: createMarketUid(chainId, lenderKey, loanAsset),
         targetLender: lenderKey,
         description: "Morpho loan asset",
-        staticBase: loanAsset
+        staticBase: true,
+        baseAsset: loanAsset
       });
     }
   }
@@ -30890,13 +31535,9 @@ function getCompoundV3Calls(chainId) {
     const skipBaseScaling = USD_PRICED_OVERRIDES[lender]?.has(chainId);
     const baseAsset = skipBaseScaling ? void 0 : baseData[lender]?.[chainId]?.baseAsset?.toLowerCase();
     const entries = Object.entries(assetOracles);
-    const constantEntry = entries.find(
+    const hasConstantFeed = entries.some(
       ([, e]) => e.description?.toLowerCase().includes("constant price")
     );
-    let staticBase;
-    if (constantEntry && baseAsset) {
-      staticBase = baseAsset;
-    }
     const calls = [];
     const meta = [];
     for (const [asset, entry] of entries) {
@@ -30905,13 +31546,14 @@ function getCompoundV3Calls(chainId) {
         name: "latestRoundData",
         params: []
       });
+      const isBaseAsset = hasConstantFeed && baseAsset && asset.toLowerCase() === baseAsset;
       meta.push({
         asset,
         oracle: entry.oracle,
         baseAsset,
         lender,
         description: entry.description,
-        staticBase
+        staticBase: isBaseAsset || void 0
       });
     }
     if (calls.length > 0) {
@@ -30954,7 +31596,8 @@ function parseCompoundV3Results(data, meta, context) {
         priceUSD,
         marketUid: createMarketUid(chainId, queryMeta.lender, queryMeta.asset),
         description: queryMeta.description,
-        staticBase: queryMeta.staticBase
+        staticBase: queryMeta.staticBase || void 0,
+        baseAsset: queryMeta.baseAsset
       });
     } catch {
     }
@@ -31232,6 +31875,96 @@ var eulerV2Fetcher = {
   parse: parseEulerV2Results,
   getAbi: getEulerV2Abi
 };
+function getAaveV4OracleGroups(chainId) {
+  const oracles = aaveV4Oracles() ?? {};
+  const groups = [];
+  for (const [fork, chains] of Object.entries(oracles)) {
+    const oracleEntries = chains[chainId] ?? [];
+    if (oracleEntries.length === 0) continue;
+    const byOracle = /* @__PURE__ */ new Map();
+    for (const entry of oracleEntries) {
+      if (!entry.oracle || entry.oracle === "0x") continue;
+      const key = entry.oracle.toLowerCase();
+      let group = byOracle.get(key);
+      if (!group) {
+        group = { decimals: entry.decimals ?? 8, entries: [] };
+        byOracle.set(key, group);
+      }
+      group.entries.push({
+        underlying: entry.underlying.toLowerCase(),
+        spoke: entry.spoke.toLowerCase(),
+        reserveId: entry.reserveId
+      });
+    }
+    for (const [oracle, group] of byOracle) {
+      groups.push({
+        fork,
+        oracle,
+        decimals: group.decimals,
+        entries: group.entries
+      });
+    }
+  }
+  return groups;
+}
+function getAaveV4Calls(chainId) {
+  const groups = getAaveV4OracleGroups(chainId);
+  const results = [];
+  for (const { fork, oracle, decimals, entries } of groups) {
+    const calls = entries.map((e) => ({
+      address: oracle,
+      name: "getReservePrice",
+      params: [e.reserveId]
+    }));
+    results.push({
+      calls,
+      meta: {
+        oracle,
+        oracleDecimals: decimals,
+        entries,
+        fork
+      },
+      lender: fork
+    });
+  }
+  return results;
+}
+function parseAaveV4Results(data, meta, context) {
+  const { chainId } = context;
+  const entries = [];
+  if (data.length === 0) return entries;
+  const divisor = 10 ** meta.oracleDecimals;
+  for (let i = 0; i < meta.entries.length; i++) {
+    const rawPrice = data[i];
+    if (rawPrice === void 0 || rawPrice === "0x") continue;
+    const entry = meta.entries[i];
+    try {
+      const priceNum = Number(BigInt(rawPrice.toString())) / divisor;
+      if (isNaN(priceNum) || priceNum === 0) continue;
+      entries.push({
+        asset: entry.underlying,
+        price: priceNum,
+        priceUSD: priceNum,
+        marketUid: createMarketUid(
+          chainId,
+          meta.fork,
+          `${entry.spoke}:${entry.reserveId}`
+        )
+      });
+    } catch {
+      continue;
+    }
+  }
+  return entries;
+}
+function getAaveV4Abi() {
+  return AaveV4OracleAbi;
+}
+var aaveV4Fetcher = {
+  getCalls: getAaveV4Calls,
+  parse: parseAaveV4Results,
+  getAbi: getAaveV4Abi
+};
 
 // src/prices/oracle-prices/fetchOraclePrices.ts
 function countFailures(data, offset, count) {
@@ -31371,6 +32104,11 @@ async function fetchOraclePrices(chainIds, rpcOverrides, lists = {}, retries = 3
       () => eulerV2Fetcher.getCalls(chainId),
       getCallsErrors
     ) : [];
+    const aaveV4Results = isActive("aavev4") ? safeGetCalls(
+      "aaveV4",
+      () => aaveV4Fetcher.getCalls(chainId),
+      getCallsErrors
+    ) : [];
     const morphoResults = isActive("morpho") ? safeGetCalls(
       "morpho",
       () => morphoFetcher.getCalls(chainId, {
@@ -31408,6 +32146,12 @@ async function fetchOraclePrices(chainIds, rpcOverrides, lists = {}, retries = 3
       eulerV2Fetcher.parse,
       getEulerV2Abi()
     );
+    const aaveV4Group = buildGroup(
+      "aaveV4",
+      aaveV4Results,
+      aaveV4Fetcher.parse,
+      getAaveV4Abi()
+    );
     const morphoGroup = buildGroup(
       "morpho",
       morphoResults,
@@ -31420,6 +32164,7 @@ async function fetchOraclePrices(chainIds, rpcOverrides, lists = {}, retries = 3
       compoundV3Group,
       listaGroup,
       eulerGroup,
+      aaveV4Group,
       morphoGroup
     ];
     const totalCalls = allGroups.reduce((s, g) => s + g.calls.length, 0);
@@ -31445,6 +32190,7 @@ async function fetchOraclePrices(chainIds, rpcOverrides, lists = {}, retries = 3
       compoundV3Data,
       listaData,
       eulerData,
+      aaveV4Data,
       morphoGqlEntries
     ] = await Promise.all([
       executeGroup(
@@ -31487,6 +32233,14 @@ async function fetchOraclePrices(chainIds, rpcOverrides, lists = {}, retries = 3
         allowFailure,
         rpcOverrides
       ),
+      executeGroup(
+        aaveV4Group,
+        chainId,
+        chainBatchSize,
+        retries,
+        allowFailure,
+        rpcOverrides
+      ),
       morphoGqlPromise
     ]);
     if (morphoGqlEntries == null && isActive("morpho")) {
@@ -31507,6 +32261,7 @@ async function fetchOraclePrices(chainIds, rpcOverrides, lists = {}, retries = 3
       { group: compoundV3Group, data: compoundV3Data },
       { group: listaGroup, data: listaData },
       { group: eulerGroup, data: eulerData },
+      { group: aaveV4Group, data: aaveV4Data },
       ...useMorphoGql ? [] : [{ group: morphoGroup, data: morphoData }]
     ];
     for (const { group, data } of groupResults) {
@@ -31561,6 +32316,7 @@ async function fetchOraclePrices(chainIds, rpcOverrides, lists = {}, retries = 3
     parseTrackers(compoundV3Group, compoundV3Data.results);
     parseTrackers(listaGroup, listaData.results);
     parseTrackers(eulerGroup, eulerData.results);
+    parseTrackers(aaveV4Group, aaveV4Data.results);
     if (stalenessThresholdSeconds > 0) {
       const nowSeconds = Math.floor(Date.now() / 1e3);
       for (const tracker of compoundV3Group.trackers) {