@1delta/margin-fetcher 0.0.216 → 0.0.217

package/dist/index.js

@@ -6275,6 +6275,7 @@ globalThis[GLOBAL_LENDER_DATA_KEY] = {
   compoundV3Bulker: {},
   eulerConfigs: {},
   eulerVaults: {},
+  aaveV4Hubs: {},
   aaveV4Spokes: {},
   aaveV4Reserves: {},
   aaveV4Oracles: {}
@@ -6302,6 +6303,7 @@ var initConfig = () => getGlobalData2()?.initConfig;
 var aaveOraclesConfig = () => getGlobalData2()?.aaveOraclesConfig;
 var eulerConfigs = () => getGlobalData2()?.eulerConfigs;
 var eulerVaults = () => getGlobalData2()?.eulerVaults;
+var aaveV4Hubs = () => getGlobalData2()?.aaveV4Hubs;
 var aaveV4Spokes = () => getGlobalData2()?.aaveV4Spokes;
 var aaveV4Reserves = () => getGlobalData2()?.aaveV4Reserves;
 var aaveV4Oracles = () => getGlobalData2()?.aaveV4Oracles;
@@ -12104,7 +12106,9 @@ function convertMarketsToMorphoResponse(response, chainId, additionalYields = {
   loaded: true
 }, tokens = {}) {
   const data = {};
-  response.markets.items.forEach((market) => {
+  const items = response?.markets?.items;
+  if (!items) return data;
+  items.forEach((market) => {
     const {
       uniqueKey,
       lltv,
@@ -18062,13 +18066,17 @@ function rayRateToApr(rateRay) {
   if (rateRay === 0n) return 0;
   return Number(rateRay) / RAY2 * 100;
 }
-function normalizeAaveV4(spokeDataList, chainId, lender, prices, additionalYields, tokenList, lenderShortNameFn, createMarketUidFn, toOracleKeyFn, toGenericPriceKeyFn) {
+function normalizeAaveV4(spokeDataList, chainId, lender, prices, additionalYields, tokenList, lenderShortNameFn, createMarketUidFn, toOracleKeyFn, toGenericPriceKeyFn, expectedHub) {
   const data = {};
   const eModes = {};
+  const hubFilter = expectedHub?.toLowerCase();
   for (const spokeData of spokeDataList) {
     const spokeAddr = spokeData.spoke.toLowerCase();
     const spokeReserves = spokeData.reserves;
     for (const reserve of spokeReserves) {
+      const reserveHub = reserve.reserve.hub?.toLowerCase();
+      if (hubFilter && reserveHub && reserveHub !== hubFilter)
+        continue;
       for (const [keyStr, dynCfg] of Object.entries(
         reserve.dynamicConfigs
       )) {
@@ -18085,6 +18093,9 @@ function normalizeAaveV4(spokeDataList, chainId, lender, prices, additionalYield
       }
     }
     for (const reserve of spokeReserves) {
+      const reserveHub = reserve.reserve.hub?.toLowerCase();
+      if (hubFilter && reserveHub && reserveHub !== hubFilter)
+        continue;
       const underlying = reserve.reserve.underlying.toLowerCase();
       const decimals = reserve.reserve.decimals;
       const hubAddr = reserve.reserve.hub.toLowerCase();
@@ -18385,6 +18396,8 @@ var getAaveV4ReservesDataConverter = (lender, chainId, prices, additionalYields,
         }
       }
     }
+    const hubEntry = aaveV4Hubs()?.[lender]?.[chainId];
+    const expectedHub = hubEntry?.hub;
     return normalizeAaveV4(
       spokeDataList,
       chainId,
@@ -18395,7 +18408,8 @@ var getAaveV4ReservesDataConverter = (lender, chainId, prices, additionalYields,
       lenderShortName,
       createMarketUid,
       toOracleKey,
-      toGenericPriceKey
+      toGenericPriceKey,
+      expectedHub
     );
   };
   return [converter, expectedCalls];
@@ -27621,34 +27635,18 @@ var yusdFetcher = {
 };
 
 // src/yields/intrinsic/fetchers/resolv.ts
-var RLP_URL = "https://api.resolv.xyz/apr/rlp/7d";
-var WSTUSR_URL = "https://api.resolv.xyz/apr/staking/7d";
 var rlp = "Resolv RLP::RLP";
 var wstusr = "Resolv wstUSR::WSTUSR";
 var rlpFetcher = {
   label: "RLP",
   fetch: async () => {
-    const res = await fetch(RLP_URL, {
-      method: "GET",
-      headers: {
-        Accept: "application/json",
-        "User-Agent": "1delta/yields"
-      }
-    }).then((r) => r.json());
-    return { [rlp]: Number(res?.value ?? 0) * 100 };
+    return { [rlp]: 0 };
   }
 };
 var wstusrFetcher = {
   label: "WSTUSR",
   fetch: async () => {
-    const res = await fetch(WSTUSR_URL, {
-      method: "GET",
-      headers: {
-        Accept: "application/json",
-        "User-Agent": "1delta/yields"
-      }
-    }).then((r) => r.json());
-    return { [wstusr]: Number(res?.value ?? 0) * 100 };
+    return { [wstusr]: 0 };
   }
 };
 
@@ -27865,7 +27863,7 @@ var susdxFetcher = {
 };
 
 // src/yields/intrinsic/fetchers/reserve.ts
-var RTOKENS_URL = "https://yields.reserve.org/pools";
+var RTOKENS_URL = "https://yields.reserve.org";
 var hyUSD = "High Yield USD Base::HYUSD";
 var bsdETH = "Based ETH::BSDETH";
 var ethPlus = "ETHPlus::ETH+";
@@ -27878,18 +27876,18 @@ var rtokensFetcher = {
   label: "RTOKENS",
   fetch: async () => {
     const res = await fetch(RTOKENS_URL).then((r) => r.json());
-    const data = res.rtokens["8453"];
-    const dataMainnet = res.rtokens["1"];
-    const dataMainnetColalterals = res.collaterals["1"];
+    const data = res?.rtokens?.["8453"];
+    const dataMainnet = res?.rtokens?.["1"];
+    const dataMainnetColalterals = res?.collaterals?.["1"];
     return {
-      [bsdETH]: apyToAprPercent(data.bsdETH / 100) * 100,
-      [hyUSD]: apyToAprPercent(data.hyUSD / 100) * 100,
-      [sfrxeth]: apyToAprPercent(dataMainnetColalterals.sfrxeth / 100) * 100,
-      [sfrax]: apyToAprPercent(dataMainnetColalterals.sfrax / 100) * 100,
-      [ceth]: apyToAprPercent(dataMainnetColalterals.ceth / 100) * 100,
-      [ethPlus]: apyToAprPercent(dataMainnet["ETH+"] / 100) * 100,
-      [usdThree]: apyToAprPercent(dataMainnet["USD3"] / 100) * 100,
-      [woEth]: apyToAprPercent(dataMainnetColalterals.woeth / 100) * 100
+      [bsdETH]: apyToAprPercent((data?.bsdETH ?? 0) / 100) * 100,
+      [hyUSD]: apyToAprPercent((data?.hyUSD ?? 0) / 100) * 100,
+      [sfrxeth]: apyToAprPercent((dataMainnetColalterals?.sfrxeth ?? 0) / 100) * 100,
+      [sfrax]: apyToAprPercent((dataMainnetColalterals?.sfrax ?? 0) / 100) * 100,
+      [ceth]: apyToAprPercent((dataMainnetColalterals?.ceth ?? 0) / 100) * 100,
+      [ethPlus]: apyToAprPercent((dataMainnet?.["ETH+"] ?? 0) / 100) * 100,
+      [usdThree]: apyToAprPercent((dataMainnet?.["USD3"] ?? 0) / 100) * 100,
+      [woEth]: apyToAprPercent((dataMainnetColalterals?.woeth ?? 0) / 100) * 100
     };
   }
 };