@aztec/world-state 0.14.2 → 0.15.0

package/dest/world-state-db/index.d.ts

@@ -1,193 +1,4 @@
-/// <reference types="node" resolution-mode="require"/>
-import { Fr } from '@aztec/foundation/fields';
-import { LeafData, LowLeafWitnessData } from '@aztec/merkle-tree';
-import { L2Block, MerkleTreeId, SiblingPath } from '@aztec/types';
 export * from './merkle_trees.js';
+export * from './merkle_tree_db.js';
 export { LeafData } from '@aztec/merkle-tree';
-/**
- * Type alias for the nullifier tree ID.
- */
-export type IndexedTreeId = MerkleTreeId.NULLIFIER_TREE;
-/**
- * Type alias for the public data tree ID.
- */
-export type PublicTreeId = MerkleTreeId.PUBLIC_DATA_TREE;
-/**
- *
- * @remarks Short explanation:
- *    The nullifier tree must be initially padded as the pre-populated 0 index prevents efficient subtree insertion.
- *    Padding with some values solves this issue.
- *
- * @remarks Thorough explanation:
- *    There needs to be an initial (0,0,0) leaf in the tree, so that when we insert the first 'proper' leaf, we can
- *    prove that any value greater than 0 doesn't exist in the tree yet. We prefill/pad the tree with "the number of
- *    leaves that are added by one block" so that the first 'proper' block can insert a full subtree.
- *
- *    Without this padding, there would be a leaf (0,0,0) at leaf index 0, making it really difficult to insert e.g.
- *    1024 leaves for the first block, because there's only neat space for 1023 leaves after 0. By padding with 1023
- *    more leaves, we can then insert the first block of 1024 leaves into indices 1024:2047.
- */
-export declare const INITIAL_NULLIFIER_TREE_SIZE: number;
-/**
- *  Defines tree information.
- */
-export interface TreeInfo {
-    /**
-     * The tree ID.
-     */
-    treeId: MerkleTreeId;
-    /**
-     * The tree root.
-     */
-    root: Buffer;
-    /**
-     * The number of leaves in the tree.
-     */
-    size: bigint;
-    /**
-     * The depth of the tree.
-     */
-    depth: number;
-}
-/**
- * Adds a last boolean flag in each function on the type.
- */
-type WithIncludeUncommitted<F> = F extends (...args: [...infer Rest]) => infer Return ? (...args: [...Rest, boolean]) => Return : F;
-/**
- * The current roots of the commitment trees
- */
-export type CurrentTreeRoots = {
-    /** Note Hash Tree root. */
-    noteHashTreeRoot: Buffer;
-    /** Contract data tree root. */
-    contractDataTreeRoot: Buffer;
-    /** L1 to L2 Messages data tree root. */
-    l1Tol2MessagesTreeRoot: Buffer;
-    /** Nullifier data tree root. */
-    nullifierTreeRoot: Buffer;
-    /** Blocks tree root. */
-    blocksTreeRoot: Buffer;
-    /** Public data tree root */
-    publicDataTreeRoot: Buffer;
-};
-/**
- * Defines the names of the setters on Merkle Trees.
- */
-type MerkleTreeSetters = 'appendLeaves' | 'updateLeaf' | 'commit' | 'rollback' | 'handleL2Block' | 'batchInsert';
-/**
- * Defines the interface for operations on a set of Merkle Trees configuring whether to return committed or uncommitted data.
- */
-export type MerkleTreeDb = {
-    [Property in keyof MerkleTreeOperations as Exclude<Property, MerkleTreeSetters>]: WithIncludeUncommitted<MerkleTreeOperations[Property]>;
-} & Pick<MerkleTreeOperations, MerkleTreeSetters>;
-/**
- * Defines the interface for operations on a set of Merkle Trees.
- */
-export interface MerkleTreeOperations {
-    /**
-     * Appends leaves to a given tree.
-     * @param treeId - The tree to be updated.
-     * @param leaves - The set of leaves to be appended.
-     */
-    appendLeaves(treeId: MerkleTreeId, leaves: Buffer[]): Promise<void>;
-    /**
-     * Returns information about the given tree.
-     * @param treeId - The tree to be queried.
-     */
-    getTreeInfo(treeId: MerkleTreeId): Promise<TreeInfo>;
-    /**
-     * Gets the current roots of the commitment trees.
-     */
-    getTreeRoots(): Promise<CurrentTreeRoots>;
-    /**
-     * Gets sibling path for a leaf.
-     * @param treeId - The tree to be queried for a sibling path.
-     * @param index - The index of the leaf for which a sibling path should be returned.
-     */
-    getSiblingPath<N extends number>(treeId: MerkleTreeId, index: bigint): Promise<SiblingPath<N>>;
-    /**
-     * Returns the previous index for a given value in an indexed tree.
-     * @param treeId - The tree for which the previous value index is required.
-     * @param value - The value to be queried.
-     */
-    getPreviousValueIndex(treeId: IndexedTreeId, value: bigint): Promise<{
-        /**
-         * The index of the found leaf.
-         */
-        index: number;
-        /**
-         * A flag indicating if the corresponding leaf's value is equal to `newValue`.
-         */
-        alreadyPresent: boolean;
-    }>;
-    /**
-     * Returns the data at a specific leaf.
-     * @param treeId - The tree for which leaf data should be returned.
-     * @param index - The index of the leaf required.
-     */
-    getLeafData(treeId: IndexedTreeId, index: number): Promise<LeafData | undefined>;
-    /**
-     * Update the leaf data at the given index.
-     * @param treeId - The tree for which leaf data should be edited.
-     * @param leaf - The updated leaf value.
-     * @param index - The index of the leaf to be updated.
-     */
-    updateLeaf(treeId: IndexedTreeId | PublicTreeId, leaf: LeafData | Buffer, index: bigint): Promise<void>;
-    /**
-     * Returns the index containing a leaf value.
-     * @param treeId - The tree for which the index should be returned.
-     * @param value - The value to search for in the tree.
-     */
-    findLeafIndex(treeId: MerkleTreeId, value: Buffer): Promise<bigint | undefined>;
-    /**
-     * Gets the value for a leaf in the tree.
-     * @param treeId - The tree for which the index should be returned.
-     * @param index - The index of the leaf.
-     */
-    getLeafValue(treeId: MerkleTreeId, index: bigint): Promise<Buffer | undefined>;
-    /**
-     * Inserts the new block hash into the new block hashes tree.
-     * This includes all of the current roots of all of the data trees and the current blocks global vars.
-     * @param globalVariablesHash - The global variables hash to insert into the block hash.
-     */
-    updateHistoricBlocksTree(globalVariablesHash: Fr): Promise<void>;
-    /**
-     * Updates the latest global variables hash
-     * @param globalVariablesHash - The latest global variables hash
-     */
-    updateLatestGlobalVariablesHash(globalVariablesHash: Fr): Promise<void>;
-    /**
-     * Gets the global variables hash from the previous block
-     */
-    getLatestGlobalVariablesHash(): Promise<Fr>;
-    /**
-     * Batch insert multiple leaves into the tree.
-     * @param leaves - Leaves to insert into the tree.
-     * @param treeId - The tree on which to insert.
-     * @param subtreeHeight - Height of the subtree.
-     * @returns The witness data for the leaves to be updated when inserting the new ones.
-     */
-    batchInsert(treeId: MerkleTreeId, leaves: Buffer[], subtreeHeight: number): Promise<[LowLeafWitnessData<number>[], SiblingPath<number>] | [undefined, SiblingPath<number>]>;
-    /**
-     * Handles a single L2 block (i.e. Inserts the new commitments into the merkle tree).
-     * @param block - The L2 block to handle.
-     */
-    handleL2Block(block: L2Block): Promise<HandleL2BlockResult>;
-    /**
-     * Commits pending changes to the underlying store.
-     */
-    commit(): Promise<void>;
-    /**
-     * Rolls back pending changes.
-     */
-    rollback(): Promise<void>;
-}
-/** Return type for handleL2Block */
-export type HandleL2BlockResult = {
-    /** Whether the block processed was emitted by our sequencer */ isBlockOurs: boolean;
-};
-/**
- * Outputs a tree leaves using for debugging purposes.
- */
-export declare function inspectTree(db: MerkleTreeOperations, treeId: MerkleTreeId, log?: import("@aztec/foundation/log").DebugLogger): Promise<void>;
 //# sourceMappingURL=index.d.ts.map

