@aztec/world-state 0.1.0-alpha43 → 0.1.0-alpha45

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

@@ -1,5 +1,5 @@
 /// <reference types="node" resolution-mode="require"/>
-import { Fr, GlobalVariables } from '@aztec/circuits.js';
+import { Fr } from '@aztec/circuits.js';
 import { IWasmModule } from '@aztec/foundation/wasm';
 import { LeafData, LowLeafWitnessData } from '@aztec/merkle-tree';
 import { L2Block, MerkleTreeId, SiblingPath } from '@aztec/types';
@@ -12,6 +12,7 @@ export declare class MerkleTrees implements MerkleTreeDb {
     private db;
     private log;
     private trees;
+    private latestGlobalVariablesHash;
     private jobQueue;
     constructor(db: levelup.LevelUp, log?: import("@aztec/foundation/log").DebugLogger);
     /**
@@ -43,10 +44,20 @@ export declare class MerkleTrees implements MerkleTreeDb {
     /**
      * Inserts into the roots trees (CONTRACT_TREE_ROOTS_TREE, PRIVATE_DATA_TREE_ROOTS_TREE, L1_TO_L2_MESSAGES_TREE_ROOTS_TREE)
      * the current roots of the corresponding trees (CONTRACT_TREE, PRIVATE_DATA_TREE, L1_TO_L2_MESSAGES_TREE).
-     * @param globals - The global variables to use for hashing.
+     * @param globalsHash - The current global variables hash.
      * @param includeUncommitted - Indicates whether to include uncommitted data.
      */
-    updateHistoricBlocksTree(globals: GlobalVariables, includeUncommitted: boolean): Promise<void>;
+    updateHistoricBlocksTree(globalsHash: Fr, includeUncommitted: boolean): Promise<void>;
+    /**
+     * Updates the latest global variables hash
+     * @param globalVariablesHash - The latest global variables hash
+     */
+    updateLatestGlobalVariablesHash(globalVariablesHash: Fr): Promise<void>;
+    /**
+     * Gets the global variables hash from the previous block
+     * @param includeUncommitted - Indicates whether to include uncommitted data.
+     */
+    getLatestGlobalVariablesHash(includeUncommitted: boolean): Promise<Fr>;
     /**
      * Gets the tree info for the specified tree.
      * @param treeId - Id of the tree to get information from.
@@ -59,9 +70,9 @@ export declare class MerkleTrees implements MerkleTreeDb {
      * @param includeUncommitted - Indicates whether to include uncommitted data.
      * @returns The current roots of the trees.
      */
-    getTreeRoots(includeUncommitted: boolean): CurrentTreeRoots;
-    getCurrentBlockHash(globals: GlobalVariables, includeUncommitted: boolean): Promise<Fr>;
-    getAllTreeRoots(includeUncommitted: boolean): Buffer[];
+    getTreeRoots(includeUncommitted: boolean): Promise<CurrentTreeRoots>;
+    private _getCurrentBlockHash;
+    private _getAllTreeRoots;
     /**
      * Gets the value at the given index.
      * @param treeId - The ID of the tree to get the leaf value from.
@@ -155,6 +166,9 @@ export declare class MerkleTrees implements MerkleTreeDb {
      * @returns Promise containing the result of the function.
      */
     private synchronise;
+    private _updateLatestGlobalVariablesHash;
+    private _getGlobalVariablesHash;
+    private _updateHistoricBlocksTree;
     /**
      * Returns the tree info for the specified tree id.
      * @param treeId - Id of the tree to get information from.

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,10 +1,12 @@
 import { BaseRollupInputs, CONTRACT_TREE_HEIGHT, CircuitsWasm, Fr, GlobalVariables, HISTORIC_BLOCKS_TREE_HEIGHT, L1_TO_L2_MSG_TREE_HEIGHT, NULLIFIER_TREE_HEIGHT, PRIVATE_DATA_TREE_HEIGHT, PUBLIC_DATA_TREE_HEIGHT, } from '@aztec/circuits.js';
-import { computeBlockHashWithGlobals } from '@aztec/circuits.js/abis';
+import { computeBlockHash } from '@aztec/circuits.js/abis';
+import { Committable } from '@aztec/foundation/committable';
 import { SerialQueue } from '@aztec/foundation/fifo';
 import { createDebugLogger } from '@aztec/foundation/log';
 import { Pedersen, SparseTree, StandardIndexedTree, StandardTree, newTree, } from '@aztec/merkle-tree';
 import { MerkleTreeId, merkleTreeIds } from '@aztec/types';
 import { MerkleTreeOperationsFacade } from '../merkle-tree/merkle_tree_operations_facade.js';
+import { computeGlobalVariablesHash } from '../utils.js';
 import { INITIAL_NULLIFIER_TREE_SIZE, } from './index.js';
 /**
  * A convenience class for managing multiple merkle trees.
@@ -15,6 +17,7 @@ export class MerkleTrees {
         this.log = log;
         this.trees = [];
         this.jobQueue = new SerialQueue();
+        this.latestGlobalVariablesHash = new Committable(Fr.zero());
     }
     /**
      * Initialises the collection of Merkle Trees.
@@ -32,8 +35,10 @@ export class MerkleTrees {
         this.trees = [contractTree, nullifierTree, privateDataTree, publicDataTree, l1Tol2MessagesTree, historicBlocksTree];
         this.jobQueue.start();
         // The first leaf in the blocks tree contains the empty roots of the other trees and empty global variables.
-        await this.updateHistoricBlocksTree(GlobalVariables.empty(), true);
-        await historicBlocksTree.commit();
+        const initialGlobalVariablesHash = await computeGlobalVariablesHash(GlobalVariables.empty());
+        await this._updateLatestGlobalVariablesHash(initialGlobalVariablesHash);
+        await this._updateHistoricBlocksTree(initialGlobalVariablesHash, true);
+        await this._commit();
     }
     /**
      * Method to asynchronously create and initialise a MerkleTrees instance.
@@ -69,12 +74,25 @@ export class MerkleTrees {
     /**
      * Inserts into the roots trees (CONTRACT_TREE_ROOTS_TREE, PRIVATE_DATA_TREE_ROOTS_TREE, L1_TO_L2_MESSAGES_TREE_ROOTS_TREE)
      * the current roots of the corresponding trees (CONTRACT_TREE, PRIVATE_DATA_TREE, L1_TO_L2_MESSAGES_TREE).
-     * @param globals - The global variables to use for hashing.
+     * @param globalsHash - The current global variables hash.
      * @param includeUncommitted - Indicates whether to include uncommitted data.
      */
-    async updateHistoricBlocksTree(globals, includeUncommitted) {
-        const blockHash = await this.getCurrentBlockHash(globals, includeUncommitted);
-        await this.appendLeaves(MerkleTreeId.BLOCKS_TREE, [blockHash.toBuffer()]);
+    async updateHistoricBlocksTree(globalsHash, includeUncommitted) {
+        await this.synchronise(() => this._updateHistoricBlocksTree(globalsHash, includeUncommitted));
+    }
+    /**
+     * Updates the latest global variables hash
+     * @param globalVariablesHash - The latest global variables hash
+     */
+    async updateLatestGlobalVariablesHash(globalVariablesHash) {
+        return await this.synchronise(() => this._updateLatestGlobalVariablesHash(globalVariablesHash));
+    }
+    /**
+     * Gets the global variables hash from the previous block
+     * @param includeUncommitted - Indicates whether to include uncommitted data.
+     */
+    async getLatestGlobalVariablesHash(includeUncommitted) {
+        return await this.synchronise(() => this._getGlobalVariablesHash(includeUncommitted));
     }
     /**
      * Gets the tree info for the specified tree.
@@ -90,8 +108,8 @@ export class MerkleTrees {
      * @param includeUncommitted - Indicates whether to include uncommitted data.
      * @returns The current roots of the trees.
      */
-    getTreeRoots(includeUncommitted) {
-        const roots = this.getAllTreeRoots(includeUncommitted);
+    async getTreeRoots(includeUncommitted) {
+        const roots = await this.synchronise(() => Promise.resolve(this._getAllTreeRoots(includeUncommitted)));
         return {
             privateDataTreeRoot: roots[0],
             nullifierTreeRoot: roots[1],
@@ -101,13 +119,13 @@ export class MerkleTrees {
             blocksTreeRoot: roots[5],
         };
     }
-    async getCurrentBlockHash(globals, includeUncommitted) {
-        const roots = this.getAllTreeRoots(includeUncommitted).map(root => Fr.fromBuffer(root));
+    async _getCurrentBlockHash(globalsHash, includeUncommitted) {
+        const roots = (await this._getAllTreeRoots(includeUncommitted)).map(root => Fr.fromBuffer(root));
         const wasm = await CircuitsWasm.get();
-        return computeBlockHashWithGlobals(wasm, globals, roots[0], roots[1], roots[2], roots[3], roots[4]);
+        return computeBlockHash(wasm, globalsHash, roots[0], roots[1], roots[2], roots[3], roots[4]);
     }
-    getAllTreeRoots(includeUncommitted) {
-        return [
+    _getAllTreeRoots(includeUncommitted) {
+        const roots = [
             MerkleTreeId.PRIVATE_DATA_TREE,
             MerkleTreeId.NULLIFIER_TREE,
             MerkleTreeId.CONTRACT_TREE,
@@ -115,6 +133,7 @@ export class MerkleTrees {
             MerkleTreeId.PUBLIC_DATA_TREE,
             MerkleTreeId.BLOCKS_TREE,
         ].map(tree => this.trees[tree].getRoot(includeUncommitted));
+        return Promise.resolve(roots);
     }
     /**
      * Gets the value at the given index.
@@ -237,6 +256,17 @@ export class MerkleTrees {
     async synchronise(fn) {
         return await this.jobQueue.put(fn);
     }
+    _updateLatestGlobalVariablesHash(globalVariablesHash) {
+        this.latestGlobalVariablesHash.set(globalVariablesHash);
+        return Promise.resolve();
+    }
+    _getGlobalVariablesHash(includeUncommitted) {
+        return Promise.resolve(this.latestGlobalVariablesHash.get(includeUncommitted));
+    }
+    async _updateHistoricBlocksTree(globalsHash, includeUncommitted) {
+        const blockHash = await this._getCurrentBlockHash(globalsHash, includeUncommitted);
+        await this._appendLeaves(MerkleTreeId.BLOCKS_TREE, [blockHash.toBuffer()]);
+    }
     /**
      * Returns the tree info for the specified tree id.
      * @param treeId - Id of the tree to get information from.
@@ -298,6 +328,7 @@ export class MerkleTrees {
         for (const tree of this.trees) {
             await tree.commit();
         }
+        this.latestGlobalVariablesHash.commit();
     }
     /**
      * Rolls back all pending updates.
@@ -307,6 +338,7 @@ export class MerkleTrees {
         for (const tree of this.trees) {
             await tree.rollback();
         }
+        this.latestGlobalVariablesHash.rollback();
     }
     /**
      * Handles a single L2 block (i.e. Inserts the new commitments into the merkle tree).
@@ -351,7 +383,10 @@ export class MerkleTrees {
                 await this._updateLeaf(MerkleTreeId.PUBLIC_DATA_TREE, newValue.toBuffer(), leafIndex.value);
             }
             // Sync and add the block to the historic blocks tree
-            const blockHash = await this.getCurrentBlockHash(l2Block.globalVariables, true);
+            const globalVariablesHash = await computeGlobalVariablesHash(l2Block.globalVariables);
+            await this._updateLatestGlobalVariablesHash(globalVariablesHash);
+            this.log(`Synced global variables with hash ${this.latestGlobalVariablesHash.toString()}`);
+            const blockHash = await this._getCurrentBlockHash(globalVariablesHash, true);
             await this._appendLeaves(MerkleTreeId.BLOCKS_TREE, [blockHash.toBuffer()]);
             await this._commit();
         }
@@ -361,4 +396,4 @@ export class MerkleTrees {
         }
     }
 }
-//# 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,13 +1,13 @@
 {
   "name": "@aztec/world-state",
-  "version": "0.1.0-alpha43",
+  "version": "0.1.0-alpha45",
   "exports": "./dest/index.js",
   "type": "module",
   "dependencies": {
-    "@aztec/circuits.js": "0.1.0-alpha43",
-    "@aztec/foundation": "0.1.0-alpha43",
-    "@aztec/merkle-tree": "0.1.0-alpha43",
-    "@aztec/types": "0.1.0-alpha43",
+    "@aztec/circuits.js": "0.1.0-alpha45",
+    "@aztec/foundation": "0.1.0-alpha45",
+    "@aztec/merkle-tree": "0.1.0-alpha45",
+    "@aztec/types": "0.1.0-alpha45",
     "levelup": "^5.1.1",
     "lodash.times": "^4.3.2",
     "memdown": "^6.1.1",

package/src/merkle-tree/merkle_tree_operations_facade.ts

@@ -1,4 +1,4 @@
-import { GlobalVariables } from '@aztec/circuits.js';
+import { Fr } from '@aztec/foundation/fields';
 import { LowLeafWitnessData } from '@aztec/merkle-tree';
 import { L2Block, MerkleTreeId, SiblingPath } from '@aztec/types';
 
@@ -24,7 +24,7 @@ export class MerkleTreeOperationsFacade implements MerkleTreeOperations {
    * Get the current roots of the commitment trees.
    * @returns The current roots of the trees.
    */
-  getTreeRoots(): CurrentTreeRoots {
+  getTreeRoots(): Promise<CurrentTreeRoots> {
     return this.trees.getTreeRoots(this.includeUncommitted);
   }
 
@@ -44,8 +44,9 @@ export class MerkleTreeOperationsFacade implements MerkleTreeOperations {
    * @param index - The index of the leaf for which a sibling path is required.
    * @returns A promise with the sibling path of the specified leaf index.
    */
-  getSiblingPath(treeId: MerkleTreeId, index: bigint): Promise<SiblingPath<number>> {
-    return this.trees.getSiblingPath(treeId, index, this.includeUncommitted);
+  async getSiblingPath<N extends number>(treeId: MerkleTreeId, index: bigint): Promise<SiblingPath<N>> {
+    const path = await this.trees.getSiblingPath(treeId, index, this.includeUncommitted);
+    return path as unknown as SiblingPath<N>;
   }
 
   /**
@@ -116,11 +117,26 @@ export class MerkleTreeOperationsFacade implements MerkleTreeOperations {
   /**
    * Inserts into the roots trees (CONTRACT_TREE_ROOTS_TREE, PRIVATE_DATA_TREE_ROOTS_TREE)
    * the current roots of the corresponding trees (CONTRACT_TREE, PRIVATE_DATA_TREE).
-   * @param globalVariables - The current global variables to include in the block hash.
+   * @param globalVariablesHash - The hash of the current global variables to include in the block hash.
    * @returns Empty promise.
    */
-  public updateHistoricBlocksTree(globalVariables: GlobalVariables): Promise<void> {
-    return this.trees.updateHistoricBlocksTree(globalVariables, this.includeUncommitted);
+  public updateHistoricBlocksTree(globalVariablesHash: Fr): Promise<void> {
+    return this.trees.updateHistoricBlocksTree(globalVariablesHash, this.includeUncommitted);
+  }
+
+  /**
+   * Updates the latest global variables hash
+   * @param globalVariablesHash - The latest global variables hash
+   */
+  public updateLatestGlobalVariablesHash(globalVariablesHash: Fr): Promise<void> {
+    return this.trees.updateLatestGlobalVariablesHash(globalVariablesHash, this.includeUncommitted);
+  }
+
+  /**
+   * Gets the global variables hash from the previous block
+   */
+  public getLatestGlobalVariablesHash(): Promise<Fr> {
+    return this.trees.getLatestGlobalVariablesHash(this.includeUncommitted);
   }
 
   /**

package/src/synchroniser/server_world_state_synchroniser.test.ts

@@ -26,7 +26,7 @@ import {
 import { jest } from '@jest/globals';
 import times from 'lodash.times';
 
-import { MerkleTreeDb } from '../index.js';
+import { MerkleTreeDb, MerkleTrees, WorldStateConfig } from '../index.js';
 import { ServerWorldStateSynchroniser } from './server_world_state_synchroniser.js';
 import { WorldStateRunningState } from './world_state_synchroniser.js';
 
@@ -96,14 +96,19 @@ const getMockBlock = (blockNumber: number, newContractsCommitments?: Buffer[]) =
   return block;
 };
 
-const createSynchroniser = (merkleTreeDb: any, rollupSource: any) =>
-  new ServerWorldStateSynchroniser(merkleTreeDb as MerkleTreeDb, rollupSource as L2BlockSource);
+const createSynchroniser = (merkleTreeDb: any, rollupSource: any, blockCheckInterval = 100) => {
+  const worldStateConfig: WorldStateConfig = {
+    worldStateBlockCheckIntervalMS: blockCheckInterval,
+    l2QueueSize: 1000,
+  };
+  return new ServerWorldStateSynchroniser(merkleTreeDb as MerkleTrees, rollupSource as L2BlockSource, worldStateConfig);
+};
 
 const log = createDebugLogger('aztec:server_world_state_synchroniser_test');
 
 describe('server_world_state_synchroniser', () => {
-  const rollupSource: Mockify<Pick<L2BlockSource, 'getBlockHeight' | 'getL2Blocks'>> = {
-    getBlockHeight: jest.fn().mockImplementation(getLatestBlockNumber),
+  const rollupSource: Mockify<Pick<L2BlockSource, 'getBlockNumber' | 'getL2Blocks'>> = {
+    getBlockNumber: jest.fn().mockImplementation(getLatestBlockNumber),
     getL2Blocks: jest.fn().mockImplementation(consumeNextBlocks),
   };
 
@@ -126,8 +131,27 @@ describe('server_world_state_synchroniser', () => {
     commit: jest.fn().mockImplementation(() => Promise.resolve()),
     rollback: jest.fn().mockImplementation(() => Promise.resolve()),
     handleL2Block: jest.fn().mockImplementation(() => Promise.resolve()),
+    stop: jest.fn().mockImplementation(() => Promise.resolve()),
   } as any;
 
+  const performInitialSync = async (server: ServerWorldStateSynchroniser) => {
+    // test initial state
+    let status = await server.status();
+    expect(status.syncedToL2Block).toEqual(0);
+    expect(status.state).toEqual(WorldStateRunningState.IDLE);
+
+    // create the initial blocks
+    nextBlocks = Array(LATEST_BLOCK_NUMBER)
+      .fill(0)
+      .map((_, index: number) => getMockBlock(index + 1));
+
+    // start the sync process and await it
+    await server.start().catch(err => log.error('Sync not completed: ', err));
+
+    status = await server.status();
+    expect(status.syncedToL2Block).toBe(LATEST_BLOCK_NUMBER);
+  };
+
   it('can be constructed', () => {
     expect(() => createSynchroniser(merkleTreeDb, rollupSource)).not.toThrow();
   });
@@ -241,7 +265,7 @@ describe('server_world_state_synchroniser', () => {
 
   it('immediately syncs if no new blocks', async () => {
     const server = createSynchroniser(merkleTreeDb, rollupSource);
-    rollupSource.getBlockHeight.mockImplementationOnce(() => {
+    rollupSource.getBlockNumber.mockImplementationOnce(() => {
       return Promise.resolve(0);
     });
 
@@ -259,7 +283,7 @@ describe('server_world_state_synchroniser', () => {
 
   it("can't be started if already stopped", async () => {
     const server = createSynchroniser(merkleTreeDb, rollupSource);
-    rollupSource.getBlockHeight.mockImplementationOnce(() => {
+    rollupSource.getBlockNumber.mockImplementationOnce(() => {
       return Promise.resolve(0);
     });
 
@@ -284,4 +308,121 @@ describe('server_world_state_synchroniser', () => {
     expect(merkleTreeDb.handleL2Block).toHaveBeenCalledTimes(totalBlocks);
     await server.stop();
   });
+
+  it('can immediately sync to latest', async () => {
+    const server = createSynchroniser(merkleTreeDb, rollupSource, 10000);
+
+    await performInitialSync(server);
+
+    // the server should now be asleep for a long time
+    // we will add a new block and force an immediate sync
+    nextBlocks = [getMockBlock(LATEST_BLOCK_NUMBER + 1)];
+    await server.syncImmediate();
+
+    let status = await server.status();
+    expect(status.syncedToL2Block).toBe(LATEST_BLOCK_NUMBER + 1);
+
+    nextBlocks = [getMockBlock(LATEST_BLOCK_NUMBER + 2), getMockBlock(LATEST_BLOCK_NUMBER + 3)];
+    await server.syncImmediate();
+
+    status = await server.status();
+    expect(status.syncedToL2Block).toBe(LATEST_BLOCK_NUMBER + 3);
+
+    // stop the synchroniser
+    await server.stop();
+
+    // check the final status
+    status = await server.status();
+    expect(status.state).toEqual(WorldStateRunningState.STOPPED);
+    expect(status.syncedToL2Block).toEqual(LATEST_BLOCK_NUMBER + 3);
+  });
+
+  it('can immediately sync to a minimum block number', async () => {
+    const server = createSynchroniser(merkleTreeDb, rollupSource, 10000);
+
+    await performInitialSync(server);
+
+    // the server should now be asleep for a long time
+    // we will add 20 blocks and force a sync to at least LATEST + 5
+    nextBlocks = Array(20)
+      .fill(0)
+      .map((_, index: number) => getMockBlock(index + 1 + LATEST_BLOCK_NUMBER));
+    await server.syncImmediate(LATEST_BLOCK_NUMBER + 5);
+
+    // we should have synced all of the blocks
+    let status = await server.status();
+    expect(status.syncedToL2Block).toBe(LATEST_BLOCK_NUMBER + 20);
+
+    // stop the synchroniser
+    await server.stop();
+
+    // check the final status
+    status = await server.status();
+    expect(status.state).toEqual(WorldStateRunningState.STOPPED);
+    expect(status.syncedToL2Block).toEqual(LATEST_BLOCK_NUMBER + 20);
+  });
+
+  it('can immediately sync to a minimum block in the past', async () => {
+    const server = createSynchroniser(merkleTreeDb, rollupSource, 10000);
+
+    await performInitialSync(server);
+    // syncing to a block in the past should succeed
+    await server.syncImmediate(LATEST_BLOCK_NUMBER - 1);
+    // syncing to the current block should succeed
+    await server.syncImmediate(LATEST_BLOCK_NUMBER);
+
+    // we should have synced all of the blocks
+    let status = await server.status();
+    expect(status.syncedToL2Block).toBe(LATEST_BLOCK_NUMBER);
+
+    // stop the synchroniser
+    await server.stop();
+
+    // check the final status
+    status = await server.status();
+    expect(status.state).toEqual(WorldStateRunningState.STOPPED);
+    expect(status.syncedToL2Block).toEqual(LATEST_BLOCK_NUMBER);
+  });
+
+  it('throws if you try to sync to an unavailable block', async () => {
+    const server = createSynchroniser(merkleTreeDb, rollupSource, 10000);
+
+    await performInitialSync(server);
+
+    // the server should now be asleep for a long time
+    // we will add 2 blocks and force a sync to at least LATEST + 5
+    nextBlocks = Array(2)
+      .fill(0)
+      .map((_, index: number) => getMockBlock(index + 1 + LATEST_BLOCK_NUMBER));
+    await expect(server.syncImmediate(LATEST_BLOCK_NUMBER + 5)).rejects.toThrow(
+      `Unable to sync to block number ${LATEST_BLOCK_NUMBER + 5}, currently synced to block ${LATEST_BLOCK_NUMBER + 2}`,
+    );
+
+    let status = await server.status();
+    expect(status.syncedToL2Block).toBe(LATEST_BLOCK_NUMBER + 2);
+
+    // stop the synchroniser
+    await server.stop();
+
+    // check the final status
+    status = await server.status();
+    expect(status.state).toEqual(WorldStateRunningState.STOPPED);
+    expect(status.syncedToL2Block).toEqual(LATEST_BLOCK_NUMBER + 2);
+  });
+
+  it('throws if you try to immediate sync when not running', async () => {
+    const server = createSynchroniser(merkleTreeDb, rollupSource, 10000);
+
+    // test initial state
+    const status = await server.status();
+    expect(status.syncedToL2Block).toEqual(0);
+    expect(status.state).toEqual(WorldStateRunningState.IDLE);
+
+    // create an initial block
+    nextBlocks = Array(LATEST_BLOCK_NUMBER)
+      .fill(0)
+      .map((_, index: number) => getMockBlock(index + 1));
+
+    await expect(server.syncImmediate()).rejects.toThrow(`World State is not running, unable to perform sync`);
+  });
 });