@1delta/margin-fetcher 0.0.317 → 0.0.319

package/dist/index.js

@@ -3,7 +3,7 @@ import './chunk-BYTNVMX7.js';
 import './chunk-PR4QN5HX.js';
 import { Lender, isAaveType, isCompoundV3, isMultiMarket, isSiloV2Type, isSiloV3Type, isDolomite, isEulerType, isAaveV4Type, isInit, isMorphoType, isCompoundV2Type, isVenusType, isSumerType, AAVE_V3_LENDERS, AAVE_V2_LENDERS, isAaveV2Type, isAaveV32Type, isAaveV3Type, isFluid, isGearboxV3, isMidnight, isYLDR, isCompoundV3Type, isLista, isTectonicType, isKineticType, isBenqiType } from '@1delta/lender-registry';
 export { isAaveType, isAaveV2Type, isAaveV32Type, isAaveV3Type, isCompoundV3, isCompoundV3Type, isInit, isMorphoType, isMultiMarket, isYLDR } from '@1delta/lender-registry';
-import { aavePools, compoundV3Pools, initConfig, morphoPools, compoundV2Pools, eulerVaults, siloMarkets, siloV2LenderKey, siloMarketsV3, siloV3LenderKey, aaveV4Spokes, aaveV4SpokeLenderKey, fluidResolvers, gearboxResolvers, dolomiteConfigs, midnightConfig, aaveReserves, compoundV3Reserves, morphoTypeMarkets, getSiloV2MarketEntry, getSiloV3MarketEntry, dolomiteEmode, aaveTokens, morphoTypeVaults, eulerConfigs, gearboxMarketCompressor, gearboxMarketConfigurators, gearboxV3LenderKey, midnightMarketsByChain, parseAaveV4SpokeLenderKey, gearboxAccountCompressor, compoundV2Tokens, aaveOracles, aaveOraclesConfig, compoundV2Oracles, compoundV2TokenArray, compoundV2OraclesConfig, compoundV3OraclesData, compoundV3BaseData, compoundV2Reserves, fetchTokenLists, fetchTokenList, aaveV4Oracles } from '@1delta/data-sdk';
+import { aavePools, compoundV3Pools, initConfig, morphoPools, compoundV2Pools, eulerVaults, siloMarkets, siloV2LenderKey, siloMarketsV3, siloV3LenderKey, aaveV4Spokes, aaveV4SpokeLenderKey, fluidResolvers, gearboxResolvers, dolomiteConfigs, midnightConfig, aaveReserves, compoundV3Reserves, morphoTypeMarkets, getSiloV2MarketEntry, getSiloV3MarketEntry, dolomiteEmode, aaveTokens, morphoTypeVaults, eulerConfigs, gearboxMarketCompressor, gearboxMarketConfigurators, gearboxV3LenderKey, midnightMarketsByChain, parseAaveV4SpokeLenderKey, gearboxAccountCompressor, compoundV2Tokens, aaveOracles, aaveOraclesConfig, compoundV2Oracles, compoundV2TokenArray, compoundV2OraclesConfig, compoundV3OraclesData, compoundV3BaseData, compoundV2Reserves, fetchTokenLists, fetchTokenList, aaveV4Oracles, resolveMidnightApiBase } from '@1delta/data-sdk';
 import lodash from 'lodash';
 import { getEvmClient, getEvmChain, getEvmClientUniversal, multicallRetryUniversal } from '@1delta/providers';
 import { MetaMorphoAbi, FluidLendingResolverAbi, FluidVaultResolverAbi, MoolahVaultAbi, MorphoLensAbi, AaveV4SpokeAbi, AaveV4OracleAbi, AaveV4HubAbi, DolomiteMarginAbi, GearboxMarketCompressorV310Abi, MorphoBlueAbi, MidnightAbi, GearboxCreditAccountCompressorV310Abi } from '@1delta/abis';
@@ -20754,12 +20754,10 @@ var getLenderPublicData = async (chainId, lenders, prices, additionalYields, mul
   }
   return lenderData;
 };
