@aztec/stdlib 0.0.1-commit.9593d84 → 0.0.1-commit.96bb3f7

package/dest/messaging/l2_to_l1_membership.js

@@ -1,63 +1,179 @@
-import { Fr } from '@aztec/foundation/fields';
+import { AZTEC_MAX_EPOCH_DURATION } from '@aztec/constants';
+import { Fr } from '@aztec/foundation/curves/bn254';
 import { SiblingPath, UnbalancedMerkleTreeCalculator, computeUnbalancedShaRoot } from '@aztec/foundation/trees';
-export async function computeL2ToL1MembershipWitness(messageRetriever, l2BlockNumber, message) {
-    const messagesForAllTxs = await messageRetriever.getL2ToL1Messages(l2BlockNumber);
-    if (!messagesForAllTxs) {
+/**
+ * # L2-to-L1 Message Tree Structure and Leaf IDs
+ *
+ * ## Overview
+ * L2-to-L1 messages are organized in a hierarchical 4-level tree structure within each epoch:
+ *   Epoch → Checkpoints → Blocks → Transactions → Messages
+ *
+ * Each level uses an unbalanced Merkle tree, and some levels use compression (skipping zero hashes).
+ *
+ * ## Tree Levels
+ *
+ * 1. **Message Tree (TX Out Hash)**
+ *    - Leaves: Individual L2-to-L1 messages within a transaction
+ *    - Root: TX out hash
+ *    - Type: Unbalanced, non-compressed (the circuits ensure that all messages are not empty.)
+ *
+ * 2. **Block Tree**
+ *    - Leaves: TX out hashes from all transactions in a block
+ *    - Root: Block out hash
+ *    - Type: Unbalanced, compressed (zero hashes are skipped)
+ *    - Compression: If a tx has no messages (out hash = 0), that branch is ignored
+ *
+ * 3. **Checkpoint Tree**
+ *    - Leaves: Block out hashes from all blocks in a checkpoint
+ *    - Root: Checkpoint out hash
+ *    - Type: Unbalanced, compressed (zero hashes are skipped)
+ *    - 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)
+ *    - 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
+ *
+ * ## Combined Membership Proof
+ * To prove a message exists in an epoch, we combine the sibling paths from all 4 trees:
+ *   [message siblings] + [tx siblings] + [block siblings] + [checkpoint siblings]
+ *
+ * ## Leaf ID: Stable Message Identification
+ *
+ * Each message gets a unique, stable **leaf ID** that identifies its position in the combined tree.
+ * The leaf ID is computed as:
+ *   leafId = 2^pathSize + leafIndex
+ *
+ * Where:
+ * - `pathSize`: Total length of the combined sibling path (from all 4 tree levels)
+ * - `leafIndex`: The message's index in a balanced tree representation at that height
+ *
+ * ### Why Leaf IDs Are Stable
+ *
+ * The leaf ID is based on the message's position in the tree structure, which is determined by:
+ * - The checkpoint index within the epoch
+ * - The block index within the checkpoint
+ * - The transaction index within the block
+ * - The message index within the transaction
+ *
+ * These indices are structural and do NOT depend on the total number of blocks/checkpoints in the epoch.
+ *
+ * ### Critical Property: Preserving Consumed Status
+ *
+ * **Problem**: On L1, epoch proofs can be submitted incrementally. For example:
+ * - First, a proof for checkpoints 1-10 of epoch 0 is submitted (proves the first 10 checkpoints)
+ * - Later, a proof for checkpoints 1-20 of epoch 0 is submitted (proves all 20 checkpoints)
+ *
+ * When the longer proof is submitted, it updates the epoch's out hash root on L1 to reflect the complete epoch (all 20
+ * checkpoints). However, some messages from checkpoints 1-10 may have already been consumed.
+ *
+ * **Solution**: The Outbox on L1 tracks consumed messages using a bitmap indexed by leaf ID.
+ * Because leaf IDs are stable (they don't change when more checkpoints are added to the epoch), messages that were consumed
+ * under the shorter proof remain marked as consumed under the longer proof.
+ *
+ * This prevents double-spending of L2-to-L1 messages when longer epoch proofs are submitted.
+ */ /**
+ * Computes the unique leaf ID for an L2-to-L1 message.
+ *
+ * The leaf ID is stable across different epoch proof lengths and is used by the Outbox
+ * on L1 to track which messages have been consumed.
+ *
+ * @param membershipWitness - Contains the leafIndex and siblingPath for the message
+ * @returns The unique leaf ID used for tracking message consumption on L1
+ */ 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) {
         return undefined;
     }
-    return computeL2ToL1MembershipWitnessFromMessagesForAllTxs(messagesForAllTxs, message);
+    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 computeL2ToL1MembershipWitnessFromMessagesForAllTxs(messagesForAllTxs, message) {
-    // Find index of message in subtree and index of tx in a block.
+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;
-    const txIndex = messagesForAllTxs.findIndex((messages)=>{
-        messageIndexInTx = messages.findIndex((msg)=>msg.equals(message));
-        return 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;
     });
-    if (txIndex === -1) {
+    if (checkpointIndex === -1) {
         throw new Error('The L2ToL1Message you are trying to prove inclusion of does not exist');
     }
-    // Get the txOutHash and the sibling path of the message in the tx subtree.
-    const txMessages = messagesForAllTxs[txIndex];
-    const txOutHashTree = UnbalancedMerkleTreeCalculator.create(txMessages.map((msg)=>msg.toBuffer()));
-    const txOutHash = txOutHashTree.getRoot();
-    const messagePathInSubtree = txOutHashTree.getSiblingPath(message.toBuffer());
-    // Calculate txOutHash for all txs.
-    const txSubtreeRoots = messagesForAllTxs.map((messages, i)=>{
-        // For a tx with no messages, we have to set an out hash of 0 to match what the circuit does.
-        if (messages.length === 0) {
-            return Fr.ZERO;
+    // Build the tx tree.
+    const messagesInTx = messagesInEpoch[checkpointIndex][blockIndex][txIndex];
+    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);
+    // 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.
+    const pathToTxOutHashInBlockTree = blockTree.getSiblingPathByLeafIndex(txIndex);
+    // Build the tree of the checkpoint containing the target message.
+    const checkpointTree = buildCheckpointTree(messagesInEpoch[checkpointIndex]);
+    // Get the sibling path of the block out hash in the checkpoint tree.
+    const pathToBlockOutHashInCheckpointTree = checkpointTree.getSiblingPathByLeafIndex(blockIndex);
+    // Compute the out hashes of all checkpoints in the epoch.
+    let checkpointOutHashes = messagesInEpoch.map((messagesInCheckpoint, i)=>{
+        if (i === checkpointIndex) {
+            return checkpointTree.getRoot();
         }
-        if (i === txIndex) {
-            return Fr.fromBuffer(txOutHash);
-        }
-        const root = computeUnbalancedShaRoot(messages.map((msg)=>msg.toBuffer()));
-        return Fr.fromBuffer(root);
+        return buildCheckpointTree(messagesInCheckpoint).getRoot();
     });
-    // Construct the top tree.
-    // The leaves of this tree are the `txOutHashes`.
-    // The root of this tree should match the `out_hash` calculated in the circuits. Zero hashes are compressed to reduce
-    // cost if the non-zero leaves result in a shorter path.
-    const valueToCompress = Buffer.alloc(32);
-    const topTree = UnbalancedMerkleTreeCalculator.create(txSubtreeRoots.map((root)=>root.toBuffer()), valueToCompress);
-    const root = Fr.fromBuffer(topTree.getRoot());
-    // Compute the combined sibling path by appending the tx subtree path to the top tree path.
-    const txPathInTopTree = topTree.getSiblingPath(txOutHash);
-    const combinedPath = messagePathInSubtree.toBufferArray().concat(txPathInTopTree.toBufferArray());
+    // Pad to AZTEC_MAX_EPOCH_DURATION with zeros.
+    checkpointOutHashes = checkpointOutHashes.concat(Array.from({
+        length: AZTEC_MAX_EPOCH_DURATION - messagesInEpoch.length
+    }, ()=>Buffer.alloc(32)));
+    // Build the epoch tree with all the checkpoint out hashes, including the padded zeros
+    const epochTree = UnbalancedMerkleTreeCalculator.create(checkpointOutHashes);
+    // Get the sibling path of the checkpoint out hash in the epoch tree.
+    const pathToCheckpointOutHashInEpochTree = epochTree.getSiblingPathByLeafIndex(checkpointIndex);
+    // The root of the epoch tree should match the `out_hash` in the root rollup's public inputs.
+    const root = Fr.fromBuffer(epochTree.getRoot());
+    // Compute the combined sibling path by appending the tx subtree path to the block tree path, then to the checkpoint
+    // tree path, then to the epoch tree path.
+    const combinedPath = pathToMessageInTxSubtree.toBufferArray().concat(pathToTxOutHashInBlockTree.toBufferArray()).concat(pathToBlockOutHashInCheckpointTree.toBufferArray()).concat(pathToCheckpointOutHashInEpochTree.toBufferArray());
     // Compute the combined index.
-    // It is the index of the message in the balanced tree at its current height.
-    const txLeafIndexAtLevel = topTree.getLeafLocation(txIndex).index;
-    const messageLeafPosition = txOutHashTree.getLeafLocation(messageIndexInTx);
-    const numLeavesInLeftSubtrees = txLeafIndexAtLevel * (1 << messageLeafPosition.level);
-    const combinedIndex = numLeavesInLeftSubtrees + messageLeafPosition.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 txLeafPosition = blockTree.getLeafLocation(txIndex);
+    const blockLeafPosition = checkpointTree.getLeafLocation(blockIndex);
+    const checkpointLeafPosition = epochTree.getLeafLocation(checkpointIndex);
+    const numLeavesInLeftCheckpoints = checkpointLeafPosition.index * (1 << blockLeafPosition.level);
+    const indexAtCheckpointLevel = numLeavesInLeftCheckpoints + blockLeafPosition.index;
+    const numLeavesInLeftBlocks = indexAtCheckpointLevel * (1 << txLeafPosition.level);
+    const indexAtTxLevel = numLeavesInLeftBlocks + txLeafPosition.index;
+    const numLeavesInLeftTxs = indexAtTxLevel * (1 << messageLeafPosition.level);
+    const combinedIndex = numLeavesInLeftTxs + messageLeafPosition.index;
     return {
         root,
         leafIndex: BigInt(combinedIndex),
         siblingPath: new SiblingPath(combinedPath.length, combinedPath)
     };
 }
-export function getL2ToL1MessageLeafId(membershipWitness) {
-    return 2n ** BigInt(membershipWitness.siblingPath.pathSize) + membershipWitness.leafIndex;
+function buildCheckpointTree(messagesInCheckpoint) {
+    const blockOutHashes = messagesInCheckpoint.map((messagesInBlock)=>buildBlockTree(messagesInBlock).getRoot());
+    return buildCompressedTree(blockOutHashes);
+}
+function buildBlockTree(messagesInBlock) {
+    const txOutHashes = messagesInBlock.map((messages)=>computeUnbalancedShaRoot(messages.map((msg)=>msg.toBuffer())));
+    return buildCompressedTree(txOutHashes);
+}
+function buildCompressedTree(leaves) {
+    // Note: If a block or tx has no messages (i.e. leaf == Buffer.alloc(32)), we ignore that branch and only accumulate
+    // the non-zero hashes to match what the circuits do.
+    const valueToCompress = Buffer.alloc(32);
+    return UnbalancedMerkleTreeCalculator.create(leaves, valueToCompress);
 }

package/dest/messaging/l2_to_l1_message.d.ts

@@ -1,5 +1,5 @@
+import { Fr } from '@aztec/foundation/curves/bn254';
 import { EthAddress } from '@aztec/foundation/eth-address';
-import { Fr } from '@aztec/foundation/fields';
 import { BufferReader, FieldReader } from '@aztec/foundation/serialize';
 import { z } from 'zod';
 import { AztecAddress } from '../aztec-address/index.js';
@@ -146,6 +146,7 @@ export declare class ScopedL2ToL1Message {
         contractAddress?: any;
     }>;
     static empty(): ScopedL2ToL1Message;
+    equals(other: ScopedL2ToL1Message): boolean;
     /**
      * Creates a ScopedL2ToL1Message instance from a plain object without Zod validation.
      * This method is optimized for performance and skips validation, making it suitable
@@ -226,4 +227,4 @@ export declare class ScopedCountedL2ToL1Message {
     static fromFields(fields: Fr[] | FieldReader): ScopedCountedL2ToL1Message;
     toFields(): Fr[];
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibDJfdG9fbDFfbWVzc2FnZS5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL21lc3NhZ2luZy9sMl90b19sMV9tZXNzYWdlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxVQUFVLEVBQUUsTUFBTSwrQkFBK0IsQ0FBQztBQUMzRCxPQUFPLEVBQUUsRUFBRSxFQUFFLE1BQU0sMEJBQTBCLENBQUM7QUFFOUMsT0FBTyxFQUFFLFlBQVksRUFBRSxXQUFXLEVBQXdDLE1BQU0sNkJBQTZCLENBQUM7QUFFOUcsT0FBTyxFQUFFLENBQUMsRUFBRSxNQUFNLEtBQUssQ0FBQztBQUV4QixPQUFPLEVBQUUsWUFBWSxFQUFFLE1BQU0sMkJBQTJCLENBQUM7QUFFekQscUJBQWEsYUFBYTtJQUVmLFNBQVMsRUFBRSxVQUFVO0lBQ3JCLE9BQU8sRUFBRSxFQUFFO0lBRnBCLFlBQ1MsU0FBUyxFQUFFLFVBQVUsRUFDckIsT0FBTyxFQUFFLEVBQUUsRUFDaEI7SUFFSixNQUFNLEtBQUssTUFBTTs7Ozs7Ozs7Ozs7O09BT2hCO0lBRUQ7OztPQUdHO0lBQ0gsTUFBTSxDQUFDLEtBQUssSUFBSSxhQUFhLENBRTVCO0lBRUQ7Ozs7OztPQU1HO0lBQ0gsTUFBTSxDQUFDLGVBQWUsQ0FBQyxHQUFHLEVBQUUsR0FBRyxHQUFHLGFBQWEsQ0FFOUM7SUFFRDs7OztPQUlHO0lBQ0gsTUFBTSxDQUFDLEtBQUssRUFBRSxhQUFhLEdBQUcsT0FBTyxDQUVwQztJQUVEOzs7T0FHRztJQUNILFFBQVEsSUFBSSxNQUFNLENBRWpCO0lBRUQ7OztPQUdHO0lBQ0gsUUFBUSxJQUFJLEVBQUUsRUFBRSxDQUVmO0lBRUQ7Ozs7T0FJRztJQUNILE1BQU0sQ0FBQyxVQUFVLENBQUMsTUFBTSxFQUFFLEVBQUUsRUFBRSxHQUFHLFdBQVcsR0FBRyxhQUFhLENBRzNEO0lBRUQ7Ozs7T0FJRztJQUNILE1BQU0sQ0FBQyxVQUFVLENBQUMsTUFBTSxFQUFFLE1BQU0sR0FBRyxZQUFZLEdBQUcsYUFBYSxDQUc5RDtJQUVEOzs7T0FHRztJQUNILE9BQU8sSUFBSSxPQUFPLENBRWpCO0lBRUQsS0FBSyxDQUFDLGVBQWUsRUFBRSxZQUFZLEdBQUcsbUJBQW1CLENBRXhEO0NBQ0Y7QUFFRCxxQkFBYSxvQkFBb0I7SUFFdEIsT0FBTyxFQUFFLGFBQWE7SUFDdEIsT0FBTyxFQUFFLE1BQU07SUFGeEIsWUFDUyxPQUFPLEVBQUUsYUFBYSxFQUN0QixPQUFPLEVBQUUsTUFBTSxFQUNwQjtJQUVKLE1BQU0sS0FBSyxNQUFNOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7T0FPaEI7SUFFRCxNQUFNLENBQUMsS0FBSyx5QkFFWDtJQUVELE9BQU8sSUFBSSxPQUFPLENBRWpCO0lBRUQsTUFBTSxDQUFDLFVBQVUsQ0FBQyxNQUFNLEVBQUUsTUFBTSxHQUFHLFlBQVksd0JBRzlDO0lBRUQsUUFBUSxJQUFJLE1BQU0sQ0FFakI7SUFFRCxNQUFNLENBQUMsVUFBVSxDQUFDLE1BQU0sRUFBRSxFQUFFLEVBQUUsR0FBRyxXQUFXLHdCQUczQztJQUVELFFBQVEsSUFBSSxFQUFFLEVBQUUsQ0FFZjtDQUNGO0FBRUQscUJBQWEsbUJBQW1CO0lBRXJCLE9BQU8sRUFBRSxhQUFhO0lBQ3RCLGVBQWUsRUFBRSxZQUFZO0lBRnRDLFlBQ1MsT0FBTyxFQUFFLGFBQWEsRUFDdEIsZUFBZSxFQUFFLFlBQVksRUFDbEM7SUFFSixNQUFNLEtBQUssTUFBTTs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O09BT2hCO0lBRUQsTUFBTSxDQUFDLEtBQUssd0JBRVg7SUFFRDs7Ozs7O09BTUc7SUFDSCxNQUFNLENBQUMsZUFBZSxDQUFDLEdBQUcsRUFBRSxHQUFHLEdBQUcsbUJBQW1CLENBS3BEO0lBRUQsT0FBTyxJQUFJLE9BQU8sQ0FFakI7SUFFRCxNQUFNLENBQUMsVUFBVSxDQUFDLE1BQU0sRUFBRSxNQUFNLEdBQUcsWUFBWSx1QkFHOUM7SUFFRCxRQUFRLElBQUksTUFBTSxDQUVqQjtJQUVELE1BQU0sQ0FBQyxVQUFVLENBQUMsTUFBTSxFQUFFLEVBQUUsRUFBRSxHQUFHLFdBQVcsdUJBRzNDO0lBRUQsUUFBUSxJQUFJLEVBQUUsRUFBRSxDQUVmO0NBQ0Y7QUFFRCxxQkFBYSwwQkFBMEI7SUFFNUIsS0FBSyxFQUFFLG9CQUFvQjtJQUMzQixlQUFlLEVBQUUsWUFBWTtJQUZ0QyxZQUNTLEtBQUssRUFBRSxvQkFBb0IsRUFDM0IsZUFBZSxFQUFFLFlBQVksRUFDbEM7SUFFSixNQUFNLEtBQUssTUFBTTs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O09BT2hCO0lBRUQsTUFBTSxDQUFDLEtBQUssK0JBRVg7SUFFRCxPQUFPLElBQUksT0FBTyxDQUVqQjtJQUVELE1BQU0sQ0FBQyxVQUFVLENBQUMsTUFBTSxFQUFFLE1BQU0sR0FBRyxZQUFZLDhCQUc5QztJQUVELFFBQVEsSUFBSSxNQUFNLENBRWpCO0lBRUQsTUFBTSxDQUFDLFVBQVUsQ0FBQyxNQUFNLEVBQUUsRUFBRSxFQUFFLEdBQUcsV0FBVyw4QkFHM0M7SUFFRCxRQUFRLElBQUksRUFBRSxFQUFFLENBRWY7Q0FDRiJ9
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibDJfdG9fbDFfbWVzc2FnZS5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL21lc3NhZ2luZy9sMl90b19sMV9tZXNzYWdlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxFQUFFLEVBQUUsTUFBTSxnQ0FBZ0MsQ0FBQztBQUNwRCxPQUFPLEVBQUUsVUFBVSxFQUFFLE1BQU0sK0JBQStCLENBQUM7QUFFM0QsT0FBTyxFQUFFLFlBQVksRUFBRSxXQUFXLEVBQXdDLE1BQU0sNkJBQTZCLENBQUM7QUFFOUcsT0FBTyxFQUFFLENBQUMsRUFBRSxNQUFNLEtBQUssQ0FBQztBQUV4QixPQUFPLEVBQUUsWUFBWSxFQUFFLE1BQU0sMkJBQTJCLENBQUM7QUFFekQscUJBQWEsYUFBYTtJQUVmLFNBQVMsRUFBRSxVQUFVO0lBQ3JCLE9BQU8sRUFBRSxFQUFFO0lBRnBCLFlBQ1MsU0FBUyxFQUFFLFVBQVUsRUFDckIsT0FBTyxFQUFFLEVBQUUsRUFDaEI7SUFFSixNQUFNLEtBQUssTUFBTTs7Ozs7Ozs7Ozs7O09BT2hCO0lBRUQ7OztPQUdHO0lBQ0gsTUFBTSxDQUFDLEtBQUssSUFBSSxhQUFhLENBRTVCO0lBRUQ7Ozs7OztPQU1HO0lBQ0gsTUFBTSxDQUFDLGVBQWUsQ0FBQyxHQUFHLEVBQUUsR0FBRyxHQUFHLGFBQWEsQ0FFOUM7SUFFRDs7OztPQUlHO0lBQ0gsTUFBTSxDQUFDLEtBQUssRUFBRSxhQUFhLEdBQUcsT0FBTyxDQUVwQztJQUVEOzs7T0FHRztJQUNILFFBQVEsSUFBSSxNQUFNLENBRWpCO0lBRUQ7OztPQUdHO0lBQ0gsUUFBUSxJQUFJLEVBQUUsRUFBRSxDQUVmO0lBRUQ7Ozs7T0FJRztJQUNILE1BQU0sQ0FBQyxVQUFVLENBQUMsTUFBTSxFQUFFLEVBQUUsRUFBRSxHQUFHLFdBQVcsR0FBRyxhQUFhLENBRzNEO0lBRUQ7Ozs7T0FJRztJQUNILE1BQU0sQ0FBQyxVQUFVLENBQUMsTUFBTSxFQUFFLE1BQU0sR0FBRyxZQUFZLEdBQUcsYUFBYSxDQUc5RDtJQUVEOzs7T0FHRztJQUNILE9BQU8sSUFBSSxPQUFPLENBRWpCO0lBRUQsS0FBSyxDQUFDLGVBQWUsRUFBRSxZQUFZLEdBQUcsbUJBQW1CLENBRXhEO0NBQ0Y7QUFFRCxxQkFBYSxvQkFBb0I7SUFFdEIsT0FBTyxFQUFFLGFBQWE7SUFDdEIsT0FBTyxFQUFFLE1BQU07SUFGeEIsWUFDUyxPQUFPLEVBQUUsYUFBYSxFQUN0QixPQUFPLEVBQUUsTUFBTSxFQUNwQjtJQUVKLE1BQU0sS0FBSyxNQUFNOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7T0FPaEI7SUFFRCxNQUFNLENBQUMsS0FBSyx5QkFFWDtJQUVELE9BQU8sSUFBSSxPQUFPLENBRWpCO0lBRUQsTUFBTSxDQUFDLFVBQVUsQ0FBQyxNQUFNLEVBQUUsTUFBTSxHQUFHLFlBQVksd0JBRzlDO0lBRUQsUUFBUSxJQUFJLE1BQU0sQ0FFakI7SUFFRCxNQUFNLENBQUMsVUFBVSxDQUFDLE1BQU0sRUFBRSxFQUFFLEVBQUUsR0FBRyxXQUFXLHdCQUczQztJQUVELFFBQVEsSUFBSSxFQUFFLEVBQUUsQ0FFZjtDQUNGO0FBRUQscUJBQWEsbUJBQW1CO0lBRXJCLE9BQU8sRUFBRSxhQUFhO0lBQ3RCLGVBQWUsRUFBRSxZQUFZO0lBRnRDLFlBQ1MsT0FBTyxFQUFFLGFBQWEsRUFDdEIsZUFBZSxFQUFFLFlBQVksRUFDbEM7SUFFSixNQUFNLEtBQUssTUFBTTs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O09BT2hCO0lBRUQsTUFBTSxDQUFDLEtBQUssd0JBRVg7SUFFRCxNQUFNLENBQUMsS0FBSyxFQUFFLG1CQUFtQixHQUFHLE9BQU8sQ0FFMUM7SUFFRDs7Ozs7O09BTUc7SUFDSCxNQUFNLENBQUMsZUFBZSxDQUFDLEdBQUcsRUFBRSxHQUFHLEdBQUcsbUJBQW1CLENBS3BEO0lBRUQsT0FBTyxJQUFJLE9BQU8sQ0FFakI7SUFFRCxNQUFNLENBQUMsVUFBVSxDQUFDLE1BQU0sRUFBRSxNQUFNLEdBQUcsWUFBWSx1QkFHOUM7SUFFRCxRQUFRLElBQUksTUFBTSxDQUVqQjtJQUVELE1BQU0sQ0FBQyxVQUFVLENBQUMsTUFBTSxFQUFFLEVBQUUsRUFBRSxHQUFHLFdBQVcsdUJBRzNDO0lBRUQsUUFBUSxJQUFJLEVBQUUsRUFBRSxDQUVmO0NBQ0Y7QUFFRCxxQkFBYSwwQkFBMEI7SUFFNUIsS0FBSyxFQUFFLG9CQUFvQjtJQUMzQixlQUFlLEVBQUUsWUFBWTtJQUZ0QyxZQUNTLEtBQUssRUFBRSxvQkFBb0IsRUFDM0IsZUFBZSxFQUFFLFlBQVksRUFDbEM7SUFFSixNQUFNLEtBQUssTUFBTTs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O09BT2hCO0lBRUQsTUFBTSxDQUFDLEtBQUssK0JBRVg7SUFFRCxPQUFPLElBQUksT0FBTyxDQUVqQjtJQUVELE1BQU0sQ0FBQyxVQUFVLENBQUMsTUFBTSxFQUFFLE1BQU0sR0FBRyxZQUFZLDhCQUc5QztJQUVELFFBQVEsSUFBSSxNQUFNLENBRWpCO0lBRUQsTUFBTSxDQUFDLFVBQVUsQ0FBQyxNQUFNLEVBQUUsRUFBRSxFQUFFLEdBQUcsV0FBVyw4QkFHM0M7SUFFRCxRQUFRLElBQUksRUFBRSxFQUFFLENBRWY7Q0FDRiJ9

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,5 +1,5 @@
+import { Fr } from '@aztec/foundation/curves/bn254';
 import { EthAddress } from '@aztec/foundation/eth-address';
-import { Fr } from '@aztec/foundation/fields';
 import { schemas } from '@aztec/foundation/schemas';
 import { BufferReader, FieldReader, serializeToBuffer, serializeToFields } from '@aztec/foundation/serialize';
 import { z } from 'zod';
@@ -130,6 +130,9 @@ export class ScopedL2ToL1Message {
     static empty() {
         return new ScopedL2ToL1Message(L2ToL1Message.empty(), AztecAddress.ZERO);
     }
+    equals(other) {
+        return this.message.equals(other.message) && this.contractAddress.equals(other.contractAddress);
+    }
     /**
    * Creates a ScopedL2ToL1Message instance from a plain object without Zod validation.
    * This method is optimized for performance and skips validation, making it suitable

package/dest/messaging/out_hash.d.ts

@@ -1,5 +1,6 @@
-import { Fr } from '@aztec/foundation/fields';
+import { Fr } from '@aztec/foundation/curves/bn254';
 export declare function computeTxOutHash(messages: Fr[]): Fr;
 export declare function computeBlockOutHash(messagesPerBlock: Fr[][]): Fr;
 export declare function computeCheckpointOutHash(messagesForAllTxs: Fr[][][]): Fr;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoib3V0X2hhc2guZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9tZXNzYWdpbmcvb3V0X2hhc2gudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLEVBQUUsRUFBRSxNQUFNLDBCQUEwQixDQUFDO0FBRzlDLHdCQUFnQixnQkFBZ0IsQ0FBQyxRQUFRLEVBQUUsRUFBRSxFQUFFLEdBQUcsRUFBRSxDQU9uRDtBQUVELHdCQUFnQixtQkFBbUIsQ0FBQyxnQkFBZ0IsRUFBRSxFQUFFLEVBQUUsRUFBRSxHQUFHLEVBQUUsQ0FHaEU7QUFFRCx3QkFBZ0Isd0JBQXdCLENBQUMsaUJBQWlCLEVBQUUsRUFBRSxFQUFFLEVBQUUsRUFBRSxHQUFHLEVBQUUsQ0FHeEUifQ==
+export declare function computeEpochOutHash(messagesInEpoch: Fr[][][][]): Fr;
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoib3V0X2hhc2guZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9tZXNzYWdpbmcvb3V0X2hhc2gudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBRUEsT0FBTyxFQUFFLEVBQUUsRUFBRSxNQUFNLGdDQUFnQyxDQUFDO0FBR3BELHdCQUFnQixnQkFBZ0IsQ0FBQyxRQUFRLEVBQUUsRUFBRSxFQUFFLEdBQUcsRUFBRSxDQU9uRDtBQUVELHdCQUFnQixtQkFBbUIsQ0FBQyxnQkFBZ0IsRUFBRSxFQUFFLEVBQUUsRUFBRSxHQUFHLEVBQUUsQ0FHaEU7QUFFRCx3QkFBZ0Isd0JBQXdCLENBQUMsaUJBQWlCLEVBQUUsRUFBRSxFQUFFLEVBQUUsRUFBRSxHQUFHLEVBQUUsQ0FHeEU7QUFFRCx3QkFBZ0IsbUJBQW1CLENBQUMsZUFBZSxFQUFFLEVBQUUsRUFBRSxFQUFFLEVBQUUsRUFBRSxHQUFHLEVBQUUsQ0FXbkUifQ==

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

@@ -1 +1 @@
-{"version":3,"file":"out_hash.d.ts","sourceRoot":"","sources":["../../src/messaging/out_hash.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAG9C,wBAAgB,gBAAgB,CAAC,QAAQ,EAAE,EAAE,EAAE,GAAG,EAAE,CAOnD;AAED,wBAAgB,mBAAmB,CAAC,gBAAgB,EAAE,EAAE,EAAE,EAAE,GAAG,EAAE,CAGhE;AAED,wBAAgB,wBAAwB,CAAC,iBAAiB,EAAE,EAAE,EAAE,EAAE,EAAE,GAAG,EAAE,CAGxE"}
+{"version":3,"file":"out_hash.d.ts","sourceRoot":"","sources":["../../src/messaging/out_hash.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AAGpD,wBAAgB,gBAAgB,CAAC,QAAQ,EAAE,EAAE,EAAE,GAAG,EAAE,CAOnD;AAED,wBAAgB,mBAAmB,CAAC,gBAAgB,EAAE,EAAE,EAAE,EAAE,GAAG,EAAE,CAGhE;AAED,wBAAgB,wBAAwB,CAAC,iBAAiB,EAAE,EAAE,EAAE,EAAE,EAAE,GAAG,EAAE,CAGxE;AAED,wBAAgB,mBAAmB,CAAC,eAAe,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,GAAG,EAAE,CAWnE"}

package/dest/messaging/out_hash.js

@@ -1,5 +1,7 @@
-import { Fr } from '@aztec/foundation/fields';
-import { UnbalancedMerkleTreeCalculator, computeUnbalancedShaRoot } from '@aztec/foundation/trees';
+import { AZTEC_MAX_EPOCH_DURATION } from '@aztec/constants';
+import { padArrayEnd } from '@aztec/foundation/collection';
+import { Fr } from '@aztec/foundation/curves/bn254';
+import { computeCompressedUnbalancedShaRoot, computeUnbalancedShaRoot } from '@aztec/foundation/trees';
 export function computeTxOutHash(messages) {
     if (!messages.length) {
         return Fr.ZERO;
@@ -16,13 +18,20 @@ export function computeCheckpointOutHash(messagesForAllTxs) {
     const blockOutHashes = messagesForAllTxs.map((block)=>computeBlockOutHash(block));
     return aggregateOutHashes(blockOutHashes);
 }
+export function computeEpochOutHash(messagesInEpoch) {
+    // Must match the implementation in `compute_epoch_out_hash.nr`.
+    const checkpointOutHashes = messagesInEpoch.map((checkpoint)=>computeCheckpointOutHash(checkpoint)).map((hash)=>hash.toBuffer());
+    if (checkpointOutHashes.every((hash)=>hash.equals(Buffer.alloc(32)))) {
+        return Fr.ZERO;
+    }
+    const paddedOutHashes = padArrayEnd(checkpointOutHashes, Buffer.alloc(32), AZTEC_MAX_EPOCH_DURATION);
+    return Fr.fromBuffer(computeUnbalancedShaRoot(paddedOutHashes));
+}
 // The root of this tree should match the `out_hash` calculated in the circuits. Zero hashes are compressed to reduce
 // cost if the non-zero leaves result in a shorter path.
 function aggregateOutHashes(outHashes) {
     if (!outHashes.length) {
         return Fr.ZERO;
     }
-    const valueToCompress = Buffer.alloc(32);
-    const tree = UnbalancedMerkleTreeCalculator.create(outHashes.map((hash)=>hash.toBuffer()), valueToCompress);
-    return Fr.fromBuffer(tree.getRoot());
+    return Fr.fromBuffer(computeCompressedUnbalancedShaRoot(outHashes.map((hash)=>hash.toBuffer())));
 }

package/dest/note/note.d.ts

@@ -1,4 +1,4 @@
-import { Fr } from '@aztec/foundation/fields';
+import { Fr } from '@aztec/foundation/curves/bn254';
 import { BufferReader } from '@aztec/foundation/serialize';
 import { Vector } from '../types/shared.js';
 /**
@@ -39,4 +39,4 @@ export declare class Note extends Vector<Fr> {
     get length(): number;
     equals(other: Note): boolean;
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibm90ZS5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL25vdGUvbm90ZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFDQSxPQUFPLEVBQUUsRUFBRSxFQUFFLE1BQU0sMEJBQTBCLENBQUM7QUFDOUMsT0FBTyxFQUFFLFlBQVksRUFBRSxNQUFNLDZCQUE2QixDQUFDO0FBSTNELE9BQU8sRUFBRSxNQUFNLEVBQUUsTUFBTSxvQkFBb0IsQ0FBQztBQUU1Qzs7O0dBR0c7QUFDSCxxQkFBYSxJQUFLLFNBQVEsTUFBTSxDQUFDLEVBQUUsQ0FBQztJQUNsQyxNQUFNLDRCQUVMO0lBRUQsTUFBTSxLQUFLLE1BQU0sdUdBRWhCO0lBRUQ7Ozs7Ozs7T0FPRztJQUNILE1BQU0sQ0FBQyxVQUFVLENBQUMsTUFBTSxFQUFFLE1BQU0sR0FBRyxZQUFZLFFBRzlDO0lBRUQ7Ozs7OztPQU1HO0lBQ0gsTUFBTSxDQUFDLE1BQU0sU0FJWjtJQUVEOzs7T0FHRztJQUNNLFFBQVEsa0JBRWhCO0lBRUQ7Ozs7T0FJRztJQUNILE1BQU0sQ0FBQyxVQUFVLENBQUMsR0FBRyxFQUFFLE1BQU0sUUFFNUI7SUFFRCxJQUFJLE1BQU0sV0FFVDtJQUVELE1BQU0sQ0FBQyxLQUFLLEVBQUUsSUFBSSxXQUVqQjtDQUNGIn0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibm90ZS5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL25vdGUvbm90ZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFDQSxPQUFPLEVBQUUsRUFBRSxFQUFFLE1BQU0sZ0NBQWdDLENBQUM7QUFDcEQsT0FBTyxFQUFFLFlBQVksRUFBRSxNQUFNLDZCQUE2QixDQUFDO0FBSTNELE9BQU8sRUFBRSxNQUFNLEVBQUUsTUFBTSxvQkFBb0IsQ0FBQztBQUU1Qzs7O0dBR0c7QUFDSCxxQkFBYSxJQUFLLFNBQVEsTUFBTSxDQUFDLEVBQUUsQ0FBQztJQUNsQyxNQUFNLDRCQUVMO0lBRUQsTUFBTSxLQUFLLE1BQU0sdUdBRWhCO0lBRUQ7Ozs7Ozs7T0FPRztJQUNILE1BQU0sQ0FBQyxVQUFVLENBQUMsTUFBTSxFQUFFLE1BQU0sR0FBRyxZQUFZLFFBRzlDO0lBRUQ7Ozs7OztPQU1HO0lBQ0gsTUFBTSxDQUFDLE1BQU0sU0FJWjtJQUVEOzs7T0FHRztJQUNNLFFBQVEsa0JBRWhCO0lBRUQ7Ozs7T0FJRztJQUNILE1BQU0sQ0FBQyxVQUFVLENBQUMsR0FBRyxFQUFFLE1BQU0sUUFFNUI7SUFFRCxJQUFJLE1BQU0sV0FFVDtJQUVELE1BQU0sQ0FBQyxLQUFLLEVBQUUsSUFBSSxXQUtqQjtDQUNGIn0=

package/dest/note/note.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"note.d.ts","sourceRoot":"","sources":["../../src/note/note.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAC9C,OAAO,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAI3D,OAAO,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AAE5C;;;GAGG;AACH,qBAAa,IAAK,SAAQ,MAAM,CAAC,EAAE,CAAC;IAClC,MAAM,4BAEL;IAED,MAAM,KAAK,MAAM,uGAEhB;IAED;;;;;;;OAOG;IACH,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY,QAG9C;IAED;;;;;;OAMG;IACH,MAAM,CAAC,MAAM,SAIZ;IAED;;;OAGG;IACM,QAAQ,kBAEhB;IAED;;;;OAIG;IACH,MAAM,CAAC,UAAU,CAAC,GAAG,EAAE,MAAM,QAE5B;IAED,IAAI,MAAM,WAET;IAED,MAAM,CAAC,KAAK,EAAE,IAAI,WAEjB;CACF"}
+{"version":3,"file":"note.d.ts","sourceRoot":"","sources":["../../src/note/note.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AACpD,OAAO,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAI3D,OAAO,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AAE5C;;;GAGG;AACH,qBAAa,IAAK,SAAQ,MAAM,CAAC,EAAE,CAAC;IAClC,MAAM,4BAEL;IAED,MAAM,KAAK,MAAM,uGAEhB;IAED;;;;;;;OAOG;IACH,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY,QAG9C;IAED;;;;;;OAMG;IACH,MAAM,CAAC,MAAM,SAIZ;IAED;;;OAGG;IACM,QAAQ,kBAEhB;IAED;;;;OAIG;IACH,MAAM,CAAC,UAAU,CAAC,GAAG,EAAE,MAAM,QAE5B;IAED,IAAI,MAAM,WAET;IAED,MAAM,CAAC,KAAK,EAAE,IAAI,WAKjB;CACF"}

package/dest/note/note.js

@@ -1,5 +1,5 @@
-import { randomInt } from '@aztec/foundation/crypto';
-import { Fr } from '@aztec/foundation/fields';
+import { randomInt } from '@aztec/foundation/crypto/random';
+import { Fr } from '@aztec/foundation/curves/bn254';
 import { BufferReader } from '@aztec/foundation/serialize';
 import { bufferToHex, hexToBuffer } from '@aztec/foundation/string';
 import { schemas } from '../schemas/index.js';
@@ -55,6 +55,9 @@ import { Vector } from '../types/shared.js';
         return this.items.length;
     }
     equals(other) {
+        if (this.items.length !== other.items.length) {
+            return false;
+        }
         return this.items.every((item, index)=>item.equals(other.items[index]));
     }
 }

package/dest/note/note_dao.d.ts

@@ -1,4 +1,5 @@
-import { Fr } from '@aztec/foundation/fields';
+import { BlockNumber } from '@aztec/foundation/branded-types';
+import { Fr } from '@aztec/foundation/curves/bn254';
 import { BufferReader } from '@aztec/foundation/serialize';
 import { AztecAddress } from '@aztec/stdlib/aztec-address';
 import { Note } from '@aztec/stdlib/note';
@@ -10,13 +11,14 @@ import { TxHash } from '@aztec/stdlib/tx';
 export declare class NoteDao {
     note: Note;
     contractAddress: AztecAddress;
+    owner: AztecAddress;
     storageSlot: Fr;
     randomness: Fr;
     noteNonce: Fr;
     noteHash: Fr;
     siloedNullifier: Fr;
     txHash: TxHash;
-    l2BlockNumber: number;
+    l2BlockNumber: BlockNumber;
     l2BlockHash: string;
     index: bigint;
     constructor(
@@ -24,13 +26,15 @@ export declare class NoteDao {
     note: Note, 
     /** The address of the contract that created the note (i.e. the address used by the kernel during siloing). */
     contractAddress: AztecAddress, 
+    /** The owner of the note - generally the account that can spend the note. */
+    owner: AztecAddress, 
     /**
      * The storage location of the note. This value is not used for anything in PXE, but we do index by storage slot
      * since contracts typically make queries based on it.
      */
     storageSlot: Fr, 
     /**
-     * The randomness injected to the note.
+     * The randomness injected to the note hash preimage.
      */
     randomness: Fr, 
     /** The nonce that was injected into the note hash preimage in order to guarantee uniqueness. */
@@ -51,7 +55,7 @@ export declare class NoteDao {
     txHash: TxHash, 
     /** The L2 block number in which the tx with this note was included. Used for note management while processing
      * reorgs.*/
-    l2BlockNumber: number, 
+    l2BlockNumber: BlockNumber, 
     /** The L2 block hash in which the tx with this note was included. Used for note management while processing
      * reorgs.*/
     l2BlockHash: string, 
@@ -61,11 +65,15 @@ export declare class NoteDao {
     static fromBuffer(buffer: Buffer | BufferReader): NoteDao;
     toString(): string;
     static fromString(str: string): NoteDao;
+    /**
+     * Returns true if this note is equal to the `other` one.
+     */
+    equals(other: NoteDao): boolean;
     /**
      * Returns the size in bytes of the Note Dao.
      * @returns - Its size in bytes.
      */
     getSize(): number;
-    static random({ note, contractAddress, storageSlot, randomness, noteNonce, noteHash, siloedNullifier, txHash, l2BlockNumber, l2BlockHash, index }?: Partial<NoteDao>): Promise<NoteDao>;
+    static random({ note, contractAddress, owner, storageSlot, randomness, noteNonce, noteHash, siloedNullifier, txHash, l2BlockNumber, l2BlockHash, index }?: Partial<NoteDao>): Promise<NoteDao>;
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibm90ZV9kYW8uZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9ub3RlL25vdGVfZGFvLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUNBLE9BQU8sRUFBRSxFQUFFLEVBQVMsTUFBTSwwQkFBMEIsQ0FBQztBQUNyRCxPQUFPLEVBQUUsWUFBWSxFQUFxQixNQUFNLDZCQUE2QixDQUFDO0FBQzlFLE9BQU8sRUFBRSxZQUFZLEVBQUUsTUFBTSw2QkFBNkIsQ0FBQztBQUMzRCxPQUFPLEVBQUUsSUFBSSxFQUFFLE1BQU0sb0JBQW9CLENBQUM7QUFDMUMsT0FBTyxFQUFFLE1BQU0sRUFBRSxNQUFNLGtCQUFrQixDQUFDO0FBRTFDOzs7R0FHRztBQUNILHFCQUFhLE9BQU87SUFLVCxJQUFJLEVBQUUsSUFBSTtJQUVWLGVBQWUsRUFBRSxZQUFZO0lBSzdCLFdBQVcsRUFBRSxFQUFFO0lBSWYsVUFBVSxFQUFFLEVBQUU7SUFFZCxTQUFTLEVBQUUsRUFBRTtJQU9iLFFBQVEsRUFBRSxFQUFFO0lBS1osZUFBZSxFQUFFLEVBQUU7SUFNbkIsTUFBTSxFQUFFLE1BQU07SUFHZCxhQUFhLEVBQUUsTUFBTTtJQUdyQixXQUFXLEVBQUUsTUFBTTtJQUVuQixLQUFLLEVBQUUsTUFBTTtJQTNDdEI7SUFHRSxrRkFBa0Y7SUFDM0UsSUFBSSxFQUFFLElBQUk7SUFDakIsOEdBQThHO0lBQ3ZHLGVBQWUsRUFBRSxZQUFZO0lBQ3BDOzs7T0FHRztJQUNJLFdBQVcsRUFBRSxFQUFFO0lBQ3RCOztPQUVHO0lBQ0ksVUFBVSxFQUFFLEVBQUU7SUFDckIsZ0dBQWdHO0lBQ3pGLFNBQVMsRUFBRSxFQUFFO0lBR3BCOzs7T0FHRztJQUNJLFFBQVEsRUFBRSxFQUFFO0lBQ25COzs7T0FHRztJQUNJLGVBQWUsRUFBRSxFQUFFO0lBRzFCOztPQUVHO0lBQ0ksTUFBTSxFQUFFLE1BQU07SUFDckI7Z0JBQ1k7SUFDTCxhQUFhLEVBQUUsTUFBTTtJQUM1QjtnQkFDWTtJQUNMLFdBQVcsRUFBRSxNQUFNO0lBQzFCLCtFQUErRTtJQUN4RSxLQUFLLEVBQUUsTUFBTSxFQUNsQjtJQUVKLFFBQVEsSUFBSSxNQUFNLENBY2pCO0lBRUQsTUFBTSxDQUFDLFVBQVUsQ0FBQyxNQUFNLEVBQUUsTUFBTSxHQUFHLFlBQVksV0E0QjlDO0lBRUQsUUFBUSxXQUVQO0lBRUQsTUFBTSxDQUFDLFVBQVUsQ0FBQyxHQUFHLEVBQUUsTUFBTSxXQUc1QjtJQUVEOzs7T0FHRztJQUNJLE9BQU8sV0FJYjtJQUVELE9BQWEsTUFBTSxDQUFDLEVBQ2xCLElBQW9CLEVBQ3BCLGVBQTJCLEVBQzNCLFdBQXlCLEVBQ3pCLFVBQXdCLEVBQ3hCLFNBQXVCLEVBQ3ZCLFFBQXNCLEVBQ3RCLGVBQTZCLEVBQzdCLE1BQXdCLEVBQ3hCLGFBQWdELEVBQ2hELFdBQW9DLEVBQ3BDLEtBQThCLEVBQy9CLEdBQUUsT0FBTyxDQUFDLE9BQU8sQ0FBTSxvQkFjdkI7Q0FDRiJ9
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibm90ZV9kYW8uZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9ub3RlL25vdGVfZGFvLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUNBLE9BQU8sRUFBRSxXQUFXLEVBQUUsTUFBTSxpQ0FBaUMsQ0FBQztBQUM5RCxPQUFPLEVBQUUsRUFBRSxFQUFFLE1BQU0sZ0NBQWdDLENBQUM7QUFFcEQsT0FBTyxFQUFFLFlBQVksRUFBcUIsTUFBTSw2QkFBNkIsQ0FBQztBQUM5RSxPQUFPLEVBQUUsWUFBWSxFQUFFLE1BQU0sNkJBQTZCLENBQUM7QUFDM0QsT0FBTyxFQUFFLElBQUksRUFBRSxNQUFNLG9CQUFvQixDQUFDO0FBQzFDLE9BQU8sRUFBRSxNQUFNLEVBQUUsTUFBTSxrQkFBa0IsQ0FBQztBQUUxQzs7O0dBR0c7QUFDSCxxQkFBYSxPQUFPO0lBS1QsSUFBSSxFQUFFLElBQUk7SUFFVixlQUFlLEVBQUUsWUFBWTtJQUU3QixLQUFLLEVBQUUsWUFBWTtJQUtuQixXQUFXLEVBQUUsRUFBRTtJQUlmLFVBQVUsRUFBRSxFQUFFO0lBRWQsU0FBUyxFQUFFLEVBQUU7SUFPYixRQUFRLEVBQUUsRUFBRTtJQUtaLGVBQWUsRUFBRSxFQUFFO0lBTW5CLE1BQU0sRUFBRSxNQUFNO0lBR2QsYUFBYSxFQUFFLFdBQVc7SUFHMUIsV0FBVyxFQUFFLE1BQU07SUFFbkIsS0FBSyxFQUFFLE1BQU07SUE3Q3RCO0lBR0Usa0ZBQWtGO0lBQzNFLElBQUksRUFBRSxJQUFJO0lBQ2pCLDhHQUE4RztJQUN2RyxlQUFlLEVBQUUsWUFBWTtJQUNwQyw2RUFBNkU7SUFDdEUsS0FBSyxFQUFFLFlBQVk7SUFDMUI7OztPQUdHO0lBQ0ksV0FBVyxFQUFFLEVBQUU7SUFDdEI7O09BRUc7SUFDSSxVQUFVLEVBQUUsRUFBRTtJQUNyQixnR0FBZ0c7SUFDekYsU0FBUyxFQUFFLEVBQUU7SUFHcEI7OztPQUdHO0lBQ0ksUUFBUSxFQUFFLEVBQUU7SUFDbkI7OztPQUdHO0lBQ0ksZUFBZSxFQUFFLEVBQUU7SUFHMUI7O09BRUc7SUFDSSxNQUFNLEVBQUUsTUFBTTtJQUNyQjtnQkFDWTtJQUNMLGFBQWEsRUFBRSxXQUFXO0lBQ2pDO2dCQUNZO0lBQ0wsV0FBVyxFQUFFLE1BQU07SUFDMUIsK0VBQStFO0lBQ3hFLEtBQUssRUFBRSxNQUFNLEVBQ2xCO0lBRUosUUFBUSxJQUFJLE1BQU0sQ0FlakI7SUFFRCxNQUFNLENBQUMsVUFBVSxDQUFDLE1BQU0sRUFBRSxNQUFNLEdBQUcsWUFBWSxXQThCOUM7SUFFRCxRQUFRLFdBRVA7SUFFRCxNQUFNLENBQUMsVUFBVSxDQUFDLEdBQUcsRUFBRSxNQUFNLFdBRzVCO0lBRUQ7O09BRUc7SUFDSCxNQUFNLENBQUMsS0FBSyxFQUFFLE9BQU8sR0FBRyxPQUFPLENBZTlCO0lBRUQ7OztPQUdHO0lBQ0ksT0FBTyxXQU1iO0lBRUQsT0FBYSxNQUFNLENBQUMsRUFDbEIsSUFBb0IsRUFDcEIsZUFBMkIsRUFDM0IsS0FBaUIsRUFDakIsV0FBeUIsRUFDekIsVUFBd0IsRUFDeEIsU0FBdUIsRUFDdkIsUUFBc0IsRUFDdEIsZUFBNkIsRUFDN0IsTUFBd0IsRUFDeEIsYUFBNkQsRUFDN0QsV0FBb0MsRUFDcEMsS0FBOEIsRUFDL0IsR0FBRSxPQUFPLENBQUMsT0FBTyxDQUFNLG9CQWV2QjtDQUNGIn0=

package/dest/note/note_dao.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"note_dao.d.ts","sourceRoot":"","sources":["../../src/note/note_dao.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,EAAE,EAAS,MAAM,0BAA0B,CAAC;AACrD,OAAO,EAAE,YAAY,EAAqB,MAAM,6BAA6B,CAAC;AAC9E,OAAO,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAC3D,OAAO,EAAE,IAAI,EAAE,MAAM,oBAAoB,CAAC;AAC1C,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAE1C;;;GAGG;AACH,qBAAa,OAAO;IAKT,IAAI,EAAE,IAAI;IAEV,eAAe,EAAE,YAAY;IAK7B,WAAW,EAAE,EAAE;IAIf,UAAU,EAAE,EAAE;IAEd,SAAS,EAAE,EAAE;IAOb,QAAQ,EAAE,EAAE;IAKZ,eAAe,EAAE,EAAE;IAMnB,MAAM,EAAE,MAAM;IAGd,aAAa,EAAE,MAAM;IAGrB,WAAW,EAAE,MAAM;IAEnB,KAAK,EAAE,MAAM;IA3CtB;IAGE,kFAAkF;IAC3E,IAAI,EAAE,IAAI;IACjB,8GAA8G;IACvG,eAAe,EAAE,YAAY;IACpC;;;OAGG;IACI,WAAW,EAAE,EAAE;IACtB;;OAEG;IACI,UAAU,EAAE,EAAE;IACrB,gGAAgG;IACzF,SAAS,EAAE,EAAE;IAGpB;;;OAGG;IACI,QAAQ,EAAE,EAAE;IACnB;;;OAGG;IACI,eAAe,EAAE,EAAE;IAG1B;;OAEG;IACI,MAAM,EAAE,MAAM;IACrB;gBACY;IACL,aAAa,EAAE,MAAM;IAC5B;gBACY;IACL,WAAW,EAAE,MAAM;IAC1B,+EAA+E;IACxE,KAAK,EAAE,MAAM,EAClB;IAEJ,QAAQ,IAAI,MAAM,CAcjB;IAED,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY,WA4B9C;IAED,QAAQ,WAEP;IAED,MAAM,CAAC,UAAU,CAAC,GAAG,EAAE,MAAM,WAG5B;IAED;;;OAGG;IACI,OAAO,WAIb;IAED,OAAa,MAAM,CAAC,EAClB,IAAoB,EACpB,eAA2B,EAC3B,WAAyB,EACzB,UAAwB,EACxB,SAAuB,EACvB,QAAsB,EACtB,eAA6B,EAC7B,MAAwB,EACxB,aAAgD,EAChD,WAAoC,EACpC,KAA8B,EAC/B,GAAE,OAAO,CAAC,OAAO,CAAM,oBAcvB;CACF"}
+{"version":3,"file":"note_dao.d.ts","sourceRoot":"","sources":["../../src/note/note_dao.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,MAAM,iCAAiC,CAAC;AAC9D,OAAO,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AAEpD,OAAO,EAAE,YAAY,EAAqB,MAAM,6BAA6B,CAAC;AAC9E,OAAO,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAC3D,OAAO,EAAE,IAAI,EAAE,MAAM,oBAAoB,CAAC;AAC1C,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAE1C;;;GAGG;AACH,qBAAa,OAAO;IAKT,IAAI,EAAE,IAAI;IAEV,eAAe,EAAE,YAAY;IAE7B,KAAK,EAAE,YAAY;IAKnB,WAAW,EAAE,EAAE;IAIf,UAAU,EAAE,EAAE;IAEd,SAAS,EAAE,EAAE;IAOb,QAAQ,EAAE,EAAE;IAKZ,eAAe,EAAE,EAAE;IAMnB,MAAM,EAAE,MAAM;IAGd,aAAa,EAAE,WAAW;IAG1B,WAAW,EAAE,MAAM;IAEnB,KAAK,EAAE,MAAM;IA7CtB;IAGE,kFAAkF;IAC3E,IAAI,EAAE,IAAI;IACjB,8GAA8G;IACvG,eAAe,EAAE,YAAY;IACpC,6EAA6E;IACtE,KAAK,EAAE,YAAY;IAC1B;;;OAGG;IACI,WAAW,EAAE,EAAE;IACtB;;OAEG;IACI,UAAU,EAAE,EAAE;IACrB,gGAAgG;IACzF,SAAS,EAAE,EAAE;IAGpB;;;OAGG;IACI,QAAQ,EAAE,EAAE;IACnB;;;OAGG;IACI,eAAe,EAAE,EAAE;IAG1B;;OAEG;IACI,MAAM,EAAE,MAAM;IACrB;gBACY;IACL,aAAa,EAAE,WAAW;IACjC;gBACY;IACL,WAAW,EAAE,MAAM;IAC1B,+EAA+E;IACxE,KAAK,EAAE,MAAM,EAClB;IAEJ,QAAQ,IAAI,MAAM,CAejB;IAED,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY,WA8B9C;IAED,QAAQ,WAEP;IAED,MAAM,CAAC,UAAU,CAAC,GAAG,EAAE,MAAM,WAG5B;IAED;;OAEG;IACH,MAAM,CAAC,KAAK,EAAE,OAAO,GAAG,OAAO,CAe9B;IAED;;;OAGG;IACI,OAAO,WAMb;IAED,OAAa,MAAM,CAAC,EAClB,IAAoB,EACpB,eAA2B,EAC3B,KAAiB,EACjB,WAAyB,EACzB,UAAwB,EACxB,SAAuB,EACvB,QAAsB,EACtB,eAA6B,EAC7B,MAAwB,EACxB,aAA6D,EAC7D,WAAoC,EACpC,KAA8B,EAC/B,GAAE,OAAO,CAAC,OAAO,CAAM,oBAevB;CACF"}

package/dest/note/note_dao.js

@@ -1,5 +1,7 @@
 import { toBigIntBE } from '@aztec/foundation/bigint-buffer';
-import { Fr, Point } from '@aztec/foundation/fields';
+import { BlockNumber } from '@aztec/foundation/branded-types';
+import { Fr } from '@aztec/foundation/curves/bn254';
+import { Point } from '@aztec/foundation/curves/grumpkin';
 import { BufferReader, serializeToBuffer } from '@aztec/foundation/serialize';
 import { AztecAddress } from '@aztec/stdlib/aztec-address';
 import { Note } from '@aztec/stdlib/note';
@@ -10,6 +12,7 @@ import { TxHash } from '@aztec/stdlib/tx';
  */ export class NoteDao {
     note;
     contractAddress;
+    owner;
     storageSlot;
     randomness;
     noteNonce;
@@ -20,11 +23,11 @@ import { TxHash } from '@aztec/stdlib/tx';
     l2BlockHash;
     index;
     constructor(// Note information
-    /** The packed content of the note, as will be returned in the getNotes oracle. */ note, /** The address of the contract that created the note (i.e. the address used by the kernel during siloing). */ contractAddress, /**
+    /** The packed content of the note, as will be returned in the getNotes oracle. */ note, /** The address of the contract that created the note (i.e. the address used by the kernel during siloing). */ contractAddress, /** The owner of the note - generally the account that can spend the note. */ owner, /**
      * The storage location of the note. This value is not used for anything in PXE, but we do index by storage slot
      * since contracts typically make queries based on it.
      */ storageSlot, /**
-     * The randomness injected to the note.
+     * The randomness injected to the note hash preimage.
      */ randomness, /** The nonce that was injected into the note hash preimage in order to guarantee uniqueness. */ noteNonce, // Computed values
     /**
      * The inner hash (non-unique, non-siloed) of the note. Each contract determines how the note is hashed. Can
@@ -40,6 +43,7 @@ import { TxHash } from '@aztec/stdlib/tx';
      * reorgs.*/ l2BlockHash, /** The index of the leaf in the global note hash tree the note is stored at */ index){
         this.note = note;
         this.contractAddress = contractAddress;
+        this.owner = owner;
         this.storageSlot = storageSlot;
         this.randomness = randomness;
         this.noteNonce = noteNonce;
@@ -54,6 +58,7 @@ import { TxHash } from '@aztec/stdlib/tx';
         return serializeToBuffer([
             this.note,
             this.contractAddress,
+            this.owner,
             this.storageSlot,
             this.randomness,
             this.noteNonce,
@@ -69,16 +74,17 @@ import { TxHash } from '@aztec/stdlib/tx';
         const reader = BufferReader.asReader(buffer);
         const note = Note.fromBuffer(reader);
         const contractAddress = AztecAddress.fromBuffer(reader);
+        const owner = AztecAddress.fromBuffer(reader);
         const storageSlot = Fr.fromBuffer(reader);
         const randomness = Fr.fromBuffer(reader);
         const noteNonce = Fr.fromBuffer(reader);
         const noteHash = Fr.fromBuffer(reader);
         const siloedNullifier = Fr.fromBuffer(reader);
         const txHash = reader.readObject(TxHash);
-        const l2BlockNumber = reader.readNumber();
+        const l2BlockNumber = BlockNumber(reader.readNumber());
         const l2BlockHash = Fr.fromBuffer(reader).toString();
         const index = toBigIntBE(reader.readBytes(32));
-        return new NoteDao(note, contractAddress, storageSlot, randomness, noteNonce, noteHash, siloedNullifier, txHash, l2BlockNumber, l2BlockHash, index);
+        return new NoteDao(note, contractAddress, owner, storageSlot, randomness, noteNonce, noteHash, siloedNullifier, txHash, l2BlockNumber, l2BlockHash, index);
     }
     toString() {
         return '0x' + this.toBuffer().toString('hex');
@@ -88,14 +94,19 @@ import { TxHash } from '@aztec/stdlib/tx';
         return NoteDao.fromBuffer(Buffer.from(hex, 'hex'));
     }
     /**
+   * Returns true if this note is equal to the `other` one.
+   */ equals(other) {
+        return this.note.equals(other.note) && this.contractAddress.equals(other.contractAddress) && this.owner.equals(other.owner) && this.storageSlot.equals(other.storageSlot) && this.randomness.equals(other.randomness) && this.noteNonce.equals(other.noteNonce) && this.noteHash.equals(other.noteHash) && this.siloedNullifier.equals(other.siloedNullifier) && this.txHash.equals(other.txHash) && this.l2BlockNumber === other.l2BlockNumber && this.l2BlockHash === other.l2BlockHash && this.index === other.index;
+    }
+    /**
    * Returns the size in bytes of the Note Dao.
    * @returns - Its size in bytes.
    */ getSize() {
         const indexSize = Math.ceil(Math.log2(Number(this.index)));
         const noteSize = 4 + this.note.items.length * Fr.SIZE_IN_BYTES;
-        return noteSize + AztecAddress.SIZE_IN_BYTES + Fr.SIZE_IN_BYTES * 4 + TxHash.SIZE + Point.SIZE_IN_BYTES + indexSize;
+        return noteSize + AztecAddress.SIZE_IN_BYTES * 2 + Fr.SIZE_IN_BYTES * 4 + TxHash.SIZE + Point.SIZE_IN_BYTES + indexSize;
     }
-    static async random({ note = Note.random(), contractAddress = undefined, storageSlot = Fr.random(), randomness = Fr.random(), noteNonce = Fr.random(), noteHash = Fr.random(), siloedNullifier = Fr.random(), txHash = TxHash.random(), l2BlockNumber = Math.floor(Math.random() * 1000), l2BlockHash = Fr.random().toString(), index = Fr.random().toBigInt() } = {}) {
-        return new NoteDao(note, contractAddress ?? await AztecAddress.random(), storageSlot, randomness, noteNonce, noteHash, siloedNullifier, txHash, l2BlockNumber, l2BlockHash, index);
+    static async random({ note = Note.random(), contractAddress = undefined, owner = undefined, storageSlot = Fr.random(), randomness = Fr.random(), noteNonce = Fr.random(), noteHash = Fr.random(), siloedNullifier = Fr.random(), txHash = TxHash.random(), l2BlockNumber = BlockNumber(Math.floor(Math.random() * 1000)), l2BlockHash = Fr.random().toString(), index = Fr.random().toBigInt() } = {}) {
+        return new NoteDao(note, contractAddress ?? await AztecAddress.random(), owner ?? await AztecAddress.random(), storageSlot, randomness, noteNonce, noteHash, siloedNullifier, txHash, l2BlockNumber, l2BlockHash, index);
     }
 }

package/dest/note/notes_filter.d.ts

@@ -1,4 +1,4 @@
-import type { Fr } from '@aztec/foundation/fields';
+import type { Fr } from '@aztec/foundation/curves/bn254';
 import type { AztecAddress } from '../aztec-address/index.js';
 import { type ZodFor } from '../schemas/index.js';
 import { NoteStatus } from './note_status.js';
@@ -12,6 +12,8 @@ export type NotesFilter = {
      * @remarks Providing a contract address is required as we need that information to trigger private state sync.
      */
     contractAddress: AztecAddress;
+    /** The owner of the note. */
+    owner?: AztecAddress;
     /** The specific storage location of the note on the contract. */
     storageSlot?: Fr;
     /** The status of the note. Defaults to 'ACTIVE'. */
@@ -22,4 +24,4 @@ export type NotesFilter = {
     scopes?: AztecAddress[];
 };
 export declare const NotesFilterSchema: ZodFor<NotesFilter>;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibm90ZXNfZmlsdGVyLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvbm90ZS9ub3Rlc19maWx0ZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxLQUFLLEVBQUUsRUFBRSxFQUFFLE1BQU0sMEJBQTBCLENBQUM7QUFJbkQsT0FBTyxLQUFLLEVBQUUsWUFBWSxFQUFFLE1BQU0sMkJBQTJCLENBQUM7QUFDOUQsT0FBTyxFQUFFLEtBQUssTUFBTSxFQUFXLE1BQU0scUJBQXFCLENBQUM7QUFDM0QsT0FBTyxFQUFFLFVBQVUsRUFBRSxNQUFNLGtCQUFrQixDQUFDO0FBRTlDOzs7R0FHRztBQUNILE1BQU0sTUFBTSxXQUFXLEdBQUc7SUFDeEI7OztPQUdHO0lBQ0gsZUFBZSxFQUFFLFlBQVksQ0FBQztJQUM5QixpRUFBaUU7SUFDakUsV0FBVyxDQUFDLEVBQUUsRUFBRSxDQUFDO0lBQ2pCLG9EQUFvRDtJQUNwRCxNQUFNLENBQUMsRUFBRSxVQUFVLENBQUM7SUFDcEIseUNBQXlDO0lBQ3pDLGVBQWUsQ0FBQyxFQUFFLEVBQUUsQ0FBQztJQUNyQiwwRUFBMEU7SUFDMUUsTUFBTSxDQUFDLEVBQUUsWUFBWSxFQUFFLENBQUM7Q0FDekIsQ0FBQztBQUVGLGVBQU8sTUFBTSxpQkFBaUIsRUFBRSxNQUFNLENBQUMsV0FBVyxDQU1oRCxDQUFDIn0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibm90ZXNfZmlsdGVyLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvbm90ZS9ub3Rlc19maWx0ZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxLQUFLLEVBQUUsRUFBRSxFQUFFLE1BQU0sZ0NBQWdDLENBQUM7QUFJekQsT0FBTyxLQUFLLEVBQUUsWUFBWSxFQUFFLE1BQU0sMkJBQTJCLENBQUM7QUFDOUQsT0FBTyxFQUFFLEtBQUssTUFBTSxFQUFXLE1BQU0scUJBQXFCLENBQUM7QUFDM0QsT0FBTyxFQUFFLFVBQVUsRUFBRSxNQUFNLGtCQUFrQixDQUFDO0FBRTlDOzs7R0FHRztBQUNILE1BQU0sTUFBTSxXQUFXLEdBQUc7SUFDeEI7OztPQUdHO0lBQ0gsZUFBZSxFQUFFLFlBQVksQ0FBQztJQUM5Qiw2QkFBNkI7SUFDN0IsS0FBSyxDQUFDLEVBQUUsWUFBWSxDQUFDO0lBQ3JCLGlFQUFpRTtJQUNqRSxXQUFXLENBQUMsRUFBRSxFQUFFLENBQUM7SUFDakIsb0RBQW9EO0lBQ3BELE1BQU0sQ0FBQyxFQUFFLFVBQVUsQ0FBQztJQUNwQix5Q0FBeUM7SUFDekMsZUFBZSxDQUFDLEVBQUUsRUFBRSxDQUFDO0lBQ3JCLDBFQUEwRTtJQUMxRSxNQUFNLENBQUMsRUFBRSxZQUFZLEVBQUUsQ0FBQztDQUN6QixDQUFDO0FBRUYsZUFBTyxNQUFNLGlCQUFpQixFQUFFLE1BQU0sQ0FBQyxXQUFXLENBT2hELENBQUMifQ==

package/dest/note/notes_filter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"notes_filter.d.ts","sourceRoot":"","sources":["../../src/note/notes_filter.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAInD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAC9D,OAAO,EAAE,KAAK,MAAM,EAAW,MAAM,qBAAqB,CAAC;AAC3D,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAE9C;;;GAGG;AACH,MAAM,MAAM,WAAW,GAAG;IACxB;;;OAGG;IACH,eAAe,EAAE,YAAY,CAAC;IAC9B,iEAAiE;IACjE,WAAW,CAAC,EAAE,EAAE,CAAC;IACjB,oDAAoD;IACpD,MAAM,CAAC,EAAE,UAAU,CAAC;IACpB,yCAAyC;IACzC,eAAe,CAAC,EAAE,EAAE,CAAC;IACrB,0EAA0E;IAC1E,MAAM,CAAC,EAAE,YAAY,EAAE,CAAC;CACzB,CAAC;AAEF,eAAO,MAAM,iBAAiB,EAAE,MAAM,CAAC,WAAW,CAMhD,CAAC"}
+{"version":3,"file":"notes_filter.d.ts","sourceRoot":"","sources":["../../src/note/notes_filter.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AAIzD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAC9D,OAAO,EAAE,KAAK,MAAM,EAAW,MAAM,qBAAqB,CAAC;AAC3D,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAE9C;;;GAGG;AACH,MAAM,MAAM,WAAW,GAAG;IACxB;;;OAGG;IACH,eAAe,EAAE,YAAY,CAAC;IAC9B,6BAA6B;IAC7B,KAAK,CAAC,EAAE,YAAY,CAAC;IACrB,iEAAiE;IACjE,WAAW,CAAC,EAAE,EAAE,CAAC;IACjB,oDAAoD;IACpD,MAAM,CAAC,EAAE,UAAU,CAAC;IACpB,yCAAyC;IACzC,eAAe,CAAC,EAAE,EAAE,CAAC;IACrB,0EAA0E;IAC1E,MAAM,CAAC,EAAE,YAAY,EAAE,CAAC;CACzB,CAAC;AAEF,eAAO,MAAM,iBAAiB,EAAE,MAAM,CAAC,WAAW,CAOhD,CAAC"}

package/dest/note/notes_filter.js

@@ -3,6 +3,7 @@ import { schemas } from '../schemas/index.js';
 import { NoteStatus } from './note_status.js';
 export const NotesFilterSchema = z.object({
     contractAddress: schemas.AztecAddress,
+    owner: schemas.AztecAddress.optional(),
     storageSlot: schemas.Fr.optional(),
     status: z.nativeEnum(NoteStatus).optional(),
     siloedNullifier: schemas.Fr.optional(),

package/dest/p2p/attestation_utils.d.ts

@@ -1,10 +1,10 @@
 import type { EthAddress } from '@aztec/foundation/eth-address';
 import { CommitteeAttestation } from '../block/index.js';
-import type { BlockAttestation } from './block_attestation.js';
+import type { CheckpointAttestation } from './checkpoint_attestation.js';
 /**
  * Returns attestation signatures in the order of a series of provided ethereum addresses
  * The rollup smart contract expects attestations to appear in the order of the committee
  * @todo: perform this logic within the memory attestation store instead?
  */
-export declare function orderAttestations(attestations: BlockAttestation[], orderAddresses: EthAddress[]): CommitteeAttestation[];
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYXR0ZXN0YXRpb25fdXRpbHMuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9wMnAvYXR0ZXN0YXRpb25fdXRpbHMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxLQUFLLEVBQUUsVUFBVSxFQUFFLE1BQU0sK0JBQStCLENBQUM7QUFFaEUsT0FBTyxFQUFFLG9CQUFvQixFQUFFLE1BQU0sbUJBQW1CLENBQUM7QUFDekQsT0FBTyxLQUFLLEVBQUUsZ0JBQWdCLEVBQUUsTUFBTSx3QkFBd0IsQ0FBQztBQUUvRDs7OztHQUlHO0FBQ0gsd0JBQWdCLGlCQUFpQixDQUMvQixZQUFZLEVBQUUsZ0JBQWdCLEVBQUUsRUFDaEMsY0FBYyxFQUFFLFVBQVUsRUFBRSxHQUMzQixvQkFBb0IsRUFBRSxDQXFCeEIifQ==
+export declare function orderAttestations(attestations: CheckpointAttestation[], orderAddresses: EthAddress[]): CommitteeAttestation[];
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYXR0ZXN0YXRpb25fdXRpbHMuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9wMnAvYXR0ZXN0YXRpb25fdXRpbHMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxLQUFLLEVBQUUsVUFBVSxFQUFFLE1BQU0sK0JBQStCLENBQUM7QUFFaEUsT0FBTyxFQUFFLG9CQUFvQixFQUFFLE1BQU0sbUJBQW1CLENBQUM7QUFDekQsT0FBTyxLQUFLLEVBQUUscUJBQXFCLEVBQUUsTUFBTSw2QkFBNkIsQ0FBQztBQUV6RTs7OztHQUlHO0FBQ0gsd0JBQWdCLGlCQUFpQixDQUMvQixZQUFZLEVBQUUscUJBQXFCLEVBQUUsRUFDckMsY0FBYyxFQUFFLFVBQVUsRUFBRSxHQUMzQixvQkFBb0IsRUFBRSxDQXFCeEIifQ==

package/dest/p2p/attestation_utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"attestation_utils.d.ts","sourceRoot":"","sources":["../../src/p2p/attestation_utils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAEhE,OAAO,EAAE,oBAAoB,EAAE,MAAM,mBAAmB,CAAC;AACzD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAE/D;;;;GAIG;AACH,wBAAgB,iBAAiB,CAC/B,YAAY,EAAE,gBAAgB,EAAE,EAChC,cAAc,EAAE,UAAU,EAAE,GAC3B,oBAAoB,EAAE,CAqBxB"}
+{"version":3,"file":"attestation_utils.d.ts","sourceRoot":"","sources":["../../src/p2p/attestation_utils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAEhE,OAAO,EAAE,oBAAoB,EAAE,MAAM,mBAAmB,CAAC;AACzD,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,6BAA6B,CAAC;AAEzE;;;;GAIG;AACH,wBAAgB,iBAAiB,CAC/B,YAAY,EAAE,qBAAqB,EAAE,EACrC,cAAc,EAAE,UAAU,EAAE,GAC3B,oBAAoB,EAAE,CAqBxB"}