package/dest/world-state-db/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/world-state-db/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/world-state-db/index.ts"],"names":[],"mappings":"AAAA,cAAc,mBAAmB,CAAC;AAClC,cAAc,qBAAqB,CAAC;AACpC,OAAO,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC"}

package/dest/world-state-db/index.js

@@ -1,31 +1,3 @@
-import { MAX_NEW_NULLIFIERS_PER_TX } from '@aztec/circuits.js';
-import { createDebugLogger } from '@aztec/foundation/log';
 export * from './merkle_trees.js';
-/**
- *
- * @remarks Short explanation:
- *    The nullifier tree must be initially padded as the pre-populated 0 index prevents efficient subtree insertion.
- *    Padding with some values solves this issue.
- *
- * @remarks Thorough explanation:
- *    There needs to be an initial (0,0,0) leaf in the tree, so that when we insert the first 'proper' leaf, we can
- *    prove that any value greater than 0 doesn't exist in the tree yet. We prefill/pad the tree with "the number of
- *    leaves that are added by one block" so that the first 'proper' block can insert a full subtree.
- *
- *    Without this padding, there would be a leaf (0,0,0) at leaf index 0, making it really difficult to insert e.g.
- *    1024 leaves for the first block, because there's only neat space for 1023 leaves after 0. By padding with 1023
- *    more leaves, we can then insert the first block of 1024 leaves into indices 1024:2047.
- */
-export const INITIAL_NULLIFIER_TREE_SIZE = 2 * MAX_NEW_NULLIFIERS_PER_TX;
-/**
- * Outputs a tree leaves using for debugging purposes.
- */
-export async function inspectTree(db, treeId, log = createDebugLogger('aztec:inspect-tree')) {
-    const info = await db.getTreeInfo(treeId);
-    const output = [`Tree id=${treeId} size=${info.size} root=0x${info.root.toString('hex')}`];
-    for (let i = 0; i < info.size; i++) {
-        output.push(` Leaf ${i}: ${await db.getLeafValue(treeId, BigInt(i)).then(x => x?.toString('hex') ?? '[undefined]')}`);
-    }
-    log(output.join('\n'));
-}
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvd29ybGQtc3RhdGUtZGIvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLHlCQUF5QixFQUFFLE1BQU0sb0JBQW9CLENBQUM7QUFFL0QsT0FBTyxFQUFFLGlCQUFpQixFQUFFLE1BQU0sdUJBQXVCLENBQUM7QUFJMUQsY0FBYyxtQkFBbUIsQ0FBQztBQWFsQzs7Ozs7Ozs7Ozs7Ozs7R0FjRztBQUNILE1BQU0sQ0FBQyxNQUFNLDJCQUEyQixHQUFHLENBQUMsR0FBRyx5QkFBeUIsQ0FBQztBQWtNekU7O0dBRUc7QUFDSCxNQUFNLENBQUMsS0FBSyxVQUFVLFdBQVcsQ0FDL0IsRUFBd0IsRUFDeEIsTUFBb0IsRUFDcEIsR0FBRyxHQUFHLGlCQUFpQixDQUFDLG9CQUFvQixDQUFDO0lBRTdDLE1BQU0sSUFBSSxHQUFHLE1BQU0sRUFBRSxDQUFDLFdBQVcsQ0FBQyxNQUFNLENBQUMsQ0FBQztJQUMxQyxNQUFNLE1BQU0sR0FBRyxDQUFDLFdBQVcsTUFBTSxTQUFTLElBQUksQ0FBQyxJQUFJLFdBQVcsSUFBSSxDQUFDLElBQUksQ0FBQyxRQUFRLENBQUMsS0FBSyxDQUFDLEVBQUUsQ0FBQyxDQUFDO0lBQzNGLEtBQUssSUFBSSxDQUFDLEdBQUcsQ0FBQyxFQUFFLENBQUMsR0FBRyxJQUFJLENBQUMsSUFBSSxFQUFFLENBQUMsRUFBRSxFQUFFO1FBQ2xDLE1BQU0sQ0FBQyxJQUFJLENBQ1QsU0FBUyxDQUFDLEtBQUssTUFBTSxFQUFFLENBQUMsWUFBWSxDQUFDLE1BQU0sRUFBRSxNQUFNLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFDLEVBQUUsQ0FBQyxDQUFDLEVBQUUsUUFBUSxDQUFDLEtBQUssQ0FBQyxJQUFJLGFBQWEsQ0FBQyxFQUFFLENBQ3pHLENBQUM7S0FDSDtJQUNELEdBQUcsQ0FBQyxNQUFNLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxDQUFDLENBQUM7QUFDekIsQ0FBQyJ9
+export * from './merkle_tree_db.js';
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvd29ybGQtc3RhdGUtZGIvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsY0FBYyxtQkFBbUIsQ0FBQztBQUNsQyxjQUFjLHFCQUFxQixDQUFDIn0=

package/dest/world-state-db/merkle_tree_db.d.ts

