@aztec/foundation 1.2.0 → 2.0.0-nightly.20250813

package/dest/trees/unbalanced_merkle_tree.d.ts

@@ -1,13 +1,27 @@
 import { sha256Trunc } from '../crypto/sha256/index.js';
 /**
- * Computes the merkle root for an unbalanced tree.
+ * Computes the Merkle root of an unbalanced tree.
  *
- * @dev Adapted from unbalanced_tree.ts.
- * Calculates the tree upwards layer by layer until we reach the root.
- * The L1 calculation instead computes the tree from right to left (slightly cheaper gas).
- * TODO: A more thorough investigation of which method is cheaper, then use that method everywhere.
+ * Unlike a balanced Merkle tree, which requires the number of leaves to be a power of two, an unbalanced tree can have
+ * any number of leaves.
+ *
+ * The tree is constructed by iteratively extracting the smallest power-of-two-sized subtrees from **right to left**.
+ * For each such subtree, it computes the subtree root and then combines all subtree roots (again from right to left)
+ * into a single root using the provided hash function.
+ *
+ * Note: We need the final tree to be as shallow as possible, to minimize the size of the sibling path required to prove
+ * membership of a leaf. Therefor, the computation proceeds from right to left - smaller subtrees must always be
+ * combined before being merged with a larger sibling on their left.
+ *
+ * For example, consider an unbalanced tree made of three subtrees of sizes 2, 4, and 8. If we combine the size-2 and
+ * size-4 subtrees first (producing a subtree of depth 3), and then merge it with the size-8 subtree (also depth 3), the
+ * resulting tree has a maximum depth of 4.
+ *
+ * But if we instead combine the size-4 and size-8 subtrees first (depth 4), and then merge with the size-2 subtree
+ * (depth 1), the final tree has a depth of 5.
  */
