@aztec/world-state 0.23.0 → 0.26.1

package/dest/synchronizer/server_world_state_synchronizer.d.ts

@@ -5,7 +5,7 @@ import { WorldStateConfig } from './config.js';
 import { WorldStateStatus, WorldStateSynchronizer } from './world_state_synchronizer.js';
 /**
  * Synchronizes the world state with the L2 blocks from a L2BlockSource.
- * The synchronizer will download the L2 blocks from the L2BlockSource and insert the new commitments into the merkle
+ * The synchronizer will download the L2 blocks from the L2BlockSource and insert the new note hashes into the merkle
  * tree.
  */
 export declare class ServerWorldStateSynchronizer implements WorldStateSynchronizer {
@@ -40,13 +40,13 @@ export declare class ServerWorldStateSynchronizer implements WorldStateSynchroni
      */
     private collectAndProcessBlocks;
     /**
-     * Handles a list of L2 blocks (i.e. Inserts the new commitments into the merkle tree).
+     * Handles a list of L2 blocks (i.e. Inserts the new note hashes into the merkle tree).
      * @param l2Blocks - The L2 blocks to handle.
      * @returns Whether the block handled was produced by this same node.
      */
     private handleL2Blocks;
     /**
-     * Handles a single L2 block (i.e. Inserts the new commitments into the merkle tree).
+     * Handles a single L2 block (i.e. Inserts the new note hashes into the merkle tree).
      * @param l2Block - The L2 block to handle.
      */
     private handleL2Block;

package/dest/synchronizer/server_world_state_synchronizer.js

@@ -7,7 +7,7 @@ import { MerkleTreeSnapshotOperationsFacade } from '../world-state-db/merkle_tre
 import { WorldStateRunningState } from './world_state_synchronizer.js';
 /**
  * Synchronizes the world state with the L2 blocks from a L2BlockSource.
- * The synchronizer will download the L2 blocks from the L2BlockSource and insert the new commitments into the merkle
+ * The synchronizer will download the L2 blocks from the L2BlockSource and insert the new note hashes into the merkle
  * tree.
  */
 export class ServerWorldStateSynchronizer {
@@ -139,7 +139,7 @@ export class ServerWorldStateSynchronizer {
         await this.handleL2Blocks(blocks);
     }
     /**
-     * Handles a list of L2 blocks (i.e. Inserts the new commitments into the merkle tree).
+     * Handles a list of L2 blocks (i.e. Inserts the new note hashes into the merkle tree).
      * @param l2Blocks - The L2 blocks to handle.
      * @returns Whether the block handled was produced by this same node.
      */
@@ -155,7 +155,7 @@ export class ServerWorldStateSynchronizer {
         }
     }
     /**
-     * Handles a single L2 block (i.e. Inserts the new commitments into the merkle tree).
+     * Handles a single L2 block (i.e. Inserts the new note hashes into the merkle tree).
      * @param l2Block - The L2 block to handle.
      */
     async handleL2Block(l2Block) {

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

@@ -112,7 +112,7 @@ export interface MerkleTreeOperations {
      */
     batchInsert<TreeHeight extends number, SubtreeSiblingPathHeight extends number>(treeId: MerkleTreeId, leaves: Buffer[], subtreeHeight: number): Promise<BatchInsertionResult<TreeHeight, SubtreeSiblingPathHeight>>;
     /**
-     * Handles a single L2 block (i.e. Inserts the new commitments into the merkle tree).
+     * Handles a single L2 block (i.e. Inserts the new note hashes into the merkle tree).
      * @param block - The L2 block to handle.
      */
     handleL2Block(block: L2Block): Promise<HandleL2BlockResult>;

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

@@ -97,7 +97,7 @@ export declare class MerkleTreeOperationsFacade implements MerkleTreeOperations
      */
     updateArchive(header: Header): Promise<void>;
     /**
-     * Handles a single L2 block (i.e. Inserts the new commitments into the merkle tree).
+     * Handles a single L2 block (i.e. Inserts the new note hashes into the merkle tree).
      * @param block - The L2 block to handle.
      * @returns Whether the block handled was produced by this same node.
      */

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

@@ -106,7 +106,7 @@ export class MerkleTreeOperationsFacade {
         return this.trees.updateArchive(header, this.includeUncommitted);
     }
     /**
-     * Handles a single L2 block (i.e. Inserts the new commitments into the merkle tree).
+     * Handles a single L2 block (i.e. Inserts the new note hashes into the merkle tree).
      * @param block - The L2 block to handle.
      * @returns Whether the block handled was produced by this same node.
      */

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

@@ -132,7 +132,7 @@ export declare class MerkleTrees implements MerkleTreeDb {
      */
     updateLeaf(treeId: IndexedTreeId, leaf: Buffer, index: bigint): Promise<void>;
     /**
-     * Handles a single L2 block (i.e. Inserts the new commitments into the merkle tree).
+     * Handles a single L2 block (i.e. Inserts the new note hashes into the merkle tree).
      * @param block - The L2 block to handle.
      * @returns Whether the block handled was produced by this same node.
      */

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

@@ -1 +1 @@
-{"version":3,"file":"merkle_trees.d.ts","sourceRoot":"","sources":["../../src/world-state-db/merkle_trees.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"merkle_trees.d.ts","sourceRoot":"","sources":["../../src/world-state-db/merkle_trees.ts"],"names":[],"mappings":"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"}

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

@@ -1,7 +1,7 @@
 var _MerkleTrees_instances, _MerkleTrees_init, _MerkleTrees_updateArchive, _MerkleTrees_getTreeInfo, _MerkleTrees_getIndexedTree, _MerkleTrees_appendLeaves, _MerkleTrees_updateLeaf, _MerkleTrees_commit, _MerkleTrees_rollback, _MerkleTrees_snapshot, _MerkleTrees_handleL2Block, _MerkleTrees_isDbPopulated;
 import { __classPrivateFieldGet } from "tslib";
 import { MerkleTreeId } from '@aztec/circuit-types';
-import { ARCHIVE_HEIGHT, AppendOnlyTreeSnapshot, CONTRACT_TREE_HEIGHT, Fr, GlobalVariables, Header, L1_TO_L2_MSG_TREE_HEIGHT, MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX, NOTE_HASH_TREE_HEIGHT, NULLIFIER_SUBTREE_HEIGHT, NULLIFIER_TREE_HEIGHT, NullifierLeaf, NullifierLeafPreimage, PUBLIC_DATA_SUBTREE_HEIGHT, PUBLIC_DATA_TREE_HEIGHT, PartialStateReference, PublicDataTreeLeaf, PublicDataTreeLeafPreimage, StateReference, } from '@aztec/circuits.js';
+import { ARCHIVE_HEIGHT, AppendOnlyTreeSnapshot, CONTRACT_TREE_HEIGHT, ContentCommitment, Fr, GlobalVariables, Header, L1_TO_L2_MSG_TREE_HEIGHT, MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX, NOTE_HASH_TREE_HEIGHT, NULLIFIER_SUBTREE_HEIGHT, NULLIFIER_TREE_HEIGHT, NullifierLeaf, NullifierLeafPreimage, PUBLIC_DATA_SUBTREE_HEIGHT, PUBLIC_DATA_TREE_HEIGHT, PartialStateReference, PublicDataTreeLeaf, PublicDataTreeLeafPreimage, StateReference, } from '@aztec/circuits.js';
 import { SerialQueue } from '@aztec/foundation/fifo';
 import { createDebugLogger } from '@aztec/foundation/log';
 import { Pedersen, StandardIndexedTree, StandardTree, getTreeMeta, loadTree, newTree, } from '@aztec/merkle-tree';
@@ -46,7 +46,7 @@ export class MerkleTrees {
     }
     async buildInitialHeader(includeUncommitted) {
         const state = await this.getStateReference(includeUncommitted);
-        return new Header(AppendOnlyTreeSnapshot.zero(), Buffer.alloc(32, 0), state, GlobalVariables.empty());
+        return new Header(AppendOnlyTreeSnapshot.zero(), ContentCommitment.empty(), state, GlobalVariables.empty());
     }
     /**
      * Stops the job queue (waits for all jobs to finish).
@@ -185,7 +185,7 @@ export class MerkleTrees {
         return await this.synchronize(() => __classPrivateFieldGet(this, _MerkleTrees_instances, "m", _MerkleTrees_updateLeaf).call(this, treeId, leaf, index));
     }
     /**
-     * Handles a single L2 block (i.e. Inserts the new commitments into the merkle tree).
+     * Handles a single L2 block (i.e. Inserts the new note hashes into the merkle tree).
      * @param block - The L2 block to handle.
      * @returns Whether the block handled was produced by this same node.
      */
@@ -303,7 +303,7 @@ async function _MerkleTrees_rollback() {
     }
 }, _MerkleTrees_handleL2Block = 
 /**
- * Handles a single L2 block (i.e. Inserts the new commitments into the merkle tree).
+ * Handles a single L2 block (i.e. Inserts the new note hashes into the merkle tree).
  * @param l2Block - The L2 block to handle.
  */
 async function _MerkleTrees_handleL2Block(l2Block) {
@@ -329,18 +329,19 @@ async function _MerkleTrees_handleL2Block(l2Block) {
         await __classPrivateFieldGet(this, _MerkleTrees_instances, "m", _MerkleTrees_rollback).call(this);
         // Sync the append only trees
         for (const [tree, leaves] of [
-            [MerkleTreeId.CONTRACT_TREE, l2Block.newContracts],
-            [MerkleTreeId.NOTE_HASH_TREE, l2Block.newCommitments],
-            [MerkleTreeId.L1_TO_L2_MESSAGE_TREE, l2Block.newL1ToL2Messages],
+            [MerkleTreeId.CONTRACT_TREE, l2Block.body.txEffects.flatMap(txEffect => txEffect.contractLeaves)],
+            [MerkleTreeId.NOTE_HASH_TREE, l2Block.body.txEffects.flatMap(txEffect => txEffect.noteHashes)],
+            [MerkleTreeId.L1_TO_L2_MESSAGE_TREE, l2Block.body.l1ToL2Messages],
         ]) {
             await __classPrivateFieldGet(this, _MerkleTrees_instances, "m", _MerkleTrees_appendLeaves).call(this, tree, leaves.map(fr => fr.toBuffer()));
         }
         // Sync the indexed trees
-        await this.trees[MerkleTreeId.NULLIFIER_TREE].batchInsert(l2Block.newNullifiers.map(fr => fr.toBuffer()), NULLIFIER_SUBTREE_HEIGHT);
+        await this.trees[MerkleTreeId.NULLIFIER_TREE].batchInsert(l2Block.body.txEffects.flatMap(txEffect => txEffect.nullifiers.map(nullifier => nullifier.toBuffer())), NULLIFIER_SUBTREE_HEIGHT);
         const publicDataTree = this.trees[MerkleTreeId.PUBLIC_DATA_TREE];
+        const publicDataWrites = l2Block.body.txEffects.flatMap(txEffect => txEffect.publicDataWrites);
         // We insert the public data tree leaves with one batch per tx to avoid updating the same key twice
-        for (let i = 0; i < l2Block.newPublicDataWrites.length / MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX; i++) {
-            await publicDataTree.batchInsert(l2Block.newPublicDataWrites
+        for (let i = 0; i < publicDataWrites.length / MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX; i++) {
+            await publicDataTree.batchInsert(publicDataWrites
                 .slice(MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX * i, MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX * (i + 1))
                 .map(write => new PublicDataTreeLeaf(write.leafIndex, write.newValue).toBuffer()), PUBLIC_DATA_SUBTREE_HEIGHT);
         }
@@ -374,4 +375,4 @@ async function _MerkleTrees_handleL2Block(l2Block) {
         return false;
     }
 };
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"merkle_trees.js","sourceRoot":"","sources":["../../src/world-state-db/merkle_trees.ts"],"names":[],"mappings":"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"}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"merkle_trees.js","sourceRoot":"","sources":["../../src/world-state-db/merkle_trees.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aztec/world-state",
-  "version": "0.23.0",
+  "version": "0.26.1",
   "type": "module",
   "exports": "./dest/index.js",
   "typedocOptions": {
@@ -30,12 +30,12 @@
     "rootDir": "./src"
   },
   "dependencies": {
-    "@aztec/circuit-types": "0.23.0",
-    "@aztec/circuits.js": "0.23.0",
-    "@aztec/foundation": "0.23.0",
-    "@aztec/kv-store": "0.23.0",
-    "@aztec/merkle-tree": "0.23.0",
-    "@aztec/types": "0.23.0",
+    "@aztec/circuit-types": "0.26.1",
+    "@aztec/circuits.js": "0.26.1",
+    "@aztec/foundation": "0.26.1",
+    "@aztec/kv-store": "0.26.1",
+    "@aztec/merkle-tree": "0.26.1",
+    "@aztec/types": "0.26.1",
     "tslib": "^2.4.0"
   },
   "devDependencies": {

package/src/index.ts

@@ -0,0 +1,3 @@
+export * from './synchronizer/index.js';
+export * from './world-state-db/index.js';
+export * from './synchronizer/config.js';

package/src/synchronizer/config.ts

@@ -0,0 +1,27 @@
+/**
+ * World State synchronizer configuration values.
+ */
+export interface WorldStateConfig {
+  /**
+   * The frequency in which to check.
+   */
+  worldStateBlockCheckIntervalMS: number;
+
+  /**
+   * Size of queue of L2 blocks to store.
+   */
+  l2QueueSize: number;
+}
+
+/**
+ * Returns the configuration values for the world state synchronizer.
+ * @returns The configuration values for the world state synchronizer.
+ */
+export function getConfigEnvVars(): WorldStateConfig {
+  const { WS_BLOCK_CHECK_INTERVAL_MS, WS_L2_BLOCK_QUEUE_SIZE } = process.env;
+  const envVars: WorldStateConfig = {
+    worldStateBlockCheckIntervalMS: WS_BLOCK_CHECK_INTERVAL_MS ? +WS_BLOCK_CHECK_INTERVAL_MS : 100,
+    l2QueueSize: WS_L2_BLOCK_QUEUE_SIZE ? +WS_L2_BLOCK_QUEUE_SIZE : 1000,
+  };
+  return envVars;
+}

package/src/synchronizer/index.ts

@@ -0,0 +1,2 @@
+export * from './server_world_state_synchronizer.js';
+export * from './world_state_synchronizer.js';

package/src/synchronizer/server_world_state_synchronizer.ts

@@ -0,0 +1,215 @@
+import { L2Block, L2BlockDownloader, L2BlockSource } from '@aztec/circuit-types';
+import { L2BlockHandledStats } from '@aztec/circuit-types/stats';
+import { SerialQueue } from '@aztec/foundation/fifo';
+import { createDebugLogger } from '@aztec/foundation/log';
+import { elapsed } from '@aztec/foundation/timer';
+import { AztecKVStore, AztecSingleton } from '@aztec/kv-store';
+
+import { HandleL2BlockResult, MerkleTreeOperations, MerkleTrees } from '../world-state-db/index.js';
+import { MerkleTreeOperationsFacade } from '../world-state-db/merkle_tree_operations_facade.js';
+import { MerkleTreeSnapshotOperationsFacade } from '../world-state-db/merkle_tree_snapshot_operations_facade.js';
+import { WorldStateConfig } from './config.js';
+import { WorldStateRunningState, WorldStateStatus, WorldStateSynchronizer } from './world_state_synchronizer.js';
+
+/**
+ * Synchronizes the world state with the L2 blocks from a L2BlockSource.
+ * The synchronizer will download the L2 blocks from the L2BlockSource and insert the new note hashes into the merkle
+ * tree.
+ */
+export class ServerWorldStateSynchronizer implements WorldStateSynchronizer {
+  private latestBlockNumberAtStart = 0;
+
+  private l2BlockDownloader: L2BlockDownloader;
+  private syncPromise: Promise<void> = Promise.resolve();
+  private syncResolve?: () => void = undefined;
+  private jobQueue = new SerialQueue();
+  private stopping = false;
+  private runningPromise: Promise<void> = Promise.resolve();
+  private currentState: WorldStateRunningState = WorldStateRunningState.IDLE;
+  private blockNumber: AztecSingleton<number>;
+
+  constructor(
+    store: AztecKVStore,
+    private merkleTreeDb: MerkleTrees,
+    private l2BlockSource: L2BlockSource,
+    config: WorldStateConfig,
+    private log = createDebugLogger('aztec:world_state'),
+  ) {
+    this.blockNumber = store.openSingleton('world_state_synch_last_block_number');
+    this.l2BlockDownloader = new L2BlockDownloader(
+      l2BlockSource,
+      config.l2QueueSize,
+      config.worldStateBlockCheckIntervalMS,
+    );
+  }
+
+  public getLatest(): MerkleTreeOperations {
+    return new MerkleTreeOperationsFacade(this.merkleTreeDb, true);
+  }
+
+  public getCommitted(): MerkleTreeOperations {
+    return new MerkleTreeOperationsFacade(this.merkleTreeDb, false);
+  }
+
+  public getSnapshot(blockNumber: number): MerkleTreeOperations {
+    return new MerkleTreeSnapshotOperationsFacade(this.merkleTreeDb, blockNumber);
+  }
+
+  public async start() {
+    if (this.currentState === WorldStateRunningState.STOPPED) {
+      throw new Error('Synchronizer already stopped');
+    }
+    if (this.currentState !== WorldStateRunningState.IDLE) {
+      return this.syncPromise;
+    }
+
+    // get the current latest block number
+    this.latestBlockNumberAtStart = await this.l2BlockSource.getBlockNumber();
+
+    const blockToDownloadFrom = this.currentL2BlockNum + 1;
+
+    // if there are blocks to be retrieved, go to a synching state
+    if (blockToDownloadFrom <= this.latestBlockNumberAtStart) {
+      this.setCurrentState(WorldStateRunningState.SYNCHING);
+      this.syncPromise = new Promise(resolve => {
+        this.syncResolve = resolve;
+      });
+      this.log(`Starting sync from ${blockToDownloadFrom}, latest block ${this.latestBlockNumberAtStart}`);
+    } else {
+      // if no blocks to be retrieved, go straight to running
+      this.setCurrentState(WorldStateRunningState.RUNNING);
+      this.syncPromise = Promise.resolve();
+      this.log(`Next block ${blockToDownloadFrom} already beyond latest block at ${this.latestBlockNumberAtStart}`);
+    }
+
+    // start looking for further blocks
+    const blockProcess = async () => {
+      while (!this.stopping) {
+        await this.jobQueue.put(() => this.collectAndProcessBlocks());
+      }
+    };
+    this.jobQueue.start();
+    this.runningPromise = blockProcess();
+    this.l2BlockDownloader.start(blockToDownloadFrom);
+    this.log(`Started block downloader from block ${blockToDownloadFrom}`);
+    return this.syncPromise;
+  }
+
+  public async stop() {
+    this.log('Stopping world state...');
+    this.stopping = true;
+    await this.l2BlockDownloader.stop();
+    this.log('Cancelling job queue...');
+    await this.jobQueue.cancel();
+    this.log('Stopping Merkle trees');
+    await this.merkleTreeDb.stop();
+    this.log('Awaiting promise');
+    await this.runningPromise;
+    this.setCurrentState(WorldStateRunningState.STOPPED);
+  }
+
+  private get currentL2BlockNum(): number {
+    return this.blockNumber.get() ?? 0;
+  }
+
+  public status(): Promise<WorldStateStatus> {
+    const status = {
+      syncedToL2Block: this.currentL2BlockNum,
+      state: this.currentState,
+    } as WorldStateStatus;
+    return Promise.resolve(status);
+  }
+
+  /**
+   * Forces an immediate sync
+   * @param minBlockNumber - The minimum block number that we must sync to
+   * @returns A promise that resolves with the block number the world state was synced to
+   */
+  public async syncImmediate(minBlockNumber?: number): Promise<number> {
+    if (this.currentState !== WorldStateRunningState.RUNNING) {
+      throw new Error(`World State is not running, unable to perform sync`);
+    }
+    // If we have been given a block number to sync to and we have reached that number
+    // then return.
+    if (minBlockNumber !== undefined && minBlockNumber <= this.currentL2BlockNum) {
+      return this.currentL2BlockNum;
+    }
+    const blockToSyncTo = minBlockNumber === undefined ? 'latest' : `${minBlockNumber}`;
+    this.log(`World State at block ${this.currentL2BlockNum}, told to sync to block ${blockToSyncTo}...`);
+    // ensure any outstanding block updates are completed first.
+    await this.jobQueue.syncPoint();
+    while (true) {
+      // Check the block number again
+      if (minBlockNumber !== undefined && minBlockNumber <= this.currentL2BlockNum) {
+        return this.currentL2BlockNum;
+      }
+      // Poll for more blocks
+      const numBlocks = await this.l2BlockDownloader.pollImmediate();
+      this.log(`Block download immediate poll yielded ${numBlocks} blocks`);
+      if (numBlocks) {
+        // More blocks were received, process them and go round again
+        await this.jobQueue.put(() => this.collectAndProcessBlocks());
+        continue;
+      }
+      // No blocks are available, if we have been given a block number then we can't achieve it
+      if (minBlockNumber !== undefined) {
+        throw new Error(
+          `Unable to sync to block number ${minBlockNumber}, currently synced to block ${this.currentL2BlockNum}`,
+        );
+      }
+      return this.currentL2BlockNum;
+    }
+  }
+
+  /**
+   * Checks for the availability of new blocks and processes them.
+   */
+  private async collectAndProcessBlocks() {
+    // This request for blocks will timeout after 1 second if no blocks are received
+    const blocks = await this.l2BlockDownloader.getBlocks(1);
+    await this.handleL2Blocks(blocks);
+  }
+
+  /**
+   * Handles a list of L2 blocks (i.e. Inserts the new note hashes into the merkle tree).
+   * @param l2Blocks - The L2 blocks to handle.
+   * @returns Whether the block handled was produced by this same node.
+   */
+  private async handleL2Blocks(l2Blocks: L2Block[]) {
+    for (const l2Block of l2Blocks) {
+      const [duration, result] = await elapsed(() => this.handleL2Block(l2Block));
+      this.log(`Handled new L2 block`, {
+        eventName: 'l2-block-handled',
+        duration,
+        isBlockOurs: result.isBlockOurs,
+        ...l2Block.getStats(),
+      } satisfies L2BlockHandledStats);
+    }
+  }
+
+  /**
+   * Handles a single L2 block (i.e. Inserts the new note hashes into the merkle tree).
+   * @param l2Block - The L2 block to handle.
+   */
+  private async handleL2Block(l2Block: L2Block): Promise<HandleL2BlockResult> {
+    const result = await this.merkleTreeDb.handleL2Block(l2Block);
+    await this.blockNumber.set(l2Block.number);
+
+    if (this.currentState === WorldStateRunningState.SYNCHING && l2Block.number >= this.latestBlockNumberAtStart) {
+      this.setCurrentState(WorldStateRunningState.RUNNING);
+      if (this.syncResolve !== undefined) {
+        this.syncResolve();
+      }
+    }
+    return result;
+  }
+
+  /**
+   * Method to set the value of the current state.
+   * @param newState - New state value.
+   */
+  private setCurrentState(newState: WorldStateRunningState) {
+    this.currentState = newState;
+    this.log(`Moved to state ${WorldStateRunningState[this.currentState]}`);
+  }
+}

package/src/synchronizer/world_state_synchronizer.ts

@@ -0,0 +1,73 @@
+import { MerkleTreeOperations } from '../world-state-db/index.js';
+
+/**
+ * Defines the possible states of the world state synchronizer.
+ */
+export enum WorldStateRunningState {
+  IDLE,
+  SYNCHING,
+  RUNNING,
+  STOPPED,
+}
+
+/**
+ * Defines the status of the world state synchronizer.
+ */
+export interface WorldStateStatus {
+  /**
+   * The current state of the world state synchronizer.
+   */
+  state: WorldStateRunningState;
+  /**
+   * The block number that the world state synchronizer is synced to.
+   */
+  syncedToL2Block: number;
+}
+
+/**
+ * Defines the interface for a world state synchronizer.
+ */
+export interface WorldStateSynchronizer {
+  /**
+   * Starts the synchronizer.
+   * @returns A promise that resolves once the initial sync is completed.
+   */
+  start(): void;
+
+  /**
+   * Returns the current status of the synchronizer.
+   * @returns The current status of the synchronizer.
+   */
+  status(): Promise<WorldStateStatus>;
+
+  /**
+   * Stops the synchronizer.
+   */
+  stop(): Promise<void>;
+
+  /**
+   * Forces an immediate sync to an optionally provided minimum block number
+   * @param minBlockNumber - The minimum block number that we must sync to
+   * @returns A promise that resolves with the block number the world state was synced to
+   */
+  syncImmediate(minBlockNumber?: number): Promise<number>;
+
+  /**
+   * Returns an instance of MerkleTreeOperations that will include uncommitted data.
+   * @returns An instance of MerkleTreeOperations that will include uncommitted data.
+   */
+  getLatest(): MerkleTreeOperations;
+
+  /**
+   * Returns an instance of MerkleTreeOperations that will not include uncommitted data.
+   * @returns An instance of MerkleTreeOperations that will not include uncommitted data.
+   */
+  getCommitted(): MerkleTreeOperations;
+
+  /**
+   * Returns a readonly instance of MerkleTreeOperations where the state is as it was at the given block number
+   * @param block - The block number to look at
+   * @returns An instance of MerkleTreeOperations
+   */
+  getSnapshot(block: number): MerkleTreeOperations;
+}

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

@@ -0,0 +1,3 @@
+export * from './merkle_trees.js';
+export * from './merkle_tree_db.js';
+export * from './merkle_tree_operations.js';