@1delta/margin-fetcher 5.0.16 → 5.0.17

package/dist/index.d.ts

@@ -3735,6 +3735,16 @@ interface LlamaLendMarketRaw {
      * converting anyone's collateral.
      */
     activeBand: number | null;
+    /**
+     * Assets per 1e18 vault shares — the multiplier that turns a lender's share
+     * balance into an amount of the borrowed token.
+     *
+     * Read once per market rather than per user. It is NOT ~1.0: `DEAD_SHARES`
+     * puts LlamaLend vault shares roughly 1000x the asset scale, so it reads
+     * around 1e-3. A consumer that treats a share balance as an amount overstates
+     * a lender's position by three orders of magnitude.
+     */
+    pricePerShare: number | null;
 }
 /** Raw public-data batch for one LlamaLend chain (both generations together). */
 interface LlamaLendMarketsRaw {
@@ -3804,6 +3814,18 @@ interface LlamaLendPositionInfo {
      * the position IS or HAS BEEN in soft liquidation.
      */
     bandCollateralInBorrowed: string;
+    /**
+     * The user's SUPPLY position on this market, in the borrowed token — vault
+     * shares plus gauge-staked shares, converted to assets.
+     *
+     * Separate from the row's `deposits`, which sums this with
+     * `bandCollateralInBorrowed`. Only this part earns the vault's lend APR.
+     */
+    lendAssets: string;
+    /** Raw lend SHARES (vault + gauge). ~1000x the asset scale — never an amount. */
+    lendShares: string;
+    /** True when some or all of the lend shares are staked in the market's gauge. */
+    lendStaked: boolean;
     /** True when the LLAMMA currently holds a borrowed-token leg for this user. */
     softLiquidating: boolean;
     /**

package/dist/index.js

@@ -17642,7 +17642,16 @@ function buildEModes(borrowVaults, cluster) {
   }
   return eModes;
 }
+var OP_DEPOSIT = 1 << 0;
+var OP_MINT = 1 << 1;
+var OP_BORROW = 1 << 6;
+function isOperationDisabled(info, operation) {
+  const hookedOps = Number(info.hookedOperations ?? 0n);
+  return (hookedOps & operation) !== 0 && info.hookTarget.toLowerCase() === zeroAddress;
+}
 function buildMetadata(info) {
+  const hookedOperations = Number(info.hookedOperations ?? 0n);
+  const hookTarget = info.hookTarget.toLowerCase();
   return {
     vault: info.vault.toLowerCase(),
     dToken: info.dToken.toLowerCase(),
@@ -17650,7 +17659,9 @@ function buildMetadata(info) {
     interestRateModel: info.interestRateModel.toLowerCase(),
     unitOfAccount: info.unitOfAccount.toLowerCase(),
     evc: info.evc.toLowerCase(),
-    governorAdmin: info.governorAdmin.toLowerCase()
+    governorAdmin: info.governorAdmin.toLowerCase(),
+    ...hookedOperations !== 0 ? { hookedOperations } : {},
+    ...hookTarget !== zeroAddress ? { hookTarget } : {}
   };
 }
 function buildTokenEntry(info, config, collateralActive, borrowVaults, opts) {
@@ -17707,13 +17718,32 @@ function buildTokenEntry(info, config, collateralActive, borrowVaults, opts) {
     lastUpdateTimestamp: Number(info.timestamp),
     config,
     collateralActive,
-    borrowingEnabled: isBorrowVault,
-    depositsEnabled: true,
+    // A governor can switch either side of a vault off through the hook system
+    // without ever touching the caps, so these flags are read from
+    // `hookedOperations`/`hookTarget` rather than assumed. A vault that takes no
+    // deposits is not a collateral candidate and must not rank as one, however
+    // attractive its rate — `maxDeposit`/`maxMint` return 0 for it on-chain.
+    borrowingEnabled: isBorrowVault && !isOperationDisabled(info, OP_BORROW),
+    // Gated on OP_DEPOSIT alone, not on `OP_DEPOSIT || OP_MINT`: every supply
+    // route we encode calls `deposit`, so a vault that disabled only that leg is
+    // unusable to us even while share-minting stays open.
+    depositsEnabled: !isOperationDisabled(info, OP_DEPOSIT),
     hasStable: false,
     isActive: true,
-    isFrozen: false,
+    // Supply AND borrow both off is the closest EVK analogue of an Aave-style
+    // freeze: the vault still prices and still lets existing positions unwind.
+    isFrozen: isOperationDisabled(info, OP_DEPOSIT) && isOperationDisabled(info, OP_MINT) && isOperationDisabled(info, OP_BORROW),
     borrowCap: toTokenAmount(info.borrowCap, info.assetDecimals),
-    supplyCap: toTokenAmount(info.supplyCap, info.assetDecimals),
+    // Supply switched off reports as ZERO CAPACITY, not merely as a false flag.
+    // Consumers that rank markets (the pair book) can only compare capacity
+    // across lenders — `depositsEnabled` means different things per provider
+    // (Gearbox marks collateral-only tokens false because they have no lend
+    // side, while they remain perfectly good collateral), so it cannot be a
+    // cross-lender gate. Capacity can, and 0 is exactly what the vault's own
+    // `maxDeposit`/`maxMint` return here. Note this is already the shape Euler
+    // itself emits for a cap-disabled vault: `caps() = (1, …)` resolves to a
+    // supply cap of 0.
+    supplyCap: isOperationDisabled(info, OP_DEPOSIT) ? 0 : toTokenAmount(info.supplyCap, info.assetDecimals),
     debtCeiling: 0,
     eMode: selfEMode,
     decimals: Number(info.assetDecimals),
@@ -22978,7 +23008,6 @@ function num(api, key2) {
   const v = api?.[key2];
   return typeof v === "number" && Number.isFinite(v) ? v : null;
 }
-var BANDS_ENDPOINTS = [4, 10, 20, 50];
 var DEFAULT_BANDS = 10;
 var LLAMALEND_READ_ABI = [
   ...LlamaLendControllerAbi,
@@ -22989,6 +23018,8 @@ var LLAMALEND_READ_ABI = [
   ...Erc20Abi
 ];
 var ZERO = "0x0000000000000000000000000000000000000000";
+var WAD8 = 10n ** 18n;
+var CALLS_PER_MARKET = 6;
 var fetchJson2 = async (url, timeoutMs = 8e3) => {
   const res = await fetch(url, {
     headers: { accept: "application/json" },
@@ -23005,25 +23036,12 @@ var toBig5 = (v) => {
 };
 var human = (v, decimals) => v === null ? null : Number(v) / 10 ** decimals;
 var bandsFor = (m) => m.defaultBands && m.defaultBands >= 4 && m.defaultBands <= 50 ? m.defaultBands : DEFAULT_BANDS;
-var bandGrid = (m) => {
-  const set = /* @__PURE__ */ new Set([...BANDS_ENDPOINTS, bandsFor(m)]);
-  return [...set].sort((a, b) => a - b);
-};
 var MIN_BANDS = 4;
 var MAX_BANDS = 50;
 var LTV_CURVE_BANDS = Array.from(
   { length: MAX_BANDS - MIN_BANDS + 1 },
   (_3, i) => MIN_BANDS + i
 );
-var maxBorrowableCall = (m, oneUnit, n) => m.version === 1 ? {
-  address: m.controller,
-  name: "max_borrowable",
-  params: [oneUnit, BigInt(n), 0n, ZERO]
-} : {
-  address: m.controller,
-  name: "max_borrowable",
-  params: [oneUnit, BigInt(n), ZERO]
-};
 var buildBandLtv = (market) => {
   if (!market.ammA || !market.loanDiscount) return null;
   try {
@@ -23044,8 +23062,6 @@ var buildBandLtv = (market) => {
 };
 async function fetchChainExtras(chainId, markets) {
   const perMarketCalls = markets.map((m) => {
-    const grid = bandGrid(m);
-    const oneUnit = 10n ** BigInt(m.collateralDecimals);
     const calls = [
       { address: m.amm, name: "price_oracle", params: [] },
       { address: m.amm, name: "active_band", params: [] },
@@ -23054,9 +23070,17 @@ async function fetchChainExtras(chainId, markets) {
       // v1 controllers have no `borrow_cap`; allowFailure turns that into a
       // null rather than sinking the whole batch.
       { address: m.controller, name: "borrow_cap", params: [] },
-      ...grid.map((n) => maxBorrowableCall(m, oneUnit, n))
+      /**
+       * Price per share, read ONCE PER MARKET rather than per user.
+       *
+       * Vault shares run ~1000x the asset scale (`DEAD_SHARES`), so a share
+       * balance is never an amount — every consumer needs this multiplier to
+       * turn a lender's holding into assets. Reading it here keeps the
+       * per-user call to two plain `balanceOf`s.
+       */
+      { address: m.vault, name: "convertToAssets", params: [WAD8] }
     ];
-    return { market: m, grid, calls };
+    return { market: m, calls };
   });
   const flat = perMarketCalls.flatMap((x) => x.calls);
   if (flat.length === 0) return {};
@@ -23077,13 +23101,14 @@ async function fetchChainExtras(chainId, markets) {
   }
   const out = {};
   let cursor = 0;
-  for (const { market, grid } of perMarketCalls) {
+  for (const { market } of perMarketCalls) {
     const priceRaw = toBig5(results[cursor]);
     const activeBandRaw = toBig5(results[cursor + 1]);
     const nLoansRaw = toBig5(results[cursor + 2]);
     const maxDepositRaw = toBig5(results[cursor + 3]);
     const borrowCapRaw = toBig5(results[cursor + 4]);
-    cursor += 5 + grid.length;
+    const pricePerShareRaw = toBig5(results[cursor + 5]);
+    cursor += CALLS_PER_MARKET;
     const collateralPrice = priceRaw === null ? null : Number(priceRaw) / 1e18;
     const bandLtv = buildBandLtv(market);
     const defaultN = String(bandsFor(market));
@@ -23094,7 +23119,11 @@ async function fetchChainExtras(chainId, markets) {
       borrowCap: human(borrowCapRaw, market.borrowedDecimals),
       maxDeposit: human(maxDepositRaw, market.borrowedDecimals),
       nLoans: nLoansRaw === null ? null : Number(nLoansRaw),
-      activeBand: activeBandRaw === null ? null : Number(activeBandRaw)
+      activeBand: activeBandRaw === null ? null : Number(activeBandRaw),
+      // Assets-per-WAD-shares. Kept as a ratio (not scaled to the borrowed
+      // token's decimals) so a consumer multiplies a raw share balance by it
+      // and divides by 1e18 exactly once.
+      pricePerShare: pricePerShareRaw === null ? null : Number(pricePerShareRaw) / 1e18
     };
   }
   return out;
@@ -23159,7 +23188,8 @@ async function fetchLlamaLendMarkets(lender, chainId) {
           ),
           maxDeposit: ex?.maxDeposit ?? null,
           nLoans: ex?.nLoans ?? null,
-          activeBand: ex?.activeBand ?? null
+          activeBand: ex?.activeBand ?? null,
+          pricePerShare: ex?.pricePerShare ?? null
         };
       });
       return { lender, config, chainData, markets: rows, source: "api" };
@@ -23219,7 +23249,8 @@ async function fetchLlamaLendMarkets(lender, chainId) {
         ),
         maxDeposit: ex?.maxDeposit ?? null,
         nLoans: ex?.nLoans ?? null,
-        activeBand: ex?.activeBand ?? null
+        activeBand: ex?.activeBand ?? null,
+        pricePerShare: ex?.pricePerShare ?? null
       };
     });
     return { lender, config, chainData, markets: rows, source: "chain" };
