@aztec/world-state 0.0.1-commit.993d240 → 0.0.1-commit.9a89641

package/dest/synchronizer/server_world_state_synchronizer.js

@@ -1,9 +1,8 @@
-import { INITIAL_CHECKPOINT_NUMBER } from '@aztec/constants';
 import { BlockNumber, CheckpointNumber } from '@aztec/foundation/branded-types';
 import { createLogger } from '@aztec/foundation/log';
 import { promiseWithResolvers } from '@aztec/foundation/promise';
 import { elapsed } from '@aztec/foundation/timer';
-import { GENESIS_CHECKPOINT_HEADER_HASH, L2BlockStream } from '@aztec/stdlib/block';
+import { EventDrivenL2BlockStream } from '@aztec/stdlib/block';
 import { WorldStateRunningState } from '@aztec/stdlib/interfaces/server';
 import { MerkleTreeId } from '@aztec/stdlib/trees';
 import { getTelemetryClient } from '@aztec/telemetry-client';
@@ -47,6 +46,39 @@ import { WorldStateSynchronizerError } from './errors.js';
     getSnapshot(blockNumber) {
         return this.merkleTreeDb.getSnapshot(blockNumber);
     }
+    async getVerifiedSnapshot(blockNumber, blockHash) {
+        const snapshot = this.merkleTreeDb.getSnapshot(blockNumber);
+        // Block 0's snapshot is the pre-genesis archive view (size 0), so archive leaf 0 is not visible from it;
+        // verify against the initial header hash instead. For later blocks, read archive leaf `blockNumber` from the
+        // snapshot's own view so the exact handle we return is validated against the requested fork.
+        const actualHash = blockNumber === BlockNumber.ZERO ? (await this.merkleTreeCommitted.getInitialHeader().hash()).toString() : (await snapshot.getLeafValue(MerkleTreeId.ARCHIVE, BigInt(blockNumber)))?.toString();
+        if (actualHash === undefined) {
+            // A missing archive leaf means either the block's history has been pruned away (permanent: the block predates
+            // the oldest historical block kept by world state) or a reorg flipped the fork between the sync and this read
+            // (transient). Only the latter is worth retrying, so it alone surfaces as WorldStateSynchronizerError.
+            const { oldestHistoricalBlock } = await this.merkleTreeDb.getStatusSummary();
+            if (blockNumber < oldestHistoricalBlock) {
+                throw new Error(`Unable to find leaf for block ${blockNumber} in the archive tree: world state history has been pruned to block ${oldestHistoricalBlock}`);
+            }
+            throw new WorldStateSynchronizerError(`Unable to read block hash at block ${blockNumber} to verify snapshot`, {
+                cause: {
+                    reason: 'block_not_available',
+                    targetBlockNumber: blockNumber
+                }
+            });
+        }
+        if (actualHash !== blockHash.toString()) {
+            throw new WorldStateSynchronizerError(`Block hash mismatch at block ${blockNumber} (expected ${blockHash} but got ${actualHash})`, {
+                cause: {
+                    reason: 'block_hash_mismatch',
+                    targetBlockNumber: blockNumber,
+                    expectedHash: blockHash.toString(),
+                    actualHash
+                }
+            });
+        }
+        return snapshot;
+    }
     fork(blockNumber, opts) {
         return this.merkleTreeDb.fork(blockNumber, opts);
     }
