@1delta/margin-fetcher 5.0.56 → 5.0.57

package/dist/index.d.ts

@@ -8559,6 +8559,17 @@ interface UpshiftVault extends VaultClassificationFields {
     vaultAddress: string;
     /** Underlying ERC-20 address (first accepted deposit asset), lowercased. */
     underlying: string;
+    /**
+     * EVERY asset the vault accepts, lowercased — `underlying` is only the
+     * first of them.
+     *
+     * The entry is genuinely multi-asset (`deposit(asset, amount, receiver)`
+     * names the asset it pulls), and several vaults take four or five: Clearstar
+     * Prism accepts USDC, USDT, USDS, deUSD and sdeUSD. Publishing only the
+     * first made the other legs unreachable — a caller paying USDT was told the
+     * vault takes USDC, which is true and not the whole truth.
+     */
+    depositAssets: string[];
     /** Receipt-token symbol, e.g. `earnAUSD`. */
     symbol: string;
     /** Vault display name as returned by the API. */
@@ -8698,7 +8709,8 @@ type UpshiftVaults = {
 };
 
 /**
- * One-shot fetcher for all visible Upshift vaults on a chain.
+ * One-shot fetcher for the Upshift vaults on a chain (see
+ * {@link isServable} for which of them we serve).
  *
  * HTTP-only (Upshift public REST listing) — no multicall executor needed,
  * mirroring the Lagoon fetcher. The endpoint is global; we filter to the

package/dist/index.js

@@ -3,7 +3,7 @@ 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, hasCrossMarginRisk, isEulerType, isAaveV4Type, isInit, isMorphoType, isCompoundV2Type, isVenusType, isSumerType, AAVE_V3_LENDERS, AAVE_V2_LENDERS, isMorphoBlue, isAaveV2Type, isAaveV32Type, isAaveV3Type, isUsdd, isSky, 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, liquityConfigFor, liquityBranchesByChain, riverConfigFor, riverChainData, termMaxApiBaseUrl, termMaxLenderKey, inverseConfigFor, inverseChainData, coolerConfigFor, llamaLendConfigFor, llamaLendChainData, llamaLendApiBaseUrl, resupplyConfigFor, fraxlendConfigFor, dssConfigFor, dssChainData, dssDebtToken, dssDebtJoin, frankencoinConfigFor, frankencoinChainData, aaveOracles, morphoTypeMarkets, resolveMidnightApiBase, resolveTermApiBase, 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 } 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, liquityConfigFor, liquityBranchesByChain, riverConfigFor, riverChainData, termMaxApiBaseUrl, termMaxLenderKey, inverseConfigFor, inverseChainData, coolerConfigFor, llamaLendConfigFor, llamaLendChainData, llamaLendApiBaseUrl, resupplyConfigFor, fraxlendConfigFor, dssConfigFor, dssChainData, dssDebtToken, dssDebtJoin, frankencoinConfigFor, frankencoinChainData, aaveOracles, morphoTypeMarkets, resolveMidnightApiBase, resolveTermApiBase, 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 lodash from 'lodash';
 import { Chain } from '@1delta/chain-registry';
 import { multicallRetryUniversal, getEvmClient, getEvmChain, getEvmClientUniversal } from '@1delta/providers';
@@ -28325,6 +28325,99 @@ var getLenderPublicDataViaApi = async (chainId, lenders, prices, additionalYield
   }
   return lenderData;
 };
+var ERC20_BALANCE_OF_ABI2 = [
+  {
+    inputs: [{ name: "account", type: "address" }],
+    name: "balanceOf",
+    outputs: [{ name: "", type: "uint256" }],
+    stateMutability: "view",
+    type: "function"
+  }
+];
+var MORPHO_BLUE_BUCKET_PREFIX = "MORPHO_BLUE_";
+function formatBalance(raw, decimals) {
+  if (raw === void 0 || raw === null || raw === "0x") return void 0;
+  let value;
+  try {
+    value = BigInt(raw);
+  } catch {
+    return void 0;
+  }
+  return Number(value) / 10 ** decimals;
+}
+async function enrichMorphoCollateralTotals(chainId, result, prices, multicallRetry) {
+  const morpho = morphoPools()?.MORPHO_BLUE?.[chainId];
+  if (!morpho) return result;
+  const markets = [];
+  for (const [bucket, entry] of Object.entries(result)) {
+    if (!bucket.startsWith(MORPHO_BLUE_BUCKET_PREFIX)) continue;
+    const market = entry?.params?.market;
+    const rows = entry?.data;
+    if (!market || !rows) continue;
+    const collateral = String(market.collateralAddress ?? "").toLowerCase();
+    const loan = String(market.loanAddress ?? "").toLowerCase();
+    if (!collateral || !loan) continue;
+    const loanRow = rows[createMarketUid(chainId, bucket, loan)];
+    const supply = Number(loanRow?.totalDeposits ?? 0);
+    const borrow = Number(loanRow?.totalDebt ?? 0);
+    const loanIdle = Number.isFinite(supply) && Number.isFinite(borrow) ? supply - borrow : 0;
+    markets.push({
+      bucket,
+      collateralUid: createMarketUid(chainId, bucket, collateral),
+      collateral,
+      loan,
+      collateralDecimals: Number(market.collateralDecimals ?? 18),
+      loanIdle
+    });
+  }
+  if (markets.length === 0) return result;
+  const marketsByCollateral = /* @__PURE__ */ new Map();
+  for (const m of markets) {
+    const list = marketsByCollateral.get(m.collateral);
+    if (list) list.push(m);
+    else marketsByCollateral.set(m.collateral, [m]);
+  }
+  const soleCollateralTokens = [...marketsByCollateral.entries()].filter(([, list]) => list.length === 1).map(([token]) => token);
+  if (soleCollateralTokens.length === 0) return result;
+  let balances;
+  try {
+    balances = await multicallRetry({
+      chain: chainId,
+      calls: soleCollateralTokens.map((token) => ({
+        address: token,
+        functionName: "balanceOf",
+        args: [morpho]
+      })),
+      abi: soleCollateralTokens.map(() => ERC20_BALANCE_OF_ABI2),
+      allowFailure: true
+    });
+  } catch {
+    return result;
+  }
+  const idleByToken = /* @__PURE__ */ new Map();
+  for (const m of markets) {
+    idleByToken.set(m.loan, (idleByToken.get(m.loan) ?? 0) + m.loanIdle);
+  }
+  soleCollateralTokens.forEach((token, i) => {
+    const m = marketsByCollateral.get(token)[0];
+    const balance = formatBalance(balances?.[i], m.collateralDecimals);
+    if (balance === void 0) return;
+    const total = balance - (idleByToken.get(token) ?? 0);
+    if (!Number.isFinite(total) || total < 0) return;
+    const row = result[m.bucket]?.data?.[m.collateralUid];
+    if (!row) return;
+    const priceKey = toOracleKey(row.asset?.assetGroup ?? null) || toGenericPriceKey(token, chainId);
+    const price2 = prices[priceKey] ?? 0;
+    const usd = total * price2;
+    row.totalDeposits = total;
+    row.totalLiquidity = total;
+    row.borrowLiquidity = total;
+    row.totalDepositsUSD = usd;
+    row.totalLiquidityUSD = usd;
+    row.borrowLiquidityUSD = usd;
+  });
+  return result;
+}
 var warn5 = (...args) => {
 };
 function lenderApiOnly(lender, chainId) {
@@ -28425,6 +28518,21 @@ var getLenderPublicDataAll = async (chainId, lenders, prices, additionalYields,
         e?.message ?? e
       );
     }
