@1delta/margin-fetcher 0.0.332 → 0.0.333

package/dist/index.js

@@ -21260,6 +21260,7 @@ function convertMidnightMarketsToResponse(raw, chainId, prices = {}, _additional
       utilization: 0,
       depositRate: supplyAprPct,
       variableBorrowRate: borrowAprPct,
+      rateModel: "fixedTerm",
       // Midnight is fixed-rate: expose the fixed borrow APR on stableBorrowRate
       // too, so fixed-rate consumers pick it up like a term product.
       stableBorrowRate: borrowAprPct,
@@ -21689,7 +21690,11 @@ function currencyFor2(address, decimals, tokens) {
   const lower = address.toLowerCase();
   return tokens[lower] ?? { address: lower, symbol: "", name: "", decimals };
 }
-function convertTermMarketsToResponse(raw, chainId, prices = {}, _additionalYields = { intrinsicYields: {}, lenderRewards: {}, loaded: true }, tokens = {}) {
+function convertTermMarketsToResponse(raw, chainId, prices = {}, _additionalYields = {
+  intrinsicYields: {},
+  lenderRewards: {},
+  loaded: true
+}, tokens = {}) {
   const out = {};
   const now = nowSec2();
   for (const { config, top, book } of raw) {
@@ -21735,6 +21740,7 @@ function convertTermMarketsToResponse(raw, chainId, prices = {}, _additionalYiel
       utilization: 0,
       depositRate: supplyAprPct,
       variableBorrowRate: borrowAprPct,
+      rateModel: "fixedTerm",
       // Term is fixed-rate: mirror the fixed borrow APR on stableBorrowRate too.
       stableBorrowRate: borrowAprPct,
       intrinsicYield: 0,
@@ -21994,6 +22000,7 @@ function convertExactlyMarketsToResponse(raw, chainId, prices = {}, _additionalY
         m.floatingAssets
       ),
       variableBorrowRate: exactlyWadRateToPercent(m.floatingBorrowRate),
+      rateModel: "fixedTerm",
       // Fixed-rate lender convention (Term/Lista): best fixed borrow APR on the
       // stable slot; the full per-maturity menu is params.market.terms.
       stableBorrowRate: bestFixedBorrowApr,
@@ -22296,6 +22303,11 @@ function convertLiquityMarketsToResponse(raw, chainId, prices = {}, _additionalY
       depositRate: spApr * 100,
       variableBorrowRate: avgRate * 100,
       stableBorrowRate: 0,
+      // Borrower picks the per-trove rate; the one-off upfront fee is the
+      // branch avg rate applied over the upfront period (7d vanilla), as a
+      // percent of the borrowed amount.
+      rateModel: "userSet",
+      originationFee: avgRate * (Number(cfg.upfrontInterestPeriodSeconds ?? 604800) / 31536e3) * 100,
       intrinsicYield: 0,
       rewards: void 0,
       decimals: stableDecimals,
@@ -22378,7 +22390,7 @@ function convertLiquityMarketsToResponse(raw, chainId, prices = {}, _additionalY
   }
   return out;
 }
-var READS_PER_TM = 5;
+var READS_PER_TM = 6;
 var RIVER_PUBLIC_READ_ABI = [
   ...RiverTroveManagerAbi,
   ...RiverStabilityPoolAbi
@@ -22401,6 +22413,7 @@ async function fetchRiverMarkets(lender, chainId) {
         name: "getBorrowingRateWithDecay",
         params: []
       },
+      { address: m.troveManager, name: "interestRate", params: [] },
       { address: m.troveManager, name: "fetchPrice", params: [] },
       { address: m.troveManager, name: "getTroveOwnersCount", params: [] }
     ])
@@ -22429,8 +22442,9 @@ async function fetchRiverMarkets(lender, chainId) {
       entireDebt: val(base),
       entireColl: val(base + 1),
       mintFeeRate: val(base + 2),
-      price: val(base + 3),
-      troveCount: val(base + 4)
+      interestRate: val(base + 3),
+      price: val(base + 4),
+      troveCount: val(base + 5)
     };
   });
   return { lender, config, chainData, spDeposits: val(0), markets: out };
@@ -22563,8 +22577,18 @@ function convertRiverMarketsToResponse(raw, chainId, prices = {}, _additionalYie
       // No interest yield while the protocol rate is 0% — SP earns
       // liquidation gains + OSHI emissions only (not modeled here).
       depositRate: 0,
-      variableBorrowRate: market.interestRate ? Number(market.interestRate) : 0,
+      // Ongoing annual borrow rate as a PERCENT (WAD → %). Live on-chain
+      // `interestRate()` preferred, metadata snapshot as fallback. River
+      // (Satoshi, Prisma lineage) runs at 0% everywhere today — the real
+      // borrow cost is the one-off decaying MINT FEE, surfaced separately as
+      // `params.market.river.mintFeeRate` (it is not an APR, so it never
+      // belongs in this field).
+      variableBorrowRate: Number(m.interestRate ?? market.interestRate ?? 0) / WAD7 * 100,
       stableBorrowRate: 0,
+      // River (Satoshi) has NO ongoing interest — the borrow cost is the
+      // one-off decaying mint fee (`getBorrowingRateWithDecay`, WAD → percent).
+      rateModel: "zeroInterest",
+      originationFee: m.mintFeeRate !== null ? Number(m.mintFeeRate) / WAD7 * 100 : void 0,
       intrinsicYield: 0,
       rewards: void 0,
       decimals: debtDecimals,
@@ -22613,7 +22637,8 @@ function convertRiverMarketsToResponse(raw, chainId, prices = {}, _additionalYie
           mintFeeCap: market.maxBorrowingFee,
           /** Current decayed one-off mint-fee rate (WAD string). */
           mintFeeRate: m.mintFeeRate !== null ? m.mintFeeRate.toString() : void 0,
-          interestRate: market.interestRate,
+          /** Ongoing annual interest rate (WAD string) — live on-chain, metadata fallback. */
+          interestRate: m.interestRate !== null ? m.interestRate.toString() : market.interestRate,
           maxSystemDebt: market.maxSystemDebt,
           paused: !!market.paused,
           sunsetting: !!market.sunsetting,