@1delta/margin-fetcher 0.0.230 → 0.0.231

package/dist/index.js

@@ -30637,9 +30637,7 @@ function parseSiloV2Results(data, meta, context) {
         const rawQt = data[qtIdx];
         if (!rawQt || rawQt === "0x") continue;
         const quoteTokenAddr = rawQt.toLowerCase();
-        const qtMeta = context.tokenList?.[quoteTokenAddr];
-        const qtDecimals = qtMeta?.decimals ?? 18;
-        const priceInQt = Number(quoteAmount) / Number(10n ** BigInt(qtDecimals));
+        const priceInQt = Number(quoteAmount) / 1e18;
         if (isNaN(priceInQt) || priceInQt === 0) continue;
         const qtUSD = lookupUSD(context, quoteTokenAddr);
         if (!qtUSD) continue;
@@ -30810,9 +30808,7 @@ function parseSiloV3Results(data, meta, context) {
         const rawQt = data[qtIdx];
         if (!rawQt || rawQt === "0x") continue;
         const quoteTokenAddr = rawQt.toLowerCase();
-        const qtMeta = context.tokenList?.[quoteTokenAddr];
-        const qtDecimals = qtMeta?.decimals ?? 18;
-        const priceInQt = Number(quoteAmount) / Number(10n ** BigInt(qtDecimals));
+        const priceInQt = Number(quoteAmount) / 1e18;
         if (isNaN(priceInQt) || priceInQt === 0) continue;
         const qtUSD = lookupUSD2(context, quoteTokenAddr);
         if (!qtUSD) continue;
@@ -30861,6 +30857,51 @@ async function fetchSiloV2GraphQLMarkets(chainId) {
     return null;
   }
 }
+async function fetchSiloV2GraphQLPrices(chainId, basePrices = {}, tokenList = {}) {
+  const items = await fetchSiloV2GraphQLMarkets(chainId);
+  if (items == null) return null;
+  const usdPrices = buildSelfDerivedUsdMap(chainId, items, basePrices, tokenList);
+  const context = { chainId, usdPrices, tokenList };
+  const entries = parseSiloV2GraphQLResults(items, context);
+  if (entries.length === 0) {
+    console.warn(
+      `[silo-v2-gql] chain ${chainId}: ${items.length} markets fetched but 0 price entries produced`
+    );
+    return null;
+  }
+  return entries;
+}
+function buildSelfDerivedUsdMap(chainId, items, basePrices, tokenList) {
+  const map = {};
+  const set = (tokenLc, priceUSD) => {
+    if (!Number.isFinite(priceUSD) || priceUSD === 0) return;
+    const groupKey = tokenList[tokenLc]?.assetGroup ?? `${chainId}-${tokenLc}`;
+    if (map[groupKey] == null) map[groupKey] = priceUSD;
+    if (map[tokenLc] == null) map[tokenLc] = priceUSD;
+  };
+  for (const item of items) {
+    for (const market of [item.market1, item.market2]) {
+      if (!market) continue;
+      const tokenLc = (market.inputTokenId ?? market.inputToken?.id ?? "").toLowerCase();
+      if (!tokenLc) continue;
+      const supply = safeNumber3(market.supply);
+      const supplyUsd = market.supplyUsd != null ? Number(market.supplyUsd) : 0;
+      if (supply > 0 && supplyUsd > 0) {
+        set(tokenLc, supplyUsd / supply);
+        continue;
+      }
+      const borrowed = safeNumber3(market.borrowed);
+      const borrowedUsd = market.borrowedUsd != null ? Number(market.borrowedUsd) : 0;
+      if (borrowed > 0 && borrowedUsd > 0) {
+        set(tokenLc, borrowedUsd / borrowed);
+      }
+    }
+  }
+  for (const [k, v] of Object.entries(basePrices)) {
+    if (Number.isFinite(v) && v > 0) map[k] = v;
+  }
+  return map;
+}
 function safeNumber3(v) {
   if (v == null) return 0;
   const n = typeof v === "number" ? v : Number(v);
@@ -30960,6 +31001,51 @@ async function fetchSiloV3GraphQLMarkets(chainId) {
     return null;
   }
 }
+async function fetchSiloV3GraphQLPrices(chainId, basePrices = {}, tokenList = {}) {
+  const items = await fetchSiloV3GraphQLMarkets(chainId);
+  if (items == null) return null;
+  const usdPrices = buildSelfDerivedUsdMap2(chainId, items, basePrices, tokenList);
+  const context = { chainId, usdPrices, tokenList };
+  const entries = parseSiloV3GraphQLResults(items, context);
+  if (entries.length === 0) {
+    console.warn(
+      `[silo-v3-gql] chain ${chainId}: ${items.length} markets fetched but 0 price entries produced`
+    );
+    return null;
+  }
+  return entries;
+}
+function buildSelfDerivedUsdMap2(chainId, items, basePrices, tokenList) {
+  const map = {};
+  const set = (tokenLc, priceUSD) => {
+    if (!Number.isFinite(priceUSD) || priceUSD === 0) return;
+    const groupKey = tokenList[tokenLc]?.assetGroup ?? `${chainId}-${tokenLc}`;
+    if (map[groupKey] == null) map[groupKey] = priceUSD;
+    if (map[tokenLc] == null) map[tokenLc] = priceUSD;
+  };
+  for (const item of items) {
+    for (const market of [item.market1, item.market2]) {
+      if (!market) continue;
+      const tokenLc = (market.inputTokenId ?? market.inputToken?.id ?? "").toLowerCase();
+      if (!tokenLc) continue;
+      const supply = safeNumber4(market.supply);
+      const supplyUsd = market.supplyUsd != null ? Number(market.supplyUsd) : 0;
+      if (supply > 0 && supplyUsd > 0) {
+        set(tokenLc, supplyUsd / supply);
+        continue;
+      }
+      const borrowed = safeNumber4(market.borrowed);
+      const borrowedUsd = market.borrowedUsd != null ? Number(market.borrowedUsd) : 0;
+      if (borrowed > 0 && borrowedUsd > 0) {
+        set(tokenLc, borrowedUsd / borrowed);
+      }
+    }
+  }
+  for (const [k, v] of Object.entries(basePrices)) {
+    if (Number.isFinite(v) && v > 0) map[k] = v;
+  }
+  return map;
+}
 function safeNumber4(v) {
   if (v == null) return 0;
   const n = typeof v === "number" ? v : Number(v);
@@ -31287,8 +31373,8 @@ async function fetchOraclePrices(chainIds, rpcOverrides, lists = {}, retries = 3
     }
     const chainBatchSize = batchSize?.[chainId];
     const morphoGqlPromise = isActive("morpho") ? fetchMorphoGraphQLPrices(chainId) : Promise.resolve(null);
-    const siloV2GqlPromise = fetchSiloV2GraphQLMarkets(chainId);
-    const siloV3GqlPromise = fetchSiloV3GraphQLMarkets(chainId);
+    const siloV2GqlPromise = isActive("silov2") ? fetchSiloV2GraphQLPrices(chainId, basePrices, tokenList) : Promise.resolve(null);
+    const siloV3GqlPromise = isActive("silov3") ? fetchSiloV3GraphQLPrices(chainId, basePrices, tokenList) : Promise.resolve(null);
     const [
       aaveData,
       compoundV2Data,
@@ -31297,8 +31383,8 @@ async function fetchOraclePrices(chainIds, rpcOverrides, lists = {}, retries = 3
       eulerData,
       aaveV4Data,
       morphoGqlEntries,
-      siloV2GqlItems,
-      siloV3GqlItems
+      siloV2GqlEntries,
+      siloV3GqlEntries
     ] = await Promise.all([
       executeGroup(
         aaveGroup,
@@ -31352,12 +31438,12 @@ async function fetchOraclePrices(chainIds, rpcOverrides, lists = {}, retries = 3
       siloV2GqlPromise,
       siloV3GqlPromise
     ]);
-    if (siloV2GqlItems == null && siloV2Group.calls.length > 0) {
+    if (siloV2GqlEntries == null && siloV2Group.calls.length > 0) {
       console.warn(
-        `[prices] chain ${chainId}: Silo v2 GraphQL unavailable, falling back to on-chain (${siloV2Group.trackers.length} trackers)`
+        `[prices] chain ${chainId}: Silo v2 GraphQL returned null, falling back to on-chain (${siloV2Group.trackers.length} trackers)`
       );
     }
-    const siloV2Data = siloV2GqlItems != null ? { results: [], error: void 0 } : await executeGroup(
+    const siloV2Data = siloV2GqlEntries != null ? { results: [], error: void 0 } : await executeGroup(
       siloV2Group,
       chainId,
       chainBatchSize,
@@ -31365,12 +31451,12 @@ async function fetchOraclePrices(chainIds, rpcOverrides, lists = {}, retries = 3
       allowFailure,
       rpcOverrides
     );
-    if (siloV3GqlItems == null && siloV3Group.calls.length > 0) {
+    if (siloV3GqlEntries == null && siloV3Group.calls.length > 0) {
       console.warn(
-        `[prices] chain ${chainId}: Silo v3 GraphQL unavailable, falling back to on-chain (${siloV3Group.trackers.length} trackers)`
+        `[prices] chain ${chainId}: Silo v3 GraphQL returned null, falling back to on-chain (${siloV3Group.trackers.length} trackers)`
       );
     }
-    const siloV3Data = siloV3GqlItems != null ? { results: [], error: void 0 } : await executeGroup(
+    const siloV3Data = siloV3GqlEntries != null ? { results: [], error: void 0 } : await executeGroup(
       siloV3Group,
       chainId,
       chainBatchSize,
@@ -31399,8 +31485,8 @@ async function fetchOraclePrices(chainIds, rpcOverrides, lists = {}, retries = 3
       { group: listaGroup, data: listaData },
       { group: eulerGroup, data: eulerData },
       { group: aaveV4Group, data: aaveV4Data },
-      ...siloV2GqlItems != null ? [] : [{ group: siloV2Group, data: siloV2Data }],
-      ...siloV3GqlItems != null ? [] : [{ group: siloV3Group, data: siloV3Data }],
+      ...siloV2GqlEntries != null ? [] : [{ group: siloV2Group, data: siloV2Data }],
+      ...siloV3GqlEntries != null ? [] : [{ group: siloV3Group, data: siloV3Data }],
       ...useMorphoGql ? [] : [{ group: morphoGroup, data: morphoData }]
     ];
     for (const { group, data } of groupResults) {
@@ -31485,16 +31571,14 @@ async function fetchOraclePrices(chainIds, rpcOverrides, lists = {}, retries = 3
       true,
       (t) => !!t.meta.baseAssetSource
     );
-    if (siloV2GqlItems != null) {
-      const context = { chainId, usdPrices, tokenList };
-      const entries = parseSiloV2GraphQLResults(siloV2GqlItems, context);
+    if (siloV2GqlEntries != null) {
       const diag2 = {
         lender: "SILO_V2 (GraphQL)",
         callCount: 0,
         failedCalls: 0,
-        parsedEntries: entries.length
+        parsedEntries: siloV2GqlEntries.length
       };
-      for (const entry of entries) {
+      for (const entry of siloV2GqlEntries) {
         const lender = entry.targetLender ?? "SILO_V2";
         if (!chainResult[lender]) chainResult[lender] = [];
         chainResult[lender].push(entry);
@@ -31506,16 +31590,14 @@ async function fetchOraclePrices(chainIds, rpcOverrides, lists = {}, retries = 3
     } else {
       parseTrackers(siloV2Group, siloV2Data.results);
     }
-    if (siloV3GqlItems != null) {
-      const context = { chainId, usdPrices, tokenList };
-      const entries = parseSiloV3GraphQLResults(siloV3GqlItems, context);
+    if (siloV3GqlEntries != null) {
       const diag2 = {
         lender: "SILO_V3 (GraphQL)",
         callCount: 0,
         failedCalls: 0,
-        parsedEntries: entries.length
+        parsedEntries: siloV3GqlEntries.length
       };
-      for (const entry of entries) {
+      for (const entry of siloV3GqlEntries) {
         const lender = entry.targetLender ?? "SILO_V3";
         if (!chainResult[lender]) chainResult[lender] = [];
         chainResult[lender].push(entry);