-var DEFAULT_MIDNIGHT_API = "https://api.morpho.org/v0/midnight";
 var warn = (...args) => {
 };
 function midnightApiBaseUrl(chainId) {
-  const base = midnightConfig()?.[chainId]?.apiBaseUrl;
-  return (base && base.length > 0 ? base : DEFAULT_MIDNIGHT_API).replace(/\/+$/, "");
+  return resolveMidnightApiBase(chainId);
 }
 var toBig2 = (v) => {
   try {
@@ -20927,7 +20925,9 @@ function convertMidnightMarketsToResponse(raw, chainId, prices = {}, _additional
       }
     ] : void 0;
     const loanAddr = config.loanToken.toLowerCase();
-    const loanPrice = prices[loanAddr] ?? 0;
+    const loanAsset = tokens[loanAddr];
+    const loanKey = toOracleKey(loanAsset?.assetGroup) ?? toGenericPriceKey(loanAsset?.address ?? config.loanToken, chainId);
+    const loanPrice = prices[loanKey] ?? 0;
     const supplyLiquidity = formatNr(top?.supplyDepthAssets ?? 0n, config.loanDecimals);
     const borrowLiquidity = formatNr(top?.borrowDepthAssets ?? 0n, config.loanDecimals);
     const entry = { data: {} };
@@ -24814,7 +24814,6 @@ function normalizeUnderlying3(token) {
   const lower = token.toLowerCase();
   return Object.values(WETH_BY_CHAIN).includes(lower) ? zeroAddress : lower;
 }
-var MIDNIGHT_UNIT_DECIMALS = 18;
 function toBigInt10(v) {
   if (v === void 0 || v === null || v === "0x") return 0n;
   if (typeof v === "bigint") return v;
@@ -24857,7 +24856,7 @@ var getMidnightUserDataConverter = (_lender, chainId, account, meta) => {
         const loanOraclePrice = loanMeta ? getOraclePrice(loanMeta) : 0;
         const loanPriceHist = loanMeta?.price?.priceUsd24h ?? loanDisplayPrice;
         const debtUnits = readDebtUnits(positionResult);
-        const debtStr = parseRawAmount(debtUnits.toString(), MIDNIGHT_UNIT_DECIMALS);
+        const debtStr = parseRawAmount(debtUnits.toString(), market.loanDecimals);
         const debtNum = Number(debtStr);
         const posData = {};
         let anyBalance = debtUnits > 0n;
@@ -34228,6 +34227,86 @@ var morphoFetcher = {
   parse: parseMorphoResults,
   getAbi: getMorphoAbi
 };
+function getMidnightCalls(chainId) {
+  const markets = midnightMarketsByChain(chainId);
+  if (markets.length === 0) return [];
+  const results = [];
+  for (const market of markets) {
+    if (!market.marketId || !market.loanToken) continue;
+    const legs = [];
+    const calls = [];
+    for (const c of market.collateralParams ?? []) {
+      if (!c.oracle || !c.token) continue;
+      legs.push({
+        collateralAsset: c.token.toLowerCase(),
+        collateralDecimals: c.decimals,
+        oracle: c.oracle
+      });
+      calls.push({ address: c.oracle, name: "price", params: [] });
+    }
+    if (legs.length === 0) continue;
+    results.push({
+      calls,
+      meta: {
+        marketId: market.marketId,
+        loanAsset: market.loanToken.toLowerCase(),
+        loanDecimals: market.loanDecimals,
+        legs
+      },
+      lender: midnightLenderKey(market.marketId)
+    });
+  }
+  return results;
+}
+function parseMidnightResults(data, meta, context) {
+  const { chainId, usdPrices, tokenList } = context;
+  const entries = [];
+  const loanAsset = meta.loanAsset;
+  const loanDecimals = meta.loanDecimals ?? tokenList?.[loanAsset]?.decimals ?? 18;
+  const loanOracleKey = tokenList?.[loanAsset]?.assetGroup ?? `${chainId}-${loanAsset}`;
+  const loanAssetUSD = usdPrices[loanOracleKey] ?? usdPrices[loanAsset];
+  if (!loanAssetUSD) return entries;
+  const lenderKey = midnightLenderKey(meta.marketId);
+  entries.push({
+    asset: loanAsset,
+    price: 1,
+    priceUSD: loanAssetUSD,
+    marketUid: createMarketUid(chainId, lenderKey, loanAsset),
+    targetLender: lenderKey,
+    description: "Midnight loan asset",
+    staticBase: true,
+    baseAsset: loanAsset
+  });
+  meta.legs.forEach((leg, i) => {
+    const rawPrice = data[i];
+    if (!rawPrice || rawPrice === "0x") return;
+    const collateralDecimals = leg.collateralDecimals ?? tokenList?.[leg.collateralAsset]?.decimals ?? 18;
+    const priceDebtToCollateral = formatMorphoPrice(
+      rawPrice.toString(),
+      loanDecimals,
+      collateralDecimals
+    );
+    if (isNaN(priceDebtToCollateral) || priceDebtToCollateral === 0) return;
+    entries.push({
+      asset: leg.collateralAsset,
+      price: priceDebtToCollateral,
+      // raw: collateral price in loan asset terms
+      priceUSD: priceDebtToCollateral * loanAssetUSD,
+      marketUid: createMarketUid(chainId, lenderKey, leg.collateralAsset),
+      targetLender: lenderKey,
+      baseAsset: loanAsset
+    });
+  });
+  return entries;
+}
+function getMidnightAbi() {
+  return ProxyOracleAbi;
+}
+var midnightFetcher = {
+  getCalls: getMidnightCalls,
+  parse: parseMidnightResults,
+  getAbi: getMidnightAbi
+};
 var CompoundV2OracleAbi = [
   {
     inputs: [{ internalType: "address", name: "cToken", type: "address" }],
@@ -35822,6 +35901,11 @@ async function fetchOraclePrices(chainIds, rpcOverrides, lists = {}, retries = 3
       }),
       getCallsErrors
     ) : [];
+    const midnightResults = isActive("midnight") ? safeGetCalls(
+      "midnight",
+      () => midnightFetcher.getCalls(chainId),
+      getCallsErrors
+    ) : [];
     const siloV2Results = isActive("silov2") ? safeGetCalls(
       "siloV2",
       () => siloV2Fetcher.getCalls(chainId),
@@ -35889,6 +35973,12 @@ async function fetchOraclePrices(chainIds, rpcOverrides, lists = {}, retries = 3
       morphoFetcher.parse,
       ProxyOracleAbi
     );
+    const midnightGroup = buildGroup(
+      "midnight",
+      midnightResults,
+      midnightFetcher.parse,
+      ProxyOracleAbi
+    );
     const siloV2Group = buildGroup(
       "siloV2",
       siloV2Results,
@@ -35927,6 +36017,7 @@ async function fetchOraclePrices(chainIds, rpcOverrides, lists = {}, retries = 3
       eulerGroup,
       aaveV4Group,
       morphoGroup,
+      midnightGroup,
       siloV2Group,
       siloV3Group,
       fluidGroup,
@@ -35962,6 +36053,7 @@ async function fetchOraclePrices(chainIds, rpcOverrides, lists = {}, retries = 3
       fluidData,
       gearboxV3Data,
       dolomiteData,
+      midnightData,
       morphoGqlEntries,
       siloV2GqlEntries,
       siloV3GqlEntries
@@ -36038,6 +36130,14 @@ async function fetchOraclePrices(chainIds, rpcOverrides, lists = {}, retries = 3
         allowFailure,
         rpcOverrides
       ),
+      executeGroup(
+        midnightGroup,
+        chainId,
+        chainBatchSize,
+        retries,
+        allowFailure,
+        rpcOverrides
+      ),
       morphoGqlPromise,
       siloV2GqlPromise,
       siloV3GqlPromise
@@ -36088,6 +36188,7 @@ async function fetchOraclePrices(chainIds, rpcOverrides, lists = {}, retries = 3
       { group: fluidGroup, data: fluidData },
       { group: gearboxV3Group, data: gearboxV3Data },
       { group: dolomiteGroup, data: dolomiteData },
+      { group: midnightGroup, data: midnightData },
       ...siloV2GqlEntries != null ? [] : [{ group: siloV2Group, data: siloV2Data }],
       ...siloV3GqlEntries != null ? [] : [{ group: siloV3Group, data: siloV3Data }],
       // In hybrid mode the on-chain multicall ran too — surface its errors.
@@ -36281,6 +36382,7 @@ async function fetchOraclePrices(chainIds, rpcOverrides, lists = {}, retries = 3
       }
       parseTrackers(morphoGroup, morphoData.results, false);
     }
+    parseTrackers(midnightGroup, midnightData.results, false);
     const totalFailedCalls = trackerDiags.reduce(
       (sum, d) => sum + d.failedCalls,
       0