@1delta/margin-fetcher 0.0.330 → 0.0.331

package/dist/index.js

@@ -22101,15 +22101,16 @@ async function fetchLiquityMarkets(lender, chainId) {
   });
   return { lender, config, branches: out };
 }
-function liquityLenderKey(lender, collIndex) {
-  return `${lender}_${collIndex}`;
+function liquityLenderKey(lender, chainId, collIndex) {
+  return `${lender}_${chainId}_${collIndex}`;
 }
 function liquityKeyParts(key) {
-  const base = LIQUITY_FAMILY_LENDERS.find((b) => key.startsWith(b));
+  const base = LIQUITY_FAMILY_LENDERS.find((b) => key.startsWith(b + "_"));
   if (!base) return void 0;
   const suffix = key.slice(base.length + 1);
-  if (!/^\d+$/.test(suffix)) return void 0;
-  return { lender: base, collIndex: Number(suffix) };
+  const m = suffix.match(/^(\d+)_(\d+)$/);
+  if (!m) return void 0;
+  return { lender: base, chainId: m[1], collIndex: Number(m[2]) };
 }
 var WAD6 = 1e18;
 function toHuman2(raw, decimals) {
@@ -22136,7 +22137,7 @@ function convertLiquityMarketsToResponse(raw, chainId, prices = {}, _additionalY
   const spYieldSplit = cfg.spYieldSplit ? Number(cfg.spYieldSplit) / WAD6 : 0.75;
   for (const b of raw.branches ?? []) {
     const branch = b.branch;
-    const lenderKey = liquityLenderKey(raw.lender, branch.collIndex);
+    const lenderKey = liquityLenderKey(raw.lender, chainId, branch.collIndex);
     const collAddr = branch.collToken.toLowerCase();
     const collDecimals = branch.collDecimals;
     const collToken = tokens[collAddr];
@@ -22371,14 +22372,15 @@ async function fetchRiverMarkets(lender, chainId) {
 }
 
 // src/lending/public-data/river/convertPublic.ts
-function riverLenderKey(lender, index) {
-  return `${lender}_${index}`;
+function riverLenderKey(lender, chainId, index) {
+  return `${lender}_${chainId}_${index}`;
 }
 function riverKeyParts(key) {
   if (!key.startsWith("RIVER_")) return void 0;
   const suffix = key.slice("RIVER_".length);
-  if (!/^\d+$/.test(suffix)) return void 0;
-  return { lender: "RIVER", index: Number(suffix) };
+  const m = suffix.match(/^(\d+)_(\d+)$/);
+  if (!m) return void 0;
+  return { lender: "RIVER", chainId: m[1], index: Number(m[2]) };
 }
 var WAD7 = 1e18;
 function toHuman3(raw, decimals) {
@@ -22406,7 +22408,7 @@ function convertRiverMarketsToResponse(raw, chainId, prices = {}, _additionalYie
   const spDeposits = raw.spDeposits !== null ? toHuman3(raw.spDeposits, debtDecimals) : 0;
   for (const m of raw.markets ?? []) {
     const market = m.market;
-    const lenderKey = riverLenderKey(raw.lender, market.index);
+    const lenderKey = riverLenderKey(raw.lender, chainId, market.index);
     const collAddr = market.collToken.toLowerCase();
     const collDecimals = market.collDecimals;
     const collToken = tokens[collAddr];
@@ -26911,13 +26913,19 @@ var getExactlyUserDataConverter = (_lender, chainId, account, meta) => {
         const loanDisplayPrice = loanMeta ? getDisplayPrice(loanMeta) : 0;
         const loanOraclePrice = loanMeta ? getOraclePrice(loanMeta) : 0;
         const loanPriceHist = loanMeta?.price?.priceUsd24h ?? loanDisplayPrice;
+        const fixedDebtUnits = sumPreview(m.fixedBorrowPositions);
         const depositUnits = m.floatingDepositAssets + sumPreview(m.fixedDepositPositions);
-        const debtUnits = m.floatingBorrowAssets + sumPreview(m.fixedBorrowPositions);
+        const debtUnits = m.floatingBorrowAssets + fixedDebtUnits;
         if (depositUnits === 0n && debtUnits === 0n) continue;
         const depositsStr = parseRawAmount(depositUnits.toString(), decimals);
         const depositsNum = Number(depositsStr);
         const debtStr = parseRawAmount(debtUnits.toString(), decimals);
         const debtNum = Number(debtStr);
+        const floatingDebtStr = parseRawAmount(
+          m.floatingBorrowAssets.toString(),
+          decimals
+        );
+        const fixedDebtStr = parseRawAmount(fixedDebtUnits.toString(), decimals);
         const fixedPositions = [
           ...toDetail(m.fixedDepositPositions, "deposit", now),
           ...toDetail(m.fixedBorrowPositions, "borrow", now)
@@ -26928,14 +26936,14 @@ var getExactlyUserDataConverter = (_lender, chainId, account, meta) => {
           marketUid: loanUid,
           underlying: assetAddr,
           deposits: depositsStr,
-          debt: debtStr,
-          debtStable: "0",
+          debt: floatingDebtStr,
+          debtStable: fixedDebtStr,
           depositsUSD: depositsNum * loanDisplayPrice,
-          debtUSD: debtNum * loanDisplayPrice,
-          debtStableUSD: 0,
+          debtUSD: Number(floatingDebtStr) * loanDisplayPrice,
+          debtStableUSD: Number(fixedDebtStr) * loanDisplayPrice,
           depositsUSDOracle: depositsNum * loanOraclePrice,
-          debtUSDOracle: debtNum * loanOraclePrice,
-          debtStableUSDOracle: 0,
+          debtUSDOracle: Number(floatingDebtStr) * loanOraclePrice,
+          debtStableUSDOracle: Number(fixedDebtStr) * loanOraclePrice,
           stableBorrowRate: "0",
           collateralEnabled: m.isCollateral,
           claimableRewards: 0,
@@ -26943,6 +26951,38 @@ var getExactlyUserDataConverter = (_lender, chainId, account, meta) => {
           // multi-account state builder mutates posData in place).
           fixedPositions: fixedPositions.length > 0 ? fixedPositions : void 0
         };
+        for (const p of m.fixedBorrowPositions) {
+          const maturity = Number(p.maturity);
+          const trancheStr = parseRawAmount(p.previewValue.toString(), decimals);
+          posData[`${loanUid}#${maturity}`] = {
+            marketUid: loanUid,
+            underlying: assetAddr,
+            loanId: String(maturity),
+            deposits: "0",
+            debt: "0",
+            debtStable: trancheStr,
+            depositsUSD: 0,
+            debtUSD: 0,
+            debtStableUSD: Number(trancheStr) * loanDisplayPrice,
+            depositsUSDOracle: 0,
+            debtUSDOracle: 0,
+            debtStableUSDOracle: Number(trancheStr) * loanOraclePrice,
+            collateralEnabled: false,
+            claimableRewards: 0,
+            term: {
+              loanId: String(maturity),
+              termId: maturity,
+              isDynamic: false,
+              debt: trancheStr,
+              maturity,
+              accruedInterest: parseRawAmount(
+                p.position.fee.toString(),
+                decimals
+              ),
+              isMatured: maturity < now
+            }
+          };
+        }
         if (debtUnits > 0n) {
           for (const c of markets) {
             if (c.market.toLowerCase() === m.market.toLowerCase()) continue;
@@ -27030,7 +27070,7 @@ var getLiquityUserDataConverter = (lender, chainId, account, meta) => {
         const callCount = liquityBranchCallCount(branch, troves.length);
         const slice = data.slice(cursor, cursor + callCount);
         cursor += callCount;
-        const lenderKey = liquityLenderKey(lender, branch.collIndex);
+        const lenderKey = liquityLenderKey(lender, chainId, branch.collIndex);
         const metaMap = meta?.[lenderKey];
         if (!metaMap) return;
         const collAddr = branch.collToken.toLowerCase();
@@ -27237,7 +27277,7 @@ var getRiverUserDataConverter = (lender, chainId, account, meta) => {
         const entire = data[base];
         const status = Number(big2(data[base + 1]));
         const surplus = big2(data[base + 2]);
-        const lenderKey = riverLenderKey(lender, market.index);
+        const lenderKey = riverLenderKey(lender, chainId, market.index);
         const metaMap = meta?.[lenderKey];
         if (!metaMap) return;
         const collAddr = market.collToken.toLowerCase();