@1delta/margin-fetcher 5.0.96 → 5.0.98

package/dist/index.js

@@ -50498,8 +50498,7 @@ var readVaults = async () => {
     (Date.now() / 1e3 - VAULT_EPOCH_ANCHOR.startTime) / NOMINAL_EPOCH_SECONDS
   );
   const probe = [];
-  for (let e = estimate - 6; e <= estimate + 6; e++) {
-    if (e - WINDOW >= 0) probe.push(e - WINDOW);
+  for (let e = estimate - 34; e <= estimate + 6; e++) {
     if (e >= 0) probe.push(e);
   }
   const epochs = [...new Set(probe)].sort((a, b) => a - b);
@@ -50516,7 +50515,6 @@ var readVaults = async () => {
     allowFailure: true
   });
   const aprs = {};
-  const cadences = [];
   BFUSD_VAULTS.forEach(({ address }, vi) => {
     const rows = /* @__PURE__ */ new Map();
     epochs.forEach((e, i) => {
@@ -50530,18 +50528,28 @@ var readVaults = async () => {
     if (!now || !then) return;
     const elapsed = Number(now.startTime - then.startTime);
     if (elapsed <= 0) return;
-    cadences.push(elapsed / WINDOW);
     const growth = Number(now.startRatio) / Number(then.startRatio) - 1;
     const apr = 100 * SECONDS_PER_YEAR13 * growth / elapsed;
     if (plausible(apr)) {
       aprs[bitfiYieldKey(Chain.ETHEREUM_MAINNET, address)] = apr;
     }
   });
-  const secondsPerEpoch = cadences.length ? cadences.reduce((a, b) => a + b, 0) / cadences.length : void 0;
-  const usable = secondsPerEpoch !== void 0 && secondsPerEpoch > 43200 && secondsPerEpoch < 259200;
-  return { aprs, secondsPerEpoch: usable ? secondsPerEpoch : void 0 };
+  return { aprs };
 };
-var readBfbtc = async (chain, address, secondsPerEpoch) => {
+var BITFI_APR_URL = "https://api-ext.bitfi.one/api/v1/external/apr";
+var fetchBitfiApiApr = async () => {
+  try {
+    const res = await fetch(BITFI_APR_URL, {
+      headers: { accept: "application/json" }
+    }).then((r) => r.json());
+    const frac = Number(res?.data?.["7e"]?.apr);
+    const apr = frac * 100;
+    return plausible(apr) && apr > 0 ? apr : void 0;
+  } catch {
+    return void 0;
+  }
+};
+var readBfbtc = async (chain, address, secondsPerEpoch, frozenFallbackApr) => {
   const [epochRaw] = await multicallRetryUniversal({
     chain,
     abi: RATIO_ABI,
@@ -50562,6 +50570,10 @@ var readBfbtc = async (chain, address, secondsPerEpoch) => {
   });
   if (typeof nowRaw !== "bigint" || typeof thenRaw !== "bigint") return {};
   if (nowRaw <= 0n || thenRaw <= 0n) return {};
+  if (nowRaw === thenRaw) {
+    const apiApr = await frozenFallbackApr();
+    return apiApr !== void 0 ? { [bitfiYieldKey(chain, address)]: apiApr } : { [bitfiYieldKey(chain, address)]: 0 };
+  }
   const growth = Number(thenRaw) / Number(nowRaw) - 1;
   const apr = 100 * SECONDS_PER_YEAR13 * growth / (WINDOW * secondsPerEpoch);
   return plausible(apr) ? { [bitfiYieldKey(chain, address)]: apr } : {};
@@ -50569,11 +50581,13 @@ var readBfbtc = async (chain, address, secondsPerEpoch) => {
 var bitfiFetcher = {
   label: "BITFI",
   fetch: async () => {
-    const { aprs, secondsPerEpoch } = await readVaults();
-    const clock = secondsPerEpoch ?? NOMINAL_EPOCH_SECONDS;
+    const { aprs } = await readVaults();
+    const clock = NOMINAL_EPOCH_SECONDS;
+    let apiApr;
+    const frozenFallbackApr = () => apiApr ??= fetchBitfiApiApr();
     const perChain = await Promise.all(
       BFBTC_DEPLOYMENTS.map(
-        ({ chain, address }) => readBfbtc(chain, address, clock).catch(() => ({}))
+        ({ chain, address }) => readBfbtc(chain, address, clock, frozenFallbackApr).catch(() => ({}))
       )
     );
     const out = { ...aprs };