@aztec/world-state 0.87.2 → 0.87.3-nightly.20250528

package/dest/native/bench_metrics.d.ts

@@ -0,0 +1,23 @@
+import { MerkleTreeId } from '@aztec/stdlib/trees';
+export declare enum InsertionType {
+    BATCH = 0,
+    SEQUENTIAL = 1
+}
+export declare enum DataRetrievalType {
+    SIBLING_PATH = 0,
+    LEAF_PREIMAGE = 1,
+    LEAF_VALUE = 2,
+    LEAF_INDICES = 3,
+    LOW_LEAF = 4
+}
+export declare class NativeBenchMetics {
+    private blockSyncMetrics;
+    private insertionMetrics;
+    private dataRetrievalMetrics;
+    toPrettyString(): string;
+    addBlockSyncMetric(numTxs: number, numLeaves: number, value: number): void;
+    addInsertionMetric(treeId: MerkleTreeId, insertionType: InsertionType, numLeaves: number, value: number): void;
+    addDataRetrievalMetric(retrievalType: DataRetrievalType, value: number): void;
+    toGithubActionBenchmarkJSON(indent?: number): string;
+}
+//# sourceMappingURL=bench_metrics.d.ts.map

package/dest/native/bench_metrics.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"bench_metrics.d.ts","sourceRoot":"","sources":["../../src/native/bench_metrics.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AAQnD,oBAAY,aAAa;IACvB,KAAK,IAAA;IACL,UAAU,IAAA;CACX;AASD,oBAAY,iBAAiB;IAC3B,YAAY,IAAA;IACZ,aAAa,IAAA;IACb,UAAU,IAAA;IACV,YAAY,IAAA;IACZ,QAAQ,IAAA;CACT;AAOD,qBAAa,iBAAiB;IAC5B,OAAO,CAAC,gBAAgB,CAA0B;IAClD,OAAO,CAAC,gBAAgB,CAA0B;IAClD,OAAO,CAAC,oBAAoB,CAA8B;IAEnD,cAAc;IAiBd,kBAAkB,CAAC,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM;IAGnE,kBAAkB,CAAC,MAAM,EAAE,YAAY,EAAE,aAAa,EAAE,aAAa,EAAE,SAAS,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM;IAGvG,sBAAsB,CAAC,aAAa,EAAE,iBAAiB,EAAE,KAAK,EAAE,MAAM;IAItE,2BAA2B,CAAC,MAAM,SAAI;CAyB9C"}

package/dest/native/bench_metrics.js

@@ -0,0 +1,81 @@
+import { MerkleTreeId } from '@aztec/stdlib/trees';
+export var InsertionType = /*#__PURE__*/ function(InsertionType) {
+    InsertionType[InsertionType["BATCH"] = 0] = "BATCH";
+    InsertionType[InsertionType["SEQUENTIAL"] = 1] = "SEQUENTIAL";
+    return InsertionType;
+}({});
+export var DataRetrievalType = /*#__PURE__*/ function(DataRetrievalType) {
+    DataRetrievalType[DataRetrievalType["SIBLING_PATH"] = 0] = "SIBLING_PATH";
+    DataRetrievalType[DataRetrievalType["LEAF_PREIMAGE"] = 1] = "LEAF_PREIMAGE";
+    DataRetrievalType[DataRetrievalType["LEAF_VALUE"] = 2] = "LEAF_VALUE";
+    DataRetrievalType[DataRetrievalType["LEAF_INDICES"] = 3] = "LEAF_INDICES";
+    DataRetrievalType[DataRetrievalType["LOW_LEAF"] = 4] = "LOW_LEAF";
+    return DataRetrievalType;
+}({});
+export class NativeBenchMetics {
+    blockSyncMetrics = [];
+    insertionMetrics = [];
+    dataRetrievalMetrics = [];
+    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;
+    }
+    addBlockSyncMetric(numTxs, numLeaves, value) {
+        this.blockSyncMetrics.push({
+            numTxs,
+            numLeaves,
+            value
+        });
+    }
+    addInsertionMetric(treeId, insertionType, numLeaves, value) {
+        this.insertionMetrics.push({
+            treeType: treeId,
+            insertionType,
+            numLeaves,
+            value
+        });
+    }
+    addDataRetrievalMetric(retrievalType, value) {
+        this.dataRetrievalMetrics.push({
+            retrievalType,
+            value: value
+        });
+    }
+    toGithubActionBenchmarkJSON(indent = 2) {
+        const data = [];
+        for (const blockSync of this.blockSyncMetrics){
+            data.push({
+                name: `blockSync/${blockSync.numTxs}/${blockSync.numLeaves}`,
+                value: blockSync.value,
+                unit: 'ms'
+            });
+        }
+        for (const insertion of this.insertionMetrics){
+            data.push({
+                name: `${MerkleTreeId[insertion.treeType]}/${InsertionType[insertion.insertionType]}/${insertion.numLeaves}`,
+                value: insertion.value,
+                unit: 'ms'
+            });
+        }
+        for (const retrieval of this.dataRetrievalMetrics){
+            data.push({
+                name: `dataRetrieval/${DataRetrievalType[retrieval.retrievalType]}`,
+                value: retrieval.value,
+                unit: 'us'
+            });
+        }
+        return JSON.stringify(data, null, indent);
+    }
+}

