@aztec/world-state 0.0.1-commit.001888fc → 0.0.1-commit.017a351

package/dest/native/native_world_state.js

@@ -1,55 +1,72 @@
+var _computedKey;
 import { MAX_NOTE_HASHES_PER_TX, MAX_NULLIFIERS_PER_TX, NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP } from '@aztec/constants';
 import { BlockNumber } from '@aztec/foundation/branded-types';
 import { fromEntries, padArrayEnd } from '@aztec/foundation/collection';
 import { Fr } from '@aztec/foundation/curves/bn254';
-import { EthAddress } from '@aztec/foundation/eth-address';
-import { tryRmDir } from '@aztec/foundation/fs';
 import { createLogger } from '@aztec/foundation/log';
 import { DatabaseVersionManager } from '@aztec/stdlib/database-version/manager';
 import { MerkleTreeId, NullifierLeaf, PublicDataTreeLeaf } from '@aztec/stdlib/trees';
-import { BlockHeader, PartialStateReference, StateReference } from '@aztec/stdlib/tx';
-import { WorldStateRevision } from '@aztec/stdlib/world-state';
+import { BlockHeader, GlobalVariables, PartialStateReference, StateReference } from '@aztec/stdlib/tx';
+import { EMPTY_GENESIS_DATA, WorldStateRevision } from '@aztec/stdlib/world-state';
 import { getTelemetryClient } from '@aztec/telemetry-client';
 import assert from 'assert/strict';
-import { mkdtemp, rm } from 'fs/promises';
+import { mkdir, mkdtemp, rm } from 'fs/promises';
 import { tmpdir } from 'os';
 import { join } from 'path';
 import { WorldStateInstrumentation } from '../instrumentation/instrumentation.js';
+import { IpcWorldState } from './ipc_world_state_instance.js';
 import { MerkleTreesFacade, MerkleTreesForkFacade, serializeLeaf } from './merkle_trees_facade.js';
 import { WorldStateMessageType, blockStateReference, sanitizeFullStatus, sanitizeSummary, treeStateReferenceToSnapshot } from './message.js';
-import { NativeWorldState } from './native_world_state_instance.js';
 // The current version of the world state database schema
 // Increment this when making incompatible changes to the database schema
 export const WORLD_STATE_DB_VERSION = 2; // The initial version
 export const WORLD_STATE_DIR = 'world_state';
