@1delta/margin-fetcher 0.0.306 → 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
       });
     }
   }