@aztec/world-state 0.0.0-test.1 → 0.0.1-commit.017a351

package/dest/native/native_world_state.js

@@ -1,59 +1,93 @@
+var _computedKey;
 import { MAX_NOTE_HASHES_PER_TX, MAX_NULLIFIERS_PER_TX, NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP } from '@aztec/constants';
-import { padArrayEnd } from '@aztec/foundation/collection';
-import { EthAddress } from '@aztec/foundation/eth-address';
-import { Fr } from '@aztec/foundation/fields';
+import { BlockNumber } from '@aztec/foundation/branded-types';
+import { fromEntries, padArrayEnd } from '@aztec/foundation/collection';
+import { Fr } from '@aztec/foundation/curves/bn254';
 import { createLogger } from '@aztec/foundation/log';
-import { DatabaseVersionManager } from '@aztec/stdlib/database-version';
+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 { 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, sanitiseFullStatus, sanitiseSummary, treeStateReferenceToSnapshot, worldStateRevision } from './message.js';
-import { NativeWorldState } from './native_world_state_instance.js';
+import { WorldStateMessageType, blockStateReference, sanitizeFullStatus, sanitizeSummary, treeStateReferenceToSnapshot } from './message.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 = 1; // The initial version
+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 = createLogger('world-state:database'), 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, dbMapSizeKb, prefilledPublicData = [], instrumentation = new WorldStateInstrumentation(getTelemetryClient()), log = createLogger('world-state:database'), cleanup = ()=>Promise.resolve()) {
-        const worldStateDirectory = join(dataDir, 'world_state');
-        // Create a version manager to handle versioning
-        const versionManager = new DatabaseVersionManager(WORLD_STATE_DB_VERSION, rollupAddress, worldStateDirectory, (dir)=>{
-            return Promise.resolve(new NativeWorldState(dir, dbMapSizeKb, prefilledPublicData, instrumentation));
+    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);
+        const versionManager = new DatabaseVersionManager({
+            schemaVersion: WORLD_STATE_DB_VERSION,
+            rollupAddress,
+            dataDirectory: worldStateDirectory,
+            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) {
-            log.error(`Error initialising world state: ${e}`);
+            log.error(`Error initializing world state: ${e}`);
             throw e;
         }
         return worldState;
     }
-    static async tmp(rollupAddress = EthAddress.ZERO, cleanupTmpDir = true, prefilledPublicData = [], instrumentation = new WorldStateInstrumentation(getTelemetryClient())) {
-        const log = createLogger('world-state:database');
+    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;
-        log.debug(`Created temporary world state database at: ${dataDir} with size: ${dbMapSizeKb}`);
-        // pass a cleanup callback because process.on('beforeExit', cleanup) does not work under Jest
+        const worldStateTreeMapSizes = {
+            archiveTreeMapSizeKb: dbMapSizeKb,
+            nullifierTreeMapSizeKb: dbMapSizeKb,
+            noteHashTreeMapSizeKb: dbMapSizeKb,
+            messageTreeMapSizeKb: dbMapSizeKb,
+            publicDataTreeMapSizeKb: dbMapSizeKb
+        };
+        log.debug(`Created temporary world state database at: ${dataDir} with tree map size: ${dbMapSizeKb}`);
+        const instance = await IpcWorldState.spawn(dataDir, worldStateTreeMapSizes, genesis, instrumentation, bindings);
         const cleanup = async ()=>{
             if (cleanupTmpDir) {
                 await rm(dataDir, {
@@ -66,7 +100,35 @@ export class NativeWorldStateService {
                 log.debug(`Leaving temporary world state database: ${dataDir}`);
             }
         };
-        return this.new(rollupAddress, dataDir, dbMapSizeKb, prefilledPublicData, instrumentation, log, 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();
@@ -88,27 +150,49 @@ export class NativeWorldStateService {
         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;
+        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(false, 0, 0));
+        return new MerkleTreesFacade(this.instance, this.initialHeader, WorldStateRevision.empty());
     }
     getSnapshot(blockNumber) {
-        return new MerkleTreesFacade(this.instance, this.initialHeader, worldStateRevision(false, 0, blockNumber));
+        return new MerkleTreesFacade(this.instance, this.initialHeader, new WorldStateRevision(/*forkId=*/ 0, /* blockNumber=*/ blockNumber, /* includeUncommitted=*/ false));
     }
-    async fork(blockNumber) {
+    async fork(blockNumber, opts = {}) {
         const resp = await this.instance.call(WorldStateMessageType.CREATE_FORK, {
             latest: blockNumber === undefined,
-            blockNumber: blockNumber ?? 0,
+            blockNumber: blockNumber ?? BlockNumber.ZERO,
             canonical: true
         });
-        return new MerkleTreesForkFacade(this.instance, this.initialHeader, worldStateRevision(true, resp.forkId, 0));
+        return new MerkleTreesForkFacade(this.instance, this.initialHeader, new WorldStateRevision(/*forkId=*/ resp.forkId, /* blockNumber=*/ WorldStateRevision.LATEST, /* includeUncommitted=*/ true), opts);
     }
     getInitialHeader() {
         return this.initialHeader;
     }
     async handleL2BlockAndMessages(l2Block, l1ToL2Messages) {
-        // We have to pad both the values within tx effects because that's how the trees are built by circuits.
+        const isFirstBlock = l2Block.indexWithinCheckpoint === 0;
+        if (!isFirstBlock && l1ToL2Messages.length > 0) {
+            throw new Error(`L1 to L2 messages must be empty for non-first blocks, but got ${l1ToL2Messages.length} messages for block ${l2Block.number}.`);
+        }
+        // We have to pad the given l1 to l2 messages, and the note hashes and nullifiers within tx effects, because that's
+        // how the trees are built by circuits.
+        const paddedL1ToL2Messages = isFirstBlock ? padArrayEnd(l1ToL2Messages, Fr.ZERO, NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP) : [];
         const paddedNoteHashes = l2Block.body.txEffects.flatMap((txEffect)=>padArrayEnd(txEffect.noteHashes, Fr.ZERO, MAX_NOTE_HASHES_PER_TX));
-        const paddedL1ToL2Messages = padArrayEnd(l1ToL2Messages, Fr.ZERO, NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP);
         const paddedNullifiers = l2Block.body.txEffects.flatMap((txEffect)=>padArrayEnd(txEffect.nullifiers, Fr.ZERO, MAX_NULLIFIERS_PER_TX)).map((nullifier)=>new NullifierLeaf(nullifier));
         const publicDataWrites = l2Block.body.txEffects.flatMap((txEffect)=>{
             return txEffect.publicDataWrites.map((write)=>{
@@ -121,56 +205,65 @@ export class NativeWorldStateService {
         try {
             return await this.instance.call(WorldStateMessageType.SYNC_BLOCK, {
                 blockNumber: l2Block.number,
-                blockHeaderHash: await l2Block.header.hash(),
+                blockHeaderHash: (await l2Block.hash()).toBuffer(),
                 paddedL1ToL2Messages: paddedL1ToL2Messages.map(serializeLeaf),
                 paddedNoteHashes: paddedNoteHashes.map(serializeLeaf),
                 paddedNullifiers: paddedNullifiers.map(serializeLeaf),
                 publicDataWrites: publicDataWrites.map(serializeLeaf),
                 blockStateRef: blockStateReference(l2Block.header.state),
                 canonical: true
-            }, this.sanitiseAndCacheSummaryFromFull.bind(this), this.deleteCachedSummary.bind(this));
+            }, this.sanitizeAndCacheSummaryFromFull.bind(this), this.deleteCachedSummary.bind(this));
         } catch (err) {
             this.worldStateInstrumentation.incCriticalErrors('synch_pending_block');
             throw err;
         }
     }
     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
+            })
         });
     }
-    sanitiseAndCacheSummaryFromFull(response) {
-        const sanitised = sanitiseFullStatus(response);
+    sanitizeAndCacheSummaryFromFull(response) {
+        const sanitized = sanitizeFullStatus(response);
         this.cachedStatusSummary = {
-            ...sanitised.summary
+            ...sanitized.summary
         };
-        return sanitised;
+        return sanitized;
     }
-    sanitiseAndCacheSummary(response) {
-        const sanitised = sanitiseSummary(response);
+    sanitizeAndCacheSummary(response) {
+        const sanitized = sanitizeSummary(response);
         this.cachedStatusSummary = {
-            ...sanitised
+            ...sanitized
         };
-        return sanitised;
+        return sanitized;
     }
     deleteCachedSummary(_) {
         this.cachedStatusSummary = undefined;
     }
     /**
-   * Advances the finalised block number to be the number provided
-   * @param toBlockNumber The block number that is now the tip of the finalised chain
+   * Advances the finalized block number to be the number provided
+   * @param toBlockNumber The block number that is now the tip of the finalized chain
    * @returns The new WorldStateStatus
-   */ async setFinalised(toBlockNumber) {
+   */ async setFinalized(toBlockNumber) {
         try {
-            await this.instance.call(WorldStateMessageType.FINALISE_BLOCKS, {
+            await this.instance.call(WorldStateMessageType.FINALIZE_BLOCKS, {
                 toBlockNumber,
                 canonical: true
-            }, this.sanitiseAndCacheSummary.bind(this), this.deleteCachedSummary.bind(this));
+            }, this.sanitizeAndCacheSummary.bind(this), this.deleteCachedSummary.bind(this));
         } catch (err) {
             this.worldStateInstrumentation.incCriticalErrors('finalize_block');
             throw err;
@@ -186,7 +279,7 @@ export class NativeWorldStateService {
             return await this.instance.call(WorldStateMessageType.REMOVE_HISTORICAL_BLOCKS, {
                 toBlockNumber,
                 canonical: true
-            }, this.sanitiseAndCacheSummaryFromFull.bind(this), this.deleteCachedSummary.bind(this));
+            }, this.sanitizeAndCacheSummaryFromFull.bind(this), this.deleteCachedSummary.bind(this));
         } catch (err) {
             this.worldStateInstrumentation.incCriticalErrors('prune_historical_block');
             throw err;
@@ -201,7 +294,7 @@ export class NativeWorldStateService {
             return await this.instance.call(WorldStateMessageType.UNWIND_BLOCKS, {
                 toBlockNumber,
                 canonical: true
-            }, this.sanitiseAndCacheSummaryFromFull.bind(this), this.deleteCachedSummary.bind(this));
+            }, this.sanitizeAndCacheSummaryFromFull.bind(this), this.deleteCachedSummary.bind(this));
         } catch (err) {
             this.worldStateInstrumentation.incCriticalErrors('prune_pending_block');
             throw err;
@@ -215,7 +308,7 @@ export class NativeWorldStateService {
         }
         return await this.instance.call(WorldStateMessageType.GET_STATUS, {
             canonical: true
-        }, this.sanitiseAndCacheSummary.bind(this));
+        }, this.sanitizeAndCacheSummary.bind(this));
     }
     updateLeaf(_treeId, _leaf, _index) {
         return Promise.reject(new Error('Method not implemented'));
@@ -226,4 +319,38 @@ export class NativeWorldStateService {
         });
         return new StateReference(treeStateReferenceToSnapshot(resp.state[MerkleTreeId.L1_TO_L2_MESSAGE_TREE]), new PartialStateReference(treeStateReferenceToSnapshot(resp.state[MerkleTreeId.NOTE_HASH_TREE]), treeStateReferenceToSnapshot(resp.state[MerkleTreeId.NULLIFIER_TREE]), treeStateReferenceToSnapshot(resp.state[MerkleTreeId.PUBLIC_DATA_TREE])));
     }
+    async backupTo(dstPath, compact = true) {
+        await this.instance.call(WorldStateMessageType.COPY_STORES, {
+            dstPath,
+            compact,
+            canonical: true
+        });
+        return fromEntries(NATIVE_WORLD_STATE_DBS.map(([name, dir])=>[
+                name,
+                join(dstPath, dir, 'data.mdb')
+            ]));
+    }
 }
+// The following paths are defined in cpp-land
+export const NATIVE_WORLD_STATE_DBS = [
+    [
+        'l1-to-l2-message-tree',
+        'L1ToL2MessageTree'
+    ],
+    [
+        'archive-tree',
+        'ArchiveTree'
+    ],
+    [
+        'public-data-tree',
+        'PublicDataTree'
+    ],
+    [
+        'note-hash-tree',
+        'NoteHashTree'
+    ],
+    [
+        'nullifier-tree',
+        'NullifierTree'
+    ]
+];

package/dest/native/native_world_state_instance.d.ts

@@ -1,33 +1,31 @@
-import type { PublicDataTreeLeaf } from '@aztec/stdlib/trees';
-import type { WorldStateInstrumentation } from '../instrumentation/instrumentation.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]>;
-}
+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 instrumentation;
-    private log;
-    private open;
-    private queues;
-    private instance;
-    /** Creates a new native WorldState instance */
-    constructor(dataDir: string, dbMapSizeKb: number, prefilledPublicData: PublicDataTreeLeaf[] | undefined, instrumentation: WorldStateInstrumentation, log?: import("@aztec/foundation/log").Logger);
+export interface NativeWorldStateInstance {
+    /**
+     * 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.
+     */
+    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=native_world_state_instance.d.ts.map
+//# 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":"AAaA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAC;AAK9D,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,uCAAuC,CAAC;AACvF,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;CACnC;AAED;;GAEG;AACH,qBAAa,gBAAiB,YAAW,wBAAwB;IAa7D,OAAO,CAAC,eAAe;IACvB,OAAO,CAAC,GAAG;IAbb,OAAO,CAAC,IAAI,CAAQ;IAGpB,OAAO,CAAC,MAAM,CAAyC;IAEvD,OAAO,CAAC,QAAQ,CAA+E;IAE/F,+CAA+C;gBAE7C,OAAO,EAAE,MAAM,EACf,WAAW,EAAE,MAAM,EACnB,mBAAmB,kCAA2B,EACtC,eAAe,EAAE,yBAAyB,EAC1C,GAAG,yCAAuC;IA8BpD;;;;;;;OAOG;IACU,IAAI,CAAC,CAAC,SAAS,qBAAqB,EAC/C,WAAW,EAAE,CAAC,EACd,IAAI,EAAE,iBAAiB,CAAC,CAAC,CAAC,GAAG,2BAA2B,EAExD,eAAe,cAAc,kBAAkB,CAAC,CAAC,CAAC,KAAG,kBAAkB,CAAC,CAAC,CAAa,EACtF,YAAY,OAAO,MAAM,SAAO,GAC/B,OAAO,CAAC,kBAAkB,CAAC,CAAC,CAAC,CAAC;IAuDjC;;OAEG;IACU,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;YAiBrB,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,164 +1,9 @@
-import { ARCHIVE_HEIGHT, GeneratorIndex, 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 {
-    instrumentation;
-    log;
-    open;
-    // We maintain a map of queue to fork
-    queues;
-    instance;
-    /** Creates a new native WorldState instance */ constructor(dataDir, dbMapSizeKb, prefilledPublicData = [], instrumentation, log = createLogger('world-state:database')){
-        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 size ${dbMapSizeKb} KB 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, GeneratorIndex.BLOCK_HASH, dbMapSizeKb, threads);
-        this.instance = new MsgpackChannel(ws);
-        // Manually create the queue for the canonical fork
-        this.queues.set(0, new WorldStateOpsQueue());
-    }
-    /**
-   * 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.d.ts

@@ -16,4 +16,4 @@ export declare class WorldStateOpsQueue {
     private sendEnqueuedRequest;
     stop(): Promise<void>;
 }
-//# sourceMappingURL=world_state_ops_queue.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoid29ybGRfc3RhdGVfb3BzX3F1ZXVlLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvbmF0aXZlL3dvcmxkX3N0YXRlX29wc19xdWV1ZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFFQSxPQUFPLEVBQUUscUJBQXFCLEVBQUUsTUFBTSxjQUFjLENBQUM7QUF5QnJELGVBQU8sTUFBTSxrQkFBa0IsNEJBZ0I3QixDQUFDO0FBR0gscUJBQWEsa0JBQWtCO0lBQzdCLE9BQU8sQ0FBQyxRQUFRLENBQXNCO0lBQ3RDLE9BQU8sQ0FBQyxxQkFBcUIsQ0FBSztJQUNsQyxPQUFPLENBQUMsYUFBYSxDQUFLO0lBQzFCLE9BQU8sQ0FBQyxXQUFXLENBQUMsQ0FBZ0I7SUFDcEMsT0FBTyxDQUFDLFdBQVcsQ0FBQyxDQUFhO0lBQ2pDLE9BQU8sQ0FBQyxTQUFTLENBQUs7SUFDdEIsT0FBTyxDQUFDLEdBQUcsQ0FBd0M7SUFJNUMsT0FBTyxDQUFDLE9BQU8sRUFBRSxNQUFNLE9BQU8sQ0FBQyxHQUFHLENBQUMsRUFBRSxXQUFXLEVBQUUscUJBQXFCLEVBQUUsYUFBYSxFQUFFLE9BQU8sZ0JBc0JyRztJQUdELE9BQU8sQ0FBQyxlQUFlO0lBV3ZCLE9BQU8sQ0FBQyw2QkFBNkI7SUFZckMsT0FBTyxDQUFDLDJCQUEyQjtJQVVuQyxPQUFPLENBQUMsZUFBZTtJQXlDdkIsT0FBTyxDQUFDLG1CQUFtQjtJQWdCcEIsSUFBSSxrQkFnQlY7Q0FDRiJ9

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

@@ -1 +1 @@
-{"version":3,"file":"world_state_ops_queue.d.ts","sourceRoot":"","sources":["../../src/native/world_state_ops_queue.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,qBAAqB,EAAE,MAAM,cAAc,CAAC;AAyBrD,eAAO,MAAM,kBAAkB,4BAgB7B,CAAC;AAGH,qBAAa,kBAAkB;IAC7B,OAAO,CAAC,QAAQ,CAAsB;IACtC,OAAO,CAAC,qBAAqB,CAAK;IAClC,OAAO,CAAC,aAAa,CAAK;IAC1B,OAAO,CAAC,WAAW,CAAC,CAAgB;IACpC,OAAO,CAAC,WAAW,CAAC,CAAa;IACjC,OAAO,CAAC,SAAS,CAAK;IACtB,OAAO,CAAC,GAAG,CAAwC;IAI5C,OAAO,CAAC,OAAO,EAAE,MAAM,OAAO,CAAC,GAAG,CAAC,EAAE,WAAW,EAAE,qBAAqB,EAAE,aAAa,EAAE,OAAO;IAyBtG,OAAO,CAAC,eAAe;IAWvB,OAAO,CAAC,6BAA6B;IAYrC,OAAO,CAAC,2BAA2B;IAUnC,OAAO,CAAC,eAAe;IAyCvB,OAAO,CAAC,mBAAmB;IAgBpB,IAAI;CAiBZ"}
+{"version":3,"file":"world_state_ops_queue.d.ts","sourceRoot":"","sources":["../../src/native/world_state_ops_queue.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,qBAAqB,EAAE,MAAM,cAAc,CAAC;AAyBrD,eAAO,MAAM,kBAAkB,4BAgB7B,CAAC;AAGH,qBAAa,kBAAkB;IAC7B,OAAO,CAAC,QAAQ,CAAsB;IACtC,OAAO,CAAC,qBAAqB,CAAK;IAClC,OAAO,CAAC,aAAa,CAAK;IAC1B,OAAO,CAAC,WAAW,CAAC,CAAgB;IACpC,OAAO,CAAC,WAAW,CAAC,CAAa;IACjC,OAAO,CAAC,SAAS,CAAK;IACtB,OAAO,CAAC,GAAG,CAAwC;IAI5C,OAAO,CAAC,OAAO,EAAE,MAAM,OAAO,CAAC,GAAG,CAAC,EAAE,WAAW,EAAE,qBAAqB,EAAE,aAAa,EAAE,OAAO,gBAsBrG;IAGD,OAAO,CAAC,eAAe;IAWvB,OAAO,CAAC,6BAA6B;IAYrC,OAAO,CAAC,2BAA2B;IAUnC,OAAO,CAAC,eAAe;IAyCvB,OAAO,CAAC,mBAAmB;IAgBpB,IAAI,kBAgBV;CACF"}