package/dest/test/utils.d.ts

@@ -2,7 +2,7 @@ import { Fr } from '@aztec/foundation/fields';
 import { L2Block } from '@aztec/stdlib/block';
 import type { MerkleTreeReadOperations, MerkleTreeWriteOperations } from '@aztec/stdlib/interfaces/server';
 import type { NativeWorldStateService } from '../native/native_world_state.js';
-export declare function mockBlock(blockNum: number, size: number, fork: MerkleTreeWriteOperations): Promise<{
+export declare function mockBlock(blockNum: number, size: number, fork: MerkleTreeWriteOperations, maxEffects?: number | undefined): Promise<{
     block: L2Block;
     messages: Fr[];
 }>;

package/dest/test/utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/test/utils.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAC9C,OAAO,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAC9C,OAAO,KAAK,EAAE,wBAAwB,EAAE,yBAAyB,EAAE,MAAM,iCAAiC,CAAC;AAG3G,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,iCAAiC,CAAC;AAE/E,wBAAsB,SAAS,CAAC,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,yBAAyB;;;GA+C9F;AAED,wBAAsB,cAAc,CAAC,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,yBAAyB;;;GAiDrF;AAED,wBAAsB,UAAU,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,UAAU,EAAE,uBAAuB;;;GAchH;AAED,wBAAsB,eAAe,CAAC,KAAK,EAAE,wBAAwB,EAAE,KAAK,EAAE,wBAAwB,iBAQrG;AAED,wBAAsB,aAAa,CAAC,IAAI,EAAE,wBAAwB,EAAE,KAAK,EAAE,wBAAwB,iBAYlG"}
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/test/utils.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAC9C,OAAO,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAC9C,OAAO,KAAK,EAEV,wBAAwB,EACxB,yBAAyB,EAC1B,MAAM,iCAAiC,CAAC;AAGzC,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,iCAAiC,CAAC;AAE/E,wBAAsB,SAAS,CAC7B,QAAQ,EAAE,MAAM,EAChB,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,yBAAyB,EAC/B,UAAU,GAAE,MAAM,GAAG,SAAqB;;;GAsD3C;AAED,wBAAsB,cAAc,CAAC,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,yBAAyB;;;GAiDrF;AAED,wBAAsB,UAAU,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,UAAU,EAAE,uBAAuB;;;GAchH;AAED,wBAAsB,eAAe,CAAC,KAAK,EAAE,wBAAwB,EAAE,KAAK,EAAE,wBAAwB,iBAQrG;AAED,wBAAsB,aAAa,CAAC,IAAI,EAAE,wBAAwB,EAAE,KAAK,EAAE,wBAAwB,iBAYlG"}

package/dest/test/utils.js

@@ -3,24 +3,27 @@ import { padArrayEnd } from '@aztec/foundation/collection';
 import { Fr } from '@aztec/foundation/fields';
 import { L2Block } from '@aztec/stdlib/block';
 import { AppendOnlyTreeSnapshot, MerkleTreeId } from '@aztec/stdlib/trees';
-export async function mockBlock(blockNum, size, fork) {
-    const l2Block = await L2Block.random(blockNum, size);
+export async function mockBlock(blockNum, size, fork, maxEffects = undefined) {
+    const l2Block = await L2Block.random(blockNum, size, maxEffects);
     const l1ToL2Messages = Array(16).fill(0).map(Fr.random);
-    // Sync the append only trees
     {
+        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, l2Block.body.txEffects.map((txEffect)=>txEffect.publicDataWrites.map((write)=>write.toBuffer())), 0, fork);
+        const nullifierInsert = insertData(MerkleTreeId.NULLIFIER_TREE, l2Block.body.txEffects.map((txEffect)=>padArrayEnd(txEffect.nullifiers, Fr.ZERO, MAX_NULLIFIERS_PER_TX).map((nullifier)=>nullifier.toBuffer())), NULLIFIER_SUBTREE_HEIGHT, fork);
         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 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;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aztec/world-state",
-  "version": "0.87.2",
+  "version": "0.87.3-nightly.20250528",
   "type": "module",
   "exports": {
     ".": "./dest/index.js",
@@ -60,19 +60,19 @@
     ]
   },
   "dependencies": {
-    "@aztec/constants": "0.87.2",
-    "@aztec/foundation": "0.87.2",
-    "@aztec/kv-store": "0.87.2",
-    "@aztec/merkle-tree": "0.87.2",
-    "@aztec/native": "0.87.2",
-    "@aztec/protocol-contracts": "0.87.2",
-    "@aztec/stdlib": "0.87.2",
-    "@aztec/telemetry-client": "0.87.2",
+    "@aztec/constants": "0.87.3-nightly.20250528",
+    "@aztec/foundation": "0.87.3-nightly.20250528",
+    "@aztec/kv-store": "0.87.3-nightly.20250528",
+    "@aztec/merkle-tree": "0.87.3-nightly.20250528",
+    "@aztec/native": "0.87.3-nightly.20250528",
+    "@aztec/protocol-contracts": "0.87.3-nightly.20250528",
+    "@aztec/stdlib": "0.87.3-nightly.20250528",
+    "@aztec/telemetry-client": "0.87.3-nightly.20250528",
     "tslib": "^2.4.0",
     "zod": "^3.23.8"
   },
   "devDependencies": {
-    "@aztec/archiver": "0.87.2",
+    "@aztec/archiver": "0.87.3-nightly.20250528",
     "@jest/globals": "^29.5.0",
     "@types/jest": "^29.5.0",
     "@types/node": "^22.15.17",

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: `blockSync/${blockSync.numTxs}/${blockSync.numLeaves}`,
+        value: blockSync.value,
+        unit: 'ms',
+      });
+    }
+    for (const insertion of this.insertionMetrics) {
+      data.push({
+        name: `${MerkleTreeId[insertion.treeType]}/${InsertionType[insertion.insertionType]}/${insertion.numLeaves}`,
+        value: insertion.value,
+        unit: 'ms',
+      });
+    }
+    for (const retrieval of this.dataRetrievalMetrics) {
+      data.push({
+        name: `dataRetrieval/${DataRetrievalType[retrieval.retrievalType]}`,
+        value: retrieval.value,
+        unit: 'us',
+      });
+    }
+    return JSON.stringify(data, null, indent);
+  }
+}

