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

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

@@ -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";
@@ -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

@@ -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}".`);
@@ -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/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.1";
+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.1";
+exports.MIDNIGHT_SDK_VERSION = "1.4.0-next.0";

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

@@ -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";
@@ -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,6 +1,6 @@
-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, mapBoundBookMarket, mapBoundBooks, mapBoundTakeableOffers, mapPriceLevel, parseValidationResponse, requestMidnightApi, } from "./helpers.js";
 export { MempoolPayloadValidationRule } from "./types.js";
@@ -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}".`);
@@ -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/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.1";
+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.1";
+export const MIDNIGHT_SDK_VERSION = "1.4.0-next.0";

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.1",
+  "version": "1.4.0-next.0",
   "author": "Morpho Association <contact@morpho.org>",
   "contributors": [
     "Rubilmax <rmilon@gmail.com>"
@@ -48,7 +48,7 @@
   },
   "devDependencies": {
     "fast-check": "^4.9.0",
-    "typescript": "^7.0.2",
+    "typescript": "7.0.2",
     "viem": "^2.55.10",
     "vitest": "^4.1.10",
     "@morpho-org/morpho-ts": "^2.11.1",