@1delta/margin-fetcher 0.0.321 → 0.0.322

package/dist/lending/public-data/fluid/publicCallBuild.d.ts

@@ -6,14 +6,18 @@ export declare const VAULT_CHUNK_SIZE = 25;
 /**
  * Builds the multicall descriptor for Fluid public data.
  *
- * Returns a single call to VaultResolver.getVaultsEntireData() — the
- * resolver returns every vault on the chain in one shot.
+ * Two calls:
+ *   [0] VaultResolver.getVaultsEntireData()        — every vault in one shot
+ *   [1] LiquidityResolver.getAllOverallTokensData() — per-token Liquidity-layer
+ *       state. Vaults borrow from the shared Liquidity Layer, so the IRM input
+ *       for every vault rate is the **Liquidity-layer token utilization**
+ *       (`lastStoredUtilization`), not any vault-level ratio.
  *
  * fTokens are intentionally NOT fetched: they are standalone ERC-4626 vaults
  * on the shared Liquidity Layer (not a lending market), so they live outside
  * this module.
  *
- * Resolver address is constant across chains but sourced via the SDK so a
+ * Resolver addresses are constant across chains but sourced via the SDK so a
  * future chain with a divergent address can be added without code changes.
  */
 export declare const buildFluidCall: (chainId: string, _lender?: string) => {
@@ -21,16 +25,6 @@ export declare const buildFluidCall: (chainId: string, _lender?: string) => {
     name: string;
     params: never[];
 }[];
-/**
- * Variant that also pulls the Liquidity resolver overall token data.
- * Use when you need per-token utilization / rate curves separate from
- * what's already embedded in the vault response.
- */
-export declare const buildFluidCallWithLiquidity: (chainId: string) => {
-    address: string;
-    name: string;
-    params: never[];
-}[];
 /**
  * Chunked fallback for chains where the single `getVaultsEntireData()` call
  * exceeds eth_call gas limits. Uses the cached vault address list from

package/dist/lending/public-data/fluid/publicCallBuild.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"publicCallBuild.d.ts","sourceRoot":"","sources":["../../../../src/lending/public-data/fluid/publicCallBuild.ts"],"names":[],"mappings":"AACA,OAAO,MAAM,MAAM,QAAQ,CAAA;AAE3B,QAAA,MAAQ,KAAK,uEAAW,CAAA;AAExB;oEACoE;AACpE,eAAO,MAAM,gBAAgB,KAAK,CAAA;AAElC;;;;;;;;;;;;GAYG;AACH,eAAO,MAAM,cAAc,GAAI,SAAS,MAAM,EAAE,UAAU,MAAM;;;;GAW/D,CAAA;AAED;;;;GAIG;AACH,eAAO,MAAM,2BAA2B,GAAI,SAAS,MAAM;;;;GAY1D,CAAA;AAED;;;;;;;;GAQG;AACH,eAAO,MAAM,qBAAqB,GAAI,SAAS,MAAM;;;;GAWpD,CAAA;AAID,OAAO,EAAE,KAAK,EAAE,CAAA"}
+{"version":3,"file":"publicCallBuild.d.ts","sourceRoot":"","sources":["../../../../src/lending/public-data/fluid/publicCallBuild.ts"],"names":[],"mappings":"AACA,OAAO,MAAM,MAAM,QAAQ,CAAA;AAE3B,QAAA,MAAQ,KAAK,uEAAW,CAAA;AAExB;oEACoE;AACpE,eAAO,MAAM,gBAAgB,KAAK,CAAA;AAElC;;;;;;;;;;;;;;;;GAgBG;AACH,eAAO,MAAM,cAAc,GAAI,SAAS,MAAM,EAAE,UAAU,MAAM;;;;GAgB/D,CAAA;AAED;;;;;;;;GAQG;AACH,eAAO,MAAM,qBAAqB,GAAI,SAAS,MAAM;;;;GAWpD,CAAA;AAID,OAAO,EAAE,KAAK,EAAE,CAAA"}

package/dist/lending/public-data/fluid/publicCallParse.d.ts

@@ -1,8 +1,33 @@
 import { AdditionalYields, GenericTokenList } from '../../../types';
 /**
- * Parser for the single-call Fluid public data fetch built by `buildFluidCall`.
+ * Per-token Liquidity-layer state relevant for the IRM.
  *
- * data[0] = VaultEntireData[] (from VaultResolver.getVaultsEntireData)
+ * `utilization` is `lastStoredUtilization` scaled to a 0-1 fraction. It is
+ * read from the same packed storage slot as the current borrow rate, so it is
+ * the exact x-coordinate on the token's rate curve that produced the rate —
+ * the canonical "current utilization" for IRM charts and simulations.
+ */
+export interface FluidLiquidityTokenState {
+    /** Liquidity-layer utilization (0-1 fraction; the IRM input) */
+    utilization: number;
+    /** Liquidity revenue fee (0-1 fraction of borrow interest) */
+    fee: number;
+    /** Utilization cap (0-1 fraction; 1 when unset) */
+    maxUtilization: number;
+    /** Total token supply at the Liquidity layer (raw token units, string) */
+    totalSupply: string;
+    /** Total token borrow at the Liquidity layer (raw token units, string) */
+    totalBorrow: string;
+    /** Liquidity-layer borrow APR % */
+    borrowRate: number;
+    /** Liquidity-layer supply APR % */
+    supplyRate: number;
+}
+/**
+ * Parser for the two-call Fluid public data fetch built by `buildFluidCall`.
+ *
+ * data[0] = VaultEntireData[]   (VaultResolver.getVaultsEntireData)
+ * data[1] = OverallTokenData[]  (LiquidityResolver.getAllOverallTokensData)
  *
  * Emits one bucket per vault under lender key `FLUID_<vaultId>` (mirrors the
  * Morpho Blue pattern of one lender per isolated market).

package/dist/lending/public-data/fluid/publicCallParse.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"publicCallParse.d.ts","sourceRoot":"","sources":["../../../../src/lending/public-data/fluid/publicCallParse.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,gBAAgB,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAA;AAyBnE;;;;;;;;;;GAUG;AACH,eAAO,MAAM,2BAA2B,GACtC,SAAS,MAAM,EACf,SAAS,MAAM,EACf,QAAQ;IAAE,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAAA;CAAE,EACnC,kBAAkB,gBAAgB,EAClC,YAAW,gBAAqB,KAC/B,CAAC,CAAC,IAAI,EAAE,GAAG,EAAE,KAAK;IAAE,CAAC,MAAM,EAAE,MAAM,GAAG,GAAG,CAAA;CAAE,GAAG,SAAS,EAAE,MAAM,CA+BjE,CAAA"}
+{"version":3,"file":"publicCallParse.d.ts","sourceRoot":"","sources":["../../../../src/lending/public-data/fluid/publicCallParse.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,gBAAgB,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAA;AAyBnE;;;;;;;GAOG;AACH,MAAM,WAAW,wBAAwB;IACvC,gEAAgE;IAChE,WAAW,EAAE,MAAM,CAAA;IACnB,8DAA8D;IAC9D,GAAG,EAAE,MAAM,CAAA;IACX,mDAAmD;IACnD,cAAc,EAAE,MAAM,CAAA;IACtB,0EAA0E;IAC1E,WAAW,EAAE,MAAM,CAAA;IACnB,0EAA0E;IAC1E,WAAW,EAAE,MAAM,CAAA;IACnB,mCAAmC;IACnC,UAAU,EAAE,MAAM,CAAA;IAClB,mCAAmC;IACnC,UAAU,EAAE,MAAM,CAAA;CACnB;AA4CD;;;;;;;;;;;GAWG;AACH,eAAO,MAAM,2BAA2B,GACtC,SAAS,MAAM,EACf,SAAS,MAAM,EACf,QAAQ;IAAE,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAAA;CAAE,EACnC,kBAAkB,gBAAgB,EAClC,YAAW,gBAAqB,KAC/B,CAAC,CAAC,IAAI,EAAE,GAAG,EAAE,KAAK;IAAE,CAAC,MAAM,EAAE,MAAM,GAAG,GAAG,CAAA;CAAE,GAAG,SAAS,EAAE,MAAM,CAmCjE,CAAA"}

package/dist/types/apiReturnType.d.ts

@@ -64,8 +64,20 @@ export interface PoolData {
     totalDebtUSD: number;
     totalLiquidityUSD: number;
     borrowLiquidityUSD: number;
-    /** Borrow utilization as a 0..1 fraction (totalDebt / totalDeposits). */
+    /**
+     * Borrow utilization as a 0..1 fraction — the IRM input for this market.
+     * Pool protocols: `totalDebt / totalDeposits` of the market itself.
+     * Shared-liquidity protocols (Fluid): the Liquidity-layer utilization of
+     * this row's token, since rates are set at that layer — never a
+     * vault-level ratio.
+     */
     utilization: number;
+    /**
+     * Fluid collateral rows only: share of the vault's collateral currently
+     * locked below the Liquidity-layer withdrawal limit
+     * (`withdrawLimit / totalSupplyVault`, 0..1).
+     */
+    lockupRatio?: number;
     depositRate: number;
     variableBorrowRate: number;
     stableBorrowRate: number;

package/dist/types/apiReturnType.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"apiReturnType.d.ts","sourceRoot":"","sources":["../../src/types/apiReturnType.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,WAAW,CAAA;AAE3C,MAAM,WAAW,UAAU;IAEzB,kBAAkB,EAAE,MAAM,CAAA;IAC1B,gBAAgB,EAAE,MAAM,CAAA;IAExB,WAAW,EAAE,MAAM,CAAA;CACpB;AAED,MAAM,MAAM,UAAU,GAAG;IAAE,CAAC,QAAQ,EAAE,MAAM,GAAG,UAAU,CAAA;CAAE,CAAA;AAE3D,MAAM,WAAW,WAAY,SAAQ,UAAU;IAC7C,KAAK,EAAE,MAAM,CAAA;CACd;AAED,MAAM,MAAM,WAAW,GAAG,WAAW,EAAE,CAAA;AAEvC,MAAM,WAAW,WAAW;IAC1B,QAAQ,EAAE,MAAM,CAAA;IAChB,sBAAsB,EAAE,MAAM,CAAA;IAC9B,gBAAgB,EAAE,MAAM,CAAA;IACxB,YAAY,EAAE,MAAM,CAAA;IACpB;;;;;;OAMG;IACH,kBAAkB,EAAE,MAAM,CAAA;IAC1B;;;;;OAKG;IACH,WAAW,EAAE,MAAM,CAAA;IACnB;;;;;;OAMG;IACH,kBAAkB,CAAC,EAAE,MAAM,CAAA;IAC3B,kBAAkB,CAAC,EAAE,OAAO,CAAA;IAC5B,YAAY,CAAC,EAAE,OAAO,CAAA;CACvB;AAED,UAAU,UAAU;IAClB,CAAC,QAAQ,EAAE,MAAM,GAAG,WAAW,CAAA;CAChC;AAED,MAAM,WAAW,QAAQ;IACvB,MAAM,EAAE,MAAM,CAAA;IACd,UAAU,EAAE,MAAM,CAAA;IAClB,KAAK,EAAE,eAAe,CAAA;IACtB,aAAa,EAAE,MAAM,CAAA;IACrB,eAAe,EAAE,MAAM,CAAA;IACvB,SAAS,EAAE,MAAM,CAAA;IACjB,cAAc,EAAE,MAAM,CAAA;IACtB;;;;OAIG;IACH,eAAe,EAAE,MAAM,CAAA;IACvB,gBAAgB,EAAE,MAAM,CAAA;IACxB,kBAAkB,EAAE,MAAM,CAAA;IAC1B,YAAY,EAAE,MAAM,CAAA;IACpB,iBAAiB,EAAE,MAAM,CAAA;IACzB,kBAAkB,EAAE,MAAM,CAAA;IAC1B,yEAAyE;IACzE,WAAW,EAAE,MAAM,CAAA;IACnB,WAAW,EAAE,MAAM,CAAA;IACnB,kBAAkB,EAAE,MAAM,CAAA;IAC1B,gBAAgB,EAAE,MAAM,CAAA;IACxB,cAAc,EAAE,MAAM,CAAA;IACtB,OAAO,EAAE,WAAW,CAAA;IACpB,QAAQ,EAAE,MAAM,CAAA;IAChB,MAAM,EAAE,UAAU,CAAA;IAClB,gBAAgB,EAAE,OAAO,CAAA;IACzB,gBAAgB,EAAE,OAAO,CAAA;IACzB,eAAe,EAAE,OAAO,CAAA;IACxB,SAAS,EAAE,OAAO,CAAA;IAClB,QAAQ,EAAE,OAAO,CAAA;IACjB,QAAQ,EAAE,OAAO,CAAA;IACjB,SAAS,EAAE,MAAM,CAAA;IACjB,SAAS,EAAE,MAAM,CAAA;IACjB,WAAW,EAAE,MAAM,CAAA;IACnB;;;;;;;OAOG;IACH,WAAW,EAAE,MAAM,CAAA;IACnB;;;;OAIG;IACH,kBAAkB,CAAC,EAAE,MAAM,CAAA;CAC5B;AAED,MAAM,MAAM,UAAU,GAAG;IACvB,CAAC,OAAO,EAAE,MAAM,GAAG;QACjB,IAAI,EAAE;YACJ,CAAC,MAAM,EAAE,MAAM,GAAG;gBAChB,IAAI,EAAE;oBACJ,CAAC,MAAM,EAAE,MAAM,GAAG,QAAQ,CAAA;iBAC3B,CAAA;gBACD,OAAO,EAAE,MAAM,CAAA;aAChB,CAAA;SACF,CAAA;QACD,WAAW,EAAE,MAAM,CAAA;KACpB,CAAA;CACF,CAAA"}
+{"version":3,"file":"apiReturnType.d.ts","sourceRoot":"","sources":["../../src/types/apiReturnType.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,WAAW,CAAA;AAE3C,MAAM,WAAW,UAAU;IAEzB,kBAAkB,EAAE,MAAM,CAAA;IAC1B,gBAAgB,EAAE,MAAM,CAAA;IAExB,WAAW,EAAE,MAAM,CAAA;CACpB;AAED,MAAM,MAAM,UAAU,GAAG;IAAE,CAAC,QAAQ,EAAE,MAAM,GAAG,UAAU,CAAA;CAAE,CAAA;AAE3D,MAAM,WAAW,WAAY,SAAQ,UAAU;IAC7C,KAAK,EAAE,MAAM,CAAA;CACd;AAED,MAAM,MAAM,WAAW,GAAG,WAAW,EAAE,CAAA;AAEvC,MAAM,WAAW,WAAW;IAC1B,QAAQ,EAAE,MAAM,CAAA;IAChB,sBAAsB,EAAE,MAAM,CAAA;IAC9B,gBAAgB,EAAE,MAAM,CAAA;IACxB,YAAY,EAAE,MAAM,CAAA;IACpB;;;;;;OAMG;IACH,kBAAkB,EAAE,MAAM,CAAA;IAC1B;;;;;OAKG;IACH,WAAW,EAAE,MAAM,CAAA;IACnB;;;;;;OAMG;IACH,kBAAkB,CAAC,EAAE,MAAM,CAAA;IAC3B,kBAAkB,CAAC,EAAE,OAAO,CAAA;IAC5B,YAAY,CAAC,EAAE,OAAO,CAAA;CACvB;AAED,UAAU,UAAU;IAClB,CAAC,QAAQ,EAAE,MAAM,GAAG,WAAW,CAAA;CAChC;AAED,MAAM,WAAW,QAAQ;IACvB,MAAM,EAAE,MAAM,CAAA;IACd,UAAU,EAAE,MAAM,CAAA;IAClB,KAAK,EAAE,eAAe,CAAA;IACtB,aAAa,EAAE,MAAM,CAAA;IACrB,eAAe,EAAE,MAAM,CAAA;IACvB,SAAS,EAAE,MAAM,CAAA;IACjB,cAAc,EAAE,MAAM,CAAA;IACtB;;;;OAIG;IACH,eAAe,EAAE,MAAM,CAAA;IACvB,gBAAgB,EAAE,MAAM,CAAA;IACxB,kBAAkB,EAAE,MAAM,CAAA;IAC1B,YAAY,EAAE,MAAM,CAAA;IACpB,iBAAiB,EAAE,MAAM,CAAA;IACzB,kBAAkB,EAAE,MAAM,CAAA;IAC1B;;;;;;OAMG;IACH,WAAW,EAAE,MAAM,CAAA;IACnB;;;;OAIG;IACH,WAAW,CAAC,EAAE,MAAM,CAAA;IACpB,WAAW,EAAE,MAAM,CAAA;IACnB,kBAAkB,EAAE,MAAM,CAAA;IAC1B,gBAAgB,EAAE,MAAM,CAAA;IACxB,cAAc,EAAE,MAAM,CAAA;IACtB,OAAO,EAAE,WAAW,CAAA;IACpB,QAAQ,EAAE,MAAM,CAAA;IAChB,MAAM,EAAE,UAAU,CAAA;IAClB,gBAAgB,EAAE,OAAO,CAAA;IACzB,gBAAgB,EAAE,OAAO,CAAA;IACzB,eAAe,EAAE,OAAO,CAAA;IACxB,SAAS,EAAE,OAAO,CAAA;IAClB,QAAQ,EAAE,OAAO,CAAA;IACjB,QAAQ,EAAE,OAAO,CAAA;IACjB,SAAS,EAAE,MAAM,CAAA;IACjB,SAAS,EAAE,MAAM,CAAA;IACjB,WAAW,EAAE,MAAM,CAAA;IACnB;;;;;;;OAOG;IACH,WAAW,EAAE,MAAM,CAAA;IACnB;;;;OAIG;IACH,kBAAkB,CAAC,EAAE,MAAM,CAAA;CAC5B;AAED,MAAM,MAAM,UAAU,GAAG;IACvB,CAAC,OAAO,EAAE,MAAM,GAAG;QACjB,IAAI,EAAE;YACJ,CAAC,MAAM,EAAE,MAAM,GAAG;gBAChB,IAAI,EAAE;oBACJ,CAAC,MAAM,EAAE,MAAM,GAAG,QAAQ,CAAA;iBAC3B,CAAA;gBACD,OAAO,EAAE,MAAM,CAAA;aAChB,CAAA;SACF,CAAA;QACD,WAAW,EAAE,MAAM,CAAA;KACpB,CAAA;CACF,CAAA"}

package/dist/vaults/fluid/fetchPublic.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"fetchPublic.d.ts","sourceRoot":"","sources":["../../../src/vaults/fluid/fetchPublic.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,sBAAsB,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAA;AAMtE,OAAO,EAAE,YAAY,EAAE,MAAM,SAAS,CAAA;AAEtC;;;;;;;;;;;;;;GAcG;AACH,eAAO,MAAM,iBAAiB,GAC5B,SAAS,MAAM,EACf,gBAAgB,sBAAsB,EACtC,SAAQ;IAAE,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAAA;CAAO,EACxC,YAAW,gBAAqB,KAC/B,OAAO,CAAC,YAAY,CA2DtB,CAAA"}
+{"version":3,"file":"fetchPublic.d.ts","sourceRoot":"","sources":["../../../src/vaults/fluid/fetchPublic.ts"],"names":[],"mappings":"AAUA,OAAO,EAAE,sBAAsB,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAA;AAMtE,OAAO,EAAE,YAAY,EAAE,MAAM,SAAS,CAAA;AAEtC;;;;;;;;;;;;;;GAcG;AACH,eAAO,MAAM,iBAAiB,GAC5B,SAAS,MAAM,EACf,gBAAgB,sBAAsB,EACtC,SAAQ;IAAE,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAAA;CAAO,EACxC,YAAW,gBAAqB,KAC/B,OAAO,CAAC,YAAY,CA2DtB,CAAA"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@1delta/margin-fetcher",
-  "version": "0.0.321",
+  "version": "0.0.322",
   "description": "",
   "type": "module",
   "files": [
@@ -22,12 +22,12 @@
   "dependencies": {
     "async-retry": "^1.3.3",
     "lodash": "^4.17.23",
-    "@1delta/abis": "0.0.22",
-    "@1delta/dex-registry": "0.0.103",
+    "@1delta/abis": "0.0.23",
     "@1delta/calldata-sdk": "0.0.157",
-    "@1delta/data-sdk": "0.0.30",
-    "@1delta/providers": "0.0.62",
+    "@1delta/data-sdk": "0.0.31",
+    "@1delta/dex-registry": "0.0.103",
     "@1delta/lender-registry": "0.0.34",
+    "@1delta/providers": "0.0.62",
     "@1delta/proxy-fetch": "0.0.1"
   },
   "devDependencies": {