-export declare function computeUnbalancedMerkleRoot(leaves: Buffer[], emptyLeaf?: Buffer, hasher?: typeof sha256Trunc): Buffer;
+export declare function computeUnbalancedMerkleTreeRoot(leaves: Buffer[], hasher?: typeof sha256Trunc): Buffer;
+export declare function getMaxUnbalancedTreeDepth(numLeaves: number): number;
 export declare function findLeafLevelAndIndex(numLeaves: number, leafIndex: number): {
     level: number;
     indexAtLevel: number;

package/dest/trees/unbalanced_merkle_tree.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"unbalanced_merkle_tree.d.ts","sourceRoot":"","sources":["../../src/trees/unbalanced_merkle_tree.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAC;AAExD;;;;;;;GAOG;AACH,wBAAgB,2BAA2B,CAAC,MAAM,EAAE,MAAM,EAAE,EAAE,SAAS,CAAC,EAAE,MAAM,EAAE,MAAM,qBAAc,GAAG,MAAM,CAwC9G;AAgDD,wBAAgB,qBAAqB,CAAC,SAAS,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM;WAhC9D,MAAM;kBAAgB,MAAM;EAmCvC"}
+{"version":3,"file":"unbalanced_merkle_tree.d.ts","sourceRoot":"","sources":["../../src/trees/unbalanced_merkle_tree.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAC;AAGxD;;;;;;;;;;;;;;;;;;;;GAoBG;AACH,wBAAgB,+BAA+B,CAAC,MAAM,EAAE,MAAM,EAAE,EAAE,MAAM,qBAAc,GAAG,MAAM,CA6B9F;AAYD,wBAAgB,yBAAyB,CAAC,SAAS,EAAE,MAAM,UAE1D;AAwCD,wBAAgB,qBAAqB,CAAC,SAAS,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM;WAhC9D,MAAM;kBAAgB,MAAM;EAmCvC"}

package/dest/trees/unbalanced_merkle_tree.js

@@ -1,64 +1,63 @@
-import { padArrayEnd } from '../collection/array.js';
 import { sha256Trunc } from '../crypto/sha256/index.js';
+import { MerkleTreeCalculator } from './merkle_tree_calculator.js';
 /**
- * Computes the merkle root for an unbalanced tree.
+ * Computes the Merkle root of an unbalanced tree.
  *
- * @dev Adapted from unbalanced_tree.ts.
- * Calculates the tree upwards layer by layer until we reach the root.
- * The L1 calculation instead computes the tree from right to left (slightly cheaper gas).
- * TODO: A more thorough investigation of which method is cheaper, then use that method everywhere.
- */ export function computeUnbalancedMerkleRoot(leaves, emptyLeaf, hasher = sha256Trunc) {
-    // Pad leaves to 2
-    if (leaves.length < 2) {
-        if (emptyLeaf === undefined) {
-            throw new Error('Cannot compute a Merkle root with less than 2 leaves');
-        } else {
-            leaves = padArrayEnd(leaves, emptyLeaf, 2);
-        }
+ * Unlike a balanced Merkle tree, which requires the number of leaves to be a power of two, an unbalanced tree can have
+ * any number of leaves.
+ *
+ * The tree is constructed by iteratively extracting the smallest power-of-two-sized subtrees from **right to left**.
+ * For each such subtree, it computes the subtree root and then combines all subtree roots (again from right to left)
+ * into a single root using the provided hash function.
+ *
+ * Note: We need the final tree to be as shallow as possible, to minimize the size of the sibling path required to prove
+ * membership of a leaf. Therefor, the computation proceeds from right to left - smaller subtrees must always be
+ * combined before being merged with a larger sibling on their left.
+ *
+ * For example, consider an unbalanced tree made of three subtrees of sizes 2, 4, and 8. If we combine the size-2 and
+ * size-4 subtrees first (producing a subtree of depth 3), and then merge it with the size-8 subtree (also depth 3), the
+ * resulting tree has a maximum depth of 4.
+ *
+ * But if we instead combine the size-4 and size-8 subtrees first (depth 4), and then merge with the size-2 subtree
+ * (depth 1), the final tree has a depth of 5.
+ */ export function computeUnbalancedMerkleTreeRoot(leaves, hasher = sha256Trunc) {
+    if (!leaves.length) {
+        throw new Error('Cannot compute a Merkle root with no leaves');
     }
-    const depth = Math.ceil(Math.log2(leaves.length));
-    let [layerWidth, nodeToShift] = leaves.length & 1 ? [
-        leaves.length - 1,
-        leaves[leaves.length - 1]
-    ] : [
-        leaves.length,
-        Buffer.alloc(0)
-    ];
-    // Allocate this layer's leaves and init the next layer up
-    let thisLayer = leaves.slice(0, layerWidth);
-    let nextLayer = [];
-    for(let i = 0; i < depth; i++){
-        for(let j = 0; j < layerWidth; j += 2){
-            // Store the hash of each pair one layer up
-            nextLayer[j / 2] = hasher(Buffer.concat([
-                thisLayer[j],
-                thisLayer[j + 1]
-            ]));
-        }
-        layerWidth /= 2;
-        if (layerWidth & 1) {
-            if (nodeToShift.length) {
-                // If the next layer has odd length, and we have a node that needs to be shifted up, add it here
-                nextLayer.push(nodeToShift);
-                layerWidth += 1;
-                nodeToShift = Buffer.alloc(0);
+    if (leaves.length === 1) {
+        return leaves[0];
+    }
+    let numRemainingLeaves = leaves.length;
+    let subtreeSize = 1;
+    let root;
+    while(numRemainingLeaves > 1){
+        if ((numRemainingLeaves & subtreeSize) !== 0) {
+            const subtreeLeaves = leaves.slice(numRemainingLeaves - subtreeSize, numRemainingLeaves);
+            const subtreeRoot = MerkleTreeCalculator.computeTreeRootSync(subtreeLeaves, hasher);
+            if (!root) {
+                root = subtreeRoot;
             } else {
-                // If we don't have a node waiting to be shifted, store the next layer's final node to be shifted
-                layerWidth -= 1;
-                nodeToShift = nextLayer[layerWidth];
+                root = hasher(Buffer.concat([
+                    subtreeRoot,
+                    root
+                ]));
             }
+            numRemainingLeaves -= subtreeSize;
         }
-        // reset the layers
-        thisLayer = nextLayer;
-        nextLayer = [];
+        subtreeSize *= 2;
     }
-    // return the root
-    return thisLayer[0];
+    return root;
 }
-function getMaxBalancedTreeDepth(numLeaves) {
+/// Get the depth of the maximum balanced tree that can be created with the given number of leaves. The subtree will be
+/// the left most subtree of the wonky tree with a total of `numLeaves` leaves.
+///
+/// Note: All the leaves may not be used to form the tree. For example, if there are 5 leaves, the maximum depth is 2,
+/// only 4 leaves are used to form a balanced tree.
+function getMaxBalancedSubtreeDepth(numLeaves) {
     return Math.floor(Math.log2(numLeaves));
 }
-function getMaxUnbalancedTreeDepth(numLeaves) {
+/// Get the maximum depth of an unbalanced tree that can be created with the given number of leaves.
+export function getMaxUnbalancedTreeDepth(numLeaves) {
     return Math.ceil(Math.log2(numLeaves));
 }
 function findPosition(rootLevel, leafLevel, numLeaves, indexOffset, targetIndex) {
@@ -70,7 +69,7 @@ function findPosition(rootLevel, leafLevel, numLeaves, indexOffset, targetIndex)
         };
     }
     // The largest balanced tree that can be created with the given number of leaves.
-    const maxBalancedTreeDepth = getMaxBalancedTreeDepth(numLeaves);
+    const maxBalancedTreeDepth = getMaxBalancedSubtreeDepth(numLeaves);
     const numBalancedLeaves = 2 ** maxBalancedTreeDepth;
     const numRemainingLeaves = numLeaves - numBalancedLeaves;
     if (targetIndex < numBalancedLeaves) {

package/dest/trees/unbalanced_merkle_tree_calculator.d.ts

@@ -1,9 +1,11 @@
+import { type Bufferable } from '@aztec/foundation/serialize';
 import type { AsyncHasher } from '@aztec/foundation/trees';
 import { SiblingPath } from '@aztec/foundation/trees';
 /**
  * An ephemeral unbalanced Merkle tree implementation.
  * Follows the rollup implementation which greedily hashes pairs of nodes up the tree.
  * Remaining rightmost nodes are shifted up until they can be paired.
+ * If there is only one leaf, the root is the leaf.
  */
 export declare class UnbalancedMerkleTreeCalculator {
     private maxDepth;
@@ -25,7 +27,7 @@ export declare class UnbalancedMerkleTreeCalculator {
      * @returns A sibling path for the element.
      * Note: The sibling path is an array of sibling hashes, with the lowest hash (leaf hash) first, and the highest hash last.
      */
-    getSiblingPath<N extends number>(value: bigint): Promise<SiblingPath<N>>;
+    getSiblingPath<N extends number>(value: Bufferable): Promise<SiblingPath<N>>;
     /**
      * Appends the given leaves to the tree.
      * @param leaves - The leaves to append.

package/dest/trees/unbalanced_merkle_tree_calculator.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"unbalanced_merkle_tree_calculator.d.ts","sourceRoot":"","sources":["../../src/trees/unbalanced_merkle_tree_calculator.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAC3D,OAAO,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAMtD;;;;GAIG;AACH,qBAAa,8BAA8B;IAUvC,OAAO,CAAC,QAAQ;IAChB,OAAO,CAAC,MAAM;IAThB,OAAO,CAAC,KAAK,CAAiC;IAE9C,OAAO,CAAC,UAAU,CAAiC;IACnD,SAAS,CAAC,IAAI,EAAE,MAAM,CAAM;IAE5B,IAAI,EAAE,MAAM,CAAoB;gBAGtB,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,WAAW,CAAC,MAAM,CAAC;IAGrC,MAAM,CAAC,MAAM,CACX,MAAM,EAAE,MAAM,EACd,MAAM,IAAU,MAAM,MAAM,EAAE,OAAO,MAAM,iCAC4B;IAKzE;;;OAGG;IACI,OAAO,IAAI,MAAM;IAIxB;;;;;OAKG;IACI,cAAc,CAAC,CAAC,SAAS,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC;IAgB/E;;;;OAIG;IACU,YAAY,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAU1D;;;;OAIG;YACW,WAAW;IAyCzB,OAAO,CAAC,SAAS;CAKlB"}
+{"version":3,"file":"unbalanced_merkle_tree_calculator.d.ts","sourceRoot":"","sources":["../../src/trees/unbalanced_merkle_tree_calculator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,UAAU,EAAqB,MAAM,6BAA6B,CAAC;AACjF,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAC3D,OAAO,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAMtD;;;;;GAKG;AACH,qBAAa,8BAA8B;IAUvC,OAAO,CAAC,QAAQ;IAChB,OAAO,CAAC,MAAM;IAThB,OAAO,CAAC,KAAK,CAAiC;IAE9C,OAAO,CAAC,UAAU,CAAiC;IACnD,SAAS,CAAC,IAAI,EAAE,MAAM,CAAM;IAE5B,IAAI,EAAE,MAAM,CAAoB;gBAGtB,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,WAAW,CAAC,MAAM,CAAC;IAGrC,MAAM,CAAC,MAAM,CACX,MAAM,EAAE,MAAM,EACd,MAAM,IAAI,MAAM,MAAM,EAAE,OAAO,MAAM,iCAC8C;IAKrF;;;OAGG;IACI,OAAO,IAAI,MAAM;IAIxB;;;;;OAKG;IACI,cAAc,CAAC,CAAC,SAAS,MAAM,EAAE,KAAK,EAAE,UAAU,GAAG,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC;IAoBnF;;;;OAIG;IACU,YAAY,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAmB1D;;;;OAIG;YACW,WAAW;IAyCzB,OAAO,CAAC,SAAS;CAKlB"}

package/dest/trees/unbalanced_merkle_tree_calculator.js

@@ -1,11 +1,12 @@
 import { serializeToBuffer } from '@aztec/foundation/serialize';
 import { SiblingPath } from '@aztec/foundation/trees';
-import { pedersenHash } from '../crypto/pedersen/index.js';
+import { sha256Trunc } from '../crypto/index.js';
 const indexToKeyHash = (level, index)=>`${level}:${index}`;
 /**
  * An ephemeral unbalanced Merkle tree implementation.
  * Follows the rollup implementation which greedily hashes pairs of nodes up the tree.
  * Remaining rightmost nodes are shifted up until they can be paired.
+ * If there is only one leaf, the root is the leaf.
  */ export class UnbalancedMerkleTreeCalculator {
     maxDepth;
     hasher;
@@ -23,10 +24,10 @@ const indexToKeyHash = (level, index)=>`${level}:${index}`;
         this.size = 0n;
         this.root = Buffer.alloc(32);
     }
-    static create(height, hasher = async (left, right)=>(await pedersenHash([
+    static create(height, hasher = (left, right)=>Promise.resolve(sha256Trunc(Buffer.concat([
             left,
             right
-        ])).toBuffer()) {
+        ])))) {
         return new UnbalancedMerkleTreeCalculator(height, hasher);
     }
     /**
@@ -41,6 +42,9 @@ const indexToKeyHash = (level, index)=>`${level}:${index}`;
    * @returns A sibling path for the element.
    * Note: The sibling path is an array of sibling hashes, with the lowest hash (leaf hash) first, and the highest hash last.
    */ getSiblingPath(value) {
+        if (this.size === 1n) {
+            return Promise.resolve(new SiblingPath(0, []));
+        }
         const path = [];
         const [depth, _index] = this.valueCache[serializeToBuffer(value).toString('hex')].split(':');
         let level = parseInt(depth, 10);
@@ -63,8 +67,15 @@ const indexToKeyHash = (level, index)=>`${level}:${index}`;
         if (this.size != BigInt(0)) {
             throw Error(`Can't re-append to an unbalanced tree. Current has ${this.size} leaves.`);
         }
-        const root = await this.batchInsert(leaves);
-        this.root = root;
+        if (leaves.length === 0) {
+            throw Error(`Can't append 0 leaves to an unbalanced tree.`);
+        }
+        if (leaves.length === 1) {
+            this.root = leaves[0];
+        } else {
+            this.root = await this.batchInsert(leaves);
+        }
+        this.size = BigInt(leaves.length);
         return Promise.resolve();
     }
     /**
@@ -110,7 +121,6 @@ const indexToKeyHash = (level, index)=>`${level}:${index}`;
             thisLayer = nextLayer;
             nextLayer = [];
         }
-        this.size += BigInt(_leaves.length);
         // return the root
         return thisLayer[0];
     }

package/dest/types/index.d.ts

@@ -28,9 +28,11 @@ export declare function unfreeze<T>(obj: T): Writeable<T>;
 export interface TypedEventEmitter<TEventMap extends {
     [key in keyof TEventMap]: (...args: any[]) => void;
 }> {
+    once<K extends keyof TEventMap>(event: K, listener: TEventMap[K]): this;
     on<K extends keyof TEventMap>(event: K, listener: TEventMap[K]): this;
     off<K extends keyof TEventMap>(event: K, listener: TEventMap[K]): this;
     emit<K extends keyof TEventMap>(event: K, ...args: Parameters<TEventMap[K]>): boolean;
     removeListener<K extends keyof TEventMap>(event: K, listener: TEventMap[K]): this;
+    removeAllListeners<K extends keyof TEventMap>(event: K): this;
 }
 //# sourceMappingURL=index.d.ts.map

package/dest/types/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/types/index.ts"],"names":[],"mappings":"AAAA,gCAAgC;AAChC,MAAM,MAAM,QAAQ,CAAC,CAAC,IAAI;KACvB,CAAC,IAAI,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,SAAS,QAAQ,GAAG,KAAK,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;CAC1D,CAAC;AAEF,kCAAkC;AAClC,MAAM,MAAM,WAAW,CAAC,CAAC,IAAI;KAC1B,CAAC,IAAI,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,SAAS,QAAQ,GAAG,CAAC,GAAG,KAAK,GAAG,CAAC,CAAC,CAAC,CAAC;CAC1D,CAAC;AAEF,uDAAuD;AACvD,MAAM,MAAM,SAAS,CAAC,CAAC,EAAE,CAAC,SAAS,MAAM,CAAC,IAAI,IAAI,CAAC,CAAC,EAAE,CAAC,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;AAE/E,6CAA6C;AAC7C,MAAM,MAAM,SAAS,CAAC,CAAC,IAAI;IAAE,CAAC,UAAU,CAAC,IAAI,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;CAAE,CAAC;AAE9D,gDAAgD;AAChD,wBAAgB,QAAQ,CAAC,CAAC,EAAE,GAAG,EAAE,CAAC,GAAG,SAAS,CAAC,CAAC,CAAC,CAEhD;AAED;;;;;;;;;;GAUG;AACH,MAAM,WAAW,iBAAiB,CAAC,SAAS,SAAS;KAAG,GAAG,IAAI,MAAM,SAAS,GAAG,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,IAAI;CAAE;IACzG,EAAE,CAAC,CAAC,SAAS,MAAM,SAAS,EAAE,KAAK,EAAE,CAAC,EAAE,QAAQ,EAAE,SAAS,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC;IACtE,GAAG,CAAC,CAAC,SAAS,MAAM,SAAS,EAAE,KAAK,EAAE,CAAC,EAAE,QAAQ,EAAE,SAAS,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC;IACvE,IAAI,CAAC,CAAC,SAAS,MAAM,SAAS,EAAE,KAAK,EAAE,CAAC,EAAE,GAAG,IAAI,EAAE,UAAU,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC;IACtF,cAAc,CAAC,CAAC,SAAS,MAAM,SAAS,EAAE,KAAK,EAAE,CAAC,EAAE,QAAQ,EAAE,SAAS,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC;CAEnF"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/types/index.ts"],"names":[],"mappings":"AAAA,gCAAgC;AAChC,MAAM,MAAM,QAAQ,CAAC,CAAC,IAAI;KACvB,CAAC,IAAI,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,SAAS,QAAQ,GAAG,KAAK,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;CAC1D,CAAC;AAEF,kCAAkC;AAClC,MAAM,MAAM,WAAW,CAAC,CAAC,IAAI;KAC1B,CAAC,IAAI,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,SAAS,QAAQ,GAAG,CAAC,GAAG,KAAK,GAAG,CAAC,CAAC,CAAC,CAAC;CAC1D,CAAC;AAEF,uDAAuD;AACvD,MAAM,MAAM,SAAS,CAAC,CAAC,EAAE,CAAC,SAAS,MAAM,CAAC,IAAI,IAAI,CAAC,CAAC,EAAE,CAAC,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;AAE/E,6CAA6C;AAC7C,MAAM,MAAM,SAAS,CAAC,CAAC,IAAI;IAAE,CAAC,UAAU,CAAC,IAAI,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;CAAE,CAAC;AAE9D,gDAAgD;AAChD,wBAAgB,QAAQ,CAAC,CAAC,EAAE,GAAG,EAAE,CAAC,GAAG,SAAS,CAAC,CAAC,CAAC,CAEhD;AAED;;;;;;;;;;GAUG;AACH,MAAM,WAAW,iBAAiB,CAAC,SAAS,SAAS;KAAG,GAAG,IAAI,MAAM,SAAS,GAAG,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,IAAI;CAAE;IACzG,IAAI,CAAC,CAAC,SAAS,MAAM,SAAS,EAAE,KAAK,EAAE,CAAC,EAAE,QAAQ,EAAE,SAAS,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC;IACxE,EAAE,CAAC,CAAC,SAAS,MAAM,SAAS,EAAE,KAAK,EAAE,CAAC,EAAE,QAAQ,EAAE,SAAS,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC;IACtE,GAAG,CAAC,CAAC,SAAS,MAAM,SAAS,EAAE,KAAK,EAAE,CAAC,EAAE,QAAQ,EAAE,SAAS,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC;IACvE,IAAI,CAAC,CAAC,SAAS,MAAM,SAAS,EAAE,KAAK,EAAE,CAAC,EAAE,GAAG,IAAI,EAAE,UAAU,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC;IACtF,cAAc,CAAC,CAAC,SAAS,MAAM,SAAS,EAAE,KAAK,EAAE,CAAC,EAAE,QAAQ,EAAE,SAAS,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC;IAClF,kBAAkB,CAAC,CAAC,SAAS,MAAM,SAAS,EAAE,KAAK,EAAE,CAAC,GAAG,IAAI,CAAC;CAE/D"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aztec/foundation",
-  "version": "1.2.0",
+  "version": "2.0.0-nightly.20250813",
   "type": "module",
   "main": "./dest/index.js",
   "types": "./dest/index.d.ts",
@@ -51,7 +51,8 @@
     "./validation": "./dest/validation/index.js",
     "./promise": "./dest/promise/index.js",
     "./string": "./dest/string/index.js",
-    "./message": "./dest/message/index.js"
+    "./message": "./dest/message/index.js",
+    "./number": "./dest/number/index.js"
   },
   "scripts": {
     "build": "yarn clean && tsc -b",
@@ -101,9 +102,9 @@
     "testEnvironment": "../../foundation/src/jest/env.mjs"
   },
   "dependencies": {
-    "@aztec/bb.js": "1.2.0",
+    "@aztec/bb.js": "2.0.0-nightly.20250813",
     "@koa/cors": "^5.0.0",
-    "@noble/curves": "^1.2.0",
+    "@noble/curves": "=1.7.0",
     "bn.js": "^5.2.1",
     "colorette": "^2.0.20",
     "detect-node": "^2.1.0",

package/src/array/array.ts

@@ -148,3 +148,16 @@ export function assertRightPadded<T>(arr: T[], isEmpty: (item: T) => boolean) {
     }
   }
 }
+
+/**
+ * Shuffles an array in-place using the Fisher-Yates algorith,
+ * @param arr - The array to shuffle
+ */
+export function shuffle<T>(arr: T[]): void {
+  for (let i = arr.length - 1; i > 0; i--) {
+    const j = (Math.random() * (i + 1)) | 0;
+    const temp = arr[i];
+    arr[i] = arr[j];
+    arr[j] = temp;
+  }
+}

package/src/async-pool/index.ts

@@ -29,6 +29,7 @@
 export function asyncPool<T, R>(poolLimit: number, iterable: T[], iteratorFn: (item: T, iterable: T[]) => Promise<R>) {
   let i = 0;
   const ret: Promise<R>[] = [];
+  // eslint-disable-next-line aztec-custom/no-non-primitive-in-collections
   const executing: Set<Promise<R>> = new Set();
   const enqueue = (): Promise<any> => {
     if (i === iterable.length) {

package/src/collection/array.ts

@@ -214,3 +214,15 @@ export function countWhile<T>(collection: T[], predicate: (x: T) => boolean): nu
   }
   return count;
 }
+
+/** Splits the given iterable into chunks of the given size. Last chunk may be of smaller than the requested size. */
+export function chunk<T>(items: T[], chunkSize: number): T[][] {
+  if (chunkSize <= 0) {
+    throw new Error('Chunk size must be greater than 0');
+  }
+  const chunks: T[][] = [];
+  for (let i = 0; i < items.length; i += chunkSize) {
+    chunks.push(items.slice(i, i + chunkSize));
+  }
+  return chunks;
+}

package/src/collection/object.ts

@@ -51,6 +51,11 @@ export function omit<T extends object>(object: T, ...props: string[]): Partial<T
   return obj;
 }
 
+/** Equivalent to Object.keys but preserves types. */
+export function getKeys<T extends object>(obj: T): (keyof T)[] {
+  return Object.keys(obj) as (keyof T)[];
+}
+
 /** Equivalent to Object.entries but preserves types. */
 export function getEntries<T extends Record<PropertyKey, unknown>>(obj: T): { [K in keyof T]: [K, T[K]] }[keyof T][] {
   // See https://stackoverflow.com/a/76176570

package/src/config/env_var.ts

@@ -84,7 +84,6 @@ export type EnvVar =
   | 'LOG_MULTILINE'
   | 'LOG_LEVEL'
   | 'MNEMONIC'
-  | 'NETWORK_NAME'
   | 'NETWORK'
   | 'NO_PXE'
   | 'COIN_ISSUER_CONTRACT_ADDRESS'
@@ -105,6 +104,7 @@ export type EnvVar =
   | 'P2P_BOOTSTRAP_NODE_ENR_VERSION_CHECK'
   | 'P2P_BOOTSTRAP_NODES_AS_FULL_PEERS'
   | 'P2P_ENABLED'
+  | 'P2P_DISCOVERY_DISABLED'
   | 'P2P_GOSSIPSUB_D'
   | 'P2P_GOSSIPSUB_DHI'
   | 'P2P_GOSSIPSUB_DLO'
@@ -126,6 +126,8 @@ export type EnvVar =
   | 'P2P_REQRESP_DIAL_TIMEOUT_MS'
   | 'P2P_REQRESP_OVERALL_REQUEST_TIMEOUT_MS'
   | 'P2P_DISABLE_STATUS_HANDSHAKE'
+  | 'P2P_ALLOW_ONLY_VALIDATORS'
+  | 'P2P_MAX_AUTH_FAILED_ATTEMPTS_ALLOWED'
   | 'P2P_REQRESP_OPTIMISTIC_NEGOTIATION'
   | 'P2P_DOUBLE_SPEND_SEVERE_PEER_PENALTY_WINDOW'
   | 'P2P_LISTEN_ADDR'
@@ -135,9 +137,12 @@ export type EnvVar =
   | 'P2P_ARCHIVED_TX_LIMIT'
   | 'P2P_TRUSTED_PEERS'
   | 'P2P_PRIVATE_PEERS'
+  | 'P2P_PREFERRED_PEERS'
   | 'P2P_MAX_TX_POOL_SIZE'
   | 'P2P_TX_POOL_OVERFLOW_FACTOR'
   | 'P2P_SEEN_MSG_CACHE_SIZE'
+  | 'P2P_DROP_TX'
+  | 'P2P_DROP_TX_CHANCE'
   | 'PEER_ID_PRIVATE_KEY'
   | 'PEER_ID_PRIVATE_KEY_PATH'
   | 'PROVER_AGENT_COUNT'
@@ -160,6 +165,7 @@ export type EnvVar =
   | 'PROVER_NODE_TX_GATHERING_INTERVAL_MS'
   | 'PROVER_NODE_TX_GATHERING_BATCH_SIZE'
   | 'PROVER_NODE_TX_GATHERING_MAX_PARALLEL_REQUESTS_PER_NODE'
+  | 'PROVER_NODE_TX_GATHERING_TIMEOUT_MS'
   | 'PROVER_PUBLISH_RETRY_INTERVAL_MS'
   | 'PROVER_PUBLISHER_PRIVATE_KEY'
   | 'PROVER_REAL_PROOFS'
@@ -186,6 +192,9 @@ export type EnvVar =
   | 'SEQ_TX_POLLING_INTERVAL_MS'
   | 'SEQ_ENFORCE_TIME_TABLE'
   | 'SEQ_MAX_L1_TX_INCLUSION_TIME_INTO_SLOT'
+  | 'SEQ_ATTESTATION_PROPAGATION_TIME'
+  | 'SEQ_SECONDS_BEFORE_INVALIDATING_BLOCK_AS_COMMITTEE_MEMBER'
+  | 'SEQ_SECONDS_BEFORE_INVALIDATING_BLOCK_AS_NON_COMMITTEE_MEMBER'
   | 'SLASH_FACTORY_CONTRACT_ADDRESS'
   | 'SLASH_PRUNE_ENABLED'
   | 'SLASH_PRUNE_PENALTY'
@@ -200,6 +209,11 @@ export type EnvVar =
   | 'SLASH_INACTIVITY_SIGNAL_TARGET_PERCENTAGE'
   | 'SLASH_OVERRIDE_PAYLOAD'
   | 'SLASH_PAYLOAD_TTL_SECONDS'
+  | 'SLASH_PROPOSE_INVALID_ATTESTATIONS_PENALTY'
+  | 'SLASH_PROPOSE_INVALID_ATTESTATIONS_MAX_PENALTY'
+  | 'SLASH_ATTEST_DESCENDANT_OF_INVALID_PENALTY'
+  | 'SLASH_ATTEST_DESCENDANT_OF_INVALID_MAX_PENALTY'
+  | 'SLASHER_PRIVATE_KEY'
   | 'STAKING_ASSET_CONTRACT_ADDRESS'
   | 'STAKING_ASSET_HANDLER_CONTRACT_ADDRESS'
   | 'SYNC_MODE'
@@ -208,6 +222,16 @@ export type EnvVar =
   | 'TELEMETRY'
   | 'TEST_ACCOUNTS'
   | 'SPONSORED_FPC'
+  | 'TX_COLLECTION_FAST_NODES_TIMEOUT_BEFORE_REQ_RESP_MS'
+  | 'TX_COLLECTION_SLOW_NODES_INTERVAL_MS'
+  | 'TX_COLLECTION_SLOW_REQ_RESP_INTERVAL_MS'
+  | 'TX_COLLECTION_SLOW_REQ_RESP_TIMEOUT_MS'
+  | 'TX_COLLECTION_RECONCILE_INTERVAL_MS'
+  | 'TX_COLLECTION_DISABLE_SLOW_DURING_FAST_REQUESTS'
+  | 'TX_COLLECTION_FAST_NODE_INTERVAL_MS'
+  | 'TX_COLLECTION_FAST_MAX_PARALLEL_REQUESTS_PER_NODE'
+  | 'TX_COLLECTION_NODE_RPC_MAX_BATCH_SIZE'
+  | 'TX_COLLECTION_NODE_RPC_URLS'
   | 'TX_GOSSIP_VERSION'
   | 'TX_PUBLIC_SETUP_ALLOWLIST'
   | 'TXE_PORT'
@@ -231,12 +255,15 @@ export type EnvVar =
   | 'AZTEC_EPOCH_DURATION'
   | 'AZTEC_TARGET_COMMITTEE_SIZE'
   | 'AZTEC_PROOF_SUBMISSION_EPOCHS'
-  | 'AZTEC_DEPOSIT_AMOUNT'
-  | 'AZTEC_MINIMUM_STAKE'
+  | 'AZTEC_ACTIVATION_THRESHOLD'
+  | 'AZTEC_EJECTION_THRESHOLD'
   | 'AZTEC_MANA_TARGET'
   | 'AZTEC_PROVING_COST_PER_MANA'
   | 'AZTEC_SLASHING_QUORUM'
   | 'AZTEC_SLASHING_ROUND_SIZE'
+  | 'AZTEC_SLASHING_LIFETIME_IN_ROUNDS'
+  | 'AZTEC_SLASHING_EXECUTION_DELAY_IN_ROUNDS'
+  | 'AZTEC_SLASHING_VETOER'
   | 'AZTEC_GOVERNANCE_PROPOSER_QUORUM'
   | 'AZTEC_GOVERNANCE_PROPOSER_ROUND_SIZE'
   | 'AZTEC_EXIT_DELAY_SECONDS'
@@ -264,4 +291,6 @@ export type EnvVar =
   | 'FEE_ASSET_HANDLER_CONTRACT_ADDRESS'
   | 'VALIDATOR_REEXECUTE_DEADLINE_MS'
   | 'AUTO_UPDATE'
-  | 'AUTO_UPDATE_URL';
+  | 'AUTO_UPDATE_URL'
+  | 'WEB3_SIGNER_URL'
+  | 'WEB3_SIGNER_ADDRESSES';

package/src/crypto/secp256k1-signer/utils.ts

@@ -99,7 +99,6 @@ export function recoverPublicKey(hash: Buffer32, signature: Signature): Buffer {
   const { r, s, v } = signature;
   const recoveryBit = toRecoveryBit(v);
   const sig = new secp256k1.Signature(r.toBigInt(), s.toBigInt()).addRecoveryBit(recoveryBit);
-
   const publicKey = sig.recoverPublicKey(hash.buffer).toHex(false);
   return Buffer.from(publicKey, 'hex');
 }

package/src/fields/fields.ts

@@ -60,8 +60,6 @@ abstract class BaseField {
       this.asBigInt = BigInt(value);
       if (this.asBigInt >= this.modulus()) {
         throw new Error(`Value 0x${this.asBigInt.toString(16)} is greater or equal to field modulus.`);
-      } else if (this.asBigInt < 0n) {
-        throw new Error(`Value 0x${this.asBigInt.toString(16)} is negative.`);
       }
     } else if (value instanceof BaseField) {
       this.asBuffer = value.asBuffer;

package/src/log/index.ts

@@ -3,3 +3,4 @@ export * from './libp2p_logger.js';
 export * from './log_fn.js';
 export * from './noir_debug_log_util.js';
 export * from './pino-logger.js';
+export * from './log-levels.js';

package/src/log/pino-logger.ts

@@ -37,11 +37,14 @@ export function createLogger(module: string): Logger {
     debug: (msg: string, data?: unknown) => logFn('debug', msg, data),
     /** Log as trace. Use for when we want to denial-of-service any recipient of the logs. */
     trace: (msg: string, data?: unknown) => logFn('trace', msg, data),
+    /** Level of the logger */
     level: pinoLogger.level as LogLevel,
     /** Whether the given level is enabled for this logger. */
     isLevelEnabled: (level: LogLevel) => isLevelEnabled(pinoLogger, level),
     /** Module name for the logger. */
     module,
+    /** Creates another logger by extending this logger module name. */
+    createChild: (childModule: string) => createLogger(`${module}:${childModule}`),
   };
 }
 
@@ -102,6 +105,7 @@ const useGcloudLogging = parseBooleanEnv(process.env['USE_GCLOUD_LOGGING' satisf
 
 const redactedPaths = [
   'validatorPrivateKeys',
+  'slasherPrivateKey',
   // for both the validator and the prover
   'publisherPrivateKey',
   'peerIdPrivateKey',
@@ -258,6 +262,7 @@ export type Logger = { [K in LogLevel]: LogFn } & { /** Error log function */ er
   level: LogLevel;
   isLevelEnabled: (level: LogLevel) => boolean;
   module: string;
+  createChild: (childModule: string) => Logger;
 };
 
 /**

package/src/number/index.ts

@@ -0,0 +1,14 @@
+/** Bounds the given value between the min and max provided (both inclusive) */
+export function boundInclusive(value: number, min: number, max: number): number {
+  if (min > max) {
+    throw new Error('Minimum bound cannot be greater than maximum bound');
+  }
+
+  if (value < min) {
+    return min;
+  } else if (value > max) {
+    return max;
+  } else {
+    return value;
+  }
+}

package/src/promise/running-promise.ts

@@ -82,7 +82,6 @@ export class RunningPromise {
    */
   async stop(): Promise<void> {
     if (!this.running) {
-      this.logger.warn(`Running promise was not started`);
       return;
     }
     this.running = false;

package/src/schemas/schemas.ts

@@ -65,4 +65,4 @@ export const schemas = {
 };
 
 // These are needed to avoid errors such as: "The inferred type of 'YourClassSchema' cannot be named without a reference to..."
-export type { EthAddress, Point, Fr, Fq };
+export type { EthAddress, Fq, Fr, Point };

package/src/serialize/serialize.ts

@@ -145,6 +145,8 @@ export type Fieldable =
     }
   | Fieldable[];
 
+export type Serializable = Bufferable & Fieldable;
+
 /**
  * Serializes a list of objects contiguously.
  * @param objs - Objects to serialize.