@1delta/margin-fetcher 5.0.73 → 5.0.75

package/dist/index.js

@@ -1,12 +1,12 @@
-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 { parseAbi, keccak256, encodeAbiParameters, formatEther, BaseError, erc20Abi, stringToHex, isAddress, pad, encodeFunctionData, formatUnits, getAddress, decodeFunctionResult, decodeAbiParameters, concat, parseAbiParameters, hexToString, AbiEncodingLengthMismatchError, concatHex, toBytes, slice, 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, isFlyingTulip, 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, flyingTulipLendersByChain, liquityLendersByChain, riverLendersByChain, inverseLendersByChain, coolerLendersByChain, llamaLendLendersByChain, usddLendersByChain, skyLendersByChain, frankencoinLendersByChain, resupplyLendersByChain, curvanceLendersByChain, fraxlendLendersByChain, twyneLendersByChain, tellerConfigByChain, tellerPoolsByChain, termMaxConfigByChain, aaveReserves, compoundV3Reserves, resolveTermApiBase, flyingTulipConfigFor, flyingTulipAssetsFor, 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 { fetchTokenLists, fetchTokenList, aavePools, compoundV3Pools, initConfig, morphoPools, compoundV2Pools, eulerVaults, siloMarkets, siloV2LenderKey, siloMarketsV3, siloV3LenderKey, aaveV4Spokes, aaveV4SpokeLenderKey, fluidResolvers, gearboxResolvers, dolomiteConfigs, midnightConfig, termConfig, termMarketsByChain, exactlyConfig, flyingTulipLendersByChain, liquityLendersByChain, riverLendersByChain, inverseLendersByChain, coolerLendersByChain, llamaLendLendersByChain, usddLendersByChain, skyLendersByChain, frankencoinLendersByChain, resupplyLendersByChain, curvanceLendersByChain, fraxlendLendersByChain, twyneLendersByChain, tellerConfigByChain, tellerPoolsByChain, termMaxConfigByChain, aaveReserves, compoundV3Reserves, resolveTermApiBase, flyingTulipConfigFor, flyingTulipAssetsFor, 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, midnightCollateralRef, parseAaveV4SpokeLenderKey, fraxlendPairsFor, gearboxAccountCompressor, compoundV2Tokens, exactlyMarketsByChain, aaveOraclesConfig, compoundV2Oracles, compoundV2OraclesConfig, compoundV3OraclesData, compoundV3BaseData, compoundV2Reserves, aaveV4Oracles, morphoTypeOracles } from '@1delta/data-sdk';
 import lodash from 'lodash';
 import { Chain, isEvmChainId } from '@1delta/chain-registry';
-import { multicallRetryUniversal, getEvmClient, getEvmChain, getEvmClientUniversal } from '@1delta/providers';
+import { multicallRetryUniversal, getEvmClient, getEvmChain, createMulticallRetryUniversal, LIST_OVERRIDES, getEvmClientUniversal } from '@1delta/providers';
 import { LiquityTroveManagerAbi, LiquityActivePoolAbi, LiquityStabilityPoolAbi, LiquityPriceFeedAbi, LiquitySortedTrovesAbi, RiverTroveManagerAbi, RiverStabilityPoolAbi, TellerMarketRegistryAbi, TellerV2Abi, InverseMarketAbi, InverseOracleAbi, InverseDbrAbi, CurveTricryptoOracleAbi, Erc20Abi, CoolerMonoAbi, CoolerLtvOracleAbi, LlamaLendControllerAbi, LlamaLendControllerV1Abi, LlamaLendControllerV2Abi, LlamaLendVaultAbi, LlamaLendAmmAbi, TwyneCollateralVaultAbi, MetaMorphoAbi, FluidDexResolverAbi, ExactlyPreviewerAbi, ExactlyAuditorAbi, FlyingTulipLendingLensAbi, LenderCommitmentGroupAbi, ResupplyRegistryAbi, ResupplyPairAbi, ResupplyUtilitiesAbi, ResupplyRewardHandlerAbi, ResupplyPairEmissionsAbi, ConvexPoolUtilAbi, FraxlendPairAbi, FraxlendLeverAbi, FrankencoinPositionAbi, FluidLendingResolverAbi, FluidVaultResolverAbi, FluidLiquidityResolverAbi, MoolahVaultAbi, UsddVatAbi, UsddJugAbi, UsddSpotAbi, MorphoLensAbi, AaveV4SpokeAbi, AaveV4OracleAbi, AaveV4HubAbi, DolomiteMarginAbi, GearboxMarketCompressorV310Abi, MorphoBlueAbi, MidnightAbi, TermRepoTokenAbi, TermRepoServicerAbi, TermRepoCollateralManagerAbi, LiquityTroveNFTAbi, LiquityCollSurplusPoolAbi, TellerCollateralManagerAbi, TermMaxViewerAbi, InverseEscrowAbi, CurvanceMarketManagerAbi, CurvanceCTokenAbi, GearboxCreditAccountCompressorV310Abi, TwyneVaultManagerAbi, TwyneCollateralVaultFactoryAbi, AaveV2V3Abi, TwyneATokenWrapperAbi, UsddCdpManagerAbi, UsddProxyRegistryAbi, CurvanceProtocolReaderAbi, CurvanceCentralRegistryAbi, TermPriceConsumerAbi, CurvanceOracleManagerAbi, TermMaxOracleAggregatorV2Abi } from '@1delta/abis';
 export { MorphoLensAbi } from '@1delta/abis';
 import { prepareDebitDataMulticall, prepareLenderDebitMulticall, parseDebitDataResult, parseLenderDebitResult, getPermit2ContractAddress, getLstAcceptedInputs, savingsVerbRequires, savingsSupportsVerb, getCompoundV2Comptroller as getCompoundV2Comptroller$1, getCompoundV3CometAddress as getCompoundV3CometAddress$1, getMorphoAddress, FLUID_VAULT_FACTORY, getAaveStyleLenderTokenAddress, LendingMode, getAaveCollateralTokenAddress, getSiloHalfForUnderlying, findSavingsWithdrawEntry, bandLtvCurve, InitMarginAddresses, ignoresReceiver, buildLstWithdrawRequest, SAVINGS_RECEIVER_CAPABILITY } from '@1delta/calldata-sdk';
@@ -11737,58 +11737,72 @@ function convertMarketsToMorphoResponse(response, chainId, additionalYields = {
         m,
         collateralAssetAddress
       );
-      data[m].data[collateralMarketUid] = {
-        marketUid: collateralMarketUid,
-        name: "Collateral " + (metaCollateral?.symbol ?? collateralAsset.symbol ?? ""),
-        poolId: collateralAssetAddress,
-        underlying: collateralAssetAddress,
-        asset: metaCollateral,
-        totalDeposits: formatNr(
-          state.collateralAssets,
-          collateralAsset.decimals
-        ),
-        totalDebtStable: 0,
-        totalDebt: 0,
-        totalLiquidity: formatNr(
-          state.collateralAssets,
-          collateralAsset.decimals
-        ),
-        borrowLiquidity: formatNr(
-          state.collateralAssets,
-          collateralAsset.decimals
-        ),
-        totalLiquidityUSD: Number(state.collateralAssetsUsd),
-        borrowLiquidityUSD: Number(state.collateralAssetsUsd),
-        totalDepositsUSD: Number(state.collateralAssetsUsd),
-        totalDebtStableUSD: 0,
-        totalDebtUSD: 0,
-        utilization: 0,
-        depositRate: 0,
-        variableBorrowRate: 0,
-        stableBorrowRate: 0,
-        intrinsicYield: additionalYields?.intrinsicYields?.[metaCollateral?.assetGroup] ?? 0,
-        rewards: void 0,
-        decimals: collateralAsset.decimals,
-        config: {
+      const existingLoanRow = data[m].data[collateralMarketUid];
+      if (existingLoanRow) {
+        existingLoanRow.collateralActive = true;
+        existingLoanRow.config = {
           0: {
-            category: 0,
+            ...existingLoanRow.config?.[0] ?? {},
             borrowCollateralFactor: ltv,
             collateralFactor: ltv,
-            borrowFactor: 1,
             liquidationPenalty,
-            closeFactor: 1,
-            collateralDisabled: false,
-            debtDisabled: true
+            collateralDisabled: false
           }
-        },
-        closeFactor: 1,
-        collateralActive: true,
-        borrowingEnabled: false,
-        depositsEnabled: true,
-        hasStable: false,
-        isActive: true,
-        isFrozen: false
-      };
+        };
+      } else {
+        data[m].data[collateralMarketUid] = {
+          marketUid: collateralMarketUid,
+          name: "Collateral " + (metaCollateral?.symbol ?? collateralAsset.symbol ?? ""),
+          poolId: collateralAssetAddress,
+          underlying: collateralAssetAddress,
+          asset: metaCollateral,
+          totalDeposits: formatNr(
+            state.collateralAssets,
+            collateralAsset.decimals
+          ),
+          totalDebtStable: 0,
+          totalDebt: 0,
+          totalLiquidity: formatNr(
+            state.collateralAssets,
+            collateralAsset.decimals
+          ),
+          borrowLiquidity: formatNr(
+            state.collateralAssets,
+            collateralAsset.decimals
+          ),
+          totalLiquidityUSD: Number(state.collateralAssetsUsd),
+          borrowLiquidityUSD: Number(state.collateralAssetsUsd),
+          totalDepositsUSD: Number(state.collateralAssetsUsd),
+          totalDebtStableUSD: 0,
+          totalDebtUSD: 0,
+          utilization: 0,
+          depositRate: 0,
+          variableBorrowRate: 0,
+          stableBorrowRate: 0,
+          intrinsicYield: additionalYields?.intrinsicYields?.[metaCollateral?.assetGroup] ?? 0,
+          rewards: void 0,
+          decimals: collateralAsset.decimals,
+          config: {
+            0: {
+              category: 0,
+              borrowCollateralFactor: ltv,
+              collateralFactor: ltv,
+              borrowFactor: 1,
+              liquidationPenalty,
+              closeFactor: 1,
+              collateralDisabled: false,
+              debtDisabled: true
+            }
+          },
+          closeFactor: 1,
+          collateralActive: true,
+          borrowingEnabled: false,
+          depositsEnabled: true,
+          hasStable: false,
+          isActive: true,
+          isFrozen: false
+        };
+      }
       data[m].params = {
         market: {
           lender: m,
@@ -16664,13 +16678,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, getEvmClient20, startRpcId, tried, maxProbe = 12, timeoutMs) => {
+var resolveEndpoint = (chainId, getEvmClient19, startRpcId, tried, maxProbe = 12, timeoutMs) => {
   let fallback = null;
   for (let probe = 0; probe < maxProbe; probe++) {
     const rpcId = startRpcId + probe;
     let client;
     try {
-      client = getEvmClient20(chainId, rpcId, { timeoutMs });
+      client = getEvmClient19(chainId, rpcId, { timeoutMs });
     } catch {
       break;
     }
@@ -16699,7 +16713,7 @@ var recordPermanentFailures = (slots, offset, collector) => {
     if (slots[i].permanent) collector.add(offset + i);
   }
 };
-var repairFailedSlots = async (chainId, contracts, slots, getEvmClient20, nextRpcId, batchSize, logs, rounds = MULTICALL_REPAIR_ROUNDS, options) => {
+var repairFailedSlots = async (chainId, contracts, slots, getEvmClient19, nextRpcId, batchSize, logs, rounds = MULTICALL_REPAIR_ROUNDS, options) => {
   let searchFrom = nextRpcId;
   for (let round = 0; round < rounds; round++) {
     const failedIdx = [];
@@ -16709,7 +16723,7 @@ var repairFailedSlots = async (chainId, contracts, slots, getEvmClient20, nextRp
     if (failedIdx.length === 0) return slots;
     const endpoint = resolveEndpoint(
       chainId,
-      getEvmClient20,
+      getEvmClient19,
       searchFrom,
       options?.tried
     );
@@ -16761,7 +16775,7 @@ var repairFailedSlots = async (chainId, contracts, slots, getEvmClient20, nextRp
   }
   return slots;
 };
-var multicallShardedAbiArray = async (chainId, abi, calls, getEvmClient20, poolSize, retries = maxRetries, allowFailure = true, batchSize = MULTICALL_DEFAULT_BATCH_SIZE, logs = false, retryFailed = false, permanentFailures, options) => {
+var multicallShardedAbiArray = async (chainId, abi, calls, getEvmClient19, 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,
@@ -16835,7 +16849,7 @@ var multicallShardedAbiArray = async (chainId, abi, calls, getEvmClient20, poolS
   const attemptHedged = async (items, startRpcId, tried) => {
     const primary = resolveEndpoint(
       chainId,
-      getEvmClient20,
+      getEvmClient19,
       startRpcId,
       tried,
       12,
@@ -16859,7 +16873,7 @@ var multicallShardedAbiArray = async (chainId, abi, calls, getEvmClient20, poolS
         clearTimeout(timer);
         const alt = resolveEndpoint(
           chainId,
-          getEvmClient20,
+          getEvmClient19,
           primary.rpcId + 1,
           tried,
           12,
@@ -16911,7 +16925,7 @@ var multicallShardedAbiArray = async (chainId, abi, calls, getEvmClient20, poolS
         chainId,
         batch.items,
         slots,
-        getEvmClient20,
+        getEvmClient19,
         won.rpcId + 1,
         requestBytes,
         logs,
@@ -16933,7 +16947,7 @@ var multicallShardedAbiArray = async (chainId, abi, calls, getEvmClient20, poolS
       const tried = /* @__PURE__ */ new Set();
       const start = resolveEndpoint(
         chainId,
-        getEvmClient20,
+        getEvmClient19,
         workerId,
         void 0,
         12,
@@ -21517,6 +21531,14 @@ function convertMidnightMarketsToResponse(raw, chainId, prices = {}, _additional
       // Midnight is fixed-rate: expose the fixed borrow APR on stableBorrowRate
       // too, so fixed-rate consumers pick it up like a term product.
       stableBorrowRate: borrowAprPct,
+      // The rate card is a BORROW-side fact, so it lives on the row that has a
+      // borrow side — natively, not by a consumer matching `loanAddress`
+      // against each row's asset. That match is what broke when the loan token
+      // was also a collateral leg: the leg row carries the same token, so it
+      // matched too and was served a "Fixed from X %" it cannot offer.
+      // `params.market.terms` still carries the same card for readers of the
+      // market-level shape; the collateral legs below never carry one.
+      terms,
       intrinsicYield: 0,
       rewards: void 0,
       decimals: config.loanDecimals,
@@ -21544,31 +21566,17 @@ function convertMidnightMarketsToResponse(raw, chainId, prices = {}, _additional
       isActive: true,
       isFrozen: false
     };
-    config.collateralParams.forEach((c) => {
+    config.collateralParams.forEach((c, i) => {
       const collAddr = c.token.toLowerCase();
       const ltv = parseLtv(c.lltv);
       const cursor = toBigIntOr0(c.liquidationCursor);
       const liquidationPenalty = cursor > 0n ? midnightLiquidationPenaltyNumber(toBigIntOr0(c.lltv), cursor) : liquidationPenaltyFromLltv(ltv);
-      const collUid = createMarketUid(chainId, m, collAddr);
+      const collUid = createMarketUid(chainId, m, midnightCollateralRef(collAddr, i));
       const collAsset = tokens[collAddr];
       const collKey = toOracleKey(collAsset?.assetGroup) || toGenericPriceKey(collAddr, chainId);
       const collPrice = prices[collKey] ?? 0;
       const collCapacityUSD = ltv > 0 ? borrowLiquidity * loanPrice / ltv : borrowLiquidity * loanPrice;
       const collCapacity = collPrice > 0 ? collCapacityUSD / collPrice : 0;
-      const existing = entry.data[collUid];
-      if (existing) {
-        existing.collateralActive = true;
-        existing.config = {
-          0: {
-            ...existing.config?.[0] ?? {},
-            borrowCollateralFactor: ltv,
-            collateralFactor: ltv,
-            liquidationPenalty,
-            collateralDisabled: false
-          }
-        };
-        return;
-      }
       entry.data[collUid] = {
         marketUid: collUid,
         name: "Collateral " + (tokens[collAddr]?.symbol ?? ""),
@@ -35021,7 +35029,11 @@ var getMidnightUserDataConverter = (_lender, chainId, account, meta) => {
           if (collAmt === 0n) return;
           anyBalance = true;
           const collAddr = c.token.toLowerCase();
-          const collUid = createMarketUid(chainId, lenderKey, collAddr);
+          const collUid = createMarketUid(
+            chainId,
+            lenderKey,
+            midnightCollateralRef(collAddr, i)
+          );
           const collMeta = metaMap[collUid];
           const collDec = collMeta?.asset?.decimals ?? c.decimals;
           const collDisplayPrice = collMeta ? getDisplayPrice(collMeta) : 0;
@@ -42365,7 +42377,7 @@ function unflattenLenderData(pools) {
   }
   return result;
 }
-var getLenderUserDataResult = async (chainId, queriesRaw, getEvmClient20, allowFailure = true, batchSize = MULTICALL_DEFAULT_BATCH_SIZE, retries = 3, logs = false, concurrency = 1, permanentFailures, onEndpointFailure) => {
+var getLenderUserDataResult = async (chainId, queriesRaw, getEvmClient19, 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) => {
@@ -42375,7 +42387,7 @@ var getLenderUserDataResult = async (chainId, queriesRaw, getEvmClient20, allowF
         query3.lender,
         query3.account,
         query3.params,
-        getEvmClient20
+        getEvmClient19
       );
       return callData.map((call) => ({ call, abi: call.abi ?? abi }));
     })
@@ -42385,7 +42397,7 @@ var getLenderUserDataResult = async (chainId, queriesRaw, getEvmClient20, allowF
     chainId,
     calls.map((call) => call.abi),
     calls.map((call) => call.call),
-    getEvmClient20,
+    getEvmClient19,
     concurrency,
     retries,
     allowFailure,
@@ -54970,15 +54982,16 @@ function getMidnightCalls(chainId) {
     if (!market.marketId || !market.loanToken) continue;
     const legs = [];
     const calls = [];
-    for (const c of market.collateralParams ?? []) {
-      if (!c.oracle || !c.token) continue;
+    (market.collateralParams ?? []).forEach((c, collateralIndex) => {
+      if (!c.oracle || !c.token) return;
       legs.push({
         collateralAsset: c.token.toLowerCase(),
         collateralDecimals: c.decimals,
-        oracle: c.oracle
+        oracle: c.oracle,
+        collateralIndex
       });
       calls.push({ address: c.oracle, name: "price", params: [] });
-    }
+    });
     if (legs.length === 0) continue;
     results.push({
       calls,
@@ -55027,7 +55040,11 @@ function parseMidnightResults(data, meta, context) {
       price: priceDebtToCollateral,
       // raw: collateral price in loan asset terms
       priceUSD: priceDebtToCollateral * loanAssetUSD,
-      marketUid: createMarketUid(chainId, lenderKey, leg.collateralAsset),
+      marketUid: createMarketUid(
+        chainId,
+        lenderKey,
+        midnightCollateralRef(leg.collateralAsset, leg.collateralIndex)
+      ),
       targetLender: lenderKey,
       baseAsset: loanAsset
     });
@@ -76210,7 +76227,7 @@ function parseMulticallRpcResponses(responses, batches, allowFailure = true, per
   });
   return allResults;
 }
-var ERC20MetadataAbi = [
+var ERC20_STRING_ABI = [
   {
     inputs: [],
     name: "name",
@@ -76233,38 +76250,110 @@ var ERC20MetadataAbi = [
     type: "function"
   }
 ];
-async function fetchTokenMetadata(chain, addrs) {
-  const tokens = {};
-  const client = getEvmClient(chain);
-  const results = await client.multicall({
-    allowFailure: false,
-    batchSize: 300,
-    contracts: addrs.map((addr4) => [
-      {
-        abi: ERC20MetadataAbi,
-        functionName: "name",
-        address: addr4,
-        args: []
-      },
-      {
-        abi: ERC20MetadataAbi,
-        functionName: "symbol",
-        address: addr4,
-        args: []
-      },
-      {
-        abi: ERC20MetadataAbi,
-        functionName: "decimals",
-        address: addr4,
-        args: []
-      }
-    ]).flat()
+var ERC20_BYTES32_ABI = [
+  {
+    inputs: [],
+    name: "name",
+    outputs: [{ internalType: "bytes32", name: "", type: "bytes32" }],
+    stateMutability: "view",
+    type: "function"
+  },
+  {
+    inputs: [],
+    name: "symbol",
+    outputs: [{ internalType: "bytes32", name: "", type: "bytes32" }],
+    stateMutability: "view",
+    type: "function"
+  }
+];
+var FAILED = "0x";
+function decodeBytes32(value) {
+  if (typeof value !== "string" || !value.startsWith("0x")) return void 0;
+  if (value === FAILED) return void 0;
+  try {
+    const decoded = hexToString(value).replace(/\0+$/, "").trim();
+    return decoded.length > 0 ? decoded : void 0;
+  } catch {
+    return void 0;
+  }
+}
+function asString(value) {
+  if (typeof value !== "string") return void 0;
+  if (value === FAILED) return void 0;
+  const trimmed = value.trim();
+  return trimmed.length > 0 ? trimmed : void 0;
+}
+async function fetchTokenMetadata(chain, addrs, options = {}) {
+  const { rpcUrls, maxRetries: maxRetries2 = 3 } = options;
+  const unique = [
+    ...new Set(
+      addrs.filter((a) => typeof a === "string" && isAddress(a, { strict: false })).map((a) => a.toLowerCase())
+    )
+  ];
+  if (unique.length === 0) return {};
+  const multicall = createMulticallRetryUniversal(
+    rpcUrls?.length ? { [chain]: rpcUrls } : LIST_OVERRIDES
+  );
+  const calls = unique.flatMap((address) => [
+    { address, name: "name", args: [] },
+    { address, name: "symbol", args: [] },
+    { address, name: "decimals", args: [] }
+  ]);
+  const results = await multicall({
+    chain,
+    calls,
+    abi: ERC20_STRING_ABI,
+    maxRetries: maxRetries2,
+    allowFailure: true
+  });
+  const names = /* @__PURE__ */ new Map();
+  const symbols = /* @__PURE__ */ new Map();
+  const decimalsByAddr = /* @__PURE__ */ new Map();
+  unique.forEach((address, i) => {
+    names.set(address, asString(results[i * 3]));
+    symbols.set(address, asString(results[i * 3 + 1]));
+    const raw = results[i * 3 + 2];
+    decimalsByAddr.set(
+      address,
+      typeof raw === "number" ? raw : typeof raw === "bigint" ? Number(raw) : void 0
+    );
   });
-  addrs.forEach((addr4, i) => {
-    const name = results[i * 3];
-    const symbol = results[i * 3 + 1];
-    const decimals = results[i * 3 + 2];
-    const address = addr4.toLowerCase();
+  const needsBytes32 = unique.filter(
+    (a) => decimalsByAddr.get(a) !== void 0 && (names.get(a) === void 0 || symbols.get(a) === void 0)
+  );
+  if (needsBytes32.length > 0) {
+    const b32Calls = needsBytes32.flatMap((address) => [
+      { address, name: "name", args: [] },
+      { address, name: "symbol", args: [] }
+    ]);
+    try {
+      const b32 = await multicall({
+        chain,
+        calls: b32Calls,
+        abi: ERC20_BYTES32_ABI,
+        maxRetries: maxRetries2,
+        allowFailure: true
+      });
+      needsBytes32.forEach((address, i) => {
+        if (names.get(address) === void 0) {
+          const decoded = decodeBytes32(b32[i * 2]);
+          if (decoded) names.set(address, decoded);
+        }
+        if (symbols.get(address) === void 0) {
+          const decoded = decodeBytes32(b32[i * 2 + 1]);
+          if (decoded) symbols.set(address, decoded);
+        }
+      });
+    } catch {
+    }
+  }
+  const tokens = {};
+  for (const address of unique) {
+    const decimals = decimalsByAddr.get(address);
+    if (decimals === void 0 || !Number.isInteger(decimals)) continue;
+    if (decimals < 0 || decimals > 36) continue;
+    const symbol = symbols.get(address) ?? `${address.slice(0, 6)}\u2026`;
+    const name = names.get(address) ?? symbol;
     tokens[address] = {
       chainId: String(chain),
       decimals,
@@ -76274,7 +76363,7 @@ async function fetchTokenMetadata(chain, addrs) {
       assetGroup: `${symbol}::${name}`,
       currencyId: `${symbol}::${name}`
     };
-  });
+  }
   return tokens;
 }
 function balanceFetcher() {