@@ -0,0 +1,192 @@
+/// <reference types="node" resolution-mode="require"/>
+import { Fr } from '@aztec/foundation/fields';
+import { LeafData, LowLeafWitnessData } from '@aztec/merkle-tree';
+import { L2Block, MerkleTreeId, SiblingPath } from '@aztec/types';
+/**
+ * Type alias for the nullifier tree ID.
+ */
+export type IndexedTreeId = MerkleTreeId.NULLIFIER_TREE;
+/**
+ * Type alias for the public data tree ID.
+ */
+export type PublicTreeId = MerkleTreeId.PUBLIC_DATA_TREE;
+/**
+ *
+ * @remarks Short explanation:
+ *    The nullifier tree must be initially padded as the pre-populated 0 index prevents efficient subtree insertion.
+ *    Padding with some values solves this issue.
+ *
+ * @remarks Thorough explanation:
+ *    There needs to be an initial (0,0,0) leaf in the tree, so that when we insert the first 'proper' leaf, we can
+ *    prove that any value greater than 0 doesn't exist in the tree yet. We prefill/pad the tree with "the number of
+ *    leaves that are added by one block" so that the first 'proper' block can insert a full subtree.
+ *
+ *    Without this padding, there would be a leaf (0,0,0) at leaf index 0, making it really difficult to insert e.g.
+ *    1024 leaves for the first block, because there's only neat space for 1023 leaves after 0. By padding with 1023
+ *    more leaves, we can then insert the first block of 1024 leaves into indices 1024:2047.
+ */
+export declare const INITIAL_NULLIFIER_TREE_SIZE: number;
+/**
+ *  Defines tree information.
+ */
+export interface TreeInfo {
+    /**
+     * The tree ID.
+     */
+    treeId: MerkleTreeId;
+    /**
+     * The tree root.
+     */
+    root: Buffer;
+    /**
+     * The number of leaves in the tree.
+     */
+    size: bigint;
+    /**
+     * The depth of the tree.
+     */
+    depth: number;
+}
+/**
+ * Adds a last boolean flag in each function on the type.
+ */
+type WithIncludeUncommitted<F> = F extends (...args: [...infer Rest]) => infer Return ? (...args: [...Rest, boolean]) => Return : F;
+/**
+ * The current roots of the commitment trees
+ */
+export type CurrentTreeRoots = {
+    /** Note Hash Tree root. */
+    noteHashTreeRoot: Buffer;
+    /** Contract data tree root. */
+    contractDataTreeRoot: Buffer;
+    /** L1 to L2 Messages data tree root. */
+    l1Tol2MessagesTreeRoot: Buffer;
+    /** Nullifier data tree root. */
+    nullifierTreeRoot: Buffer;
+    /** Blocks tree root. */
+    blocksTreeRoot: Buffer;
+    /** Public data tree root */
+    publicDataTreeRoot: Buffer;
+};
+/**
+ * Defines the names of the setters on Merkle Trees.
+ */
+type MerkleTreeSetters = 'appendLeaves' | 'updateLeaf' | 'commit' | 'rollback' | 'handleL2Block' | 'batchInsert';
+/**
+ * Defines the interface for operations on a set of Merkle Trees configuring whether to return committed or uncommitted data.
+ */
+export type MerkleTreeDb = {
+    [Property in keyof MerkleTreeOperations as Exclude<Property, MerkleTreeSetters>]: WithIncludeUncommitted<MerkleTreeOperations[Property]>;
+} & Pick<MerkleTreeOperations, MerkleTreeSetters>;
+/**
+ * Defines the interface for operations on a set of Merkle Trees.
+ */
+export interface MerkleTreeOperations {
+    /**
+     * Appends leaves to a given tree.
+     * @param treeId - The tree to be updated.
+     * @param leaves - The set of leaves to be appended.
+     */
+    appendLeaves(treeId: MerkleTreeId, leaves: Buffer[]): Promise<void>;
+    /**
+     * Returns information about the given tree.
+     * @param treeId - The tree to be queried.
+     */
+    getTreeInfo(treeId: MerkleTreeId): Promise<TreeInfo>;
+    /**
+     * Gets the current roots of the commitment trees.
+     */
+    getTreeRoots(): Promise<CurrentTreeRoots>;
+    /**
+     * Gets sibling path for a leaf.
+     * @param treeId - The tree to be queried for a sibling path.
+     * @param index - The index of the leaf for which a sibling path should be returned.
+     */
+    getSiblingPath<N extends number>(treeId: MerkleTreeId, index: bigint): Promise<SiblingPath<N>>;
+    /**
+     * Returns the previous index for a given value in an indexed tree.
+     * @param treeId - The tree for which the previous value index is required.
+     * @param value - The value to be queried.
+     */
+    getPreviousValueIndex(treeId: IndexedTreeId, value: bigint): Promise<{
+        /**
+         * The index of the found leaf.
+         */
+        index: number;
+        /**
+         * A flag indicating if the corresponding leaf's value is equal to `newValue`.
+         */
+        alreadyPresent: boolean;
+    }>;
+    /**
+     * Returns the data at a specific leaf.
+     * @param treeId - The tree for which leaf data should be returned.
+     * @param index - The index of the leaf required.
+     */
+    getLeafData(treeId: IndexedTreeId, index: number): Promise<LeafData | undefined>;
+    /**
+     * Update the leaf data at the given index.
+     * @param treeId - The tree for which leaf data should be edited.
+     * @param leaf - The updated leaf value.
+     * @param index - The index of the leaf to be updated.
+     */
+    updateLeaf(treeId: IndexedTreeId | PublicTreeId, leaf: LeafData | Buffer, index: bigint): Promise<void>;
+    /**
+     * Returns the index containing a leaf value.
+     * @param treeId - The tree for which the index should be returned.
+     * @param value - The value to search for in the tree.
+     */
+    findLeafIndex(treeId: MerkleTreeId, value: Buffer): Promise<bigint | undefined>;
+    /**
+     * Gets the value for a leaf in the tree.
+     * @param treeId - The tree for which the index should be returned.
+     * @param index - The index of the leaf.
+     */
+    getLeafValue(treeId: MerkleTreeId, index: bigint): Promise<Buffer | undefined>;
+    /**
+     * Inserts the new block hash into the new block hashes tree.
+     * This includes all of the current roots of all of the data trees and the current blocks global vars.
+     * @param globalVariablesHash - The global variables hash to insert into the block hash.
+     */
+    updateHistoricBlocksTree(globalVariablesHash: Fr): Promise<void>;
+    /**
+     * Updates the latest global variables hash
+     * @param globalVariablesHash - The latest global variables hash
+     */
+    updateLatestGlobalVariablesHash(globalVariablesHash: Fr): Promise<void>;
+    /**
+     * Gets the global variables hash from the previous block
+     */
+    getLatestGlobalVariablesHash(): Promise<Fr>;
+    /**
+     * Batch insert multiple leaves into the tree.
+     * @param leaves - Leaves to insert into the tree.
+     * @param treeId - The tree on which to insert.
+     * @param subtreeHeight - Height of the subtree.
+     * @returns The witness data for the leaves to be updated when inserting the new ones.
+     */
+    batchInsert(treeId: MerkleTreeId, leaves: Buffer[], subtreeHeight: number): Promise<[LowLeafWitnessData<number>[], SiblingPath<number>] | [undefined, SiblingPath<number>]>;
+    /**
+     * Handles a single L2 block (i.e. Inserts the new commitments into the merkle tree).
+     * @param block - The L2 block to handle.
+     */
+    handleL2Block(block: L2Block): Promise<HandleL2BlockResult>;
+    /**
+     * Commits pending changes to the underlying store.
+     */
+    commit(): Promise<void>;
+    /**
+     * Rolls back pending changes.
+     */
+    rollback(): Promise<void>;
+}
+/** Return type for handleL2Block */
+export type HandleL2BlockResult = {
+    /** Whether the block processed was emitted by our sequencer */ isBlockOurs: boolean;
+};
+/**
+ * Outputs a tree leaves using for debugging purposes.
+ */
+export declare function inspectTree(db: MerkleTreeOperations, treeId: MerkleTreeId, log?: import("@aztec/foundation/log").DebugLogger): Promise<void>;
+export {};
+//# sourceMappingURL=merkle_tree_db.d.ts.map