+_computedKey = Symbol.asyncDispose;
 export class NativeWorldStateService {
     instance;
     worldStateInstrumentation;
     log;
+    genesis;
     cleanup;
+    recreateInstance;
     initialHeader;
     // This is read heavily and only changes when data is persisted, so we cache it
     cachedStatusSummary;
-    constructor(instance, worldStateInstrumentation, log, cleanup = ()=>Promise.resolve()){
+    constructor(instance, worldStateInstrumentation, log, genesis = EMPTY_GENESIS_DATA, cleanup = ()=>Promise.resolve(), /** Factory to recreate a fresh IpcWorldState after clear(). */ recreateInstance){
         this.instance = instance;
         this.worldStateInstrumentation = worldStateInstrumentation;
         this.log = log;
+        this.genesis = genesis;
         this.cleanup = cleanup;
+        this.recreateInstance = recreateInstance;
     }
-    static async new(rollupAddress, dataDir, wsTreeMapSizes, prefilledPublicData = [], instrumentation = new WorldStateInstrumentation(getTelemetryClient()), bindings, cleanup = ()=>Promise.resolve()) {
+    static async new(rollupAddress, dataDir, wsTreeMapSizes, genesis = EMPTY_GENESIS_DATA, instrumentation = new WorldStateInstrumentation(getTelemetryClient()), bindings, cleanup = ()=>Promise.resolve()) {
+        for (const [key, value] of Object.entries(wsTreeMapSizes)){
+            if (value <= 0) {
+                throw new Error(`Map size must be a positive number, got ${value} for ${key}`);
+            }
+        }
         const log = createLogger('world-state:database', bindings);
         const worldStateDirectory = join(dataDir, WORLD_STATE_DIR);
-        // Create a version manager to handle versioning
         const versionManager = new DatabaseVersionManager({
             schemaVersion: WORLD_STATE_DB_VERSION,
             rollupAddress,
             dataDirectory: worldStateDirectory,
-            onOpen: (dir)=>{
-                return Promise.resolve(new NativeWorldState(dir, wsTreeMapSizes, prefilledPublicData, instrumentation, bindings));
-            }
+            onOpen: (dir)=>IpcWorldState.spawn(dir, wsTreeMapSizes, genesis, instrumentation, bindings)
         });
         const [instance] = await versionManager.open();
-        const worldState = new this(instance, instrumentation, log, cleanup);
+        const recreateInstance = async ()=>{
+            await rm(worldStateDirectory, {
+                recursive: true,
+                force: true,
+                maxRetries: 3
+            });
+            await mkdir(worldStateDirectory, {
+                recursive: true
+            });
+            return IpcWorldState.spawn(worldStateDirectory, wsTreeMapSizes, genesis, instrumentation, bindings);
+        };
+        const worldState = new this(instance, instrumentation, log, genesis, cleanup, recreateInstance);
         try {
             await worldState.init();
         } catch (e) {
@@ -58,7 +75,7 @@ export class NativeWorldStateService {
         }
         return worldState;
     }
-    static async tmp(rollupAddress = EthAddress.ZERO, cleanupTmpDir = true, prefilledPublicData = [], instrumentation = new WorldStateInstrumentation(getTelemetryClient()), bindings) {
+    static async tmp(cleanupTmpDir = true, genesis = EMPTY_GENESIS_DATA, instrumentation = new WorldStateInstrumentation(getTelemetryClient()), bindings) {
         const log = createLogger('world-state:database', bindings);
         const dataDir = await mkdtemp(join(tmpdir(), 'aztec-world-state-'));
         const dbMapSizeKb = 10 * 1024 * 1024;
@@ -70,7 +87,7 @@ export class NativeWorldStateService {
             publicDataTreeMapSizeKb: dbMapSizeKb
         };
         log.debug(`Created temporary world state database at: ${dataDir} with tree map size: ${dbMapSizeKb}`);
-        // pass a cleanup callback because process.on('beforeExit', cleanup) does not work under Jest
+        const instance = await IpcWorldState.spawn(dataDir, worldStateTreeMapSizes, genesis, instrumentation, bindings);
         const cleanup = async ()=>{
             if (cleanupTmpDir) {
                 await rm(dataDir, {
@@ -83,7 +100,35 @@ export class NativeWorldStateService {
                 log.debug(`Leaving temporary world state database: ${dataDir}`);
             }
         };
-        return this.new(rollupAddress, dataDir, worldStateTreeMapSizes, prefilledPublicData, instrumentation, bindings, cleanup);
+        const recreateInstance = async ()=>{
+            await rm(dataDir, {
+                recursive: true,
+                force: true,
+                maxRetries: 3
+            });
+            await mkdir(dataDir, {
+                recursive: true
+            });
+            return IpcWorldState.spawn(dataDir, worldStateTreeMapSizes, genesis, instrumentation, bindings);
+        };
+        const worldState = new this(instance, instrumentation, log, genesis, cleanup, recreateInstance);
+        try {
+            await worldState.init();
+        } catch (e) {
+            log.error(`Error initializing tmp world state: ${e}`);
+            throw e;
+        }
+        return worldState;
+    }
+    static ephemeral(genesis = EMPTY_GENESIS_DATA, instrumentation = new WorldStateInstrumentation(getTelemetryClient()), bindings) {
+        return this.tmp(/*cleanupTmpDir=*/ true, genesis, instrumentation, bindings);
+    }
+    static async fromIpc(wsdbBackend, instrumentation = new WorldStateInstrumentation(getTelemetryClient()), bindings, genesis = EMPTY_GENESIS_DATA, cleanup = ()=>Promise.resolve(), recreateInstance) {
+        const log = createLogger('world-state:database', bindings);
+        const instance = new IpcWorldState(wsdbBackend, instrumentation, bindings);
+        const worldState = new this(instance, instrumentation, log, genesis, cleanup, recreateInstance);
+        await worldState.init();
+        return worldState;
     }
     async init() {
         const status = await this.getStatusSummary();
@@ -100,16 +145,27 @@ export class NativeWorldStateService {
         // 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 indices = await committed.findLeafIndices(MerkleTreeId.ARCHIVE, [
-            (await this.initialHeader.hash()).toFr()
+            await this.initialHeader.hash()
         ]);
         const initialHeaderIndex = indices[0];
         assert.strictEqual(initialHeaderIndex, 0n, 'Invalid initial archive state');
     }
     async clear() {
+        if (!this.recreateInstance) {
+            throw new Error('clear() is not available for externally-managed IPC backends');
+        }
+        this.log.warn('Clearing world state: shutting down WSDB, deleting data, and recreating');
         await this.instance.close();
         this.cachedStatusSummary = undefined;
-        await tryRmDir(this.instance.getDataDir(), this.log);
-        this.instance = this.instance.clone();
+        this.instance = await this.recreateInstance();
+        await this.init();
+        this.log.info('World state cleared and reinitialized from genesis');
+    }
+    /** Returns the socket path of the underlying IPC backend, if available. */ getSocketPath() {
+        if (this.instance instanceof IpcWorldState) {
+            return this.instance.getSocketPath();
+        }
+        throw new Error('getSocketPath() is only available with IPC world state');
     }
     getCommitted() {
         return new MerkleTreesFacade(this.instance, this.initialHeader, WorldStateRevision.empty());
@@ -123,7 +179,7 @@ export class NativeWorldStateService {
             blockNumber: blockNumber ?? BlockNumber.ZERO,
             canonical: true
         });
-        return new MerkleTreesForkFacade(this.instance, this.initialHeader, new WorldStateRevision(/*forkId=*/ resp.forkId, /* blockNumber=*/ BlockNumber.ZERO, /* includeUncommitted=*/ true), opts);
+        return new MerkleTreesForkFacade(this.instance, this.initialHeader, new WorldStateRevision(/*forkId=*/ resp.forkId, /* blockNumber=*/ WorldStateRevision.LATEST, /* includeUncommitted=*/ true), opts);
     }
     getInitialHeader() {
         return this.initialHeader;
@@ -149,7 +205,7 @@ export class NativeWorldStateService {
         try {
             return await this.instance.call(WorldStateMessageType.SYNC_BLOCK, {
                 blockNumber: l2Block.number,
-                blockHeaderHash: await l2Block.hash(),
+                blockHeaderHash: (await l2Block.hash()).toBuffer(),
                 paddedL1ToL2Messages: paddedL1ToL2Messages.map(serializeLeaf),
                 paddedNoteHashes: paddedNoteHashes.map(serializeLeaf),
                 paddedNullifiers: paddedNullifiers.map(serializeLeaf),
@@ -163,13 +219,22 @@ export class NativeWorldStateService {
         }
     }
     async close() {
-        await this.instance.close();
-        await this.cleanup();
+        try {
+            await this.instance.close();
+        } finally{
+            await this.cleanup();
+        }
+    }
+    async [_computedKey]() {
+        await this.close();
     }
     async buildInitialHeader() {
         const state = await this.getInitialStateReference();
         return BlockHeader.empty({
-            state
+            state,
+            globalVariables: GlobalVariables.empty({
+                timestamp: this.genesis.genesisTimestamp
+            })
         });
     }
     sanitizeAndCacheSummaryFromFull(response) {

package/dest/native/native_world_state_instance.d.ts

@@ -1,49 +1,31 @@
-import { type Logger, type LoggerBindings } from '@aztec/foundation/log';
-import type { PublicDataTreeLeaf } from '@aztec/stdlib/trees';
-import type { WorldStateInstrumentation } from '../instrumentation/instrumentation.js';
-import type { WorldStateTreeMapSizes } from '../synchronizer/factory.js';
-import { WorldStateMessageType, type WorldStateRequest, type WorldStateRequestCategories, type WorldStateResponse } from './message.js';
-export interface NativeWorldStateInstance {
-    call<T extends WorldStateMessageType>(messageType: T, body: WorldStateRequest[T] & WorldStateRequestCategories): Promise<WorldStateResponse[T]>;
-    getHandle(): any;
-}
+import type { WorldStateMessageType, WorldStateRequest, WorldStateRequestCategories, WorldStateResponse } from './message.js';
 /**
- * Strongly-typed interface to access the WorldState class in the native world_state_napi module.
+ * Backend-agnostic handle to a running aztec-wsdb world state, accessed by the TS layer.
+ *
+ * Two implementations exist:
+ *   - {@link IpcWorldState} — talks to a standalone aztec-wsdb process over UDS or shared memory.
+ *
+ * The legacy in-process NAPI implementation has been removed; the C++ AVM (NAPI) now connects to
+ * the same aztec-wsdb process via UDS using the socket path returned by {@link getSocketPath}.
  */
-export declare class NativeWorldState implements NativeWorldStateInstance {
-    private readonly dataDir;
-    private readonly wsTreeMapSizes;
-    private readonly prefilledPublicData;
-    private readonly instrumentation;
-    private readonly log;
-    private open;
-    private queues;
-    private instance;
-    /** Creates a new native WorldState instance */
-    constructor(dataDir: string, wsTreeMapSizes: WorldStateTreeMapSizes, prefilledPublicData: PublicDataTreeLeaf[] | undefined, instrumentation: WorldStateInstrumentation, bindings?: LoggerBindings, log?: Logger);
-    getDataDir(): string;
-    clone(): NativeWorldState;
+export interface NativeWorldStateInstance {
     /**
-     * Gets the native WorldState handle from the underlying native instance.
-     * We call the getHandle() method on the native WorldState to get a NAPI External
-     * that wraps the underlying C++ WorldState pointer.
-     * @returns The NAPI External handle to the native WorldState instance,since
-     * the NAPI external type is opaque, we return any (we could also use an opaque symbol type)
+     * Send a typed msgpack message to the backing world state and await its response.
+     *
+     * @param responseHandler — optional pre-resolution hook executed on the per-fork queue, useful
+     *   for caching responses while the queue still holds the fork lock.
+     * @param errorHandler — optional pre-rejection hook executed on the per-fork queue.
      */
-    getHandle(): any;
+    call<T extends WorldStateMessageType>(messageType: T, body: WorldStateRequest[T] & WorldStateRequestCategories, responseHandler?: (response: WorldStateResponse[T]) => WorldStateResponse[T], errorHandler?: (error: string) => void): Promise<WorldStateResponse[T]>;
     /**
-     * Sends a message to the native instance and returns the response.
-     * @param messageType - The type of message to send
-     * @param body - The message body
-     * @param responseHandler - A callback accepting the response, executed on the job queue
-     * @param errorHandler - A callback called on request error, executed on the job queue
-     * @returns The response to the message
+     * UDS path the underlying aztec-wsdb process listens on. The C++ AVM uses this to attach to the
+     * same world state instance the TS layer is using.
      */
-    call<T extends WorldStateMessageType>(messageType: T, body: WorldStateRequest[T] & WorldStateRequestCategories, responseHandler?: (response: WorldStateResponse[T]) => WorldStateResponse[T], errorHandler?: (_: string) => void): Promise<WorldStateResponse[T]>;
+    getSocketPath(): string;
     /**
-     * Stops the native instance.
+     * Shut down the world state instance. Cancels any in-flight queues, closes the IPC channel, and
+     * terminates the underlying aztec-wsdb process. Idempotent.
      */
     close(): Promise<void>;
-    private _sendMessage;
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibmF0aXZlX3dvcmxkX3N0YXRlX2luc3RhbmNlLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvbmF0aXZlL25hdGl2ZV93b3JsZF9zdGF0ZV9pbnN0YW5jZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFVQSxPQUFPLEVBQUUsS0FBSyxNQUFNLEVBQUUsS0FBSyxjQUFjLEVBQWdCLE1BQU0sdUJBQXVCLENBQUM7QUFHdkYsT0FBTyxLQUFLLEVBQUUsa0JBQWtCLEVBQUUsTUFBTSxxQkFBcUIsQ0FBQztBQUs5RCxPQUFPLEtBQUssRUFBRSx5QkFBeUIsRUFBRSxNQUFNLHVDQUF1QyxDQUFDO0FBQ3ZGLE9BQU8sS0FBSyxFQUFFLHNCQUFzQixFQUFFLE1BQU0sNEJBQTRCLENBQUM7QUFDekUsT0FBTyxFQUNMLHFCQUFxQixFQUNyQixLQUFLLGlCQUFpQixFQUN0QixLQUFLLDJCQUEyQixFQUNoQyxLQUFLLGtCQUFrQixFQUl4QixNQUFNLGNBQWMsQ0FBQztBQUt0QixNQUFNLFdBQVcsd0JBQXdCO0lBQ3ZDLElBQUksQ0FBQyxDQUFDLFNBQVMscUJBQXFCLEVBQ2xDLFdBQVcsRUFBRSxDQUFDLEVBQ2QsSUFBSSxFQUFFLGlCQUFpQixDQUFDLENBQUMsQ0FBQyxHQUFHLDJCQUEyQixHQUN2RCxPQUFPLENBQUMsa0JBQWtCLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQztJQUVsQyxTQUFTLElBQUksR0FBRyxDQUFDO0NBQ2xCO0FBRUQ7O0dBRUc7QUFDSCxxQkFBYSxnQkFBaUIsWUFBVyx3QkFBd0I7SUFVN0QsT0FBTyxDQUFDLFFBQVEsQ0FBQyxPQUFPO0lBQ3hCLE9BQU8sQ0FBQyxRQUFRLENBQUMsY0FBYztJQUMvQixPQUFPLENBQUMsUUFBUSxDQUFDLG1CQUFtQjtJQUNwQyxPQUFPLENBQUMsUUFBUSxDQUFDLGVBQWU7SUFFaEMsT0FBTyxDQUFDLFFBQVEsQ0FBQyxHQUFHO0lBZHRCLE9BQU8sQ0FBQyxJQUFJLENBQVE7SUFHcEIsT0FBTyxDQUFDLE1BQU0sQ0FBeUM7SUFFdkQsT0FBTyxDQUFDLFFBQVEsQ0FBK0U7SUFFL0YsK0NBQStDO0lBQy9DLFlBQ21CLE9BQU8sRUFBRSxNQUFNLEVBQ2YsY0FBYyxFQUFFLHNCQUFzQixFQUN0QyxtQkFBbUIsa0NBQTJCLEVBQzlDLGVBQWUsRUFBRSx5QkFBeUIsRUFDM0QsUUFBUSxDQUFDLEVBQUUsY0FBYyxFQUNSLEdBQUcsR0FBRSxNQUF1RCxFQW9DOUU7SUFFTSxVQUFVLFdBRWhCO0lBRU0sS0FBSyxxQkFTWDtJQUVEOzs7Ozs7T0FNRztJQUNJLFNBQVMsSUFBSSxHQUFHLENBaUJ0QjtJQUVEOzs7Ozs7O09BT0c7SUFDVSxJQUFJLENBQUMsQ0FBQyxTQUFTLHFCQUFxQixFQUMvQyxXQUFXLEVBQUUsQ0FBQyxFQUNkLElBQUksRUFBRSxpQkFBaUIsQ0FBQyxDQUFDLENBQUMsR0FBRywyQkFBMkIsRUFFeEQsZUFBZSw2REFBdUUsRUFDdEYsWUFBWSxzQkFBb0IsR0FDL0IsT0FBTyxDQUFDLGtCQUFrQixDQUFDLENBQUMsQ0FBQyxDQUFDLENBcURoQztJQUVEOztPQUVHO0lBQ1UsS0FBSyxJQUFJLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FlbEM7WUFFYSxZQUFZO0NBOEQzQiJ9
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibmF0aXZlX3dvcmxkX3N0YXRlX2luc3RhbmNlLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvbmF0aXZlL25hdGl2ZV93b3JsZF9zdGF0ZV9pbnN0YW5jZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEtBQUssRUFDVixxQkFBcUIsRUFDckIsaUJBQWlCLEVBQ2pCLDJCQUEyQixFQUMzQixrQkFBa0IsRUFDbkIsTUFBTSxjQUFjLENBQUM7QUFFdEI7Ozs7Ozs7O0dBUUc7QUFDSCxNQUFNLFdBQVcsd0JBQXdCO0lBQ3ZDOzs7Ozs7T0FNRztJQUNILElBQUksQ0FBQyxDQUFDLFNBQVMscUJBQXFCLEVBQ2xDLFdBQVcsRUFBRSxDQUFDLEVBQ2QsSUFBSSxFQUFFLGlCQUFpQixDQUFDLENBQUMsQ0FBQyxHQUFHLDJCQUEyQixFQUN4RCxlQUFlLENBQUMsRUFBRSxDQUFDLFFBQVEsRUFBRSxrQkFBa0IsQ0FBQyxDQUFDLENBQUMsS0FBSyxrQkFBa0IsQ0FBQyxDQUFDLENBQUMsRUFDNUUsWUFBWSxDQUFDLEVBQUUsQ0FBQyxLQUFLLEVBQUUsTUFBTSxLQUFLLElBQUksR0FDckMsT0FBTyxDQUFDLGtCQUFrQixDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUM7SUFFbEM7OztPQUdHO0lBQ0gsYUFBYSxJQUFJLE1BQU0sQ0FBQztJQUV4Qjs7O09BR0c7SUFDSCxLQUFLLElBQUksT0FBTyxDQUFDLElBQUksQ0FBQyxDQUFDO0NBQ3hCIn0=

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

@@ -1 +1 @@
-{"version":3,"file":"native_world_state_instance.d.ts","sourceRoot":"","sources":["../../src/native/native_world_state_instance.ts"],"names":[],"mappings":"AAUA,OAAO,EAAE,KAAK,MAAM,EAAE,KAAK,cAAc,EAAgB,MAAM,uBAAuB,CAAC;AAGvF,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAC;AAK9D,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,uCAAuC,CAAC;AACvF,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,4BAA4B,CAAC;AACzE,OAAO,EACL,qBAAqB,EACrB,KAAK,iBAAiB,EACtB,KAAK,2BAA2B,EAChC,KAAK,kBAAkB,EAIxB,MAAM,cAAc,CAAC;AAKtB,MAAM,WAAW,wBAAwB;IACvC,IAAI,CAAC,CAAC,SAAS,qBAAqB,EAClC,WAAW,EAAE,CAAC,EACd,IAAI,EAAE,iBAAiB,CAAC,CAAC,CAAC,GAAG,2BAA2B,GACvD,OAAO,CAAC,kBAAkB,CAAC,CAAC,CAAC,CAAC,CAAC;IAElC,SAAS,IAAI,GAAG,CAAC;CAClB;AAED;;GAEG;AACH,qBAAa,gBAAiB,YAAW,wBAAwB;IAU7D,OAAO,CAAC,QAAQ,CAAC,OAAO;IACxB,OAAO,CAAC,QAAQ,CAAC,cAAc;IAC/B,OAAO,CAAC,QAAQ,CAAC,mBAAmB;IACpC,OAAO,CAAC,QAAQ,CAAC,eAAe;IAEhC,OAAO,CAAC,QAAQ,CAAC,GAAG;IAdtB,OAAO,CAAC,IAAI,CAAQ;IAGpB,OAAO,CAAC,MAAM,CAAyC;IAEvD,OAAO,CAAC,QAAQ,CAA+E;IAE/F,+CAA+C;IAC/C,YACmB,OAAO,EAAE,MAAM,EACf,cAAc,EAAE,sBAAsB,EACtC,mBAAmB,kCAA2B,EAC9C,eAAe,EAAE,yBAAyB,EAC3D,QAAQ,CAAC,EAAE,cAAc,EACR,GAAG,GAAE,MAAuD,EAoC9E;IAEM,UAAU,WAEhB;IAEM,KAAK,qBASX;IAED;;;;;;OAMG;IACI,SAAS,IAAI,GAAG,CAiBtB;IAED;;;;;;;OAOG;IACU,IAAI,CAAC,CAAC,SAAS,qBAAqB,EAC/C,WAAW,EAAE,CAAC,EACd,IAAI,EAAE,iBAAiB,CAAC,CAAC,CAAC,GAAG,2BAA2B,EAExD,eAAe,6DAAuE,EACtF,YAAY,sBAAoB,GAC/B,OAAO,CAAC,kBAAkB,CAAC,CAAC,CAAC,CAAC,CAqDhC;IAED;;OAEG;IACU,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CAelC;YAEa,YAAY;CA8D3B"}
+{"version":3,"file":"native_world_state_instance.d.ts","sourceRoot":"","sources":["../../src/native/native_world_state_instance.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,qBAAqB,EACrB,iBAAiB,EACjB,2BAA2B,EAC3B,kBAAkB,EACnB,MAAM,cAAc,CAAC;AAEtB;;;;;;;;GAQG;AACH,MAAM,WAAW,wBAAwB;IACvC;;;;;;OAMG;IACH,IAAI,CAAC,CAAC,SAAS,qBAAqB,EAClC,WAAW,EAAE,CAAC,EACd,IAAI,EAAE,iBAAiB,CAAC,CAAC,CAAC,GAAG,2BAA2B,EACxD,eAAe,CAAC,EAAE,CAAC,QAAQ,EAAE,kBAAkB,CAAC,CAAC,CAAC,KAAK,kBAAkB,CAAC,CAAC,CAAC,EAC5E,YAAY,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,GACrC,OAAO,CAAC,kBAAkB,CAAC,CAAC,CAAC,CAAC,CAAC;IAElC;;;OAGG;IACH,aAAa,IAAI,MAAM,CAAC;IAExB;;;OAGG;IACH,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;CACxB"}

package/dest/native/native_world_state_instance.js

@@ -1,203 +1,9 @@
-import { ARCHIVE_HEIGHT, DomainSeparator, L1_TO_L2_MSG_TREE_HEIGHT, MAX_NULLIFIERS_PER_TX, MAX_TOTAL_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX, NOTE_HASH_TREE_HEIGHT, NULLIFIER_TREE_HEIGHT, PUBLIC_DATA_TREE_HEIGHT } from '@aztec/constants';
-import { createLogger } from '@aztec/foundation/log';
-import { NativeWorldState as BaseNativeWorldState, MsgpackChannel } from '@aztec/native';
-import { MerkleTreeId } from '@aztec/stdlib/trees';
-import assert from 'assert';
-import { cpus } from 'os';
-import { WorldStateMessageType, isWithCanonical, isWithForkId, isWithRevision } from './message.js';
-import { WorldStateOpsQueue } from './world_state_ops_queue.js';
-const MAX_WORLD_STATE_THREADS = +(process.env.HARDWARE_CONCURRENCY || '16');
 /**
- * Strongly-typed interface to access the WorldState class in the native world_state_napi module.
- */ export class NativeWorldState {
-    dataDir;
-    wsTreeMapSizes;
-    prefilledPublicData;
-    instrumentation;
-    log;
-    open;
-    // We maintain a map of queue to fork
-    queues;
-    instance;
-    /** Creates a new native WorldState instance */ constructor(dataDir, wsTreeMapSizes, prefilledPublicData = [], instrumentation, bindings, log = createLogger('world-state:database', bindings)){
-        this.dataDir = dataDir;
-        this.wsTreeMapSizes = wsTreeMapSizes;
-        this.prefilledPublicData = prefilledPublicData;
-        this.instrumentation = instrumentation;
-        this.log = log;
-        this.open = true;
-        this.queues = new Map();
-        const threads = Math.min(cpus().length, MAX_WORLD_STATE_THREADS);
-        log.info(`Creating world state data store at directory ${dataDir} with map sizes ${JSON.stringify(wsTreeMapSizes)} and ${threads} threads.`);
-        const prefilledPublicDataBufferArray = prefilledPublicData.map((d)=>[
-                d.slot.toBuffer(),
-                d.value.toBuffer()
-            ]);
-        const ws = new BaseNativeWorldState(dataDir, {
-            [MerkleTreeId.NULLIFIER_TREE]: NULLIFIER_TREE_HEIGHT,
-            [MerkleTreeId.NOTE_HASH_TREE]: NOTE_HASH_TREE_HEIGHT,
-            [MerkleTreeId.PUBLIC_DATA_TREE]: PUBLIC_DATA_TREE_HEIGHT,
-            [MerkleTreeId.L1_TO_L2_MESSAGE_TREE]: L1_TO_L2_MSG_TREE_HEIGHT,
-            [MerkleTreeId.ARCHIVE]: ARCHIVE_HEIGHT
-        }, {
-            [MerkleTreeId.NULLIFIER_TREE]: 2 * MAX_NULLIFIERS_PER_TX,
-            [MerkleTreeId.PUBLIC_DATA_TREE]: 2 * MAX_TOTAL_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX
-        }, prefilledPublicDataBufferArray, DomainSeparator.BLOCK_HEADER_HASH, {
-            [MerkleTreeId.NULLIFIER_TREE]: wsTreeMapSizes.nullifierTreeMapSizeKb,
-            [MerkleTreeId.NOTE_HASH_TREE]: wsTreeMapSizes.noteHashTreeMapSizeKb,
-            [MerkleTreeId.PUBLIC_DATA_TREE]: wsTreeMapSizes.publicDataTreeMapSizeKb,
-            [MerkleTreeId.L1_TO_L2_MESSAGE_TREE]: wsTreeMapSizes.messageTreeMapSizeKb,
-            [MerkleTreeId.ARCHIVE]: wsTreeMapSizes.archiveTreeMapSizeKb
-        }, threads);
-        this.instance = new MsgpackChannel(ws);
-        // Manually create the queue for the canonical fork
-        this.queues.set(0, new WorldStateOpsQueue());
-    }
-    getDataDir() {
-        return this.dataDir;
-    }
-    clone() {
-        return new NativeWorldState(this.dataDir, this.wsTreeMapSizes, this.prefilledPublicData, this.instrumentation, this.log.getBindings(), this.log);
-    }
-    /**
-   * Gets the native WorldState handle from the underlying native instance.
-   * We call the getHandle() method on the native WorldState to get a NAPI External
-   * that wraps the underlying C++ WorldState pointer.
-   * @returns The NAPI External handle to the native WorldState instance,since
-   * the NAPI external type is opaque, we return any (we could also use an opaque symbol type)
-   */ getHandle() {
-        const worldStateWrapper = this.instance.dest;
-        if (!worldStateWrapper) {
-            throw new Error('No WorldStateWrapper found');
-        }
-        if (typeof worldStateWrapper.getHandle !== 'function') {
-            throw new Error('WorldStateWrapper does not have getHandle method');
-        }
-        // Call getHandle() to get the NAPI External
-        try {
-            return worldStateWrapper.getHandle();
-        } catch (error) {
-            this.log.error('Failed to get native WorldState handle', error);
-        }
-    }
-    /**
-   * Sends a message to the native instance and returns the response.
-   * @param messageType - The type of message to send
-   * @param body - The message body
-   * @param responseHandler - A callback accepting the response, executed on the job queue
-   * @param errorHandler - A callback called on request error, executed on the job queue
-   * @returns The response to the message
-   */ async call(messageType, body, // allows for the pre-processing of responses on the job queue before being passed back
-    responseHandler = (response)=>response, errorHandler = (_)=>{}) {
-        // 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 _ = 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;
-            try {
-                response = await this._sendMessage(messageType, body);
-            } catch (error) {
-                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;
-    }
-    /**
-   * Stops the native instance.
-   */ async close() {
-        if (!this.open) {
-            return;
-        }
-        this.open = false;
-        const queue = this.queues.get(0);
-        await queue.execute(async ()=>{
-            await this._sendMessage(WorldStateMessageType.CLOSE, {
-                canonical: true
-            });
-        }, WorldStateMessageType.CLOSE, false);
-        await queue.stop();
-    }
-    async _sendMessage(messageType, body) {
-        let logMetadata = {};
-        if (body) {
-            if ('treeId' in body) {
-                logMetadata['treeId'] = MerkleTreeId[body.treeId];
-            }
-            if ('revision' in body) {
-                logMetadata = {
-                    ...logMetadata,
-                    ...body.revision
-                };
-            }
-            if ('forkId' in body) {
-                logMetadata['forkId'] = body.forkId;
-            }
-            if ('blockNumber' in body) {
-                logMetadata['blockNumber'] = body.blockNumber;
-            }
-            if ('toBlockNumber' in body) {
-                logMetadata['toBlockNumber'] = body.toBlockNumber;
-            }
-            if ('leafIndex' in body) {
-                logMetadata['leafIndex'] = body.leafIndex;
-            }
-            if ('blockHeaderHash' in body) {
-                logMetadata['blockHeaderHash'] = '0x' + body.blockHeaderHash.toString('hex');
-            }
-            if ('leaves' in body) {
-                logMetadata['leavesCount'] = body.leaves.length;
-            }
-            // sync operation
-            if ('paddedNoteHashes' in body) {
-                logMetadata['notesCount'] = body.paddedNoteHashes.length;
-                logMetadata['nullifiersCount'] = body.paddedNullifiers.length;
-                logMetadata['l1ToL2MessagesCount'] = body.paddedL1ToL2Messages.length;
-                logMetadata['publicDataWritesCount'] = body.publicDataWrites.length;
-            }
-        }
-        try {
-            const { duration, response } = await this.instance.sendMessage(messageType, body);
-            this.log.trace(`Call ${WorldStateMessageType[messageType]} took (ms)`, {
-                duration,
-                ...logMetadata
-            });
-            this.instrumentation.recordRoundTrip(duration.totalUs, messageType);
-            return response;
-        } catch (error) {
-            this.log.error(`Call ${WorldStateMessageType[messageType]} failed: ${error}`, error, logMetadata);
-            throw error;
-        }
-    }
-}
+ * Backend-agnostic handle to a running aztec-wsdb world state, accessed by the TS layer.
+ *
+ * Two implementations exist:
+ *   - {@link IpcWorldState} — talks to a standalone aztec-wsdb process over UDS or shared memory.
+ *
+ * The legacy in-process NAPI implementation has been removed; the C++ AVM (NAPI) now connects to
+ * the same aztec-wsdb process via UDS using the socket path returned by {@link getSocketPath}.
+ */ export { };

package/dest/native/world_state_ops_queue.js

@@ -67,7 +67,7 @@ export class WorldStateOpsQueue {
         // 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) {
+        if (this.inFlightMutatingCount === 0 && this.requests.length === 0) {
             this.sendEnqueuedRequest(op);
         } else {
             this.requests.push(op);
@@ -88,7 +88,7 @@ export class WorldStateOpsQueue {
         }
         --this.inFlightCount;
         // If there are still requests in flight then do nothing further
-        if (this.inFlightCount != 0) {
+        if (this.inFlightCount !== 0) {
             return;
         }
         // No requests in flight, send next queued requests
@@ -99,7 +99,7 @@ export class WorldStateOpsQueue {
         while(this.requests.length > 0){
             const next = this.requests[0];
             if (next.mutating) {
-                if (this.inFlightCount == 0) {
+                if (this.inFlightCount === 0) {
                     // send the mutating request
                     this.requests.shift();
                     this.sendEnqueuedRequest(next);
@@ -112,7 +112,7 @@ export class WorldStateOpsQueue {
             }
         }
         // 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) {
+        if (this.inFlightCount === 0 && this.stopResolve !== undefined) {
             this.stopResolve();
         }
     }
@@ -138,7 +138,7 @@ export class WorldStateOpsQueue {
             this.stopResolve = resolve;
         });
         // If no outstanding requests then immediately resolve the promise
-        if (this.requests.length == 0 && this.inFlightCount == 0 && this.stopResolve !== undefined) {
+        if (this.requests.length === 0 && this.inFlightCount === 0 && this.stopResolve !== undefined) {
             this.stopResolve();
         }
         return this.stopPromise;

package/dest/synchronizer/config.d.ts

@@ -28,4 +28,4 @@ export declare const worldStateConfigMappings: ConfigMappingsType<WorldStateConf
  * @returns The configuration values for the world state synchronizer.
  */
 export declare function getWorldStateConfigFromEnv(): WorldStateConfig;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29uZmlnLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvc3luY2hyb25pemVyL2NvbmZpZy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsS0FBSyxrQkFBa0IsRUFBNkMsTUFBTSwwQkFBMEIsQ0FBQztBQUU5RyxxREFBcUQ7QUFDckQsTUFBTSxXQUFXLGdCQUFnQjtJQUMvQix1Q0FBdUM7SUFDdkMsOEJBQThCLEVBQUUsTUFBTSxDQUFDO0lBRXZDLDJGQUEyRjtJQUMzRiwrQkFBK0IsQ0FBQyxFQUFFLE1BQU0sQ0FBQztJQUV6QyxtSkFBbUo7SUFDbkoscUJBQXFCLENBQUMsRUFBRSxNQUFNLENBQUM7SUFFL0IsMkpBQTJKO0lBQzNKLG9CQUFvQixDQUFDLEVBQUUsTUFBTSxDQUFDO0lBRTlCLDZKQUE2SjtJQUM3SixzQkFBc0IsQ0FBQyxFQUFFLE1BQU0sQ0FBQztJQUVoQyw2SkFBNko7SUFDN0oscUJBQXFCLENBQUMsRUFBRSxNQUFNLENBQUM7SUFFL0IsMkpBQTJKO0lBQzNKLG9CQUFvQixDQUFDLEVBQUUsTUFBTSxDQUFDO0lBRTlCLCtKQUErSjtJQUMvSix1QkFBdUIsQ0FBQyxFQUFFLE1BQU0sQ0FBQztJQUVqQywyR0FBMkc7SUFDM0csdUJBQXVCLENBQUMsRUFBRSxNQUFNLENBQUM7SUFFakMscUVBQXFFO0lBQ3JFLDJCQUEyQixFQUFFLE1BQU0sQ0FBQztDQUNyQztBQUVELGVBQU8sTUFBTSx3QkFBd0IsRUFBRSxrQkFBa0IsQ0FBQyxnQkFBZ0IsQ0EwRHpFLENBQUM7QUFFRjs7O0dBR0c7QUFDSCx3QkFBZ0IsMEJBQTBCLElBQUksZ0JBQWdCLENBRTdEIn0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29uZmlnLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvc3luY2hyb25pemVyL2NvbmZpZy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQ0wsS0FBSyxrQkFBa0IsRUFJeEIsTUFBTSwwQkFBMEIsQ0FBQztBQUVsQyxxREFBcUQ7QUFDckQsTUFBTSxXQUFXLGdCQUFnQjtJQUMvQix1Q0FBdUM7SUFDdkMsOEJBQThCLEVBQUUsTUFBTSxDQUFDO0lBRXZDLDJGQUEyRjtJQUMzRiwrQkFBK0IsQ0FBQyxFQUFFLE1BQU0sQ0FBQztJQUV6QyxtSkFBbUo7SUFDbkoscUJBQXFCLENBQUMsRUFBRSxNQUFNLENBQUM7SUFFL0IsMkpBQTJKO0lBQzNKLG9CQUFvQixDQUFDLEVBQUUsTUFBTSxDQUFDO0lBRTlCLDZKQUE2SjtJQUM3SixzQkFBc0IsQ0FBQyxFQUFFLE1BQU0sQ0FBQztJQUVoQyw2SkFBNko7SUFDN0oscUJBQXFCLENBQUMsRUFBRSxNQUFNLENBQUM7SUFFL0IsMkpBQTJKO0lBQzNKLG9CQUFvQixDQUFDLEVBQUUsTUFBTSxDQUFDO0lBRTlCLCtKQUErSjtJQUMvSix1QkFBdUIsQ0FBQyxFQUFFLE1BQU0sQ0FBQztJQUVqQywyR0FBMkc7SUFDM0csdUJBQXVCLENBQUMsRUFBRSxNQUFNLENBQUM7SUFFakMscUVBQXFFO0lBQ3JFLDJCQUEyQixFQUFFLE1BQU0sQ0FBQztDQUNyQztBQUVELGVBQU8sTUFBTSx3QkFBd0IsRUFBRSxrQkFBa0IsQ0FBQyxnQkFBZ0IsQ0F5RHpFLENBQUM7QUFFRjs7O0dBR0c7QUFDSCx3QkFBZ0IsMEJBQTBCLElBQUksZ0JBQWdCLENBRTdEIn0=

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

@@ -1 +1 @@
-{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../src/synchronizer/config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,kBAAkB,EAA6C,MAAM,0BAA0B,CAAC;AAE9G,qDAAqD;AACrD,MAAM,WAAW,gBAAgB;IAC/B,uCAAuC;IACvC,8BAA8B,EAAE,MAAM,CAAC;IAEvC,2FAA2F;IAC3F,+BAA+B,CAAC,EAAE,MAAM,CAAC;IAEzC,mJAAmJ;IACnJ,qBAAqB,CAAC,EAAE,MAAM,CAAC;IAE/B,2JAA2J;IAC3J,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAE9B,6JAA6J;IAC7J,sBAAsB,CAAC,EAAE,MAAM,CAAC;IAEhC,6JAA6J;IAC7J,qBAAqB,CAAC,EAAE,MAAM,CAAC;IAE/B,2JAA2J;IAC3J,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAE9B,+JAA+J;IAC/J,uBAAuB,CAAC,EAAE,MAAM,CAAC;IAEjC,2GAA2G;IAC3G,uBAAuB,CAAC,EAAE,MAAM,CAAC;IAEjC,qEAAqE;IACrE,2BAA2B,EAAE,MAAM,CAAC;CACrC;AAED,eAAO,MAAM,wBAAwB,EAAE,kBAAkB,CAAC,gBAAgB,CA0DzE,CAAC;AAEF;;;GAGG;AACH,wBAAgB,0BAA0B,IAAI,gBAAgB,CAE7D"}
+{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../src/synchronizer/config.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,kBAAkB,EAIxB,MAAM,0BAA0B,CAAC;AAElC,qDAAqD;AACrD,MAAM,WAAW,gBAAgB;IAC/B,uCAAuC;IACvC,8BAA8B,EAAE,MAAM,CAAC;IAEvC,2FAA2F;IAC3F,+BAA+B,CAAC,EAAE,MAAM,CAAC;IAEzC,mJAAmJ;IACnJ,qBAAqB,CAAC,EAAE,MAAM,CAAC;IAE/B,2JAA2J;IAC3J,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAE9B,6JAA6J;IAC7J,sBAAsB,CAAC,EAAE,MAAM,CAAC;IAEhC,6JAA6J;IAC7J,qBAAqB,CAAC,EAAE,MAAM,CAAC;IAE/B,2JAA2J;IAC3J,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAE9B,+JAA+J;IAC/J,uBAAuB,CAAC,EAAE,MAAM,CAAC;IAEjC,2GAA2G;IAC3G,uBAAuB,CAAC,EAAE,MAAM,CAAC;IAEjC,qEAAqE;IACrE,2BAA2B,EAAE,MAAM,CAAC;CACrC;AAED,eAAO,MAAM,wBAAwB,EAAE,kBAAkB,CAAC,gBAAgB,CAyDzE,CAAC;AAEF;;;GAGG;AACH,wBAAgB,0BAA0B,IAAI,gBAAgB,CAE7D"}

package/dest/synchronizer/config.js

@@ -1,44 +1,43 @@
-import { getConfigFromMappings, numberConfigHelper } from '@aztec/foundation/config';
+import { getConfigFromMappings, numberConfigHelper, optionalNumberConfigHelper } from '@aztec/foundation/config';
 export const worldStateConfigMappings = {
     worldStateBlockCheckIntervalMS: {
         env: 'WS_BLOCK_CHECK_INTERVAL_MS',
-        parseEnv: (val)=>+val,
-        defaultValue: 100,
+        ...numberConfigHelper(100),
         description: 'The frequency in which to check.'
     },
     worldStateBlockRequestBatchSize: {
         env: 'WS_BLOCK_REQUEST_BATCH_SIZE',
-        parseEnv: (val)=>val ? +val : undefined,
+        ...optionalNumberConfigHelper(),
         description: 'Size of the batch for each get-blocks request from the synchronizer to the archiver.'
     },
     worldStateDbMapSizeKb: {
         env: 'WS_DB_MAP_SIZE_KB',
-        parseEnv: (val)=>val ? +val : undefined,
+        ...optionalNumberConfigHelper(),
         description: 'The maximum possible size of the world state DB in KB. Overwrites the general dataStoreMapSizeKb.'
     },
     archiveTreeMapSizeKb: {
         env: 'ARCHIVE_TREE_MAP_SIZE_KB',
-        parseEnv: (val)=>val ? +val : undefined,
+        ...optionalNumberConfigHelper(),
         description: 'The maximum possible size of the world state archive tree in KB. Overwrites the general worldStateDbMapSizeKb.'
     },
     nullifierTreeMapSizeKb: {
         env: 'NULLIFIER_TREE_MAP_SIZE_KB',
-        parseEnv: (val)=>val ? +val : undefined,
+        ...optionalNumberConfigHelper(),
         description: 'The maximum possible size of the world state nullifier tree in KB. Overwrites the general worldStateDbMapSizeKb.'
     },
     noteHashTreeMapSizeKb: {
         env: 'NOTE_HASH_TREE_MAP_SIZE_KB',
-        parseEnv: (val)=>val ? +val : undefined,
+        ...optionalNumberConfigHelper(),
         description: 'The maximum possible size of the world state note hash tree in KB. Overwrites the general worldStateDbMapSizeKb.'
     },
     messageTreeMapSizeKb: {
         env: 'MESSAGE_TREE_MAP_SIZE_KB',
-        parseEnv: (val)=>val ? +val : undefined,
+        ...optionalNumberConfigHelper(),
         description: 'The maximum possible size of the world state message tree in KB. Overwrites the general worldStateDbMapSizeKb.'
     },
     publicDataTreeMapSizeKb: {
         env: 'PUBLIC_DATA_TREE_MAP_SIZE_KB',
-        parseEnv: (val)=>val ? +val : undefined,
+        ...optionalNumberConfigHelper(),
         description: 'The maximum possible size of the world state public data tree in KB. Overwrites the general worldStateDbMapSizeKb.'
     },
     worldStateDataDirectory: {