@1delta/margin-fetcher 5.0.61 → 5.0.63

package/dist/index.js

@@ -1,9 +1,9 @@
 import { parseAbi, keccak256, encodeAbiParameters, formatEther, BaseError, erc20Abi, stringToHex, isAddress, pad, encodeFunctionData, formatUnits, getAddress, decodeFunctionResult, decodeAbiParameters, concat, parseAbiParameters, AbiEncodingLengthMismatchError, concatHex, toBytes, slice, hexToString, InvalidAddressError, boolToHex, integerRegex, numberToHex, bytesRegex, BytesSizeMismatchError, arrayRegex, UnsupportedPackedAbiType } from './chunk-JUYF2XLF.js';
 import './chunk-BYTNVMX7.js';
 import './chunk-PR4QN5HX.js';
-import { Lender, isExactly, isMidnight, isTerm, isTermMax, isTeller, isListaDao, isLiquityFamily, isRiver, isInverse, isCooler, isDssType, isCompoundV3Type, isFluid, isGearboxV3, isLlamaLend, isFrankencoin, isResupply, isCurvance, isTwyne, isFraxlend, LIQUITY_FAMILY_LENDERS, isAaveType, isCompoundV3, isMultiMarket, isSiloV2Type, isSiloV3Type, isDolomite, isMorphoType, isUsdd, isSky, hasCrossMarginRisk, isEulerType, isAaveV4Type, isInit, isCompoundV2Type, isVenusType, isSumerType, AAVE_V3_LENDERS, AAVE_V2_LENDERS, isMorphoBlue, isAaveV2Type, isAaveV32Type, isAaveV3Type, isYLDR, isLista, hasSubAccounts, isTectonicType, isKineticType, isBenqiType } from '@1delta/lender-registry';
+import { Lender, isExactly, isMidnight, isTerm, isTermMax, isTeller, isListaDao, isLiquityFamily, isRiver, isInverse, isCooler, isDssType, isCompoundV3Type, isFluid, isGearboxV3, isLlamaLend, isFrankencoin, isResupply, isCurvance, isTwyne, isFraxlend, isAaveV4Type, LIQUITY_FAMILY_LENDERS, isAaveType, isCompoundV3, isCompoundV2Type, isMultiMarket, isSiloV2Type, isSiloV3Type, isDolomite, isMorphoType, isUsdd, isSky, hasCrossMarginRisk, isEulerType, isInit, isVenusType, isSumerType, AAVE_V3_LENDERS, AAVE_V2_LENDERS, isMorphoBlue, isAaveV2Type, isAaveV32Type, isAaveV3Type, isYLDR, isLista, hasSubAccounts, isTectonicType, isKineticType, isBenqiType } from '@1delta/lender-registry';
 export { hasCrossMarginRisk, isAaveType, isAaveV2Type, isAaveV32Type, isAaveV3Type, isCompoundV3, isCompoundV3Type, isInit, isMorphoType, isMultiMarket, isYLDR } from '@1delta/lender-registry';
-import { fetchTokenLists, fetchTokenList, aavePools, compoundV3Pools, initConfig, morphoPools, compoundV2Pools, eulerVaults, siloMarkets, siloV2LenderKey, siloMarketsV3, siloV3LenderKey, aaveV4Spokes, aaveV4SpokeLenderKey, fluidResolvers, gearboxResolvers, dolomiteConfigs, midnightConfig, termConfig, termMarketsByChain, exactlyConfig, liquityLendersByChain, riverLendersByChain, inverseLendersByChain, coolerLendersByChain, llamaLendLendersByChain, usddLendersByChain, skyLendersByChain, frankencoinLendersByChain, resupplyLendersByChain, curvanceLendersByChain, fraxlendLendersByChain, twyneLendersByChain, tellerConfigByChain, tellerPoolsByChain, termMaxConfigByChain, aaveReserves, compoundV3Reserves, resolveTermApiBase, liquityConfigFor, liquityBranchesByChain, riverConfigFor, riverChainData, termMaxApiBaseUrl, termMaxLenderKey, inverseConfigFor, inverseChainData, coolerConfigFor, llamaLendConfigFor, llamaLendChainData, llamaLendApiBaseUrl, resupplyConfigFor, fraxlendConfigFor, dssConfigFor, dssChainData, dssDebtToken, dssDebtJoin, frankencoinConfigFor, frankencoinChainData, aaveOracles, morphoTypeMarkets, resolveMidnightApiBase, llamaLendMarketByVault, getSiloV2MarketEntry, getSiloV3MarketEntry, dolomiteEmode, curvanceConfigFor, aaveTokens, morphoTypeVaults, listaCollateralProvider, eulerConfigs, gearboxMarketCompressor, gearboxMarketConfigurators, gearboxV3LenderKey, midnightMarketsByChain, twyneConfigFor, twyneChainData, parseAaveV4SpokeLenderKey, fraxlendPairsFor, gearboxAccountCompressor, compoundV2Tokens, exactlyMarketsByChain, aaveOraclesConfig, compoundV2Oracles, compoundV2TokenArray, compoundV2OraclesConfig, compoundV3OraclesData, compoundV3BaseData, compoundV2Reserves, aaveV4Oracles, morphoTypeOracles } from '@1delta/data-sdk';
+import { fetchTokenLists, fetchTokenList, aavePools, compoundV3Pools, initConfig, morphoPools, compoundV2Pools, eulerVaults, siloMarkets, siloV2LenderKey, siloMarketsV3, siloV3LenderKey, aaveV4Spokes, aaveV4SpokeLenderKey, fluidResolvers, gearboxResolvers, dolomiteConfigs, midnightConfig, termConfig, termMarketsByChain, exactlyConfig, liquityLendersByChain, riverLendersByChain, inverseLendersByChain, coolerLendersByChain, llamaLendLendersByChain, usddLendersByChain, skyLendersByChain, frankencoinLendersByChain, resupplyLendersByChain, curvanceLendersByChain, fraxlendLendersByChain, twyneLendersByChain, tellerConfigByChain, tellerPoolsByChain, termMaxConfigByChain, aaveReserves, compoundV3Reserves, resolveTermApiBase, liquityConfigFor, liquityBranchesByChain, riverConfigFor, riverChainData, termMaxApiBaseUrl, termMaxLenderKey, inverseConfigFor, inverseChainData, coolerConfigFor, llamaLendConfigFor, llamaLendChainData, llamaLendApiBaseUrl, resupplyConfigFor, fraxlendConfigFor, dssConfigFor, dssChainData, dssDebtToken, dssDebtJoin, frankencoinConfigFor, frankencoinChainData, aaveOracles, morphoTypeMarkets, resolveMidnightApiBase, llamaLendMarketByVault, getSiloV2MarketEntry, getSiloV3MarketEntry, dolomiteEmode, curvanceConfigFor, aaveTokens, morphoTypeVaults, listaCollateralProvider, eulerConfigs, gearboxMarketCompressor, gearboxMarketConfigurators, compoundV2TokenArray, gearboxV3LenderKey, midnightMarketsByChain, twyneConfigFor, twyneChainData, parseAaveV4SpokeLenderKey, fraxlendPairsFor, gearboxAccountCompressor, compoundV2Tokens, exactlyMarketsByChain, aaveOraclesConfig, compoundV2Oracles, compoundV2OraclesConfig, compoundV3OraclesData, compoundV3BaseData, compoundV2Reserves, aaveV4Oracles, morphoTypeOracles } from '@1delta/data-sdk';
 import lodash from 'lodash';
 import { Chain } from '@1delta/chain-registry';
 import { multicallRetryUniversal, getEvmClient, getEvmChain, getEvmClientUniversal } from '@1delta/providers';
