@1delta/margin-fetcher 0.0.305 → 0.0.307

package/dist/index.js

@@ -11413,7 +11413,9 @@ function createBaseTypeUserState(payload, lenderData, totalDeposits24h = 0, tota
       collateralAllActive += (userConfigForAsset?.collateralFactor ?? 1) * depositsUSDOracle;
     }
     depositInterest += depositRate * depositsUSD;
-    borrowInterest += debtStableUSD * stableBorrowRate + debtUSD * variableBorrowRate;
+    const posStableRate = Number(pos.stableBorrowRate);
+    const effStableBorrowRate = Number.isFinite(posStableRate) && posStableRate > 0 ? posStableRate : stableBorrowRate;
+    borrowInterest += debtStableUSD * effStableBorrowRate + debtUSD * variableBorrowRate;
   }
   const nav = deposits - debt;
   const balanceData2 = {
@@ -23177,10 +23179,12 @@ function createMorphoEntryFromMarketWithLens(balanceInfo, metaMap, chainId, lend
       };
     };
     let sumFixedRaw = 0n;
+    let weightedAprNumerator = 0;
     for (const loan of brokerData.fixedLoans) {
       const trancheRaw = BigInt(loan.outstanding) + BigInt(loan.accruedInterest);
       sumFixedRaw += trancheRaw;
       const trancheToken = parseRawAmount(trancheRaw.toString(), loanDecimals);
+      weightedAprNumerator += Number(trancheToken) * loan.apr;
       mkTermPosition(`${loanMarketUid}#${loan.posId}`, trancheToken, {
         loanId: loan.posId,
         termId: loan.termId,
@@ -23203,12 +23207,18 @@ function createMorphoEntryFromMarketWithLens(balanceInfo, metaMap, chainId, lend
     dataForLoanAsset.debtStable = fixedToken;
     dataForLoanAsset.debtStableUSD = Number(fixedToken) * priceLoan;
     dataForLoanAsset.debtStableUSDOracle = Number(fixedToken) * oraclePriceLoan;
+    const fixedTokenNum = Number(fixedToken);
+    dataForLoanAsset.stableBorrowRate = fixedTokenNum > 0 ? (weightedAprNumerator / fixedTokenNum).toString() : "0";
     aggregateDebtToken = parseRawAmount(totalRaw.toString(), loanDecimals);
     if (dynRaw > 0n) {
       mkTermPosition(`${loanMarketUid}#dynamic`, dynToken, {
         loanId: LISTA_DYNAMIC_LOAN_ID,
         isDynamic: true,
-        debt: dynToken
+        debt: dynToken,
+        // the flexible loan accrues at the underlying Moolah market's variable borrow rate
+        // (PERCENT). Expired fixed positions refinance into this dynamic loan, so without
+        // this the migrated debt would (incorrectly) report a 0% borrow rate.
+        apr: loanAssetMeta?.variableBorrowRate ?? 0
       });
     }
   }
@@ -38153,7 +38163,7 @@ function computeWeightedSupplyApy(strategies, totalAssetsRaw, feePercent, evkInd
   }
   if (weightedRay === ZERO) return 0;
   const apyRayPerAsset = weightedRay / totalAssets;
-  const grossPercent = Number(apyRayPerAsset) / RAY_TO_PERCENT3;
+  const grossPercent = apyToAprPercent(Number(apyRayPerAsset) / RAY_TO_PERCENT3);
   const netPercent = grossPercent * (1 - feePercent / 100);
   return Number.isFinite(netPercent) ? netPercent : 0;
 }
@@ -38327,18 +38337,6 @@ async function fetchEulerEarnVaultsFromSubgraph(chainId, prices = {}, tokenList
 var EULER_DATA_API_BASE2 = "https://v3.euler.finance/v3";
 var API_TIMEOUT_MS = 1e4;
 var DETAIL_CONCURRENCY = 8;
-var BLOCK_TIME_SEC = {
-  "1": 12,
-  "56": 0.75,
-  "130": 1,
-  "146": 0.5,
-  "8453": 2,
-  "1923": 2,
-  "42161": 0.25,
-  "43114": 2
-};
-var DEFAULT_BLOCK_TIME_SEC = 2;
-var MAX_LAG_SECONDS = 30 * 60;
 function safeBigInt2(v) {
   if (v == null || v === "") return 0n;
   try {
@@ -38366,37 +38364,6 @@ async function getJson(url) {
     clearTimeout(timer);
   }
 }
-async function isEulerEarnSubgraphStale(chainId, subgraphUrl) {
-  const [subHead, chainHead] = await Promise.all([
-    fetchSubgraphHead(subgraphUrl),
-    getEvmClientUniversal({ chain: chainId, rpcId: 0 }).getBlockNumber().then((b) => Number(b)).catch(() => null)
-  ]);
-  if (subHead == null || chainHead == null) return true;
-  const lagBlocks = chainHead - subHead;
-  if (lagBlocks <= 0) return false;
-  const lagSeconds = lagBlocks * (BLOCK_TIME_SEC[chainId] ?? DEFAULT_BLOCK_TIME_SEC);
-  return lagSeconds > MAX_LAG_SECONDS;
-}
-async function fetchSubgraphHead(subgraphUrl) {
-  const controller = new AbortController();
-  const timer = setTimeout(() => controller.abort(), API_TIMEOUT_MS);
-  try {
-    const res = await fetch(subgraphUrl, {
-      method: "POST",
-      headers: { "Content-Type": "application/json" },
-      body: JSON.stringify({ query: "{ _meta { block { number } } }" }),
-      signal: controller.signal
-    });
-    if (!res.ok) return null;
-    const json = await res.json();
-    const n = json?.data?._meta?.block?.number;
-    return typeof n === "number" ? n : null;
-  } catch {
-    return null;
-  } finally {
-    clearTimeout(timer);
-  }
-}
 function mapApiDetail(d, chainId, prices, tokenList) {
   const address = (d.address ?? "").toLowerCase();
   const underlying = (d.asset?.address ?? "").toLowerCase();
@@ -38498,20 +38465,21 @@ async function fetchEulerEarnVaultsFromApi(chainId, prices = {}, tokenList = {})
 // src/vaults/euler-earn/fetchPublic.ts
 var isNonEmpty = (v) => !!v && Object.keys(v).length > 0;
 var fetchEulerEarnVaults = async (chainId, prices = {}, tokenList = {}, multicallRetry) => {
-  const subgraphUrl = getEulerEarnSubgraphUrl(chainId);
-  if (!subgraphUrl) {
-    return await fetchEulerEarnVaultsFromApi(chainId, prices, tokenList) ?? {};
-  }
-  const [stale, subgraph] = await Promise.all([
-    isEulerEarnSubgraphStale(chainId, subgraphUrl).catch(() => false),
-    fetchEulerEarnVaultsFromSubgraph(chainId, prices, tokenList, multicallRetry).then((r) => ({ ok: true, data: r })).catch(() => ({ ok: false, data: void 0 }))
-  ]);
-  if (!stale && subgraph.ok && isNonEmpty(subgraph.data)) {
-    return subgraph.data;
-  }
-  const fromApi = await fetchEulerEarnVaultsFromApi(chainId, prices, tokenList);
+  const fromApi = await fetchEulerEarnVaultsFromApi(
+    chainId,
+    prices,
+    tokenList
+  ).catch(() => void 0);
   if (isNonEmpty(fromApi)) return fromApi;
-  return subgraph.ok && subgraph.data ? subgraph.data : {};
+  const subgraphUrl = getEulerEarnSubgraphUrl(chainId);
+  if (!subgraphUrl) return fromApi ?? {};
+  const fromSubgraph = await fetchEulerEarnVaultsFromSubgraph(
+    chainId,
+    prices,
+    tokenList,
+    multicallRetry
+  ).catch(() => void 0);
+  return isNonEmpty(fromSubgraph) ? fromSubgraph : fromApi ?? {};
 };
 var CHAIN_ID4 = "1";
 var SWBTC = "0x8db2350d78abc13f5673a411d4700bcf87864dde";