package/dest/world-state-db/merkle_tree_db.d.ts.map

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

package/dest/world-state-db/merkle_tree_db.js

@@ -0,0 +1,30 @@
+import { MAX_NEW_NULLIFIERS_PER_TX } from '@aztec/circuits.js';
+import { createDebugLogger } from '@aztec/foundation/log';
+/**
+ *
+ * @remarks Short explanation:
+ *    The nullifier tree must be initially padded as the pre-populated 0 index prevents efficient subtree insertion.
+ *    Padding with some values solves this issue.
+ *
+ * @remarks Thorough explanation:
+ *    There needs to be an initial (0,0,0) leaf in the tree, so that when we insert the first 'proper' leaf, we can
+ *    prove that any value greater than 0 doesn't exist in the tree yet. We prefill/pad the tree with "the number of
+ *    leaves that are added by one block" so that the first 'proper' block can insert a full subtree.
+ *
+ *    Without this padding, there would be a leaf (0,0,0) at leaf index 0, making it really difficult to insert e.g.
+ *    1024 leaves for the first block, because there's only neat space for 1023 leaves after 0. By padding with 1023
+ *    more leaves, we can then insert the first block of 1024 leaves into indices 1024:2047.
+ */
+export const INITIAL_NULLIFIER_TREE_SIZE = 2 * MAX_NEW_NULLIFIERS_PER_TX;
+/**
+ * Outputs a tree leaves using for debugging purposes.
+ */
+export async function inspectTree(db, treeId, log = createDebugLogger('aztec:inspect-tree')) {
+    const info = await db.getTreeInfo(treeId);
+    const output = [`Tree id=${treeId} size=${info.size} root=0x${info.root.toString('hex')}`];
+    for (let i = 0; i < info.size; i++) {
+        output.push(` Leaf ${i}: ${await db.getLeafValue(treeId, BigInt(i)).then(x => x?.toString('hex') ?? '[undefined]')}`);
+    }
+    log(output.join('\n'));
+}
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibWVya2xlX3RyZWVfZGIuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvd29ybGQtc3RhdGUtZGIvbWVya2xlX3RyZWVfZGIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLHlCQUF5QixFQUFFLE1BQU0sb0JBQW9CLENBQUM7QUFFL0QsT0FBTyxFQUFFLGlCQUFpQixFQUFFLE1BQU0sdUJBQXVCLENBQUM7QUFjMUQ7Ozs7Ozs7Ozs7Ozs7O0dBY0c7QUFDSCxNQUFNLENBQUMsTUFBTSwyQkFBMkIsR0FBRyxDQUFDLEdBQUcseUJBQXlCLENBQUM7QUFrTXpFOztHQUVHO0FBQ0gsTUFBTSxDQUFDLEtBQUssVUFBVSxXQUFXLENBQy9CLEVBQXdCLEVBQ3hCLE1BQW9CLEVBQ3BCLEdBQUcsR0FBRyxpQkFBaUIsQ0FBQyxvQkFBb0IsQ0FBQztJQUU3QyxNQUFNLElBQUksR0FBRyxNQUFNLEVBQUUsQ0FBQyxXQUFXLENBQUMsTUFBTSxDQUFDLENBQUM7SUFDMUMsTUFBTSxNQUFNLEdBQUcsQ0FBQyxXQUFXLE1BQU0sU0FBUyxJQUFJLENBQUMsSUFBSSxXQUFXLElBQUksQ0FBQyxJQUFJLENBQUMsUUFBUSxDQUFDLEtBQUssQ0FBQyxFQUFFLENBQUMsQ0FBQztJQUMzRixLQUFLLElBQUksQ0FBQyxHQUFHLENBQUMsRUFBRSxDQUFDLEdBQUcsSUFBSSxDQUFDLElBQUksRUFBRSxDQUFDLEVBQUUsRUFBRTtRQUNsQyxNQUFNLENBQUMsSUFBSSxDQUNULFNBQVMsQ0FBQyxLQUFLLE1BQU0sRUFBRSxDQUFDLFlBQVksQ0FBQyxNQUFNLEVBQUUsTUFBTSxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQyxFQUFFLENBQUMsQ0FBQyxFQUFFLFFBQVEsQ0FBQyxLQUFLLENBQUMsSUFBSSxhQUFhLENBQUMsRUFBRSxDQUN6RyxDQUFDO0tBQ0g7SUFDRCxHQUFHLENBQUMsTUFBTSxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFDO0FBQ3pCLENBQUMifQ==

package/dest/world-state-db/merkle_trees.d.ts

@@ -1,10 +1,9 @@
 /// <reference types="node" resolution-mode="require"/>
 import { Fr, GlobalVariables } from '@aztec/circuits.js';
-import { IWasmModule } from '@aztec/foundation/wasm';
 import { LeafData, LowLeafWitnessData } from '@aztec/merkle-tree';
 import { L2Block, MerkleTreeId, SiblingPath } from '@aztec/types';
 import { default as levelup } from 'levelup';
-import { CurrentTreeRoots, HandleL2BlockResult, IndexedTreeId, MerkleTreeDb, MerkleTreeOperations, PublicTreeId, TreeInfo } from './index.js';
+import { CurrentTreeRoots, HandleL2BlockResult, IndexedTreeId, MerkleTreeDb, MerkleTreeOperations, PublicTreeId, TreeInfo } from './merkle_tree_db.js';
 /**
  * Data necessary to reinitialize the merkle trees from Db.
  */