@@ -24411,6 +24442,13 @@ function convertLlamaLendMarketsToResponse(raw, chainId, prices = {}, additional
           collateralPrice: m.collateralPrice !== null ? String(m.collateralPrice) : void 0,
           /** v2 only; `0` means borrowing is switched off. */
           borrowCap: m.borrowCap !== null ? String(m.borrowCap) : void 0,
+          /**
+           * Assets per 1e18 vault shares — what a lender's share balance is
+           * worth. Published because the SUPPLY side of a LlamaLend market is
+           * an ERC-4626 vault whose shares run ~1000x the asset scale, so a
+           * raw balance is meaningless without it.
+           */
+          pricePerShare: m.pricePerShare !== null ? String(m.pricePerShare) : void 0,
           addresses: {
             controller: market.controller,
             vault: market.vault,
@@ -25109,7 +25147,7 @@ function dssKeyParts(key2) {
   if (!m) return void 0;
   return { lender: m[1], chainId: m[2], ilk: keySegmentToIlk(m[3]) };
 }
-var WAD9 = 1e18;
+var WAD10 = 1e18;
 var RAY4 = 1e27;
 var RAD = 1e45;
 var YEAR_SECONDS2 = 31536e3;
@@ -25153,7 +25191,7 @@ function convertDssMarketsToResponse(raw, chainId, prices = {}, _additionalYield
     const totalColl = m.joinBalance !== null ? toHuman4(m.joinBalance, collDecimals) : 0;
     const mat = m.mat !== null ? Number(m.mat) / RAY4 : Number(market.mat) / RAY4 || 1.5;
     const ltv = mat > 0 ? 1 / mat : 0;
-    const chop = market.chop ? Number(market.chop) / WAD9 : 0;
+    const chop = market.chop ? Number(market.chop) / WAD10 : 0;
     const liqPenalty = chop > 1 ? chop - 1 : 0;
     const duty = m.duty !== null ? m.duty : BigInt(market.duty ?? 0);
     const borrowApr = duty > BigInt(1e27) ? Number(duty - BigInt(10) ** BigInt(27)) / RAY4 * YEAR_SECONDS2 * 100 : 0;
@@ -27885,7 +27923,7 @@ var buildRiverUserCall = (chainId, lender, account) => {
   });
   return calls;
 };
-var LLAMALEND_CALLS_PER_MARKET = 5;
+var LLAMALEND_CALLS_PER_MARKET = 8;
 var buildLlamaLendUserCall = (chainId, lender, account, spender) => {
   const cfg = llamaLendConfigFor(lender, chainId);
   const markets = llamaLendChainData(lender, chainId)?.markets ?? [];
@@ -27896,7 +27934,16 @@ var buildLlamaLendUserCall = (chainId, lender, account, spender) => {
     { address: m.controller, name: "health", params: [account, true] },
     { address: m.controller, name: "user_prices", params: [account] },
     { address: m.amm, name: "read_user_tick_numbers", params: [account] },
-    { address: m.controller, name: "approval", params: [account, delegate] }
+    { address: m.controller, name: "approval", params: [account, delegate] },
+    { address: m.vault, name: "balanceOf", params: [account] },
+    // A market without a gauge would call address(0), which returns '0x' and
+    // parses as zero — the layout stays fixed either way.
+    {
+      address: m.gauge ?? "0x0000000000000000000000000000000000000000",
+      name: "balanceOf",
+      params: [account]
+    },
+    { address: m.vault, name: "convertToAssets", params: [10n ** 18n] }
   ]);
 };
 var INVERSE_CALLS_PER_MARKET = 4;
