@aztec/foundation 3.0.0-canary.a9708bd → 3.0.0-devnet.20251212

package/dest/trees/unbalanced_merkle_tree_calculator.js

@@ -1,132 +1,158 @@
-import { serializeToBuffer } from '@aztec/foundation/serialize';
-import { SiblingPath } from '@aztec/foundation/trees';
-import { sha256Trunc } from '../crypto/index.js';
-const indexToKeyHash = (level, index)=>`${level}:${index}`;
+import { shaMerkleHash } from './balanced_merkle_tree.js';
+import { SiblingPath } from './sibling_path.js';
+import { UnbalancedTreeStore } from './unbalanced_tree_store.js';
+export function computeCompressedUnbalancedMerkleTreeRoot(leaves, valueToCompress = Buffer.alloc(32), emptyRoot = Buffer.alloc(32), hasher) {
+    const calculator = UnbalancedMerkleTreeCalculator.create(leaves, valueToCompress, emptyRoot, hasher);
+    return calculator.getRoot();
+}
 /**
  * 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.
+ * The values that match the `valueToCompress` are skipped and the sibling of the compressed leaf are shifted up until
+ * they can be paired.
  * If there is only one leaf, the root is the leaf.
  */ export class UnbalancedMerkleTreeCalculator {
-    maxDepth;
+    leaves;
+    valueToCompress;
+    emptyRoot;
     hasher;
-    // This map stores index and depth -> value
-    cache;
-    // This map stores value -> index and depth, since we have variable depth
-    valueCache;
-    size;
-    root;
-    constructor(maxDepth, hasher){
-        this.maxDepth = maxDepth;
+    store;
+    leafLocations;
+    constructor(leaves, valueToCompress, emptyRoot, hasher){
+        this.leaves = leaves;
+        this.valueToCompress = valueToCompress;
+        this.emptyRoot = emptyRoot;
         this.hasher = hasher;
-        this.cache = {};
-        this.valueCache = {};
-        this.size = 0n;
-        this.root = Buffer.alloc(32);
+        this.leafLocations = [];
+        this.store = new UnbalancedTreeStore(leaves.length);
+        this.buildTree();
     }
-    static create(height, hasher = (left, right)=>Promise.resolve(sha256Trunc(Buffer.concat([
-            left,
-            right
-        ])))) {
-        return new UnbalancedMerkleTreeCalculator(height, hasher);
+    static create(leaves, valueToCompress = Buffer.alloc(0), emptyRoot = Buffer.alloc(32), hasher = shaMerkleHash) {
+        return new UnbalancedMerkleTreeCalculator(leaves, valueToCompress, emptyRoot, hasher);
     }
     /**
    * Returns the root of the tree.
    * @returns The root of the tree.
    */ getRoot() {
-        return this.root;
+        return this.store.getRoot().value;
     }
     /**
-   * Returns a sibling path for the element at the given index.
+   * Returns a sibling path for the element.
    * @param value - The value of the element.
    * @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);
-        let index = BigInt(_index);
-        while(level > 0){
-            const isRight = index & 0x01n;
-            const key = indexToKeyHash(level, isRight ? index - 1n : index + 1n);
-            const sibling = this.cache[key];
-            path.push(sibling);
-            level -= 1;
-            index >>= 1n;
+        const leafIndex = this.leaves.findIndex((leaf)=>leaf.equals(value));
+        if (leafIndex === -1) {
+            throw Error(`Leaf value ${value.toString('hex')} not found in tree.`);
         }
-        return Promise.resolve(new SiblingPath(parseInt(depth, 10), path));
+        return this.getSiblingPathByLeafIndex(leafIndex);
     }
     /**
-   * Appends the given leaves to the tree.
-   * @param leaves - The leaves to append.
-   * @returns Empty promise.
-   */ async appendLeaves(leaves) {
-        if (this.size != BigInt(0)) {
-            throw Error(`Can't re-append to an unbalanced tree. Current has ${this.size} leaves.`);
+   * Returns a sibling path for the leaf at the given index.
+   * @param leafIndex - The index of the leaf.
+   * @returns A sibling path for the leaf.
+   */ getSiblingPathByLeafIndex(leafIndex) {
+        if (leafIndex >= this.leaves.length) {
+            throw Error(`Leaf index ${leafIndex} out of bounds. Tree has ${this.leaves.length} leaves.`);
         }
-        if (leaves.length === 0) {
-            throw Error(`Can't append 0 leaves to an unbalanced tree.`);
+        const leaf = this.leaves[leafIndex];
+        if (leaf.equals(this.valueToCompress)) {
+            throw Error(`Leaf at index ${leafIndex} has been compressed.`);
         }
-        if (leaves.length === 1) {
-            this.root = leaves[0];
-        } else {
-            this.root = await this.batchInsert(leaves);
+        const path = [];
+        let location = this.leafLocations[leafIndex];
+        while(location.level > 0){
+            const sibling = this.store.getSibling(location);
+            path.push(sibling.value);
+            location = this.store.getParentLocation(location);
         }
-        this.size = BigInt(leaves.length);
-        return Promise.resolve();
+        return new SiblingPath(path.length, path);
+    }
+    getLeafLocation(leafIndex) {
+        return this.leafLocations[leafIndex];
     }
     /**
-   * Calculates root while adding leaves and nodes to the cache.
-   * @param leaves - The leaves to append.
-   * @returns Resulting root of the tree.
-   */ async batchInsert(_leaves) {
-        // If we have an even number of leaves, hash them all in pairs
-        // Otherwise, store the final leaf to be shifted up to the next odd sized level
-        let [layerWidth, nodeToShift] = _leaves.length & 1 ? [
-            _leaves.length - 1,
-            serializeToBuffer(_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).map((l)=>serializeToBuffer(l));
-        let nextLayer = [];
-        // Store the bottom level leaves
-        thisLayer.forEach((leaf, i)=>this.storeNode(leaf, this.maxDepth, BigInt(i)));
-        for(let i = 0; i < this.maxDepth; i++){
-            for(let j = 0; j < layerWidth; j += 2){
-                // Store the hash of each pair one layer up
-                nextLayer[j / 2] = await this.hasher(serializeToBuffer(thisLayer[j]), serializeToBuffer(thisLayer[j + 1]));
-                this.storeNode(nextLayer[j / 2], this.maxDepth - i - 1, BigInt(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(serializeToBuffer(nodeToShift));
-                    this.storeNode(nodeToShift, this.maxDepth - i - 1, BigInt(layerWidth * 2 >> 1));
-                    layerWidth += 1;
-                    nodeToShift = Buffer.alloc(0);
+   * Adds leaves and nodes to the store. Updates the leafLocations.
+   * @param leaves - The leaves of the tree.
+   */ buildTree() {
+        this.leafLocations = this.leaves.map((value, i)=>this.store.setLeaf(i, {
+                value,
+                leafIndex: i
+            }));
+        // Start with the leaves that are not compressed.
+        let toProcess = this.leafLocations.filter((_, i)=>!this.leaves[i].equals(this.valueToCompress));
+        if (!toProcess.length) {
+            // All leaves are compressed. Set empty root to the root.
+            this.store.setNode({
+                level: 0,
+                index: 0
+            }, {
+                value: this.emptyRoot
+            });
+            return;
+        }
+        const level = toProcess[0].level;
+        for(let i = level; i > 0; i--){
+            const toProcessNext = [];
+            for (const location of toProcess){
+                if (location.level !== i) {
+                    toProcessNext.push(location);
+                    continue;
+                }
+                const parentLocation = this.store.getParentLocation(location);
+                if (this.store.getNode(parentLocation)) {
+                    continue;
+                }
+                const sibling = this.store.getSibling(location);
+                // If sibling is undefined, all its children are compressed.
+                const shouldShiftUp = !sibling || sibling.value.equals(this.valueToCompress);
+                if (shouldShiftUp) {
+                    // The node becomes the parent if the sibling is a compressed leaf.
+                    this.shiftNodeUp(location, parentLocation);
                 } 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];
+                    // Hash the value with the (right) sibling and update the parent node.
+                    const node = this.store.getNode(location);
+                    const parentValue = this.hasher(node.value, sibling.value);
+                    this.store.setNode(parentLocation, {
+                        value: parentValue
+                    });
                 }
+                // Add the parent location to be processed next.
+                toProcessNext.push(parentLocation);
+            }
+            toProcess = toProcessNext;
+        }
+    }
+    shiftNodeUp(from, to) {
+        // Collect all nodes that need to shift.
+        const nodesToShift = this.collectNodesToShift(from, to);
+        // Move all nodes to their new locations.
+        for (const { node, newLocation } of nodesToShift){
+            this.store.setNode(newLocation, node);
+            if (node.leafIndex !== undefined) {
+                this.leafLocations[node.leafIndex] = newLocation;
             }
-            // reset the layers
-            thisLayer = nextLayer;
-            nextLayer = [];
         }
-        // return the root
-        return thisLayer[0];
     }
-    storeNode(value, depth, index) {
-        const key = indexToKeyHash(depth, index);
-        this.cache[key] = value;
-        this.valueCache[value.toString('hex')] = key;
+    collectNodesToShift(from, to) {
+        const node = this.store.getNode(from);
+        if (!node) {
+            return [];
+        }
+        let result = [
+            {
+                node,
+                newLocation: to
+            }
+        ];
+        // If not a leaf, collect its children.
+        if (node.leafIndex === undefined) {
+            const [leftChild, rightChild] = this.store.getChildLocations(from);
+            const [leftChildNew, rightChildNew] = this.store.getChildLocations(to);
+            result = result.concat(this.collectNodesToShift(leftChild, leftChildNew)).concat(this.collectNodesToShift(rightChild, rightChildNew));
+        }
+        return result;
     }
 }

package/dest/trees/unbalanced_tree_store.d.ts

@@ -12,8 +12,9 @@ export declare class UnbalancedTreeStore<T> {
     getChildLocations({ level, index }: TreeNodeLocation): [TreeNodeLocation, TreeNodeLocation];
     getLeaf(leafIndex: number): T | undefined;
     getNode(location: TreeNodeLocation): T | undefined;
+    getRoot(): T | undefined;
     getParent(location: TreeNodeLocation): T | undefined;
     getSibling(location: TreeNodeLocation): T | undefined;
     getChildren(location: TreeNodeLocation): [T | undefined, T | undefined];
 }
-//# sourceMappingURL=unbalanced_tree_store.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidW5iYWxhbmNlZF90cmVlX3N0b3JlLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvdHJlZXMvdW5iYWxhbmNlZF90cmVlX3N0b3JlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUVBLE1BQU0sV0FBVyxnQkFBZ0I7SUFDL0IsS0FBSyxFQUFFLE1BQU0sQ0FBQztJQUNkLEtBQUssRUFBRSxNQUFNLENBQUM7Q0FDZjtBQU9ELHFCQUFhLG1CQUFtQixDQUFDLENBQUM7O0lBSWhDLFlBQVksU0FBUyxFQUFFLE1BQU0sRUFFNUI7SUFFRCxPQUFPLENBQUMsU0FBUyxFQUFFLE1BQU0sRUFBRSxLQUFLLEVBQUUsQ0FBQyxHQUFHLGdCQUFnQixDQWVyRDtJQUVELE9BQU8sQ0FBQyxFQUFFLEtBQUssRUFBRSxLQUFLLEVBQUUsRUFBRSxnQkFBZ0IsRUFBRSxLQUFLLEVBQUUsQ0FBQyxRQVNuRDtJQUVELGlCQUFpQixDQUFDLEVBQUUsS0FBSyxFQUFFLEtBQUssRUFBRSxFQUFFLGdCQUFnQixHQUFHLGdCQUFnQixDQU10RTtJQUVELGtCQUFrQixDQUFDLEVBQUUsS0FBSyxFQUFFLEtBQUssRUFBRSxFQUFFLGdCQUFnQixHQUFHLGdCQUFnQixDQU12RTtJQUVELGlCQUFpQixDQUFDLEVBQUUsS0FBSyxFQUFFLEtBQUssRUFBRSxFQUFFLGdCQUFnQixHQUFHLENBQUMsZ0JBQWdCLEVBQUUsZ0JBQWdCLENBQUMsQ0FJMUY7SUFFRCxPQUFPLENBQUMsU0FBUyxFQUFFLE1BQU0sR0FBRyxDQUFDLEdBQUcsU0FBUyxDQU94QztJQUVELE9BQU8sQ0FBQyxRQUFRLEVBQUUsZ0JBQWdCLEdBQUcsQ0FBQyxHQUFHLFNBQVMsQ0FFakQ7SUFFRCxPQUFPLElBQUksQ0FBQyxHQUFHLFNBQVMsQ0FFdkI7SUFFRCxTQUFTLENBQUMsUUFBUSxFQUFFLGdCQUFnQixHQUFHLENBQUMsR0FBRyxTQUFTLENBR25EO0lBRUQsVUFBVSxDQUFDLFFBQVEsRUFBRSxnQkFBZ0IsR0FBRyxDQUFDLEdBQUcsU0FBUyxDQUdwRDtJQUVELFdBQVcsQ0FBQyxRQUFRLEVBQUUsZ0JBQWdCLEdBQUcsQ0FBQyxDQUFDLEdBQUcsU0FBUyxFQUFFLENBQUMsR0FBRyxTQUFTLENBQUMsQ0FHdEU7Q0FLRiJ9

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

@@ -1 +1 @@
-{"version":3,"file":"unbalanced_tree_store.d.ts","sourceRoot":"","sources":["../../src/trees/unbalanced_tree_store.ts"],"names":[],"mappings":"AAEA,MAAM,WAAW,gBAAgB;IAC/B,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;CACf;AAOD,qBAAa,mBAAmB,CAAC,CAAC;;gBAIpB,SAAS,EAAE,MAAM;IAI7B,OAAO,CAAC,SAAS,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,GAAG,gBAAgB;IAiBtD,OAAO,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,EAAE,gBAAgB,EAAE,KAAK,EAAE,CAAC;IAWpD,iBAAiB,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,EAAE,gBAAgB,GAAG,gBAAgB;IAQvE,kBAAkB,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,EAAE,gBAAgB,GAAG,gBAAgB;IAQxE,iBAAiB,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,EAAE,gBAAgB,GAAG,CAAC,gBAAgB,EAAE,gBAAgB,CAAC;IAM3F,OAAO,CAAC,SAAS,EAAE,MAAM;IASzB,OAAO,CAAC,QAAQ,EAAE,gBAAgB,GAAG,CAAC,GAAG,SAAS;IAIlD,SAAS,CAAC,QAAQ,EAAE,gBAAgB,GAAG,CAAC,GAAG,SAAS;IAKpD,UAAU,CAAC,QAAQ,EAAE,gBAAgB,GAAG,CAAC,GAAG,SAAS;IAKrD,WAAW,CAAC,QAAQ,EAAE,gBAAgB,GAAG,CAAC,CAAC,GAAG,SAAS,EAAE,CAAC,GAAG,SAAS,CAAC;CAQxE"}
+{"version":3,"file":"unbalanced_tree_store.d.ts","sourceRoot":"","sources":["../../src/trees/unbalanced_tree_store.ts"],"names":[],"mappings":"AAEA,MAAM,WAAW,gBAAgB;IAC/B,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;CACf;AAOD,qBAAa,mBAAmB,CAAC,CAAC;;IAIhC,YAAY,SAAS,EAAE,MAAM,EAE5B;IAED,OAAO,CAAC,SAAS,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,GAAG,gBAAgB,CAerD;IAED,OAAO,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,EAAE,gBAAgB,EAAE,KAAK,EAAE,CAAC,QASnD;IAED,iBAAiB,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,EAAE,gBAAgB,GAAG,gBAAgB,CAMtE;IAED,kBAAkB,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,EAAE,gBAAgB,GAAG,gBAAgB,CAMvE;IAED,iBAAiB,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,EAAE,gBAAgB,GAAG,CAAC,gBAAgB,EAAE,gBAAgB,CAAC,CAI1F;IAED,OAAO,CAAC,SAAS,EAAE,MAAM,GAAG,CAAC,GAAG,SAAS,CAOxC;IAED,OAAO,CAAC,QAAQ,EAAE,gBAAgB,GAAG,CAAC,GAAG,SAAS,CAEjD;IAED,OAAO,IAAI,CAAC,GAAG,SAAS,CAEvB;IAED,SAAS,CAAC,QAAQ,EAAE,gBAAgB,GAAG,CAAC,GAAG,SAAS,CAGnD;IAED,UAAU,CAAC,QAAQ,EAAE,gBAAgB,GAAG,CAAC,GAAG,SAAS,CAGpD;IAED,WAAW,CAAC,QAAQ,EAAE,gBAAgB,GAAG,CAAC,CAAC,GAAG,SAAS,EAAE,CAAC,GAAG,SAAS,CAAC,CAGtE;CAKF"}

package/dest/trees/unbalanced_tree_store.js

@@ -73,6 +73,12 @@ export class UnbalancedTreeStore {
     getNode(location) {
         return this.#nodeMapping.get(this.#getKey(location))?.value;
     }
+    getRoot() {
+        return this.getNode({
+            level: 0,
+            index: 0
+        });
+    }
     getParent(location) {
         const parentLocation = this.getParentLocation(location);
         return this.getNode(parentLocation);

package/dest/types/index.d.ts

@@ -39,4 +39,4 @@ export interface TypedEventEmitter<TEventMap extends {
     removeListener<K extends keyof TEventMap>(event: K, listener: TEventMap[K]): this;
     removeAllListeners<K extends keyof TEventMap>(event: K): this;
 }
-//# sourceMappingURL=index.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy90eXBlcy9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxnQ0FBZ0M7QUFDaEMsTUFBTSxNQUFNLFFBQVEsQ0FBQyxDQUFDLElBQUk7S0FDdkIsQ0FBQyxJQUFJLE1BQU0sQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFDLENBQUMsU0FBUyxRQUFRLEdBQUcsS0FBSyxHQUFHLENBQUMsR0FBRyxDQUFDLENBQUMsQ0FBQyxDQUFDO0NBQzFELENBQUM7QUFFRixrQ0FBa0M7QUFDbEMsTUFBTSxNQUFNLFdBQVcsQ0FBQyxDQUFDLElBQUk7S0FDMUIsQ0FBQyxJQUFJLE1BQU0sQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFDLENBQUMsU0FBUyxRQUFRLEdBQUcsQ0FBQyxHQUFHLEtBQUssR0FBRyxDQUFDLENBQUMsQ0FBQyxDQUFDO0NBQzFELENBQUM7QUFFRix1REFBdUQ7QUFDdkQsTUFBTSxNQUFNLFNBQVMsQ0FBQyxDQUFDLEVBQUUsQ0FBQyxTQUFTLE1BQU0sQ0FBQyxJQUFJLElBQUksQ0FBQyxDQUFDLEVBQUUsQ0FBQyxDQUFDLEdBQUcsT0FBTyxDQUFDLElBQUksQ0FBQyxDQUFDLEVBQUUsQ0FBQyxDQUFDLENBQUMsQ0FBQztBQUUvRSw2Q0FBNkM7QUFDN0MsTUFBTSxNQUFNLFNBQVMsQ0FBQyxDQUFDLElBQUk7SUFBRSxDQUFDLFVBQVUsQ0FBQyxJQUFJLE1BQU0sQ0FBQyxHQUFHLENBQUMsQ0FBQyxDQUFDLENBQUM7Q0FBRSxDQUFDO0FBRTlELGdEQUFnRDtBQUNoRCx3QkFBZ0IsUUFBUSxDQUFDLENBQUMsRUFBRSxHQUFHLEVBQUUsQ0FBQyxHQUFHLFNBQVMsQ0FBQyxDQUFDLENBQUMsQ0FFaEQ7QUFFRCxxREFBcUQ7QUFDckQsTUFBTSxNQUFNLFFBQVEsQ0FBQyxDQUFDLElBQUk7S0FDdkIsQ0FBQyxJQUFJLE1BQU0sQ0FBQyxHQUFHLENBQUMsQ0FBQyxDQUFDLENBQUM7Q0FDckIsR0FBRyxFQUFFLENBQUM7QUFFUDs7Ozs7Ozs7OztHQVVHO0FBQ0gsTUFBTSxXQUFXLGlCQUFpQixDQUFDLFNBQVMsU0FBUztLQUFHLEdBQUcsSUFBSSxNQUFNLFNBQVMsR0FBRyxDQUFDLEdBQUcsSUFBSSxFQUFFLEdBQUcsRUFBRSxLQUFLLElBQUk7Q0FBRTtJQUN6RyxJQUFJLENBQUMsQ0FBQyxTQUFTLE1BQU0sU0FBUyxFQUFFLEtBQUssRUFBRSxDQUFDLEVBQUUsUUFBUSxFQUFFLFNBQVMsQ0FBQyxDQUFDLENBQUMsR0FBRyxJQUFJLENBQUM7SUFDeEUsRUFBRSxDQUFDLENBQUMsU0FBUyxNQUFNLFNBQVMsRUFBRSxLQUFLLEVBQUUsQ0FBQyxFQUFFLFFBQVEsRUFBRSxTQUFTLENBQUMsQ0FBQyxDQUFDLEdBQUcsSUFBSSxDQUFDO0lBQ3RFLEdBQUcsQ0FBQyxDQUFDLFNBQVMsTUFBTSxTQUFTLEVBQUUsS0FBSyxFQUFFLENBQUMsRUFBRSxRQUFRLEVBQUUsU0FBUyxDQUFDLENBQUMsQ0FBQyxHQUFHLElBQUksQ0FBQztJQUN2RSxJQUFJLENBQUMsQ0FBQyxTQUFTLE1BQU0sU0FBUyxFQUFFLEtBQUssRUFBRSxDQUFDLEVBQUUsR0FBRyxJQUFJLEVBQUUsVUFBVSxDQUFDLFNBQVMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxHQUFHLE9BQU8sQ0FBQztJQUN0RixjQUFjLENBQUMsQ0FBQyxTQUFTLE1BQU0sU0FBUyxFQUFFLEtBQUssRUFBRSxDQUFDLEVBQUUsUUFBUSxFQUFFLFNBQVMsQ0FBQyxDQUFDLENBQUMsR0FBRyxJQUFJLENBQUM7SUFDbEYsa0JBQWtCLENBQUMsQ0FBQyxTQUFTLE1BQU0sU0FBUyxFQUFFLEtBQUssRUFBRSxDQUFDLEdBQUcsSUFBSSxDQUFDO0NBRS9EIn0=

package/dest/url/index.d.ts

@@ -6,4 +6,4 @@
  * @api public
  */
 export declare function fileURLToPath(uri: string): string;
-//# sourceMappingURL=index.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy91cmwvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBbUJBOzs7Ozs7R0FNRztBQUVILHdCQUFnQixhQUFhLENBQUMsR0FBRyxFQUFFLE1BQU0sR0FBRyxNQUFNLENBNENqRCJ9

package/dest/validation/index.d.ts

@@ -6,4 +6,4 @@ export declare function required<T>(value: T | undefined, errMsg?: string): T;
  * @param err - Error message to throw if x isn't met.
  */
 export declare function assert(x: any, err: string): asserts x;
-//# sourceMappingURL=index.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy92YWxpZGF0aW9uL2luZGV4LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLHlFQUF5RTtBQUN6RSx3QkFBZ0IsUUFBUSxDQUFDLENBQUMsRUFBRSxLQUFLLEVBQUUsQ0FBQyxHQUFHLFNBQVMsRUFBRSxNQUFNLENBQUMsRUFBRSxNQUFNLEdBQUcsQ0FBQyxDQUtwRTtBQUVEOzs7O0dBSUc7QUFDSCx3QkFBZ0IsTUFBTSxDQUFDLENBQUMsRUFBRSxHQUFHLEVBQUUsR0FBRyxFQUFFLE1BQU0sR0FBRyxPQUFPLENBQUMsQ0FBQyxDQUlyRCJ9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aztec/foundation",
-  "version": "3.0.0-canary.a9708bd",
+  "version": "3.0.0-devnet.20251212",
   "type": "module",
   "main": "./dest/index.js",
   "types": "./dest/index.d.ts",
@@ -12,10 +12,30 @@
     "./async-map": "./dest/async-map/index.js",
     "./async-pool": "./dest/async-pool/index.js",
     "./bigint": "./dest/bigint/index.js",
+    "./branded-types": "./dest/branded-types/index.js",
     "./collection": "./dest/collection/index.js",
     "./config": "./dest/config/index.js",
-    "./crypto": "./dest/crypto/index.js",
+    "./crypto/aes128": "./dest/crypto/aes128/index.js",
+    "./crypto/bls": "./dest/crypto/bls/index.js",
+    "./crypto/bls/bn254_keystore": "./dest/crypto/bls/bn254_keystore.js",
+    "./crypto/bn254": "./dest/crypto/bn254/index.js",
+    "./crypto/ecdsa": "./dest/crypto/ecdsa/index.js",
+    "./crypto/grumpkin": "./dest/crypto/grumpkin/index.js",
+    "./crypto/keccak": "./dest/crypto/keccak/index.js",
+    "./crypto/keys": "./dest/crypto/keys/index.js",
+    "./crypto/pedersen": "./dest/crypto/pedersen/index.js",
+    "./crypto/poseidon": "./dest/crypto/poseidon/index.js",
+    "./crypto/random": "./dest/crypto/random/index.js",
+    "./crypto/schnorr": "./dest/crypto/schnorr/index.js",
+    "./crypto/secp256k1": "./dest/crypto/secp256k1/index.js",
+    "./crypto/secp256k1-signer": "./dest/crypto/secp256k1-signer/index.js",
+    "./crypto/sha256": "./dest/crypto/sha256/index.js",
+    "./crypto/sha512": "./dest/crypto/sha512/index.js",
+    "./crypto/signature": "./dest/crypto/signature/index.js",
     "./crypto/sync": "./dest/crypto/sync/index.js",
+    "./curves/bn254": "./dest/curves/bn254/index.js",
+    "./curves/grumpkin": "./dest/curves/grumpkin/index.js",
+    "./curves/bls12": "./dest/curves/bls12/index.js",
     "./decorators": "./dest/decorators/index.js",
     "./error": "./dest/error/index.js",
     "./eth-address": "./dest/eth-address/index.js",
@@ -31,7 +51,6 @@
     "./iterable": "./dest/iterable/index.js",
     "./log": "./dest/log/index.js",
     "./mutex": "./dest/mutex/index.js",
-    "./fields": "./dest/fields/index.js",
     "./retry": "./dest/retry/index.js",
     "./running-promise": "./dest/running-promise/index.js",
     "./serialize": "./dest/serialize/index.js",
@@ -47,6 +66,7 @@
     "./noir": "./dest/noir/index.js",
     "./testing": "./dest/testing/index.js",
     "./testing/files": "./dest/testing/files/index.js",
+    "./profiler": "./dest/profiler/index.js",
     "./array": "./dest/array/index.js",
     "./validation": "./dest/validation/index.js",
     "./promise": "./dest/promise/index.js",
@@ -55,8 +75,8 @@
     "./number": "./dest/number/index.js"
   },
   "scripts": {
-    "build": "yarn clean && tsc -b",
-    "build:dev": "tsc -b --watch",
+    "build": "yarn clean && ../scripts/tsc.sh",
+    "build:dev": "../scripts/tsc.sh --watch",
     "clean": "rm -rf ./dest .tsbuildinfo",
     "generate": "true",
     "test": "NODE_NO_WARNINGS=1 node --experimental-vm-modules ../node_modules/.bin/jest --passWithNoTests --maxWorkers=${JEST_MAX_WORKERS:-8}"
@@ -102,9 +122,11 @@
     "testEnvironment": "../../foundation/src/jest/env.mjs"
   },
   "dependencies": {
-    "@aztec/bb.js": "3.0.0-canary.a9708bd",
+    "@aztec/bb.js": "3.0.0-devnet.20251212",
     "@koa/cors": "^5.0.0",
     "@noble/curves": "=1.7.0",
+    "@noble/hashes": "^1.6.1",
+    "@scure/bip39": "^2.0.1",
     "bn.js": "^5.2.1",
     "colorette": "^2.0.20",
     "detect-node": "^2.1.0",
@@ -112,7 +134,7 @@
     "koa": "^2.16.1",
     "koa-bodyparser": "^4.4.0",
     "koa-compress": "^5.1.0",
-    "koa-router": "^12.0.0",
+    "koa-router": "^13.1.1",
     "leveldown": "^6.1.1",
     "lodash.chunk": "^4.2.0",
     "lodash.clonedeepwith": "^4.5.0",
@@ -139,6 +161,7 @@
     "@types/node": "^22.15.17",
     "@types/pako": "^2.0.0",
     "@types/supertest": "^2.0.12",
+    "@typescript/native-preview": "7.0.0-dev.20251126.1",
     "comlink": "^4.4.1",
     "eslint": "^9.26.0",
     "eslint-config-prettier": "^10.1.5",
@@ -153,7 +176,7 @@
     "ts-node": "^10.9.1",
     "typescript": "^5.3.3",
     "typescript-eslint": "^8.32.1",
-    "viem": "2.23.7"
+    "viem": "npm:@aztec/viem@2.38.2"
   },
   "files": [
     "dest",

package/src/array/array.ts

@@ -42,22 +42,6 @@ export async function makeTupleAsync<T, N extends number>(length: N, fn: (i: num
   )) as Tuple<T, N>;
 }
 
-/**
- * Create an array over an integer range, filled with a function 'fn'. However, the latter half of the array are set to zeros.
- * see `makeTuple` above.
- * @param n - The number of integers.
- * @param fn - The generator function.
- * @returns The array of numbers.
- */
-export function makeHalfFullTuple<T, N extends number>(
-  length: N,
-  fn: (i: number) => T,
-  offset = 0,
-  makeEmpty: () => T,
-) {
-  return Array.from({ length }, (_: any, i: number) => (i < length / 2 ? fn(i + offset) : makeEmpty())) as Tuple<T, N>;
-}
-
 /**
  * Assert a member of an object is a certain length.
  * @param obj - An object.

package/src/branded-types/block_number.ts

@@ -0,0 +1,112 @@
+import { z } from 'zod';
+
+import type { CheckpointNumber } from './checkpoint_number.js';
+import type { Branded } from './types.js';
+
+/**
+ * A branded type representing an Aztec (L2) block number.
+ * Block numbers are sequential identifiers for blocks in the Aztec rollup chain.
+ *
+ * This is a nominal type backed by a number, but TypeScript will treat it as
+ * incompatible with plain numbers and other branded numeric types (like EpochNumber, SlotNumber, etc.).
+ *
+ * Note: This type should ONLY be used for Aztec L2 block numbers, NOT for Ethereum L1 block numbers.
+ *
+ * @example
+ * ```ts
+ * const blockNumber = BlockNumber(100);
+ * const plainNumber: number = blockNumber; // OK - BlockNumber is assignable to number
+ * const blockFromNumber: BlockNumber = 100;  // ERROR - number is not assignable to BlockNumber
+ * ```
+ */
+export type BlockNumber = Branded<number, 'BlockNumber'>;
+
+/**
+ * Creates a BlockNumber from a number.
+ * @param value - The block number (must be a non-negative integer)
+ * @returns The branded BlockNumber value
+ * @throws If the value is negative or not an integer
+ */
+export function BlockNumber(value: number): BlockNumber {
+  if (!Number.isInteger(value)) {
+    throw new Error(`BlockNumber must be an integer, got ${value}`);
+  }
+  if (value < 0) {
+    throw new Error(`BlockNumber must be non-negative, got ${value}`);
+  }
+  return value as BlockNumber;
+}
+
+/**
+ * Creates a BlockNumber from a bigint.
+ * @param value - The block number as bigint (must be a non-negative integer within safe integer range)
+ * @returns The branded BlockNumber value
+ * @throws If the value is negative or exceeds Number.MAX_SAFE_INTEGER
+ */
+BlockNumber.fromBigInt = function (value: bigint): BlockNumber {
+  if (value < 0n) {
+    throw new Error(`BlockNumber must be non-negative, got ${value}`);
+  }
+  if (value > BigInt(Number.MAX_SAFE_INTEGER)) {
+    throw new Error(`BlockNumber ${value} exceeds MAX_SAFE_INTEGER`);
+  }
+  return Number(value) as BlockNumber;
+};
+
+/**
+ * Creates a BlockNumber from a string.
+ * @param value - The block number as a string
+ * @returns The branded BlockNumber value
+ * @throws If the string cannot be parsed as a valid block number
+ */
+BlockNumber.fromString = function (value: string): BlockNumber {
+  const parsed = parseInt(value, 10);
+  if (isNaN(parsed)) {
+    throw new Error(`Cannot parse BlockNumber from string: ${value}`);
+  }
+  return BlockNumber(parsed);
+};
+
+/**
+ * Converts a CheckpointNumber to a BlockNumber.
+ * This is used in checkpoint-based systems where checkpoint numbers align with block numbers.
+ * WARNING: This should only be used when you know the checkpoint number corresponds to a block number.
+ * @param value - The checkpoint number to convert
+ * @returns The corresponding BlockNumber
+ */
+BlockNumber.fromCheckpointNumber = function (value: CheckpointNumber): BlockNumber {
+  return value as unknown as BlockNumber;
+};
+
+/**
+ * Type guard to check if a value is a valid BlockNumber.
+ * Note: At runtime, a BlockNumber is just a number, so this checks if the value
+ * is a non-negative integer.
+ */
+BlockNumber.isValid = function (value: unknown): value is BlockNumber {
+  return typeof value === 'number' && Number.isInteger(value) && value >= 0;
+};
+
+/**
+ * The zero block value (genesis block).
+ */
+BlockNumber.ZERO = BlockNumber(0);
+
+function makeBlockNumberSchema(minValue: number) {
+  return z
+    .union([z.number(), z.bigint(), z.string()])
+    .pipe(z.coerce.number().int().min(minValue))
+    .transform(value => BlockNumber(value));
+}
+
+/**
+ * Zod schema for parsing and validating BlockNumber values.
+ * Accepts numbers, bigints, or strings and coerces them to BlockNumber.
+ */
+export const BlockNumberSchema = makeBlockNumberSchema(0);
+
+/**
+ * Zod schema for parsing and validating BlockNumber values that are strictly positive.
+ * Accepts numbers, bigints, or strings and coerces them to BlockNumber.
+ */
+export const BlockNumberPositiveSchema = makeBlockNumberSchema(1);