@aztec/world-state 0.0.0-test.0 → 0.0.1-commit.03f7ef2

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,6 +1,7 @@
-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 { L2BlockNew } from '@aztec/stdlib/block';
 import type { ForkMerkleTreeOperations, MerkleTreeReadOperations } from '@aztec/stdlib/interfaces/server';
 import type { MerkleTreeId } from '@aztec/stdlib/trees';
 import type { WorldStateStatusFull, WorldStateStatusSummary } from '../native/message.js';
@@ -34,7 +35,7 @@ export interface MerkleTreeAdminDatabase extends ForkMerkleTreeOperations {
      * @param block - The L2 block to handle.
      * @param l1ToL2Messages - The L1 to L2 messages for the block.
      */
-    handleL2BlockAndMessages(block: L2Block, l1ToL2Messages: Fr[]): Promise<WorldStateStatusFull>;
+    handleL2BlockAndMessages(block: L2BlockNew, l1ToL2Messages: Fr[]): Promise<WorldStateStatusFull>;
     /**
      * Gets a handle that allows reading the latest committed state
      */
@@ -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,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibWVya2xlX3RyZWVfZGIuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy93b3JsZC1zdGF0ZS1kYi9tZXJrbGVfdHJlZV9kYi50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFDQSxPQUFPLEtBQUssRUFBRSxXQUFXLEVBQUUsTUFBTSxpQ0FBaUMsQ0FBQztBQUNuRSxPQUFPLEtBQUssRUFBRSxFQUFFLEVBQUUsTUFBTSxnQ0FBZ0MsQ0FBQztBQUN6RCxPQUFPLEtBQUssRUFBRSxtQkFBbUIsRUFBRSxZQUFZLEVBQUUsTUFBTSxvQkFBb0IsQ0FBQztBQUM1RSxPQUFPLEtBQUssRUFBRSxVQUFVLEVBQUUsTUFBTSxxQkFBcUIsQ0FBQztBQUN0RCxPQUFPLEtBQUssRUFBRSx3QkFBd0IsRUFBRSx3QkFBd0IsRUFBRSxNQUFNLGlDQUFpQyxDQUFDO0FBQzFHLE9BQU8sS0FBSyxFQUFFLFlBQVksRUFBRSxNQUFNLHFCQUFxQixDQUFDO0FBRXhELE9BQU8sS0FBSyxFQUFFLG9CQUFvQixFQUFFLHVCQUF1QixFQUFFLE1BQU0sc0JBQXNCLENBQUM7QUFFMUY7Ozs7Ozs7Ozs7Ozs7O0dBY0c7QUFDSCxlQUFPLE1BQU0sMkJBQTJCLFFBQTRCLENBQUM7QUFFckUsZUFBTyxNQUFNLDZCQUE2QixRQUFtRCxDQUFDO0FBRTlGLE1BQU0sTUFBTSxhQUFhLEdBQUc7SUFDMUIsQ0FBQyxZQUFZLENBQUMsY0FBYyxDQUFDLEVBQUUsbUJBQW1CLENBQUM7SUFDbkQsQ0FBQyxZQUFZLENBQUMsY0FBYyxDQUFDLEVBQUUsWUFBWSxDQUFDLEVBQUUsQ0FBQyxDQUFDO0lBQ2hELENBQUMsWUFBWSxDQUFDLGdCQUFnQixDQUFDLEVBQUUsbUJBQW1CLENBQUM7SUFDckQsQ0FBQyxZQUFZLENBQUMscUJBQXFCLENBQUMsRUFBRSxZQUFZLENBQUMsRUFBRSxDQUFDLENBQUM7SUFDdkQsQ0FBQyxZQUFZLENBQUMsT0FBTyxDQUFDLEVBQUUsWUFBWSxDQUFDLEVBQUUsQ0FBQyxDQUFDO0NBQzFDLENBQUM7QUFFRixNQUFNLFdBQVcsdUJBQXdCLFNBQVEsd0JBQXdCO0lBQ3ZFOzs7O09BSUc7SUFDSCx3QkFBd0IsQ0FBQyxLQUFLLEVBQUUsVUFBVSxFQUFFLGNBQWMsRUFBRSxFQUFFLEVBQUUsR0FBRyxPQUFPLENBQUMsb0JBQW9CLENBQUMsQ0FBQztJQUVqRzs7T0FFRztJQUNILFlBQVksSUFBSSx3QkFBd0IsQ0FBQztJQUV6Qzs7OztPQUlHO0lBQ0gsc0JBQXNCLENBQUMsYUFBYSxFQUFFLFdBQVcsR0FBRyxPQUFPLENBQUMsb0JBQW9CLENBQUMsQ0FBQztJQUVsRjs7OztPQUlHO0lBQ0gsWUFBWSxDQUFDLGFBQWEsRUFBRSxXQUFXLEdBQUcsT0FBTyxDQUFDLG9CQUFvQixDQUFDLENBQUM7SUFFeEU7Ozs7T0FJRztJQUNILFlBQVksQ0FBQyxhQUFhLEVBQUUsV0FBVyxHQUFHLE9BQU8sQ0FBQyx1QkFBdUIsQ0FBQyxDQUFDO0lBRTNFOzs7T0FHRztJQUNILGdCQUFnQixJQUFJLE9BQU8sQ0FBQyx1QkFBdUIsQ0FBQyxDQUFDO0lBRXJELHlCQUF5QjtJQUN6QixLQUFLLElBQUksT0FBTyxDQUFDLElBQUksQ0FBQyxDQUFDO0lBRXZCLHNCQUFzQjtJQUN0QixLQUFLLElBQUksT0FBTyxDQUFDLElBQUksQ0FBQyxDQUFDO0NBQ3hCIn0=

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,UAAU,EAAE,MAAM,qBAAqB,CAAC;AACtD,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,UAAU,EAAE,cAAc,EAAE,EAAE,EAAE,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAAC;IAEjG;;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.03f7ef2",
   "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.03f7ef2",
+    "@aztec/foundation": "0.0.1-commit.03f7ef2",
+    "@aztec/kv-store": "0.0.1-commit.03f7ef2",
+    "@aztec/merkle-tree": "0.0.1-commit.03f7ef2",
+    "@aztec/native": "0.0.1-commit.03f7ef2",
+    "@aztec/protocol-contracts": "0.0.1-commit.03f7ef2",
+    "@aztec/stdlib": "0.0.1-commit.03f7ef2",
+    "@aztec/telemetry-client": "0.0.1-commit.03f7ef2",
     "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.03f7ef2",
+    "@jest/globals": "^30.0.0",
+    "@types/jest": "^30.0.0",
+    "@types/node": "^22.15.17",
+    "@typescript/native-preview": "7.0.0-dev.20251126.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,
@@ -31,34 +31,43 @@ 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.dbPhysicalSize = meter.createGauge(Metrics.WORLD_STATE_DB_PHYSICAL_SIZE, {
+      description: `The current physical disk space used for each database`,
+      valueType: ValueType.INT,
+    });
+
     this.treeSize = meter.createGauge(Metrics.WORLD_STATE_TREE_SIZE, {
       description: `The current number of leaves in each merkle tree`,
       valueType: ValueType.INT,
     });
 
-    this.unfinalisedHeight = meter.createGauge(Metrics.WORLD_STATE_UNFINALISED_HEIGHT, {
-      description: `The unfinalised block height of each merkle tree`,
+    this.unfinalizedHeight = meter.createGauge(Metrics.WORLD_STATE_UNFINALIZED_HEIGHT, {
+      description: `The unfinalized block height of each merkle tree`,
       valueType: ValueType.INT,
     });
 
-    this.finalisedHeight = meter.createGauge(Metrics.WORLD_STATE_FINALISED_HEIGHT, {
-      description: `The finalised block height of each merkle tree`,
+    this.finalizedHeight = meter.createGauge(Metrics.WORLD_STATE_FINALIZED_HEIGHT, {
+      description: `The finalized block height of each merkle tree`,
       valueType: ValueType.INT,
     });
 
@@ -93,13 +102,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);
+  }
+}

package/src/native/merkle_trees_facade.ts

@@ -1,5 +1,8 @@
-import { Fr } from '@aztec/foundation/fields';
+import { BlockNumber } from '@aztec/foundation/branded-types';
+import { Fr } from '@aztec/foundation/curves/bn254';
+import { createLogger } from '@aztec/foundation/log';
 import { serializeToBuffer } from '@aztec/foundation/serialize';
+import { sleep } from '@aztec/foundation/sleep';
 import { type IndexedTreeLeafPreimage, SiblingPath } from '@aztec/foundation/trees';
 import type {
   BatchInsertionResult,
@@ -18,6 +21,7 @@ import {
   PublicDataTreeLeafPreimage,
 } from '@aztec/stdlib/trees';
 import { type BlockHeader, PartialStateReference, StateReference } from '@aztec/stdlib/tx';
+import { type WorldStateRevision, WorldStateRevisionWithHandle } from '@aztec/stdlib/world-state';
 
 import assert from 'assert';
 
@@ -25,7 +29,6 @@ import {
   type SerializedIndexedLeaf,
   type SerializedLeafValue,
   WorldStateMessageType,
-  type WorldStateRevision,
   blockStateReference,
   treeStateReferenceToSnapshot,
 } from './message.js';
@@ -42,10 +45,32 @@ export class MerkleTreesFacade implements MerkleTreeReadOperations {
     return this.initialHeader;
   }
 
+  getRevision(): WorldStateRevisionWithHandle {
+    return WorldStateRevisionWithHandle.fromWorldStateRevision(this.revision, this.instance.getHandle());
+  }
+
   findLeafIndices(treeId: MerkleTreeId, values: MerkleTreeLeafType<MerkleTreeId>[]): Promise<(bigint | undefined)[]> {
     return this.findLeafIndicesAfter(treeId, values, 0n);
   }
 
+  async findSiblingPaths<N extends number>(
+    treeId: MerkleTreeId,
+    values: MerkleTreeLeafType<MerkleTreeId>[],
+  ): Promise<({ path: SiblingPath<N>; index: bigint } | undefined)[]> {
+    const response = await this.instance.call(WorldStateMessageType.FIND_SIBLING_PATHS, {
+      leaves: values.map(leaf => serializeLeaf(hydrateLeaf(treeId, leaf))),
+      revision: this.revision,
+      treeId,
+    });
+
+    return response.paths.map(path => {
+      if (!path) {
+        return undefined;
+      }
+      return { path: new SiblingPath<N>(path.path.length as N, path.path), index: BigInt(path.index) };
+    });
+  }
+
   async findLeafIndicesAfter(
     treeId: MerkleTreeId,
     leaves: MerkleTreeLeafType<MerkleTreeId>[],
@@ -169,19 +194,26 @@ export class MerkleTreesFacade implements MerkleTreeReadOperations {
   async getBlockNumbersForLeafIndices<ID extends MerkleTreeId>(
     treeId: ID,
     leafIndices: bigint[],
-  ): Promise<(bigint | undefined)[]> {
+  ): Promise<(BlockNumber | undefined)[]> {
     const response = await this.instance.call(WorldStateMessageType.GET_BLOCK_NUMBERS_FOR_LEAF_INDICES, {
       treeId,
       revision: this.revision,
       leafIndices,
     });
 
-    return response.blockNumbers.map(x => (x === undefined || x === null ? undefined : BigInt(x)));
+    return response.blockNumbers.map(x => (x === undefined || x === null ? undefined : BlockNumber(Number(x))));
   }
 }
 
 export class MerkleTreesForkFacade extends MerkleTreesFacade implements MerkleTreeWriteOperations {
-  constructor(instance: NativeWorldStateInstance, initialHeader: BlockHeader, revision: WorldStateRevision) {
+  private log = createLogger('world-state:merkle-trees-fork-facade');
+
+  constructor(
+    instance: NativeWorldStateInstance,
+    initialHeader: BlockHeader,
+    revision: WorldStateRevision,
+    private opts: { closeDelayMs?: number },
+  ) {
     assert.notEqual(revision.forkId, 0, 'Fork ID must be set');
     assert.equal(revision.includeUncommitted, true, 'Fork must include uncommitted data');
     super(instance, initialHeader, revision);
@@ -263,6 +295,21 @@ export class MerkleTreesForkFacade extends MerkleTreesFacade implements MerkleTr
     await this.instance.call(WorldStateMessageType.DELETE_FORK, { forkId: this.revision.forkId });
   }
 
+  async [Symbol.dispose](): Promise<void> {
+    if (this.opts.closeDelayMs) {
+      void sleep(this.opts.closeDelayMs)
+        .then(() => this.close())
+        .catch(err => {
+          if (err && 'message' in err && err.message === 'Native instance is closed') {
+            return; // Ignore errors due to native instance being closed
+          }
+          this.log.warn('Error closing MerkleTreesForkFacade after delay', { err });
+        });
+    } else {
+      await this.close();
+    }
+  }
+
   public async createCheckpoint(): Promise<void> {
     assert.notEqual(this.revision.forkId, 0, 'Fork ID must be set');
     await this.instance.call(WorldStateMessageType.CREATE_CHECKPOINT, { forkId: this.revision.forkId });
@@ -277,6 +324,16 @@ export class MerkleTreesForkFacade extends MerkleTreesFacade implements MerkleTr
     assert.notEqual(this.revision.forkId, 0, 'Fork ID must be set');
     await this.instance.call(WorldStateMessageType.REVERT_CHECKPOINT, { forkId: this.revision.forkId });
   }
+
+  public async commitAllCheckpoints(): Promise<void> {
+    assert.notEqual(this.revision.forkId, 0, 'Fork ID must be set');
+    await this.instance.call(WorldStateMessageType.COMMIT_ALL_CHECKPOINTS, { forkId: this.revision.forkId });
+  }
+
+  public async revertAllCheckpoints(): Promise<void> {
+    assert.notEqual(this.revision.forkId, 0, 'Fork ID must be set');
+    await this.instance.call(WorldStateMessageType.REVERT_ALL_CHECKPOINTS, { forkId: this.revision.forkId });
+  }
 }
 
 function hydrateLeaf<ID extends MerkleTreeId>(treeId: ID, leaf: Fr | Buffer) {
@@ -295,7 +352,7 @@ export function serializeLeaf(leaf: Fr | NullifierLeaf | PublicDataTreeLeaf): Se
   if (leaf instanceof Fr) {
     return leaf.toBuffer();
   } else if (leaf instanceof NullifierLeaf) {
-    return { value: leaf.nullifier.toBuffer() };
+    return { nullifier: leaf.nullifier.toBuffer() };
   } else {
     return { value: leaf.value.toBuffer(), slot: leaf.slot.toBuffer() };
   }
@@ -307,23 +364,22 @@ function deserializeLeafValue(leaf: SerializedLeafValue): Fr | NullifierLeaf | P
   } else if ('slot' in leaf) {
     return new PublicDataTreeLeaf(Fr.fromBuffer(leaf.slot), Fr.fromBuffer(leaf.value));
   } else {
-    return new NullifierLeaf(Fr.fromBuffer(leaf.value));
+    return new NullifierLeaf(Fr.fromBuffer(leaf.nullifier));
   }
 }
 
-function deserializeIndexedLeaf(leaf: SerializedIndexedLeaf): IndexedTreeLeafPreimage {
-  if ('slot' in leaf.value) {
+function deserializeIndexedLeaf(leafPreimage: SerializedIndexedLeaf): IndexedTreeLeafPreimage {
+  if ('slot' in leafPreimage.leaf) {
     return new PublicDataTreeLeafPreimage(
-      Fr.fromBuffer(leaf.value.slot),
-      Fr.fromBuffer(leaf.value.value),
-      Fr.fromBuffer(leaf.nextValue),
-      BigInt(leaf.nextIndex),
+      new PublicDataTreeLeaf(Fr.fromBuffer(leafPreimage.leaf.slot), Fr.fromBuffer(leafPreimage.leaf.value)),
+      Fr.fromBuffer(leafPreimage.nextKey),
+      BigInt(leafPreimage.nextIndex),
     );
-  } else if ('value' in leaf.value) {
+  } else if ('nullifier' in leafPreimage.leaf) {
     return new NullifierLeafPreimage(
-      Fr.fromBuffer(leaf.value.value),
-      Fr.fromBuffer(leaf.nextValue),
-      BigInt(leaf.nextIndex),
+      new NullifierLeaf(Fr.fromBuffer(leafPreimage.leaf.nullifier)),
+      Fr.fromBuffer(leafPreimage.nextKey),
+      BigInt(leafPreimage.nextIndex),
     );
   } else {
     throw new Error('Invalid leaf type');