@aztec/world-state 0.69.1-devnet → 0.70.0

package/dest/native/world_state_ops_queue.js

@@ -0,0 +1,154 @@
+import { promiseWithResolvers } from '@aztec/foundation/promise';
+import { WorldStateMessageType } from './message.js';
+// These are the set of message types that implement mutating operations
+// Messages of these types require exclusive access to their given forks
+export const MUTATING_MSG_TYPES = new Set([
+    WorldStateMessageType.APPEND_LEAVES,
+    WorldStateMessageType.BATCH_INSERT,
+    WorldStateMessageType.SEQUENTIAL_INSERT,
+    WorldStateMessageType.UPDATE_ARCHIVE,
+    WorldStateMessageType.COMMIT,
+    WorldStateMessageType.ROLLBACK,
+    WorldStateMessageType.SYNC_BLOCK,
+    WorldStateMessageType.CREATE_FORK,
+    WorldStateMessageType.DELETE_FORK,
+    WorldStateMessageType.FINALISE_BLOCKS,
+    WorldStateMessageType.UNWIND_BLOCKS,
+    WorldStateMessageType.REMOVE_HISTORICAL_BLOCKS,
+]);
+// This class implements the per-fork operation queue
+export class WorldStateOpsQueue {
+    constructor() {
+        this.requests = [];
+        this.inFlightMutatingCount = 0;
+        this.inFlightCount = 0;
+        this.requestId = 0;
+        this.ops = new Map();
+    }
+    // The primary public api, this is where an operation is queued
+    // We return a promise that will ultimately be resolved/rejected with the response/error generated by the 'request' argument
+    execute(request, messageType, committedOnly) {
+        if (this.stopResolve !== undefined) {
+            throw new Error('Unable to send request to world state, queue already stopped');
+        }
+        const op = {
+            requestId: this.requestId++,
+            mutating: MUTATING_MSG_TYPES.has(messageType),
+            request,
+            promise: promiseWithResolvers(),
+        };
+        this.ops.set(op.requestId, op);
+        // Perform the appropriate action based upon the queueing rules
+        if (op.mutating) {
+            this.executeMutating(op);
+        }
+        else if (committedOnly === false) {
+            this.executeNonMutatingUncommitted(op);
+        }
+        else {
+            this.executeNonMutatingCommitted(op);
+        }
+        return op.promise.promise;
+    }
+    // Mutating requests need exclusive access
+    executeMutating(op) {
+        // If nothing is in flight then we send the request immediately
+        // Otherwise add to the queue
+        if (this.inFlightCount === 0) {
+            this.sendEnqueuedRequest(op);
+        }
+        else {
+            this.requests.push(op);
+        }
+    }
+    // Non mutating requests including uncommitted state
+    executeNonMutatingUncommitted(op) {
+        // If there are no mutating requests in flight and there is nothing queued
+        // then send the request immediately
+        // If a mutating request is in flight then we must wait
+        // If a mutating request is not in flight but something is queued then it must be a mutating request
+        if (this.inFlightMutatingCount == 0 && this.requests.length == 0) {
+            this.sendEnqueuedRequest(op);
+        }
+        else {
+            this.requests.push(op);
+        }
+    }
+    executeNonMutatingCommitted(op) {
+        // This is a non-mutating request for committed data
+        // It can always be sent
+        op.request()
+            .then(op.promise.resolve, op.promise.reject)
+            .finally(() => {
+            this.ops.delete(op.requestId);
+        });
+    }
+    checkAndEnqueue(completedOp) {
+        // As request has completed
+        // First we decrements the relevant in flight counters
+        if (completedOp.mutating) {
+            --this.inFlightMutatingCount;
+        }
+        --this.inFlightCount;
+        // If there are still requests in flight then do nothing further
+        if (this.inFlightCount != 0) {
+            return;
+        }
+        // No requests in flight, send next queued requests
+        // We loop and send:
+        // 1 mutating request if it is next in the queue
+        // As many non-mutating requests as we encounter until
+        // we exhaust the queue or we reach a mutating request
+        while (this.requests.length > 0) {
+            const next = this.requests[0];
+            if (next.mutating) {
+                if (this.inFlightCount == 0) {
+                    // send the mutating request
+                    this.requests.shift();
+                    this.sendEnqueuedRequest(next);
+                }
+                // this request is mutating, we need to stop here
+                break;
+            }
+            else {
+                // not mutating, send and go round again
+                this.requests.shift();
+                this.sendEnqueuedRequest(next);
+            }
+        }
+        // If the queue is empty, there is nothing in flight and we have been told to stop, then resolve the stop promise
+        if (this.inFlightCount == 0 && this.stopResolve !== undefined) {
+            this.stopResolve();
+        }
+    }
+    sendEnqueuedRequest(op) {
+        // Here we increment the in flight counts before sending
+        ++this.inFlightCount;
+        if (op.mutating) {
+            ++this.inFlightMutatingCount;
+        }
+        // Make the request and pass the response/error through to the stored promise
+        op.request()
+            .then(op.promise.resolve, op.promise.reject)
+            .finally(() => {
+            this.checkAndEnqueue(op);
+            this.ops.delete(op.requestId);
+        });
+    }
+    stop() {
+        // If there is already a stop promise then return it
+        if (this.stopPromise) {
+            return this.stopPromise;
+        }
+        // Otherwise create a new one and capture the resolve method
+        this.stopPromise = new Promise(resolve => {
+            this.stopResolve = resolve;
+        });
+        // If no outstanding requests then immediately resolve the promise
+        if (this.requests.length == 0 && this.inFlightCount == 0 && this.stopResolve !== undefined) {
+            this.stopResolve();
+        }
+        return this.stopPromise;
+    }
+}
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoid29ybGRfc3RhdGVfb3BzX3F1ZXVlLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL25hdGl2ZS93b3JsZF9zdGF0ZV9vcHNfcXVldWUudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLG9CQUFvQixFQUFFLE1BQU0sMkJBQTJCLENBQUM7QUFFakUsT0FBTyxFQUFFLHFCQUFxQixFQUFFLE1BQU0sY0FBYyxDQUFDO0FBdUJyRCx3RUFBd0U7QUFDeEUsd0VBQXdFO0FBQ3hFLE1BQU0sQ0FBQyxNQUFNLGtCQUFrQixHQUFHLElBQUksR0FBRyxDQUFDO0lBQ3hDLHFCQUFxQixDQUFDLGFBQWE7SUFDbkMscUJBQXFCLENBQUMsWUFBWTtJQUNsQyxxQkFBcUIsQ0FBQyxpQkFBaUI7SUFDdkMscUJBQXFCLENBQUMsY0FBYztJQUNwQyxxQkFBcUIsQ0FBQyxNQUFNO0lBQzVCLHFCQUFxQixDQUFDLFFBQVE7SUFDOUIscUJBQXFCLENBQUMsVUFBVTtJQUNoQyxxQkFBcUIsQ0FBQyxXQUFXO0lBQ2pDLHFCQUFxQixDQUFDLFdBQVc7SUFDakMscUJBQXFCLENBQUMsZUFBZTtJQUNyQyxxQkFBcUIsQ0FBQyxhQUFhO0lBQ25DLHFCQUFxQixDQUFDLHdCQUF3QjtDQUMvQyxDQUFDLENBQUM7QUFFSCxxREFBcUQ7QUFDckQsTUFBTSxPQUFPLGtCQUFrQjtJQUEvQjtRQUNVLGFBQVEsR0FBbUIsRUFBRSxDQUFDO1FBQzlCLDBCQUFxQixHQUFHLENBQUMsQ0FBQztRQUMxQixrQkFBYSxHQUFHLENBQUMsQ0FBQztRQUdsQixjQUFTLEdBQUcsQ0FBQyxDQUFDO1FBQ2QsUUFBRyxHQUE4QixJQUFJLEdBQUcsRUFBRSxDQUFDO0lBd0lyRCxDQUFDO0lBdElDLCtEQUErRDtJQUMvRCw0SEFBNEg7SUFDckgsT0FBTyxDQUFDLE9BQTJCLEVBQUUsV0FBa0MsRUFBRSxhQUFzQjtRQUNwRyxJQUFJLElBQUksQ0FBQyxXQUFXLEtBQUssU0FBUyxFQUFFLENBQUM7WUFDbkMsTUFBTSxJQUFJLEtBQUssQ0FBQyw4REFBOEQsQ0FBQyxDQUFDO1FBQ2xGLENBQUM7UUFFRCxNQUFNLEVBQUUsR0FBaUI7WUFDdkIsU0FBUyxFQUFFLElBQUksQ0FBQyxTQUFTLEVBQUU7WUFDM0IsUUFBUSxFQUFFLGtCQUFrQixDQUFDLEdBQUcsQ0FBQyxXQUFXLENBQUM7WUFDN0MsT0FBTztZQUNQLE9BQU8sRUFBRSxvQkFBb0IsRUFBRTtTQUNoQyxDQUFDO1FBQ0YsSUFBSSxDQUFDLEdBQUcsQ0FBQyxHQUFHLENBQUMsRUFBRSxDQUFDLFNBQVMsRUFBRSxFQUFFLENBQUMsQ0FBQztRQUUvQiwrREFBK0Q7UUFDL0QsSUFBSSxFQUFFLENBQUMsUUFBUSxFQUFFLENBQUM7WUFDaEIsSUFBSSxDQUFDLGVBQWUsQ0FBQyxFQUFFLENBQUMsQ0FBQztRQUMzQixDQUFDO2FBQU0sSUFBSSxhQUFhLEtBQUssS0FBSyxFQUFFLENBQUM7WUFDbkMsSUFBSSxDQUFDLDZCQUE2QixDQUFDLEVBQUUsQ0FBQyxDQUFDO1FBQ3pDLENBQUM7YUFBTSxDQUFDO1lBQ04sSUFBSSxDQUFDLDJCQUEyQixDQUFDLEVBQUUsQ0FBQyxDQUFDO1FBQ3ZDLENBQUM7UUFDRCxPQUFPLEVBQUUsQ0FBQyxPQUFPLENBQUMsT0FBTyxDQUFDO0lBQzVCLENBQUM7SUFFRCwwQ0FBMEM7SUFDbEMsZUFBZSxDQUFDLEVBQWdCO1FBQ3RDLCtEQUErRDtRQUMvRCw2QkFBNkI7UUFDN0IsSUFBSSxJQUFJLENBQUMsYUFBYSxLQUFLLENBQUMsRUFBRSxDQUFDO1lBQzdCLElBQUksQ0FBQyxtQkFBbUIsQ0FBQyxFQUFFLENBQUMsQ0FBQztRQUMvQixDQUFDO2FBQU0sQ0FBQztZQUNOLElBQUksQ0FBQyxRQUFRLENBQUMsSUFBSSxDQUFDLEVBQUUsQ0FBQyxDQUFDO1FBQ3pCLENBQUM7SUFDSCxDQUFDO0lBRUQsb0RBQW9EO0lBQzVDLDZCQUE2QixDQUFDLEVBQWdCO1FBQ3BELDBFQUEwRTtRQUMxRSxvQ0FBb0M7UUFDcEMsdURBQXVEO1FBQ3ZELG9HQUFvRztRQUNwRyxJQUFJLElBQUksQ0FBQyxxQkFBcUIsSUFBSSxDQUFDLElBQUksSUFBSSxDQUFDLFFBQVEsQ0FBQyxNQUFNLElBQUksQ0FBQyxFQUFFLENBQUM7WUFDakUsSUFBSSxDQUFDLG1CQUFtQixDQUFDLEVBQUUsQ0FBQyxDQUFDO1FBQy9CLENBQUM7YUFBTSxDQUFDO1lBQ04sSUFBSSxDQUFDLFFBQVEsQ0FBQyxJQUFJLENBQUMsRUFBRSxDQUFDLENBQUM7UUFDekIsQ0FBQztJQUNILENBQUM7SUFFTywyQkFBMkIsQ0FBQyxFQUFnQjtRQUNsRCxvREFBb0Q7UUFDcEQsd0JBQXdCO1FBQ3hCLEVBQUUsQ0FBQyxPQUFPLEVBQUU7YUFDVCxJQUFJLENBQUMsRUFBRSxDQUFDLE9BQU8sQ0FBQyxPQUFPLEVBQUUsRUFBRSxDQUFDLE9BQU8sQ0FBQyxNQUFNLENBQUM7YUFDM0MsT0FBTyxDQUFDLEdBQUcsRUFBRTtZQUNaLElBQUksQ0FBQyxHQUFHLENBQUMsTUFBTSxDQUFDLEVBQUUsQ0FBQyxTQUFTLENBQUMsQ0FBQztRQUNoQyxDQUFDLENBQUMsQ0FBQztJQUNQLENBQUM7SUFFTyxlQUFlLENBQUMsV0FBeUI7UUFDL0MsMkJBQTJCO1FBQzNCLHNEQUFzRDtRQUN0RCxJQUFJLFdBQVcsQ0FBQyxRQUFRLEVBQUUsQ0FBQztZQUN6QixFQUFFLElBQUksQ0FBQyxxQkFBcUIsQ0FBQztRQUMvQixDQUFDO1FBQ0QsRUFBRSxJQUFJLENBQUMsYUFBYSxDQUFDO1FBRXJCLGdFQUFnRTtRQUNoRSxJQUFJLElBQUksQ0FBQyxhQUFhLElBQUksQ0FBQyxFQUFFLENBQUM7WUFDNUIsT0FBTztRQUNULENBQUM7UUFFRCxtREFBbUQ7UUFDbkQsb0JBQW9CO1FBQ3BCLGdEQUFnRDtRQUNoRCxzREFBc0Q7UUFDdEQsc0RBQXNEO1FBQ3RELE9BQU8sSUFBSSxDQUFDLFFBQVEsQ0FBQyxNQUFNLEdBQUcsQ0FBQyxFQUFFLENBQUM7WUFDaEMsTUFBTSxJQUFJLEdBQUcsSUFBSSxDQUFDLFFBQVEsQ0FBQyxDQUFDLENBQUMsQ0FBQztZQUM5QixJQUFJLElBQUksQ0FBQyxRQUFRLEVBQUUsQ0FBQztnQkFDbEIsSUFBSSxJQUFJLENBQUMsYUFBYSxJQUFJLENBQUMsRUFBRSxDQUFDO29CQUM1Qiw0QkFBNEI7b0JBQzVCLElBQUksQ0FBQyxRQUFRLENBQUMsS0FBSyxFQUFFLENBQUM7b0JBQ3RCLElBQUksQ0FBQyxtQkFBbUIsQ0FBQyxJQUFJLENBQUMsQ0FBQztnQkFDakMsQ0FBQztnQkFDRCxpREFBaUQ7Z0JBQ2pELE1BQU07WUFDUixDQUFDO2lCQUFNLENBQUM7Z0JBQ04sd0NBQXdDO2dCQUN4QyxJQUFJLENBQUMsUUFBUSxDQUFDLEtBQUssRUFBRSxDQUFDO2dCQUN0QixJQUFJLENBQUMsbUJBQW1CLENBQUMsSUFBSSxDQUFDLENBQUM7WUFDakMsQ0FBQztRQUNILENBQUM7UUFFRCxpSEFBaUg7UUFDakgsSUFBSSxJQUFJLENBQUMsYUFBYSxJQUFJLENBQUMsSUFBSSxJQUFJLENBQUMsV0FBVyxLQUFLLFNBQVMsRUFBRSxDQUFDO1lBQzlELElBQUksQ0FBQyxXQUFXLEVBQUUsQ0FBQztRQUNyQixDQUFDO0lBQ0gsQ0FBQztJQUVPLG1CQUFtQixDQUFDLEVBQWdCO1FBQzFDLHdEQUF3RDtRQUN4RCxFQUFFLElBQUksQ0FBQyxhQUFhLENBQUM7UUFDckIsSUFBSSxFQUFFLENBQUMsUUFBUSxFQUFFLENBQUM7WUFDaEIsRUFBRSxJQUFJLENBQUMscUJBQXFCLENBQUM7UUFDL0IsQ0FBQztRQUVELDZFQUE2RTtRQUM3RSxFQUFFLENBQUMsT0FBTyxFQUFFO2FBQ1QsSUFBSSxDQUFDLEVBQUUsQ0FBQyxPQUFPLENBQUMsT0FBTyxFQUFFLEVBQUUsQ0FBQyxPQUFPLENBQUMsTUFBTSxDQUFDO2FBQzNDLE9BQU8sQ0FBQyxHQUFHLEVBQUU7WUFDWixJQUFJLENBQUMsZUFBZSxDQUFDLEVBQUUsQ0FBQyxDQUFDO1lBQ3pCLElBQUksQ0FBQyxHQUFHLENBQUMsTUFBTSxDQUFDLEVBQUUsQ0FBQyxTQUFTLENBQUMsQ0FBQztRQUNoQyxDQUFDLENBQUMsQ0FBQztJQUNQLENBQUM7SUFFTSxJQUFJO1FBQ1Qsb0RBQW9EO1FBQ3BELElBQUksSUFBSSxDQUFDLFdBQVcsRUFBRSxDQUFDO1lBQ3JCLE9BQU8sSUFBSSxDQUFDLFdBQVcsQ0FBQztRQUMxQixDQUFDO1FBRUQsNERBQTREO1FBQzVELElBQUksQ0FBQyxXQUFXLEdBQUcsSUFBSSxPQUFPLENBQUMsT0FBTyxDQUFDLEVBQUU7WUFDdkMsSUFBSSxDQUFDLFdBQVcsR0FBRyxPQUFPLENBQUM7UUFDN0IsQ0FBQyxDQUFDLENBQUM7UUFFSCxrRUFBa0U7UUFDbEUsSUFBSSxJQUFJLENBQUMsUUFBUSxDQUFDLE1BQU0sSUFBSSxDQUFDLElBQUksSUFBSSxDQUFDLGFBQWEsSUFBSSxDQUFDLElBQUksSUFBSSxDQUFDLFdBQVcsS0FBSyxTQUFTLEVBQUUsQ0FBQztZQUMzRixJQUFJLENBQUMsV0FBVyxFQUFFLENBQUM7UUFDckIsQ0FBQztRQUNELE9BQU8sSUFBSSxDQUFDLFdBQVcsQ0FBQztJQUMxQixDQUFDO0NBQ0YifQ==

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aztec/world-state",
-  "version": "0.69.1-devnet",
+  "version": "0.70.0",
   "type": "module",
   "exports": {
     ".": "./dest/index.js",
@@ -62,13 +62,13 @@
     ]
   },
   "dependencies": {
-    "@aztec/circuit-types": "0.69.1-devnet",
-    "@aztec/circuits.js": "0.69.1-devnet",
-    "@aztec/foundation": "0.69.1-devnet",
-    "@aztec/kv-store": "0.69.1-devnet",
-    "@aztec/merkle-tree": "0.69.1-devnet",
-    "@aztec/telemetry-client": "0.69.1-devnet",
-    "@aztec/types": "0.69.1-devnet",
+    "@aztec/circuit-types": "0.70.0",
+    "@aztec/circuits.js": "0.70.0",
+    "@aztec/foundation": "0.70.0",
+    "@aztec/kv-store": "0.70.0",
+    "@aztec/merkle-tree": "0.70.0",
+    "@aztec/telemetry-client": "0.70.0",
+    "@aztec/types": "0.70.0",
     "bindings": "^1.5.0",
     "msgpackr": "^1.10.2",
     "tslib": "^2.4.0",

package/src/native/merkle_trees_facade.ts

@@ -143,7 +143,7 @@ export class MerkleTreesFacade implements MerkleTreeReadOperations {
   }
 
   async getInitialStateReference(): Promise<StateReference> {
-    const resp = await this.instance.call(WorldStateMessageType.GET_INITIAL_STATE_REFERENCE, void 0);
+    const resp = await this.instance.call(WorldStateMessageType.GET_INITIAL_STATE_REFERENCE, { canonical: true });
 
     return new StateReference(
       treeStateReferenceToSnapshot(resp.state[MerkleTreeId.L1_TO_L2_MESSAGE_TREE]),

package/src/native/message.ts

@@ -314,6 +314,10 @@ interface WithWorldStateRevision {
   revision: WorldStateRevision;
 }
 
+interface WithCanonicalForkId {
+  canonical: true;
+}
+
 interface WithLeafIndex {
   leafIndex: bigint;
 }
@@ -333,7 +337,7 @@ interface WithLeafValues {
   leaves: SerializedLeafValue[];
 }
 
-interface BlockShiftRequest {
+interface BlockShiftRequest extends WithCanonicalForkId {
   toBlockNumber: bigint;
 }
 
@@ -422,7 +426,7 @@ interface UpdateArchiveRequest extends WithForkId {
   blockHeaderHash: Buffer;
 }
 
-interface SyncBlockRequest {
+interface SyncBlockRequest extends WithCanonicalForkId {
   blockNumber: number;
   blockStateRef: BlockStateReference;
   blockHeaderHash: Fr;
@@ -432,7 +436,7 @@ interface SyncBlockRequest {
   publicDataWrites: readonly SerializedLeafValue[];
 }
 
-interface CreateForkRequest {
+interface CreateForkRequest extends WithCanonicalForkId {
   latest: boolean;
   blockNumber: number;
 }
@@ -441,22 +445,26 @@ interface CreateForkResponse {
   forkId: number;
 }
 
-interface DeleteForkRequest {
-  forkId: number;
+interface DeleteForkRequest extends WithForkId {}
+
+export type WorldStateRequestCategories = WithForkId | WithWorldStateRevision | WithCanonicalForkId;
+
+export function isWithForkId(body: WorldStateRequestCategories): body is WithForkId {
+  return body && 'forkId' in body;
 }
 
-interface CreateForkResponse {
-  forkId: number;
+export function isWithRevision(body: WorldStateRequestCategories): body is WithWorldStateRevision {
+  return body && 'revision' in body;
 }
 
-interface DeleteForkRequest {
-  forkId: number;
+export function isWithCanonical(body: WorldStateRequestCategories): body is WithCanonicalForkId {
+  return body && 'canonical' in body;
 }
 
 export type WorldStateRequest = {
   [WorldStateMessageType.GET_TREE_INFO]: GetTreeInfoRequest;
   [WorldStateMessageType.GET_STATE_REFERENCE]: GetStateReferenceRequest;
-  [WorldStateMessageType.GET_INITIAL_STATE_REFERENCE]: void;
+  [WorldStateMessageType.GET_INITIAL_STATE_REFERENCE]: WithCanonicalForkId;
 
   [WorldStateMessageType.GET_LEAF_VALUE]: GetLeafRequest;
   [WorldStateMessageType.GET_LEAF_PREIMAGE]: GetLeafPreImageRequest;
@@ -472,8 +480,8 @@ export type WorldStateRequest = {
 
   [WorldStateMessageType.UPDATE_ARCHIVE]: UpdateArchiveRequest;
 
-  [WorldStateMessageType.COMMIT]: void;
-  [WorldStateMessageType.ROLLBACK]: void;
+  [WorldStateMessageType.COMMIT]: WithCanonicalForkId;
+  [WorldStateMessageType.ROLLBACK]: WithCanonicalForkId;
 
   [WorldStateMessageType.SYNC_BLOCK]: SyncBlockRequest;
 
@@ -484,9 +492,9 @@ export type WorldStateRequest = {
   [WorldStateMessageType.UNWIND_BLOCKS]: BlockShiftRequest;
   [WorldStateMessageType.FINALISE_BLOCKS]: BlockShiftRequest;
 
-  [WorldStateMessageType.GET_STATUS]: void;
+  [WorldStateMessageType.GET_STATUS]: WithCanonicalForkId;
 
-  [WorldStateMessageType.CLOSE]: void;
+  [WorldStateMessageType.CLOSE]: WithCanonicalForkId;
 };
 
 export type WorldStateResponse = {

package/src/native/native_world_state.ts

@@ -160,6 +160,7 @@ export class NativeWorldStateService implements MerkleTreeDatabase {
     const resp = await this.instance.call(WorldStateMessageType.CREATE_FORK, {
       latest: blockNumber === undefined,
       blockNumber: blockNumber ?? 0,
+      canonical: true,
     });
     return new MerkleTreesForkFacade(this.instance, this.initialHeader!, worldStateRevision(true, resp.forkId, 0));
   }
@@ -198,6 +199,7 @@ export class NativeWorldStateService implements MerkleTreeDatabase {
         paddedNullifiers: paddedNullifiers.map(serializeLeaf),
         publicDataWrites: publicDataWrites.map(serializeLeaf),
         blockStateRef: blockStateReference(l2Block.header.state),
+        canonical: true,
       },
       this.sanitiseAndCacheSummaryFromFull.bind(this),
       this.deleteCachedSummary.bind(this),
@@ -240,6 +242,7 @@ export class NativeWorldStateService implements MerkleTreeDatabase {
       WorldStateMessageType.FINALISE_BLOCKS,
       {
         toBlockNumber,
+        canonical: true,
       },
       this.sanitiseAndCacheSummary.bind(this),
       this.deleteCachedSummary.bind(this),
@@ -257,6 +260,7 @@ export class NativeWorldStateService implements MerkleTreeDatabase {
       WorldStateMessageType.REMOVE_HISTORICAL_BLOCKS,
       {
         toBlockNumber,
+        canonical: true,
       },
       this.sanitiseAndCacheSummaryFromFull.bind(this),
       this.deleteCachedSummary.bind(this),
@@ -273,6 +277,7 @@ export class NativeWorldStateService implements MerkleTreeDatabase {
       WorldStateMessageType.UNWIND_BLOCKS,
       {
         toBlockNumber,
+        canonical: true,
       },
       this.sanitiseAndCacheSummaryFromFull.bind(this),
       this.deleteCachedSummary.bind(this),
@@ -283,7 +288,11 @@ export class NativeWorldStateService implements MerkleTreeDatabase {
     if (this.cachedStatusSummary !== undefined) {
       return { ...this.cachedStatusSummary };
     }
-    return await this.instance.call(WorldStateMessageType.GET_STATUS, void 0, this.sanitiseAndCacheSummary.bind(this));
+    return await this.instance.call(
+      WorldStateMessageType.GET_STATUS,
+      { canonical: true },
+      this.sanitiseAndCacheSummary.bind(this),
+    );
   }
 
   updateLeaf<ID extends IndexedTreeId>(
@@ -295,7 +304,7 @@ export class NativeWorldStateService implements MerkleTreeDatabase {
   }
 
   private async getInitialStateReference(): Promise<StateReference> {
-    const resp = await this.instance.call(WorldStateMessageType.GET_INITIAL_STATE_REFERENCE, void 0);
+    const resp = await this.instance.call(WorldStateMessageType.GET_INITIAL_STATE_REFERENCE, { canonical: true });
 
     return new StateReference(
       treeStateReferenceToSnapshot(resp.state[MerkleTreeId.L1_TO_L2_MESSAGE_TREE]),

package/src/native/native_world_state_instance.ts

@@ -11,7 +11,6 @@ import {
   PUBLIC_DATA_TREE_HEIGHT,
 } from '@aztec/circuits.js';
 import { createLogger } from '@aztec/foundation/log';
-import { SerialQueue } from '@aztec/foundation/queue';
 
 import assert from 'assert';
 import bindings from 'bindings';
@@ -25,8 +24,13 @@ import {
   TypedMessage,
   WorldStateMessageType,
   type WorldStateRequest,
+  type WorldStateRequestCategories,
   type WorldStateResponse,
+  isWithCanonical,
+  isWithForkId,
+  isWithRevision,
 } from './message.js';
+import { WorldStateOpsQueue } from './world_state_ops_queue.js';
 
 // small extension to pack an NodeJS Fr instance to a representation that the C++ code can understand
 // this only works for writes. Unpacking from C++ can't create Fr instances because the data is passed
@@ -49,7 +53,10 @@ const NATIVE_MODULE = bindings(NATIVE_LIBRARY_NAME);
 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]>;
+  call<T extends WorldStateMessageType>(
+    messageType: T,
+    body: WorldStateRequest[T] & WorldStateRequestCategories,
+  ): Promise<WorldStateResponse[T]>;
 }
 
 /**
@@ -78,8 +85,8 @@ export class NativeWorldState implements NativeWorldStateInstance {
   /** The actual native instance */
   private instance: any;
 
-  /** Calls to the same instance are serialized */
-  private queue = new SerialQueue();
+  // We maintain a map of queue to fork
+  private queues = new Map<number, WorldStateOpsQueue>();
 
   /** Creates a new native WorldState instance */
   constructor(
@@ -109,7 +116,8 @@ export class NativeWorldState implements NativeWorldStateInstance {
       dbMapSizeKb,
       threads,
     );
-    this.queue.start();
+    // Manually create the queue for the canonical fork
+    this.queues.set(0, new WorldStateOpsQueue());
   }
 
   /**
@@ -120,25 +128,65 @@ export class NativeWorldState implements NativeWorldStateInstance {
    * @param errorHandler - A callback called on request error, executed on the job queue
    * @returns The response to the message
    */
-  public call<T extends WorldStateMessageType>(
+  public async call<T extends WorldStateMessageType>(
     messageType: T,
-    body: WorldStateRequest[T],
+    body: WorldStateRequest[T] & WorldStateRequestCategories,
     // allows for the pre-processing of responses on the job queue before being passed back
     responseHandler = (response: WorldStateResponse[T]): WorldStateResponse[T] => response,
     errorHandler = (_: string) => {},
   ): Promise<WorldStateResponse[T]> {
-    return this.queue.put(async () => {
-      assert.notEqual(messageType, WorldStateMessageType.CLOSE, 'Use close() to close the native instance');
-      assert.equal(this.open, true, 'Native instance is closed');
-      let response: WorldStateResponse[T];
-      try {
-        response = await this._sendMessage(messageType, body);
-      } catch (error: any) {
-        errorHandler(error.message);
-        throw error;
-      }
-      return responseHandler(response);
-    });
+    // Here we determine which fork the request is being executed against and whether it requires uncommitted data
+    // We use the fork Id to select the appropriate request queue and the uncommitted data flag to pass to the queue
+    let forkId = -1;
+    // We assume it includes uncommitted unless explicitly told otherwise
+    let committedOnly = false;
+
+    // Canonical requests ALWAYS go against the canonical fork
+    // These include things like block syncs/unwinds etc
+    // These requests don't contain a fork ID
+    if (isWithCanonical(body)) {
+      forkId = 0;
+    } else if (isWithForkId(body)) {
+      forkId = body.forkId;
+    } else if (isWithRevision(body)) {
+      forkId = body.revision.forkId;
+      committedOnly = body.revision.includeUncommitted === false;
+    } else {
+      const _: never = body;
+      throw new Error(`Unable to determine forkId for message=${WorldStateMessageType[messageType]}`);
+    }
+
+    // Get the queue or create a new one
+    let requestQueue = this.queues.get(forkId);
+    if (requestQueue === undefined) {
+      requestQueue = new WorldStateOpsQueue();
+      this.queues.set(forkId, requestQueue);
+    }
+
+    // Enqueue the request and wait for the response
+    const response = await requestQueue.execute(
+      async () => {
+        assert.notEqual(messageType, WorldStateMessageType.CLOSE, 'Use close() to close the native instance');
+        assert.equal(this.open, true, 'Native instance is closed');
+        let response: WorldStateResponse[T];
+        try {
+          response = await this._sendMessage(messageType, body);
+        } catch (error: any) {
+          errorHandler(error.message);
+          throw error;
+        }
+        return responseHandler(response);
+      },
+      messageType,
+      committedOnly,
+    );
+
+    // If the request was to delete the fork then we clean it up here
+    if (messageType === WorldStateMessageType.DELETE_FORK) {
+      await requestQueue.stop();
+      this.queues.delete(forkId);
+    }
+    return response;
   }
 
   /**
@@ -149,13 +197,21 @@ export class NativeWorldState implements NativeWorldStateInstance {
       return;
     }
     this.open = false;
-    await this._sendMessage(WorldStateMessageType.CLOSE, undefined);
-    await this.queue.end();
+    const queue = this.queues.get(0)!;
+
+    await queue.execute(
+      async () => {
+        await this._sendMessage(WorldStateMessageType.CLOSE, { canonical: true });
+      },
+      WorldStateMessageType.CLOSE,
+      false,
+    );
+    await queue.stop();
   }
 
   private async _sendMessage<T extends WorldStateMessageType>(
     messageType: T,
-    body: WorldStateRequest[T],
+    body: WorldStateRequest[T] & WorldStateRequestCategories,
   ): Promise<WorldStateResponse[T]> {
     const messageId = this.nextMessageId++;
     if (body) {