package/src/test/utils.ts

@@ -7,44 +7,59 @@ import {
 import { padArrayEnd } from '@aztec/foundation/collection';
 import { Fr } from '@aztec/foundation/fields';
 import { L2Block } from '@aztec/stdlib/block';
-import type { MerkleTreeReadOperations, MerkleTreeWriteOperations } from '@aztec/stdlib/interfaces/server';
+import type {
+  IndexedTreeId,
+  MerkleTreeReadOperations,
+  MerkleTreeWriteOperations,
+} from '@aztec/stdlib/interfaces/server';
 import { AppendOnlyTreeSnapshot, MerkleTreeId } from '@aztec/stdlib/trees';
 
 import type { NativeWorldStateService } from '../native/native_world_state.js';
 
-export async function mockBlock(blockNum: number, size: number, fork: MerkleTreeWriteOperations) {
-  const l2Block = await L2Block.random(blockNum, size);
+export async function mockBlock(
+  blockNum: number,
+  size: number,
+  fork: MerkleTreeWriteOperations,
+  maxEffects: number | undefined = undefined,
+) {
+  const l2Block = await L2Block.random(blockNum, size, maxEffects);
   const l1ToL2Messages = Array(16).fill(0).map(Fr.random);
 
-  // Sync the append only trees
   {
+    const insertData = async (
+      treeId: IndexedTreeId,
+      data: Buffer[][],
+      subTreeHeight: number,
+      fork: MerkleTreeWriteOperations,
+    ) => {
+      for (const dataBatch of data) {
+        await fork.batchInsert(treeId, dataBatch, subTreeHeight);
+      }
+    };
+
+    const publicDataInsert = insertData(
+      MerkleTreeId.PUBLIC_DATA_TREE,
+      l2Block.body.txEffects.map(txEffect => txEffect.publicDataWrites.map(write => write.toBuffer())),
+      0,
+      fork,
+    );
+    const nullifierInsert = insertData(
+      MerkleTreeId.NULLIFIER_TREE,
+      l2Block.body.txEffects.map(txEffect =>
+        padArrayEnd(txEffect.nullifiers, Fr.ZERO, MAX_NULLIFIERS_PER_TX).map(nullifier => nullifier.toBuffer()),
+      ),
+      NULLIFIER_SUBTREE_HEIGHT,
+      fork,
+    );
     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 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();