@1delta/margin-fetcher 0.0.334 → 0.0.335

package/dist/index.js

@@ -21300,20 +21300,25 @@ function convertMidnightMarketsToResponse(raw, chainId, prices = {}, _additional
       const cursor = toBigIntOr0(c.liquidationCursor);
       const liquidationPenalty = cursor > 0n ? midnightLiquidationPenaltyNumber(toBigIntOr0(c.lltv), cursor) : liquidationPenaltyFromLltv(ltv);
       const collUid = createMarketUid(chainId, m, collAddr);
+      const collAsset = tokens[collAddr];
+      const collKey = toOracleKey(collAsset?.assetGroup) || toGenericPriceKey(collAddr, chainId);
+      const collPrice = prices[collKey] ?? 0;
+      const collCapacityUSD = ltv > 0 ? borrowLiquidity * loanPrice / ltv : borrowLiquidity * loanPrice;
+      const collCapacity = collPrice > 0 ? collCapacityUSD / collPrice : 0;
       entry.data[collUid] = {
         marketUid: collUid,
         name: "Collateral " + (tokens[collAddr]?.symbol ?? ""),
         poolId: collAddr,
         underlying: collAddr,
         asset: currencyFor(collAddr, c.decimals, tokens),
-        totalDeposits: 0,
+        totalDeposits: collCapacity,
         totalDebtStable: 0,
         totalDebt: 0,
-        totalLiquidity: 0,
+        totalLiquidity: collCapacity,
         borrowLiquidity: 0,
-        totalLiquidityUSD: 0,
+        totalLiquidityUSD: collCapacityUSD,
         borrowLiquidityUSD: 0,
-        totalDepositsUSD: 0,
+        totalDepositsUSD: collCapacityUSD,
         totalDebtStableUSD: 0,
         totalDebtUSD: 0,
         utilization: 0,
@@ -22661,7 +22666,7 @@ function convertRiverMarketsToResponse(raw, chainId, prices = {}, _additionalYie
   }
   return out;
 }
-var READS_PER_POOL = 6;
+var READS_PER_POOL = 7;
 var READS_PER_MARKET = 2;
 async function fetchTellerMarkets(chainId) {
   const pools = tellerPoolsByChain(chainId);
@@ -22679,7 +22684,12 @@ async function fetchTellerMarkets(chainId) {
         params: [onePrincipal]
       },
       { address: p.pool, name: "getMaxLoanDuration", params: [] },
-      { address: p.pool, name: "getMarketId", params: [] }
+      { address: p.pool, name: "getMarketId", params: [] },
+      // ERC-4626 CURRENT principal TVL (V2/V3). `totalPrincipalTokensCommitted`
+      // is a CUMULATIVE lifetime counter, NOT the current balance — using it
+      // overstates deposits by orders of magnitude. `totalAssets` reverts on V1
+      // Smart pools (→ null), where we fall back to the committed counter.
+      { address: p.pool, name: "totalAssets", params: [] }
     ];
   });
   let results = [];
@@ -22719,7 +22729,8 @@ async function fetchTellerMarkets(chainId) {
       minRateBps: num6(base + 2),
       collateralPerPrincipal: big4(base + 3),
       maxLoanDuration: num6(base + 4),
-      marketId: big4(base + 5)
+      marketId: big4(base + 5),
+      totalAssets: big4(base + 6)
     };
   });
   const attByMarket = /* @__PURE__ */ new Map();
