@aztec/stdlib 0.0.1-commit.96bb3f7 → 0.0.1-commit.993d240

package/dest/messaging/l2_to_l1_membership.d.ts

@@ -1,6 +1,22 @@
 import type { EpochNumber } from '@aztec/foundation/branded-types';
 import { Fr } from '@aztec/foundation/curves/bn254';
 import { SiblingPath } from '@aztec/foundation/trees';
+import type { AztecNode } from '../interfaces/aztec-node.js';
+import { TxHash } from '../tx/tx_hash.js';
+import { TxReceipt } from '../tx/tx_receipt.js';
+/**
+ * Provides access to the L1 Outbox's per-epoch roots so the witness helper can pick the smallest
+ * partial-proof root that covers a tx's checkpoint. Implemented by `OutboxContract` in the
+ * ethereum package.
+ */
+export interface OutboxRootsReader {
+    /**
+     * Returns the array of roots stored for `epoch`. Slot `i` holds the root inserted for
+     * `numCheckpointsInEpoch = i + 1`, or `Fr.ZERO` if no proof of that depth has landed yet. The
+     * returned array length is `MAX_CHECKPOINTS_PER_EPOCH`.
+     */
+    getRoots(epoch: EpochNumber): Promise<Fr[]>;
+}
 /**
  * # L2-to-L1 Message Tree Structure and Leaf IDs
  *
@@ -30,10 +46,10 @@ import { SiblingPath } from '@aztec/foundation/trees';
  *    - Compression: If a block has no messages (out hash = 0), that branch is ignored
  *
  * 4. **Epoch Tree**
- *    - Leaves: Checkpoint out hashes from all checkpoints in an epoch (padded to AZTEC_MAX_EPOCH_DURATION)
+ *    - Leaves: Checkpoint out hashes from all checkpoints in an epoch (padded to OUT_HASH_TREE_LEAF_COUNT)
  *    - Root: Epoch out hash (set in the root rollup's public inputs and inserted into the Outbox on L1 when the epoch is proven)
  *    - Type: Unbalanced, non-compressed
- *    - **Important**: Padded with zeros up to AZTEC_MAX_EPOCH_DURATION to allow for proofs of partial epochs
+ *    - **Important**: Padded with zeros up to OUT_HASH_TREE_LEAF_COUNT to allow for proofs of partial epochs
  *
  * ## Combined Membership Proof
  * To prove a message exists in an epoch, we combine the sibling paths from all 4 trees:
@@ -84,14 +100,54 @@ import { SiblingPath } from '@aztec/foundation/trees';
  * @returns The unique leaf ID used for tracking message consumption on L1
  */
 export declare function getL2ToL1MessageLeafId(membershipWitness: Pick<L2ToL1MembershipWitness, 'leafIndex' | 'siblingPath'>): bigint;
-export interface MessageRetrieval {
-    getL2ToL1Messages(epoch: EpochNumber): Promise<Fr[][][][]>;
-}
 export type L2ToL1MembershipWitness = {
+    epochNumber: EpochNumber;
+    /**
+     * The number of checkpoints covered by the partial-proof root this witness was built against
+     * (1-indexed; equal to `roots-array-index + 1` on the Outbox). Pass this through to
+     * `Outbox.consume` so the contract reads the matching root slot.
+     */
+    numCheckpointsInEpoch: number;
+    root: Fr;
+    leafIndex: bigint;
+    siblingPath: SiblingPath<number>;
+};
+/**
+ * Computes the L2 to L1 membership witness for a given message in a transaction.
+ *
+ * Queries the L1 Outbox to find the smallest partial-proof root that covers the tx's checkpoint,
+ * then builds the witness against that root by including only the first `numCheckpointsInEpoch`
+ * checkpoints of the epoch in the tree (the remaining slots are zero-padded, matching the shape
+ * the rollup proved). Returns `undefined` if the tx is not yet in a block/epoch or if the Outbox
+ * holds no root yet that covers the tx's checkpoint.
+ *
+ * @param node - The Aztec node to query for block/tx/epoch data.
+ * @param outboxOrRoots - Either an `OutboxRootsReader` (the helper will fetch the per-epoch roots),
+ *   or an already-resolved roots array of length `MAX_CHECKPOINTS_PER_EPOCH`. Pass the array when
+ *   you already read the outbox (e.g. inside a tight loop that resolves witnesses for many
+ *   messages in the same epoch) to avoid redundant L1 reads.
+ * @param message - The L2 to L1 message hash to prove membership of.
+ * @param txHashOrReceipt - Either the tx hash, or the already-fetched `TxReceipt`. Passing the
+ *   receipt skips an internal `getTxReceipt` call.
+ * @param messageIndexInTx - Optional index of the message within the transaction's L2-to-L1 messages.
+ *   If not provided, the message is found by scanning the tx's messages (throws if duplicates exist).
+ */
+export declare function computeL2ToL1MembershipWitness(node: Pick<AztecNode, 'getL2ToL1Messages' | 'getTxReceipt' | 'getTxEffect' | 'getBlock' | 'getCheckpointsData'>, outboxOrRoots: OutboxRootsReader | Fr[], message: Fr, txHashOrReceipt: TxHash | Pick<TxReceipt, 'txHash' | 'epochNumber' | 'blockNumber'>, messageIndexInTx?: number): Promise<L2ToL1MembershipWitness | undefined>;
+/**
+ * Computes a membership witness for a message in the epoch's L2-to-L1 message tree, given explicit position indices.
+ *
+ * @param messagesInEpoch - All L2-to-L1 messages in the epoch, organized as checkpoints → blocks → txs → messages.
+ * @param message - The message hash to prove membership of.
+ * @param checkpointIndex - Index of the checkpoint within the epoch's message array.
+ * @param blockIndex - Index of the block within the checkpoint.
+ * @param txIndex - Index of the transaction within the block.
+ * @param messageIndexInTx - Optional index of the message within the transaction's messages.
+ *   If not provided, the message is found by scanning (throws if duplicates exist within the tx).
+ */
+/** @internal Exported for testing only. */
+export declare function computeL2ToL1MembershipWitnessFromMessagesInEpoch(messagesInEpoch: Fr[][][][], message: Fr, checkpointIndex: number, blockIndex: number, txIndex: number, messageIndexInTx?: number): {
     root: Fr;
     leafIndex: bigint;
     siblingPath: SiblingPath<number>;
 };
