@1delta/margin-fetcher 0.0.228 → 0.0.229

package/dist/index.js

@@ -7594,6 +7594,10 @@ var getLendersForChain = (c) => {
   for (const market of siloChainPairs) {
     lenders.push(siloV2LenderKey(market.siloConfig));
   }
+  const siloV3ChainPairs = siloMarketsV3()?.[c] ?? [];
+  for (const market of siloV3ChainPairs) {
+    lenders.push(siloV3LenderKey(market.siloConfig));
+  }
   const v4ChainSpokes = aaveV4Spokes()?.[c] ?? {};
   for (const spokeAddr of Object.keys(v4ChainSpokes)) {
     lenders.push(aaveV4SpokeLenderKey(spokeAddr));
@@ -18883,6 +18887,7 @@ function buildSiloV3LenderReserveCall(_chainId, lender) {
 }
 
 // src/lending/public-data/silo-v3/publicCallParse.ts
+var ZERO_ADDRESS = "0x0000000000000000000000000000000000000000";
 var getSiloV3ReservesDataConverter = (lender, chainId, prices, additionalYields, tokenList = {}) => {
   const market = getSiloV3MarketEntry(chainId, lender);
   if (!market) return [() => void 0, 0];
@@ -18976,8 +18981,8 @@ var getSiloV3ReservesDataConverter = (lender, chainId, prices, additionalYields,
               silo: self.silo,
               counterpartySilo: other.silo,
               siloConfig: market.siloConfig,
-              oracle: self.solvencyOracle,
-              irm: self.interestRateModel,
+              oracle: self.solvencyOracle || ZERO_ADDRESS,
+              irm: self.interestRateModel || ZERO_ADDRESS,
               shareTokens: {
                 collateral: self.collateralShareToken,
                 protected: self.protectedShareToken,
@@ -19308,6 +19313,61 @@ query GetSilos {
   }
 }
 `;
+var liteQuery = (chainId, limit) => `
+query GetSilosLite {
+  silos(where: {chainId_in: [${chainId}]}, limit: ${limit}) {
+    items {
+      configAddress
+      protocol { protocolVersion }
+      market1 {
+        index
+        inputTokenId
+        supply
+        borrowed
+        supplyUsd
+        borrowedUsd
+        solvencyOracleAddress
+        solvencyOracle { quote quoteTokenId }
+      }
+      market2 {
+        index
+        inputTokenId
+        supply
+        borrowed
+        supplyUsd
+        borrowedUsd
+        solvencyOracleAddress
+        solvencyOracle { quote quoteTokenId }
+      }
+    }
+  }
+}
+`;
+async function fetchSiloMarketsLite(chainId, options) {
+  if (!SILO_API_SUPPORTED_CHAIN_IDS.has(chainId)) return [];
+  const limit = options?.limit ?? 500;
+  const response = await fetch(BASE_URL2, {
+    method: "POST",
+    headers: { "Content-Type": "application/json" },
+    body: JSON.stringify({ query: liteQuery(chainId, limit) })
+  });
+  if (!response.ok) {
+    throw new Error(
+      `[silo-api] Network error: ${response.status} - ${response.statusText}`
+    );
+  }
+  const payload = await response.json();
+  if (payload?.errors?.length) {
+    throw new Error(
+      `[silo-api] GraphQL error: ${payload.errors.map((e) => e?.message).join("; ")}`
+    );
+  }
+  const items = payload?.data?.silos?.items ?? [];
+  if (!options?.protocolVersion) return items;
+  return items.filter(
+    (s) => s.protocol?.protocolVersion === options.protocolVersion
+  );
+}
 async function fetchSiloMarkets(chainId, options) {
   if (!SILO_API_SUPPORTED_CHAIN_IDS.has(chainId)) return [];
   const limit = options?.limit ?? 500;
@@ -19474,6 +19534,7 @@ function safeLtvOrFee(api, field5, fallback) {
 }
 
 // src/lending/public-data/silo-v3/convertPublic.ts
+var ZERO_ADDRESS2 = "0x0000000000000000000000000000000000000000";
 function convertSiloV3MarketsToPublicResponse(apiItems, chainId, prices, additionalYields = {
   intrinsicYields: {},
   lenderRewards: {},
@@ -19571,8 +19632,8 @@ function convertSiloV3MarketsToPublicResponse(apiItems, chainId, prices, additio
             silo: self.silo.toLowerCase(),
             counterpartySilo: other.silo.toLowerCase(),
             siloConfig: registryEntry.siloConfig.toLowerCase(),
-            oracle: (api.solvencyOracleAddress ?? self.solvencyOracle).toLowerCase(),
-            irm: (api.interestRateModelId ?? self.interestRateModel).toLowerCase(),
+            oracle: (api.solvencyOracleAddress || self.solvencyOracle || ZERO_ADDRESS2).toLowerCase(),
+            irm: (api.interestRateModelId || self.interestRateModel || ZERO_ADDRESS2).toLowerCase(),
             shareTokens: {
               collateral: self.collateralShareToken,
               protected: self.protectedShareToken,
@@ -19777,40 +19838,46 @@ var getLenderPublicDataAll = async (chainId, lenders, prices, additionalYields,
   const lendersApi = lenders.filter(
     (l) => lenderApiOnly(l, chainId) || lenderApiWithOnChainFallback(l, chainId)
   );
-  const lendersOnChain = lenders.filter((l) => !lenderApiOnly(l, chainId));
-  const onChain = getLenderPublicData(
-    chainId,
-    lendersOnChain,
-    prices,
-    additionalYields,
-    multicallRetry,
-    tokenList
-  );
-  const api = getLenderPublicDataViaApi(
-    chainId,
-    lendersApi,
-    prices,
-    additionalYields,
-    tokenList,
-    includeUnlistedMorphoMarkets
-  );
-  const [onChainResult, apiResult] = await Promise.allSettled([
-    onChain,
-    api
-  ]);
-  const onChainRes = onChainResult.status === "fulfilled" ? onChainResult.value : {};
-  const apiRes = apiResult.status === "fulfilled" ? apiResult.value : {};
-  if (onChainResult.status === "rejected") {
-    console.warn(
-      `[lending] on-chain fetch failed for chain ${chainId}:`,
-      onChainResult.reason?.message ?? onChainResult.reason
-    );
+  let apiRes = {};
+  if (lendersApi.length > 0) {
+    try {
+      apiRes = await getLenderPublicDataViaApi(
+        chainId,
+        lendersApi,
+        prices,
+        additionalYields,
+        tokenList,
+        includeUnlistedMorphoMarkets
+      );
+    } catch (e) {
+      console.warn(
+        `[lending] API fetch failed for chain ${chainId}:`,
+        e?.message ?? e
+      );
+    }
   }
-  if (apiResult.status === "rejected") {
-    console.warn(
-      `[lending] API fetch failed for chain ${chainId}:`,
-      apiResult.reason?.message ?? apiResult.reason
-    );
+  const lendersOnChain = lenders.filter((l) => {
+    if (lenderApiOnly(l, chainId)) return false;
+    if (lenderApiWithOnChainFallback(l, chainId) && apiRes[l]) return false;
+    return true;
+  });
+  let onChainRes = {};
+  if (lendersOnChain.length > 0) {
+    try {
+      onChainRes = await getLenderPublicData(
+        chainId,
+        lendersOnChain,
+        prices,
+        additionalYields,
+        multicallRetry,
+        tokenList
+      );
+    } catch (e) {
+      console.warn(
+        `[lending] on-chain fetch failed for chain ${chainId}:`,
+        e?.message ?? e
+      );
+    }
   }
   return { ...onChainRes, ...apiRes };
 };
@@ -30462,7 +30529,7 @@ var SiloOracleAbi = [
     type: "function"
   }
 ];
-var ZERO_ADDRESS = "0x0000000000000000000000000000000000000000";
+var ZERO_ADDRESS3 = "0x0000000000000000000000000000000000000000";
 function lookupUSD(context, asset) {
   const lc = asset.toLowerCase();
   const groupKey = context.tokenList?.[lc]?.assetGroup ?? `${context.chainId}-${lc}`;
@@ -30474,7 +30541,7 @@ function getSiloV2Calls(chainId) {
   const tokensWithRealOracle = /* @__PURE__ */ new Set();
   for (const market of allMarkets) {
     for (const half of [market.silo0, market.silo1]) {
-      if (half.solvencyOracle && half.solvencyOracle !== ZERO_ADDRESS) {
+      if (half.solvencyOracle && half.solvencyOracle !== ZERO_ADDRESS3) {
         tokensWithRealOracle.add(half.token.toLowerCase());
       }
     }
@@ -30487,7 +30554,7 @@ function getSiloV2Calls(chainId) {
     const lenderKey = siloV2LenderKey(market.siloConfig);
     const halves = [market.silo0, market.silo1];
     const isStatic = halves.map(
-      (h) => !h.solvencyOracle || h.solvencyOracle === ZERO_ADDRESS
+      (h) => !h.solvencyOracle || h.solvencyOracle === ZERO_ADDRESS3
     );
     if (isStatic[0] && isStatic[1]) {
       const t0 = halves[0].token.toLowerCase();
@@ -30507,7 +30574,7 @@ function getSiloV2Calls(chainId) {
           decimals: half.decimals,
           silo: half.silo.toLowerCase(),
           lenderKey,
-          oracle: ZERO_ADDRESS,
+          oracle: ZERO_ADDRESS3,
           partnerToken: partnerLc,
           isStatic: true
         });
@@ -30635,7 +30702,7 @@ var SiloOracleAbi2 = [
     type: "function"
   }
 ];
-var ZERO_ADDRESS2 = "0x0000000000000000000000000000000000000000";
+var ZERO_ADDRESS4 = "0x0000000000000000000000000000000000000000";
 function lookupUSD2(context, asset) {
   const lc = asset.toLowerCase();
   const groupKey = context.tokenList?.[lc]?.assetGroup ?? `${context.chainId}-${lc}`;
@@ -30647,7 +30714,7 @@ function getSiloV3Calls(chainId) {
   const tokensWithRealOracle = /* @__PURE__ */ new Set();
   for (const market of allMarkets) {
     for (const half of [market.silo0, market.silo1]) {
-      if (half.solvencyOracle && half.solvencyOracle !== ZERO_ADDRESS2) {
+      if (half.solvencyOracle && half.solvencyOracle !== ZERO_ADDRESS4) {
         tokensWithRealOracle.add(half.token.toLowerCase());
       }
     }
@@ -30660,7 +30727,7 @@ function getSiloV3Calls(chainId) {
     const lenderKey = siloV3LenderKey(market.siloConfig);
     const halves = [market.silo0, market.silo1];
     const isStatic = halves.map(
-      (h) => !h.solvencyOracle || h.solvencyOracle === ZERO_ADDRESS2
+      (h) => !h.solvencyOracle || h.solvencyOracle === ZERO_ADDRESS4
     );
     if (isStatic[0] && isStatic[1]) {
       const t0 = halves[0].token.toLowerCase();
@@ -30680,7 +30747,7 @@ function getSiloV3Calls(chainId) {
           decimals: half.decimals,
           silo: half.silo.toLowerCase(),
           lenderKey,
-          oracle: ZERO_ADDRESS2,
+          oracle: ZERO_ADDRESS4,
           partnerToken: partnerLc,
           isStatic: true
         });
@@ -30792,7 +30859,7 @@ var siloV3Fetcher = {
 async function fetchSiloV2GraphQLMarkets(chainId) {
   if (!SILO_API_SUPPORTED_CHAIN_IDS.has(chainId)) return null;
   try {
-    const items = await fetchSiloMarkets(chainId, { protocolVersion: "v2" });
+    const items = await fetchSiloMarketsLite(chainId, { protocolVersion: "v2" });
     return items;
   } catch (e) {
     console.warn(
@@ -30813,7 +30880,7 @@ function lookupUSD3(context, asset) {
   return context.usdPrices[groupKey] ?? context.usdPrices[lc] ?? 0;
 }
 function parseSiloV2GraphQLResults(items, context) {
-  const ZERO_ADDRESS3 = "0x0000000000000000000000000000000000000000";
+  const ZERO_ADDRESS5 = "0x0000000000000000000000000000000000000000";
   const out = [];
   const seen = /* @__PURE__ */ new Set();
   for (const item of items) {
@@ -30836,8 +30903,8 @@ function parseSiloV2GraphQLResults(items, context) {
       const partnerTokenLc = other.token.toLowerCase();
       const dedupKey = `${lenderKey}:${tokenLc}`;
       if (seen.has(dedupKey)) continue;
-      const oracleAddr = (side.solvencyOracleAddress ?? side.solvencyOracle?.id ?? self.solvencyOracle ?? ZERO_ADDRESS3).toLowerCase();
-      const isStatic = !oracleAddr || oracleAddr === ZERO_ADDRESS3;
+      const oracleAddr = (side.solvencyOracleAddress ?? side.solvencyOracle?.id ?? self.solvencyOracle ?? ZERO_ADDRESS5).toLowerCase();
+      const isStatic = !oracleAddr || oracleAddr === ZERO_ADDRESS5;
       const siloAddrLc = self.silo.toLowerCase();
       try {
         let priceUSD = 0;
@@ -30891,7 +30958,7 @@ function parseSiloV2GraphQLResults(items, context) {
 async function fetchSiloV3GraphQLMarkets(chainId) {
   if (!SILO_API_SUPPORTED_CHAIN_IDS.has(chainId)) return null;
   try {
-    const items = await fetchSiloMarkets(chainId, { protocolVersion: "v3" });
+    const items = await fetchSiloMarketsLite(chainId, { protocolVersion: "v3" });
     return items;
   } catch (e) {
     console.warn(
@@ -30912,7 +30979,7 @@ function lookupUSD4(context, asset) {
   return context.usdPrices[groupKey] ?? context.usdPrices[lc] ?? 0;
 }
 function parseSiloV3GraphQLResults(items, context) {
-  const ZERO_ADDRESS3 = "0x0000000000000000000000000000000000000000";
+  const ZERO_ADDRESS5 = "0x0000000000000000000000000000000000000000";
   const out = [];
   const seen = /* @__PURE__ */ new Set();
   for (const item of items) {
@@ -30935,8 +31002,8 @@ function parseSiloV3GraphQLResults(items, context) {
       const partnerTokenLc = other.token.toLowerCase();
       const dedupKey = `${lenderKey}:${tokenLc}`;
       if (seen.has(dedupKey)) continue;
-      const oracleAddr = (side.solvencyOracleAddress ?? side.solvencyOracle?.id ?? self.solvencyOracle ?? ZERO_ADDRESS3).toLowerCase();
-      const isStatic = !oracleAddr || oracleAddr === ZERO_ADDRESS3;
+      const oracleAddr = (side.solvencyOracleAddress ?? side.solvencyOracle?.id ?? self.solvencyOracle ?? ZERO_ADDRESS5).toLowerCase();
+      const isStatic = !oracleAddr || oracleAddr === ZERO_ADDRESS5;
       const siloAddrLc = self.silo.toLowerCase();
       try {
         let priceUSD = 0;