@morpho-org/midnight-sdk 1.3.0 → 1.4.0-next.0

package/lib/cjs/api/MidnightApi.d.ts

@@ -67,7 +67,7 @@ export declare class MidnightApi {
      * @param params.request - Optional fetch options forwarded to this request.
      * @returns Paginated books mapped to SDK camelCase fields.
      * @throws {MidnightApiError} when the API returns a non-2xx response.
-     * @throws {InvalidMidnightApiResponseError} when the API success response is not JSON.
+     * @throws {InvalidMidnightApiResponseError} when the API success response is not JSON, when a returned book's `market_id` does not match, or cannot be derived from, its own market params, or when a returned book falls outside the supplied `marketIds` filter.
      * @example
      * ```ts
      * import { MidnightApi } from "@morpho-org/midnight-sdk/api";
@@ -92,7 +92,7 @@ export declare class MidnightApi {
      * @param params.request - Optional fetch options forwarded to this request.
      * @returns Book snapshot mapped to SDK camelCase fields.
      * @throws {MidnightApiError} when the API returns a non-2xx response.
-     * @throws {InvalidMidnightApiResponseError} when the API success response is not JSON.
+     * @throws {InvalidMidnightApiResponseError} when the API success response is not JSON, when the returned book's `market_id` does not match, or cannot be derived from, its own market params, or when it differs from the requested `marketId`.
      * @example
      * ```ts
      * import { MidnightApi } from "@morpho-org/midnight-sdk/api";
@@ -166,12 +166,15 @@ export declare class MidnightApi {
      * @param params.units - Optional target unit amount. Mutually exclusive with `params.assets`.
      * @param params.averageWorstPrice - Optional WAD-scaled average worst price guard. Mutually exclusive with `params.slippage`.
      * @param params.slippage - Optional slippage percentage used to derive the guard. Mutually exclusive with `params.averageWorstPrice`.
+     * @param params.settlementFee - Optional current WAD-scaled settlement fee used for local guard validation. Defaults to zero.
      * @param params.baseUrl - Optional Midnight API base URL override.
      * @param params.fetch - Optional fetch implementation override.
      * @param params.request - Optional fetch options forwarded to this request.
      * @returns Quote and signed ABI-ready take caps mapped from the API response.
+     * @throws {NegativeValueError} when `settlementFee` is negative.
      * @throws {MidnightApiError} when the API returns a non-2xx response.
-     * @throws {InvalidMidnightApiResponseError} when the API success response is not JSON.
+     * @throws {InvalidMidnightApiResponseError} when the API returns a malformed success response or the returned offers imply a rounded aggregate settlement price outside the effective average-worst-price guard.
+     * @throws {SettlementFeeExceedsPriceError} when a bid's settlement fee exceeds its offer price.
      * @example
      * ```ts
      * import { MidnightApi } from "@morpho-org/midnight-sdk/api";
@@ -320,7 +323,7 @@ export declare class MidnightApi {
      * @param params.cursor - Optional opaque pagination cursor from a previous response.
      * @returns Paginated books mapped to SDK camelCase fields.
      * @throws {MidnightApiError} when the API returns a non-2xx response.
-     * @throws {InvalidMidnightApiResponseError} when the API success response is not JSON.
+     * @throws {InvalidMidnightApiResponseError} when the API success response is not JSON, when a returned book's `market_id` does not match, or cannot be derived from, its own market params, or when a returned book falls outside the supplied `marketIds` filter.
      * @example
      * ```ts
      * import { MidnightApi } from "@morpho-org/midnight-sdk/api";
@@ -340,7 +343,7 @@ export declare class MidnightApi {
      * @param params.depth - Optional maximum levels returned per side.
      * @returns Book snapshot mapped to SDK camelCase fields.
      * @throws {MidnightApiError} when the API returns a non-2xx response.
-     * @throws {InvalidMidnightApiResponseError} when the API success response is not JSON.
+     * @throws {InvalidMidnightApiResponseError} when the API success response is not JSON, when the returned book's `market_id` does not match, or cannot be derived from, its own market params, or when it differs from the requested `marketId`.
      * @example
      * ```ts
      * import { MidnightApi } from "@morpho-org/midnight-sdk/api";
@@ -411,9 +414,12 @@ export declare class MidnightApi {
      * @param params.units - Optional target unit amount. Mutually exclusive with `params.assets`.
      * @param params.averageWorstPrice - Optional WAD-scaled average worst price guard. Mutually exclusive with `params.slippage`.
      * @param params.slippage - Optional slippage percentage used to derive the guard. Mutually exclusive with `params.averageWorstPrice`.
+     * @param params.settlementFee - Optional current WAD-scaled settlement fee used for local guard validation. Defaults to zero.
      * @returns Quote and signed ABI-ready take caps mapped from the API response.
+     * @throws {NegativeValueError} when `settlementFee` is negative.
      * @throws {MidnightApiError} when the API returns a non-2xx response.
-     * @throws {InvalidMidnightApiResponseError} when the API success response is not JSON.
+     * @throws {InvalidMidnightApiResponseError} when the API returns a malformed success response or the returned offers imply a rounded aggregate settlement price outside the effective average-worst-price guard.
+     * @throws {SettlementFeeExceedsPriceError} when a bid's settlement fee exceeds its offer price.
      * @example
      * ```ts
      * import { MidnightApi } from "@morpho-org/midnight-sdk/api";

package/lib/cjs/api/MidnightApi.js

@@ -79,7 +79,7 @@ class MidnightApi {
      * @param params.request - Optional fetch options forwarded to this request.
      * @returns Paginated books mapped to SDK camelCase fields.
      * @throws {MidnightApiError} when the API returns a non-2xx response.
-     * @throws {InvalidMidnightApiResponseError} when the API success response is not JSON.
+     * @throws {InvalidMidnightApiResponseError} when the API success response is not JSON, when a returned book's `market_id` does not match, or cannot be derived from, its own market params, or when a returned book falls outside the supplied `marketIds` filter.
      * @example
      * ```ts
      * import { MidnightApi } from "@morpho-org/midnight-sdk/api";
@@ -110,7 +110,7 @@ class MidnightApi {
         });
         return {
             cursor: response.cursor,
-            data: response.data.map(helpers_js_1.mapBookMarket),
+            data: (0, helpers_js_1.mapBoundBooks)(response.data, input.marketIds),
         };
     }
     /**
@@ -125,7 +125,7 @@ class MidnightApi {
      * @param params.request - Optional fetch options forwarded to this request.
      * @returns Book snapshot mapped to SDK camelCase fields.
      * @throws {MidnightApiError} when the API returns a non-2xx response.
-     * @throws {InvalidMidnightApiResponseError} when the API success response is not JSON.
+     * @throws {InvalidMidnightApiResponseError} when the API success response is not JSON, when the returned book's `market_id` does not match, or cannot be derived from, its own market params, or when it differs from the requested `marketId`.
      * @example
      * ```ts
      * import { MidnightApi } from "@morpho-org/midnight-sdk/api";
@@ -147,7 +147,7 @@ class MidnightApi {
             },
         });
         return {
-            data: (0, helpers_js_1.mapBookMarket)(response.data),
+            data: (0, helpers_js_1.mapBoundBookMarket)(response.data, input.marketId),
         };
     }
     /**
@@ -242,12 +242,15 @@ class MidnightApi {
      * @param params.units - Optional target unit amount. Mutually exclusive with `params.assets`.
      * @param params.averageWorstPrice - Optional WAD-scaled average worst price guard. Mutually exclusive with `params.slippage`.
      * @param params.slippage - Optional slippage percentage used to derive the guard. Mutually exclusive with `params.averageWorstPrice`.
+     * @param params.settlementFee - Optional current WAD-scaled settlement fee used for local guard validation. Defaults to zero.
      * @param params.baseUrl - Optional Midnight API base URL override.
      * @param params.fetch - Optional fetch implementation override.
      * @param params.request - Optional fetch options forwarded to this request.
      * @returns Quote and signed ABI-ready take caps mapped from the API response.
+     * @throws {NegativeValueError} when `settlementFee` is negative.
      * @throws {MidnightApiError} when the API returns a non-2xx response.
-     * @throws {InvalidMidnightApiResponseError} when the API success response is not JSON.
+     * @throws {InvalidMidnightApiResponseError} when the API returns a malformed success response or the returned offers imply a rounded aggregate settlement price outside the effective average-worst-price guard.
+     * @throws {SettlementFeeExceedsPriceError} when a bid's settlement fee exceeds its offer price.
      * @example
      * ```ts
      * import { MidnightApi } from "@morpho-org/midnight-sdk/api";
@@ -263,6 +266,8 @@ class MidnightApi {
      */
     static async fetchBookQuote(params) {
         const input = params;
+        const settlementFee = BigInt(input.settlementFee ?? 0n);
+        (0, morpho_ts_1.assertNonNegative)("settlementFee", settlementFee);
         const response = await (0, helpers_js_1.requestMidnightApi)({
             ...input,
             method: "GET",
@@ -290,16 +295,20 @@ class MidnightApi {
         if (averageWorstPrice != null) {
             const guard = BigInt(averageWorstPrice);
             let filledUnits = 0n;
-            let weightedPrice = 0n;
+            let filledAssets = 0n;
             if ("units" in input && input.units != null) {
                 let remainingUnits = BigInt(input.units);
                 for (const take of takeableOffers) {
                     if (remainingUnits === 0n)
                         break;
-                    const price = index_js_1.TickLib.tickToPrice(take.offer.tick);
+                    const { buyerPrice, sellerPrice } = index_js_1.TakeAmountsLib.prices({
+                        offer: take.offer,
+                        settlementFee,
+                    });
+                    const price = input.side === "asks" ? buyerPrice : sellerPrice;
                     const filled = take.units < remainingUnits ? take.units : remainingUnits;
                     filledUnits += filled;
-                    weightedPrice += filled * price;
+                    filledAssets += morpho_ts_1.MathLib.mulDiv(filled, price, morpho_ts_1.MathLib.WAD, input.side === "asks" ? "Up" : "Down");
                     remainingUnits -= filled;
                 }
             }
@@ -308,25 +317,30 @@ class MidnightApi {
                 for (const take of takeableOffers) {
                     if (remainingAssets === 0n)
                         break;
-                    const price = index_js_1.TickLib.tickToPrice(take.offer.tick);
-                    const takeAssets = input.side === "asks"
-                        ? morpho_ts_1.MathLib.mulDivUp(take.units, price, morpho_ts_1.MathLib.WAD)
-                        : morpho_ts_1.MathLib.mulDivDown(take.units, price, morpho_ts_1.MathLib.WAD);
-                    if (takeAssets === 0n)
-                        continue;
-                    const fillsEntireTake = takeAssets <= remainingAssets;
+                    const { buyerPrice, sellerPrice } = index_js_1.TakeAmountsLib.prices({
+                        offer: take.offer,
+                        settlementFee,
+                    });
+                    const makerPrice = input.side === "asks" ? sellerPrice : buyerPrice;
+                    const settlementPrice = input.side === "asks" ? buyerPrice : sellerPrice;
+                    const takeMakerAssets = input.side === "asks"
+                        ? morpho_ts_1.MathLib.mulDivUp(take.units, makerPrice, morpho_ts_1.MathLib.WAD)
+                        : morpho_ts_1.MathLib.mulDivDown(take.units, makerPrice, morpho_ts_1.MathLib.WAD);
+                    const fillsEntireTake = takeMakerAssets <= remainingAssets;
                     const filled = fillsEntireTake
                         ? take.units
-                        : morpho_ts_1.MathLib.mulDiv(remainingAssets, morpho_ts_1.MathLib.WAD, price, input.side === "asks" ? "Down" : "Up");
+                        : morpho_ts_1.MathLib.mulDiv(remainingAssets, morpho_ts_1.MathLib.WAD, makerPrice, input.side === "asks" ? "Down" : "Up");
                     if (filled === 0n)
                         continue;
                     filledUnits += filled;
-                    weightedPrice += filled * price;
-                    remainingAssets = fillsEntireTake ? remainingAssets - takeAssets : 0n;
+                    filledAssets += morpho_ts_1.MathLib.mulDiv(filled, settlementPrice, morpho_ts_1.MathLib.WAD, input.side === "asks" ? "Up" : "Down");
+                    remainingAssets = fillsEntireTake
+                        ? remainingAssets - takeMakerAssets
+                        : 0n;
                 }
             }
             if (filledUnits > 0n) {
-                const averagePrice = morpho_ts_1.MathLib.mulDivDown(weightedPrice, 1n, filledUnits);
+                const averagePrice = morpho_ts_1.MathLib.mulDiv(filledAssets, morpho_ts_1.MathLib.WAD, filledUnits, input.side === "asks" ? "Up" : "Down");
                 const violatesGuard = input.side === "asks" ? averagePrice > guard : averagePrice < guard;
                 if (violatesGuard) {
                     throw new errors_js_1.InvalidMidnightApiResponseError(`Midnight API quote takeable offers imply average price "${averagePrice}" outside average_worst_price guard "${guard}".`);
@@ -525,7 +539,7 @@ class MidnightApi {
      * @param params.cursor - Optional opaque pagination cursor from a previous response.
      * @returns Paginated books mapped to SDK camelCase fields.
      * @throws {MidnightApiError} when the API returns a non-2xx response.
-     * @throws {InvalidMidnightApiResponseError} when the API success response is not JSON.
+     * @throws {InvalidMidnightApiResponseError} when the API success response is not JSON, when a returned book's `market_id` does not match, or cannot be derived from, its own market params, or when a returned book falls outside the supplied `marketIds` filter.
      * @example
      * ```ts
      * import { MidnightApi } from "@morpho-org/midnight-sdk/api";
@@ -550,7 +564,7 @@ class MidnightApi {
      * @param params.depth - Optional maximum levels returned per side.
      * @returns Book snapshot mapped to SDK camelCase fields.
      * @throws {MidnightApiError} when the API returns a non-2xx response.
-     * @throws {InvalidMidnightApiResponseError} when the API success response is not JSON.
+     * @throws {InvalidMidnightApiResponseError} when the API success response is not JSON, when the returned book's `market_id` does not match, or cannot be derived from, its own market params, or when it differs from the requested `marketId`.
      * @example
      * ```ts
      * import { MidnightApi } from "@morpho-org/midnight-sdk/api";
@@ -636,9 +650,12 @@ class MidnightApi {
      * @param params.units - Optional target unit amount. Mutually exclusive with `params.assets`.
      * @param params.averageWorstPrice - Optional WAD-scaled average worst price guard. Mutually exclusive with `params.slippage`.
      * @param params.slippage - Optional slippage percentage used to derive the guard. Mutually exclusive with `params.averageWorstPrice`.
+     * @param params.settlementFee - Optional current WAD-scaled settlement fee used for local guard validation. Defaults to zero.
      * @returns Quote and signed ABI-ready take caps mapped from the API response.
+     * @throws {NegativeValueError} when `settlementFee` is negative.
      * @throws {MidnightApiError} when the API returns a non-2xx response.
-     * @throws {InvalidMidnightApiResponseError} when the API success response is not JSON.
+     * @throws {InvalidMidnightApiResponseError} when the API returns a malformed success response or the returned offers imply a rounded aggregate settlement price outside the effective average-worst-price guard.
+     * @throws {SettlementFeeExceedsPriceError} when a bid's settlement fee exceeds its offer price.
      * @example
      * ```ts
      * import { MidnightApi } from "@morpho-org/midnight-sdk/api";

package/lib/cjs/api/helpers.d.ts

@@ -8,8 +8,18 @@ export declare function buildBookPath(params: {
     readonly side?: MidnightApiBookSide;
     readonly suffix?: "quote" | "takeable-offers";
 }): string;
-/** @internal Maps a book market API payload to the SDK response shape. */
+/**
+ * @internal Maps a book market API payload to the SDK response shape, rejecting any
+ * response whose advertised `market_id` cannot be derived from — or does not match —
+ * its own market params. Recomputing the id with `MarketUtils.toId` (mirroring the
+ * takeable-offers path) stops a hostile API from pairing a trusted id with foreign
+ * metadata; every book flows through here, so both bound paths reject the same substitution.
+ */
 export declare function mapBookMarket(book: ApiBookMarketResponse): MidnightApiBookMarket;
+/** @internal Maps a book market, binding its verified id to the requested market. */
+export declare function mapBoundBookMarket(book: ApiBookMarketResponse, requestedMarketId: Hash): MidnightApiBookMarket;
+/** @internal Maps listed book markets, binding each verified id to the requested market_ids filter when present. */
+export declare function mapBoundBooks(books: readonly ApiBookMarketResponse[], marketIds?: readonly Hash[]): MidnightApiBookMarket[];
 /** @internal Maps a collateral API payload to the SDK response shape. */
 export declare function mapCollateral(collateral: ApiCollateralResponse): MidnightApiCollateral;
 /** @internal Maps a price-level API payload to the SDK response shape. */

package/lib/cjs/api/helpers.js

@@ -3,6 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.requestMidnightApi = requestMidnightApi;
 exports.buildBookPath = buildBookPath;
 exports.mapBookMarket = mapBookMarket;
+exports.mapBoundBookMarket = mapBoundBookMarket;
+exports.mapBoundBooks = mapBoundBooks;
 exports.mapCollateral = mapCollateral;
 exports.mapPriceLevel = mapPriceLevel;
 exports.mapTakeableOffer = mapTakeableOffer;
@@ -90,8 +92,42 @@ function buildBookPath(params) {
     ].filter((segment) => segment !== undefined);
     return segments.map(encodeURIComponent).join("/");
 }
-/** @internal Maps a book market API payload to the SDK response shape. */
+/**
+ * @internal Maps a book market API payload to the SDK response shape, rejecting any
+ * response whose advertised `market_id` cannot be derived from — or does not match —
+ * its own market params. Recomputing the id with `MarketUtils.toId` (mirroring the
+ * takeable-offers path) stops a hostile API from pairing a trusted id with foreign
+ * metadata; every book flows through here, so both bound paths reject the same substitution.
+ */
 function mapBookMarket(book) {
+    let derivedMarketId;
+    let matchesAdvertisedId;
+    try {
+        derivedMarketId = index_js_1.MarketUtils.toId({
+            chainId: book.chain_id,
+            midnight: book.midnight,
+            loanToken: book.loan_token,
+            collateralParams: book.collaterals.map((collateral) => ({
+                token: collateral.token,
+                lltv: collateral.lltv,
+                liquidationCursor: collateral.liquidation_cursor,
+                oracle: collateral.oracle,
+            })),
+            maturity: book.maturity,
+            rcfThreshold: book.rcf_threshold,
+            enterGate: book.enter_gate,
+            liquidatorGate: book.liquidator_gate,
+        });
+        // Comparison stays inside the try so a malformed advertised `market_id`
+        // (non-hex value) surfaces as a wrapped response error, not a raw TypeError.
+        matchesAdvertisedId = (0, morpho_ts_1.isHexEqual)(derivedMarketId, book.market_id);
+    }
+    catch (cause) {
+        throw new errors_js_1.InvalidMidnightApiResponseError(`Midnight API book market_id "${book.market_id}" could not be validated against its market params.`, { cause });
+    }
+    if (!matchesAdvertisedId) {
+        throw new errors_js_1.InvalidMidnightApiResponseError(`Midnight API book market_id "${book.market_id}" does not match the id "${derivedMarketId}" derived from its market params.`);
+    }
     return {
         marketId: book.market_id,
         chainId: book.chain_id,
@@ -106,6 +142,26 @@ function mapBookMarket(book) {
         bids: book.bids.map(mapPriceLevel),
     };
 }
+/** @internal Maps a book market, binding its verified id to the requested market. */
+function mapBoundBookMarket(book, requestedMarketId) {
+    const market = mapBookMarket(book);
+    if (!(0, morpho_ts_1.isHexEqual)(market.marketId, requestedMarketId)) {
+        throw new errors_js_1.InvalidMidnightApiResponseError(`Midnight API book market_id "${market.marketId}" does not match requested market "${requestedMarketId}".`);
+    }
+    return market;
+}
+/** @internal Maps listed book markets, binding each verified id to the requested market_ids filter when present. */
+function mapBoundBooks(books, marketIds) {
+    return books.map((book) => {
+        const market = mapBookMarket(book);
+        if (marketIds != null &&
+            marketIds.length > 0 &&
+            !marketIds.some((marketId) => (0, morpho_ts_1.isHexEqual)(marketId, market.marketId))) {
+            throw new errors_js_1.InvalidMidnightApiResponseError(`Midnight API book market_id "${market.marketId}" is outside the requested market_ids filter.`);
+        }
+        return market;
+    });
+}
 /** @internal Maps a collateral API payload to the SDK response shape. */
 function mapCollateral(collateral) {
     return {

package/lib/cjs/api/types.d.ts

@@ -177,6 +177,8 @@ export type FetchBookQuoteParams = MidnightApiConfig & {
     readonly marketId: Hash;
     /** Book side to quote. */
     readonly side: MidnightApiBookSide;
+    /** Current WAD-scaled settlement fee used for local guard validation. Defaults to zero. */
+    readonly settlementFee?: BigIntish;
 } & (MidnightApiQuoteAssetsTarget | MidnightApiQuoteUnitsTarget) & (MidnightApiQuoteAverageWorstPriceGuard | MidnightApiQuoteSlippageGuard | MidnightApiQuoteWithoutGuard);
 /**
  * Parameters for {@link MidnightApi.fetchTakeableOffers}.

package/lib/cjs/api/version.generated.d.ts

@@ -1,2 +1,2 @@
 /** @internal Installed Midnight SDK package version. */
-export declare const MIDNIGHT_SDK_VERSION = "1.3.0";
+export declare const MIDNIGHT_SDK_VERSION = "1.4.0-next.0";

package/lib/cjs/api/version.generated.js

@@ -3,4 +3,4 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MIDNIGHT_SDK_VERSION = void 0;
 /** @internal Installed Midnight SDK package version. */
-exports.MIDNIGHT_SDK_VERSION = "1.3.0";
+exports.MIDNIGHT_SDK_VERSION = "1.4.0-next.0";

package/lib/cjs/fetch/utils.d.ts

@@ -3,6 +3,6 @@ import type { DeploylessFetchParameters, MidnightCallParameters } from "./types.
 /** @internal Extracts viem call parameters from Midnight fetch inputs. */
 export declare const callParameters: (params: MidnightCallParameters) => MidnightCallParameters;
 /** @internal Returns the configured deployless mode, defaulting to enabled. */
-export declare const shouldUseDeployless: (params: DeploylessFetchParameters) => boolean | "force";
+export declare const shouldUseDeployless: (params: DeploylessFetchParameters) => "force" | boolean;
 /** @internal Returns the RPC chain id and rejects configured-chain drift. */
 export declare const resolveChainId: (client: Client) => Promise<number>;

package/lib/cjs/signatures/EcrecoverRatifierUtils.d.ts

@@ -434,7 +434,7 @@ export declare namespace EcrecoverRatifierUtils {
      * console.log(EcrecoverRatifierUtils.treeTypeHash(0));
      * ```
      */
-    function treeTypeHash(height: number): "0x270da1ebafc0f24637af3612fb8c3a1d828fcb56d3637c24e86dd006b12ca7f9" | "0x828b9cdf8326a1cf234328e4d5229546a98fb72ef73624f5b6b31538e555b96c" | "0xfcb7a3ca4094246b8185620c4cf025c93032b6f0384805aa3f22afe04290e982" | "0xcc97cb1955496a5269b5a7afca62ba694edcab26ba838a1adbd257931249de92" | "0xda3feb08db360ad9e09540132ff04d2b6a596fdaa4747892217aaa4c7c9bcc31" | "0x15bd6e2aa1a7a61614187ac16d2cbf8610c8f2f3c3d9eaa380ae7a501ee3cf06" | "0xb726cb7fab1a24c28213cbd482fa5a301f127fb25feb01da341919983a72711a" | "0xcea9cd557c6f821868ea287304199d0e0554af630bfa8fe36c64eb3bbacca418" | "0xf7dbde8234e8e345cec8fc0a8ac5909ee336b214882751ecd51e7b37df4f6cdd" | "0x5400a5d43d39e6bfe910af8cb84ac77bf501d310413769dffd62ccecda8b00c6" | "0x0754209b60d99d0822b3ecd5a970f9db09df9c8998a8441e24b81f06d6c76fee" | "0xf5d561d88647c3b38ed6636709d3166819fc66f8ed52a0daf4ae186387b4646c" | "0x5801c07a6c7df039ce00a7a2b8bd92aa1cf333c30b0bc3d78768590b6063d09e" | "0xc9da7190eaf4b14c7cb1c14f9898256c0adb6b1dc303afe79594dea64fe199c0" | "0xa47534c85ac57c583568465d40fd46683d2d558d8129fe1aca01e93023afca92" | "0xb1e841691fb54f4ef85e2ed9de45d610e57f49e1e6eb2510ceead16e447dd519" | "0x4fa4f16f09f0c36c7670449a4032073380d28a60071e12ee8874bb3e5a8318fc" | "0x817bbaac8bb863670f488b454cdd5d0990d9d81871a68e9df381c3c13d3f2ba2" | "0xc447f06079bddf4b011523c4bce119e9e90fdf937de4ee88f48010406560e9c1" | "0x1608d5eb56943c667c34b413f9f8a1c24a84ddfe1301a9c25487e638de1f5822" | "0x3a677100d2e855c24a62d1e9c365bff90d02287f066a07064843ca1ee70ea113";
+    function treeTypeHash(height: number): "0x0754209b60d99d0822b3ecd5a970f9db09df9c8998a8441e24b81f06d6c76fee" | "0x15bd6e2aa1a7a61614187ac16d2cbf8610c8f2f3c3d9eaa380ae7a501ee3cf06" | "0x1608d5eb56943c667c34b413f9f8a1c24a84ddfe1301a9c25487e638de1f5822" | "0x270da1ebafc0f24637af3612fb8c3a1d828fcb56d3637c24e86dd006b12ca7f9" | "0x3a677100d2e855c24a62d1e9c365bff90d02287f066a07064843ca1ee70ea113" | "0x4fa4f16f09f0c36c7670449a4032073380d28a60071e12ee8874bb3e5a8318fc" | "0x5400a5d43d39e6bfe910af8cb84ac77bf501d310413769dffd62ccecda8b00c6" | "0x5801c07a6c7df039ce00a7a2b8bd92aa1cf333c30b0bc3d78768590b6063d09e" | "0x817bbaac8bb863670f488b454cdd5d0990d9d81871a68e9df381c3c13d3f2ba2" | "0x828b9cdf8326a1cf234328e4d5229546a98fb72ef73624f5b6b31538e555b96c" | "0xa47534c85ac57c583568465d40fd46683d2d558d8129fe1aca01e93023afca92" | "0xb1e841691fb54f4ef85e2ed9de45d610e57f49e1e6eb2510ceead16e447dd519" | "0xb726cb7fab1a24c28213cbd482fa5a301f127fb25feb01da341919983a72711a" | "0xc447f06079bddf4b011523c4bce119e9e90fdf937de4ee88f48010406560e9c1" | "0xc9da7190eaf4b14c7cb1c14f9898256c0adb6b1dc303afe79594dea64fe199c0" | "0xcc97cb1955496a5269b5a7afca62ba694edcab26ba838a1adbd257931249de92" | "0xcea9cd557c6f821868ea287304199d0e0554af630bfa8fe36c64eb3bbacca418" | "0xda3feb08db360ad9e09540132ff04d2b6a596fdaa4747892217aaa4c7c9bcc31" | "0xf5d561d88647c3b38ed6636709d3166819fc66f8ed52a0daf4ae186387b4646c" | "0xf7dbde8234e8e345cec8fc0a8ac5909ee336b214882751ecd51e7b37df4f6cdd" | "0xfcb7a3ca4094246b8185620c4cf025c93032b6f0384805aa3f22afe04290e982";
     /**
      * Builds EcrecoverRatifier typed data for a tree-like input.
      *

package/lib/cjs/signatures/EcrecoverRatifierUtils.js

@@ -817,18 +817,13 @@ var EcrecoverRatifierUtils;
                 account: params.account,
             }));
         }
-        const items = [];
-        for (const offer of tree.offers) {
-            items.push({
-                offer,
-                ratifierData: ratifierData({
-                    tree,
-                    leafIndex: items.length,
-                    signature,
-                }),
-            });
-        }
-        return items;
+        return tree.offers.map((offer, leafIndex) => ({
+            offer,
+            ratifierData: encodeRatifierData({
+                signature,
+                ...TreeUtils_js_1.TreeUtils.buildProof({ tree, leafIndex }),
+            }),
+        }));
     }
     EcrecoverRatifierUtils.ratify = ratify;
 })(EcrecoverRatifierUtils || (exports.EcrecoverRatifierUtils = EcrecoverRatifierUtils = {}));

package/lib/cjs/signatures/RatifierUtils.d.ts

@@ -76,8 +76,8 @@ export declare namespace RatifierUtils {
      * @param params.tree - Tree-like object or raw offer/group input.
      * @param params.label - Ratifier label used in validation errors.
      * @returns Normalized tree-like data and its shared ratifier.
-     * @throws {InvalidTreeError} when the tree is empty or contains multiple ratifiers.
-     * @throws {InvalidTreeHeightError} when normalized raw input exceeds the supported tree height.
+     * @throws {InvalidTreeError} when the tree fields disagree, the tree is empty, or it contains multiple ratifiers.
+     * @throws {InvalidTreeHeightError} when the tree height is unsupported.
      * @example
      * ```ts
      * import { Offer, RatifierUtils } from "@morpho-org/midnight-sdk";

package/lib/cjs/signatures/RatifierUtils.js

@@ -5,6 +5,7 @@ const errors_js_1 = require("../errors.js");
 const index_js_1 = require("../offers/index.js");
 const Group_js_1 = require("./Group.js");
 const GroupUtils_js_1 = require("./GroupUtils.js");
+const offerStructInternal_js_1 = require("./offerStructInternal.js");
 const TreeUtils_js_1 = require("./TreeUtils.js");
 function isTreeLike(tree) {
     return (!Array.isArray(tree) &&
@@ -16,6 +17,49 @@ function isTreeLike(tree) {
 }
 function normalizeTree(tree) {
     if (isTreeLike(tree)) {
+        if (!Number.isInteger(tree.height) || tree.height < 0 || tree.height > 20) {
+            throw new errors_js_1.InvalidTreeHeightError(tree.height);
+        }
+        const expectedLength = 2 ** tree.height;
+        if (tree.paddedOffers.length !== expectedLength ||
+            tree.leaves.length !== expectedLength ||
+            tree.offers.length > expectedLength) {
+            throw new errors_js_1.InvalidTreeError("Tree offers, leaves, and height describe different trees.");
+        }
+        const computedLeaves = tree.paddedOffers.map(index_js_1.OfferUtils.hashStruct);
+        const seen = new Set();
+        for (const [index, offer] of tree.offers.entries()) {
+            if ((0, offerStructInternal_js_1.isEmptyOfferStruct)(tree.paddedOffers[index], {
+                allowDefaultGroup: true,
+            })) {
+                throw new errors_js_1.InvalidTreeError("Visible offers must not contain tree padding.");
+            }
+            const hash = index_js_1.OfferUtils.hashStruct(index_js_1.OfferUtils.toStruct({ offer }));
+            if (hash.toLowerCase() !== computedLeaves[index].toLowerCase() ||
+                seen.has(hash.toLowerCase())) {
+                throw new errors_js_1.InvalidTreeError("Visible offers do not match the tree leaves.");
+            }
+            seen.add(hash.toLowerCase());
+        }
+        if (tree.paddedOffers
+            .slice(tree.offers.length)
+            .some((offer) => !(0, offerStructInternal_js_1.isEmptyOfferStruct)(offer, { allowDefaultGroup: true }))) {
+            throw new errors_js_1.InvalidTreeError("Tree padding contains offers hidden from the visible offer list.");
+        }
+        if (computedLeaves.some((leaf, index) => leaf.toLowerCase() !== tree.leaves[index].toLowerCase())) {
+            throw new errors_js_1.InvalidTreeError("Tree leaves do not match its padded offers.");
+        }
+        let level = computedLeaves;
+        while (level.length > 1) {
+            const next = [];
+            for (let index = 0; index < level.length; index += 2) {
+                next.push(TreeUtils_js_1.TreeUtils.hashNode(level[index], level[index + 1]));
+            }
+            level = next;
+        }
+        if (level[0]?.toLowerCase() !== tree.root.toLowerCase()) {
+            throw new errors_js_1.InvalidTreeError("Tree root does not match its leaves.");
+        }
         return tree;
     }
     const entries = Array.isArray(tree) ? tree : [tree];
@@ -77,8 +121,8 @@ var RatifierUtils;
      * @param params.tree - Tree-like object or raw offer/group input.
      * @param params.label - Ratifier label used in validation errors.
      * @returns Normalized tree-like data and its shared ratifier.
-     * @throws {InvalidTreeError} when the tree is empty or contains multiple ratifiers.
-     * @throws {InvalidTreeHeightError} when normalized raw input exceeds the supported tree height.
+     * @throws {InvalidTreeError} when the tree fields disagree, the tree is empty, or it contains multiple ratifiers.
+     * @throws {InvalidTreeHeightError} when the tree height is unsupported.
      * @example
      * ```ts
      * import { Offer, RatifierUtils } from "@morpho-org/midnight-sdk";

package/lib/cjs/signatures/SetterRatifierUtils.js

@@ -244,17 +244,10 @@ var SetterRatifierUtils;
             tree: params.tree,
             label: "Setter",
         });
-        const items = [];
-        for (const offer of tree.offers) {
-            items.push({
-                offer,
-                ratifierData: ratifierData({
-                    tree,
-                    leafIndex: items.length,
-                }),
-            });
-        }
-        return items;
+        return tree.offers.map((offer, leafIndex) => ({
+            offer,
+            ratifierData: encodeRatifierData(TreeUtils_js_1.TreeUtils.buildProof({ tree, leafIndex })),
+        }));
     }
     SetterRatifierUtils.ratify = ratify;
 })(SetterRatifierUtils || (exports.SetterRatifierUtils = SetterRatifierUtils = {}));

package/lib/cjs/signatures/offerStructInternal.js

@@ -32,7 +32,7 @@ exports.EMPTY_OFFER_STRUCT = {
     maxAssets: 0n,
     continuousFeeCap: 0n,
 };
-const EMPTY_OFFER_DEFAULT_GROUP = index_js_1.OfferUtils.hashStruct(exports.EMPTY_OFFER_STRUCT);
+const EMPTY_OFFER_DEFAULT_GROUP = (0, viem_1.keccak256)(index_js_1.OfferUtils.hashStruct(exports.EMPTY_OFFER_STRUCT));
 /** @internal Returns whether an address value is the zero address. */
 function isZeroAddress(value) {
     return value.toLowerCase() === viem_1.zeroAddress;
@@ -44,9 +44,9 @@ function isZeroAddress(value) {
  * decoding only treats the canonical zero-group empty struct as padding.
  */
 function isEmptyOfferStruct(offer, options = {}) {
-    const hasEmptyGroup = offer.group === viem_1.zeroHash ||
-        (options.allowDefaultGroup === true &&
-            offer.group === EMPTY_OFFER_DEFAULT_GROUP);
+    const group = offer.group.toLowerCase();
+    const hasEmptyGroup = group === viem_1.zeroHash ||
+        (options.allowDefaultGroup === true && group === EMPTY_OFFER_DEFAULT_GROUP);
     return (offer.market.chainId === 0n &&
         isZeroAddress(offer.market.midnight) &&
         isZeroAddress(offer.market.loanToken) &&

package/lib/esm/api/MidnightApi.d.ts

@@ -67,7 +67,7 @@ export declare class MidnightApi {
      * @param params.request - Optional fetch options forwarded to this request.
      * @returns Paginated books mapped to SDK camelCase fields.
      * @throws {MidnightApiError} when the API returns a non-2xx response.
-     * @throws {InvalidMidnightApiResponseError} when the API success response is not JSON.
+     * @throws {InvalidMidnightApiResponseError} when the API success response is not JSON, when a returned book's `market_id` does not match, or cannot be derived from, its own market params, or when a returned book falls outside the supplied `marketIds` filter.
      * @example
      * ```ts
      * import { MidnightApi } from "@morpho-org/midnight-sdk/api";
@@ -92,7 +92,7 @@ export declare class MidnightApi {
      * @param params.request - Optional fetch options forwarded to this request.
      * @returns Book snapshot mapped to SDK camelCase fields.
      * @throws {MidnightApiError} when the API returns a non-2xx response.
-     * @throws {InvalidMidnightApiResponseError} when the API success response is not JSON.
+     * @throws {InvalidMidnightApiResponseError} when the API success response is not JSON, when the returned book's `market_id` does not match, or cannot be derived from, its own market params, or when it differs from the requested `marketId`.
      * @example
      * ```ts
      * import { MidnightApi } from "@morpho-org/midnight-sdk/api";
@@ -166,12 +166,15 @@ export declare class MidnightApi {
      * @param params.units - Optional target unit amount. Mutually exclusive with `params.assets`.
      * @param params.averageWorstPrice - Optional WAD-scaled average worst price guard. Mutually exclusive with `params.slippage`.
      * @param params.slippage - Optional slippage percentage used to derive the guard. Mutually exclusive with `params.averageWorstPrice`.
+     * @param params.settlementFee - Optional current WAD-scaled settlement fee used for local guard validation. Defaults to zero.
      * @param params.baseUrl - Optional Midnight API base URL override.
      * @param params.fetch - Optional fetch implementation override.
      * @param params.request - Optional fetch options forwarded to this request.
      * @returns Quote and signed ABI-ready take caps mapped from the API response.
+     * @throws {NegativeValueError} when `settlementFee` is negative.
      * @throws {MidnightApiError} when the API returns a non-2xx response.
-     * @throws {InvalidMidnightApiResponseError} when the API success response is not JSON.
+     * @throws {InvalidMidnightApiResponseError} when the API returns a malformed success response or the returned offers imply a rounded aggregate settlement price outside the effective average-worst-price guard.
+     * @throws {SettlementFeeExceedsPriceError} when a bid's settlement fee exceeds its offer price.
      * @example
      * ```ts
      * import { MidnightApi } from "@morpho-org/midnight-sdk/api";
@@ -320,7 +323,7 @@ export declare class MidnightApi {
      * @param params.cursor - Optional opaque pagination cursor from a previous response.
      * @returns Paginated books mapped to SDK camelCase fields.
      * @throws {MidnightApiError} when the API returns a non-2xx response.
-     * @throws {InvalidMidnightApiResponseError} when the API success response is not JSON.
+     * @throws {InvalidMidnightApiResponseError} when the API success response is not JSON, when a returned book's `market_id` does not match, or cannot be derived from, its own market params, or when a returned book falls outside the supplied `marketIds` filter.
      * @example
      * ```ts
      * import { MidnightApi } from "@morpho-org/midnight-sdk/api";
@@ -340,7 +343,7 @@ export declare class MidnightApi {
      * @param params.depth - Optional maximum levels returned per side.
      * @returns Book snapshot mapped to SDK camelCase fields.
      * @throws {MidnightApiError} when the API returns a non-2xx response.
-     * @throws {InvalidMidnightApiResponseError} when the API success response is not JSON.
+     * @throws {InvalidMidnightApiResponseError} when the API success response is not JSON, when the returned book's `market_id` does not match, or cannot be derived from, its own market params, or when it differs from the requested `marketId`.
      * @example
      * ```ts
      * import { MidnightApi } from "@morpho-org/midnight-sdk/api";
@@ -411,9 +414,12 @@ export declare class MidnightApi {
      * @param params.units - Optional target unit amount. Mutually exclusive with `params.assets`.
      * @param params.averageWorstPrice - Optional WAD-scaled average worst price guard. Mutually exclusive with `params.slippage`.
      * @param params.slippage - Optional slippage percentage used to derive the guard. Mutually exclusive with `params.averageWorstPrice`.
+     * @param params.settlementFee - Optional current WAD-scaled settlement fee used for local guard validation. Defaults to zero.
      * @returns Quote and signed ABI-ready take caps mapped from the API response.
+     * @throws {NegativeValueError} when `settlementFee` is negative.
      * @throws {MidnightApiError} when the API returns a non-2xx response.
-     * @throws {InvalidMidnightApiResponseError} when the API success response is not JSON.
+     * @throws {InvalidMidnightApiResponseError} when the API returns a malformed success response or the returned offers imply a rounded aggregate settlement price outside the effective average-worst-price guard.
+     * @throws {SettlementFeeExceedsPriceError} when a bid's settlement fee exceeds its offer price.
      * @example
      * ```ts
      * import { MidnightApi } from "@morpho-org/midnight-sdk/api";

package/lib/esm/api/MidnightApi.js

@@ -1,8 +1,8 @@
-import { MathLib } from "@morpho-org/morpho-ts";
+import { assertNonNegative, MathLib } from "@morpho-org/morpho-ts";
 import { InvalidMidnightApiResponseError } from "../errors.js";
-import { TickLib } from "../math/index.js";
+import { TakeAmountsLib } from "../math/index.js";
 import { Payload } from "../signatures/Payload.js";
-import { buildBookPath, mapBookMarket, mapBoundTakeableOffers, mapPriceLevel, parseValidationResponse, requestMidnightApi, } from "./helpers.js";
+import { buildBookPath, mapBoundBookMarket, mapBoundBooks, mapBoundTakeableOffers, mapPriceLevel, parseValidationResponse, requestMidnightApi, } from "./helpers.js";
 export { MempoolPayloadValidationRule } from "./types.js";
 /**
  * Midnight API client and stateless helper surface for books and mempool data.
@@ -75,7 +75,7 @@ export class MidnightApi {
      * @param params.request - Optional fetch options forwarded to this request.
      * @returns Paginated books mapped to SDK camelCase fields.
      * @throws {MidnightApiError} when the API returns a non-2xx response.
-     * @throws {InvalidMidnightApiResponseError} when the API success response is not JSON.
+     * @throws {InvalidMidnightApiResponseError} when the API success response is not JSON, when a returned book's `market_id` does not match, or cannot be derived from, its own market params, or when a returned book falls outside the supplied `marketIds` filter.
      * @example
      * ```ts
      * import { MidnightApi } from "@morpho-org/midnight-sdk/api";
@@ -106,7 +106,7 @@ export class MidnightApi {
         });
         return {
             cursor: response.cursor,
-            data: response.data.map(mapBookMarket),
+            data: mapBoundBooks(response.data, input.marketIds),
         };
     }
     /**
@@ -121,7 +121,7 @@ export class MidnightApi {
      * @param params.request - Optional fetch options forwarded to this request.
      * @returns Book snapshot mapped to SDK camelCase fields.
      * @throws {MidnightApiError} when the API returns a non-2xx response.
-     * @throws {InvalidMidnightApiResponseError} when the API success response is not JSON.
+     * @throws {InvalidMidnightApiResponseError} when the API success response is not JSON, when the returned book's `market_id` does not match, or cannot be derived from, its own market params, or when it differs from the requested `marketId`.
      * @example
      * ```ts
      * import { MidnightApi } from "@morpho-org/midnight-sdk/api";
@@ -143,7 +143,7 @@ export class MidnightApi {
             },
         });
         return {
-            data: mapBookMarket(response.data),
+            data: mapBoundBookMarket(response.data, input.marketId),
         };
     }
     /**
@@ -238,12 +238,15 @@ export class MidnightApi {
      * @param params.units - Optional target unit amount. Mutually exclusive with `params.assets`.
      * @param params.averageWorstPrice - Optional WAD-scaled average worst price guard. Mutually exclusive with `params.slippage`.
      * @param params.slippage - Optional slippage percentage used to derive the guard. Mutually exclusive with `params.averageWorstPrice`.
+     * @param params.settlementFee - Optional current WAD-scaled settlement fee used for local guard validation. Defaults to zero.
      * @param params.baseUrl - Optional Midnight API base URL override.
      * @param params.fetch - Optional fetch implementation override.
      * @param params.request - Optional fetch options forwarded to this request.
      * @returns Quote and signed ABI-ready take caps mapped from the API response.
+     * @throws {NegativeValueError} when `settlementFee` is negative.
      * @throws {MidnightApiError} when the API returns a non-2xx response.
-     * @throws {InvalidMidnightApiResponseError} when the API success response is not JSON.
+     * @throws {InvalidMidnightApiResponseError} when the API returns a malformed success response or the returned offers imply a rounded aggregate settlement price outside the effective average-worst-price guard.
+     * @throws {SettlementFeeExceedsPriceError} when a bid's settlement fee exceeds its offer price.
      * @example
      * ```ts
      * import { MidnightApi } from "@morpho-org/midnight-sdk/api";
@@ -259,6 +262,8 @@ export class MidnightApi {
      */
     static async fetchBookQuote(params) {
         const input = params;
+        const settlementFee = BigInt(input.settlementFee ?? 0n);
+        assertNonNegative("settlementFee", settlementFee);
         const response = await requestMidnightApi({
             ...input,
             method: "GET",
@@ -286,16 +291,20 @@ export class MidnightApi {
         if (averageWorstPrice != null) {
             const guard = BigInt(averageWorstPrice);
             let filledUnits = 0n;
-            let weightedPrice = 0n;
+            let filledAssets = 0n;
             if ("units" in input && input.units != null) {
                 let remainingUnits = BigInt(input.units);
                 for (const take of takeableOffers) {
                     if (remainingUnits === 0n)
                         break;
-                    const price = TickLib.tickToPrice(take.offer.tick);
+                    const { buyerPrice, sellerPrice } = TakeAmountsLib.prices({
+                        offer: take.offer,
+                        settlementFee,
+                    });
+                    const price = input.side === "asks" ? buyerPrice : sellerPrice;
                     const filled = take.units < remainingUnits ? take.units : remainingUnits;
                     filledUnits += filled;
-                    weightedPrice += filled * price;
+                    filledAssets += MathLib.mulDiv(filled, price, MathLib.WAD, input.side === "asks" ? "Up" : "Down");
                     remainingUnits -= filled;
                 }
             }
@@ -304,25 +313,30 @@ export class MidnightApi {
                 for (const take of takeableOffers) {
                     if (remainingAssets === 0n)
                         break;
-                    const price = TickLib.tickToPrice(take.offer.tick);
-                    const takeAssets = input.side === "asks"
-                        ? MathLib.mulDivUp(take.units, price, MathLib.WAD)
-                        : MathLib.mulDivDown(take.units, price, MathLib.WAD);
-                    if (takeAssets === 0n)
-                        continue;
-                    const fillsEntireTake = takeAssets <= remainingAssets;
+                    const { buyerPrice, sellerPrice } = TakeAmountsLib.prices({
+                        offer: take.offer,
+                        settlementFee,
+                    });
+                    const makerPrice = input.side === "asks" ? sellerPrice : buyerPrice;
+                    const settlementPrice = input.side === "asks" ? buyerPrice : sellerPrice;
+                    const takeMakerAssets = input.side === "asks"
+                        ? MathLib.mulDivUp(take.units, makerPrice, MathLib.WAD)
+                        : MathLib.mulDivDown(take.units, makerPrice, MathLib.WAD);
+                    const fillsEntireTake = takeMakerAssets <= remainingAssets;
                     const filled = fillsEntireTake
                         ? take.units
-                        : MathLib.mulDiv(remainingAssets, MathLib.WAD, price, input.side === "asks" ? "Down" : "Up");
+                        : MathLib.mulDiv(remainingAssets, MathLib.WAD, makerPrice, input.side === "asks" ? "Down" : "Up");
                     if (filled === 0n)
                         continue;
                     filledUnits += filled;
-                    weightedPrice += filled * price;
-                    remainingAssets = fillsEntireTake ? remainingAssets - takeAssets : 0n;
+                    filledAssets += MathLib.mulDiv(filled, settlementPrice, MathLib.WAD, input.side === "asks" ? "Up" : "Down");
+                    remainingAssets = fillsEntireTake
+                        ? remainingAssets - takeMakerAssets
+                        : 0n;
                 }
             }
             if (filledUnits > 0n) {
-                const averagePrice = MathLib.mulDivDown(weightedPrice, 1n, filledUnits);
+                const averagePrice = MathLib.mulDiv(filledAssets, MathLib.WAD, filledUnits, input.side === "asks" ? "Up" : "Down");
                 const violatesGuard = input.side === "asks" ? averagePrice > guard : averagePrice < guard;
                 if (violatesGuard) {
                     throw new InvalidMidnightApiResponseError(`Midnight API quote takeable offers imply average price "${averagePrice}" outside average_worst_price guard "${guard}".`);
@@ -521,7 +535,7 @@ export class MidnightApi {
      * @param params.cursor - Optional opaque pagination cursor from a previous response.
      * @returns Paginated books mapped to SDK camelCase fields.
      * @throws {MidnightApiError} when the API returns a non-2xx response.
-     * @throws {InvalidMidnightApiResponseError} when the API success response is not JSON.
+     * @throws {InvalidMidnightApiResponseError} when the API success response is not JSON, when a returned book's `market_id` does not match, or cannot be derived from, its own market params, or when a returned book falls outside the supplied `marketIds` filter.
      * @example
      * ```ts
      * import { MidnightApi } from "@morpho-org/midnight-sdk/api";
@@ -546,7 +560,7 @@ export class MidnightApi {
      * @param params.depth - Optional maximum levels returned per side.
      * @returns Book snapshot mapped to SDK camelCase fields.
      * @throws {MidnightApiError} when the API returns a non-2xx response.
-     * @throws {InvalidMidnightApiResponseError} when the API success response is not JSON.
+     * @throws {InvalidMidnightApiResponseError} when the API success response is not JSON, when the returned book's `market_id` does not match, or cannot be derived from, its own market params, or when it differs from the requested `marketId`.
      * @example
      * ```ts
      * import { MidnightApi } from "@morpho-org/midnight-sdk/api";
@@ -632,9 +646,12 @@ export class MidnightApi {
      * @param params.units - Optional target unit amount. Mutually exclusive with `params.assets`.
      * @param params.averageWorstPrice - Optional WAD-scaled average worst price guard. Mutually exclusive with `params.slippage`.
      * @param params.slippage - Optional slippage percentage used to derive the guard. Mutually exclusive with `params.averageWorstPrice`.
+     * @param params.settlementFee - Optional current WAD-scaled settlement fee used for local guard validation. Defaults to zero.
      * @returns Quote and signed ABI-ready take caps mapped from the API response.
+     * @throws {NegativeValueError} when `settlementFee` is negative.
      * @throws {MidnightApiError} when the API returns a non-2xx response.
-     * @throws {InvalidMidnightApiResponseError} when the API success response is not JSON.
+     * @throws {InvalidMidnightApiResponseError} when the API returns a malformed success response or the returned offers imply a rounded aggregate settlement price outside the effective average-worst-price guard.
+     * @throws {SettlementFeeExceedsPriceError} when a bid's settlement fee exceeds its offer price.
      * @example
      * ```ts
      * import { MidnightApi } from "@morpho-org/midnight-sdk/api";

package/lib/esm/api/helpers.d.ts

@@ -8,8 +8,18 @@ export declare function buildBookPath(params: {
     readonly side?: MidnightApiBookSide;
     readonly suffix?: "quote" | "takeable-offers";
 }): string;
-/** @internal Maps a book market API payload to the SDK response shape. */
+/**
+ * @internal Maps a book market API payload to the SDK response shape, rejecting any
+ * response whose advertised `market_id` cannot be derived from — or does not match —
+ * its own market params. Recomputing the id with `MarketUtils.toId` (mirroring the
+ * takeable-offers path) stops a hostile API from pairing a trusted id with foreign
+ * metadata; every book flows through here, so both bound paths reject the same substitution.
+ */
 export declare function mapBookMarket(book: ApiBookMarketResponse): MidnightApiBookMarket;
+/** @internal Maps a book market, binding its verified id to the requested market. */
+export declare function mapBoundBookMarket(book: ApiBookMarketResponse, requestedMarketId: Hash): MidnightApiBookMarket;
+/** @internal Maps listed book markets, binding each verified id to the requested market_ids filter when present. */
+export declare function mapBoundBooks(books: readonly ApiBookMarketResponse[], marketIds?: readonly Hash[]): MidnightApiBookMarket[];
 /** @internal Maps a collateral API payload to the SDK response shape. */
 export declare function mapCollateral(collateral: ApiCollateralResponse): MidnightApiCollateral;
 /** @internal Maps a price-level API payload to the SDK response shape. */

package/lib/esm/api/helpers.js

@@ -80,8 +80,42 @@ export function buildBookPath(params) {
     ].filter((segment) => segment !== undefined);
     return segments.map(encodeURIComponent).join("/");
 }
-/** @internal Maps a book market API payload to the SDK response shape. */
+/**
+ * @internal Maps a book market API payload to the SDK response shape, rejecting any
+ * response whose advertised `market_id` cannot be derived from — or does not match —
+ * its own market params. Recomputing the id with `MarketUtils.toId` (mirroring the
+ * takeable-offers path) stops a hostile API from pairing a trusted id with foreign
+ * metadata; every book flows through here, so both bound paths reject the same substitution.
+ */
 export function mapBookMarket(book) {
+    let derivedMarketId;
+    let matchesAdvertisedId;
+    try {
+        derivedMarketId = MarketUtils.toId({
+            chainId: book.chain_id,
+            midnight: book.midnight,
+            loanToken: book.loan_token,
+            collateralParams: book.collaterals.map((collateral) => ({
+                token: collateral.token,
+                lltv: collateral.lltv,
+                liquidationCursor: collateral.liquidation_cursor,
+                oracle: collateral.oracle,
+            })),
+            maturity: book.maturity,
+            rcfThreshold: book.rcf_threshold,
+            enterGate: book.enter_gate,
+            liquidatorGate: book.liquidator_gate,
+        });
+        // Comparison stays inside the try so a malformed advertised `market_id`
+        // (non-hex value) surfaces as a wrapped response error, not a raw TypeError.
+        matchesAdvertisedId = isHexEqual(derivedMarketId, book.market_id);
+    }
+    catch (cause) {
+        throw new InvalidMidnightApiResponseError(`Midnight API book market_id "${book.market_id}" could not be validated against its market params.`, { cause });
+    }
+    if (!matchesAdvertisedId) {
+        throw new InvalidMidnightApiResponseError(`Midnight API book market_id "${book.market_id}" does not match the id "${derivedMarketId}" derived from its market params.`);
+    }
     return {
         marketId: book.market_id,
         chainId: book.chain_id,
@@ -96,6 +130,26 @@ export function mapBookMarket(book) {
         bids: book.bids.map(mapPriceLevel),
     };
 }
+/** @internal Maps a book market, binding its verified id to the requested market. */
+export function mapBoundBookMarket(book, requestedMarketId) {
+    const market = mapBookMarket(book);
+    if (!isHexEqual(market.marketId, requestedMarketId)) {
+        throw new InvalidMidnightApiResponseError(`Midnight API book market_id "${market.marketId}" does not match requested market "${requestedMarketId}".`);
+    }
+    return market;
+}
+/** @internal Maps listed book markets, binding each verified id to the requested market_ids filter when present. */
+export function mapBoundBooks(books, marketIds) {
+    return books.map((book) => {
+        const market = mapBookMarket(book);
+        if (marketIds != null &&
+            marketIds.length > 0 &&
+            !marketIds.some((marketId) => isHexEqual(marketId, market.marketId))) {
+            throw new InvalidMidnightApiResponseError(`Midnight API book market_id "${market.marketId}" is outside the requested market_ids filter.`);
+        }
+        return market;
+    });
+}
 /** @internal Maps a collateral API payload to the SDK response shape. */
 export function mapCollateral(collateral) {
     return {

package/lib/esm/api/types.d.ts

@@ -177,6 +177,8 @@ export type FetchBookQuoteParams = MidnightApiConfig & {
     readonly marketId: Hash;
     /** Book side to quote. */
     readonly side: MidnightApiBookSide;
+    /** Current WAD-scaled settlement fee used for local guard validation. Defaults to zero. */
+    readonly settlementFee?: BigIntish;
 } & (MidnightApiQuoteAssetsTarget | MidnightApiQuoteUnitsTarget) & (MidnightApiQuoteAverageWorstPriceGuard | MidnightApiQuoteSlippageGuard | MidnightApiQuoteWithoutGuard);
 /**
  * Parameters for {@link MidnightApi.fetchTakeableOffers}.

package/lib/esm/api/version.generated.d.ts

@@ -1,2 +1,2 @@
 /** @internal Installed Midnight SDK package version. */
-export declare const MIDNIGHT_SDK_VERSION = "1.3.0";
+export declare const MIDNIGHT_SDK_VERSION = "1.4.0-next.0";

package/lib/esm/api/version.generated.js

@@ -1,3 +1,3 @@
 // Generated by scripts/release/generate-midnight-package-version.mjs. Do not edit.
 /** @internal Installed Midnight SDK package version. */
-export const MIDNIGHT_SDK_VERSION = "1.3.0";
+export const MIDNIGHT_SDK_VERSION = "1.4.0-next.0";

package/lib/esm/fetch/utils.d.ts

@@ -3,6 +3,6 @@ import type { DeploylessFetchParameters, MidnightCallParameters } from "./types.
 /** @internal Extracts viem call parameters from Midnight fetch inputs. */
 export declare const callParameters: (params: MidnightCallParameters) => MidnightCallParameters;
 /** @internal Returns the configured deployless mode, defaulting to enabled. */
-export declare const shouldUseDeployless: (params: DeploylessFetchParameters) => boolean | "force";
+export declare const shouldUseDeployless: (params: DeploylessFetchParameters) => "force" | boolean;
 /** @internal Returns the RPC chain id and rejects configured-chain drift. */
 export declare const resolveChainId: (client: Client) => Promise<number>;

package/lib/esm/signatures/EcrecoverRatifierUtils.d.ts

@@ -434,7 +434,7 @@ export declare namespace EcrecoverRatifierUtils {
      * console.log(EcrecoverRatifierUtils.treeTypeHash(0));
      * ```
      */
-    function treeTypeHash(height: number): "0x270da1ebafc0f24637af3612fb8c3a1d828fcb56d3637c24e86dd006b12ca7f9" | "0x828b9cdf8326a1cf234328e4d5229546a98fb72ef73624f5b6b31538e555b96c" | "0xfcb7a3ca4094246b8185620c4cf025c93032b6f0384805aa3f22afe04290e982" | "0xcc97cb1955496a5269b5a7afca62ba694edcab26ba838a1adbd257931249de92" | "0xda3feb08db360ad9e09540132ff04d2b6a596fdaa4747892217aaa4c7c9bcc31" | "0x15bd6e2aa1a7a61614187ac16d2cbf8610c8f2f3c3d9eaa380ae7a501ee3cf06" | "0xb726cb7fab1a24c28213cbd482fa5a301f127fb25feb01da341919983a72711a" | "0xcea9cd557c6f821868ea287304199d0e0554af630bfa8fe36c64eb3bbacca418" | "0xf7dbde8234e8e345cec8fc0a8ac5909ee336b214882751ecd51e7b37df4f6cdd" | "0x5400a5d43d39e6bfe910af8cb84ac77bf501d310413769dffd62ccecda8b00c6" | "0x0754209b60d99d0822b3ecd5a970f9db09df9c8998a8441e24b81f06d6c76fee" | "0xf5d561d88647c3b38ed6636709d3166819fc66f8ed52a0daf4ae186387b4646c" | "0x5801c07a6c7df039ce00a7a2b8bd92aa1cf333c30b0bc3d78768590b6063d09e" | "0xc9da7190eaf4b14c7cb1c14f9898256c0adb6b1dc303afe79594dea64fe199c0" | "0xa47534c85ac57c583568465d40fd46683d2d558d8129fe1aca01e93023afca92" | "0xb1e841691fb54f4ef85e2ed9de45d610e57f49e1e6eb2510ceead16e447dd519" | "0x4fa4f16f09f0c36c7670449a4032073380d28a60071e12ee8874bb3e5a8318fc" | "0x817bbaac8bb863670f488b454cdd5d0990d9d81871a68e9df381c3c13d3f2ba2" | "0xc447f06079bddf4b011523c4bce119e9e90fdf937de4ee88f48010406560e9c1" | "0x1608d5eb56943c667c34b413f9f8a1c24a84ddfe1301a9c25487e638de1f5822" | "0x3a677100d2e855c24a62d1e9c365bff90d02287f066a07064843ca1ee70ea113";
+    function treeTypeHash(height: number): "0x0754209b60d99d0822b3ecd5a970f9db09df9c8998a8441e24b81f06d6c76fee" | "0x15bd6e2aa1a7a61614187ac16d2cbf8610c8f2f3c3d9eaa380ae7a501ee3cf06" | "0x1608d5eb56943c667c34b413f9f8a1c24a84ddfe1301a9c25487e638de1f5822" | "0x270da1ebafc0f24637af3612fb8c3a1d828fcb56d3637c24e86dd006b12ca7f9" | "0x3a677100d2e855c24a62d1e9c365bff90d02287f066a07064843ca1ee70ea113" | "0x4fa4f16f09f0c36c7670449a4032073380d28a60071e12ee8874bb3e5a8318fc" | "0x5400a5d43d39e6bfe910af8cb84ac77bf501d310413769dffd62ccecda8b00c6" | "0x5801c07a6c7df039ce00a7a2b8bd92aa1cf333c30b0bc3d78768590b6063d09e" | "0x817bbaac8bb863670f488b454cdd5d0990d9d81871a68e9df381c3c13d3f2ba2" | "0x828b9cdf8326a1cf234328e4d5229546a98fb72ef73624f5b6b31538e555b96c" | "0xa47534c85ac57c583568465d40fd46683d2d558d8129fe1aca01e93023afca92" | "0xb1e841691fb54f4ef85e2ed9de45d610e57f49e1e6eb2510ceead16e447dd519" | "0xb726cb7fab1a24c28213cbd482fa5a301f127fb25feb01da341919983a72711a" | "0xc447f06079bddf4b011523c4bce119e9e90fdf937de4ee88f48010406560e9c1" | "0xc9da7190eaf4b14c7cb1c14f9898256c0adb6b1dc303afe79594dea64fe199c0" | "0xcc97cb1955496a5269b5a7afca62ba694edcab26ba838a1adbd257931249de92" | "0xcea9cd557c6f821868ea287304199d0e0554af630bfa8fe36c64eb3bbacca418" | "0xda3feb08db360ad9e09540132ff04d2b6a596fdaa4747892217aaa4c7c9bcc31" | "0xf5d561d88647c3b38ed6636709d3166819fc66f8ed52a0daf4ae186387b4646c" | "0xf7dbde8234e8e345cec8fc0a8ac5909ee336b214882751ecd51e7b37df4f6cdd" | "0xfcb7a3ca4094246b8185620c4cf025c93032b6f0384805aa3f22afe04290e982";
     /**
      * Builds EcrecoverRatifier typed data for a tree-like input.
      *

package/lib/esm/signatures/EcrecoverRatifierUtils.js

@@ -814,18 +814,13 @@ export var EcrecoverRatifierUtils;
                 account: params.account,
             }));
         }
-        const items = [];
-        for (const offer of tree.offers) {
-            items.push({
-                offer,
-                ratifierData: ratifierData({
-                    tree,
-                    leafIndex: items.length,
-                    signature,
-                }),
-            });
-        }
-        return items;
+        return tree.offers.map((offer, leafIndex) => ({
+            offer,
+            ratifierData: encodeRatifierData({
+                signature,
+                ...TreeUtils.buildProof({ tree, leafIndex }),
+            }),
+        }));
     }
     EcrecoverRatifierUtils.ratify = ratify;
 })(EcrecoverRatifierUtils || (EcrecoverRatifierUtils = {}));

package/lib/esm/signatures/RatifierUtils.d.ts

@@ -76,8 +76,8 @@ export declare namespace RatifierUtils {
      * @param params.tree - Tree-like object or raw offer/group input.
      * @param params.label - Ratifier label used in validation errors.
      * @returns Normalized tree-like data and its shared ratifier.
-     * @throws {InvalidTreeError} when the tree is empty or contains multiple ratifiers.
-     * @throws {InvalidTreeHeightError} when normalized raw input exceeds the supported tree height.
+     * @throws {InvalidTreeError} when the tree fields disagree, the tree is empty, or it contains multiple ratifiers.
+     * @throws {InvalidTreeHeightError} when the tree height is unsupported.
      * @example
      * ```ts
      * import { Offer, RatifierUtils } from "@morpho-org/midnight-sdk";

package/lib/esm/signatures/RatifierUtils.js

@@ -1,7 +1,8 @@
-import { InvalidTreeError } from "../errors.js";
-import { Offer } from "../offers/index.js";
+import { InvalidTreeError, InvalidTreeHeightError } from "../errors.js";
+import { Offer, OfferUtils } from "../offers/index.js";
 import { Group } from "./Group.js";
 import { GroupUtils } from "./GroupUtils.js";
+import { isEmptyOfferStruct } from "./offerStructInternal.js";
 import { TreeUtils } from "./TreeUtils.js";
 function isTreeLike(tree) {
     return (!Array.isArray(tree) &&
@@ -13,6 +14,49 @@ function isTreeLike(tree) {
 }
 function normalizeTree(tree) {
     if (isTreeLike(tree)) {
+        if (!Number.isInteger(tree.height) || tree.height < 0 || tree.height > 20) {
+            throw new InvalidTreeHeightError(tree.height);
+        }
+        const expectedLength = 2 ** tree.height;
+        if (tree.paddedOffers.length !== expectedLength ||
+            tree.leaves.length !== expectedLength ||
+            tree.offers.length > expectedLength) {
+            throw new InvalidTreeError("Tree offers, leaves, and height describe different trees.");
+        }
+        const computedLeaves = tree.paddedOffers.map(OfferUtils.hashStruct);
+        const seen = new Set();
+        for (const [index, offer] of tree.offers.entries()) {
+            if (isEmptyOfferStruct(tree.paddedOffers[index], {
+                allowDefaultGroup: true,
+            })) {
+                throw new InvalidTreeError("Visible offers must not contain tree padding.");
+            }
+            const hash = OfferUtils.hashStruct(OfferUtils.toStruct({ offer }));
+            if (hash.toLowerCase() !== computedLeaves[index].toLowerCase() ||
+                seen.has(hash.toLowerCase())) {
+                throw new InvalidTreeError("Visible offers do not match the tree leaves.");
+            }
+            seen.add(hash.toLowerCase());
+        }
+        if (tree.paddedOffers
+            .slice(tree.offers.length)
+            .some((offer) => !isEmptyOfferStruct(offer, { allowDefaultGroup: true }))) {
+            throw new InvalidTreeError("Tree padding contains offers hidden from the visible offer list.");
+        }
+        if (computedLeaves.some((leaf, index) => leaf.toLowerCase() !== tree.leaves[index].toLowerCase())) {
+            throw new InvalidTreeError("Tree leaves do not match its padded offers.");
+        }
+        let level = computedLeaves;
+        while (level.length > 1) {
+            const next = [];
+            for (let index = 0; index < level.length; index += 2) {
+                next.push(TreeUtils.hashNode(level[index], level[index + 1]));
+            }
+            level = next;
+        }
+        if (level[0]?.toLowerCase() !== tree.root.toLowerCase()) {
+            throw new InvalidTreeError("Tree root does not match its leaves.");
+        }
         return tree;
     }
     const entries = Array.isArray(tree) ? tree : [tree];
@@ -74,8 +118,8 @@ export var RatifierUtils;
      * @param params.tree - Tree-like object or raw offer/group input.
      * @param params.label - Ratifier label used in validation errors.
      * @returns Normalized tree-like data and its shared ratifier.
-     * @throws {InvalidTreeError} when the tree is empty or contains multiple ratifiers.
-     * @throws {InvalidTreeHeightError} when normalized raw input exceeds the supported tree height.
+     * @throws {InvalidTreeError} when the tree fields disagree, the tree is empty, or it contains multiple ratifiers.
+     * @throws {InvalidTreeHeightError} when the tree height is unsupported.
      * @example
      * ```ts
      * import { Offer, RatifierUtils } from "@morpho-org/midnight-sdk";

package/lib/esm/signatures/SetterRatifierUtils.js

@@ -241,17 +241,10 @@ export var SetterRatifierUtils;
             tree: params.tree,
             label: "Setter",
         });
-        const items = [];
-        for (const offer of tree.offers) {
-            items.push({
-                offer,
-                ratifierData: ratifierData({
-                    tree,
-                    leafIndex: items.length,
-                }),
-            });
-        }
-        return items;
+        return tree.offers.map((offer, leafIndex) => ({
+            offer,
+            ratifierData: encodeRatifierData(TreeUtils.buildProof({ tree, leafIndex })),
+        }));
     }
     SetterRatifierUtils.ratify = ratify;
 })(SetterRatifierUtils || (SetterRatifierUtils = {}));

package/lib/esm/signatures/offerStructInternal.js

@@ -1,4 +1,4 @@
-import { zeroAddress, zeroHash } from "viem";
+import { keccak256, zeroAddress, zeroHash } from "viem";
 import { OfferUtils } from "../offers/index.js";
 /** @internal Empty protocol offer struct used for Merkle padding. */
 export const EMPTY_OFFER_STRUCT = {
@@ -27,7 +27,7 @@ export const EMPTY_OFFER_STRUCT = {
     maxAssets: 0n,
     continuousFeeCap: 0n,
 };
-const EMPTY_OFFER_DEFAULT_GROUP = OfferUtils.hashStruct(EMPTY_OFFER_STRUCT);
+const EMPTY_OFFER_DEFAULT_GROUP = keccak256(OfferUtils.hashStruct(EMPTY_OFFER_STRUCT));
 /** @internal Returns whether an address value is the zero address. */
 export function isZeroAddress(value) {
     return value.toLowerCase() === zeroAddress;
@@ -39,9 +39,9 @@ export function isZeroAddress(value) {
  * decoding only treats the canonical zero-group empty struct as padding.
  */
 export function isEmptyOfferStruct(offer, options = {}) {
-    const hasEmptyGroup = offer.group === zeroHash ||
-        (options.allowDefaultGroup === true &&
-            offer.group === EMPTY_OFFER_DEFAULT_GROUP);
+    const group = offer.group.toLowerCase();
+    const hasEmptyGroup = group === zeroHash ||
+        (options.allowDefaultGroup === true && group === EMPTY_OFFER_DEFAULT_GROUP);
     return (offer.market.chainId === 0n &&
         isZeroAddress(offer.market.midnight) &&
         isZeroAddress(offer.market.loanToken) &&

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@morpho-org/midnight-sdk",
   "description": "Viem-based package for Morpho Midnight that exports protocol utilities, fetch helpers, and Midnight API utilities under a dedicated API subpath.",
-  "version": "1.3.0",
+  "version": "1.4.0-next.0",
   "author": "Morpho Association <contact@morpho.org>",
   "contributors": [
     "Rubilmax <rmilon@gmail.com>"
@@ -47,12 +47,12 @@
     "viem": "^2.0.0"
   },
   "devDependencies": {
-    "fast-check": "^4.8.0",
-    "typescript": "^6.0.3",
-    "viem": "^2.54.2",
-    "vitest": "^4.1.9",
-    "@morpho-org/morpho-ts": "^2.8.0",
-    "@morpho-org/test": "^2.8.3"
+    "fast-check": "^4.9.0",
+    "typescript": "7.0.2",
+    "viem": "^2.55.10",
+    "vitest": "^4.1.10",
+    "@morpho-org/morpho-ts": "^2.11.1",
+    "@morpho-org/test": "^2.10.0"
   },
   "scripts": {
     "prepublish": "$npm_execpath build",
@@ -61,7 +61,7 @@
     "build:cjs": "tsc --build tsconfig.build.cjs.json && echo '{\"type\":\"commonjs\"}' > lib/cjs/package.json",
     "build:esm": "tsc --build tsconfig.build.esm.json && echo '{\"type\":\"module\"}' > lib/esm/package.json",
     "generate:version": "node ../../scripts/release/generate-midnight-package-version.mjs",
-    "test": "vitest --root ../.. --project midnight-sdk"
+    "test": "vitest --root ../.. --project midnight-sdk --project midnight-sdk-fork"
   },
   "types": "./lib/esm/index.d.ts"
 }