@@ -22822,7 +22833,10 @@ function convertTellerMarketsToResponse(raw, chainId, prices = {}, _additionalYi
     const principalPrice = priceFor(principalAddr, chainId, tokens, prices);
     const collateralPrice = priceFor(collateralAddr, chainId, tokens, prices);
     const borrowLiquidity = tellerToHuman(p.available, cfg.principalDecimals);
-    const totalDeposits = tellerToHuman(p.committed, cfg.principalDecimals);
+    const totalDeposits = tellerToHuman(
+      p.totalAssets ?? p.committed,
+      cfg.principalDecimals
+    );
     const totalDebt = Math.max(0, totalDeposits - borrowLiquidity);
     const utilization = totalDeposits > 0 ? totalDebt / totalDeposits : 0;
     const borrowApr = tellerBpsToPercent(p.minRateBps);
@@ -39711,19 +39725,12 @@ function parseTellerResults(data, meta, context) {
   const principal = meta.principal;
   const collateral = meta.collateral;
   const lenderKey = tellerLenderKey(meta.pool);
-  const principalOracleKey = tokenList?.[principal]?.assetGroup ?? `${chainId}-${principal}`;
-  const principalUSD = usdPrices[principalOracleKey] ?? usdPrices[principal];
-  if (!principalUSD) return entries;
-  entries.push({
-    asset: principal,
-    price: 1,
-    priceUSD: principalUSD,
-    marketUid: createMarketUid(chainId, lenderKey, principal),
-    targetLender: lenderKey,
-    description: "Teller principal asset",
-    staticBase: true,
-    baseAsset: principal
-  });
+  const usdOf = (addr) => {
+    const key = tokenList?.[addr]?.assetGroup ?? `${chainId}-${addr}`;
+    return usdPrices[key] ?? usdPrices[addr];
+  };
+  const principalUSD = usdOf(principal);
+  const collateralUSD = usdOf(collateral);
   const rawCollateral = data?.[0];
   if (rawCollateral == null || rawCollateral === "0x") return entries;
   let equivalent;
@@ -39734,17 +39741,48 @@ function parseTellerResults(data, meta, context) {
   }
   if (equivalent <= 0n) return entries;
   const collateralDecimals = meta.collateralDecimals ?? tokenList?.[collateral]?.decimals ?? 18;
-  const priceCollateralInPrincipal = 10 ** collateralDecimals / Number(equivalent);
-  if (!(priceCollateralInPrincipal > 0)) return entries;
-  entries.push({
-    asset: collateral,
-    price: priceCollateralInPrincipal,
-    // raw: collateral price in principal terms
-    priceUSD: priceCollateralInPrincipal * principalUSD,
-    marketUid: createMarketUid(chainId, lenderKey, collateral),
-    targetLender: lenderKey,
-    baseAsset: principal
-  });
+  const collPerPrincipal = Number(equivalent) / 10 ** collateralDecimals;
+  if (!(collPerPrincipal > 0)) return entries;
+  if (principalUSD) {
+    const collateralPriceInPrincipal = 1 / collPerPrincipal;
+    entries.push({
+      asset: principal,
+      price: 1,
+      priceUSD: principalUSD,
+      marketUid: createMarketUid(chainId, lenderKey, principal),
+      targetLender: lenderKey,
+      description: "Teller principal asset",
+      staticBase: true,
+      baseAsset: principal
+    });
+    entries.push({
+      asset: collateral,
+      price: collateralPriceInPrincipal,
+      priceUSD: collateralPriceInPrincipal * principalUSD,
+      marketUid: createMarketUid(chainId, lenderKey, collateral),
+      targetLender: lenderKey,
+      baseAsset: principal
+    });
+  } else if (collateralUSD) {
+    entries.push({
+      asset: collateral,
+      price: 1,
+      priceUSD: collateralUSD,
+      marketUid: createMarketUid(chainId, lenderKey, collateral),
+      targetLender: lenderKey,
+      description: "Teller collateral asset",
+      staticBase: true,
+      baseAsset: collateral
+    });
+    entries.push({
+      asset: principal,
+      price: collPerPrincipal,
+      priceUSD: collPerPrincipal * collateralUSD,
+      marketUid: createMarketUid(chainId, lenderKey, principal),
+      targetLender: lenderKey,
+      baseAsset: collateral
+    });
+  }
   return entries;
 }
 function getTellerAbi() {