-export declare function computeL2ToL1MembershipWitness(messageRetriever: MessageRetrieval, epoch: EpochNumber, message: Fr): Promise<L2ToL1MembershipWitness | undefined>;
-export declare function computeL2ToL1MembershipWitnessFromMessagesInEpoch(messagesInEpoch: Fr[][][][], message: Fr): L2ToL1MembershipWitness;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibDJfdG9fbDFfbWVtYmVyc2hpcC5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL21lc3NhZ2luZy9sMl90b19sMV9tZW1iZXJzaGlwLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUNBLE9BQU8sS0FBSyxFQUFFLFdBQVcsRUFBRSxNQUFNLGlDQUFpQyxDQUFDO0FBQ25FLE9BQU8sRUFBRSxFQUFFLEVBQUUsTUFBTSxnQ0FBZ0MsQ0FBQztBQUNwRCxPQUFPLEVBQUUsV0FBVyxFQUE0RCxNQUFNLHlCQUF5QixDQUFDO0FBRWhIOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7R0F3RUc7QUFFSDs7Ozs7Ozs7R0FRRztBQUNILHdCQUFnQixzQkFBc0IsQ0FDcEMsaUJBQWlCLEVBQUUsSUFBSSxDQUFDLHVCQUF1QixFQUFFLFdBQVcsR0FBRyxhQUFhLENBQUMsR0FDNUUsTUFBTSxDQUVSO0FBRUQsTUFBTSxXQUFXLGdCQUFnQjtJQUMvQixpQkFBaUIsQ0FBQyxLQUFLLEVBQUUsV0FBVyxHQUFHLE9BQU8sQ0FBQyxFQUFFLEVBQUUsRUFBRSxFQUFFLEVBQUUsQ0FBQyxDQUFDO0NBQzVEO0FBRUQsTUFBTSxNQUFNLHVCQUF1QixHQUFHO0lBQ3BDLElBQUksRUFBRSxFQUFFLENBQUM7SUFDVCxTQUFTLEVBQUUsTUFBTSxDQUFDO0lBQ2xCLFdBQVcsRUFBRSxXQUFXLENBQUMsTUFBTSxDQUFDLENBQUM7Q0FDbEMsQ0FBQztBQUVGLHdCQUFzQiw4QkFBOEIsQ0FDbEQsZ0JBQWdCLEVBQUUsZ0JBQWdCLEVBQ2xDLEtBQUssRUFBRSxXQUFXLEVBQ2xCLE9BQU8sRUFBRSxFQUFFLEdBQ1YsT0FBTyxDQUFDLHVCQUF1QixHQUFHLFNBQVMsQ0FBQyxDQU85QztBQUlELHdCQUFnQixpREFBaUQsQ0FDL0QsZUFBZSxFQUFFLEVBQUUsRUFBRSxFQUFFLEVBQUUsRUFBRSxFQUMzQixPQUFPLEVBQUUsRUFBRSxHQUNWLHVCQUF1QixDQW1GekIifQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibDJfdG9fbDFfbWVtYmVyc2hpcC5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL21lc3NhZ2luZy9sMl90b19sMV9tZW1iZXJzaGlwLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUNBLE9BQU8sS0FBSyxFQUFFLFdBQVcsRUFBRSxNQUFNLGlDQUFpQyxDQUFDO0FBQ25FLE9BQU8sRUFBRSxFQUFFLEVBQUUsTUFBTSxnQ0FBZ0MsQ0FBQztBQUNwRCxPQUFPLEVBQUUsV0FBVyxFQUE0RCxNQUFNLHlCQUF5QixDQUFDO0FBRWhILE9BQU8sS0FBSyxFQUFFLFNBQVMsRUFBRSxNQUFNLDZCQUE2QixDQUFDO0FBQzdELE9BQU8sRUFBRSxNQUFNLEVBQUUsTUFBTSxrQkFBa0IsQ0FBQztBQUMxQyxPQUFPLEVBQUUsU0FBUyxFQUFFLE1BQU0scUJBQXFCLENBQUM7QUFFaEQ7Ozs7R0FJRztBQUNILE1BQU0sV0FBVyxpQkFBaUI7SUFDaEM7Ozs7T0FJRztJQUNILFFBQVEsQ0FBQyxLQUFLLEVBQUUsV0FBVyxHQUFHLE9BQU8sQ0FBQyxFQUFFLEVBQUUsQ0FBQyxDQUFDO0NBQzdDO0FBRUQ7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7OztHQXdFRztBQUVIOzs7Ozs7OztHQVFHO0FBQ0gsd0JBQWdCLHNCQUFzQixDQUNwQyxpQkFBaUIsRUFBRSxJQUFJLENBQUMsdUJBQXVCLEVBQUUsV0FBVyxHQUFHLGFBQWEsQ0FBQyxHQUM1RSxNQUFNLENBRVI7QUFFRCxNQUFNLE1BQU0sdUJBQXVCLEdBQUc7SUFDcEMsV0FBVyxFQUFFLFdBQVcsQ0FBQztJQUN6Qjs7OztPQUlHO0lBQ0gscUJBQXFCLEVBQUUsTUFBTSxDQUFDO0lBQzlCLElBQUksRUFBRSxFQUFFLENBQUM7SUFDVCxTQUFTLEVBQUUsTUFBTSxDQUFDO0lBQ2xCLFdBQVcsRUFBRSxXQUFXLENBQUMsTUFBTSxDQUFDLENBQUM7Q0FDbEMsQ0FBQztBQUVGOzs7Ozs7Ozs7Ozs7Ozs7Ozs7O0dBbUJHO0FBQ0gsd0JBQXNCLDhCQUE4QixDQUNsRCxJQUFJLEVBQUUsSUFBSSxDQUFDLFNBQVMsRUFBRSxtQkFBbUIsR0FBRyxjQUFjLEdBQUcsYUFBYSxHQUFHLFVBQVUsR0FBRyxvQkFBb0IsQ0FBQyxFQUMvRyxhQUFhLEVBQUUsaUJBQWlCLEdBQUcsRUFBRSxFQUFFLEVBQ3ZDLE9BQU8sRUFBRSxFQUFFLEVBQ1gsZUFBZSxFQUFFLE1BQU0sR0FBRyxJQUFJLENBQUMsU0FBUyxFQUFFLFFBQVEsR0FBRyxhQUFhLEdBQUcsYUFBYSxDQUFDLEVBQ25GLGdCQUFnQixDQUFDLEVBQUUsTUFBTSxHQUN4QixPQUFPLENBQUMsdUJBQXVCLEdBQUcsU0FBUyxDQUFDLENBK0Q5QztBQWdCRDs7Ozs7Ozs7OztHQVVHO0FBQ0gsMkNBQTJDO0FBQzNDLHdCQUFnQixpREFBaUQsQ0FDL0QsZUFBZSxFQUFFLEVBQUUsRUFBRSxFQUFFLEVBQUUsRUFBRSxFQUMzQixPQUFPLEVBQUUsRUFBRSxFQUNYLGVBQWUsRUFBRSxNQUFNLEVBQ3ZCLFVBQVUsRUFBRSxNQUFNLEVBQ2xCLE9BQU8sRUFBRSxNQUFNLEVBQ2YsZ0JBQWdCLENBQUMsRUFBRSxNQUFNLEdBQ3hCO0lBQUUsSUFBSSxFQUFFLEVBQUUsQ0FBQztJQUFDLFNBQVMsRUFBRSxNQUFNLENBQUM7SUFBQyxXQUFXLEVBQUUsV0FBVyxDQUFDLE1BQU0sQ0FBQyxDQUFBO0NBQUUsQ0FvRW5FIn0=