+    if (lendersOnChain.some((l) => l === Lender.MORPHO_BLUE)) {
+      try {
+        onChainRes = await enrichMorphoCollateralTotals(
+          chainId,
+          onChainRes,
+          prices,
+          multicallRetry
+        );
+      } catch (e) {
+        warn5(
+          `[lending] morpho collateral enrichment failed for chain ${chainId}:`,
+          e?.message ?? e
+        );
+      }
+    }
   }
   return { ...onChainRes, ...apiRes };
 };
@@ -49837,8 +49945,13 @@ var UPSHIFT_CHAIN_IDS = /* @__PURE__ */ new Set([
   // Plasma
   "57073",
   // Ink
-  "999"
+  "999",
   // HyperEVM
+  // Citrea. Added 2026-08-19: the listing carries a live, visible $2.56M
+  // RockawayX vault there (`Earn ctUSD`) that this gate was short-circuiting
+  // away — the fetch itself is HTTP-only and chain-agnostic, so a chain
+  // missing from this set is the only thing that can hide one.
+  "4114"
 ]);
 var hasUpshiftVaults = (chainId) => UPSHIFT_CHAIN_IDS.has(String(chainId));
 async function fetchUpshiftApiVaults() {
@@ -51466,7 +51579,8 @@ function generateMorphoLenderKey(marketId) {
 }
 function getMorphoMarketsForChain(chainId, marketOverrides) {
   const chainOverrides = marketOverrides?.[chainId] ?? [];
-  return chainOverrides.map((override) => ({
+  const markets = chainOverrides.length ? chainOverrides : morphoTypeOracles()?.[chainId]?.[Lender.MORPHO_BLUE] ?? [];
+  return markets.map((override) => ({
     oracle: override.oracle,
     loanAsset: override.loanAsset,
     collateralAsset: override.collateralAsset,
@@ -65305,6 +65419,7 @@ function parseVault8(v, chainId, prices, tokenList) {
   const vaultAddr = (v?.address ?? receiptAddr).toLowerCase();
   const asset0 = v.depositAssets?.find((a) => a?.address);
   const assetAddr = (asset0?.address ?? "").toLowerCase();
+  const depositAssets = (v.depositAssets ?? []).map((a) => (a?.address ?? "").toLowerCase()).filter((a) => isEvmAddress(a));
   if (!receiptAddr || !assetAddr) return null;
   if (!isEvmAddress(receiptAddr) || !isEvmAddress(assetAddr)) return null;
   const assetMeta = tokenList[assetAddr];
@@ -65342,6 +65457,7 @@ function parseVault8(v, chainId, prices, tokenList) {
     address: receiptAddr,
     vaultAddress: vaultAddr,
     underlying: assetAddr,
+    depositAssets,
     symbol,
     name: name || symbol,
     decimals,
@@ -65392,6 +65508,7 @@ function parseVault8(v, chainId, prices, tokenList) {
     totalAssetsUsd
   };
 }
+var isServable = (v) => v?.isVisible !== false || v?.withdrawalOnly === true;
 var fetchUpshiftVaults = async (chainId, prices = {}, tokenList = {}) => {
   if (!hasUpshiftVaults(chainId)) return {};
   const items = await fetchUpshiftApiVaults();
@@ -65399,7 +65516,7 @@ var fetchUpshiftVaults = async (chainId, prices = {}, tokenList = {}) => {
   const out = {};
   for (const item of items) {
     if (Number(item?.chainId) !== want) continue;
-    if (item?.isVisible === false) continue;
+    if (!isServable(item)) continue;
     const parsed = parseVault8(item, chainId, prices, tokenList);
     if (parsed) out[parsed.address] = parsed;
   }
@@ -74329,6 +74446,7 @@ function acceptsVaultZap(row, provider) {
   if (ZAP_EXCLUDED_PROVIDERS.has(provider)) return false;
   const share = row.shareToken?.address ?? row.ref;
   if (!share) return false;
+  if (provider === "upshift" && isSplitUpshiftRow(row, share)) return false;
   try {
     const entry = findSavingsWithdrawEntry(row.chainId, share);
     if (entry && NON_4626_DEPOSIT_KINDS.has(entry.kind)) return false;
@@ -74337,6 +74455,10 @@ function acceptsVaultZap(row, provider) {
   }
   return true;
 }
+function isSplitUpshiftRow(row, share) {
+  const deposit = (row.providerMeta ?? {}).depositContract;
+  return typeof deposit === "string" && deposit.toLowerCase() !== String(share).toLowerCase();
+}
 function isSecondaryMarketRow(row) {
   const meta = row.providerMeta ?? {};
   if (meta.secondaryMarketOnly === true) return true;
@@ -74413,7 +74535,7 @@ function vaultCapabilities(row) {
     caps.push({
       action: "claim",
       async: false,
-      requires: claimRequires()
+      requires: claimRequires(row, provider)
     });
   }
   if (supportsCancel(provider, meta)) {
@@ -74429,6 +74551,11 @@ function swapRoutedProvidersArePriceConsistent() {
   return [...SWAP_ROUTED_PROVIDERS].filter((p) => !isBookPriced(p));
 }
 function depositInputs(row, provider) {
+  if (provider === "upshift") {
+    const assets = (row.providerMeta ?? {}).depositAssets;
+    if (!Array.isArray(assets) || assets.length < 2) return void 0;
+    return assets.filter((a) => typeof a === "string").map((asset) => ({ asset, mode: "direct" }));
+  }
   if (provider !== "lst") return void 0;
   const share = row.shareToken?.address ?? row.ref;
   if (!share) return void 0;
@@ -74475,7 +74602,10 @@ function requestRequires(provider) {
   if (isBookPriced(provider)) requires.push("slippage");
   return requires.length ? requires : void 0;
 }
-function claimRequires(provider) {
+function claimRequires(row, provider) {
+  const share = row.shareToken?.address ?? row.ref;
+  if (provider === "upshift" && share && isSplitUpshiftRow(row, share))
+    return ["claimableEpoch"];
   return void 0;
 }
 function supportsCancel(provider, meta) {