@1delta/margin-fetcher 0.0.236 → 0.0.238

package/dist/index.js

@@ -7607,6 +7607,9 @@ var getLendersForChain = (c) => {
   for (const spokeAddr of Object.keys(v4ChainSpokes)) {
     lenders.push(aaveV4SpokeLenderKey(spokeAddr));
   }
+  if (fluidResolvers()?.[c]) {
+    lenders.push(Lender.FLUID);
+  }
   return lenders;
 };
 var filterLendersByProtocol = (allLenders, protocolList) => {
@@ -7615,8 +7618,9 @@ var filterLendersByProtocol = (allLenders, protocolList) => {
   }
   const hasMorpho = protocolList.includes(Lender.MORPHO_BLUE);
   const hasMoolah = protocolList.includes(Lender.LISTA_DAO);
+  const hasFluid = protocolList.includes(Lender.FLUID);
   return allLenders.filter(
-    (lender) => protocolList.includes(lender) || hasMorpho && lender?.startsWith("MORPHO_BLUE") || hasMoolah && lender?.startsWith("LISTA_DAO")
+    (lender) => protocolList.includes(lender) || hasMorpho && lender?.startsWith("MORPHO_BLUE") || hasMoolah && lender?.startsWith("LISTA_DAO") || hasFluid && lender?.startsWith("FLUID")
   );
 };
 var getAavesForChain = () => {
@@ -31477,6 +31481,88 @@ var siloV3Fetcher = {
   parse: parseSiloV3Results,
   getAbi: getSiloV3Abi
 };
+var FLUID_EEE_LOWER2 = "0xeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee";
+var normalizeUnderlying2 = (addr) => addr === FLUID_EEE_LOWER2 ? zeroAddress : addr;
+function priceColInDebt(raw, colDec, debtDec) {
+  return formatMorphoPrice(raw, debtDec, colDec + 9);
+}
+function getFluidCalls(chainId) {
+  const resolvers = fluidResolvers()?.[chainId];
+  if (!resolvers) return [];
+  const call = {
+    address: resolvers.vaultResolver,
+    name: "getVaultsEntireData",
+    params: []
+  };
+  return [
+    {
+      calls: [call],
+      // Empty placeholder — populated per-vault inside `parse` from the
+      // resolver response. Kept as an empty object to match the shape
+      // other fetchers expose.
+      meta: { vaults: [] },
+      lender: Lender.FLUID
+    }
+  ];
+}
+function parseFluidResults(data, _meta, context) {
+  const { chainId, usdPrices, tokenList } = context;
+  const entries = [];
+  const vaults = data[0];
+  if (!Array.isArray(vaults) || vaults.length === 0) return entries;
+  for (const vault of vaults) {
+    try {
+      if (vault.isSmartCol || vault.isSmartDebt) continue;
+      const constants = vault.constantVariables;
+      const configs = vault.configs;
+      if (!constants || !configs) continue;
+      const rawCol = (constants.supplyToken?.token0 ?? constants.supplyToken ?? "").toString().toLowerCase();
+      const rawLoan = (constants.borrowToken?.token0 ?? constants.borrowToken ?? "").toString().toLowerCase();
+      if (!rawCol || !rawLoan) continue;
+      const collateral = normalizeUnderlying2(rawCol);
+      const loan = normalizeUnderlying2(rawLoan);
+      const colDec = tokenList?.[collateral]?.decimals ?? 18;
+      const loanDec = tokenList?.[loan]?.decimals ?? 18;
+      const rawPrice = configs.oraclePriceOperate?.toString() ?? "0";
+      if (!rawPrice || rawPrice === "0") continue;
+      const priceDebtPerCol = priceColInDebt(rawPrice, colDec, loanDec);
+      if (!Number.isFinite(priceDebtPerCol) || priceDebtPerCol === 0) continue;
+      const vaultId = Number(constants.vaultId ?? 0);
+      const lenderKey = `${Lender.FLUID}_${vaultId}`;
+      const loanOracleKey = tokenList?.[loan]?.assetGroup ?? `${chainId}-${loan}`;
+      const loanUSD = usdPrices[loanOracleKey] ?? usdPrices[loan];
+      if (!loanUSD) continue;
+      entries.push({
+        asset: loan,
+        price: 1,
+        priceUSD: loanUSD,
+        marketUid: createMarketUid(chainId, lenderKey, loan),
+        targetLender: lenderKey,
+        description: "Fluid loan asset",
+        staticBase: true,
+        baseAsset: loan
+      });
+      entries.push({
+        asset: collateral,
+        price: priceDebtPerCol,
+        priceUSD: priceDebtPerCol * loanUSD,
+        marketUid: createMarketUid(chainId, lenderKey, collateral),
+        targetLender: lenderKey,
+        baseAsset: loan
+      });
+    } catch {
+    }
+  }
+  return entries;
+}
+function getFluidAbi() {
+  return FluidVaultResolverAbi;
+}
+var fluidFetcher = {
+  getCalls: getFluidCalls,
+  parse: parseFluidResults,
+  getAbi: getFluidAbi
+};
 
 // src/prices/oracle-prices/fetchers/siloV2Graphql.ts
 async function fetchSiloV2GraphQLMarkets(chainId) {
@@ -31926,6 +32012,11 @@ async function fetchOraclePrices(chainIds, rpcOverrides, lists = {}, retries = 3
       () => siloV3Fetcher.getCalls(chainId),
       getCallsErrors
     ) : [];
+    const fluidResults = isActive("fluid") ? safeGetCalls(
+      "fluid",
+      () => fluidFetcher.getCalls(chainId),
+      getCallsErrors
+    ) : [];
     const aaveGroup = buildGroup(
       "aave",
       aaveResults,
@@ -31980,6 +32071,12 @@ async function fetchOraclePrices(chainIds, rpcOverrides, lists = {}, retries = 3
       siloV3Fetcher.parse,
       getSiloV3Abi()
     );
+    const fluidGroup = buildGroup(
+      "fluid",
+      fluidResults,
+      fluidFetcher.parse,
+      getFluidAbi()
+    );
     const allGroups = [
       aaveGroup,
       compoundV2Group,
@@ -31989,7 +32086,8 @@ async function fetchOraclePrices(chainIds, rpcOverrides, lists = {}, retries = 3
       aaveV4Group,
       morphoGroup,
       siloV2Group,
-      siloV3Group
+      siloV3Group,
+      fluidGroup
     ];
     const totalCalls = allGroups.reduce((s, g) => s + g.calls.length, 0);
     if (totalCalls === 0 && !isActive("morpho")) {
@@ -32017,6 +32115,7 @@ async function fetchOraclePrices(chainIds, rpcOverrides, lists = {}, retries = 3
       listaData,
       eulerData,
       aaveV4Data,
+      fluidData,
       morphoGqlEntries,
       siloV2GqlEntries,
       siloV3GqlEntries
@@ -32069,6 +32168,14 @@ async function fetchOraclePrices(chainIds, rpcOverrides, lists = {}, retries = 3
         allowFailure,
         rpcOverrides
       ),
+      executeGroup(
+        fluidGroup,
+        chainId,
+        chainBatchSize,
+        retries,
+        allowFailure,
+        rpcOverrides
+      ),
       morphoGqlPromise,
       siloV2GqlPromise,
       siloV3GqlPromise
@@ -32120,6 +32227,7 @@ async function fetchOraclePrices(chainIds, rpcOverrides, lists = {}, retries = 3
       { group: listaGroup, data: listaData },
       { group: eulerGroup, data: eulerData },
       { group: aaveV4Group, data: aaveV4Data },
+      { group: fluidGroup, data: fluidData },
       ...siloV2GqlEntries != null ? [] : [{ group: siloV2Group, data: siloV2Data }],
       ...siloV3GqlEntries != null ? [] : [{ group: siloV3Group, data: siloV3Data }],
       ...useMorphoGql ? [] : [{ group: morphoGroup, data: morphoData }]
@@ -32206,6 +32314,7 @@ async function fetchOraclePrices(chainIds, rpcOverrides, lists = {}, retries = 3
       true,
       (t) => !!t.meta.baseAssetSource
     );
+    parseTrackers(fluidGroup, fluidData.results, false);
     if (siloV2GqlEntries != null) {
       const diag2 = {
         lender: "SILO_V2 (GraphQL)",
@@ -32770,8 +32879,8 @@ var buildFluidFTokensCall = (chainId) => {
 };
 
 // src/vaults/fluid/publicCallParse.ts
-var FLUID_EEE_LOWER2 = "0xeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee";
-var normalizeUnderlying2 = (addr) => addr === FLUID_EEE_LOWER2 ? zeroAddress : addr;
+var FLUID_EEE_LOWER3 = "0xeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee";
+var normalizeUnderlying3 = (addr) => addr === FLUID_EEE_LOWER3 ? zeroAddress : addr;
 var FLUID_RATE_SCALE2 = 100;
 var scaleFluidRate2 = (raw) => {
   if (raw === void 0 || raw === null) return 0;
@@ -32793,7 +32902,7 @@ function parseFTokens(fTokens, chainId, prices, tokenList) {
   for (const ft of fTokens) {
     const rawAsset = (ft.asset ?? "").toString().toLowerCase();
     if (!rawAsset) continue;
-    const underlying = normalizeUnderlying2(rawAsset);
+    const underlying = normalizeUnderlying3(rawAsset);
     const assetMeta = tokenList[underlying];
     const decimals = Number(ft.decimals ?? assetMeta?.decimals ?? 18);
     const totalAssetsFormatted = Number(