@@ -29,14 +28,14 @@ export declare class MerkleTrees implements MerkleTreeDb {
      * @param optionalWasm - WASM instance to use for hashing (if not provided PrimitivesWasm will be used).
      * @param fromDbOptions - Options to initialize the trees from the database.
      */
-    init(optionalWasm?: IWasmModule, fromDbOptions?: FromDbOptions): Promise<void>;
+    init(fromDbOptions?: FromDbOptions): Promise<void>;
     /**
      * Method to asynchronously create and initialize a MerkleTrees instance.
      * @param db - The db instance to use for data persistance.
      * @param wasm - WASM instance to use for hashing (if not provided PrimitivesWasm will be used).
      * @returns - A fully initialized MerkleTrees instance.
      */
-    static new(db: levelup.LevelUp, wasm?: IWasmModule): Promise<MerkleTrees>;
+    static new(db: levelup.LevelUp): Promise<MerkleTrees>;
     /**
      * Stops the job queue (waits for all jobs to finish).
      */

package/dest/world-state-db/merkle_trees.d.ts.map

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

package/dest/world-state-db/merkle_trees.js

@@ -1,4 +1,4 @@
-import { CONTRACT_TREE_HEIGHT, CircuitsWasm, Fr, GlobalVariables, HISTORIC_BLOCKS_TREE_HEIGHT, L1_TO_L2_MSG_TREE_HEIGHT, NOTE_HASH_TREE_HEIGHT, NULLIFIER_SUBTREE_HEIGHT, NULLIFIER_TREE_HEIGHT, PUBLIC_DATA_TREE_HEIGHT, } from '@aztec/circuits.js';
+import { CONTRACT_TREE_HEIGHT, Fr, GlobalVariables, HISTORIC_BLOCKS_TREE_HEIGHT, L1_TO_L2_MSG_TREE_HEIGHT, NOTE_HASH_TREE_HEIGHT, NULLIFIER_SUBTREE_HEIGHT, NULLIFIER_TREE_HEIGHT, PUBLIC_DATA_TREE_HEIGHT, } from '@aztec/circuits.js';
 import { computeBlockHash, computeGlobalsHash } from '@aztec/circuits.js/abis';
 import { Committable } from '@aztec/foundation/committable';
 import { SerialQueue } from '@aztec/foundation/fifo';
@@ -6,7 +6,7 @@ import { createDebugLogger } from '@aztec/foundation/log';
 import { Pedersen, SparseTree, StandardIndexedTree, StandardTree, loadTree, newTree, } from '@aztec/merkle-tree';
 import { MerkleTreeId } from '@aztec/types';
 import { MerkleTreeOperationsFacade } from '../merkle-tree/merkle_tree_operations_facade.js';
-import { INITIAL_NULLIFIER_TREE_SIZE, } from './index.js';
+import { INITIAL_NULLIFIER_TREE_SIZE, } from './merkle_tree_db.js';
 /**
  * A convenience class for managing multiple merkle trees.
  */
@@ -23,11 +23,10 @@ export class MerkleTrees {
      * @param optionalWasm - WASM instance to use for hashing (if not provided PrimitivesWasm will be used).
      * @param fromDbOptions - Options to initialize the trees from the database.
      */
-    async init(optionalWasm, fromDbOptions) {
+    async init(fromDbOptions) {
         const fromDb = fromDbOptions !== undefined;
         const initializeTree = fromDb ? loadTree : newTree;
-        const wasm = optionalWasm ?? (await CircuitsWasm.get());
-        const hasher = new Pedersen(wasm);
+        const hasher = new Pedersen();
         const contractTree = await initializeTree(StandardTree, this.db, hasher, `${MerkleTreeId[MerkleTreeId.CONTRACT_TREE]}`, CONTRACT_TREE_HEIGHT);
         const nullifierTree = await initializeTree(StandardIndexedTree, this.db, hasher, `${MerkleTreeId[MerkleTreeId.NULLIFIER_TREE]}`, NULLIFIER_TREE_HEIGHT, INITIAL_NULLIFIER_TREE_SIZE);
         const noteHashTree = await initializeTree(StandardTree, this.db, hasher, `${MerkleTreeId[MerkleTreeId.NOTE_HASH_TREE]}`, NOTE_HASH_TREE_HEIGHT);
@@ -38,13 +37,13 @@ export class MerkleTrees {
         this.jobQueue.start();
         // The first leaf in the blocks tree contains the empty roots of the other trees and empty global variables.
         if (!fromDb) {
-            const initialGlobalVariablesHash = computeGlobalsHash(wasm, GlobalVariables.empty());
+            const initialGlobalVariablesHash = computeGlobalsHash(GlobalVariables.empty());
             await this._updateLatestGlobalVariablesHash(initialGlobalVariablesHash);
             await this._updateHistoricBlocksTree(initialGlobalVariablesHash, true);
             await this._commit();
         }
         else {
-            await this._updateLatestGlobalVariablesHash(computeGlobalsHash(wasm, fromDbOptions.globalVariables));
+            await this._updateLatestGlobalVariablesHash(computeGlobalsHash(fromDbOptions.globalVariables));
         }
     }
     /**
@@ -53,9 +52,9 @@ export class MerkleTrees {
      * @param wasm - WASM instance to use for hashing (if not provided PrimitivesWasm will be used).
      * @returns - A fully initialized MerkleTrees instance.
      */
-    static async new(db, wasm) {
+    static async new(db) {
         const merkleTrees = new MerkleTrees(db);
-        await merkleTrees.init(wasm);
+        await merkleTrees.init();
         return merkleTrees;
     }
     /**
@@ -128,8 +127,7 @@ export class MerkleTrees {
     }
     async _getCurrentBlockHash(globalsHash, includeUncommitted) {
         const roots = (await this._getAllTreeRoots(includeUncommitted)).map(root => Fr.fromBuffer(root));
-        const wasm = await CircuitsWasm.get();
-        return computeBlockHash(wasm, globalsHash, roots[0], roots[1], roots[2], roots[3], roots[4]);
+        return computeBlockHash(globalsHash, roots[0], roots[1], roots[2], roots[3], roots[4]);
     }
     _getAllTreeRoots(includeUncommitted) {
         const roots = [
@@ -391,7 +389,7 @@ export class MerkleTrees {
                 await this._updateLeaf(MerkleTreeId.PUBLIC_DATA_TREE, newValue.toBuffer(), leafIndex.value);
             }
             // Sync and add the block to the historic blocks tree
-            const globalVariablesHash = computeGlobalsHash(await CircuitsWasm.get(), l2Block.globalVariables);
+            const globalVariablesHash = computeGlobalsHash(l2Block.globalVariables);
             await this._updateLatestGlobalVariablesHash(globalVariablesHash);
             this.log(`Synced global variables with hash ${globalVariablesHash}`);
             const blockHash = await this._getCurrentBlockHash(globalVariablesHash, true);
@@ -414,4 +412,4 @@ export class MerkleTrees {
         return { isBlockOurs: ourBlock };
     }
 }
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"merkle_trees.js","sourceRoot":"","sources":["../../src/world-state-db/merkle_trees.ts"],"names":[],"mappings":"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"}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"merkle_trees.js","sourceRoot":"","sources":["../../src/world-state-db/merkle_trees.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aztec/world-state",
-  "version": "0.14.2",
+  "version": "0.15.0",
   "type": "module",
   "exports": "./dest/index.js",
   "typedocOptions": {
@@ -30,10 +30,10 @@
     "rootDir": "./src"
   },
   "dependencies": {
-    "@aztec/circuits.js": "0.14.2",
-    "@aztec/foundation": "0.14.2",
-    "@aztec/merkle-tree": "0.14.2",
-    "@aztec/types": "0.14.2",
+    "@aztec/circuits.js": "0.15.0",
+    "@aztec/foundation": "0.15.0",
+    "@aztec/merkle-tree": "0.15.0",
+    "@aztec/types": "0.15.0",
     "levelup": "^5.1.1",
     "lodash.times": "^4.3.2",
     "memdown": "^6.1.1",

package/src/world-state-db/index.ts

@@ -1,245 +1,3 @@
-import { MAX_NEW_NULLIFIERS_PER_TX } from '@aztec/circuits.js';
-import { Fr } from '@aztec/foundation/fields';
-import { createDebugLogger } from '@aztec/foundation/log';
-import { LeafData, LowLeafWitnessData } from '@aztec/merkle-tree';
-import { L2Block, MerkleTreeId, SiblingPath } from '@aztec/types';
-
 export * from './merkle_trees.js';
+export * from './merkle_tree_db.js';
 export { LeafData } from '@aztec/merkle-tree';
-
-/**
- * Type alias for the nullifier tree ID.
- */
-export type IndexedTreeId = MerkleTreeId.NULLIFIER_TREE;
-
-/**
- * Type alias for the public data tree ID.
- */
-export type PublicTreeId = MerkleTreeId.PUBLIC_DATA_TREE;
-
-/**
- *
- * @remarks Short explanation:
- *    The nullifier tree must be initially padded as the pre-populated 0 index prevents efficient subtree insertion.
- *    Padding with some values solves this issue.
- *
- * @remarks Thorough explanation:
- *    There needs to be an initial (0,0,0) leaf in the tree, so that when we insert the first 'proper' leaf, we can
- *    prove that any value greater than 0 doesn't exist in the tree yet. We prefill/pad the tree with "the number of
- *    leaves that are added by one block" so that the first 'proper' block can insert a full subtree.
- *
- *    Without this padding, there would be a leaf (0,0,0) at leaf index 0, making it really difficult to insert e.g.
- *    1024 leaves for the first block, because there's only neat space for 1023 leaves after 0. By padding with 1023
- *    more leaves, we can then insert the first block of 1024 leaves into indices 1024:2047.
- */
-export const INITIAL_NULLIFIER_TREE_SIZE = 2 * MAX_NEW_NULLIFIERS_PER_TX;
-
-/**
- *  Defines tree information.
- */
-export interface TreeInfo {
-  /**
-   * The tree ID.
-   */
-  treeId: MerkleTreeId;
-  /**
-   * The tree root.
-   */
-  root: Buffer;
-  /**
-   * The number of leaves in the tree.
-   */
-  size: bigint;
-
-  /**
-   * The depth of the tree.
-   */
-  depth: number;
-}
-
-/**
- * Adds a last boolean flag in each function on the type.
- */
-type WithIncludeUncommitted<F> = F extends (...args: [...infer Rest]) => infer Return
-  ? (...args: [...Rest, boolean]) => Return
-  : F;
-
-/**
- * The current roots of the commitment trees
- */
-export type CurrentTreeRoots = {
-  /** Note Hash Tree root. */
-  noteHashTreeRoot: Buffer;
-  /** Contract data tree root. */
-  contractDataTreeRoot: Buffer;
-  /** L1 to L2 Messages data tree root. */
-  l1Tol2MessagesTreeRoot: Buffer;
-  /** Nullifier data tree root. */
-  nullifierTreeRoot: Buffer;
-  /** Blocks tree root. */
-  blocksTreeRoot: Buffer;
-  /** Public data tree root */
-  publicDataTreeRoot: Buffer;
-};
-
-/**
- * Defines the names of the setters on Merkle Trees.
- */
-type MerkleTreeSetters = 'appendLeaves' | 'updateLeaf' | 'commit' | 'rollback' | 'handleL2Block' | 'batchInsert';
-
-/**
- * Defines the interface for operations on a set of Merkle Trees configuring whether to return committed or uncommitted data.
- */
-export type MerkleTreeDb = {
-  [Property in keyof MerkleTreeOperations as Exclude<Property, MerkleTreeSetters>]: WithIncludeUncommitted<
-    MerkleTreeOperations[Property]
-  >;
-} & Pick<MerkleTreeOperations, MerkleTreeSetters>;
-
-/**
- * Defines the interface for operations on a set of Merkle Trees.
- */
-export interface MerkleTreeOperations {
-  /**
-   * Appends leaves to a given tree.
-   * @param treeId - The tree to be updated.
-   * @param leaves - The set of leaves to be appended.
-   */
-  appendLeaves(treeId: MerkleTreeId, leaves: Buffer[]): Promise<void>;
-
-  /**
-   * Returns information about the given tree.
-   * @param treeId - The tree to be queried.
-   */
-  getTreeInfo(treeId: MerkleTreeId): Promise<TreeInfo>;
-
-  /**
-   * Gets the current roots of the commitment trees.
-   */
-  getTreeRoots(): Promise<CurrentTreeRoots>;
-
-  /**
-   * Gets sibling path for a leaf.
-   * @param treeId - The tree to be queried for a sibling path.
-   * @param index - The index of the leaf for which a sibling path should be returned.
-   */
-  getSiblingPath<N extends number>(treeId: MerkleTreeId, index: bigint): Promise<SiblingPath<N>>;
-
-  /**
-   * Returns the previous index for a given value in an indexed tree.
-   * @param treeId - The tree for which the previous value index is required.
-   * @param value - The value to be queried.
-   */
-  getPreviousValueIndex(
-    treeId: IndexedTreeId,
-    value: bigint,
-  ): Promise<{
-    /**
-     * The index of the found leaf.
-     */
-    index: number;
-    /**
-     * A flag indicating if the corresponding leaf's value is equal to `newValue`.
-     */
-    alreadyPresent: boolean;
-  }>;
-
-  /**
-   * Returns the data at a specific leaf.
-   * @param treeId - The tree for which leaf data should be returned.
-   * @param index - The index of the leaf required.
-   */
-  getLeafData(treeId: IndexedTreeId, index: number): Promise<LeafData | undefined>;
-
-  /**
-   * Update the leaf data at the given index.
-   * @param treeId - The tree for which leaf data should be edited.
-   * @param leaf - The updated leaf value.
-   * @param index - The index of the leaf to be updated.
-   */
-  updateLeaf(treeId: IndexedTreeId | PublicTreeId, leaf: LeafData | Buffer, index: bigint): Promise<void>;
-
-  /**
-   * Returns the index containing a leaf value.
-   * @param treeId - The tree for which the index should be returned.
-   * @param value - The value to search for in the tree.
-   */
-  findLeafIndex(treeId: MerkleTreeId, value: Buffer): Promise<bigint | undefined>;
-
-  /**
-   * Gets the value for a leaf in the tree.
-   * @param treeId - The tree for which the index should be returned.
-   * @param index - The index of the leaf.
-   */
-  getLeafValue(treeId: MerkleTreeId, index: bigint): Promise<Buffer | undefined>;
-
-  /**
-   * Inserts the new block hash into the new block hashes tree.
-   * This includes all of the current roots of all of the data trees and the current blocks global vars.
-   * @param globalVariablesHash - The global variables hash to insert into the block hash.
-   */
-  updateHistoricBlocksTree(globalVariablesHash: Fr): Promise<void>;
-
-  /**
-   * Updates the latest global variables hash
-   * @param globalVariablesHash - The latest global variables hash
-   */
-  updateLatestGlobalVariablesHash(globalVariablesHash: Fr): Promise<void>;
-
-  /**
-   * Gets the global variables hash from the previous block
-   */
-  getLatestGlobalVariablesHash(): Promise<Fr>;
-
-  /**
-   * Batch insert multiple leaves into the tree.
-   * @param leaves - Leaves to insert into the tree.
-   * @param treeId - The tree on which to insert.
-   * @param subtreeHeight - Height of the subtree.
-   * @returns The witness data for the leaves to be updated when inserting the new ones.
-   */
-  batchInsert(
-    treeId: MerkleTreeId,
-    leaves: Buffer[],
-    subtreeHeight: number,
-  ): Promise<[LowLeafWitnessData<number>[], SiblingPath<number>] | [undefined, SiblingPath<number>]>;
-
-  /**
-   * Handles a single L2 block (i.e. Inserts the new commitments into the merkle tree).
-   * @param block - The L2 block to handle.
-   */
-  handleL2Block(block: L2Block): Promise<HandleL2BlockResult>;
-
-  /**
-   * Commits pending changes to the underlying store.
-   */
-  commit(): Promise<void>;
-
-  /**
-   * Rolls back pending changes.
-   */
-  rollback(): Promise<void>;
-}
-
-/** Return type for handleL2Block */
-export type HandleL2BlockResult = {
-  /** Whether the block processed was emitted by our sequencer */ isBlockOurs: boolean;
-};
-
-/**
- * Outputs a tree leaves using for debugging purposes.
- */
-export async function inspectTree(
-  db: MerkleTreeOperations,
-  treeId: MerkleTreeId,
-  log = createDebugLogger('aztec:inspect-tree'),
-) {
-  const info = await db.getTreeInfo(treeId);
-  const output = [`Tree id=${treeId} size=${info.size} root=0x${info.root.toString('hex')}`];
-  for (let i = 0; i < info.size; i++) {
-    output.push(
-      ` Leaf ${i}: ${await db.getLeafValue(treeId, BigInt(i)).then(x => x?.toString('hex') ?? '[undefined]')}`,
-    );
-  }
-  log(output.join('\n'));
-}

package/src/world-state-db/merkle_tree_db.ts

@@ -0,0 +1,242 @@
+import { MAX_NEW_NULLIFIERS_PER_TX } from '@aztec/circuits.js';
+import { Fr } from '@aztec/foundation/fields';
+import { createDebugLogger } from '@aztec/foundation/log';
+import { LeafData, LowLeafWitnessData } from '@aztec/merkle-tree';
+import { L2Block, MerkleTreeId, SiblingPath } from '@aztec/types';
+
+/**
+ * Type alias for the nullifier tree ID.
+ */
+export type IndexedTreeId = MerkleTreeId.NULLIFIER_TREE;
+
+/**
+ * Type alias for the public data tree ID.
+ */
+export type PublicTreeId = MerkleTreeId.PUBLIC_DATA_TREE;
+
+/**
+ *
+ * @remarks Short explanation:
+ *    The nullifier tree must be initially padded as the pre-populated 0 index prevents efficient subtree insertion.
+ *    Padding with some values solves this issue.
+ *
+ * @remarks Thorough explanation:
+ *    There needs to be an initial (0,0,0) leaf in the tree, so that when we insert the first 'proper' leaf, we can
+ *    prove that any value greater than 0 doesn't exist in the tree yet. We prefill/pad the tree with "the number of
+ *    leaves that are added by one block" so that the first 'proper' block can insert a full subtree.
+ *
+ *    Without this padding, there would be a leaf (0,0,0) at leaf index 0, making it really difficult to insert e.g.
+ *    1024 leaves for the first block, because there's only neat space for 1023 leaves after 0. By padding with 1023
+ *    more leaves, we can then insert the first block of 1024 leaves into indices 1024:2047.
+ */
+export const INITIAL_NULLIFIER_TREE_SIZE = 2 * MAX_NEW_NULLIFIERS_PER_TX;
+
+/**
+ *  Defines tree information.
+ */
+export interface TreeInfo {
+  /**
+   * The tree ID.
+   */
+  treeId: MerkleTreeId;
+  /**
+   * The tree root.
+   */
+  root: Buffer;
+  /**
+   * The number of leaves in the tree.
+   */
+  size: bigint;
+
+  /**
+   * The depth of the tree.
+   */
+  depth: number;
+}
+
+/**
+ * Adds a last boolean flag in each function on the type.
+ */
+type WithIncludeUncommitted<F> = F extends (...args: [...infer Rest]) => infer Return
+  ? (...args: [...Rest, boolean]) => Return
+  : F;
+
+/**
+ * The current roots of the commitment trees
+ */
+export type CurrentTreeRoots = {
+  /** Note Hash Tree root. */
+  noteHashTreeRoot: Buffer;
+  /** Contract data tree root. */
+  contractDataTreeRoot: Buffer;
+  /** L1 to L2 Messages data tree root. */
+  l1Tol2MessagesTreeRoot: Buffer;
+  /** Nullifier data tree root. */
+  nullifierTreeRoot: Buffer;
+  /** Blocks tree root. */
+  blocksTreeRoot: Buffer;
+  /** Public data tree root */
+  publicDataTreeRoot: Buffer;
+};
+
+/**
+ * Defines the names of the setters on Merkle Trees.
+ */
+type MerkleTreeSetters = 'appendLeaves' | 'updateLeaf' | 'commit' | 'rollback' | 'handleL2Block' | 'batchInsert';
+
+/**
+ * Defines the interface for operations on a set of Merkle Trees configuring whether to return committed or uncommitted data.
+ */
+export type MerkleTreeDb = {
+  [Property in keyof MerkleTreeOperations as Exclude<Property, MerkleTreeSetters>]: WithIncludeUncommitted<
+    MerkleTreeOperations[Property]
+  >;
+} & Pick<MerkleTreeOperations, MerkleTreeSetters>;
+
+/**
+ * Defines the interface for operations on a set of Merkle Trees.
+ */
+export interface MerkleTreeOperations {
+  /**
+   * Appends leaves to a given tree.
+   * @param treeId - The tree to be updated.
+   * @param leaves - The set of leaves to be appended.
+   */
+  appendLeaves(treeId: MerkleTreeId, leaves: Buffer[]): Promise<void>;
+
+  /**
+   * Returns information about the given tree.
+   * @param treeId - The tree to be queried.
+   */
+  getTreeInfo(treeId: MerkleTreeId): Promise<TreeInfo>;
+
+  /**
+   * Gets the current roots of the commitment trees.
+   */
+  getTreeRoots(): Promise<CurrentTreeRoots>;
+
+  /**
+   * Gets sibling path for a leaf.
+   * @param treeId - The tree to be queried for a sibling path.
+   * @param index - The index of the leaf for which a sibling path should be returned.
+   */
+  getSiblingPath<N extends number>(treeId: MerkleTreeId, index: bigint): Promise<SiblingPath<N>>;
+
+  /**
+   * Returns the previous index for a given value in an indexed tree.
+   * @param treeId - The tree for which the previous value index is required.
+   * @param value - The value to be queried.
+   */
+  getPreviousValueIndex(
+    treeId: IndexedTreeId,
+    value: bigint,
+  ): Promise<{
+    /**
+     * The index of the found leaf.
+     */
+    index: number;
+    /**
+     * A flag indicating if the corresponding leaf's value is equal to `newValue`.
+     */
+    alreadyPresent: boolean;
+  }>;
+
+  /**
+   * Returns the data at a specific leaf.
+   * @param treeId - The tree for which leaf data should be returned.
+   * @param index - The index of the leaf required.
+   */
+  getLeafData(treeId: IndexedTreeId, index: number): Promise<LeafData | undefined>;
+
+  /**
+   * Update the leaf data at the given index.
+   * @param treeId - The tree for which leaf data should be edited.
+   * @param leaf - The updated leaf value.
+   * @param index - The index of the leaf to be updated.
+   */
+  updateLeaf(treeId: IndexedTreeId | PublicTreeId, leaf: LeafData | Buffer, index: bigint): Promise<void>;
+
+  /**
+   * Returns the index containing a leaf value.
+   * @param treeId - The tree for which the index should be returned.
+   * @param value - The value to search for in the tree.
+   */
+  findLeafIndex(treeId: MerkleTreeId, value: Buffer): Promise<bigint | undefined>;
+
+  /**
+   * Gets the value for a leaf in the tree.
+   * @param treeId - The tree for which the index should be returned.
+   * @param index - The index of the leaf.
+   */
+  getLeafValue(treeId: MerkleTreeId, index: bigint): Promise<Buffer | undefined>;
+
+  /**
+   * Inserts the new block hash into the new block hashes tree.
+   * This includes all of the current roots of all of the data trees and the current blocks global vars.
+   * @param globalVariablesHash - The global variables hash to insert into the block hash.
+   */
+  updateHistoricBlocksTree(globalVariablesHash: Fr): Promise<void>;
+
+  /**
+   * Updates the latest global variables hash
+   * @param globalVariablesHash - The latest global variables hash
+   */
+  updateLatestGlobalVariablesHash(globalVariablesHash: Fr): Promise<void>;
+
+  /**
+   * Gets the global variables hash from the previous block
+   */
+  getLatestGlobalVariablesHash(): Promise<Fr>;
+
+  /**
+   * Batch insert multiple leaves into the tree.
+   * @param leaves - Leaves to insert into the tree.
+   * @param treeId - The tree on which to insert.
+   * @param subtreeHeight - Height of the subtree.
+   * @returns The witness data for the leaves to be updated when inserting the new ones.
+   */
+  batchInsert(
+    treeId: MerkleTreeId,
+    leaves: Buffer[],
+    subtreeHeight: number,
+  ): Promise<[LowLeafWitnessData<number>[], SiblingPath<number>] | [undefined, SiblingPath<number>]>;
+
+  /**
+   * Handles a single L2 block (i.e. Inserts the new commitments into the merkle tree).
+   * @param block - The L2 block to handle.
+   */
+  handleL2Block(block: L2Block): Promise<HandleL2BlockResult>;
+
+  /**
+   * Commits pending changes to the underlying store.
+   */
+  commit(): Promise<void>;
+
+  /**
+   * Rolls back pending changes.
+   */
+  rollback(): Promise<void>;
+}
+
+/** Return type for handleL2Block */
+export type HandleL2BlockResult = {
+  /** Whether the block processed was emitted by our sequencer */ isBlockOurs: boolean;
+};
+
+/**
+ * Outputs a tree leaves using for debugging purposes.
+ */
+export async function inspectTree(
+  db: MerkleTreeOperations,
+  treeId: MerkleTreeId,
+  log = createDebugLogger('aztec:inspect-tree'),
+) {
+  const info = await db.getTreeInfo(treeId);
+  const output = [`Tree id=${treeId} size=${info.size} root=0x${info.root.toString('hex')}`];
+  for (let i = 0; i < info.size; i++) {
+    output.push(
+      ` Leaf ${i}: ${await db.getLeafValue(treeId, BigInt(i)).then(x => x?.toString('hex') ?? '[undefined]')}`,
+    );
+  }
+  log(output.join('\n'));
+}

package/src/world-state-db/merkle_trees.ts

@@ -1,6 +1,5 @@
 import {
   CONTRACT_TREE_HEIGHT,
-  CircuitsWasm,
   Fr,
   GlobalVariables,
   HISTORIC_BLOCKS_TREE_HEIGHT,
@@ -14,7 +13,6 @@ import { computeBlockHash, computeGlobalsHash } from '@aztec/circuits.js/abis';
 import { Committable } from '@aztec/foundation/committable';
 import { SerialQueue } from '@aztec/foundation/fifo';
 import { createDebugLogger } from '@aztec/foundation/log';
-import { IWasmModule } from '@aztec/foundation/wasm';
 import {
   AppendOnlyTree,
   IndexedTree,
@@ -42,7 +40,7 @@ import {
   MerkleTreeOperations,
   PublicTreeId,
   TreeInfo,
-} from './index.js';
+} from './merkle_tree_db.js';
 
 /**
  * Data necessary to reinitialize the merkle trees from Db.
@@ -71,12 +69,11 @@ export class MerkleTrees implements MerkleTreeDb {
    * @param optionalWasm - WASM instance to use for hashing (if not provided PrimitivesWasm will be used).
    * @param fromDbOptions - Options to initialize the trees from the database.
    */
-  public async init(optionalWasm?: IWasmModule, fromDbOptions?: FromDbOptions) {
+  public async init(fromDbOptions?: FromDbOptions) {
     const fromDb = fromDbOptions !== undefined;
     const initializeTree = fromDb ? loadTree : newTree;
 
-    const wasm = optionalWasm ?? (await CircuitsWasm.get());
-    const hasher = new Pedersen(wasm);
+    const hasher = new Pedersen();
     const contractTree: AppendOnlyTree = await initializeTree(
       StandardTree,
       this.db,
@@ -126,12 +123,12 @@ export class MerkleTrees implements MerkleTreeDb {
 
     // The first leaf in the blocks tree contains the empty roots of the other trees and empty global variables.
     if (!fromDb) {
-      const initialGlobalVariablesHash = computeGlobalsHash(wasm, GlobalVariables.empty());
+      const initialGlobalVariablesHash = computeGlobalsHash(GlobalVariables.empty());
       await this._updateLatestGlobalVariablesHash(initialGlobalVariablesHash);
       await this._updateHistoricBlocksTree(initialGlobalVariablesHash, true);
       await this._commit();
     } else {
-      await this._updateLatestGlobalVariablesHash(computeGlobalsHash(wasm, fromDbOptions.globalVariables));
+      await this._updateLatestGlobalVariablesHash(computeGlobalsHash(fromDbOptions.globalVariables));
     }
   }
 
@@ -141,9 +138,9 @@ export class MerkleTrees implements MerkleTreeDb {
    * @param wasm - WASM instance to use for hashing (if not provided PrimitivesWasm will be used).
    * @returns - A fully initialized MerkleTrees instance.
    */
-  public static async new(db: levelup.LevelUp, wasm?: IWasmModule) {
+  public static async new(db: levelup.LevelUp) {
     const merkleTrees = new MerkleTrees(db);
-    await merkleTrees.init(wasm);
+    await merkleTrees.init();
     return merkleTrees;
   }
 
@@ -226,8 +223,7 @@ export class MerkleTrees implements MerkleTreeDb {
 
   private async _getCurrentBlockHash(globalsHash: Fr, includeUncommitted: boolean): Promise<Fr> {
     const roots = (await this._getAllTreeRoots(includeUncommitted)).map(root => Fr.fromBuffer(root));
-    const wasm = await CircuitsWasm.get();
-    return computeBlockHash(wasm, globalsHash, roots[0], roots[1], roots[2], roots[3], roots[4]);
+    return computeBlockHash(globalsHash, roots[0], roots[1], roots[2], roots[3], roots[4]);
   }
 
   private _getAllTreeRoots(includeUncommitted: boolean): Promise<Buffer[]> {
@@ -574,7 +570,7 @@ export class MerkleTrees implements MerkleTreeDb {
       }
 
       // Sync and add the block to the historic blocks tree
-      const globalVariablesHash = computeGlobalsHash(await CircuitsWasm.get(), l2Block.globalVariables);
+      const globalVariablesHash = computeGlobalsHash(l2Block.globalVariables);
       await this._updateLatestGlobalVariablesHash(globalVariablesHash);
       this.log(`Synced global variables with hash ${globalVariablesHash}`);