@@ -7103,18 +7103,15 @@ var formatAaveYieldToNumber = (n) => {
   if (!n) return 0;
   return Number(formatEther(BigInt(n) / BigInt(1e7)));
 };
-var calculateRateForCompoundType2 = (n) => {
+var calculateRateForCompoundType2 = (n, unitSeconds) => {
   const rate = Number(formatEther(BigInt(n)));
-  return (Math.pow(rate * 60 * 60 * 24 / 12 + 1, 365) - 1) * 100;
+  const perUnit = unitSeconds && unitSeconds > 0 ? unitSeconds : 12;
+  return (Math.pow(rate * 60 * 60 * 24 / perUnit + 1, 365) - 1) * 100;
 };
-var calculateRateForCompoundType = (n, chainId, scale3 = 1 /* SECOND */) => {
+var calculateRateForCompoundType = (n, chainId, scale3 = 1 /* SECOND */, unitSeconds) => {
   const rate = Number(formatEther(BigInt(n)));
-  if (scale3 === 0 /* BLOCK */)
-    return (Math.pow(
-      rate * 60 * 60 * 24 / (BLOCK_TIMES[chainId] ?? "1") + 1,
-      365
-    ) - 1) * 100;
-  return (Math.pow(rate * 60 * 60 * 24 + 1, 365) - 1) * 100;
+  const perUnit = unitSeconds && unitSeconds > 0 ? unitSeconds : scale3 === 0 /* BLOCK */ ? Number(BLOCK_TIMES[chainId] ?? 1) : 1;
+  return (Math.pow(rate * 60 * 60 * 24 / perUnit + 1, 365) - 1) * 100;
 };
 var formatAaveRawApyToApr = (raw) => {
   const apy = formatAaveYieldToNumber(raw);
@@ -15305,9 +15302,102 @@ function getCall(lender, chainId) {
     params: [tk]
   });
 }
+var L1_BLOCK_SECONDS = 12;
+var L1_MERGE_BLOCK = 15537394;
+var L1_MERGE_TIMESTAMP = 1663224162;
+var estimateL1Height = (nowSeconds) => L1_MERGE_BLOCK + (nowSeconds - L1_MERGE_TIMESTAMP) / L1_BLOCK_SECONDS;
+var CADENCE_SPAN = 20000n;
+var TTL_MS = 24 * 60 * 60 * 1e3;
+var clockCache = /* @__PURE__ */ new Map();
+var cadenceCache = /* @__PURE__ */ new Map();
+var fresh = (e) => !!e && Date.now() - e.at < TTL_MS;
+function classifyRateClock(accrualBlockNumber, headBlockNumber, headTimestamp) {
+  const v = Number(accrualBlockNumber);
+  if (!Number.isFinite(v) || v <= 0) return void 0;
+  const candidates = [
+    ["timestamp", Number(headTimestamp)],
+    ["block", Number(headBlockNumber)],
+    // The L1 height is not readable from this chain; derive it from the L2
+    // head's timestamp, which is the same wall clock Ethereum runs on.
+    ["l1-block", estimateL1Height(Number(headTimestamp))]
+  ];
+  let best;
+  let bestRatio = Infinity;
+  for (const [kind, expected] of candidates) {
+    if (!Number.isFinite(expected) || expected <= 0) continue;
+    const ratio = v > expected ? v / expected : expected / v;
+    if (ratio < bestRatio) {
+      bestRatio = ratio;
+      best = kind;
+    }
+  }
+  return bestRatio <= 2 ? best : void 0;
+}
+async function chainBlockSeconds(chainId) {
+  const hit = cadenceCache.get(chainId);
+  if (fresh(hit)) return hit.value;
+  let value;
+  try {
+    const client = await getEvmClient(chainId);
+    const head = await client.getBlockNumber();
+    const span = head > CADENCE_SPAN ? CADENCE_SPAN : head / 2n;
+    const [b1, b0] = await Promise.all([
+      client.getBlock({ blockNumber: head }),
+      client.getBlock({ blockNumber: head - span })
+    ]);
+    const secs = Number(b1.timestamp - b0.timestamp) / Number(span);
+    if (secs >= 0.05 && secs <= 60) value = secs;
+  } catch {
+    value = void 0;
+  }
+  cadenceCache.set(chainId, { at: Date.now(), value });
+  return value;
+}
+async function resolveRateUnitSeconds(chainId, lender) {
+  const key3 = `${chainId}:${lender}`;
+  let clock = clockCache.get(key3);
+  if (!fresh(clock)) {
+    let value;
+    try {
+      const sample = getCompoundV2Tokens(chainId, lender)[0]?.cToken;
+      if (sample) {
+        const client = await getEvmClient(chainId);
+        const head = await client.getBlock();
+        const accrual = await client.readContract({
+          address: sample,
+          abi: [
+            {
+              inputs: [],
+              name: "accrualBlockNumber",
+              outputs: [{ name: "", type: "uint256" }],
+              stateMutability: "view",
+              type: "function"
+            }
+          ],
+          functionName: "accrualBlockNumber"
+        });
+        value = classifyRateClock(accrual, head.number, head.timestamp);
+      }
+    } catch {
+      value = void 0;
+    }
+    clock = { at: Date.now(), value };
+    clockCache.set(key3, clock);
+  }
+  switch (clock.value) {
+    case "timestamp":
+      return 1;
+    case "l1-block":
+      return L1_BLOCK_SECONDS;
+    case "block":
+      return await chainBlockSeconds(chainId);
+    default:
+      return void 0;
+  }
+}
 
 // src/lending/public-data/compound-v2/getters/venus.ts
-function readVTokenMetadata(meta, token) {
+function readVTokenMetadata(meta, token, unitSeconds) {
   const pick3 = (...values) => values.find((v) => v !== void 0);
   return {
     vToken: meta.vToken ?? "",
@@ -15343,7 +15433,8 @@ function readVTokenMetadata(meta, token) {
           meta.supplyRatePerBlockOrTimestamp
         )?.toString() ?? "0",
         token.chainId,
-        0 /* BLOCK */
+        0 /* BLOCK */,
+        unitSeconds
       ) / 100
     ) * 100,
     variableBorrowRate: apyToApr(
@@ -15353,7 +15444,8 @@ function readVTokenMetadata(meta, token) {
           meta.borrowRatePerBlockOrTimestamp
         )?.toString() ?? "0",
         token.chainId,
-        0 /* BLOCK */
+        0 /* BLOCK */,
+        unitSeconds
       ) / 100
     ) * 100,
     supplyCap: 0,
@@ -15572,20 +15664,24 @@ function parseTectonicMarketData(input) {
     isBoosted: toBool3(field3(input, "isBoosted", 22)),
     baseRatePerBlock: toBigInt3(field3(input, "baseRatePerBlock", 23)),
     multiplierPerBlock: toBigInt3(field3(input, "multiplierPerBlock", 24)),
-    jumpMultiplierPerBlock: toBigInt3(field3(input, "jumpMultiplierPerBlock", 25)),
+    jumpMultiplierPerBlock: toBigInt3(
+      field3(input, "jumpMultiplierPerBlock", 25)
+    ),
     kink: toBigInt3(field3(input, "kink", 26))
   };
 }