package/dest/messaging/l2_to_l1_membership.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"l2_to_l1_membership.d.ts","sourceRoot":"","sources":["../../src/messaging/l2_to_l1_membership.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,iCAAiC,CAAC;AACnE,OAAO,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AACpD,OAAO,EAAE,WAAW,EAA4D,MAAM,yBAAyB,CAAC;AAEhH;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAwEG;AAEH;;;;;;;;GAQG;AACH,wBAAgB,sBAAsB,CACpC,iBAAiB,EAAE,IAAI,CAAC,uBAAuB,EAAE,WAAW,GAAG,aAAa,CAAC,GAC5E,MAAM,CAER;AAED,MAAM,WAAW,gBAAgB;IAC/B,iBAAiB,CAAC,KAAK,EAAE,WAAW,GAAG,OAAO,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC;CAC5D;AAED,MAAM,MAAM,uBAAuB,GAAG;IACpC,IAAI,EAAE,EAAE,CAAC;IACT,SAAS,EAAE,MAAM,CAAC;IAClB,WAAW,EAAE,WAAW,CAAC,MAAM,CAAC,CAAC;CAClC,CAAC;AAEF,wBAAsB,8BAA8B,CAClD,gBAAgB,EAAE,gBAAgB,EAClC,KAAK,EAAE,WAAW,EAClB,OAAO,EAAE,EAAE,GACV,OAAO,CAAC,uBAAuB,GAAG,SAAS,CAAC,CAO9C;AAID,wBAAgB,iDAAiD,CAC/D,eAAe,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAC3B,OAAO,EAAE,EAAE,GACV,uBAAuB,CAmFzB"}
+{"version":3,"file":"l2_to_l1_membership.d.ts","sourceRoot":"","sources":["../../src/messaging/l2_to_l1_membership.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,iCAAiC,CAAC;AACnE,OAAO,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AACpD,OAAO,EAAE,WAAW,EAA4D,MAAM,yBAAyB,CAAC;AAEhH,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,6BAA6B,CAAC;AAC7D,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAC1C,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAEhD;;;;GAIG;AACH,MAAM,WAAW,iBAAiB;IAChC;;;;OAIG;IACH,QAAQ,CAAC,KAAK,EAAE,WAAW,GAAG,OAAO,CAAC,EAAE,EAAE,CAAC,CAAC;CAC7C;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAwEG;AAEH;;;;;;;;GAQG;AACH,wBAAgB,sBAAsB,CACpC,iBAAiB,EAAE,IAAI,CAAC,uBAAuB,EAAE,WAAW,GAAG,aAAa,CAAC,GAC5E,MAAM,CAER;AAED,MAAM,MAAM,uBAAuB,GAAG;IACpC,WAAW,EAAE,WAAW,CAAC;IACzB;;;;OAIG;IACH,qBAAqB,EAAE,MAAM,CAAC;IAC9B,IAAI,EAAE,EAAE,CAAC;IACT,SAAS,EAAE,MAAM,CAAC;IAClB,WAAW,EAAE,WAAW,CAAC,MAAM,CAAC,CAAC;CAClC,CAAC;AAEF;;;;;;;;;;;;;;;;;;;GAmBG;AACH,wBAAsB,8BAA8B,CAClD,IAAI,EAAE,IAAI,CAAC,SAAS,EAAE,mBAAmB,GAAG,cAAc,GAAG,aAAa,GAAG,UAAU,GAAG,oBAAoB,CAAC,EAC/G,aAAa,EAAE,iBAAiB,GAAG,EAAE,EAAE,EACvC,OAAO,EAAE,EAAE,EACX,eAAe,EAAE,MAAM,GAAG,IAAI,CAAC,SAAS,EAAE,QAAQ,GAAG,aAAa,GAAG,aAAa,CAAC,EACnF,gBAAgB,CAAC,EAAE,MAAM,GACxB,OAAO,CAAC,uBAAuB,GAAG,SAAS,CAAC,CA+D9C;AAgBD;;;;;;;;;;GAUG;AACH,2CAA2C;AAC3C,wBAAgB,iDAAiD,CAC/D,eAAe,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAC3B,OAAO,EAAE,EAAE,EACX,eAAe,EAAE,MAAM,EACvB,UAAU,EAAE,MAAM,EAClB,OAAO,EAAE,MAAM,EACf,gBAAgB,CAAC,EAAE,MAAM,GACxB;IAAE,IAAI,EAAE,EAAE,CAAC;IAAC,SAAS,EAAE,MAAM,CAAC;IAAC,WAAW,EAAE,WAAW,CAAC,MAAM,CAAC,CAAA;CAAE,CAoEnE"}

package/dest/messaging/l2_to_l1_membership.js

@@ -1,4 +1,4 @@
-import { AZTEC_MAX_EPOCH_DURATION } from '@aztec/constants';
+import { MAX_CHECKPOINTS_PER_EPOCH, OUT_HASH_TREE_LEAF_COUNT } from '@aztec/constants';
 import { Fr } from '@aztec/foundation/curves/bn254';
 import { SiblingPath, UnbalancedMerkleTreeCalculator, computeUnbalancedShaRoot } from '@aztec/foundation/trees';
 /**
@@ -30,10 +30,10 @@ import { SiblingPath, UnbalancedMerkleTreeCalculator, computeUnbalancedShaRoot }
  *    - Compression: If a block has no messages (out hash = 0), that branch is ignored
  *
  * 4. **Epoch Tree**
- *    - Leaves: Checkpoint out hashes from all checkpoints in an epoch (padded to AZTEC_MAX_EPOCH_DURATION)
+ *    - Leaves: Checkpoint out hashes from all checkpoints in an epoch (padded to OUT_HASH_TREE_LEAF_COUNT)
  *    - Root: Epoch out hash (set in the root rollup's public inputs and inserted into the Outbox on L1 when the epoch is proven)
  *    - Type: Unbalanced, non-compressed
- *    - **Important**: Padded with zeros up to AZTEC_MAX_EPOCH_DURATION to allow for proofs of partial epochs
+ *    - **Important**: Padded with zeros up to OUT_HASH_TREE_LEAF_COUNT to allow for proofs of partial epochs
  *
  * ## Combined Membership Proof
  * To prove a message exists in an epoch, we combine the sibling paths from all 4 trees:
@@ -84,38 +84,105 @@ import { SiblingPath, UnbalancedMerkleTreeCalculator, computeUnbalancedShaRoot }
  */ export function getL2ToL1MessageLeafId(membershipWitness) {
     return 2n ** BigInt(membershipWitness.siblingPath.pathSize) + membershipWitness.leafIndex;
 }
-export async function computeL2ToL1MembershipWitness(messageRetriever, epoch, message) {
-    const messagesInEpoch = await messageRetriever.getL2ToL1Messages(epoch);
-    if (messagesInEpoch.length === 0) {
+/**
+ * Computes the L2 to L1 membership witness for a given message in a transaction.
+ *
+ * Queries the L1 Outbox to find the smallest partial-proof root that covers the tx's checkpoint,
+ * then builds the witness against that root by including only the first `numCheckpointsInEpoch`
+ * checkpoints of the epoch in the tree (the remaining slots are zero-padded, matching the shape
+ * the rollup proved). Returns `undefined` if the tx is not yet in a block/epoch or if the Outbox
+ * holds no root yet that covers the tx's checkpoint.
+ *
+ * @param node - The Aztec node to query for block/tx/epoch data.
+ * @param outboxOrRoots - Either an `OutboxRootsReader` (the helper will fetch the per-epoch roots),
+ *   or an already-resolved roots array of length `MAX_CHECKPOINTS_PER_EPOCH`. Pass the array when
+ *   you already read the outbox (e.g. inside a tight loop that resolves witnesses for many
+ *   messages in the same epoch) to avoid redundant L1 reads.
+ * @param message - The L2 to L1 message hash to prove membership of.
+ * @param txHashOrReceipt - Either the tx hash, or the already-fetched `TxReceipt`. Passing the
+ *   receipt skips an internal `getTxReceipt` call.
+ * @param messageIndexInTx - Optional index of the message within the transaction's L2-to-L1 messages.
+ *   If not provided, the message is found by scanning the tx's messages (throws if duplicates exist).
+ */ export async function computeL2ToL1MembershipWitness(node, outboxOrRoots, message, txHashOrReceipt, messageIndexInTx) {
+    const receipt = 'txHash' in txHashOrReceipt ? txHashOrReceipt : await node.getTxReceipt(txHashOrReceipt);
+    const { txHash, epochNumber, blockNumber } = receipt;
+    if (epochNumber === undefined || blockNumber === undefined) {
         return undefined;
     }
-    return computeL2ToL1MembershipWitnessFromMessagesInEpoch(messagesInEpoch, message);
-}
-// TODO: Allow to specify the message to consume by its index or by an offset, in case there are multiple messages with
-// the same value.
-export function computeL2ToL1MembershipWitnessFromMessagesInEpoch(messagesInEpoch, message) {
-    // Find the index of the message in the tx, index of the tx in the block, and index of the block in the epoch.
-    let messageIndexInTx = -1;
-    let txIndex = -1;
-    let blockIndex = -1;
-    const checkpointIndex = messagesInEpoch.findIndex((messagesInCheckpoint)=>{
-        blockIndex = messagesInCheckpoint.findIndex((messagesInBlock)=>{
-            txIndex = messagesInBlock.findIndex((messagesInTx)=>{
-                messageIndexInTx = messagesInTx.findIndex((msg)=>msg.equals(message));
-                return messageIndexInTx !== -1;
-            });
-            return txIndex !== -1;
-        });
-        return blockIndex !== -1;
-    });
+    const [messagesInEpoch, block, txEffect, checkpointsData] = await Promise.all([
+        node.getL2ToL1Messages(epochNumber),
+        node.getBlock(blockNumber),
+        node.getTxEffect(txHash),
+        node.getCheckpointsData({
+            epoch: epochNumber
+        })
+    ]);
+    if (messagesInEpoch.length === 0 || !block || !txEffect) {
+        return undefined;
+    }
+    const checkpointIndex = checkpointsData.findIndex((c)=>c.checkpointNumber === block.checkpointNumber);
     if (checkpointIndex === -1) {
-        throw new Error('The L2ToL1Message you are trying to prove inclusion of does not exist');
+        return undefined;
     }
-    // Build the tx tree.
+    const blockIndex = block.indexWithinCheckpoint;
+    const txIndex = txEffect.txIndexInBlock;
+    // Pick the smallest partial-proof root on the Outbox that covers checkpointIndex. The Outbox
+    // stores roots keyed by `numCheckpointsInEpoch - 1`, so to cover a tx in checkpoint at index
+    // `checkpointIndex` we need a non-zero entry at array index >= checkpointIndex.
+    const roots = Array.isArray(outboxOrRoots) ? outboxOrRoots : await outboxOrRoots.getRoots(epochNumber);
+    const numCheckpointsInEpoch = findSmallestCoveringRootCount(roots, checkpointIndex);
+    if (numCheckpointsInEpoch === undefined) {
+        return undefined;
+    }
+    // Build the witness against the first `numCheckpointsInEpoch` checkpoints. The inner builder
+    // pads to OUT_HASH_TREE_LEAF_COUNT internally, so slicing the outer array narrows the real-leaf
+    // prefix and grows the zero suffix — exactly the shape the rollup proved against.
+    const messagesInPartialEpoch = messagesInEpoch.slice(0, numCheckpointsInEpoch);
+    const { root, leafIndex, siblingPath } = computeL2ToL1MembershipWitnessFromMessagesInEpoch(messagesInPartialEpoch, message, checkpointIndex, blockIndex, txIndex, messageIndexInTx);
+    // Cross-check: the recomputed root must equal the root the Outbox is holding for this depth.
+    // A mismatch means the node and L1 disagree about the epoch's contents; fail loud rather than
+    // return a witness that will revert on chain.
+    const expected = roots[numCheckpointsInEpoch - 1];
+    if (!root.equals(expected)) {
+        throw new Error(`Local epoch out-hash does not match Outbox at epoch ${epochNumber} numCheckpointsInEpoch ` + `${numCheckpointsInEpoch}: local=${root.toString()} outbox=${expected.toString()}`);
+    }
+    return {
+        epochNumber,
+        numCheckpointsInEpoch,
+        root,
+        leafIndex,
+        siblingPath
+    };
+}
+/**
+ * Returns the smallest `numCheckpointsInEpoch` (1-indexed) for which the Outbox holds a root that
+ * covers the message at `checkpointIndex` (0-indexed). Returns `undefined` if no covering root has
+ * been inserted yet.
+ */ function findSmallestCoveringRootCount(roots, checkpointIndex) {
+    for(let i = checkpointIndex; i < Math.min(roots.length, MAX_CHECKPOINTS_PER_EPOCH); i++){
+        if (!roots[i].isZero()) {
+            return i + 1;
+        }
+    }
+    return undefined;
+}
+/**
+ * Computes a membership witness for a message in the epoch's L2-to-L1 message tree, given explicit position indices.
+ *
+ * @param messagesInEpoch - All L2-to-L1 messages in the epoch, organized as checkpoints → blocks → txs → messages.
+ * @param message - The message hash to prove membership of.
+ * @param checkpointIndex - Index of the checkpoint within the epoch's message array.
+ * @param blockIndex - Index of the block within the checkpoint.
+ * @param txIndex - Index of the transaction within the block.
+ * @param messageIndexInTx - Optional index of the message within the transaction's messages.
+ *   If not provided, the message is found by scanning (throws if duplicates exist within the tx).
+ */ /** @internal Exported for testing only. */ export function computeL2ToL1MembershipWitnessFromMessagesInEpoch(messagesInEpoch, message, checkpointIndex, blockIndex, txIndex, messageIndexInTx) {
     const messagesInTx = messagesInEpoch[checkpointIndex][blockIndex][txIndex];
+    const resolvedMessageIndex = resolveMessageIndex(messagesInTx, message, messageIndexInTx);
+    // Build the tx tree.
     const txTree = UnbalancedMerkleTreeCalculator.create(messagesInTx.map((msg)=>msg.toBuffer()));
     // Get the sibling path of the target message in the tx tree.
-    const pathToMessageInTxSubtree = txTree.getSiblingPathByLeafIndex(messageIndexInTx);
+    const pathToMessageInTxSubtree = txTree.getSiblingPathByLeafIndex(resolvedMessageIndex);
     // Build the tree of the block containing the target message.
     const blockTree = buildBlockTree(messagesInEpoch[checkpointIndex][blockIndex]);
     // Get the sibling path of the tx out hash in the block tree.
@@ -131,11 +198,13 @@ export function computeL2ToL1MembershipWitnessFromMessagesInEpoch(messagesInEpoc
         }
         return buildCheckpointTree(messagesInCheckpoint).getRoot();
     });
-    // Pad to AZTEC_MAX_EPOCH_DURATION with zeros.
+    // Pad to OUT_HASH_TREE_LEAF_COUNT with zeros.
     checkpointOutHashes = checkpointOutHashes.concat(Array.from({
-        length: AZTEC_MAX_EPOCH_DURATION - messagesInEpoch.length
+        length: OUT_HASH_TREE_LEAF_COUNT - messagesInEpoch.length
     }, ()=>Buffer.alloc(32)));
-    // Build the epoch tree with all the checkpoint out hashes, including the padded zeros
+    // Build the epoch tree with all the checkpoint out hashes, including the padded zeros.
+    // Note: The epoch tree is actually a balanced tree, but we use an unbalanced tree calculator here to avoid turning
+    // this function into async.
     const epochTree = UnbalancedMerkleTreeCalculator.create(checkpointOutHashes);
     // Get the sibling path of the checkpoint out hash in the epoch tree.
     const pathToCheckpointOutHashInEpochTree = epochTree.getSiblingPathByLeafIndex(checkpointIndex);
@@ -147,7 +216,7 @@ export function computeL2ToL1MembershipWitnessFromMessagesInEpoch(messagesInEpoc
     // Compute the combined index.
     // It is the index of the message in the balanced tree (by filling up the wonky tree with empty nodes) at its current
     // height. It's used to validate the membership proof.
-    const messageLeafPosition = txTree.getLeafLocation(messageIndexInTx);
+    const messageLeafPosition = txTree.getLeafLocation(resolvedMessageIndex);
     const txLeafPosition = blockTree.getLeafLocation(txIndex);
     const blockLeafPosition = checkpointTree.getLeafLocation(blockIndex);
     const checkpointLeafPosition = epochTree.getLeafLocation(checkpointIndex);
@@ -163,6 +232,27 @@ export function computeL2ToL1MembershipWitnessFromMessagesInEpoch(messagesInEpoc
         siblingPath: new SiblingPath(combinedPath.length, combinedPath)
     };
 }
+function resolveMessageIndex(messagesInTx, message, messageIndexInTx) {
+    if (messageIndexInTx !== undefined) {
+        if (!messagesInTx[messageIndexInTx]?.equals(message)) {
+            throw new Error(`Message at index ${messageIndexInTx} in tx does not match the expected message ${message}`);
+        }
+        return messageIndexInTx;
+    }
+    const indices = messagesInTx.reduce((acc, msg, i)=>{
+        if (msg.equals(message)) {
+            acc.push(i);
+        }
+        return acc;
+    }, []);
+    if (indices.length === 0) {
+        throw new Error('The L2ToL1Message you are trying to prove inclusion of does not exist');
+    }
+    if (indices.length > 1) {
+        throw new Error(`Multiple messages with the same value ${message} found in tx (indices: ${indices.join(', ')}). ` + `Provide messageIndexInTx to disambiguate.`);
+    }
+    return indices[0];
+}
 function buildCheckpointTree(messagesInCheckpoint) {
     const blockOutHashes = messagesInCheckpoint.map((messagesInBlock)=>buildBlockTree(messagesInBlock).getRoot());
     return buildCompressedTree(blockOutHashes);

package/dest/messaging/l2_to_l1_message.d.ts

@@ -1,25 +1,19 @@
 import { Fr } from '@aztec/foundation/curves/bn254';
 import { EthAddress } from '@aztec/foundation/eth-address';
-import { BufferReader, FieldReader } from '@aztec/foundation/serialize';
+import { BufferReader, BufferSink, FieldReader } from '@aztec/foundation/serialize';
 import { z } from 'zod';
 import { AztecAddress } from '../aztec-address/index.js';
 export declare class L2ToL1Message {
     recipient: EthAddress;
     content: Fr;
     constructor(recipient: EthAddress, content: Fr);
-    static get schema(): z.ZodEffects<z.ZodObject<{
-        recipient: z.ZodType<EthAddress, any, string>;
-        content: z.ZodType<Fr, any, string>;
-    }, "strip", z.ZodTypeAny, {
+    static get schema(): z.ZodPipe<z.ZodObject<{
+        recipient: z.ZodType<EthAddress, string, z.core.$ZodTypeInternals<EthAddress, string>>;
+        content: z.ZodType<Fr, string, z.core.$ZodTypeInternals<Fr, string>>;
+    }, z.core.$strip>, z.ZodTransform<L2ToL1Message, {
         recipient: EthAddress;
         content: Fr;
-    }, {
-        recipient: string;
-        content: string;
-    }>, L2ToL1Message, {
-        recipient: string;
-        content: string;
-    }>;
+    }>>;
     /**
      * Creates an empty L2ToL1Message with default values.
      * @returns An instance of L2ToL1Message with empty fields.
@@ -44,6 +38,7 @@ export declare class L2ToL1Message {
      * @returns The buffer.
      */
     toBuffer(): Buffer;
+    toBuffer(sink: BufferSink): void;
     /**
      * Serializes the L2ToL1Message into an array of fields.
      * @returns An array of fields representing the serialized message.
@@ -72,41 +67,24 @@ export declare class CountedL2ToL1Message {
     message: L2ToL1Message;
     counter: number;
     constructor(message: L2ToL1Message, counter: number);
-    static get schema(): z.ZodEffects<z.ZodObject<{
-        message: z.ZodEffects<z.ZodObject<{
-            recipient: z.ZodType<EthAddress, any, string>;
-            content: z.ZodType<Fr, any, string>;
-        }, "strip", z.ZodTypeAny, {
+    static get schema(): z.ZodPipe<z.ZodObject<{
+        message: z.ZodPipe<z.ZodObject<{
+            recipient: z.ZodType<EthAddress, string, z.core.$ZodTypeInternals<EthAddress, string>>;
+            content: z.ZodType<Fr, string, z.core.$ZodTypeInternals<Fr, string>>;
+        }, z.core.$strip>, z.ZodTransform<L2ToL1Message, {
             recipient: EthAddress;
             content: Fr;
-        }, {
-            recipient: string;
-            content: string;
-        }>, L2ToL1Message, {
-            recipient: string;
-            content: string;
-        }>;
+        }>>;
         counter: z.ZodNumber;
-    }, "strip", z.ZodTypeAny, {
+    }, z.core.$strip>, z.ZodTransform<CountedL2ToL1Message, {
         message: L2ToL1Message;
         counter: number;
-    }, {
-        message: {
-            recipient: string;
-            content: string;
-        };
-        counter: number;
-    }>, CountedL2ToL1Message, {
-        message: {
-            recipient: string;
-            content: string;
-        };
-        counter: number;
-    }>;
+    }>>;
     static empty(): CountedL2ToL1Message;
     isEmpty(): boolean;
     static fromBuffer(buffer: Buffer | BufferReader): CountedL2ToL1Message;
     toBuffer(): Buffer;
+    toBuffer(sink: BufferSink): void;
     static fromFields(fields: Fr[] | FieldReader): CountedL2ToL1Message;
     toFields(): Fr[];
 }
@@ -114,37 +92,19 @@ export declare class ScopedL2ToL1Message {
     message: L2ToL1Message;
     contractAddress: AztecAddress;
     constructor(message: L2ToL1Message, contractAddress: AztecAddress);
-    static get schema(): z.ZodEffects<z.ZodObject<{
-        message: z.ZodEffects<z.ZodObject<{
-            recipient: z.ZodType<EthAddress, any, string>;
-            content: z.ZodType<Fr, any, string>;
-        }, "strip", z.ZodTypeAny, {
+    static get schema(): z.ZodPipe<z.ZodObject<{
+        message: z.ZodPipe<z.ZodObject<{
+            recipient: z.ZodType<EthAddress, string, z.core.$ZodTypeInternals<EthAddress, string>>;
+            content: z.ZodType<Fr, string, z.core.$ZodTypeInternals<Fr, string>>;
+        }, z.core.$strip>, z.ZodTransform<L2ToL1Message, {
             recipient: EthAddress;
             content: Fr;
-        }, {
-            recipient: string;
-            content: string;
-        }>, L2ToL1Message, {
-            recipient: string;
-            content: string;
-        }>;
+        }>>;
         contractAddress: import("@aztec/foundation/schemas").ZodFor<AztecAddress>;
-    }, "strip", z.ZodTypeAny, {
+    }, z.core.$strip>, z.ZodTransform<ScopedL2ToL1Message, {
         message: L2ToL1Message;
         contractAddress: AztecAddress;
-    }, {
-        message: {
-            recipient: string;
-            content: string;
-        };
-        contractAddress?: any;
-    }>, ScopedL2ToL1Message, {
-        message: {
-            recipient: string;
-            content: string;
-        };
-        contractAddress?: any;
-    }>;
+    }>>;
     static empty(): ScopedL2ToL1Message;
     equals(other: ScopedL2ToL1Message): boolean;
     /**
@@ -158,6 +118,7 @@ export declare class ScopedL2ToL1Message {
     isEmpty(): boolean;
     static fromBuffer(buffer: Buffer | BufferReader): ScopedL2ToL1Message;
     toBuffer(): Buffer;
+    toBuffer(sink: BufferSink): void;
     static fromFields(fields: Fr[] | FieldReader): ScopedL2ToL1Message;
     toFields(): Fr[];
 }
@@ -165,66 +126,31 @@ export declare class ScopedCountedL2ToL1Message {
     inner: CountedL2ToL1Message;
     contractAddress: AztecAddress;
     constructor(inner: CountedL2ToL1Message, contractAddress: AztecAddress);
-    static get schema(): z.ZodEffects<z.ZodObject<{
-        inner: z.ZodEffects<z.ZodObject<{
-            message: z.ZodEffects<z.ZodObject<{
-                recipient: z.ZodType<EthAddress, any, string>;
-                content: z.ZodType<Fr, any, string>;
-            }, "strip", z.ZodTypeAny, {
+    static get schema(): z.ZodPipe<z.ZodObject<{
+        inner: z.ZodPipe<z.ZodObject<{
+            message: z.ZodPipe<z.ZodObject<{
+                recipient: z.ZodType<EthAddress, string, z.core.$ZodTypeInternals<EthAddress, string>>;
+                content: z.ZodType<Fr, string, z.core.$ZodTypeInternals<Fr, string>>;
+            }, z.core.$strip>, z.ZodTransform<L2ToL1Message, {
                 recipient: EthAddress;
                 content: Fr;
-            }, {
-                recipient: string;
-                content: string;
-            }>, L2ToL1Message, {
-                recipient: string;
-                content: string;
-            }>;
+            }>>;
             counter: z.ZodNumber;
-        }, "strip", z.ZodTypeAny, {
+        }, z.core.$strip>, z.ZodTransform<CountedL2ToL1Message, {
             message: L2ToL1Message;
             counter: number;
-        }, {
-            message: {
-                recipient: string;
-                content: string;
-            };
-            counter: number;
-        }>, CountedL2ToL1Message, {
-            message: {
-                recipient: string;
-                content: string;
-            };
-            counter: number;
-        }>;
+        }>>;
         contractAddress: import("@aztec/foundation/schemas").ZodFor<AztecAddress>;
-    }, "strip", z.ZodTypeAny, {
+    }, z.core.$strip>, z.ZodTransform<ScopedCountedL2ToL1Message, {
         inner: CountedL2ToL1Message;
         contractAddress: AztecAddress;
-    }, {
-        inner: {
-            message: {
-                recipient: string;
-                content: string;
-            };
-            counter: number;
-        };
-        contractAddress?: any;
-    }>, ScopedCountedL2ToL1Message, {
-        inner: {
-            message: {
-                recipient: string;
-                content: string;
-            };
-            counter: number;
-        };
-        contractAddress?: any;
-    }>;
+    }>>;
     static empty(): ScopedCountedL2ToL1Message;
     isEmpty(): boolean;
     static fromBuffer(buffer: Buffer | BufferReader): ScopedCountedL2ToL1Message;
     toBuffer(): Buffer;
+    toBuffer(sink: BufferSink): void;
     static fromFields(fields: Fr[] | FieldReader): ScopedCountedL2ToL1Message;
     toFields(): Fr[];
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibDJfdG9fbDFfbWVzc2FnZS5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL21lc3NhZ2luZy9sMl90b19sMV9tZXNzYWdlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxFQUFFLEVBQUUsTUFBTSxnQ0FBZ0MsQ0FBQztBQUNwRCxPQUFPLEVBQUUsVUFBVSxFQUFFLE1BQU0sK0JBQStCLENBQUM7QUFFM0QsT0FBTyxFQUFFLFlBQVksRUFBRSxXQUFXLEVBQXdDLE1BQU0sNkJBQTZCLENBQUM7QUFFOUcsT0FBTyxFQUFFLENBQUMsRUFBRSxNQUFNLEtBQUssQ0FBQztBQUV4QixPQUFPLEVBQUUsWUFBWSxFQUFFLE1BQU0sMkJBQTJCLENBQUM7QUFFekQscUJBQWEsYUFBYTtJQUVmLFNBQVMsRUFBRSxVQUFVO0lBQ3JCLE9BQU8sRUFBRSxFQUFFO0lBRnBCLFlBQ1MsU0FBUyxFQUFFLFVBQVUsRUFDckIsT0FBTyxFQUFFLEVBQUUsRUFDaEI7SUFFSixNQUFNLEtBQUssTUFBTTs7Ozs7Ozs7Ozs7O09BT2hCO0lBRUQ7OztPQUdHO0lBQ0gsTUFBTSxDQUFDLEtBQUssSUFBSSxhQUFhLENBRTVCO0lBRUQ7Ozs7OztPQU1HO0lBQ0gsTUFBTSxDQUFDLGVBQWUsQ0FBQyxHQUFHLEVBQUUsR0FBRyxHQUFHLGFBQWEsQ0FFOUM7SUFFRDs7OztPQUlHO0lBQ0gsTUFBTSxDQUFDLEtBQUssRUFBRSxhQUFhLEdBQUcsT0FBTyxDQUVwQztJQUVEOzs7T0FHRztJQUNILFFBQVEsSUFBSSxNQUFNLENBRWpCO0lBRUQ7OztPQUdHO0lBQ0gsUUFBUSxJQUFJLEVBQUUsRUFBRSxDQUVmO0lBRUQ7Ozs7T0FJRztJQUNILE1BQU0sQ0FBQyxVQUFVLENBQUMsTUFBTSxFQUFFLEVBQUUsRUFBRSxHQUFHLFdBQVcsR0FBRyxhQUFhLENBRzNEO0lBRUQ7Ozs7T0FJRztJQUNILE1BQU0sQ0FBQyxVQUFVLENBQUMsTUFBTSxFQUFFLE1BQU0sR0FBRyxZQUFZLEdBQUcsYUFBYSxDQUc5RDtJQUVEOzs7T0FHRztJQUNILE9BQU8sSUFBSSxPQUFPLENBRWpCO0lBRUQsS0FBSyxDQUFDLGVBQWUsRUFBRSxZQUFZLEdBQUcsbUJBQW1CLENBRXhEO0NBQ0Y7QUFFRCxxQkFBYSxvQkFBb0I7SUFFdEIsT0FBTyxFQUFFLGFBQWE7SUFDdEIsT0FBTyxFQUFFLE1BQU07SUFGeEIsWUFDUyxPQUFPLEVBQUUsYUFBYSxFQUN0QixPQUFPLEVBQUUsTUFBTSxFQUNwQjtJQUVKLE1BQU0sS0FBSyxNQUFNOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7T0FPaEI7SUFFRCxNQUFNLENBQUMsS0FBSyx5QkFFWDtJQUVELE9BQU8sSUFBSSxPQUFPLENBRWpCO0lBRUQsTUFBTSxDQUFDLFVBQVUsQ0FBQyxNQUFNLEVBQUUsTUFBTSxHQUFHLFlBQVksd0JBRzlDO0lBRUQsUUFBUSxJQUFJLE1BQU0sQ0FFakI7SUFFRCxNQUFNLENBQUMsVUFBVSxDQUFDLE1BQU0sRUFBRSxFQUFFLEVBQUUsR0FBRyxXQUFXLHdCQUczQztJQUVELFFBQVEsSUFBSSxFQUFFLEVBQUUsQ0FFZjtDQUNGO0FBRUQscUJBQWEsbUJBQW1CO0lBRXJCLE9BQU8sRUFBRSxhQUFhO0lBQ3RCLGVBQWUsRUFBRSxZQUFZO0lBRnRDLFlBQ1MsT0FBTyxFQUFFLGFBQWEsRUFDdEIsZUFBZSxFQUFFLFlBQVksRUFDbEM7SUFFSixNQUFNLEtBQUssTUFBTTs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O09BT2hCO0lBRUQsTUFBTSxDQUFDLEtBQUssd0JBRVg7SUFFRCxNQUFNLENBQUMsS0FBSyxFQUFFLG1CQUFtQixHQUFHLE9BQU8sQ0FFMUM7SUFFRDs7Ozs7O09BTUc7SUFDSCxNQUFNLENBQUMsZUFBZSxDQUFDLEdBQUcsRUFBRSxHQUFHLEdBQUcsbUJBQW1CLENBS3BEO0lBRUQsT0FBTyxJQUFJLE9BQU8sQ0FFakI7SUFFRCxNQUFNLENBQUMsVUFBVSxDQUFDLE1BQU0sRUFBRSxNQUFNLEdBQUcsWUFBWSx1QkFHOUM7SUFFRCxRQUFRLElBQUksTUFBTSxDQUVqQjtJQUVELE1BQU0sQ0FBQyxVQUFVLENBQUMsTUFBTSxFQUFFLEVBQUUsRUFBRSxHQUFHLFdBQVcsdUJBRzNDO0lBRUQsUUFBUSxJQUFJLEVBQUUsRUFBRSxDQUVmO0NBQ0Y7QUFFRCxxQkFBYSwwQkFBMEI7SUFFNUIsS0FBSyxFQUFFLG9CQUFvQjtJQUMzQixlQUFlLEVBQUUsWUFBWTtJQUZ0QyxZQUNTLEtBQUssRUFBRSxvQkFBb0IsRUFDM0IsZUFBZSxFQUFFLFlBQVksRUFDbEM7SUFFSixNQUFNLEtBQUssTUFBTTs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O09BT2hCO0lBRUQsTUFBTSxDQUFDLEtBQUssK0JBRVg7SUFFRCxPQUFPLElBQUksT0FBTyxDQUVqQjtJQUVELE1BQU0sQ0FBQyxVQUFVLENBQUMsTUFBTSxFQUFFLE1BQU0sR0FBRyxZQUFZLDhCQUc5QztJQUVELFFBQVEsSUFBSSxNQUFNLENBRWpCO0lBRUQsTUFBTSxDQUFDLFVBQVUsQ0FBQyxNQUFNLEVBQUUsRUFBRSxFQUFFLEdBQUcsV0FBVyw4QkFHM0M7SUFFRCxRQUFRLElBQUksRUFBRSxFQUFFLENBRWY7Q0FDRiJ9
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibDJfdG9fbDFfbWVzc2FnZS5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL21lc3NhZ2luZy9sMl90b19sMV9tZXNzYWdlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxFQUFFLEVBQUUsTUFBTSxnQ0FBZ0MsQ0FBQztBQUNwRCxPQUFPLEVBQUUsVUFBVSxFQUFFLE1BQU0sK0JBQStCLENBQUM7QUFFM0QsT0FBTyxFQUFFLFlBQVksRUFBRSxVQUFVLEVBQUUsV0FBVyxFQUFzQyxNQUFNLDZCQUE2QixDQUFDO0FBRXhILE9BQU8sRUFBRSxDQUFDLEVBQUUsTUFBTSxLQUFLLENBQUM7QUFFeEIsT0FBTyxFQUFFLFlBQVksRUFBRSxNQUFNLDJCQUEyQixDQUFDO0FBRXpELHFCQUFhLGFBQWE7SUFFZixTQUFTLEVBQUUsVUFBVTtJQUNyQixPQUFPLEVBQUUsRUFBRTtJQUZwQixZQUNTLFNBQVMsRUFBRSxVQUFVLEVBQ3JCLE9BQU8sRUFBRSxFQUFFLEVBQ2hCO0lBRUosTUFBTSxLQUFLLE1BQU07Ozs7OztRQU9oQjtJQUVEOzs7T0FHRztJQUNILE1BQU0sQ0FBQyxLQUFLLElBQUksYUFBYSxDQUU1QjtJQUVEOzs7Ozs7T0FNRztJQUNILE1BQU0sQ0FBQyxlQUFlLENBQUMsR0FBRyxFQUFFLEdBQUcsR0FBRyxhQUFhLENBRTlDO0lBRUQ7Ozs7T0FJRztJQUNILE1BQU0sQ0FBQyxLQUFLLEVBQUUsYUFBYSxHQUFHLE9BQU8sQ0FFcEM7SUFFRDs7O09BR0c7SUFDSCxRQUFRLElBQUksTUFBTSxDQUFDO0lBQ25CLFFBQVEsQ0FBQyxJQUFJLEVBQUUsVUFBVSxHQUFHLElBQUksQ0FBQztJQVFqQzs7O09BR0c7SUFDSCxRQUFRLElBQUksRUFBRSxFQUFFLENBRWY7SUFFRDs7OztPQUlHO0lBQ0gsTUFBTSxDQUFDLFVBQVUsQ0FBQyxNQUFNLEVBQUUsRUFBRSxFQUFFLEdBQUcsV0FBVyxHQUFHLGFBQWEsQ0FHM0Q7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

package/dest/messaging/l2_to_l1_message.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"l2_to_l1_message.d.ts","sourceRoot":"","sources":["../../src/messaging/l2_to_l1_message.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"l2_to_l1_message.d.ts","sourceRoot":"","sources":["../../src/messaging/l2_to_l1_message.ts"],"names":[],"mappings":"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"}

package/dest/messaging/l2_to_l1_message.js

@@ -1,7 +1,7 @@
 import { Fr } from '@aztec/foundation/curves/bn254';
 import { EthAddress } from '@aztec/foundation/eth-address';
 import { schemas } from '@aztec/foundation/schemas';
-import { BufferReader, FieldReader, serializeToBuffer, serializeToFields } from '@aztec/foundation/serialize';
+import { BufferReader, BufferSink, FieldReader, serializeToFields, serializeToSink } from '@aztec/foundation/serialize';
 import { z } from 'zod';
 import { AztecAddress } from '../aztec-address/index.js';
 export class L2ToL1Message {
@@ -39,11 +39,11 @@ export class L2ToL1Message {
    */ equals(other) {
         return this.recipient.equals(other.recipient) && this.content.equals(other.content);
     }
-    /**
-   * Serialize this as a buffer.
-   * @returns The buffer.
-   */ toBuffer() {
-        return serializeToBuffer(this.recipient, this.content);
+    toBuffer(sink) {
+        if (!sink) {
+            return BufferSink.serialize(this);
+        }
+        serializeToSink(sink, this.recipient, this.content);
     }
     /**
    * Serializes the L2ToL1Message into an array of fields.
@@ -103,8 +103,11 @@ export class CountedL2ToL1Message {
         const reader = BufferReader.asReader(buffer);
         return new CountedL2ToL1Message(reader.readObject(L2ToL1Message), reader.readNumber());
     }
-    toBuffer() {
-        return serializeToBuffer(this.message, this.counter);
+    toBuffer(sink) {
+        if (!sink) {
+            return BufferSink.serialize(this);
+        }
+        serializeToSink(sink, this.message, this.counter);
     }
     static fromFields(fields) {
         const reader = FieldReader.asReader(fields);
@@ -149,8 +152,11 @@ export class ScopedL2ToL1Message {
         const reader = BufferReader.asReader(buffer);
         return new ScopedL2ToL1Message(reader.readObject(L2ToL1Message), reader.readObject(AztecAddress));
     }
-    toBuffer() {
-        return serializeToBuffer(this.message, this.contractAddress);
+    toBuffer(sink) {
+        if (!sink) {
+            return BufferSink.serialize(this);
+        }
+        serializeToSink(sink, this.message, this.contractAddress);
     }
     static fromFields(fields) {
         const reader = FieldReader.asReader(fields);
@@ -183,8 +189,11 @@ export class ScopedCountedL2ToL1Message {
         const reader = BufferReader.asReader(buffer);
         return new ScopedCountedL2ToL1Message(reader.readObject(CountedL2ToL1Message), reader.readObject(AztecAddress));
     }
-    toBuffer() {
-        return serializeToBuffer(this.inner, this.contractAddress);
+    toBuffer(sink) {
+        if (!sink) {
+            return BufferSink.serialize(this);
+        }
+        serializeToSink(sink, this.inner, this.contractAddress);
     }
     static fromFields(fields) {
         const reader = FieldReader.asReader(fields);