@aztec/world-state 0.7.2 → 0.7.4

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

@@ -0,0 +1,407 @@
+import { CONTRACT_TREE_HEIGHT, CircuitsWasm, Fr, GlobalVariables, HISTORIC_BLOCKS_TREE_HEIGHT, L1_TO_L2_MSG_TREE_HEIGHT, NULLIFIER_SUBTREE_HEIGHT, NULLIFIER_TREE_HEIGHT, PRIVATE_DATA_TREE_HEIGHT, PUBLIC_DATA_TREE_HEIGHT, } from '@aztec/circuits.js';
+import { computeBlockHash } from '@aztec/circuits.js/abis';
+import { Committable } from '@aztec/foundation/committable';
+import { SerialQueue } from '@aztec/foundation/fifo';
+import { createDebugLogger } from '@aztec/foundation/log';
+import { Pedersen, SparseTree, StandardIndexedTree, StandardTree, loadTree, newTree, } from '@aztec/merkle-tree';
+import { MerkleTreeId, merkleTreeIds } from '@aztec/types';
+import { MerkleTreeOperationsFacade } from '../merkle-tree/merkle_tree_operations_facade.js';
+import { computeGlobalVariablesHash } from '../utils.js';
+import { INITIAL_NULLIFIER_TREE_SIZE, } from './index.js';
+/**
+ * A convenience class for managing multiple merkle trees.
+ */
+export class MerkleTrees {
+    constructor(db, log = createDebugLogger('aztec:merkle_trees')) {
+        this.db = db;
+        this.log = log;
+        this.trees = [];
+        this.jobQueue = new SerialQueue();
+        this.latestGlobalVariablesHash = new Committable(Fr.zero());
+    }
+    /**
+     * Initialises the collection of Merkle Trees.
+     * @param optionalWasm - WASM instance to use for hashing (if not provided PrimitivesWasm will be used).
+     * @param fromDbOptions - Options to initialise the trees from the database.
+     */
+    async init(optionalWasm, fromDbOptions) {
+        const fromDb = fromDbOptions !== undefined;
+        const initialiseTree = fromDb ? loadTree : newTree;
+        const wasm = optionalWasm ?? (await CircuitsWasm.get());
+        const hasher = new Pedersen(wasm);
+        const contractTree = await initialiseTree(StandardTree, this.db, hasher, `${MerkleTreeId[MerkleTreeId.CONTRACT_TREE]}`, CONTRACT_TREE_HEIGHT);
+        const nullifierTree = await initialiseTree(StandardIndexedTree, this.db, hasher, `${MerkleTreeId[MerkleTreeId.NULLIFIER_TREE]}`, NULLIFIER_TREE_HEIGHT, INITIAL_NULLIFIER_TREE_SIZE);
+        const privateDataTree = await initialiseTree(StandardTree, this.db, hasher, `${MerkleTreeId[MerkleTreeId.PRIVATE_DATA_TREE]}`, PRIVATE_DATA_TREE_HEIGHT);
+        const publicDataTree = await initialiseTree(SparseTree, this.db, hasher, `${MerkleTreeId[MerkleTreeId.PUBLIC_DATA_TREE]}`, PUBLIC_DATA_TREE_HEIGHT);
+        const l1Tol2MessagesTree = await initialiseTree(StandardTree, this.db, hasher, `${MerkleTreeId[MerkleTreeId.L1_TO_L2_MESSAGES_TREE]}`, L1_TO_L2_MSG_TREE_HEIGHT);
+        const historicBlocksTree = await initialiseTree(StandardTree, this.db, hasher, `${MerkleTreeId[MerkleTreeId.BLOCKS_TREE]}`, HISTORIC_BLOCKS_TREE_HEIGHT);
+        this.trees = [contractTree, nullifierTree, privateDataTree, publicDataTree, l1Tol2MessagesTree, historicBlocksTree];
+        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 = await computeGlobalVariablesHash(GlobalVariables.empty());
+            await this._updateLatestGlobalVariablesHash(initialGlobalVariablesHash);
+            await this._updateHistoricBlocksTree(initialGlobalVariablesHash, true);
+            await this._commit();
+        }
+        else {
+            await this._updateLatestGlobalVariablesHash(await computeGlobalVariablesHash(fromDbOptions.globalVariables));
+        }
+    }
+    /**
+     * Method to asynchronously create and initialise 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 initialised MerkleTrees instance.
+     */
+    static async new(db, wasm) {
+        const merkleTrees = new MerkleTrees(db);
+        await merkleTrees.init(wasm);
+        return merkleTrees;
+    }
+    /**
+     * Stops the job queue (waits for all jobs to finish).
+     */
+    async stop() {
+        await this.jobQueue.end();
+    }
+    /**
+     * Gets a view of this db that returns uncommitted data.
+     * @returns - A facade for this instance.
+     */
+    asLatest() {
+        return new MerkleTreeOperationsFacade(this, true);
+    }
+    /**
+     * Gets a view of this db that returns committed data only.
+     * @returns - A facade for this instance.
+     */
+    asCommitted() {
+        return new MerkleTreeOperationsFacade(this, false);
+    }
+    /**
+     * Inserts into the roots trees (CONTRACT_TREE_ROOTS_TREE, PRIVATE_DATA_TREE_ROOTS_TREE, L1_TO_L2_MESSAGES_TREE_ROOTS_TREE)
+     * the current roots of the corresponding trees (CONTRACT_TREE, PRIVATE_DATA_TREE, L1_TO_L2_MESSAGES_TREE).
+     * @param globalsHash - The current global variables hash.
+     * @param includeUncommitted - Indicates whether to include uncommitted data.
+     */
+    async updateHistoricBlocksTree(globalsHash, includeUncommitted) {
+        await this.synchronise(() => this._updateHistoricBlocksTree(globalsHash, includeUncommitted));
+    }
+    /**
+     * Updates the latest global variables hash
+     * @param globalVariablesHash - The latest global variables hash
+     */
+    async updateLatestGlobalVariablesHash(globalVariablesHash) {
+        return await this.synchronise(() => this._updateLatestGlobalVariablesHash(globalVariablesHash));
+    }
+    /**
+     * Gets the global variables hash from the previous block
+     * @param includeUncommitted - Indicates whether to include uncommitted data.
+     */
+    async getLatestGlobalVariablesHash(includeUncommitted) {
+        return await this.synchronise(() => this._getGlobalVariablesHash(includeUncommitted));
+    }
+    /**
+     * Gets the tree info for the specified tree.
+     * @param treeId - Id of the tree to get information from.
+     * @param includeUncommitted - Indicates whether to include uncommitted data.
+     * @returns The tree info for the specified tree.
+     */
+    async getTreeInfo(treeId, includeUncommitted) {
+        return await this.synchronise(() => this._getTreeInfo(treeId, includeUncommitted));
+    }
+    /**
+     * Get the current roots of the commitment trees.
+     * @param includeUncommitted - Indicates whether to include uncommitted data.
+     * @returns The current roots of the trees.
+     */
+    async getTreeRoots(includeUncommitted) {
+        const roots = await this.synchronise(() => Promise.resolve(this._getAllTreeRoots(includeUncommitted)));
+        return {
+            privateDataTreeRoot: roots[0],
+            nullifierTreeRoot: roots[1],
+            contractDataTreeRoot: roots[2],
+            l1Tol2MessagesTreeRoot: roots[3],
+            publicDataTreeRoot: roots[4],
+            blocksTreeRoot: roots[5],
+        };
+    }
+    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]);
+    }
+    _getAllTreeRoots(includeUncommitted) {
+        const roots = [
+            MerkleTreeId.PRIVATE_DATA_TREE,
+            MerkleTreeId.NULLIFIER_TREE,
+            MerkleTreeId.CONTRACT_TREE,
+            MerkleTreeId.L1_TO_L2_MESSAGES_TREE,
+            MerkleTreeId.PUBLIC_DATA_TREE,
+            MerkleTreeId.BLOCKS_TREE,
+        ].map(tree => this.trees[tree].getRoot(includeUncommitted));
+        return Promise.resolve(roots);
+    }
+    /**
+     * Gets the value at the given index.
+     * @param treeId - The ID of the tree to get the leaf value from.
+     * @param index - The index of the leaf.
+     * @param includeUncommitted - Indicates whether to include uncommitted changes.
+     * @returns Leaf value at the given index (undefined if not found).
+     */
+    async getLeafValue(treeId, index, includeUncommitted) {
+        return await this.synchronise(() => this.trees[treeId].getLeafValue(index, includeUncommitted));
+    }
+    /**
+     * Gets the sibling path for a leaf in a tree.
+     * @param treeId - The ID of the tree.
+     * @param index - The index of the leaf.
+     * @param includeUncommitted - Indicates whether the sibling path should incro include uncommitted data.
+     * @returns The sibling path for the leaf.
+     */
+    async getSiblingPath(treeId, index, includeUncommitted) {
+        return await this.synchronise(() => this._getSiblingPath(treeId, index, includeUncommitted));
+    }
+    /**
+     * Appends leaves to a tree.
+     * @param treeId - The ID of the tree.
+     * @param leaves - The leaves to append.
+     * @returns Empty promise.
+     */
+    async appendLeaves(treeId, leaves) {
+        return await this.synchronise(() => this._appendLeaves(treeId, leaves));
+    }
+    /**
+     * Commits all pending updates.
+     * @returns Empty promise.
+     */
+    async commit() {
+        return await this.synchronise(() => this._commit());
+    }
+    /**
+     * Rolls back all pending updates.
+     * @returns Empty promise.
+     */
+    async rollback() {
+        return await this.synchronise(() => this._rollback());
+    }
+    /**
+     * Finds the index of the largest leaf whose value is less than or equal to the provided value.
+     * @param treeId - The ID of the tree to search.
+     * @param value - The value to be inserted into the tree.
+     * @param includeUncommitted - If true, the uncommitted changes are included in the search.
+     * @returns The found leaf index and a flag indicating if the corresponding leaf's value is equal to `newValue`.
+     */
+    async getPreviousValueIndex(treeId, value, includeUncommitted) {
+        return await this.synchronise(() => Promise.resolve(this._getIndexedTree(treeId).findIndexOfPreviousValue(value, includeUncommitted)));
+    }
+    /**
+     * Gets the leaf data at a given index and tree.
+     * @param treeId - The ID of the tree get the leaf from.
+     * @param index - The index of the leaf to get.
+     * @param includeUncommitted - Indicates whether to include uncommitted data.
+     * @returns Leaf data.
+     */
+    async getLeafData(treeId, index, includeUncommitted) {
+        return await this.synchronise(() => Promise.resolve(this._getIndexedTree(treeId).getLatestLeafDataCopy(index, includeUncommitted)));
+    }
+    /**
+     * Returns the index of a leaf given its value, or undefined if no leaf with that value is found.
+     * @param treeId - The ID of the tree.
+     * @param value - The leaf value to look for.
+     * @param includeUncommitted - Indicates whether to include uncommitted data.
+     * @returns The index of the first leaf found with a given value (undefined if not found).
+     */
+    async findLeafIndex(treeId, value, includeUncommitted) {
+        return await this.synchronise(async () => {
+            const tree = this.trees[treeId];
+            for (let i = 0n; i < tree.getNumLeaves(includeUncommitted); i++) {
+                const currentValue = await tree.getLeafValue(i, includeUncommitted);
+                if (currentValue && currentValue.equals(value)) {
+                    return i;
+                }
+            }
+            return undefined;
+        });
+    }
+    /**
+     * Updates a leaf in a tree at a given index.
+     * @param treeId - The ID of the tree.
+     * @param leaf - The new leaf value.
+     * @param index - The index to insert into.
+     * @returns Empty promise.
+     */
+    async updateLeaf(treeId, leaf, index) {
+        return await this.synchronise(() => this._updateLeaf(treeId, leaf, index));
+    }
+    /**
+     * Handles a single L2 block (i.e. Inserts the new commitments into the merkle tree).
+     * @param block - The L2 block to handle.
+     */
+    async handleL2Block(block) {
+        await this.synchronise(() => this._handleL2Block(block));
+    }
+    /**
+     * Batch insert multiple leaves into the tree.
+     * @param treeId - The ID of the tree.
+     * @param leaves - Leaves to insert into the tree.
+     * @param subtreeHeight - Height of the subtree.
+     * @returns The data for the leaves to be updated when inserting the new ones.
+     */
+    async batchInsert(treeId, leaves, subtreeHeight) {
+        const tree = this.trees[treeId];
+        if (!('batchInsert' in tree)) {
+            throw new Error('Tree does not support `batchInsert` method');
+        }
+        return await this.synchronise(() => tree.batchInsert(leaves, subtreeHeight));
+    }
+    /**
+     * Waits for all jobs to finish before executing the given function.
+     * @param fn - The function to execute.
+     * @returns Promise containing the result of the function.
+     */
+    async synchronise(fn) {
+        return await this.jobQueue.put(fn);
+    }
+    _updateLatestGlobalVariablesHash(globalVariablesHash) {
+        this.latestGlobalVariablesHash.set(globalVariablesHash);
+        return Promise.resolve();
+    }
+    _getGlobalVariablesHash(includeUncommitted) {
+        return Promise.resolve(this.latestGlobalVariablesHash.get(includeUncommitted));
+    }
+    async _updateHistoricBlocksTree(globalsHash, includeUncommitted) {
+        const blockHash = await this._getCurrentBlockHash(globalsHash, includeUncommitted);
+        await this._appendLeaves(MerkleTreeId.BLOCKS_TREE, [blockHash.toBuffer()]);
+    }
+    /**
+     * Returns the tree info for the specified tree id.
+     * @param treeId - Id of the tree to get information from.
+     * @param includeUncommitted - Indicates whether to include uncommitted data.
+     * @returns The tree info for the specified tree.
+     */
+    _getTreeInfo(treeId, includeUncommitted) {
+        const treeInfo = {
+            treeId,
+            root: this.trees[treeId].getRoot(includeUncommitted),
+            size: this.trees[treeId].getNumLeaves(includeUncommitted),
+            depth: this.trees[treeId].getDepth(),
+        };
+        return Promise.resolve(treeInfo);
+    }
+    /**
+     * Returns an instance of an indexed tree.
+     * @param treeId - Id of the tree to get an instance of.
+     * @returns The indexed tree for the specified tree id.
+     */
+    _getIndexedTree(treeId) {
+        return this.trees[treeId];
+    }
+    /**
+     * Returns the sibling path for a leaf in a tree.
+     * @param treeId - Id of the tree to get the sibling path from.
+     * @param index - Index of the leaf to get the sibling path for.
+     * @param includeUncommitted - Indicates whether to include uncommitted updates in the sibling path.
+     * @returns Promise containing the sibling path for the leaf.
+     */
+    _getSiblingPath(treeId, index, includeUncommitted) {
+        return Promise.resolve(this.trees[treeId].getSiblingPath(index, includeUncommitted));
+    }
+    /**
+     * Appends leaves to a tree.
+     * @param treeId - Id of the tree to append leaves to.
+     * @param leaves - Leaves to append.
+     * @returns Empty promise.
+     */
+    async _appendLeaves(treeId, leaves) {
+        const tree = this.trees[treeId];
+        if (!('appendLeaves' in tree)) {
+            throw new Error('Tree does not support `appendLeaves` method');
+        }
+        return await tree.appendLeaves(leaves);
+    }
+    async _updateLeaf(treeId, leaf, index) {
+        const tree = this.trees[treeId];
+        if (!('updateLeaf' in tree)) {
+            throw new Error('Tree does not support `updateLeaf` method');
+        }
+        return await tree.updateLeaf(leaf, index);
+    }
+    /**
+     * Commits all pending updates.
+     * @returns Empty promise.
+     */
+    async _commit() {
+        for (const tree of this.trees) {
+            await tree.commit();
+        }
+        this.latestGlobalVariablesHash.commit();
+    }
+    /**
+     * Rolls back all pending updates.
+     * @returns Empty promise.
+     */
+    async _rollback() {
+        for (const tree of this.trees) {
+            await tree.rollback();
+        }
+        this.latestGlobalVariablesHash.rollback();
+    }
+    /**
+     * Handles a single L2 block (i.e. Inserts the new commitments into the merkle tree).
+     * @param l2Block - The L2 block to handle.
+     */
+    async _handleL2Block(l2Block) {
+        const compareRoot = (root, treeId) => {
+            const treeRoot = this.trees[treeId].getRoot(true);
+            return treeRoot.equals(root.toBuffer());
+        };
+        const rootChecks = [
+            compareRoot(l2Block.endContractTreeSnapshot.root, MerkleTreeId.CONTRACT_TREE),
+            compareRoot(l2Block.endNullifierTreeSnapshot.root, MerkleTreeId.NULLIFIER_TREE),
+            compareRoot(l2Block.endPrivateDataTreeSnapshot.root, MerkleTreeId.PRIVATE_DATA_TREE),
+            compareRoot(l2Block.endPublicDataTreeRoot, MerkleTreeId.PUBLIC_DATA_TREE),
+            compareRoot(l2Block.endL1ToL2MessagesTreeSnapshot.root, MerkleTreeId.L1_TO_L2_MESSAGES_TREE),
+            compareRoot(l2Block.endHistoricBlocksTreeSnapshot.root, MerkleTreeId.BLOCKS_TREE),
+        ];
+        const ourBlock = rootChecks.every(x => x);
+        if (ourBlock) {
+            this.log(`Block ${l2Block.number} is ours, committing world state..`);
+            await this._commit();
+        }
+        else {
+            this.log(`Block ${l2Block.number} is not ours, rolling back world state and committing state from chain..`);
+            await this._rollback();
+            // Sync the append only trees
+            for (const [tree, leaves] of [
+                [MerkleTreeId.CONTRACT_TREE, l2Block.newContracts],
+                [MerkleTreeId.PRIVATE_DATA_TREE, l2Block.newCommitments],
+                [MerkleTreeId.L1_TO_L2_MESSAGES_TREE, l2Block.newL1ToL2Messages],
+            ]) {
+                await this._appendLeaves(tree, leaves.map(fr => fr.toBuffer()));
+            }
+            // Sync the indexed trees
+            await this.trees[MerkleTreeId.NULLIFIER_TREE].batchInsert(l2Block.newNullifiers.map(fr => fr.toBuffer()), NULLIFIER_SUBTREE_HEIGHT);
+            // Sync the public data tree
+            for (const dataWrite of l2Block.newPublicDataWrites) {
+                if (dataWrite.isEmpty())
+                    continue;
+                const { newValue, leafIndex } = dataWrite;
+                await this._updateLeaf(MerkleTreeId.PUBLIC_DATA_TREE, newValue.toBuffer(), leafIndex.value);
+            }
+            // Sync and add the block to the historic blocks tree
+            const globalVariablesHash = await computeGlobalVariablesHash(l2Block.globalVariables);
+            await this._updateLatestGlobalVariablesHash(globalVariablesHash);
+            this.log(`Synced global variables with hash ${this.latestGlobalVariablesHash.toString()}`);
+            const blockHash = await this._getCurrentBlockHash(globalVariablesHash, true);
+            await this._appendLeaves(MerkleTreeId.BLOCKS_TREE, [blockHash.toBuffer()]);
+            await this._commit();
+        }
+        for (const treeId of merkleTreeIds()) {
+            const info = await this._getTreeInfo(treeId, false);
+            this.log(`Tree ${MerkleTreeId[treeId]} synched with size ${info.size} root ${info.root.toString('hex')}`);
+        }
+    }
+}
+//# 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,13 +1,13 @@
 {
   "name": "@aztec/world-state",
-  "version": "0.7.2",
+  "version": "0.7.4",
   "exports": "./dest/index.js",
   "type": "module",
   "dependencies": {
-    "@aztec/circuits.js": "0.7.2",
-    "@aztec/foundation": "0.7.2",
-    "@aztec/merkle-tree": "0.7.2",
-    "@aztec/types": "0.7.2",
+    "@aztec/circuits.js": "0.7.4",
+    "@aztec/foundation": "0.7.4",
+    "@aztec/merkle-tree": "0.7.4",
+    "@aztec/types": "0.7.4",
     "levelup": "^5.1.1",
     "lodash.times": "^4.3.2",
     "memdown": "^6.1.1",

package/Dockerfile

@@ -1,18 +0,0 @@
-FROM 278380418400.dkr.ecr.eu-west-2.amazonaws.com/yarn-project-base AS builder
-
-COPY . .
-
-WORKDIR /usr/src/yarn-project/world-state
-RUN yarn build && yarn formatting
-
-RUN yarn test
-
-# Prune dev dependencies. See comment in base image.
-RUN yarn cache clean
-RUN yarn workspaces focus --production > /dev/null
-
-# set up entry point
-FROM node:18-alpine
-COPY --from=builder /usr/src/yarn-project/world-state /usr/src/yarn-project/world-state
-WORKDIR /usr/src/yarn-project/world-state
-ENTRYPOINT ["yarn", "test"]