-function getTectonicRates(info, chainId) {
+function getTectonicRates(info, chainId, unitSeconds) {
   const supplyApy = calculateRateForCompoundType(
     info.supplyRatePerBlock.toString(),
     chainId,
-    0 /* BLOCK */
+    0 /* BLOCK */,
+    unitSeconds
   );
   const borrowApy = calculateRateForCompoundType(
     info.borrowRatePerBlock.toString(),
     chainId,
-    0 /* BLOCK */
+    0 /* BLOCK */,
+    unitSeconds
   );
   return {
     depositRate: apyToApr(supplyApy / 100) * 100,
@@ -15631,7 +15727,9 @@ function parseKineticMarketMetadata(input) {
     totalBorrows: toBigInt4(field4(input, "totalBorrows", 9)),
     collateralFactor: toBigInt4(field4(input, "collateralFactor", 10)),
     underlyingToken: String(field4(input, "underlyingToken", 11)),
-    underlyingTokenDecimals: Number(field4(input, "underlyingTokenDecimals", 12)),
+    underlyingTokenDecimals: Number(
+      field4(input, "underlyingTokenDecimals", 12)
+    ),
     cTokenDecimals: Number(field4(input, "cTokenDecimals", 13)),
     totalReserves: toBigInt4(field4(input, "totalReserves", 16)),
     cash: toBigInt4(field4(input, "cash", 17)),
@@ -16116,9 +16214,7 @@ function parseBenqiEcoMarketMetadata(input) {
     borrowCap: toBigInt5(field5(input, "borrowCap", 6)),
     supplyCap: toBigInt5(field5(input, "supplyCap", 7)),
     totalSupply: toBigInt5(field5(input, "totalSupply", 8)),
-    totalUnderlyingSupply: toBigInt5(
-      field5(input, "totalUnderlyingSupply", 9)
-    ),
+    totalUnderlyingSupply: toBigInt5(field5(input, "totalUnderlyingSupply", 9)),
     totalBorrows: toBigInt5(field5(input, "totalBorrows", 10)),
     collateralFactor: toBigInt5(field5(input, "collateralFactor", 11)),
     underlying: parseToken(field5(input, "underlying", 12)),
@@ -16129,16 +16225,18 @@ function parseBenqiEcoMarketMetadata(input) {
     borrowPaused: toBool5(field5(input, "borrowPaused", 17))
   };
 }
-function getBenqiRates(info, chainId) {
+function getBenqiRates(info, chainId, unitSeconds) {
   const supplyApy = calculateRateForCompoundType(
     info.supplyRate.toString(),
     chainId,
-    0 /* BLOCK */
+    0 /* BLOCK */,
+    unitSeconds
   );
   const borrowApy = calculateRateForCompoundType(
     info.borrowRate.toString(),
     chainId,
-    0 /* BLOCK */
+    0 /* BLOCK */,
+    unitSeconds
   );
   return {
     depositRate: apyToApr(supplyApy / 100) * 100,
@@ -16339,27 +16437,29 @@ function parseBaseFields(meta) {
     pausedActions: DEFAULT_PAUSED_ACTIONS
   };
 }
-function readLodestarCTokenMetadata(meta, token) {
+function readLodestarCTokenMetadata(meta, token, unitSeconds) {
   const base = parseBaseFields(meta);
   return {
     ...base,
     depositRate: capRate(
       apyToApr(
         calculateRateForCompoundType2(
-          base.supplyRatePerBlock?.toString() ?? "0"
+          base.supplyRatePerBlock?.toString() ?? "0",
+          unitSeconds
         ) / 100
       ) * 100
     ),
     variableBorrowRate: capRate(
       apyToApr(
         calculateRateForCompoundType2(
-          base.borrowRatePerBlock?.toString() ?? "0"
+          base.borrowRatePerBlock?.toString() ?? "0",
+          unitSeconds
         ) / 100
       ) * 100
     )
   };
 }
-function readCompoundV2CTokenMetadata(meta, token) {
+function readCompoundV2CTokenMetadata(meta, token, unitSeconds) {
   const base = parseBaseFields(meta);
   return {
     ...base,
@@ -16368,7 +16468,8 @@ function readCompoundV2CTokenMetadata(meta, token) {
         calculateRateForCompoundType(
           base.supplyRatePerBlock?.toString() ?? "0",
           token.chainId,
-          0 /* BLOCK */
+          0 /* BLOCK */,
+          unitSeconds
         ) / 100
       ) * 100
     ),
@@ -16377,7 +16478,8 @@ function readCompoundV2CTokenMetadata(meta, token) {
         calculateRateForCompoundType(
           base.borrowRatePerBlock?.toString() ?? "0",
           token.chainId,
-          0 /* BLOCK */
+          0 /* BLOCK */,
+          unitSeconds
         ) / 100
       ) * 100
     )
@@ -16406,7 +16508,7 @@ function parseCreamV2BaseFields(meta) {
     pausedActions: DEFAULT_PAUSED_ACTIONS
   };
 }
-function readCreamV2CTokenMetadata(meta, token) {
+function readCreamV2CTokenMetadata(meta, token, unitSeconds) {
   const base = parseCreamV2BaseFields(meta);
   return {
     ...base,
@@ -16415,7 +16517,8 @@ function readCreamV2CTokenMetadata(meta, token) {
         calculateRateForCompoundType(
           base.supplyRatePerBlock?.toString() ?? "0",
           token.chainId,
-          0 /* BLOCK */
+          0 /* BLOCK */,
+          unitSeconds
         ) / 100
       ) * 100
     ),
@@ -16424,7 +16527,8 @@ function readCreamV2CTokenMetadata(meta, token) {
         calculateRateForCompoundType(
           base.borrowRatePerBlock?.toString() ?? "0",
           token.chainId,
-          0 /* BLOCK */
+          0 /* BLOCK */,
+          unitSeconds
         ) / 100
       ) * 100
     )
@@ -16557,13 +16661,13 @@ var REPAIR_BACKOFF_JITTER_MS = 60;
 var sleep = (ms) => new Promise((resolve) => setTimeout(resolve, Math.max(0, ms)));
 var backoffForRound = (round) => REPAIR_BACKOFF_BASE_MS * 2 ** round + Math.random() * REPAIR_BACKOFF_JITTER_MS;
 var endpointUrl = (client, rpcId) => client?.transport?.url ?? `rpc#${rpcId}`;
-var resolveEndpoint = (chainId, getEvmClient17, startRpcId, tried, maxProbe = 12, timeoutMs) => {
+var resolveEndpoint = (chainId, getEvmClient18, startRpcId, tried, maxProbe = 12, timeoutMs) => {
   let fallback = null;
   for (let probe = 0; probe < maxProbe; probe++) {
     const rpcId = startRpcId + probe;
     let client;
     try {
-      client = getEvmClient17(chainId, rpcId, { timeoutMs });
+      client = getEvmClient18(chainId, rpcId, { timeoutMs });
     } catch {
       break;
     }
@@ -16592,7 +16696,7 @@ var recordPermanentFailures = (slots, offset, collector) => {
     if (slots[i].permanent) collector.add(offset + i);
   }
 };
-var repairFailedSlots = async (chainId, contracts, slots, getEvmClient17, nextRpcId, batchSize, logs, rounds = MULTICALL_REPAIR_ROUNDS, options) => {
+var repairFailedSlots = async (chainId, contracts, slots, getEvmClient18, nextRpcId, batchSize, logs, rounds = MULTICALL_REPAIR_ROUNDS, options) => {
   let searchFrom = nextRpcId;
   for (let round = 0; round < rounds; round++) {
     const failedIdx = [];
@@ -16602,7 +16706,7 @@ var repairFailedSlots = async (chainId, contracts, slots, getEvmClient17, nextRp
     if (failedIdx.length === 0) return slots;
     const endpoint = resolveEndpoint(
       chainId,
-      getEvmClient17,
+      getEvmClient18,
       searchFrom,
       options?.tried
     );
@@ -16654,7 +16758,7 @@ var repairFailedSlots = async (chainId, contracts, slots, getEvmClient17, nextRp
   }
   return slots;
 };
-var multicallShardedAbiArray = async (chainId, abi, calls, getEvmClient17, poolSize, retries = maxRetries, allowFailure = true, batchSize = MULTICALL_DEFAULT_BATCH_SIZE, logs = false, retryFailed = false, permanentFailures, options) => {
+var multicallShardedAbiArray = async (chainId, abi, calls, getEvmClient18, poolSize, retries = maxRetries, allowFailure = true, batchSize = MULTICALL_DEFAULT_BATCH_SIZE, logs = false, retryFailed = false, permanentFailures, options) => {
   const abiIsArray = isArray(abi[0]);
   const contracts = calls.map(({ address, name, params }, i) => ({
     abi: abiIsArray ? abi?.[i] : abi,
@@ -16728,7 +16832,7 @@ var multicallShardedAbiArray = async (chainId, abi, calls, getEvmClient17, poolS
   const attemptHedged = async (items, startRpcId, tried) => {
     const primary = resolveEndpoint(
       chainId,
-      getEvmClient17,
+      getEvmClient18,
       startRpcId,
       tried,
       12,
@@ -16752,7 +16856,7 @@ var multicallShardedAbiArray = async (chainId, abi, calls, getEvmClient17, poolS
         clearTimeout(timer);
         const alt = resolveEndpoint(
           chainId,
-          getEvmClient17,
+          getEvmClient18,
           primary.rpcId + 1,
           tried,
           12,
@@ -16804,7 +16908,7 @@ var multicallShardedAbiArray = async (chainId, abi, calls, getEvmClient17, poolS
         chainId,
         batch.items,
         slots,
-        getEvmClient17,
+        getEvmClient18,
         won.rpcId + 1,
         requestBytes,
         logs,
@@ -16826,7 +16930,7 @@ var multicallShardedAbiArray = async (chainId, abi, calls, getEvmClient17, poolS
       const tried = /* @__PURE__ */ new Set();
       const start = resolveEndpoint(
         chainId,
-        getEvmClient17,
+        getEvmClient18,
         workerId,
         void 0,
         12,
@@ -16873,7 +16977,7 @@ var parseMantissaWad = (raw) => {
     return void 0;
   }
 };
-var getCompoundV2DataConverter = (lender, chainId, prices, additionalYields, tokenList = {}) => {
+var getCompoundV2DataConverter = (lender, chainId, prices, additionalYields, tokenList = {}, unitSeconds) => {
   if (lender === Lender.TAKARA) {
     return [
       (data) => {
@@ -16995,7 +17099,7 @@ var getCompoundV2DataConverter = (lender, chainId, prices, additionalYields, tok
   const pauseReads = Boolean(stdComptroller) && usesComptrollerPauseReads(lender);
   const pauseCalls = pauseReads ? tokenCount * 2 : 0;
   const expectedNumberOfCalls = isSumer ? tokenCount + SUMER_GROUP_COUNT : tokenCount + stdComptrollerCalls + pauseCalls;
-  const reader = getReader(lender, chainId);
+  const reader = getReader(lender, chainId, unitSeconds);
   return [
     (data) => {
       if (data.length !== expectedNumberOfCalls) return void 0;
@@ -17065,9 +17169,9 @@ var getCompoundV2DataConverter = (lender, chainId, prices, additionalYields, tok
     expectedNumberOfCalls
   ];
 };
-function getReader(lender, chainId) {
+function getReader(lender, chainId, unitSeconds) {
   if (isVenusType(lender)) {
-    return (x, t) => readVTokenMetadata(x, t);
+    return (x, t) => readVTokenMetadata(x, t, unitSeconds);
   }
   if (lender === Lender.MOONWELL) {
     return (x, t) => parseMoonwellMarket(x, t);
@@ -17076,10 +17180,10 @@ function getReader(lender, chainId) {
     return (x, t) => readSumerCTokenMetadata(x, t);
   }
   if (lender === Lender.LODESTAR || lender === Lender.TENDER) {
-    return (x, t) => readLodestarCTokenMetadata(x);
+    return (x, t) => readLodestarCTokenMetadata(x, t, unitSeconds);
   }
   if (lender === Lender.CREAM_FINANCE && (chainId === Chain.POLYGON_MAINNET || chainId === Chain.ARBITRUM_ONE)) {
-    return (x, t) => readCreamV2CTokenMetadata(x, t);
+    return (x, t) => readCreamV2CTokenMetadata(x, t, unitSeconds);
   }
   if (lender === Lender.COMPOUND_V2 || lender === Lender.FLUX_FINANCE || lender === Lender.WE_PIGGY || lender === Lender.CREAM_FINANCE || lender === Lender.CAPY_FI || lender === Lender.GAMMA || // long-tail forks read through a shared 14-field lens — MUST mirror the
   // `CreamLensAbi` branch in publicCallBuild.ts `getCall`. A lender in that
@@ -17087,7 +17191,7 @@ function getReader(lender, chainId) {
   // `reader is not a function`, which is not a length mismatch and so is not
   // caught by the parser's own guard.
   lender === Lender.DEMETER || lender === Lender.LANDER || lender === Lender.FILDA || lender === Lender.SOLIDLIZARD || lender === Lender.IRON_BANK || lender === Lender.MENDI || lender === Lender.PAXO || lender === Lender.SONNE || lender === Lender.ASO_FINANCE || lender === Lender.BLUME || lender === Lender.KAWA || lender === Lender.XPERT || lender === Lender.KEOM || lender === Lender.REACTOR_FUSION) {
-    return (x, t) => readCompoundV2CTokenMetadata(x, t);
+    return (x, t) => readCompoundV2CTokenMetadata(x, t, unitSeconds);
   }
 }
 
@@ -18802,7 +18906,9 @@ function normalizeAaveV4(spokeDataList, chainId, spokeLenderKeyArg, prices, addi
           // >= PERCENTAGE_FACTOR (README: "bonus ≥ 100% (= ≥ 0% bonus)"). Same
           // semantics as V3's `liquidationBonus`, so penalty = bps/BPS - 1.
           liquidationPenalty: Number.isFinite(dynCfg.maxLiquidationBonus) && dynCfg.maxLiquidationBonus > 0 ? dynCfg.maxLiquidationBonus / BPS - 1 : 0,
-          closeFactor: 0.5,
+          // No close factor in V4 — the ceiling is the whole debt. See the
+          // field docstring on `AaveV4TokenEntry.closeFactor`.
+          closeFactor: 1,
           targetHealthFactor,
           // _validateSetUsingAsCollateral: !paused && !frozen (frozen blocks enabling)
           collateralDisabled: dynCfg.collateralFactor === 0 || reserve.config.paused || reserve.config.frozen,
@@ -18818,7 +18924,9 @@ function normalizeAaveV4(spokeDataList, chainId, spokeLenderKeyArg, prices, addi
           collateralFactor: 0,
           borrowFactor: 1,
           liquidationPenalty: 0,
-          closeFactor: 0.5,
+          // No close factor in V4 — the ceiling is the whole debt. See the
+          // field docstring on `AaveV4TokenEntry.closeFactor`.
+          closeFactor: 1,
           targetHealthFactor,
           collateralDisabled: true,
           debtDisabled: !reserve.config.borrowable || reserve.config.paused || reserve.config.frozen
@@ -18887,7 +18995,8 @@ function normalizeAaveV4(spokeDataList, chainId, spokeLenderKeyArg, prices, addi
         borrowCap,
         supplyCap,
         debtCeiling: 0,
-        closeFactor: 0.5,
+        // No close factor in V4 — the ceiling is the whole debt.
+        closeFactor: 1,
         targetHealthFactor,
         spokeActive,
         spokeHalted,
@@ -18906,13 +19015,20 @@ function normalizeAaveV4(spokeDataList, chainId, spokeLenderKeyArg, prices, addi
       };
     }
     if (Object.keys(data).length === 0) return void 0;
+    const liqCfg = spokeData.liquidationConfig;
+    const wad = (v) => v != null && v > 0n ? Number(v) / 1e18 : void 0;
     return {
       data,
       chainId,
       params: {
         spoke: spokeAddr,
         oracle: spokeData.oracle.toLowerCase(),
-        label: spokeData.label
+        label: spokeData.label,
+        liquidation: {
+          targetHealthFactor: wad(liqCfg?.targetHealthFactor),
+          healthFactorForMaxBonus: wad(liqCfg?.healthFactorForMaxBonus),
+          liquidationBonusFactorBps: liqCfg?.liquidationBonusFactor || void 0
+        }
       }
     };
   }
@@ -19676,7 +19792,7 @@ var buildFluidCall = (chainId, _lender) => {
 // src/lending/public-data/fluid/apiData.ts
 var FLUID_API_BASE = "https://api.fluid.instadapp.io/v2";
 var SUPPORTED_CHAINS = /* @__PURE__ */ new Set(["1", "56", "137", "8453", "9745", "42161"]);
-var TTL_MS = 6e4;
+var TTL_MS2 = 6e4;
 var ZERO_ADDRESS4 = "0x0000000000000000000000000000000000000000";
 var cache = {};
 var inflight = /* @__PURE__ */ new Map();
@@ -19724,7 +19840,7 @@ var parseChainPayload = (raw) => {
 var fetchFluidApiData = async (chainId) => {
   if (!SUPPORTED_CHAINS.has(chainId)) return void 0;
   const hit = cache[chainId];
-  if (hit && Date.now() - hit.at < TTL_MS) return hit.data;
+  if (hit && Date.now() - hit.at < TTL_MS2) return hit.data;
   const pending = inflight.get(chainId);
   if (pending) return pending;
   const run = (async () => {
@@ -19758,14 +19874,14 @@ var DEX_RESOLVER_FALLBACK = {
 };
 var dexResolverFor = (chainId) => fluidResolvers()?.[chainId]?.dexResolver ?? DEX_RESOLVER_FALLBACK[chainId];
 var ZERO_ADDRESS5 = "0x0000000000000000000000000000000000000000";
-var TTL_MS2 = 6e4;
+var TTL_MS3 = 6e4;
 var cache2 = {};
 var inflight2 = /* @__PURE__ */ new Map();
 var fetchFluidDexState = async (chainId, multicallRetry, extraDexAddresses = []) => {
   const resolver = dexResolverFor(chainId);
   if (!resolver) return void 0;
   const hit = cache2[chainId];
-  if (hit && Date.now() - hit.at < TTL_MS2) return hit.data;
+  if (hit && Date.now() - hit.at < TTL_MS3) return hit.data;
   const pending = inflight2.get(chainId);
   if (pending) return pending;
   const run = (async () => {
@@ -20768,7 +20884,7 @@ function buildLenderCall(chainId, lender) {
   if (isGearboxV3(lender)) return buildGearboxCall(chainId);
   return [];
 }
-function getLenderDataConverter(lender, chainId, prices, additionalYields, tokenList = {}) {
+function getLenderDataConverter(lender, chainId, prices, additionalYields, tokenList = {}, unitSeconds) {
   if (isAaveV2Type(lender))
     return getAaveV2ReservesDataConverter(
       lender,
@@ -20816,7 +20932,8 @@ function getLenderDataConverter(lender, chainId, prices, additionalYields, token
       chainId,
       prices,
       additionalYields,
-      tokenList
+      tokenList,
+      unitSeconds
     );
   if (isEulerType(lender))
     return getEulerV2ReservesDataConverter(
@@ -20957,6 +21074,16 @@ var getLenderPublicData = async (chainId, lenders, prices, additionalYields, mul
   }
   const invalidLenders = [];
   let lenderData = {};
+  const rateUnitSeconds = /* @__PURE__ */ new Map();
+  await Promise.all(
+    validLenders.filter((l) => isCompoundV2Type(l)).map(async (l) => {
+      try {
+        rateUnitSeconds.set(l, await resolveRateUnitSeconds(chainId, l));
+      } catch {
+        rateUnitSeconds.set(l, void 0);
+      }
+    })
+  );
   let currentSlice = 0;
   for (const lender of validLenders) {
     const [converter, sliceLength] = getLenderDataConverter(
@@ -20964,7 +21091,8 @@ var getLenderPublicData = async (chainId, lenders, prices, additionalYields, mul
       chainId,
       prices,
       additionalYields,
-      list
+      list,
+      rateUnitSeconds.get(lender)
     );
     if (sliceLength > 0) {
       try {
@@ -21173,16 +21301,16 @@ var LKG_TTL_SEC = 30 * 60;
 var lastGood = /* @__PURE__ */ new Map();
 async function fetchTopAndBookWithFallback(source, chainId, marketId, nowSec9) {
   const key3 = `${chainId}:${marketId}`;
-  let fresh = null;
+  let fresh2 = null;
   if (source.getTopAndBook) {
-    fresh = await source.getTopAndBook(marketId, MIDNIGHT_BOOK_LEVELS).catch(() => null);
+    fresh2 = await source.getTopAndBook(marketId, MIDNIGHT_BOOK_LEVELS).catch(() => null);
   } else {
     const top = await source.getBookTop(marketId).catch(() => null);
-    if (top) fresh = { top, book: { bids: [], asks: [] } };
+    if (top) fresh2 = { top, book: { bids: [], asks: [] } };
   }
-  if (fresh) {
-    lastGood.set(key3, { top: fresh.top, book: fresh.book, at: nowSec9 });
-    return { top: fresh.top, book: fresh.book };
+  if (fresh2) {
+    lastGood.set(key3, { top: fresh2.top, book: fresh2.book, at: nowSec9 });
+    return { top: fresh2.top, book: fresh2.book };
   }
   const cached = lastGood.get(key3);
   if (cached && nowSec9 - cached.at <= LKG_TTL_SEC) {
@@ -21954,21 +22082,21 @@ var LKG_TTL_SEC2 = 30 * 60;
 var lastGood2 = /* @__PURE__ */ new Map();
 async function fetchTopAndBookWithFallback2(source, chainId, config, nowSec9) {
   const key3 = `${chainId}:${config.termRepoId}`;
-  let fresh = null;
+  let fresh2 = null;
   if (source.getTopAndBook) {
-    fresh = await source.getTopAndBook(config, TERM_BOOK_LEVELS).catch(() => null);
+    fresh2 = await source.getTopAndBook(config, TERM_BOOK_LEVELS).catch(() => null);
   } else {
     const top = await source.getBookTop(config).catch(() => null);
-    if (top) fresh = { top, book: { bids: [], asks: [] }, auction: null };
+    if (top) fresh2 = { top, book: { bids: [], asks: [] }, auction: null };
   }
-  if (fresh) {
+  if (fresh2) {
     lastGood2.set(key3, {
-      top: fresh.top,
-      book: fresh.book,
-      auction: fresh.auction ?? null,
+      top: fresh2.top,
+      book: fresh2.book,
+      auction: fresh2.auction ?? null,
       at: nowSec9
     });
-    return { top: fresh.top, book: fresh.book, auction: fresh.auction ?? null };
+    return { top: fresh2.top, book: fresh2.book, auction: fresh2.auction ?? null };
   }
   const cached = lastGood2.get(key3);
   if (cached && nowSec9 - cached.at <= LKG_TTL_SEC2) {
@@ -23156,7 +23284,7 @@ async function fetchTellerMarkets(chainId) {
     }
     return null;
   };
-  const num18 = (i) => {
+  const num19 = (i) => {
     const b = big22(i);
     return b === null ? null : Number(b);
   };
@@ -23166,9 +23294,9 @@ async function fetchTellerMarkets(chainId) {
       config,
       available: big22(base),
       committed: big22(base + 1),
-      minRateBps: num18(base + 2),
+      minRateBps: num19(base + 2),
       collateralPerPrincipal: big22(base + 3),
-      maxLoanDuration: num18(base + 4),
+      maxLoanDuration: num19(base + 4),
       marketId: big22(base + 5),
       totalAssets: big22(base + 6)
     };
@@ -23578,10 +23706,10 @@ function refreshLiveMarkets(chainId, source) {
   const running = refreshInFlight.get(chainId);
   if (running) return running;
   lastRefreshAttempt.set(chainId, Date.now());
-  const p = source.getChainMarkets(chainId).then((fresh) => {
-    if (!fresh) return;
+  const p = source.getChainMarkets(chainId).then((fresh2) => {
+    if (!fresh2) return;
     const nowSec9 = Math.floor(Date.now() / 1e3);
-    const live = fresh.filter((m) => m.config.maturity > nowSec9);
+    const live = fresh2.filter((m) => m.config.maturity > nowSec9);
     lastGood3.set(chainId, { markets: live, at: nowSec9 });
     rememberMarkets(chainId, live);
   }).catch(() => void 0).finally(() => refreshInFlight.delete(chainId));
@@ -24301,20 +24429,20 @@ async function fetchInverseMarkets(lender, chainId) {
     if (Object.keys(byAddr).length > 0) {
       const rows = markets.map((market) => {
         const m = byAddr[market.address.toLowerCase()];
-        const num18 = (v) => typeof v === "number" && Number.isFinite(v) ? v : null;
+        const num19 = (v) => typeof v === "number" && Number.isFinite(v) ? v : null;
         return {
           market,
-          totalDebt: num18(m?.totalDebt),
-          dolaLiquidity: num18(m?.dolaLiquidity),
-          leftToBorrow: num18(m?.leftToBorrow),
-          price: num18(m?.price),
+          totalDebt: num19(m?.totalDebt),
+          dolaLiquidity: num19(m?.dolaLiquidity),
+          leftToBorrow: num19(m?.leftToBorrow),
+          price: num19(m?.price),
           borrowPaused: typeof m?.borrowPaused === "boolean" ? m.borrowPaused : null,
-          dailyBorrows: num18(m?.dailyBorrows),
+          dailyBorrows: num19(m?.dailyBorrows),
           // The API serves it as a DECIMAL (`replenishmentIncentive: 0.1`),
           // unlike the on-chain bps — normalize here, and fall back to the
           // curated metadata value when the field is missing.
           replenishmentIncentiveBps: (() => {
-            const dec2 = num18(m?.replenishmentIncentive);
+            const dec2 = num19(m?.replenishmentIncentive);
             if (dec2 !== null) return Math.round(dec2 * 1e4);
             const meta = Number(market.replenishmentIncentiveBps);
             return Number.isFinite(meta) ? meta : null;
@@ -41769,7 +41897,7 @@ function unflattenLenderData(pools) {
   }
   return result;
 }
-var getLenderUserDataResult = async (chainId, queriesRaw, getEvmClient17, allowFailure = true, batchSize = MULTICALL_DEFAULT_BATCH_SIZE, retries = 3, logs = false, concurrency = 1, permanentFailures, onEndpointFailure) => {
+var getLenderUserDataResult = async (chainId, queriesRaw, getEvmClient18, allowFailure = true, batchSize = MULTICALL_DEFAULT_BATCH_SIZE, retries = 3, logs = false, concurrency = 1, permanentFailures, onEndpointFailure) => {
   const queries = organizeUserQueries(queriesRaw);
   const builtCalls = await Promise.all(
     queries.map(async (query3) => {
@@ -41779,7 +41907,7 @@ var getLenderUserDataResult = async (chainId, queriesRaw, getEvmClient17, allowF
         query3.lender,
         query3.account,
         query3.params,
-        getEvmClient17
+        getEvmClient18
       );
       return callData.map((call) => ({ call, abi: call.abi ?? abi }));
     })
@@ -41789,7 +41917,7 @@ var getLenderUserDataResult = async (chainId, queriesRaw, getEvmClient17, allowF
     chainId,
     calls.map((call) => call.abi),
     calls.map((call) => call.call),
-    getEvmClient17,
+    getEvmClient18,
     concurrency,
     retries,
     allowFailure,
@@ -59478,7 +59606,7 @@ var fetchSiloVaults = async (chainId, prices = {}, tokenList = {}, options) => {
 
 // src/vaults/euler-earn/entityLabels.ts
 var LABELS_BASE = "https://raw.githubusercontent.com/euler-xyz/euler-labels/master";
-var TTL_MS3 = 30 * 60 * 1e3;
+var TTL_MS4 = 30 * 60 * 1e3;
 var cache3 = /* @__PURE__ */ new Map();
 var inflight4 = /* @__PURE__ */ new Map();
 async function fetchChainEntities(chainId) {
@@ -59504,7 +59632,7 @@ async function fetchChainEntities(chainId) {
 }
 async function fetchEulerEntityNames(chainId) {
   const hit = cache3.get(chainId);
-  if (hit && Date.now() - hit.at <= TTL_MS3) return hit.map;
+  if (hit && Date.now() - hit.at <= TTL_MS4) return hit.map;
   const running = inflight4.get(chainId);
   if (running) return running;
   const p = fetchChainEntities(chainId).then((map) => {
@@ -69815,6 +69943,12 @@ function borrowDescription(b) {
     parts.push(
       "Liquidation is a public auction rather than a loan-to-value threshold" + (win ? `, open for ${duration(win)} once started` : "") + (pen != null ? `, and the liquidator is paid ${pct(pen * 100)}` : "") + "."
     );
+  } else if (b.liquidation.model === "repay-to-target-hf") {
+    const l = b.liquidation;
+    const start = l.liquidationLtv != null && l.liquidationLtv > 0 ? `Liquidation starts at ${pct(l.liquidationLtv * 100)} LTV and` : "A liquidation";
+    const sized = l.targetHealthFactor != null ? ` repays as much of your debt as it takes to restore a health factor of ${l.targetHealthFactor.toFixed(2)}` : " repays as much of your debt as it takes to restore the spoke\u2019s target health factor";
+    const bonus = l.penalty != null && l.penalty > 0 ? ` \u2014 the liquidator\u2019s bonus scales up to ${pct(l.penalty * 100)}` + (l.healthFactorForMaxBonus != null ? ` at a health factor of ${l.healthFactorForMaxBonus.toFixed(2)}` : "") + "." : ".";
+    parts.push(`${start}${sized} rather than a fixed share of it${bonus}`);
   } else if (b.liquidation.liquidationLtv != null && b.liquidation.liquidationLtv > 0) {
     const pen = b.liquidation.penalty;
     parts.push(
@@ -69848,6 +69982,27 @@ var TERM_PROFILES = [
       ]
     }
   }),
+  P({
+    id: "aave-v4.spoke@v1",
+    name: "Aave V4 spoke (liquidated to a target health factor)",
+    family: "pool",
+    supply: {
+      description: "A shared liquidity pool on an Aave V4 spoke. Deposits earn interest paid by borrowers of the hub asset, at a rate that moves with utilization. Withdrawals are instant up to the cash left in the pool.",
+      implications: [
+        "Your yield is not fixed \u2014 it rises and falls with borrowing demand.",
+        "If utilization reaches 100 %, withdrawals are blocked until borrowers repay or new deposits arrive.",
+        "Each spoke is its own market: the same asset on another spoke is a separate position with its own risk parameters."
+      ]
+    },
+    borrow: {
+      description: "Borrow against collateral at a rate that moves with utilization. Liquidation here is sized to a target health factor rather than capped at a fixed share of your debt: a liquidator repays whatever it takes to bring the position back up to the target, and their bonus grows the further under water it is.",
+      implications: [
+        "There is no 50 % close-factor protection \u2014 how much of your debt is taken depends on how far the position fell, and a deep enough drop takes all of it.",
+        "The published liquidation penalty is the MAXIMUM bonus, charged only once the position is far enough under water; a shallow liquidation costs less.",
+        "V4 uses ONE loan-to-value per asset for both borrowing and liquidation \u2014 there is no buffer between the LTV you can borrow to and the one that gets you liquidated."
+      ]
+    }
+  }),
   // ── Fixed-term families ──────────────────────────────────────────────────
   P({
     id: "exactly.fixed@v1",
@@ -73624,8 +73779,18 @@ function toTermSheetInput(row, ctx = {}) {
       "flags.variableBorrowDisabled"
     ),
     config,
-    closeFactor: num15(pick2(row, "closeFactor")),
-    targetHealthFactor: num15(pick2(row, "targetHealthFactor")),
+    // `caps.` is NOT optional here. `/pools/latest` serializes both of these as
+    // TOP-LEVEL row fields, while `/lending/latest` — the endpoint the lending
+    // term sheets are actually stamped on — nests them under `caps` alongside
+    // the supply/borrow caps (yield-tracer `utils/lending.ts`). Reading only
+    // the flat key made every sheet on that endpoint fall through to the
+    // builder's `?? 1`, so Aave and Compound V2 published "the whole debt can
+    // be repaid in one liquidation" against a real close factor of 0.5, and
+    // Aave V4's `targetHealthFactor` vanished entirely.
+    closeFactor: num15(pick2(row, "closeFactor", "caps.closeFactor")),
+    targetHealthFactor: num15(
+      pick2(row, "targetHealthFactor", "caps.targetHealthFactor")
+    ),
     fixedTerm: pick2(row, "fixedTerm") ?? ctx.fixedTerm,
     terms: pick2(row, "terms"),
     market: resolveMarketDescriptors(row, ctx.market)
@@ -73657,6 +73822,11 @@ var ROW_DESCRIPTOR_KEYS = [
   // Fluid: distinguishes a SMART (T2/T3/T4) vault, whose collateral and/or
   // debt is a two-token DEX LP position, from an ordinary T1 pool row.
   "fluid",
+  // Aave V4: the liquidation BONUS CURVE (`healthFactorForMaxBonus`,
+  // `liquidationBonusFactor`). The sizing knob `targetHealthFactor` is a
+  // market-level column and arrives without this; the curve is what turns the
+  // published max bonus from a flat penalty into a bound.
+  "aaveV4",
   "broker",
   "collateralProvider",
   "loanProvider",
@@ -75231,6 +75401,32 @@ var morphoBlueAdapter = {
     };
   }
 };
+var aaveV4Adapter = {
+  id: "aave-v4",
+  matches: isAaveV4Type,
+  profileId: () => "aave-v4.spoke@v1",
+  build: (input) => {
+    const target = input.targetHealthFactor;
+    const desc = input.market?.aaveV4 ?? {};
+    const maxBonusHf = num17(desc.healthFactorForMaxBonus);
+    return {
+      borrow: {
+        liquidation: {
+          model: "repay-to-target-hf",
+          // NOT a close factor — the ceiling. See the header.
+          closeFactor: 1,
+          targetHealthFactor: target,
+          healthFactorForMaxBonus: maxBonusHf
+        }
+      }
+    };
+  }
+};
+function num17(v) {
+  if (v == null) return void 0;
+  const n = typeof v === "string" ? Number(v) : v;
+  return Number.isFinite(n) && n > 0 ? n : void 0;
+}
 
 // src/terms/adapters/index.ts
 var TERM_ADAPTERS = [
@@ -75254,7 +75450,8 @@ var TERM_ADAPTERS = [
   curvanceAdapter,
   twyneAdapter,
   fraxlendAdapter,
-  morphoBlueAdapter
+  morphoBlueAdapter,
+  aaveV4Adapter
 ];
 function resolveAdapter(lender) {
   return TERM_ADAPTERS.find((a) => a.matches(lender));
@@ -76220,7 +76417,7 @@ function legEarnUid(marketUid) {
   if (isVaultVenue(parts[0])) return void 0;
   return marketUid;
 }
-function num17(v) {
+function num18(v) {
   const n = typeof v === "number" ? v : Number(v);
   return Number.isFinite(n) ? n : 0;
 }
@@ -76242,10 +76439,10 @@ function legAsset(pos) {
   };
 }
 function toLeg(pos) {
-  const depositsUsd = num17(pos.depositsUSD);
-  const debtUsd = num17(pos.debtUSD) + num17(pos.debtStableUSD);
-  const hasSupply = depositsUsd !== 0 || num17(pos.deposits) !== 0;
-  const hasDebt = debtUsd !== 0 || num17(pos.debt) !== 0 || num17(pos.debtStable) !== 0;
+  const depositsUsd = num18(pos.depositsUSD);
+  const debtUsd = num18(pos.debtUSD) + num18(pos.debtStableUSD);
+  const hasSupply = depositsUsd !== 0 || num18(pos.deposits) !== 0;
+  const hasDebt = debtUsd !== 0 || num18(pos.debt) !== 0 || num18(pos.debtStable) !== 0;
   return {
     earnUid: legEarnUid(pos.marketUid),
     marketUid: pos.marketUid,
@@ -76285,12 +76482,12 @@ function earnPositionFromLenderEntry(entry) {
     (s) => s.legs.some((l) => l.side !== "none") || s.netUsd !== 0
   );
   const crossMargin = active.length <= 1;
-  const suppliedUsd = num17(entry.balanceData?.deposits);
-  const borrowedUsd = num17(entry.balanceData?.debt);
+  const suppliedUsd = num18(entry.balanceData?.deposits);
+  const borrowedUsd = num18(entry.balanceData?.debt);
   const aprBreakdown = {
-    market: num17(entry.aprData?.apr),
-    rewards: num17(entry.aprData?.rewardApr),
-    intrinsic: num17(entry.aprData?.intrinsicApr)
+    market: num18(entry.aprData?.apr),
+    rewards: num18(entry.aprData?.rewardApr),
+    intrinsic: num18(entry.aprData?.intrinsicApr)
   };
   return {
     positionUid: buildLendingPositionUid(entry.lender, entry.chainId),
@@ -76304,15 +76501,15 @@ function earnPositionFromLenderEntry(entry) {
     ...entry.lenderInfo?.logoUri ? { logoURI: entry.lenderInfo.logoUri } : {},
     suppliedUsd,
     borrowedUsd,
-    netUsd: num17(entry.balanceData?.nav),
+    netUsd: num18(entry.balanceData?.nav),
     apr: aprBreakdown.market + aprBreakdown.rewards + aprBreakdown.intrinsic,
     aprBreakdown,
-    depositApr: num17(entry.aprData?.depositApr),
-    borrowApr: num17(entry.aprData?.borrowApr),
+    depositApr: num18(entry.aprData?.depositApr),
+    borrowApr: num18(entry.aprData?.borrowApr),
     // Only a cross-margin account HAS one health factor. Publishing the first
     // sub-account's as the row's would be a number about a different position.
     health: crossMargin ? active[0]?.health ?? null : null,
-    leverage: num17(entry.leverage),
+    leverage: num18(entry.leverage),
     crossMargin,
     legs: subAccounts.flatMap((s) => s.legs),
     subAccounts: active,