@@ -31073,7 +31120,7 @@ var getMidnightUserDataConverter = (_lender, chainId, account, meta) => {
     totalCalls
   ];
 };
-var WAD10 = 1000000000000000000n;
+var WAD11 = 1000000000000000000n;
 function toBigInt11(v) {
   if (v === void 0 || v === null || v === "0x") return 0n;
   if (typeof v === "bigint") return v;
@@ -31115,8 +31162,8 @@ var getTermUserDataConverter = (_lender, chainId, account, meta) => {
         const debtStr = parseRawAmount(debtUnits.toString(), market.loanDecimals);
         const debtNum = Number(debtStr);
         const repoBalance = toBigInt11(balanceResult);
-        const redemptionValue = toBigInt11(redemptionResult) || toBigInt11(market.redemptionValue) || WAD10;
-        const lentUnits = repoBalance * redemptionValue / WAD10;
+        const redemptionValue = toBigInt11(redemptionResult) || toBigInt11(market.redemptionValue) || WAD11;
+        const lentUnits = repoBalance * redemptionValue / WAD11;
         const depositsStr = parseRawAmount(lentUnits.toString(), market.loanDecimals);
         const depositsNum = Number(depositsStr);
         const posData = {};
@@ -31194,7 +31241,7 @@ var getTermUserDataConverter = (_lender, chainId, account, meta) => {
 };
 var nowSec6 = () => Math.floor(Date.now() / 1e3);
 var DAY_SECONDS = 86400n;
-var WAD11 = 10n ** 18n;
+var WAD12 = 10n ** 18n;
 function sumPreview(positions) {
   return positions.reduce((acc, p) => acc + p.previewValue, 0n);
 }
@@ -31218,7 +31265,7 @@ function toDetail(positions, kind, now, penaltyRate, penaltyApr) {
       ...kind === "borrow" ? {
         ...overdue ? { latePenalty: excess.toString() } : { earlyRepayDiscount: gap.toString() },
         // face × penaltyRate × 1 day — what another day of being late adds.
-        latePenaltyPerDay: (face * penaltyRate * DAY_SECONDS / WAD11).toString(),
+        latePenaltyPerDay: (face * penaltyRate * DAY_SECONDS / WAD12).toString(),
         latePenaltyApr: penaltyApr
       } : {
         ...overdue ? {} : { earlyExitCost: gap.toString() },
@@ -31347,7 +31394,7 @@ var getExactlyUserDataConverter = (_lender, chainId, account, meta) => {
               latePenalty: penalty,
               /** further penalty per day overdue — linear on face */
               latePenaltyPerDay: parseRawAmount(
-                (face * m.penaltyRate * DAY_SECONDS / WAD11).toString(),
+                (face * m.penaltyRate * DAY_SECONDS / WAD12).toString(),
                 decimals
               ),
               latePenaltyApr: penaltyApr,
@@ -31875,7 +31922,13 @@ var getLlamaLendUserDataConverter = (lender, chainId, account, meta) => {
         const bandBorrowed = big7(stateRaw[1]);
         const debt = big7(stateRaw[2]);
         const bandCount = Number(big7(stateRaw[3]));
-        if (collateral === 0n && debt === 0n && bandBorrowed === 0n) return;
+        const vaultSharesRaw = data[base + 5];
+        const gaugeSharesRaw = data[base + 6];
+        const vaultShares = isFailedCall(vaultSharesRaw) ? 0n : big7(vaultSharesRaw);
+        const gaugeShares = isFailedCall(gaugeSharesRaw) ? 0n : big7(gaugeSharesRaw);
+        const lendShares = vaultShares + gaugeShares;
+        if (collateral === 0n && debt === 0n && bandBorrowed === 0n && lendShares === 0n)
+          return;
         const healthRaw = data[base + 1];
         const health = isFailedCall(healthRaw) ? 0n : big7(healthRaw);
         const pricesRaw = data[base + 2];
@@ -31902,6 +31955,15 @@ var getLlamaLendUserDataConverter = (lender, chainId, account, meta) => {
         const loanDisplay = loanMeta ? getDisplayPrice(loanMeta) : 0;
         const loanOracle = loanMeta ? getOraclePrice(loanMeta) : 0;
         const loanHist = loanMeta?.price?.priceUsd24h ?? loanDisplay;
+        const shareToAssetRaw = data[base + 7];
+        const shareToAsset = isFailedCall(shareToAssetRaw) ? 0n : big7(shareToAssetRaw);
+        const lendAssets = shareToAsset === 0n ? 0n : lendShares * shareToAsset / 10n ** 18n;
+        const lendStr = parseRawAmount(lendAssets.toString(), loanDecimals);
+        const depositStr = parseRawAmount(
+          (lendAssets + bandBorrowed).toString(),
+          loanDecimals
+        );
+        const depositNum = Number(depositStr);
         const llamalendInfo = {
           health: health.toString(),
           priceUpper: priceUpper.toString(),
@@ -31909,6 +31971,9 @@ var getLlamaLendUserDataConverter = (lender, chainId, account, meta) => {
           bands,
           bandCount,
           bandCollateralInBorrowed: bandBorrowed.toString(),
+          lendAssets: lendStr,
+          lendShares: lendShares.toString(),
+          lendStaked: gaugeShares > 0n,
           softLiquidating: bandBorrowed > 0n,
           delegated,
           supportsDelegation: market.supportsDelegation === true,
@@ -31918,11 +31983,10 @@ var getLlamaLendUserDataConverter = (lender, chainId, account, meta) => {
         const collNum = Number(collStr);
         const debtStr = parseRawAmount(debt.toString(), loanDecimals);
         const debtNum = Number(debtStr);
-        const bandBorrowedStr = parseRawAmount(
+        parseRawAmount(
           bandBorrowed.toString(),
           loanDecimals
         );
-        const bandBorrowedNum = Number(bandBorrowedStr);
         const lendingPositions = {
           "0": {
             [collUid]: {
@@ -31944,16 +32008,18 @@ var getLlamaLendUserDataConverter = (lender, chainId, account, meta) => {
             [loanUid]: {
               marketUid: loanUid,
               underlying: loanAddr,
-              deposits: bandBorrowedStr,
+              deposits: depositStr,
               debt: debtStr,
               debtStable: "0",
-              depositsUSD: bandBorrowedNum * loanDisplay,
+              depositsUSD: depositNum * loanDisplay,
               debtUSD: debtNum * loanDisplay,
               debtStableUSD: 0,
-              depositsUSDOracle: bandBorrowedNum * loanOracle,
+              depositsUSDOracle: depositNum * loanOracle,
               debtUSDOracle: debtNum * loanOracle,
               debtStableUSDOracle: 0,
               stableBorrowRate: "0",
+              // The borrowed token is never collateral in a LlamaLend market —
+              // supplying it earns the lend rate, it does not back a loan.
               collateralEnabled: false,
               claimableRewards: 0,
               llamalendInfo
@@ -31963,7 +32029,7 @@ var getLlamaLendUserDataConverter = (lender, chainId, account, meta) => {
         const modes = { "0": bandCount };
         const hist = {
           "0": {
-            totalDeposits24h: collNum * collHist + bandBorrowedNum * loanHist,
+            totalDeposits24h: collNum * collHist + depositNum * loanHist,
             totalDebt24h: debtNum * loanHist
           }
         };
@@ -32111,7 +32177,7 @@ var getResupplyUserDataConverter = (lender, chainId, account, meta) => {
     expected
   ];
 };
-var WAD12 = 10n ** 18n;
+var WAD13 = 10n ** 18n;
 var big9 = (v) => {
   try {
     if (typeof v === "bigint") return v;
@@ -32182,7 +32248,7 @@ var getCurvanceUserDataConverter = (lender, chainId, account, meta) => {
           const display = getDisplayPrice(rowMeta);
           const oracle = getOraclePrice(rowMeta);
           const histPrice = rowMeta.price?.priceUsd24h ?? display;
-          const toUnderlying = (s) => exchangeRate > 0n ? s * exchangeRate / WAD12 : s;
+          const toUnderlying = (s) => exchangeRate > 0n ? s * exchangeRate / WAD13 : s;
           const depositsRaw = toUnderlying(collateralShares);
           const depositsStr = parseRawAmount(
             depositsRaw.toString(),