@@ -83,7 +115,7 @@ import { WorldStateSynchronizerError } from './errors.js';
     }
     createBlockStream() {
         const logger = createLogger('world-state:block_stream');
-        return new L2BlockStream(this.l2BlockSource, this, this, logger, {
+        return new EventDrivenL2BlockStream(this.l2BlockSource, this, this, logger, {
             pollIntervalMS: this.config.worldStateBlockCheckIntervalMS,
             batchSize: this.config.worldStateBlockRequestBatchSize,
             ignoreCheckpoints: true
@@ -198,7 +230,11 @@ import { WorldStateSynchronizerError } from './errors.js';
         }
         return this.merkleTreeCommitted.getLeafValue(MerkleTreeId.ARCHIVE, BigInt(number)).then((leaf)=>leaf?.toString());
     }
-    /** Returns the latest L2 block number for each tip of the chain (latest, proven, finalized). */ async getL2Tips() {
+    /**
+   * Returns the proposed, proven, and finalized block tips of the chain. World state drives its block stream with
+   * `ignoreCheckpoints`, so it does not track checkpointed blocks or checkpoints and omits `checkpointed` from the tips
+   * it reports.
+   */ async getL2Tips() {
         const status = await this.merkleTreeDb.getStatusSummary();
         const unfinalizedBlockHashPromise = this.getL2BlockHash(status.unfinalizedBlockNumber);
         const finalizedBlockHashPromise = this.getL2BlockHash(status.finalizedBlockNumber);
@@ -209,55 +245,21 @@ import { WorldStateSynchronizerError } from './errors.js';
             finalizedBlockHashPromise,
             provenBlockHashPromise
         ]);
-        const latestBlockId = {
-            number: status.unfinalizedBlockNumber,
-            hash: unfinalizedBlockHash
-        };
-        // World state doesn't track checkpointed blocks or checkpoints themselves.
-        // but we use a block stream so we need to provide 'local' L2Tips.
-        // We configure the block stream to ignore checkpoints and set checkpoint values to genesis here.
-        const genesisCheckpointHeaderHash = GENESIS_CHECKPOINT_HEADER_HASH.toString();
-        const initialBlockHash = (await this.merkleTreeCommitted.getInitialHeader().hash()).toString();
         return {
-            proposed: latestBlockId,
-            checkpointed: {
-                block: {
-                    number: BlockNumber.ZERO,
-                    hash: initialBlockHash
-                },
-                checkpoint: {
-                    number: INITIAL_CHECKPOINT_NUMBER,
-                    hash: genesisCheckpointHeaderHash
-                }
-            },
-            proposedCheckpoint: {
-                block: {
-                    number: BlockNumber.ZERO,
-                    hash: initialBlockHash
-                },
-                checkpoint: {
-                    number: INITIAL_CHECKPOINT_NUMBER,
-                    hash: genesisCheckpointHeaderHash
-                }
+            proposed: {
+                number: status.unfinalizedBlockNumber,
+                hash: unfinalizedBlockHash
             },
             finalized: {
                 block: {
                     number: status.finalizedBlockNumber,
-                    hash: finalizedBlockHash ?? ''
-                },
-                checkpoint: {
-                    number: INITIAL_CHECKPOINT_NUMBER,
-                    hash: genesisCheckpointHeaderHash
+                    hash: finalizedBlockHash
                 }
             },
             proven: {
                 block: {
                     number: provenBlockNumber,
-                    hash: provenBlockHash ?? ''
-                },
-                checkpoint: {
-                    number: INITIAL_CHECKPOINT_NUMBER,
-                    hash: genesisCheckpointHeaderHash
+                    hash: provenBlockHash
                 }
             }
         };
@@ -276,6 +278,16 @@ import { WorldStateSynchronizerError } from './errors.js';
             case 'chain-finalized':
                 await this.handleChainFinalized(event.block.number);
                 break;
+            // World state runs in block mode with ignoreCheckpoints: it tracks tips via blocks-added/pruned/proven/finalized
+            // and ignores the thin tip events (it never anchors on them).
+            case 'chain-proposed':
+            case 'chain-checkpointed':
+                break;
+            default:
+                {
+                    const _ = event;
+                    break;
+                }
         }
     }
     /**

package/dest/test/utils.d.ts

@@ -23,4 +23,4 @@ export declare function mockCheckpoint(checkpointNumber: CheckpointNumber, fork:
 }>;
 export declare function assertSameState(forkA: MerkleTreeReadOperations, forkB: MerkleTreeReadOperations): Promise<void>;
 export declare function compareChains(left: MerkleTreeReadOperations, right: MerkleTreeReadOperations): Promise<void>;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidXRpbHMuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy90ZXN0L3V0aWxzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQU9BLE9BQU8sRUFBRSxXQUFXLEVBQUUsS0FBSyxnQkFBZ0IsRUFBeUIsTUFBTSxpQ0FBaUMsQ0FBQztBQUU1RyxPQUFPLEVBQUUsRUFBRSxFQUFFLE1BQU0sZ0NBQWdDLENBQUM7QUFDcEQsT0FBTyxFQUFFLE9BQU8sRUFBRSxNQUFNLHFCQUFxQixDQUFDO0FBQzlDLE9BQU8sS0FBSyxFQUVWLHdCQUF3QixFQUN4Qix5QkFBeUIsRUFDMUIsTUFBTSxpQ0FBaUMsQ0FBQztBQUN6QyxPQUFPLEVBQUUseUJBQXlCLEVBQXNCLE1BQU0sdUJBQXVCLENBQUM7QUFJdEYsT0FBTyxLQUFLLEVBQUUsdUJBQXVCLEVBQUUsTUFBTSxpQ0FBaUMsQ0FBQztBQUUvRSx3QkFBc0IsZ0JBQWdCLENBQUMsS0FBSyxFQUFFLE9BQU8sRUFBRSxjQUFjLEVBQUUsRUFBRSxFQUFFLEVBQUUsSUFBSSxFQUFFLHlCQUF5QixpQkE4QzNHO0FBRUQsd0JBQXNCLFNBQVMsQ0FDN0IsUUFBUSxFQUFFLFdBQVcsRUFDckIsSUFBSSxFQUFFLE1BQU0sRUFDWixJQUFJLEVBQUUseUJBQXlCLEVBQy9CLFVBQVUsR0FBRSxNQUFNLEdBQUcsU0FBZ0IsRUFDckMsaUJBQWlCLEdBQUUsTUFBNEMsRUFDL0Qsd0JBQXdCLEdBQUUsT0FBYzs7O0dBZXpDO0FBRUQsd0JBQXNCLGNBQWMsQ0FBQyxRQUFRLEVBQUUsV0FBVyxFQUFFLElBQUksRUFBRSx5QkFBeUI7OztHQVkxRjtBQUVELHdCQUFzQixVQUFVLENBQzlCLElBQUksRUFBRSxXQUFXLEVBQ2pCLEtBQUssRUFBRSxNQUFNLEVBQ2IsTUFBTSxFQUFFLE1BQU0sRUFDZCxVQUFVLEVBQUUsdUJBQXVCOzs7R0FlcEM7QUFFRCx3QkFBc0IsY0FBYyxDQUNsQyxnQkFBZ0IsRUFBRSxnQkFBZ0IsRUFDbEMsSUFBSSxFQUFFLHlCQUF5QixFQUMvQixPQUFPLEdBQUUsT0FBTyxDQUFDLFVBQVUsQ0FBQyxPQUFPLHlCQUF5QixDQUFDLENBQUMsQ0FBQyxDQUFDLENBQU07OztHQU92RTtBQUVELHdCQUFzQixlQUFlLENBQUMsS0FBSyxFQUFFLHdCQUF3QixFQUFFLEtBQUssRUFBRSx3QkFBd0IsaUJBUXJHO0FBRUQsd0JBQXNCLGFBQWEsQ0FBQyxJQUFJLEVBQUUsd0JBQXdCLEVBQUUsS0FBSyxFQUFFLHdCQUF3QixpQkFZbEcifQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidXRpbHMuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy90ZXN0L3V0aWxzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQU9BLE9BQU8sRUFBRSxXQUFXLEVBQUUsS0FBSyxnQkFBZ0IsRUFBeUIsTUFBTSxpQ0FBaUMsQ0FBQztBQUU1RyxPQUFPLEVBQUUsRUFBRSxFQUFFLE1BQU0sZ0NBQWdDLENBQUM7QUFDcEQsT0FBTyxFQUFFLE9BQU8sRUFBRSxNQUFNLHFCQUFxQixDQUFDO0FBQzlDLE9BQU8sS0FBSyxFQUVWLHdCQUF3QixFQUN4Qix5QkFBeUIsRUFDMUIsTUFBTSxpQ0FBaUMsQ0FBQztBQUN6QyxPQUFPLEVBQUUseUJBQXlCLEVBQXNCLE1BQU0sdUJBQXVCLENBQUM7QUFJdEYsT0FBTyxLQUFLLEVBQUUsdUJBQXVCLEVBQUUsTUFBTSxpQ0FBaUMsQ0FBQztBQUUvRSx3QkFBc0IsZ0JBQWdCLENBQUMsS0FBSyxFQUFFLE9BQU8sRUFBRSxjQUFjLEVBQUUsRUFBRSxFQUFFLEVBQUUsSUFBSSxFQUFFLHlCQUF5QixpQkF1RDNHO0FBRUQsd0JBQXNCLFNBQVMsQ0FDN0IsUUFBUSxFQUFFLFdBQVcsRUFDckIsSUFBSSxFQUFFLE1BQU0sRUFDWixJQUFJLEVBQUUseUJBQXlCLEVBQy9CLFVBQVUsR0FBRSxNQUFNLEdBQUcsU0FBZ0IsRUFDckMsaUJBQWlCLEdBQUUsTUFBNEMsRUFDL0Qsd0JBQXdCLEdBQUUsT0FBYzs7O0dBZXpDO0FBRUQsd0JBQXNCLGNBQWMsQ0FBQyxRQUFRLEVBQUUsV0FBVyxFQUFFLElBQUksRUFBRSx5QkFBeUI7OztHQVkxRjtBQUVELHdCQUFzQixVQUFVLENBQzlCLElBQUksRUFBRSxXQUFXLEVBQ2pCLEtBQUssRUFBRSxNQUFNLEVBQ2IsTUFBTSxFQUFFLE1BQU0sRUFDZCxVQUFVLEVBQUUsdUJBQXVCOzs7R0FlcEM7QUFFRCx3QkFBc0IsY0FBYyxDQUNsQyxnQkFBZ0IsRUFBRSxnQkFBZ0IsRUFDbEMsSUFBSSxFQUFFLHlCQUF5QixFQUMvQixPQUFPLEdBQUUsT0FBTyxDQUFDLFVBQVUsQ0FBQyxPQUFPLHlCQUF5QixDQUFDLENBQUMsQ0FBQyxDQUFDLENBQU07OztHQU92RTtBQUVELHdCQUFzQixlQUFlLENBQUMsS0FBSyxFQUFFLHdCQUF3QixFQUFFLEtBQUssRUFBRSx3QkFBd0IsaUJBUXJHO0FBRUQsd0JBQXNCLGFBQWEsQ0FBQyxJQUFJLEVBQUUsd0JBQXdCLEVBQUUsS0FBSyxFQUFFLHdCQUF3QixpQkFZbEcifQ==

package/dest/test/utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/test/utils.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,WAAW,EAAE,KAAK,gBAAgB,EAAyB,MAAM,iCAAiC,CAAC;AAE5G,OAAO,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AACpD,OAAO,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAC9C,OAAO,KAAK,EAEV,wBAAwB,EACxB,yBAAyB,EAC1B,MAAM,iCAAiC,CAAC;AACzC,OAAO,EAAE,yBAAyB,EAAsB,MAAM,uBAAuB,CAAC;AAItF,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,iCAAiC,CAAC;AAE/E,wBAAsB,gBAAgB,CAAC,KAAK,EAAE,OAAO,EAAE,cAAc,EAAE,EAAE,EAAE,EAAE,IAAI,EAAE,yBAAyB,iBA8C3G;AAED,wBAAsB,SAAS,CAC7B,QAAQ,EAAE,WAAW,EACrB,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,yBAAyB,EAC/B,UAAU,GAAE,MAAM,GAAG,SAAgB,EACrC,iBAAiB,GAAE,MAA4C,EAC/D,wBAAwB,GAAE,OAAc;;;GAezC;AAED,wBAAsB,cAAc,CAAC,QAAQ,EAAE,WAAW,EAAE,IAAI,EAAE,yBAAyB;;;GAY1F;AAED,wBAAsB,UAAU,CAC9B,IAAI,EAAE,WAAW,EACjB,KAAK,EAAE,MAAM,EACb,MAAM,EAAE,MAAM,EACd,UAAU,EAAE,uBAAuB;;;GAepC;AAED,wBAAsB,cAAc,CAClC,gBAAgB,EAAE,gBAAgB,EAClC,IAAI,EAAE,yBAAyB,EAC/B,OAAO,GAAE,OAAO,CAAC,UAAU,CAAC,OAAO,yBAAyB,CAAC,CAAC,CAAC,CAAC,CAAM;;;GAOvE;AAED,wBAAsB,eAAe,CAAC,KAAK,EAAE,wBAAwB,EAAE,KAAK,EAAE,wBAAwB,iBAQrG;AAED,wBAAsB,aAAa,CAAC,IAAI,EAAE,wBAAwB,EAAE,KAAK,EAAE,wBAAwB,iBAYlG"}
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/test/utils.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,WAAW,EAAE,KAAK,gBAAgB,EAAyB,MAAM,iCAAiC,CAAC;AAE5G,OAAO,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AACpD,OAAO,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAC9C,OAAO,KAAK,EAEV,wBAAwB,EACxB,yBAAyB,EAC1B,MAAM,iCAAiC,CAAC;AACzC,OAAO,EAAE,yBAAyB,EAAsB,MAAM,uBAAuB,CAAC;AAItF,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,iCAAiC,CAAC;AAE/E,wBAAsB,gBAAgB,CAAC,KAAK,EAAE,OAAO,EAAE,cAAc,EAAE,EAAE,EAAE,EAAE,IAAI,EAAE,yBAAyB,iBAuD3G;AAED,wBAAsB,SAAS,CAC7B,QAAQ,EAAE,WAAW,EACrB,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,yBAAyB,EAC/B,UAAU,GAAE,MAAM,GAAG,SAAgB,EACrC,iBAAiB,GAAE,MAA4C,EAC/D,wBAAwB,GAAE,OAAc;;;GAezC;AAED,wBAAsB,cAAc,CAAC,QAAQ,EAAE,WAAW,EAAE,IAAI,EAAE,yBAAyB;;;GAY1F;AAED,wBAAsB,UAAU,CAC9B,IAAI,EAAE,WAAW,EACjB,KAAK,EAAE,MAAM,EACb,MAAM,EAAE,MAAM,EACd,UAAU,EAAE,uBAAuB;;;GAepC;AAED,wBAAsB,cAAc,CAClC,gBAAgB,EAAE,gBAAgB,EAClC,IAAI,EAAE,yBAAyB,EAC/B,OAAO,GAAE,OAAO,CAAC,UAAU,CAAC,OAAO,yBAAyB,CAAC,CAAC,CAAC,CAAC,CAAM;;;GAOvE;AAED,wBAAsB,eAAe,CAAC,KAAK,EAAE,wBAAwB,EAAE,KAAK,EAAE,wBAAwB,iBAQrG;AAED,wBAAsB,aAAa,CAAC,IAAI,EAAE,wBAAwB,EAAE,KAAK,EAAE,wBAAwB,iBAYlG"}

package/dest/test/utils.js

@@ -26,9 +26,14 @@ export async function updateBlockState(block, l1ToL2Messages, fork) {
         messageInsert
     ]);
     const state = await fork.getStateReference();
+    // Capture the archive root *before* appending this block so the header's lastArchive chains off the previous block.
+    // sync_block now verifies lastArchive against the committed archive root, so a block carrying an unchained value
+    // (e.g. the random lastArchive from L2Block.random) would be rejected as a divergence from the canonical chain.
+    const previousArchive = await fork.getTreeInfo(MerkleTreeId.ARCHIVE);
     block.header = BlockHeader.from({
         ...block.header,
-        state
+        state,
+        lastArchive: new AppendOnlyTreeSnapshot(Fr.fromBuffer(previousArchive.root), Number(previousArchive.size))
     });
     await fork.updateArchive(block.header);
     const archiveState = await fork.getTreeInfo(MerkleTreeId.ARCHIVE);

package/dest/testing.d.ts

@@ -3,9 +3,9 @@ import type { AztecAddress } from '@aztec/stdlib/aztec-address';
 import { PublicDataTreeLeaf } from '@aztec/stdlib/trees';
 import type { GenesisData } from '@aztec/stdlib/world-state';
 export declare const defaultInitialAccountFeeJuice: Fr;
-export declare function getGenesisValues(initialAccounts: AztecAddress[], initialAccountFeeJuice?: Fr, genesisPublicData?: PublicDataTreeLeaf[], genesisTimestamp?: bigint): Promise<{
+export declare function getGenesisValues(initialAccounts: AztecAddress[], initialAccountFeeJuice?: Fr, genesisPublicData?: PublicDataTreeLeaf[], genesisTimestamp?: bigint, prefilledNullifiers?: Fr[]): Promise<{
     genesisArchiveRoot: Fr;
     genesis: GenesisData;
     fundingNeeded: bigint;
 }>;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidGVzdGluZy5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vc3JjL3Rlc3RpbmcudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQ0EsT0FBTyxFQUFFLEVBQUUsRUFBRSxNQUFNLGdDQUFnQyxDQUFDO0FBRXBELE9BQU8sS0FBSyxFQUFFLFlBQVksRUFBRSxNQUFNLDZCQUE2QixDQUFDO0FBQ2hFLE9BQU8sRUFBZ0Isa0JBQWtCLEVBQUUsTUFBTSxxQkFBcUIsQ0FBQztBQUN2RSxPQUFPLEtBQUssRUFBRSxXQUFXLEVBQUUsTUFBTSwyQkFBMkIsQ0FBQztBQXFCN0QsZUFBTyxNQUFNLDZCQUE2QixJQUFxQixDQUFDO0FBRWhFLHdCQUFzQixnQkFBZ0IsQ0FDcEMsZUFBZSxFQUFFLFlBQVksRUFBRSxFQUMvQixzQkFBc0IsS0FBZ0MsRUFDdEQsaUJBQWlCLEdBQUUsa0JBQWtCLEVBQU8sRUFDNUMsZ0JBQWdCLEdBQUUsTUFBVzs7OztHQXNCOUIifQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidGVzdGluZy5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vc3JjL3Rlc3RpbmcudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQ0EsT0FBTyxFQUFFLEVBQUUsRUFBRSxNQUFNLGdDQUFnQyxDQUFDO0FBRXBELE9BQU8sS0FBSyxFQUFFLFlBQVksRUFBRSxNQUFNLDZCQUE2QixDQUFDO0FBQ2hFLE9BQU8sRUFBZ0Isa0JBQWtCLEVBQUUsTUFBTSxxQkFBcUIsQ0FBQztBQUN2RSxPQUFPLEtBQUssRUFBRSxXQUFXLEVBQUUsTUFBTSwyQkFBMkIsQ0FBQztBQTBCN0QsZUFBTyxNQUFNLDZCQUE2QixJQUFxQixDQUFDO0FBRWhFLHdCQUFzQixnQkFBZ0IsQ0FDcEMsZUFBZSxFQUFFLFlBQVksRUFBRSxFQUMvQixzQkFBc0IsS0FBZ0MsRUFDdEQsaUJBQWlCLEdBQUUsa0JBQWtCLEVBQU8sRUFDNUMsZ0JBQWdCLEdBQUUsTUFBVyxFQUM3QixtQkFBbUIsR0FBRSxFQUFFLEVBQU87Ozs7R0EwQi9CIn0=

package/dest/testing.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"testing.d.ts","sourceRoot":"","sources":["../src/testing.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AAEpD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAChE,OAAO,EAAgB,kBAAkB,EAAE,MAAM,qBAAqB,CAAC;AACvE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAC;AAqB7D,eAAO,MAAM,6BAA6B,IAAqB,CAAC;AAEhE,wBAAsB,gBAAgB,CACpC,eAAe,EAAE,YAAY,EAAE,EAC/B,sBAAsB,KAAgC,EACtD,iBAAiB,GAAE,kBAAkB,EAAO,EAC5C,gBAAgB,GAAE,MAAW;;;;GAsB9B"}
+{"version":3,"file":"testing.d.ts","sourceRoot":"","sources":["../src/testing.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AAEpD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAChE,OAAO,EAAgB,kBAAkB,EAAE,MAAM,qBAAqB,CAAC;AACvE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAC;AA0B7D,eAAO,MAAM,6BAA6B,IAAqB,CAAC;AAEhE,wBAAsB,gBAAgB,CACpC,eAAe,EAAE,YAAY,EAAE,EAC/B,sBAAsB,KAAgC,EACtD,iBAAiB,GAAE,kBAAkB,EAAO,EAC5C,gBAAgB,GAAE,MAAW,EAC7B,mBAAmB,GAAE,EAAE,EAAO;;;;GA0B/B"}

package/dest/testing.js

@@ -4,13 +4,18 @@ import { computeFeePayerBalanceLeafSlot } from '@aztec/protocol-contracts/fee-ju
 import { MerkleTreeId, PublicDataTreeLeaf } from '@aztec/stdlib/trees';
 import { NativeWorldStateService } from './native/index.js';
 async function generateGenesisValues(genesis) {
-    if (!genesis.prefilledPublicData.length && genesis.genesisTimestamp === 0n) {
+    // The GENESIS_ARCHIVE_ROOT constant reflects the canonical empty genesis (no public data, no prefilled nullifiers,
+    // timestamp 0), so we can only short-circuit when this genesis adds none of those on top.
+    if (!genesis.prefilledPublicData.length && genesis.genesisTimestamp === 0n && !genesis.prefilledNullifiers?.length) {
         return {
             genesisArchiveRoot: new Fr(GENESIS_ARCHIVE_ROOT)
         };
     }
-    // Create a temporary world state to compute the genesis values.
-    const ws = await NativeWorldStateService.tmp(undefined /* rollupAddress */ , true, genesis);
+    // Compute the genesis values on a throwaway world state. The archive root derives deterministically from the
+    // prefilled public data, the prefilled nullifiers, and the genesis timestamp, so the fsync-off ephemeral store (no
+    // version manager, no crash-recoverability) produces an identical root while skipping the fsync overhead that `tmp`
+    // pays. close() removes the tmpdir.
+    const ws = await NativeWorldStateService.ephemeral(genesis);
     const genesisArchiveRoot = new Fr((await ws.getCommitted().getTreeInfo(MerkleTreeId.ARCHIVE)).root);
     await ws.close();
     return {
@@ -18,14 +23,20 @@ async function generateGenesisValues(genesis) {
     };
 }
 export const defaultInitialAccountFeeJuice = new Fr(10n ** 22n);
-export async function getGenesisValues(initialAccounts, initialAccountFeeJuice = defaultInitialAccountFeeJuice, genesisPublicData = [], genesisTimestamp = 0n) {
+export async function getGenesisValues(initialAccounts, initialAccountFeeJuice = defaultInitialAccountFeeJuice, genesisPublicData = [], genesisTimestamp = 0n, prefilledNullifiers = []) {
     // Top up the accounts with fee juice.
     let prefilledPublicData = await Promise.all(initialAccounts.map(async (address)=>new PublicDataTreeLeaf(await computeFeePayerBalanceLeafSlot(address), initialAccountFeeJuice)));
     // Add user-defined public data
     prefilledPublicData = prefilledPublicData.concat(genesisPublicData);
     prefilledPublicData.sort((a, b)=>b.slot.lt(a.slot) ? 1 : -1);
+    // The indexed nullifier tree requires its prefilled leaves to be unique and strictly increasing, so sort ascending
+    // here (a copy, to avoid mutating the caller's array) rather than relying on the caller's ordering.
+    const sortedNullifiers = [
+        ...prefilledNullifiers
+    ].sort((a, b)=>a.toBigInt() < b.toBigInt() ? -1 : 1);
     const genesis = {
         prefilledPublicData,
+        prefilledNullifiers: sortedNullifiers,
         genesisTimestamp
     };
     const { genesisArchiveRoot } = await generateGenesisValues(genesis);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aztec/world-state",
-  "version": "0.0.1-commit.993d240",
+  "version": "0.0.1-commit.9a89641",
   "type": "module",
   "exports": {
     ".": "./dest/index.js",
@@ -64,20 +64,21 @@
     ]
   },
   "dependencies": {
-    "@aztec/bb.js": "0.0.1-commit.993d240",
-    "@aztec/constants": "0.0.1-commit.993d240",
-    "@aztec/foundation": "0.0.1-commit.993d240",
-    "@aztec/kv-store": "0.0.1-commit.993d240",
-    "@aztec/native": "0.0.1-commit.993d240",
-    "@aztec/protocol-contracts": "0.0.1-commit.993d240",
-    "@aztec/stdlib": "0.0.1-commit.993d240",
-    "@aztec/telemetry-client": "0.0.1-commit.993d240",
+    "@aztec/bb.js": "6.0.0-nightly.20260807",
+    "@aztec/constants": "0.0.1-commit.9a89641",
+    "@aztec/foundation": "0.0.1-commit.9a89641",
+    "@aztec/kv-store": "0.0.1-commit.9a89641",
+    "@aztec/protocol-contracts": "0.0.1-commit.9a89641",
+    "@aztec/stdlib": "0.0.1-commit.9a89641",
+    "@aztec/telemetry-client": "0.0.1-commit.9a89641",
+    "@aztec/wsdb": "6.0.0-nightly.20260807",
     "msgpackr": "^1.11.2",
     "tslib": "^2.4.0",
     "zod": "^4"
   },
   "devDependencies": {
-    "@aztec/archiver": "0.0.1-commit.993d240",
+    "@aztec/archiver": "0.0.1-commit.9a89641",
+    "@aztec/ipc-runtime": "6.0.0-nightly.20260807",
     "@jest/globals": "^30.0.0",
     "@types/jest": "^30.0.0",
     "@types/node": "^22.15.17",

package/src/index.ts

@@ -2,3 +2,4 @@ export * from './synchronizer/index.js';
 export * from './world-state-db/index.js';
 export * from './synchronizer/config.js';
 export * from './native/index.js';
+export { WorldStateInstrumentation } from './instrumentation/instrumentation.js';

package/src/instrumentation/instrumentation.ts

@@ -10,24 +10,12 @@ import {
   createUpDownCounterWithDefault,
 } from '@aztec/telemetry-client';
 
-import {
-  type DBStats,
-  type TreeDBStats,
-  type TreeMeta,
-  WorldStateMessageType,
-  type WorldStateStatusFull,
-} from '../native/message.js';
+import type { DBStats, TreeDBStats, TreeMeta, WorldStateStatusFull } from '../native/message.js';
+import type { WorldStateOperationName } from '../native/world_state_operation.js';
 
 type DBTypeString = 'leaf_preimage' | 'leaf_indices' | 'nodes' | 'blocks' | 'block_indices';
 
-const durationTrackDenylist = new Set<WorldStateMessageType>([
-  WorldStateMessageType.GET_INITIAL_STATE_REFERENCE,
-  WorldStateMessageType.CLOSE,
-
-  // these aren't used anymore, should be removed from the API
-  WorldStateMessageType.COMMIT,
-  WorldStateMessageType.ROLLBACK,
-]);
+const durationTrackDenylist = new Set<WorldStateOperationName>(['getInitialStateReference']);
 
 export class WorldStateInstrumentation {
   private dbMapSize: Gauge;
@@ -144,10 +132,10 @@ export class WorldStateInstrumentation {
     );
   }
 
-  public recordRoundTrip(timeUs: number, request: WorldStateMessageType) {
-    if (!durationTrackDenylist.has(request)) {
+  public recordRoundTrip(timeUs: number, operation: WorldStateOperationName) {
+    if (!durationTrackDenylist.has(operation)) {
       this.requestHistogram.record(Math.ceil(timeUs), {
-        [Attributes.WORLD_STATE_REQUEST_TYPE]: WorldStateMessageType[request],
+        [Attributes.WORLD_STATE_REQUEST_TYPE]: operation,
       });
     }
   }

package/src/native/index.ts

@@ -1,2 +1,3 @@
 export * from './native_world_state.js';
 export * from './fork_checkpoint.js';
+export { IpcWorldState, getWsdbOptions } from './ipc_world_state_instance.js';