@aztec/world-state 0.67.1 → 0.68.0

package/src/{synchronizer → instrumentation}/instrumentation.ts

@@ -1,8 +1,21 @@
 import { MerkleTreeId } from '@aztec/circuit-types';
 import { createLogger } from '@aztec/foundation/log';
-import { Attributes, type Gauge, type TelemetryClient, ValueType } from '@aztec/telemetry-client';
-
-import { type DBStats, type TreeDBStats, type TreeMeta, type WorldStateStatusFull } from '../native/message.js';
+import {
+  Attributes,
+  type Gauge,
+  type Histogram,
+  Metrics,
+  type TelemetryClient,
+  ValueType,
+} from '@aztec/telemetry-client';
+
+import {
+  type DBStats,
+  type TreeDBStats,
+  type TreeMeta,
+  WorldStateMessageType,
+  type WorldStateStatusFull,
+} from '../native/message.js';
 
 type DBTypeString = 'leaf_preimage' | 'leaf_indices' | 'nodes' | 'blocks' | 'block_indices';
 
@@ -14,43 +27,50 @@ export class WorldStateInstrumentation {
   private oldestBlock: Gauge;
   private dbNumItems: Gauge;
   private dbUsedSize: Gauge;
+  private requestHistogram: Histogram;
 
-  constructor(telemetry: TelemetryClient, private log = createLogger('world-state:instrumentation')) {
+  constructor(public readonly telemetry: TelemetryClient, private log = createLogger('world-state:instrumentation')) {
     const meter = telemetry.getMeter('World State');
-    this.dbMapSize = meter.createGauge(`aztec.world_state.db_map_size`, {
+    this.dbMapSize = meter.createGauge(Metrics.WORLD_STATE_DB_MAP_SIZE, {
       description: `The current configured map size for each merkle tree`,
       valueType: ValueType.INT,
     });
 
-    this.treeSize = meter.createGauge(`aztec.world_state.tree_size`, {
+    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(`aztec.world_state.unfinalised_height`, {
+    this.unfinalisedHeight = meter.createGauge(Metrics.WORLD_STATE_UNFINALISED_HEIGHT, {
       description: `The unfinalised block height of each merkle tree`,
       valueType: ValueType.INT,
     });
 
-    this.finalisedHeight = meter.createGauge(`aztec.world_state.finalised_height`, {
+    this.finalisedHeight = meter.createGauge(Metrics.WORLD_STATE_FINALISED_HEIGHT, {
       description: `The finalised block height of each merkle tree`,
       valueType: ValueType.INT,
     });
 
-    this.oldestBlock = meter.createGauge(`aztec.world_state.oldest_block`, {
+    this.oldestBlock = meter.createGauge(Metrics.WORLD_STATE_OLDEST_BLOCK, {
       description: `The oldest historical block of each merkle tree`,
       valueType: ValueType.INT,
     });
 
-    this.dbUsedSize = meter.createGauge(`aztec.world_state.db_used_size`, {
+    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.dbNumItems = meter.createGauge(`aztec.world_state.db_num_items`, {
+    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.requestHistogram = meter.createHistogram(Metrics.WORLD_STATE_REQUEST_TIME, {
+      description: 'The round trip time of world state requests',
+      unit: 'us',
+      valueType: ValueType.INT,
+    });
   }
 
   private updateTreeStats(treeDbStats: TreeDBStats, treeMeta: TreeMeta, tree: MerkleTreeId) {
@@ -119,4 +139,10 @@ export class WorldStateInstrumentation {
       MerkleTreeId.PUBLIC_DATA_TREE,
     );
   }
+
+  public recordRoundTrip(timeUs: number, request: WorldStateMessageType) {
+    this.requestHistogram.record(Math.ceil(timeUs), {
+      [Attributes.WORLD_STATE_REQUEST_TYPE]: WorldStateMessageType[request],
+    });
+  }
 }

package/src/native/merkle_trees_facade.ts

@@ -45,27 +45,29 @@ export class MerkleTreesFacade implements MerkleTreeReadOperations {
     return this.initialHeader;
   }
 
-  findLeafIndex(treeId: MerkleTreeId, value: MerkleTreeLeafType<MerkleTreeId>): Promise<bigint | undefined> {
-    return this.findLeafIndexAfter(treeId, value, 0n);
+  findLeafIndices(treeId: MerkleTreeId, values: MerkleTreeLeafType<MerkleTreeId>[]): Promise<(bigint | undefined)[]> {
+    return this.findLeafIndicesAfter(treeId, values, 0n);
   }
 
-  async findLeafIndexAfter(
+  async findLeafIndicesAfter(
     treeId: MerkleTreeId,
-    leaf: MerkleTreeLeafType<MerkleTreeId>,
+    leaves: MerkleTreeLeafType<MerkleTreeId>[],
     startIndex: bigint,
-  ): Promise<bigint | undefined> {
-    const index = await this.instance.call(WorldStateMessageType.FIND_LEAF_INDEX, {
-      leaf: serializeLeaf(hydrateLeaf(treeId, leaf)),
+  ): Promise<(bigint | undefined)[]> {
+    const response = await this.instance.call(WorldStateMessageType.FIND_LEAF_INDICES, {
+      leaves: leaves.map(leaf => serializeLeaf(hydrateLeaf(treeId, leaf))),
       revision: this.revision,
       treeId,
       startIndex,
     });
 
-    if (typeof index === 'number' || typeof index === 'bigint') {
-      return BigInt(index);
-    } else {
-      return undefined;
-    }
+    return response.indices.map(index => {
+      if (typeof index === 'number' || typeof index === 'bigint') {
+        return BigInt(index);
+      } else {
+        return undefined;
+      }
+    });
   }
 
   async getLeafPreimage(treeId: IndexedTreeId, leafIndex: bigint): Promise<IndexedTreeLeafPreimage | undefined> {

package/src/native/message.ts

@@ -56,7 +56,7 @@ export enum WorldStateMessageType {
   GET_SIBLING_PATH,
   GET_BLOCK_NUMBERS_FOR_LEAF_INDICES,
 
-  FIND_LEAF_INDEX,
+  FIND_LEAF_INDICES,
   FIND_LOW_LEAF,
 
   APPEND_LEAVES,
@@ -329,8 +329,8 @@ export type SerializedIndexedLeaf = {
   nextValue: Buffer; // Fr
 };
 
-interface WithLeafValue {
-  leaf: SerializedLeafValue;
+interface WithLeafValues {
+  leaves: SerializedLeafValue[];
 }
 
 interface BlockShiftRequest {
@@ -371,10 +371,12 @@ type GetLeafResponse = SerializedLeafValue | undefined;
 interface GetLeafPreImageRequest extends WithTreeId, WithLeafIndex, WithWorldStateRevision {}
 type GetLeafPreImageResponse = SerializedIndexedLeaf | undefined;
 
-interface FindLeafIndexRequest extends WithTreeId, WithLeafValue, WithWorldStateRevision {
+interface FindLeafIndicesRequest extends WithTreeId, WithLeafValues, WithWorldStateRevision {
   startIndex: bigint;
 }
-type FindLeafIndexResponse = bigint | null;
+interface FindLeafIndicesResponse {
+  indices: bigint[];
+}
 
 interface FindLowLeafRequest extends WithTreeId, WithWorldStateRevision {
   key: Fr;
@@ -461,7 +463,7 @@ export type WorldStateRequest = {
   [WorldStateMessageType.GET_SIBLING_PATH]: GetSiblingPathRequest;
   [WorldStateMessageType.GET_BLOCK_NUMBERS_FOR_LEAF_INDICES]: GetBlockNumbersForLeafIndicesRequest;
 
-  [WorldStateMessageType.FIND_LEAF_INDEX]: FindLeafIndexRequest;
+  [WorldStateMessageType.FIND_LEAF_INDICES]: FindLeafIndicesRequest;
   [WorldStateMessageType.FIND_LOW_LEAF]: FindLowLeafRequest;
 
   [WorldStateMessageType.APPEND_LEAVES]: AppendLeavesRequest;
@@ -497,7 +499,7 @@ export type WorldStateResponse = {
   [WorldStateMessageType.GET_SIBLING_PATH]: GetSiblingPathResponse;
   [WorldStateMessageType.GET_BLOCK_NUMBERS_FOR_LEAF_INDICES]: GetBlockNumbersForLeafIndicesResponse;
 
-  [WorldStateMessageType.FIND_LEAF_INDEX]: FindLeafIndexResponse;
+  [WorldStateMessageType.FIND_LEAF_INDICES]: FindLeafIndicesResponse;
   [WorldStateMessageType.FIND_LOW_LEAF]: FindLowLeafResponse;
 
   [WorldStateMessageType.APPEND_LEAVES]: void;

package/src/native/native_world_state.ts

@@ -21,12 +21,14 @@ import {
 } from '@aztec/circuits.js';
 import { padArrayEnd } from '@aztec/foundation/collection';
 import { createLogger } from '@aztec/foundation/log';
+import { NoopTelemetryClient } from '@aztec/telemetry-client/noop';
 
 import assert from 'assert/strict';
 import { mkdir, mkdtemp, rm } from 'fs/promises';
 import { tmpdir } from 'os';
 import { join } from 'path';
 
+import { WorldStateInstrumentation } from '../instrumentation/instrumentation.js';
 import { type MerkleTreeAdminDatabase as MerkleTreeDatabase } from '../world-state-db/merkle_tree_db.js';
 import { MerkleTreesFacade, MerkleTreesForkFacade, serializeLeaf } from './merkle_trees_facade.js';
 import {
@@ -58,6 +60,7 @@ export class NativeWorldStateService implements MerkleTreeDatabase {
 
   protected constructor(
     protected readonly instance: NativeWorldState,
+    protected readonly worldStateInstrumentation: WorldStateInstrumentation,
     protected readonly log = createLogger('world-state:database'),
     private readonly cleanup = () => Promise.resolve(),
   ) {}
@@ -66,6 +69,7 @@ export class NativeWorldStateService implements MerkleTreeDatabase {
     rollupAddress: EthAddress,
     dataDir: string,
     dbMapSizeKb: number,
+    instrumentation = new WorldStateInstrumentation(new NoopTelemetryClient()),
     log = createLogger('world-state:database'),
     cleanup = () => Promise.resolve(),
   ): Promise<NativeWorldStateService> {
@@ -89,8 +93,8 @@ export class NativeWorldStateService implements MerkleTreeDatabase {
     await mkdir(worldStateDirectory, { recursive: true });
     await newWorldStateVersion.writeVersionFile(versionFile);
 
-    const instance = new NativeWorldState(worldStateDirectory, dbMapSizeKb);
-    const worldState = new this(instance, log, cleanup);
+    const instance = new NativeWorldState(worldStateDirectory, dbMapSizeKb, instrumentation);
+    const worldState = new this(instance, instrumentation, log, cleanup);
     try {
       await worldState.init();
     } catch (e) {
@@ -101,7 +105,11 @@ export class NativeWorldStateService implements MerkleTreeDatabase {
     return worldState;
   }
 
-  static async tmp(rollupAddress = EthAddress.ZERO, cleanupTmpDir = true): Promise<NativeWorldStateService> {
+  static async tmp(
+    rollupAddress = EthAddress.ZERO,
+    cleanupTmpDir = true,
+    instrumentation = new WorldStateInstrumentation(new NoopTelemetryClient()),
+  ): Promise<NativeWorldStateService> {
     const log = createLogger('world-state:database');
     const dataDir = await mkdtemp(join(tmpdir(), 'aztec-world-state-'));
     const dbMapSizeKb = 10 * 1024 * 1024;
@@ -117,7 +125,7 @@ export class NativeWorldStateService implements MerkleTreeDatabase {
       }
     };
 
-    return this.new(rollupAddress, dataDir, dbMapSizeKb, log, cleanup);
+    return this.new(rollupAddress, dataDir, dbMapSizeKb, instrumentation, log, cleanup);
   }
 
   protected async init() {
@@ -136,7 +144,8 @@ export class NativeWorldStateService implements MerkleTreeDatabase {
 
     // the initial header _must_ be the first element in the archive tree
     // if this assertion fails, check that the hashing done in Header in yarn-project matches the initial header hash done in world_state.cpp
-    const initialHeaderIndex = await committed.findLeafIndex(MerkleTreeId.ARCHIVE, this.initialHeader.hash());
+    const indices = await committed.findLeafIndices(MerkleTreeId.ARCHIVE, [this.initialHeader.hash()]);
+    const initialHeaderIndex = indices[0];
     assert.strictEqual(initialHeaderIndex, 0n, 'Invalid initial archive state');
   }
 

package/src/native/native_world_state_instance.ts

@@ -12,7 +12,6 @@ import {
 } from '@aztec/circuits.js';
 import { createLogger } from '@aztec/foundation/log';
 import { SerialQueue } from '@aztec/foundation/queue';
-import { Timer } from '@aztec/foundation/timer';
 
 import assert from 'assert';
 import bindings from 'bindings';
@@ -20,6 +19,7 @@ import { Decoder, Encoder, addExtension } from 'msgpackr';
 import { cpus } from 'os';
 import { isAnyArrayBuffer } from 'util/types';
 
+import { type WorldStateInstrumentation } from '../instrumentation/instrumentation.js';
 import {
   MessageHeader,
   TypedMessage,
@@ -46,7 +46,7 @@ const NATIVE_LIBRARY_NAME = 'world_state_napi';
 const NATIVE_CLASS_NAME = 'WorldState';
 
 const NATIVE_MODULE = bindings(NATIVE_LIBRARY_NAME);
-const MAX_WORLD_STATE_THREADS = 16;
+const MAX_WORLD_STATE_THREADS = +(process.env.HARDWARE_CONCURRENCY || '16');
 
 export interface NativeWorldStateInstance {
   call<T extends WorldStateMessageType>(messageType: T, body: WorldStateRequest[T]): Promise<WorldStateResponse[T]>;
@@ -82,8 +82,16 @@ export class NativeWorldState implements NativeWorldStateInstance {
   private queue = new SerialQueue();
 
   /** Creates a new native WorldState instance */
-  constructor(dataDir: string, dbMapSizeKb: number, private log = createLogger('world-state:database')) {
-    log.info(`Creating world state data store at directory ${dataDir} with map size ${dbMapSizeKb} KB`);
+  constructor(
+    dataDir: string,
+    dbMapSizeKb: number,
+    private instrumentation: WorldStateInstrumentation,
+    private log = createLogger('world-state:database'),
+  ) {
+    const threads = Math.min(cpus().length, MAX_WORLD_STATE_THREADS);
+    log.info(
+      `Creating world state data store at directory ${dataDir} with map size ${dbMapSizeKb} KB and ${threads} threads.`,
+    );
     this.instance = new NATIVE_MODULE[NATIVE_CLASS_NAME](
       dataDir,
       {
@@ -99,7 +107,7 @@ export class NativeWorldState implements NativeWorldStateInstance {
       },
       GeneratorIndex.BLOCK_HASH,
       dbMapSizeKb,
-      Math.min(cpus().length, MAX_WORLD_STATE_THREADS),
+      threads,
     );
     this.queue.start();
   }
@@ -180,17 +188,6 @@ export class NativeWorldState implements NativeWorldStateInstance {
         data['blockHeaderHash'] = '0x' + body.blockHeaderHash.toString('hex');
       }
 
-      if ('leaf' in body) {
-        if (Buffer.isBuffer(body.leaf)) {
-          data['leaf'] = '0x' + body.leaf.toString('hex');
-        } else if ('slot' in body.leaf) {
-          data['slot'] = '0x' + body.leaf.slot.toString('hex');
-          data['value'] = '0x' + body.leaf.value.toString('hex');
-        } else {
-          data['nullifier'] = '0x' + body.leaf.value.toString('hex');
-        }
-      }
-
       if ('leaves' in body) {
         data['leavesCount'] = body.leaves.length;
       }
@@ -208,11 +205,12 @@ export class NativeWorldState implements NativeWorldStateInstance {
       this.log.trace(`Calling messageId=${messageId} ${WorldStateMessageType[messageType]}`);
     }
 
-    const timer = new Timer();
+    const start = process.hrtime.bigint();
 
     const request = new TypedMessage(messageType, new MessageHeader({ messageId }), body);
     const encodedRequest = this.encoder.encode(request);
-    const encodingDuration = timer.ms();
+    const encodingEnd = process.hrtime.bigint();
+    const encodingDuration = Number(encodingEnd - start) / 1_000_000;
 
     let encodedResponse: any;
     try {
@@ -222,7 +220,9 @@ export class NativeWorldState implements NativeWorldStateInstance {
       throw error;
     }
 
-    const callDuration = timer.ms() - encodingDuration;
+    const callEnd = process.hrtime.bigint();
+
+    const callDuration = Number(callEnd - encodingEnd) / 1_000_000;
 
     const buf = Buffer.isBuffer(encodedResponse)
       ? encodedResponse
@@ -246,8 +246,9 @@ export class NativeWorldState implements NativeWorldStateInstance {
     }
 
     const response = TypedMessage.fromMessagePack<T, WorldStateResponse[T]>(decodedResponse);
-    const decodingDuration = timer.ms() - callDuration;
-    const totalDuration = timer.ms();
+    const decodingEnd = process.hrtime.bigint();
+    const decodingDuration = Number(decodingEnd - callEnd) / 1_000_000;
+    const totalDuration = Number(decodingEnd - start) / 1_000_000;
     this.log.trace(`Call messageId=${messageId} ${WorldStateMessageType[messageType]} took (ms)`, {
       totalDuration,
       encodingDuration,
@@ -265,6 +266,9 @@ export class NativeWorldState implements NativeWorldStateInstance {
       throw new Error('Invalid response message type: ' + response.msgType + ' != ' + messageType);
     }
 
+    const callDurationUs = Number(callEnd - encodingEnd) / 1000;
+    this.instrumentation.recordRoundTrip(callDurationUs, messageType);
+
     return response.value;
   }
 }

package/src/synchronizer/factory.ts

@@ -1,12 +1,9 @@
 import { type L1ToL2MessageSource, type L2BlockSource } from '@aztec/circuit-types';
-import { createLogger } from '@aztec/foundation/log';
 import { type DataStoreConfig } from '@aztec/kv-store/config';
-import { createStore } from '@aztec/kv-store/lmdb';
 import { type TelemetryClient } from '@aztec/telemetry-client';
-import { NoopTelemetryClient } from '@aztec/telemetry-client/noop';
 
+import { WorldStateInstrumentation } from '../instrumentation/instrumentation.js';
 import { NativeWorldStateService } from '../native/native_world_state.js';
-import { MerkleTrees } from '../world-state-db/merkle_trees.js';
 import { type WorldStateConfig } from './config.js';
 import { ServerWorldStateSynchronizer } from './server_world_state_synchronizer.js';
 
@@ -15,13 +12,14 @@ export async function createWorldStateSynchronizer(
   l2BlockSource: L2BlockSource & L1ToL2MessageSource,
   client: TelemetryClient,
 ) {
-  const merkleTrees = await createWorldState(config, client);
-  return new ServerWorldStateSynchronizer(merkleTrees, l2BlockSource, config, client);
+  const instrumentation = new WorldStateInstrumentation(client);
+  const merkleTrees = await createWorldState(config, instrumentation);
+  return new ServerWorldStateSynchronizer(merkleTrees, l2BlockSource, config, instrumentation);
 }
 
 export async function createWorldState(
   config: WorldStateConfig & DataStoreConfig,
-  client: TelemetryClient = new NoopTelemetryClient(),
+  instrumentation: WorldStateInstrumentation,
 ) {
   const newConfig = {
     dataDirectory: config.worldStateDataDirectory ?? config.dataDirectory,
@@ -33,13 +31,12 @@ export async function createWorldState(
   }
 
   // If a data directory is provided in config, then create a persistent store.
-  const merkleTrees = ['true', '1'].includes(process.env.USE_LEGACY_WORLD_STATE ?? '')
-    ? await MerkleTrees.new(await createStore('world-state', newConfig, createLogger('world-state:lmdb')), client)
-    : newConfig.dataDirectory
+  const merkleTrees = newConfig.dataDirectory
     ? await NativeWorldStateService.new(
         config.l1Contracts.rollupAddress,
         newConfig.dataDirectory,
         newConfig.dataStoreMapSizeKB,
+        instrumentation,
       )
     : await NativeWorldStateService.tmp(
         config.l1Contracts.rollupAddress,

package/src/synchronizer/server_world_state_synchronizer.ts

@@ -3,7 +3,7 @@ import {
   type L2Block,
   type L2BlockId,
   type L2BlockSource,
-  L2BlockStream,
+  type L2BlockStream,
   type L2BlockStreamEvent,
   type L2BlockStreamEventHandler,
   type L2BlockStreamLocalDataProvider,
@@ -23,12 +23,13 @@ import { createLogger } from '@aztec/foundation/log';
 import { promiseWithResolvers } from '@aztec/foundation/promise';
 import { elapsed } from '@aztec/foundation/timer';
 import { SHA256Trunc } from '@aztec/merkle-tree';
-import { type TelemetryClient } from '@aztec/telemetry-client';
+import { TraceableL2BlockStream } from '@aztec/telemetry-client';
+import { NoopTelemetryClient } from '@aztec/telemetry-client/noop';
 
+import { WorldStateInstrumentation } from '../instrumentation/instrumentation.js';
 import { type WorldStateStatusFull } from '../native/message.js';
 import { type MerkleTreeAdminDatabase } from '../world-state-db/merkle_tree_db.js';
 import { type WorldStateConfig } from './config.js';
-import { WorldStateInstrumentation } from './instrumentation.js';
 
 /**
  * Synchronizes the world state with the L2 blocks from a L2BlockSource via a block stream.
@@ -47,16 +48,14 @@ export class ServerWorldStateSynchronizer
 
   private syncPromise = promiseWithResolvers<void>();
   protected blockStream: L2BlockStream | undefined;
-  private instrumentation: WorldStateInstrumentation;
 
   constructor(
     private readonly merkleTreeDb: MerkleTreeAdminDatabase,
     private readonly l2BlockSource: L2BlockSource & L1ToL2MessageSource,
     private readonly config: WorldStateConfig,
-    telemetry: TelemetryClient,
+    private instrumentation = new WorldStateInstrumentation(new NoopTelemetryClient()),
     private readonly log = createLogger('world_state'),
   ) {
-    this.instrumentation = new WorldStateInstrumentation(telemetry);
     this.merkleTreeCommitted = this.merkleTreeDb.getCommitted();
     this.historyToKeep = config.worldStateBlockHistory < 1 ? undefined : config.worldStateBlockHistory;
     this.log.info(
@@ -110,8 +109,10 @@ export class ServerWorldStateSynchronizer
     return this.syncPromise.promise;
   }
 
-  protected createBlockStream() {
-    return new L2BlockStream(this.l2BlockSource, this, this, createLogger('world_state:block_stream'), {
+  protected createBlockStream(): L2BlockStream {
+    const tracer = this.instrumentation.telemetry.getTracer('WorldStateL2BlockStream');
+    const logger = createLogger('world-state:block_stream');
+    return new TraceableL2BlockStream(this.l2BlockSource, this, this, tracer, 'WorldStateL2BlockStream', logger, {
       proven: this.config.worldStateProvenBlocksOnly,
       pollIntervalMS: this.config.worldStateBlockCheckIntervalMS,
       batchSize: this.config.worldStateBlockRequestBatchSize,

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

@@ -110,8 +110,11 @@ export class MerkleTreeReadOperationsFacade implements MerkleTreeWriteOperations
    * @param value - The leaf value to look for.
    * @returns The index of the first leaf found with a given value (undefined if not found).
    */
-  findLeafIndex<ID extends MerkleTreeId>(treeId: ID, value: MerkleTreeLeafType<ID>): Promise<bigint | undefined> {
-    return this.trees.findLeafIndex(treeId, value, this.includeUncommitted);
+  findLeafIndices<ID extends MerkleTreeId>(
+    treeId: ID,
+    values: MerkleTreeLeafType<ID>[],
+  ): Promise<(bigint | undefined)[]> {
+    return Promise.all(values.map(leaf => this.trees.findLeafIndex(treeId, leaf, this.includeUncommitted)));
   }
 
   /**
@@ -120,12 +123,14 @@ export class MerkleTreeReadOperationsFacade implements MerkleTreeWriteOperations
    * @param value - The value to search for in the tree.
    * @param startIndex - The index to start searching from (used when skipping nullified messages)
    */
-  findLeafIndexAfter<ID extends MerkleTreeId>(
+  findLeafIndicesAfter<ID extends MerkleTreeId>(
     treeId: ID,
-    value: MerkleTreeLeafType<ID>,
+    values: MerkleTreeLeafType<ID>[],
     startIndex: bigint,
-  ): Promise<bigint | undefined> {
-    return this.trees.findLeafIndexAfter(treeId, value, startIndex, this.includeUncommitted);
+  ): Promise<(bigint | undefined)[]> {
+    return Promise.all(
+      values.map(leaf => this.trees.findLeafIndexAfter(treeId, leaf, startIndex, this.includeUncommitted)),
+    );
   }
 
   /**

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

@@ -40,20 +40,23 @@ export class MerkleTreeSnapshotOperationsFacade implements MerkleTreeReadOperati
     return this.#treeSnapshots[treeId]!;
   }
 
-  async findLeafIndex<ID extends MerkleTreeId>(treeId: ID, value: MerkleTreeLeafType<ID>): Promise<bigint | undefined> {
+  async findLeafIndices<ID extends MerkleTreeId>(
+    treeId: ID,
+    values: MerkleTreeLeafType<ID>[],
+  ): Promise<(bigint | undefined)[]> {
     const tree = await this.#getTreeSnapshot(treeId);
     // TODO #5448 fix "as any"
-    return tree.findLeafIndex(value as any);
+    return values.map(leaf => tree.findLeafIndex(leaf as any));
   }
 
-  async findLeafIndexAfter<ID extends MerkleTreeId>(
+  async findLeafIndicesAfter<ID extends MerkleTreeId>(
     treeId: MerkleTreeId,
-    value: MerkleTreeLeafType<ID>,
+    values: MerkleTreeLeafType<ID>[],
     startIndex: bigint,
-  ): Promise<bigint | undefined> {
+  ): Promise<(bigint | undefined)[]> {
     const tree = await this.#getTreeSnapshot(treeId);
     // TODO #5448 fix "as any"
-    return tree.findLeafIndexAfter(value as any, startIndex);
+    return values.map(leaf => tree.findLeafIndexAfter(leaf as any, startIndex));
   }
 
   async getLeafPreimage<ID extends IndexedTreeId>(

package/dest/synchronizer/instrumentation.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"instrumentation.d.ts","sourceRoot":"","sources":["../../src/synchronizer/instrumentation.ts"],"names":[],"mappings":"AAEA,OAAO,EAA0B,KAAK,eAAe,EAAa,MAAM,yBAAyB,CAAC;AAElG,OAAO,EAAiD,KAAK,oBAAoB,EAAE,MAAM,sBAAsB,CAAC;AAIhH,qBAAa,yBAAyB;IASI,OAAO,CAAC,GAAG;IARnD,OAAO,CAAC,SAAS,CAAQ;IACzB,OAAO,CAAC,QAAQ,CAAQ;IACxB,OAAO,CAAC,iBAAiB,CAAQ;IACjC,OAAO,CAAC,eAAe,CAAQ;IAC/B,OAAO,CAAC,WAAW,CAAQ;IAC3B,OAAO,CAAC,UAAU,CAAQ;IAC1B,OAAO,CAAC,UAAU,CAAQ;gBAEd,SAAS,EAAE,eAAe,EAAU,GAAG,yCAA8C;IAsCjG,OAAO,CAAC,eAAe;IAwBvB,OAAO,CAAC,iBAAiB;IAWlB,uBAAuB,CAAC,gBAAgB,EAAE,oBAAoB;CA+BtE"}

package/dest/synchronizer/instrumentation.js

@@ -1,77 +0,0 @@
-import { MerkleTreeId } from '@aztec/circuit-types';
-import { createLogger } from '@aztec/foundation/log';
-import { Attributes, ValueType } from '@aztec/telemetry-client';
-export class WorldStateInstrumentation {
-    constructor(telemetry, log = createLogger('world-state:instrumentation')) {
-        this.log = log;
-        const meter = telemetry.getMeter('World State');
-        this.dbMapSize = meter.createGauge(`aztec.world_state.db_map_size`, {
-            description: `The current configured map size for each merkle tree`,
-            valueType: ValueType.INT,
-        });
-        this.treeSize = meter.createGauge(`aztec.world_state.tree_size`, {
-            description: `The current number of leaves in each merkle tree`,
-            valueType: ValueType.INT,
-        });
-        this.unfinalisedHeight = meter.createGauge(`aztec.world_state.unfinalised_height`, {
-            description: `The unfinalised block height of each merkle tree`,
-            valueType: ValueType.INT,
-        });
-        this.finalisedHeight = meter.createGauge(`aztec.world_state.finalised_height`, {
-            description: `The finalised block height of each merkle tree`,
-            valueType: ValueType.INT,
-        });
-        this.oldestBlock = meter.createGauge(`aztec.world_state.oldest_block`, {
-            description: `The oldest historical block of each merkle tree`,
-            valueType: ValueType.INT,
-        });
-        this.dbUsedSize = meter.createGauge(`aztec.world_state.db_used_size`, {
-            description: `The current used database size for each db of each merkle tree`,
-            valueType: ValueType.INT,
-        });
-        this.dbNumItems = meter.createGauge(`aztec.world_state.db_num_items`, {
-            description: `The current number of items in each database of each merkle tree`,
-            valueType: ValueType.INT,
-        });
-    }
-    updateTreeStats(treeDbStats, treeMeta, tree) {
-        this.dbMapSize.record(Number(treeDbStats.mapSize), {
-            [Attributes.MERKLE_TREE_NAME]: MerkleTreeId[tree],
-        });
-        this.treeSize.record(Number(treeMeta.size), {
-            [Attributes.MERKLE_TREE_NAME]: MerkleTreeId[tree],
-        });
-        this.unfinalisedHeight.record(Number(treeMeta.unfinalisedBlockHeight), {
-            [Attributes.MERKLE_TREE_NAME]: MerkleTreeId[tree],
-        });
-        this.finalisedHeight.record(Number(treeMeta.finalisedBlockHeight), {
-            [Attributes.MERKLE_TREE_NAME]: MerkleTreeId[tree],
-        });
-        this.oldestBlock.record(Number(treeMeta.oldestHistoricBlock), {
-            [Attributes.MERKLE_TREE_NAME]: MerkleTreeId[tree],
-        });
-        this.updateTreeDBStats(treeDbStats.blockIndicesDBStats, 'block_indices', tree);
-        this.updateTreeDBStats(treeDbStats.blocksDBStats, 'blocks', tree);
-        this.updateTreeDBStats(treeDbStats.leafIndicesDBStats, 'leaf_indices', tree);
-        this.updateTreeDBStats(treeDbStats.leafPreimagesDBStats, 'leaf_preimage', tree);
-        this.updateTreeDBStats(treeDbStats.nodesDBStats, 'nodes', tree);
-    }
-    updateTreeDBStats(dbStats, dbType, tree) {
-        this.dbNumItems.record(Number(dbStats.numDataItems), {
-            [Attributes.WS_DB_DATA_TYPE]: dbType,
-            [Attributes.MERKLE_TREE_NAME]: MerkleTreeId[tree],
-        });
-        this.dbUsedSize.record(Number(dbStats.totalUsedSize), {
-            [Attributes.WS_DB_DATA_TYPE]: dbType,
-            [Attributes.MERKLE_TREE_NAME]: MerkleTreeId[tree],
-        });
-    }
-    updateWorldStateMetrics(worldStateStatus) {
-        this.updateTreeStats(worldStateStatus.dbStats.archiveTreeStats, worldStateStatus.meta.archiveTreeMeta, MerkleTreeId.ARCHIVE);
-        this.updateTreeStats(worldStateStatus.dbStats.messageTreeStats, worldStateStatus.meta.messageTreeMeta, MerkleTreeId.L1_TO_L2_MESSAGE_TREE);
-        this.updateTreeStats(worldStateStatus.dbStats.noteHashTreeStats, worldStateStatus.meta.noteHashTreeMeta, MerkleTreeId.NOTE_HASH_TREE);
-        this.updateTreeStats(worldStateStatus.dbStats.nullifierTreeStats, worldStateStatus.meta.nullifierTreeMeta, MerkleTreeId.NULLIFIER_TREE);
-        this.updateTreeStats(worldStateStatus.dbStats.publicDataTreeStats, worldStateStatus.meta.publicDataTreeMeta, MerkleTreeId.PUBLIC_DATA_TREE);
-    }
-}
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5zdHJ1bWVudGF0aW9uLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3N5bmNocm9uaXplci9pbnN0cnVtZW50YXRpb24udHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLFlBQVksRUFBRSxNQUFNLHNCQUFzQixDQUFDO0FBQ3BELE9BQU8sRUFBRSxZQUFZLEVBQUUsTUFBTSx1QkFBdUIsQ0FBQztBQUNyRCxPQUFPLEVBQUUsVUFBVSxFQUFvQyxTQUFTLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQztBQU1sRyxNQUFNLE9BQU8seUJBQXlCO0lBU3BDLFlBQVksU0FBMEIsRUFBVSxNQUFNLFlBQVksQ0FBQyw2QkFBNkIsQ0FBQztRQUFqRCxRQUFHLEdBQUgsR0FBRyxDQUE4QztRQUMvRixNQUFNLEtBQUssR0FBRyxTQUFTLENBQUMsUUFBUSxDQUFDLGFBQWEsQ0FBQyxDQUFDO1FBQ2hELElBQUksQ0FBQyxTQUFTLEdBQUcsS0FBSyxDQUFDLFdBQVcsQ0FBQywrQkFBK0IsRUFBRTtZQUNsRSxXQUFXLEVBQUUsc0RBQXNEO1lBQ25FLFNBQVMsRUFBRSxTQUFTLENBQUMsR0FBRztTQUN6QixDQUFDLENBQUM7UUFFSCxJQUFJLENBQUMsUUFBUSxHQUFHLEtBQUssQ0FBQyxXQUFXLENBQUMsNkJBQTZCLEVBQUU7WUFDL0QsV0FBVyxFQUFFLGtEQUFrRDtZQUMvRCxTQUFTLEVBQUUsU0FBUyxDQUFDLEdBQUc7U0FDekIsQ0FBQyxDQUFDO1FBRUgsSUFBSSxDQUFDLGlCQUFpQixHQUFHLEtBQUssQ0FBQyxXQUFXLENBQUMsc0NBQXNDLEVBQUU7WUFDakYsV0FBVyxFQUFFLGtEQUFrRDtZQUMvRCxTQUFTLEVBQUUsU0FBUyxDQUFDLEdBQUc7U0FDekIsQ0FBQyxDQUFDO1FBRUgsSUFBSSxDQUFDLGVBQWUsR0FBRyxLQUFLLENBQUMsV0FBVyxDQUFDLG9DQUFvQyxFQUFFO1lBQzdFLFdBQVcsRUFBRSxnREFBZ0Q7WUFDN0Qs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