@aztec/world-state 0.0.0-test.0 → 0.0.1-commit.023c3e5

package/dest/test/utils.js

@@ -1,73 +1,70 @@
 import { MAX_NOTE_HASHES_PER_TX, MAX_NULLIFIERS_PER_TX, NULLIFIER_SUBTREE_HEIGHT, NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP } from '@aztec/constants';
+import { asyncMap } from '@aztec/foundation/async-map';
+import { BlockNumber, IndexWithinCheckpoint } from '@aztec/foundation/branded-types';
 import { padArrayEnd } from '@aztec/foundation/collection';
-import { Fr } from '@aztec/foundation/fields';
+import { Fr } from '@aztec/foundation/curves/bn254';
 import { L2Block } from '@aztec/stdlib/block';
+import { mockCheckpointAndMessages, mockL1ToL2Messages } from '@aztec/stdlib/testing';
 import { AppendOnlyTreeSnapshot, MerkleTreeId } from '@aztec/stdlib/trees';
-export async function mockBlock(blockNum, size, fork) {
-    const l2Block = await L2Block.random(blockNum, size);
-    const l1ToL2Messages = Array(16).fill(0).map(Fr.random);
-    // Sync the append only trees
-    {
-        const noteHashesPadded = l2Block.body.txEffects.flatMap((txEffect)=>padArrayEnd(txEffect.noteHashes, Fr.ZERO, MAX_NOTE_HASHES_PER_TX));
-        await fork.appendLeaves(MerkleTreeId.NOTE_HASH_TREE, noteHashesPadded);
-        const l1ToL2MessagesPadded = padArrayEnd(l1ToL2Messages, Fr.ZERO, NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP);
-        await fork.appendLeaves(MerkleTreeId.L1_TO_L2_MESSAGE_TREE, l1ToL2MessagesPadded);
-    }
-    // Sync the indexed trees
-    {
-        // We insert the public data tree leaves with one batch per tx to avoid updating the same key twice
-        for (const txEffect of l2Block.body.txEffects){
-            await fork.batchInsert(MerkleTreeId.PUBLIC_DATA_TREE, txEffect.publicDataWrites.map((write)=>write.toBuffer()), 0);
-            const nullifiersPadded = padArrayEnd(txEffect.nullifiers, Fr.ZERO, MAX_NULLIFIERS_PER_TX);
-            await fork.batchInsert(MerkleTreeId.NULLIFIER_TREE, nullifiersPadded.map((nullifier)=>nullifier.toBuffer()), NULLIFIER_SUBTREE_HEIGHT);
+import { BlockHeader } from '@aztec/stdlib/tx';
+export async function updateBlockState(block, l1ToL2Messages, fork) {
+    const insertData = async (treeId, data, subTreeHeight, fork)=>{
+        for (const dataBatch of data){
+            await fork.batchInsert(treeId, dataBatch, subTreeHeight);
         }
-    }
+    };
+    const publicDataInsert = insertData(MerkleTreeId.PUBLIC_DATA_TREE, block.body.txEffects.map((txEffect)=>txEffect.publicDataWrites.map((write)=>write.toBuffer())), 0, fork);
+    const nullifierInsert = insertData(MerkleTreeId.NULLIFIER_TREE, block.body.txEffects.map((txEffect)=>padArrayEnd(txEffect.nullifiers, Fr.ZERO, MAX_NULLIFIERS_PER_TX).map((nullifier)=>nullifier.toBuffer())), NULLIFIER_SUBTREE_HEIGHT, fork);
+    const noteHashesPadded = block.body.txEffects.flatMap((txEffect)=>padArrayEnd(txEffect.noteHashes, Fr.ZERO, MAX_NOTE_HASHES_PER_TX));
+    const l1ToL2MessagesPadded = block.indexWithinCheckpoint === 0 ? padArrayEnd(l1ToL2Messages, Fr.ZERO, NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP) : l1ToL2Messages;
+    const noteHashInsert = fork.appendLeaves(MerkleTreeId.NOTE_HASH_TREE, noteHashesPadded);
+    const messageInsert = fork.appendLeaves(MerkleTreeId.L1_TO_L2_MESSAGE_TREE, l1ToL2MessagesPadded);
+    await Promise.all([
+        publicDataInsert,
+        nullifierInsert,
+        noteHashInsert,
+        messageInsert
+    ]);
     const state = await fork.getStateReference();
-    l2Block.header.state = state;
-    await fork.updateArchive(l2Block.header);
+    block.header = BlockHeader.from({
+        ...block.header,
+        state
+    });
+    await fork.updateArchive(block.header);
     const archiveState = await fork.getTreeInfo(MerkleTreeId.ARCHIVE);
-    l2Block.archive = new AppendOnlyTreeSnapshot(Fr.fromBuffer(archiveState.root), Number(archiveState.size));
+    block.archive = new AppendOnlyTreeSnapshot(Fr.fromBuffer(archiveState.root), Number(archiveState.size));
+}
+export async function mockBlock(blockNum, size, fork, maxEffects = 1000, numL1ToL2Messages = NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP, isFirstBlockInCheckpoint = true) {
+    const block = await L2Block.random(blockNum, {
+        indexWithinCheckpoint: isFirstBlockInCheckpoint ? IndexWithinCheckpoint(0) : IndexWithinCheckpoint(1),
+        txsPerBlock: size,
+        txOptions: {
+            maxEffects
+        }
+    });
+    const l1ToL2Messages = mockL1ToL2Messages(numL1ToL2Messages);
+    await updateBlockState(block, l1ToL2Messages, fork);
     return {
-        block: l2Block,
+        block,
         messages: l1ToL2Messages
     };
 }
 export async function mockEmptyBlock(blockNum, fork) {
     const l2Block = L2Block.empty();
     const l1ToL2Messages = Array(16).fill(0).map(Fr.zero);
-    l2Block.header.globalVariables.blockNumber = new Fr(blockNum);
-    // Sync the append only trees
-    {
-        const noteHashesPadded = l2Block.body.txEffects.flatMap((txEffect)=>padArrayEnd(txEffect.noteHashes, Fr.ZERO, MAX_NOTE_HASHES_PER_TX));
-        await fork.appendLeaves(MerkleTreeId.NOTE_HASH_TREE, noteHashesPadded);
-        const l1ToL2MessagesPadded = padArrayEnd(l1ToL2Messages, Fr.ZERO, NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP);
-        await fork.appendLeaves(MerkleTreeId.L1_TO_L2_MESSAGE_TREE, l1ToL2MessagesPadded);
-    }
-    // Sync the indexed trees
-    {
-        // We insert the public data tree leaves with one batch per tx to avoid updating the same key twice
-        for (const txEffect of l2Block.body.txEffects){
-            await fork.batchInsert(MerkleTreeId.PUBLIC_DATA_TREE, txEffect.publicDataWrites.map((write)=>write.toBuffer()), 0);
-            const nullifiersPadded = padArrayEnd(txEffect.nullifiers, Fr.ZERO, MAX_NULLIFIERS_PER_TX);
-            await fork.batchInsert(MerkleTreeId.NULLIFIER_TREE, nullifiersPadded.map((nullifier)=>nullifier.toBuffer()), NULLIFIER_SUBTREE_HEIGHT);
-        }
-    }
-    const state = await fork.getStateReference();
-    l2Block.header.state = state;
-    await fork.updateArchive(l2Block.header);
-    const archiveState = await fork.getTreeInfo(MerkleTreeId.ARCHIVE);
-    l2Block.archive = new AppendOnlyTreeSnapshot(Fr.fromBuffer(archiveState.root), Number(archiveState.size));
+    l2Block.header.globalVariables.blockNumber = blockNum;
+    await updateBlockState(l2Block, l1ToL2Messages, fork);
     return {
         block: l2Block,
         messages: l1ToL2Messages
     };
 }
 export async function mockBlocks(from, count, numTxs, worldState) {
-    const tempFork = await worldState.fork(from - 1);
+    const tempFork = await worldState.fork(BlockNumber(from - 1));
     const blocks = [];
     const messagesArray = [];
     for(let blockNumber = from; blockNumber < from + count; blockNumber++){
-        const { block, messages } = await mockBlock(blockNumber, numTxs, tempFork);
+        const { block, messages } = await mockBlock(BlockNumber(blockNumber), numTxs, tempFork);
         blocks.push(block);
         messagesArray.push(messages);
     }
@@ -77,6 +74,16 @@ export async function mockBlocks(from, count, numTxs, worldState) {
         messages: messagesArray
     };
 }
+export async function mockCheckpoint(checkpointNumber, fork, options = {}) {
+    const { checkpoint, messages } = await mockCheckpointAndMessages(checkpointNumber, options);
+    await asyncMap(checkpoint.blocks, async (block, i)=>{
+        await updateBlockState(block, i === 0 ? messages : [], fork);
+    });
+    return {
+        checkpoint,
+        messages
+    };
+}
 export async function assertSameState(forkA, forkB) {
     const nativeStateRef = await forkA.getStateReference();
     const nativeArchive = await forkA.getTreeInfo(MerkleTreeId.ARCHIVE);

package/dest/testing.d.ts

@@ -1,10 +1,10 @@
-import { Fr } from '@aztec/foundation/fields';
+import { Fr } from '@aztec/foundation/curves/bn254';
 import type { AztecAddress } from '@aztec/stdlib/aztec-address';
 import { PublicDataTreeLeaf } from '@aztec/stdlib/trees';
 export declare const defaultInitialAccountFeeJuice: Fr;
 export declare function getGenesisValues(initialAccounts: AztecAddress[], initialAccountFeeJuice?: Fr, genesisPublicData?: PublicDataTreeLeaf[]): Promise<{
     genesisArchiveRoot: Fr;
-    genesisBlockHash: Fr;
     prefilledPublicData: PublicDataTreeLeaf[];
+    fundingNeeded: bigint;
 }>;
-//# sourceMappingURL=testing.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidGVzdGluZy5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vc3JjL3Rlc3RpbmcudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQ0EsT0FBTyxFQUFFLEVBQUUsRUFBRSxNQUFNLGdDQUFnQyxDQUFDO0FBRXBELE9BQU8sS0FBSyxFQUFFLFlBQVksRUFBRSxNQUFNLDZCQUE2QixDQUFDO0FBQ2hFLE9BQU8sRUFBZ0Isa0JBQWtCLEVBQUUsTUFBTSxxQkFBcUIsQ0FBQztBQXlCdkUsZUFBTyxNQUFNLDZCQUE2QixJQUFxQixDQUFDO0FBRWhFLHdCQUFzQixnQkFBZ0IsQ0FDcEMsZUFBZSxFQUFFLFlBQVksRUFBRSxFQUMvQixzQkFBc0IsS0FBZ0MsRUFDdEQsaUJBQWlCLEdBQUUsa0JBQWtCLEVBQU87Ozs7R0FxQjdDIn0=

package/dest/testing.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"testing.d.ts","sourceRoot":"","sources":["../src/testing.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAE9C,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAChE,OAAO,EAAgB,kBAAkB,EAAE,MAAM,qBAAqB,CAAC;AA6BvE,eAAO,MAAM,6BAA6B,IAAqB,CAAC;AAEhE,wBAAsB,gBAAgB,CACpC,eAAe,EAAE,YAAY,EAAE,EAC/B,sBAAsB,KAAgC,EACtD,iBAAiB,GAAE,kBAAkB,EAAO;;;;GAqB7C"}
+{"version":3,"file":"testing.d.ts","sourceRoot":"","sources":["../src/testing.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AAEpD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAChE,OAAO,EAAgB,kBAAkB,EAAE,MAAM,qBAAqB,CAAC;AAyBvE,eAAO,MAAM,6BAA6B,IAAqB,CAAC;AAEhE,wBAAsB,gBAAgB,CACpC,eAAe,EAAE,YAAY,EAAE,EAC/B,sBAAsB,KAAgC,EACtD,iBAAiB,GAAE,kBAAkB,EAAO;;;;GAqB7C"}

package/dest/testing.js

@@ -1,24 +1,20 @@
-import { GENESIS_ARCHIVE_ROOT, GENESIS_BLOCK_HASH } from '@aztec/constants';
-import { Fr } from '@aztec/foundation/fields';
+import { GENESIS_ARCHIVE_ROOT } from '@aztec/constants';
+import { Fr } from '@aztec/foundation/curves/bn254';
 import { computeFeePayerBalanceLeafSlot } from '@aztec/protocol-contracts/fee-juice';
 import { MerkleTreeId, PublicDataTreeLeaf } from '@aztec/stdlib/trees';
 import { NativeWorldStateService } from './native/index.js';
 async function generateGenesisValues(prefilledPublicData) {
     if (!prefilledPublicData.length) {
         return {
-            genesisArchiveRoot: new Fr(GENESIS_ARCHIVE_ROOT),
-            genesisBlockHash: new Fr(GENESIS_BLOCK_HASH)
+            genesisArchiveRoot: new Fr(GENESIS_ARCHIVE_ROOT)
         };
     }
     // Create a temporary world state to compute the genesis values.
     const ws = await NativeWorldStateService.tmp(undefined /* rollupAddress */ , true, prefilledPublicData);
-    const initialHeader = ws.getInitialHeader();
-    const genesisBlockHash = await initialHeader.hash();
     const genesisArchiveRoot = new Fr((await ws.getCommitted().getTreeInfo(MerkleTreeId.ARCHIVE)).root);
     await ws.close();
     return {
-        genesisArchiveRoot,
-        genesisBlockHash
+        genesisArchiveRoot
     };
 }
 export const defaultInitialAccountFeeJuice = new Fr(10n ** 22n);
@@ -28,10 +24,10 @@ export async function getGenesisValues(initialAccounts, initialAccountFeeJuice =
     // Add user-defined public data
     prefilledPublicData = prefilledPublicData.concat(genesisPublicData);
     prefilledPublicData.sort((a, b)=>b.slot.lt(a.slot) ? 1 : -1);
-    const { genesisBlockHash, genesisArchiveRoot } = await generateGenesisValues(prefilledPublicData);
+    const { genesisArchiveRoot } = await generateGenesisValues(prefilledPublicData);
     return {
         genesisArchiveRoot,
-        genesisBlockHash,
-        prefilledPublicData
+        prefilledPublicData,
+        fundingNeeded: BigInt(initialAccounts.length) * initialAccountFeeJuice.toBigInt()
     };
 }

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

@@ -1,3 +1,3 @@
 export * from './merkle_tree_db.js';
 export type { MerkleTreeReadOperations } from '@aztec/stdlib/interfaces/server';
-//# sourceMappingURL=index.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy93b3JsZC1zdGF0ZS1kYi9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxjQUFjLHFCQUFxQixDQUFDO0FBRXBDLFlBQVksRUFBRSx3QkFBd0IsRUFBRSxNQUFNLGlDQUFpQyxDQUFDIn0=

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

@@ -1,7 +1,8 @@
-import type { Fr } from '@aztec/foundation/fields';
+import type { BlockNumber } from '@aztec/foundation/branded-types';
+import type { Fr } from '@aztec/foundation/curves/bn254';
 import type { IndexedTreeSnapshot, TreeSnapshot } from '@aztec/merkle-tree';
 import type { L2Block } from '@aztec/stdlib/block';
-import type { ForkMerkleTreeOperations, MerkleTreeReadOperations } from '@aztec/stdlib/interfaces/server';
+import type { ForkMerkleTreeOperations, MerkleTreeReadOperations, ReadonlyWorldStateAccess } from '@aztec/stdlib/interfaces/server';
 import type { MerkleTreeId } from '@aztec/stdlib/trees';
 import type { WorldStateStatusFull, WorldStateStatusSummary } from '../native/message.js';
 /**
@@ -28,7 +29,7 @@ export type TreeSnapshots = {
     [MerkleTreeId.L1_TO_L2_MESSAGE_TREE]: TreeSnapshot<Fr>;
     [MerkleTreeId.ARCHIVE]: TreeSnapshot<Fr>;
 };
-export interface MerkleTreeAdminDatabase extends ForkMerkleTreeOperations {
+export interface MerkleTreeAdminDatabase extends ForkMerkleTreeOperations, ReadonlyWorldStateAccess {
     /**
      * Handles a single L2 block (i.e. Inserts the new note hashes into the merkle tree).
      * @param block - The L2 block to handle.
@@ -44,19 +45,19 @@ export interface MerkleTreeAdminDatabase extends ForkMerkleTreeOperations {
      * @param toBlockNumber The block number of the new oldest historical block
      * @returns The new WorldStateStatus
      */
-    removeHistoricalBlocks(toBlockNumber: bigint): Promise<WorldStateStatusFull>;
+    removeHistoricalBlocks(toBlockNumber: BlockNumber): Promise<WorldStateStatusFull>;
     /**
      * Removes all pending blocks down to but not including the given block number
      * @param toBlockNumber The block number of the new tip of the pending chain,
      * @returns The new WorldStateStatus
      */
-    unwindBlocks(toBlockNumber: bigint): Promise<WorldStateStatusFull>;
+    unwindBlocks(toBlockNumber: BlockNumber): Promise<WorldStateStatusFull>;
     /**
-     * Advances the finalised block number to be the number provided
-     * @param toBlockNumber The block number that is now the tip of the finalised chain
+     * Advances the finalized block number to be the number provided
+     * @param toBlockNumber The block number that is now the tip of the finalized chain
      * @returns The new WorldStateStatus
      */
-    setFinalised(toBlockNumber: bigint): Promise<WorldStateStatusSummary>;
+    setFinalized(toBlockNumber: BlockNumber): Promise<WorldStateStatusSummary>;
     /**
      * Gets the current status summary of the database.
      * @returns The current WorldStateStatus.
@@ -64,5 +65,7 @@ export interface MerkleTreeAdminDatabase extends ForkMerkleTreeOperations {
     getStatusSummary(): Promise<WorldStateStatusSummary>;
     /** Stops the database */
     close(): Promise<void>;
+    /** Deletes the db. */
+    clear(): Promise<void>;
 }
-//# sourceMappingURL=merkle_tree_db.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibWVya2xlX3RyZWVfZGIuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy93b3JsZC1zdGF0ZS1kYi9tZXJrbGVfdHJlZV9kYi50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFDQSxPQUFPLEtBQUssRUFBRSxXQUFXLEVBQUUsTUFBTSxpQ0FBaUMsQ0FBQztBQUNuRSxPQUFPLEtBQUssRUFBRSxFQUFFLEVBQUUsTUFBTSxnQ0FBZ0MsQ0FBQztBQUN6RCxPQUFPLEtBQUssRUFBRSxtQkFBbUIsRUFBRSxZQUFZLEVBQUUsTUFBTSxvQkFBb0IsQ0FBQztBQUM1RSxPQUFPLEtBQUssRUFBRSxPQUFPLEVBQUUsTUFBTSxxQkFBcUIsQ0FBQztBQUNuRCxPQUFPLEtBQUssRUFDVix3QkFBd0IsRUFDeEIsd0JBQXdCLEVBQ3hCLHdCQUF3QixFQUN6QixNQUFNLGlDQUFpQyxDQUFDO0FBQ3pDLE9BQU8sS0FBSyxFQUFFLFlBQVksRUFBRSxNQUFNLHFCQUFxQixDQUFDO0FBRXhELE9BQU8sS0FBSyxFQUFFLG9CQUFvQixFQUFFLHVCQUF1QixFQUFFLE1BQU0sc0JBQXNCLENBQUM7QUFFMUY7Ozs7Ozs7Ozs7Ozs7O0dBY0c7QUFDSCxlQUFPLE1BQU0sMkJBQTJCLFFBQTRCLENBQUM7QUFFckUsZUFBTyxNQUFNLDZCQUE2QixRQUFtRCxDQUFDO0FBRTlGLE1BQU0sTUFBTSxhQUFhLEdBQUc7SUFDMUIsQ0FBQyxZQUFZLENBQUMsY0FBYyxDQUFDLEVBQUUsbUJBQW1CLENBQUM7SUFDbkQsQ0FBQyxZQUFZLENBQUMsY0FBYyxDQUFDLEVBQUUsWUFBWSxDQUFDLEVBQUUsQ0FBQyxDQUFDO0lBQ2hELENBQUMsWUFBWSxDQUFDLGdCQUFnQixDQUFDLEVBQUUsbUJBQW1CLENBQUM7SUFDckQsQ0FBQyxZQUFZLENBQUMscUJBQXFCLENBQUMsRUFBRSxZQUFZLENBQUMsRUFBRSxDQUFDLENBQUM7SUFDdkQsQ0FBQyxZQUFZLENBQUMsT0FBTyxDQUFDLEVBQUUsWUFBWSxDQUFDLEVBQUUsQ0FBQyxDQUFDO0NBQzFDLENBQUM7QUFFRixNQUFNLFdBQVcsdUJBQXdCLFNBQVEsd0JBQXdCLEVBQUUsd0JBQXdCO0lBQ2pHOzs7O09BSUc7SUFDSCx3QkFBd0IsQ0FBQyxLQUFLLEVBQUUsT0FBTyxFQUFFLGNBQWMsRUFBRSxFQUFFLEVBQUUsR0FBRyxPQUFPLENBQUMsb0JBQW9CLENBQUMsQ0FBQztJQUU5Rjs7T0FFRztJQUNILFlBQVksSUFBSSx3QkFBd0IsQ0FBQztJQUV6Qzs7OztPQUlHO0lBQ0gsc0JBQXNCLENBQUMsYUFBYSxFQUFFLFdBQVcsR0FBRyxPQUFPLENBQUMsb0JBQW9CLENBQUMsQ0FBQztJQUVsRjs7OztPQUlHO0lBQ0gsWUFBWSxDQUFDLGFBQWEsRUFBRSxXQUFXLEdBQUcsT0FBTyxDQUFDLG9CQUFvQixDQUFDLENBQUM7SUFFeEU7Ozs7T0FJRztJQUNILFlBQVksQ0FBQyxhQUFhLEVBQUUsV0FBVyxHQUFHLE9BQU8sQ0FBQyx1QkFBdUIsQ0FBQyxDQUFDO0lBRTNFOzs7T0FHRztJQUNILGdCQUFnQixJQUFJLE9BQU8sQ0FBQyx1QkFBdUIsQ0FBQyxDQUFDO0lBRXJELHlCQUF5QjtJQUN6QixLQUFLLElBQUksT0FBTyxDQUFDLElBQUksQ0FBQyxDQUFDO0lBRXZCLHNCQUFzQjtJQUN0QixLQUFLLElBQUksT0FBTyxDQUFDLElBQUksQ0FBQyxDQUFDO0NBQ3hCIn0=

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

@@ -1 +1 @@
-{"version":3,"file":"merkle_tree_db.d.ts","sourceRoot":"","sources":["../../src/world-state-db/merkle_tree_db.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AACnD,OAAO,KAAK,EAAE,mBAAmB,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAC5E,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AACnD,OAAO,KAAK,EAAE,wBAAwB,EAAE,wBAAwB,EAAE,MAAM,iCAAiC,CAAC;AAC1G,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AAExD,OAAO,KAAK,EAAE,oBAAoB,EAAE,uBAAuB,EAAE,MAAM,sBAAsB,CAAC;AAE1F;;;;;;;;;;;;;;GAcG;AACH,eAAO,MAAM,2BAA2B,QAA4B,CAAC;AAErE,eAAO,MAAM,6BAA6B,QAAmD,CAAC;AAE9F,MAAM,MAAM,aAAa,GAAG;IAC1B,CAAC,YAAY,CAAC,cAAc,CAAC,EAAE,mBAAmB,CAAC;IACnD,CAAC,YAAY,CAAC,cAAc,CAAC,EAAE,YAAY,CAAC,EAAE,CAAC,CAAC;IAChD,CAAC,YAAY,CAAC,gBAAgB,CAAC,EAAE,mBAAmB,CAAC;IACrD,CAAC,YAAY,CAAC,qBAAqB,CAAC,EAAE,YAAY,CAAC,EAAE,CAAC,CAAC;IACvD,CAAC,YAAY,CAAC,OAAO,CAAC,EAAE,YAAY,CAAC,EAAE,CAAC,CAAC;CAC1C,CAAC;AAEF,MAAM,WAAW,uBAAwB,SAAQ,wBAAwB;IACvE;;;;OAIG;IACH,wBAAwB,CAAC,KAAK,EAAE,OAAO,EAAE,cAAc,EAAE,EAAE,EAAE,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAAC;IAE9F;;OAEG;IACH,YAAY,IAAI,wBAAwB,CAAC;IAEzC;;;;OAIG;IACH,sBAAsB,CAAC,aAAa,EAAE,MAAM,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAAC;IAE7E;;;;OAIG;IACH,YAAY,CAAC,aAAa,EAAE,MAAM,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAAC;IAEnE;;;;OAIG;IACH,YAAY,CAAC,aAAa,EAAE,MAAM,GAAG,OAAO,CAAC,uBAAuB,CAAC,CAAC;IAEtE;;;OAGG;IACH,gBAAgB,IAAI,OAAO,CAAC,uBAAuB,CAAC,CAAC;IAErD,yBAAyB;IACzB,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;CACxB"}
+{"version":3,"file":"merkle_tree_db.d.ts","sourceRoot":"","sources":["../../src/world-state-db/merkle_tree_db.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,iCAAiC,CAAC;AACnE,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AACzD,OAAO,KAAK,EAAE,mBAAmB,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAC5E,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AACnD,OAAO,KAAK,EACV,wBAAwB,EACxB,wBAAwB,EACxB,wBAAwB,EACzB,MAAM,iCAAiC,CAAC;AACzC,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AAExD,OAAO,KAAK,EAAE,oBAAoB,EAAE,uBAAuB,EAAE,MAAM,sBAAsB,CAAC;AAE1F;;;;;;;;;;;;;;GAcG;AACH,eAAO,MAAM,2BAA2B,QAA4B,CAAC;AAErE,eAAO,MAAM,6BAA6B,QAAmD,CAAC;AAE9F,MAAM,MAAM,aAAa,GAAG;IAC1B,CAAC,YAAY,CAAC,cAAc,CAAC,EAAE,mBAAmB,CAAC;IACnD,CAAC,YAAY,CAAC,cAAc,CAAC,EAAE,YAAY,CAAC,EAAE,CAAC,CAAC;IAChD,CAAC,YAAY,CAAC,gBAAgB,CAAC,EAAE,mBAAmB,CAAC;IACrD,CAAC,YAAY,CAAC,qBAAqB,CAAC,EAAE,YAAY,CAAC,EAAE,CAAC,CAAC;IACvD,CAAC,YAAY,CAAC,OAAO,CAAC,EAAE,YAAY,CAAC,EAAE,CAAC,CAAC;CAC1C,CAAC;AAEF,MAAM,WAAW,uBAAwB,SAAQ,wBAAwB,EAAE,wBAAwB;IACjG;;;;OAIG;IACH,wBAAwB,CAAC,KAAK,EAAE,OAAO,EAAE,cAAc,EAAE,EAAE,EAAE,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAAC;IAE9F;;OAEG;IACH,YAAY,IAAI,wBAAwB,CAAC;IAEzC;;;;OAIG;IACH,sBAAsB,CAAC,aAAa,EAAE,WAAW,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAAC;IAElF;;;;OAIG;IACH,YAAY,CAAC,aAAa,EAAE,WAAW,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAAC;IAExE;;;;OAIG;IACH,YAAY,CAAC,aAAa,EAAE,WAAW,GAAG,OAAO,CAAC,uBAAuB,CAAC,CAAC;IAE3E;;;OAGG;IACH,gBAAgB,IAAI,OAAO,CAAC,uBAAuB,CAAC,CAAC;IAErD,yBAAyB;IACzB,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IAEvB,sBAAsB;IACtB,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;CACxB"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aztec/world-state",
-  "version": "0.0.0-test.0",
+  "version": "0.0.1-commit.023c3e5",
   "type": "module",
   "exports": {
     ".": "./dest/index.js",
@@ -18,11 +18,9 @@
     "tsconfig": "./tsconfig.json"
   },
   "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",
-    "formatting": "run -T prettier --check ./src && run -T eslint ./src",
-    "formatting:fix": "run -T eslint --fix ./src && run -T prettier -w ./src",
     "test": "NODE_NO_WARNINGS=1 node --experimental-vm-modules ../node_modules/.bin/jest --passWithNoTests --maxWorkers=${JEST_MAX_WORKERS:-8}"
   },
   "inherits": [
@@ -59,32 +57,34 @@
     "testTimeout": 120000,
     "setupFiles": [
       "../../foundation/src/jest/setup.mjs"
+    ],
+    "testEnvironment": "../../foundation/src/jest/env.mjs",
+    "setupFilesAfterEnv": [
+      "../../foundation/src/jest/setupAfterEnv.mjs"
     ]
   },
   "dependencies": {
-    "@aztec/constants": "0.0.0-test.0",
-    "@aztec/foundation": "0.0.0-test.0",
-    "@aztec/kv-store": "0.0.0-test.0",
-    "@aztec/merkle-tree": "0.0.0-test.0",
-    "@aztec/native": "0.0.0-test.0",
-    "@aztec/protocol-contracts": "0.0.0-test.0",
-    "@aztec/stdlib": "0.0.0-test.0",
-    "@aztec/telemetry-client": "0.0.0-test.0",
+    "@aztec/constants": "0.0.1-commit.023c3e5",
+    "@aztec/foundation": "0.0.1-commit.023c3e5",
+    "@aztec/kv-store": "0.0.1-commit.023c3e5",
+    "@aztec/merkle-tree": "0.0.1-commit.023c3e5",
+    "@aztec/native": "0.0.1-commit.023c3e5",
+    "@aztec/protocol-contracts": "0.0.1-commit.023c3e5",
+    "@aztec/stdlib": "0.0.1-commit.023c3e5",
+    "@aztec/telemetry-client": "0.0.1-commit.023c3e5",
     "tslib": "^2.4.0",
     "zod": "^3.23.8"
   },
   "devDependencies": {
-    "@aztec/archiver": "0.0.0-test.0",
-    "@jest/globals": "^29.5.0",
-    "@types/jest": "^29.5.0",
-    "@types/levelup": "^5.1.2",
-    "@types/memdown": "^3.0.0",
-    "@types/node": "^18.7.23",
-    "jest": "^29.5.0",
-    "jest-mock-extended": "^3.0.5",
-    "memdown": "^6.1.1",
+    "@aztec/archiver": "0.0.1-commit.023c3e5",
+    "@jest/globals": "^30.0.0",
+    "@types/jest": "^30.0.0",
+    "@types/node": "^22.15.17",
+    "@typescript/native-preview": "7.0.0-dev.20260113.1",
+    "jest": "^30.0.0",
+    "jest-mock-extended": "^4.0.0",
     "ts-node": "^10.9.1",
-    "typescript": "^5.0.4"
+    "typescript": "^5.3.3"
   },
   "files": [
     "dest",
@@ -93,6 +93,6 @@
   ],
   "types": "./dest/index.d.ts",
   "engines": {
-    "node": ">=18"
+    "node": ">=20.10"
   }
 }

package/src/instrumentation/instrumentation.ts

@@ -1,4 +1,4 @@
-import { createLogger } from '@aztec/foundation/log';
+import { type Logger, createLogger } from '@aztec/foundation/log';
 import { MerkleTreeId } from '@aztec/stdlib/trees';
 import {
   Attributes,
@@ -7,7 +7,7 @@ import {
   Metrics,
   type TelemetryClient,
   type UpDownCounter,
-  ValueType,
+  createUpDownCounterWithDefault,
 } from '@aztec/telemetry-client';
 
 import {
@@ -31,61 +31,46 @@ const durationTrackDenylist = new Set<WorldStateMessageType>([
 
 export class WorldStateInstrumentation {
   private dbMapSize: Gauge;
+  private dbPhysicalSize: Gauge;
   private treeSize: Gauge;
-  private unfinalisedHeight: Gauge;
-  private finalisedHeight: Gauge;
+  private unfinalizedHeight: Gauge;
+  private finalizedHeight: Gauge;
   private oldestBlock: Gauge;
   private dbNumItems: Gauge;
   private dbUsedSize: Gauge;
   private requestHistogram: Histogram;
   private criticalErrors: UpDownCounter;
 
-  constructor(public readonly telemetry: TelemetryClient, private log = createLogger('world-state:instrumentation')) {
+  constructor(
+    public readonly telemetry: TelemetryClient,
+    private log: Logger = createLogger('world-state:instrumentation'),
+  ) {
     const meter = telemetry.getMeter('World State');
-    this.dbMapSize = meter.createGauge(Metrics.WORLD_STATE_DB_MAP_SIZE, {
-      description: `The current configured map size for each merkle tree`,
-      valueType: ValueType.INT,
-    });
+    this.dbMapSize = meter.createGauge(Metrics.WORLD_STATE_DB_MAP_SIZE);
 
-    this.treeSize = meter.createGauge(Metrics.WORLD_STATE_TREE_SIZE, {
-      description: `The current number of leaves in each merkle tree`,
-      valueType: ValueType.INT,
-    });
+    this.dbPhysicalSize = meter.createGauge(Metrics.WORLD_STATE_DB_PHYSICAL_SIZE);
 
-    this.unfinalisedHeight = meter.createGauge(Metrics.WORLD_STATE_UNFINALISED_HEIGHT, {
-      description: `The unfinalised block height of each merkle tree`,
-      valueType: ValueType.INT,
-    });
+    this.treeSize = meter.createGauge(Metrics.WORLD_STATE_TREE_SIZE);
 
-    this.finalisedHeight = meter.createGauge(Metrics.WORLD_STATE_FINALISED_HEIGHT, {
-      description: `The finalised block height of each merkle tree`,
-      valueType: ValueType.INT,
-    });
+    this.unfinalizedHeight = meter.createGauge(Metrics.WORLD_STATE_UNFINALIZED_HEIGHT);
 
-    this.oldestBlock = meter.createGauge(Metrics.WORLD_STATE_OLDEST_BLOCK, {
-      description: `The oldest historical block of each merkle tree`,
-      valueType: ValueType.INT,
-    });
+    this.finalizedHeight = meter.createGauge(Metrics.WORLD_STATE_FINALIZED_HEIGHT);
 
-    this.dbUsedSize = meter.createGauge(Metrics.WORLD_STATE_DB_USED_SIZE, {
-      description: `The current used database size for each db of each merkle tree`,
-      valueType: ValueType.INT,
-    });
+    this.oldestBlock = meter.createGauge(Metrics.WORLD_STATE_OLDEST_BLOCK);
 
-    this.dbNumItems = meter.createGauge(Metrics.WORLD_STATE_DB_NUM_ITEMS, {
-      description: `The current number of items in each database of each merkle tree`,
-      valueType: ValueType.INT,
-    });
+    this.dbUsedSize = meter.createGauge(Metrics.WORLD_STATE_DB_USED_SIZE);
 
-    this.requestHistogram = meter.createHistogram(Metrics.WORLD_STATE_REQUEST_TIME, {
-      description: 'The round trip time of world state requests',
-      unit: 'us',
-      valueType: ValueType.INT,
-    });
+    this.dbNumItems = meter.createGauge(Metrics.WORLD_STATE_DB_NUM_ITEMS);
 
-    this.criticalErrors = meter.createUpDownCounter(Metrics.WORLD_STATE_CRITICAL_ERROR_COUNT, {
-      description: 'The number of critical errors in the world state',
-      valueType: ValueType.INT,
+    this.requestHistogram = meter.createHistogram(Metrics.WORLD_STATE_REQUEST_TIME);
+
+    this.criticalErrors = createUpDownCounterWithDefault(meter, Metrics.WORLD_STATE_CRITICAL_ERROR_COUNT, {
+      [Attributes.ERROR_TYPE]: [
+        'synch_pending_block',
+        'finalize_block',
+        'prune_pending_block',
+        'prune_historical_block',
+      ],
     });
   }
 
@@ -93,13 +78,16 @@ export class WorldStateInstrumentation {
     this.dbMapSize.record(Number(treeDbStats.mapSize), {
       [Attributes.MERKLE_TREE_NAME]: MerkleTreeId[tree],
     });
+    this.dbPhysicalSize.record(Number(treeDbStats.physicalFileSize), {
+      [Attributes.MERKLE_TREE_NAME]: MerkleTreeId[tree],
+    });
     this.treeSize.record(Number(treeMeta.size), {
       [Attributes.MERKLE_TREE_NAME]: MerkleTreeId[tree],
     });
-    this.unfinalisedHeight.record(Number(treeMeta.unfinalisedBlockHeight), {
+    this.unfinalizedHeight.record(Number(treeMeta.unfinalizedBlockHeight), {
       [Attributes.MERKLE_TREE_NAME]: MerkleTreeId[tree],
     });
-    this.finalisedHeight.record(Number(treeMeta.finalisedBlockHeight), {
+    this.finalizedHeight.record(Number(treeMeta.finalizedBlockHeight), {
       [Attributes.MERKLE_TREE_NAME]: MerkleTreeId[tree],
     });
     this.oldestBlock.record(Number(treeMeta.oldestHistoricBlock), {

package/src/native/bench_metrics.ts

@@ -0,0 +1,91 @@
+import { MerkleTreeId } from '@aztec/stdlib/trees';
+
+type BlockSyncMetrics = {
+  numTxs: number;
+  numLeaves: number;
+  value: number;
+};
+
+export enum InsertionType {
+  BATCH,
+  SEQUENTIAL,
+}
+
+type InsertionMetrics = {
+  treeType: MerkleTreeId;
+  insertionType: InsertionType;
+  numLeaves: number;
+  value: number;
+};
+
+export enum DataRetrievalType {
+  SIBLING_PATH,
+  LEAF_PREIMAGE,
+  LEAF_VALUE,
+  LEAF_INDICES,
+  LOW_LEAF,
+}
+
+type DataRetrievalMetrics = {
+  retrievalType: DataRetrievalType;
+  value: number;
+};
+
+export class NativeBenchMetics {
+  private blockSyncMetrics: BlockSyncMetrics[] = [];
+  private insertionMetrics: InsertionMetrics[] = [];
+  private dataRetrievalMetrics: DataRetrievalMetrics[] = [];
+
+  public toPrettyString() {
+    let pretty = '';
+    pretty += `Block sync metrics:\n`;
+    for (const metric of this.blockSyncMetrics) {
+      pretty += `  ${metric.numTxs} txs, ${metric.numLeaves} leaves: ${metric.value} ms\n`;
+    }
+    pretty += `Insertion metrics:\n`;
+    for (const metric of this.insertionMetrics) {
+      pretty += `  ${MerkleTreeId[metric.treeType]}: ${InsertionType[metric.insertionType]} (${metric.numLeaves} leaves): ${metric.value} ms\n`;
+    }
+    pretty += `Data retrieval metrics:\n`;
+    for (const metric of this.dataRetrievalMetrics) {
+      pretty += `  ${DataRetrievalType[metric.retrievalType]}: ${metric.value} us\n`;
+    }
+    return pretty;
+  }
+
+  public addBlockSyncMetric(numTxs: number, numLeaves: number, value: number) {
+    this.blockSyncMetrics.push({ numTxs, numLeaves, value });
+  }
+  public addInsertionMetric(treeId: MerkleTreeId, insertionType: InsertionType, numLeaves: number, value: number) {
+    this.insertionMetrics.push({ treeType: treeId, insertionType, numLeaves, value });
+  }
+  public addDataRetrievalMetric(retrievalType: DataRetrievalType, value: number) {
+    this.dataRetrievalMetrics.push({ retrievalType, value: value });
+  }
+
+  public toGithubActionBenchmarkJSON(indent = 2) {
+    const data = [];
+    for (const blockSync of this.blockSyncMetrics) {
+      data.push({
+        name: `Block Sync/${blockSync.numTxs} txs/${blockSync.numLeaves} leaves per tx`,
+        value: blockSync.value,
+        unit: 'ms',
+      });
+    }
+    for (const insertion of this.insertionMetrics) {
+      data.push({
+        name: `Tree Insertion/${MerkleTreeId[insertion.treeType]}/${InsertionType[insertion.insertionType]}/${insertion.numLeaves} leaves`,
+        value: insertion.value,
+        unit: 'ms',
+      });
+    }
+    for (const retrieval of this.dataRetrievalMetrics) {
+      data.push({
+        name: `Data Retrieval/${DataRetrievalType[retrieval.retrievalType]}`,
+        value: retrieval.value,
+        unit: 'us',
+      });
+    }
+    return JSON.stringify(data, null, indent);
+  }
+}