@1delta/margin-fetcher 5.0.53 → 5.0.54

package/dist/index.d.ts

@@ -12179,12 +12179,23 @@ interface EarnExclusions {
     lowTvl: number;
     /** Above the risk ceiling the rest of the API also applies. */
     highRisk: number;
+    /**
+     * Rows whose position is a multi-token LP (`basket`), hidden by default.
+     *
+     * Excluded unasked because the row names ONE token while the position holds
+     * several in a split the pool keeps moving — so a depositor reading it as
+     * "USDC at 10 %" ends up carrying the other leg's price risk. Reported here
+     * so a UI can offer `?lp=include` rather than let the rows vanish silently.
+     */
+    lp: number;
 }
 interface EarnAppliedDefaults {
     minTvlUsd: number;
     maxRiskScore: number;
     excludePassthrough: boolean;
     excludeIlliquid: boolean;
+    /** LP / auto-rebalancing positions are hidden unless `?lp=include`. */
+    excludeLp: boolean;
 }
 /**
  * The filter vocabulary, published rather than hard-coded.

package/dist/index.js

@@ -19476,6 +19476,10 @@ function parseVault(vault, chainId, prices, additionalYields, tokenList, liquidi
     }
     return value > 0 ? weighted / value : legs[0]?.rate ?? 0;
   };
+  const smartLegTokens = /* @__PURE__ */ new Set([
+    ...isSmartCol ? colLegs.map((l) => l.token.toLowerCase()) : [],
+    ...isSmartDebt ? debtLegs.map((l) => l.token.toLowerCase()) : []
+  ]);
   const basketSupplyRate = isSmartCol ? basketRate(colLegs) : void 0;
   const basketBorrowRate = isSmartDebt ? basketRate(debtLegs) : void 0;
   const irmTotals = (state, decimals) => state ? {
@@ -19564,7 +19568,7 @@ function parseVault(vault, chainId, prices, additionalYields, tokenList, liquidi
        * NOT the position's rate (use the basket rate); and an exit has to be
        * sized in shares rather than in this token.
        */
-      ...isSmartVault ? { autoBalanced: true } : {},
+      ...smartLegTokens.has(leg.token.toLowerCase()) ? { autoBalanced: true } : {},
       fluid: isSmartVault ? {
         vaultType,
         /**
@@ -24647,6 +24651,7 @@ async function fetchTwyneMarkets(lender, chainId) {
     allowFailure: true
   });
   const out = [];
+  const pendingDebtBalances = [];
   markets.forEach((m, i) => {
     const c = i * 8;
     const creditTotalAssets = big3(creditReads[c]);
@@ -24660,6 +24665,7 @@ async function fetchTwyneMarkets(lender, chainId) {
     let externalSupplyRate;
     let externalBorrowRate;
     let externalBorrowLiquidity;
+    let debtAToken;
     if (aaveIdx >= 0) {
       const emode = aaveEmode[aaveIdx];
       const collReserve = aaveReserves6[aaveIdx * 2];
@@ -24669,6 +24675,12 @@ async function fetchTwyneMarkets(lender, chainId) {
         externalSupplyRate = Number(collReserve.currentLiquidityRate) / RAY4;
       if (ok(debtReserve) && debtReserve?.currentVariableBorrowRate !== void 0)
         externalBorrowRate = Number(debtReserve.currentVariableBorrowRate) / RAY4;
+      if (ok(debtReserve)) {
+        const virtual = big3(debtReserve.virtualUnderlyingBalance);
+        if (virtual !== void 0 && virtual > 0n) externalBorrowLiquidity = virtual;
+        else if (typeof debtReserve.aTokenAddress === "string")
+          debtAToken = debtReserve.aTokenAddress;
+      }
     } else if (eulerIdx >= 0) {
       const e = eulerIdx * 7;
       externalLiqLtv = big3(eulerReads[e]);
@@ -24685,7 +24697,10 @@ async function fetchTwyneMarkets(lender, chainId) {
       }
     }
     const s = i * 3;
-    if (externalBorrowLiquidity === void 0) externalBorrowLiquidity = big3(scaleReads[s + 2]);
+    if (externalBorrowLiquidity === void 0 && !debtAToken) {
+      externalBorrowLiquidity = big3(scaleReads[s + 2]);
+    }
+    if (debtAToken) pendingDebtBalances.push({ index: out.length, token: m.targetAsset, holder: debtAToken });
     out.push({
       market: m,
       creditTotalAssets,
@@ -24711,6 +24726,22 @@ async function fetchTwyneMarkets(lender, chainId) {
       paused
     });
   });
+  if (pendingDebtBalances.length > 0) {
+    const balances = await multicallRetryUniversal({
+      chain: chainId,
+      calls: pendingDebtBalances.map((p) => ({
+        address: p.token,
+        name: "balanceOf",
+        args: [p.holder]
+      })),
+      abi: ERC20_ABI,
+      allowFailure: true
+    });
+    pendingDebtBalances.forEach((p, i) => {
+      const v = big3(balances[i]);
+      if (v !== void 0 && out[p.index]) out[p.index].externalBorrowLiquidity = v;
+    });
+  }
   if (out.length === 0) return void 0;
   return { lender, chainId, config, markets: out };
 }
@@ -72456,7 +72487,10 @@ var twyneAdapter = {
           description: [
             `Your collateral stays in ${externalName}; Twyne only reserves other lenders\u2019 unused borrowing power so the same collateral supports a larger loan.`,
             bandNote,
-            creditApr != null ? `On top of ${externalName}\u2019s borrow rate you pay ${creditApr.toFixed(3)} % a year on the RESERVED CREDIT only \u2014 not on your debt \u2014 and it is charged in the collateral asset.` : void 0
+            creditApr != null ? `On top of ${externalName}\u2019s borrow rate you pay ${creditApr.toFixed(3)} % a year on the RESERVED CREDIT only \u2014 not on your debt \u2014 and it is charged in the collateral asset.` : void 0,
+            // The loan is perpetual; the COLLATERAL is what expires. Said here
+            // rather than in `maturity`, which would mis-type the loan itself.
+            maturity != null && matured ? "This market\u2019s collateral has already matured. Existing positions can still be repaid and closed, but nothing new should be opened against it." : maturity != null ? `Your loan has no end date, but the collateral is a fixed-maturity token that stops accreting on ${new Date(maturity * 1e3).toISOString().slice(0, 10)}, and ${externalName}\u2019s risk parameters move as that date approaches.` : void 0
           ].filter(Boolean).join(" ")
         },
         availability: {
@@ -72490,21 +72524,20 @@ var twyneAdapter = {
             description: `Twyne liquidates first, above your chosen LTV. ${externalName}\u2019s own threshold of ${pct2(externalLiqLtv)} is the backstop, and reaching it is the bad case.`
           } : {}
         },
-        // The collateral has a maturity even though the loan does not — a PT
-        // stops accreting at expiry and the external threshold ramps out from
-        // under it, so this is a date the borrower has to act on.
-        ...maturity ? {
-          maturity: {
-            kind: "fixed-date",
-            maturity,
-            maturityIso: new Date(maturity * 1e3).toISOString(),
-            ...matured ? {
-              description: "This market\u2019s collateral has already matured. Existing positions can still be repaid and closed, but no new borrowing should be opened against it."
-            } : {
-              description: "The collateral is a fixed-maturity token. The loan itself has no end date, but the collateral stops accreting at maturity and the underlying market\u2019s risk parameters move as that date approaches."
-            }
-          }
-        } : {}
+        // THE LOAN IS PERPETUAL. Only the COLLATERAL expires.
+        //
+        // The first version of this adapter put the PT's expiry on
+        // `borrow.maturity` with `kind: 'fixed-date'`, and that is wrong in a
+        // way that shows up immediately in a UI: every consumer reads that field
+        // as "this is a fixed-TERM loan", so the market rendered with a `Fixed`
+        // borrow-rate badge and no APR — a fixed-rate product Twyne does not
+        // offer. A Twyne loan has no end date, no rollover and no settlement;
+        // it accrues at the external market's variable rate until repaid.
+        //
+        // What the collateral's expiry actually means is carried where it
+        // belongs: `twyne.collateralMaturity` / `collateralMatured` on the
+        // market descriptor (computed at read time), and stated in prose here.
+        maturity: { kind: "perpetual" }
       }
     };
   }
@@ -73109,6 +73142,10 @@ function resolveBasket(row) {
   const f = row.fluid;
   if (f && f.isSmartCol !== true) return void 0;
   const legs = (f?.collateralPair ?? []).map((a) => addr3(a)).filter((a) => !!a).map((address) => ({ address }));
+  if (legs.length > 0) {
+    const rowAsset = addr3(row.underlying) ?? addr3(row.asset?.address);
+    if (!rowAsset || !legs.some((l) => l.address === rowAsset)) return void 0;
+  }
   return {
     // Fluid emits one row PER LEG of the pool, so this row is a leg and a
     // consumer that sums the listing without deduping counts the position