@aztec/world-state 0.0.1-commit.86469d5 → 0.0.1-commit.8655d4a

package/dest/synchronizer/server_world_state_synchronizer.js

@@ -1,5 +1,5 @@
-import { GENESIS_BLOCK_HEADER_HASH, INITIAL_L2_BLOCK_NUM, INITIAL_L2_CHECKPOINT_NUM } from '@aztec/constants';
-import { BlockNumber } from '@aztec/foundation/branded-types';
+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';
@@ -38,7 +38,7 @@ import { WorldStateSynchronizerError } from './errors.js';
         this.currentState = WorldStateRunningState.IDLE;
         this.syncPromise = promiseWithResolvers();
         this.merkleTreeCommitted = this.merkleTreeDb.getCommitted();
-        this.historyToKeep = config.worldStateBlockHistory < 1 ? undefined : config.worldStateBlockHistory;
+        this.historyToKeep = config.worldStateCheckpointHistory < 1 ? undefined : config.worldStateCheckpointHistory;
         this.log.info(`Created world state synchroniser with block history of ${this.historyToKeep === undefined ? 'infinity' : this.historyToKeep}`);
     }
     getCommitted() {
@@ -130,9 +130,9 @@ import { WorldStateSynchronizerError } from './errors.js';
     /**
    * Forces an immediate sync.
    * @param targetBlockNumber - The target block number that we must sync to. Will download unproven blocks if needed to reach it.
-   * @param skipThrowIfTargetNotReached - Whether to skip throwing if the target block number is not reached.
+   * @param blockHash - If provided, verifies the block at targetBlockNumber matches this hash. On mismatch, triggers a resync (reorg detection).
    * @returns A promise that resolves with the block number the world state was synced to
-   */ async syncImmediate(targetBlockNumber, skipThrowIfTargetNotReached) {
+   */ async syncImmediate(targetBlockNumber, blockHash) {
         if (this.currentState !== WorldStateRunningState.RUNNING) {
             throw new Error(`World State is not running. Unable to perform sync.`);
         }
@@ -142,7 +142,16 @@ import { WorldStateSynchronizerError } from './errors.js';
         // If we have been given a block number to sync to and we have reached that number then return
         const currentBlockNumber = await this.getLatestBlockNumber();
         if (targetBlockNumber !== undefined && targetBlockNumber <= currentBlockNumber) {
-            return currentBlockNumber;
+            if (blockHash === undefined) {
+                return currentBlockNumber;
+            }
+            // If a block hash was provided, verify we're on the expected fork
+            const currentHash = await this.getL2BlockHash(targetBlockNumber);
+            if (currentHash === blockHash.toString()) {
+                return currentBlockNumber;
+            }
+            // Hash mismatch: a reorg may have occurred, fall through to trigger sync
+            this.log.debug(`World state block hash mismatch at ${targetBlockNumber} (expected ${blockHash}, got ${currentHash}). Triggering resync.`);
         }
         this.log.debug(`World State at ${currentBlockNumber} told to sync to ${targetBlockNumber ?? 'latest'}`);
         // If the archiver is behind the target block, force an archiver sync
@@ -157,7 +166,7 @@ import { WorldStateSynchronizerError } from './errors.js';
         await this.blockStream.sync();
         // If we have been given a block number to sync to and we have not reached that number then fail
         const updatedBlockNumber = await this.getLatestBlockNumber();
-        if (!skipThrowIfTargetNotReached && targetBlockNumber !== undefined && targetBlockNumber > updatedBlockNumber) {
+        if (targetBlockNumber !== undefined && targetBlockNumber > updatedBlockNumber) {
             throw new WorldStateSynchronizerError(`Unable to sync to block number ${targetBlockNumber} (last synced is ${updatedBlockNumber})`, {
                 cause: {
                     reason: 'block_not_available',
@@ -167,6 +176,20 @@ import { WorldStateSynchronizerError } from './errors.js';
                 }
             });
         }
+        // If a block hash was provided, verify we're on the expected fork after syncing, throw otherwise
+        if (blockHash !== undefined && targetBlockNumber !== undefined) {
+            const updatedHash = await this.getL2BlockHash(targetBlockNumber);
+            if (updatedHash !== blockHash.toString()) {
+                throw new WorldStateSynchronizerError(`Block hash mismatch at block ${targetBlockNumber} (expected ${blockHash} but got ${updatedHash})`, {
+                    cause: {
+                        reason: 'block_hash_mismatch',
+                        targetBlockNumber,
+                        expectedHash: blockHash.toString(),
+                        actualHash: updatedHash
+                    }
+                });
+            }
+        }
         return updatedBlockNumber;
     }
     /** Returns the L2 block hash for a given number. Used by the L2BlockStream for detecting reorgs. */ async getL2BlockHash(number) {
@@ -194,15 +217,26 @@ import { WorldStateSynchronizerError } from './errors.js';
         // 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: INITIAL_L2_BLOCK_NUM,
-                    hash: GENESIS_BLOCK_HEADER_HASH.toString()
+                    number: BlockNumber.ZERO,
+                    hash: initialBlockHash
+                },
+                checkpoint: {
+                    number: INITIAL_CHECKPOINT_NUMBER,
+                    hash: genesisCheckpointHeaderHash
+                }
+            },
+            proposedCheckpoint: {
+                block: {
+                    number: BlockNumber.ZERO,
+                    hash: initialBlockHash
                 },
                 checkpoint: {
-                    number: INITIAL_L2_CHECKPOINT_NUM,
+                    number: INITIAL_CHECKPOINT_NUMBER,
                     hash: genesisCheckpointHeaderHash
                 }
             },
@@ -212,7 +246,7 @@ import { WorldStateSynchronizerError } from './errors.js';
                     hash: finalizedBlockHash ?? ''
                 },
                 checkpoint: {
-                    number: INITIAL_L2_CHECKPOINT_NUM,
+                    number: INITIAL_CHECKPOINT_NUMBER,
                     hash: genesisCheckpointHeaderHash
                 }
             },
@@ -222,7 +256,7 @@ import { WorldStateSynchronizerError } from './errors.js';
                     hash: provenBlockHash ?? ''
                 },
                 checkpoint: {
-                    number: INITIAL_L2_CHECKPOINT_NUM,
+                    number: INITIAL_CHECKPOINT_NUMBER,
                     hash: genesisCheckpointHeaderHash
                 }
             }
@@ -296,16 +330,52 @@ import { WorldStateSynchronizerError } from './errors.js';
     }
     async handleChainFinalized(blockNumber) {
         this.log.verbose(`Finalized chain is now at block ${blockNumber}`);
+        // If the finalized block number is older than the oldest available block in world state,
+        // skip entirely. The finalized block number can jump backwards (e.g. when the finalization
+        // heuristic changes) and try to read block data that has already been pruned. When this
+        // happens, there is nothing useful to do — the native world state is already finalized
+        // past this point and pruning has already happened.
+        const currentSummary = await this.merkleTreeDb.getStatusSummary();
+        if (blockNumber < currentSummary.oldestHistoricalBlock || blockNumber < 1) {
+            this.log.trace(`Finalized block ${blockNumber} is older than the oldest available block ${currentSummary.oldestHistoricalBlock}. Skipping.`);
+            return;
+        }
         const summary = await this.merkleTreeDb.setFinalized(blockNumber);
         if (this.historyToKeep === undefined) {
             return;
         }
-        const newHistoricBlock = summary.finalizedBlockNumber - this.historyToKeep + 1;
-        if (newHistoricBlock <= 1) {
+        const finalisedBlockData = await this.l2BlockSource.getBlockData({
+            number: summary.finalizedBlockNumber
+        });
+        if (finalisedBlockData === undefined) {
+            this.log.warn(`Failed to retrieve checkpointed block for finalized block number: ${summary.finalizedBlockNumber}`);
+            return;
+        }
+        // Compute the required historic checkpoint number
+        const newHistoricCheckpointNumber = finalisedBlockData.checkpointNumber - this.historyToKeep + 1;
+        if (newHistoricCheckpointNumber <= 1) {
+            return;
+        }
+        // Retrieve the historic checkpoint
+        const historicCheckpoint = await this.l2BlockSource.getCheckpoint({
+            number: CheckpointNumber(newHistoricCheckpointNumber)
+        });
+        if (!historicCheckpoint) {
+            this.log.warn(`Failed to retrieve checkpoint number ${newHistoricCheckpointNumber} from Archiver`);
             return;
         }
-        this.log.verbose(`Pruning historic blocks to ${newHistoricBlock}`);
-        const status = await this.merkleTreeDb.removeHistoricalBlocks(BlockNumber(newHistoricBlock));
+        if (historicCheckpoint.checkpoint.blocks.length === 0 || historicCheckpoint.checkpoint.blocks[0] === undefined) {
+            this.log.warn(`Retrieved checkpoint number ${newHistoricCheckpointNumber} has no blocks!`);
+            return;
+        }
+        // Find the block at the start of the checkpoint and remove blocks up to this one
+        const newHistoricBlock = historicCheckpoint.checkpoint.blocks[0];
+        if (newHistoricBlock.number <= currentSummary.oldestHistoricalBlock) {
+            this.log.debug(`Historic block ${newHistoricBlock.number} is not newer than oldest available ${currentSummary.oldestHistoricalBlock}. Skipping prune.`);
+            return;
+        }
+        this.log.verbose(`Pruning historic blocks to ${newHistoricBlock.number}`);
+        const status = await this.merkleTreeDb.removeHistoricalBlocks(BlockNumber(newHistoricBlock.number));
         this.log.debug(`World state summary `, status.summary);
     }
     handleChainProven(blockNumber) {
@@ -314,9 +384,11 @@ import { WorldStateSynchronizerError } from './errors.js';
         return Promise.resolve();
     }
     async handleChainPruned(blockNumber) {
-        this.log.warn(`Chain pruned to block ${blockNumber}`);
+        this.log.info(`Chain pruned to block ${blockNumber}`);
         const status = await this.merkleTreeDb.unwindBlocks(blockNumber);
-        this.provenBlockNumber = undefined;
+        if (this.provenBlockNumber !== undefined && this.provenBlockNumber > blockNumber) {
+            this.provenBlockNumber = undefined;
+        }
         this.instrumentation.updateWorldStateMetrics(status);
     }
     /**

package/dest/testing.d.ts

@@ -1,10 +1,11 @@
 import { Fr } from '@aztec/foundation/curves/bn254';
 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[]): Promise<{
+export declare function getGenesisValues(initialAccounts: AztecAddress[], initialAccountFeeJuice?: Fr, genesisPublicData?: PublicDataTreeLeaf[], genesisTimestamp?: bigint): Promise<{
     genesisArchiveRoot: Fr;
-    prefilledPublicData: PublicDataTreeLeaf[];
+    genesis: GenesisData;
     fundingNeeded: bigint;
 }>;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidGVzdGluZy5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vc3JjL3Rlc3RpbmcudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQ0EsT0FBTyxFQUFFLEVBQUUsRUFBRSxNQUFNLGdDQUFnQyxDQUFDO0FBRXBELE9BQU8sS0FBSyxFQUFFLFlBQVksRUFBRSxNQUFNLDZCQUE2QixDQUFDO0FBQ2hFLE9BQU8sRUFBZ0Isa0JBQWtCLEVBQUUsTUFBTSxxQkFBcUIsQ0FBQztBQXlCdkUsZUFBTyxNQUFNLDZCQUE2QixJQUFxQixDQUFDO0FBRWhFLHdCQUFzQixnQkFBZ0IsQ0FDcEMsZUFBZSxFQUFFLFlBQVksRUFBRSxFQUMvQixzQkFBc0IsS0FBZ0MsRUFDdEQsaUJBQWlCLEdBQUUsa0JBQWtCLEVBQU87Ozs7R0FxQjdDIn0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidGVzdGluZy5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vc3JjL3Rlc3RpbmcudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQ0EsT0FBTyxFQUFFLEVBQUUsRUFBRSxNQUFNLGdDQUFnQyxDQUFDO0FBRXBELE9BQU8sS0FBSyxFQUFFLFlBQVksRUFBRSxNQUFNLDZCQUE2QixDQUFDO0FBQ2hFLE9BQU8sRUFBZ0Isa0JBQWtCLEVBQUUsTUFBTSxxQkFBcUIsQ0FBQztBQUN2RSxPQUFPLEtBQUssRUFBRSxXQUFXLEVBQUUsTUFBTSwyQkFBMkIsQ0FBQztBQXFCN0QsZUFBTyxNQUFNLDZCQUE2QixJQUFxQixDQUFDO0FBRWhFLHdCQUFzQixnQkFBZ0IsQ0FDcEMsZUFBZSxFQUFFLFlBQVksRUFBRSxFQUMvQixzQkFBc0IsS0FBZ0MsRUFDdEQsaUJBQWlCLEdBQUUsa0JBQWtCLEVBQU8sRUFDNUMsZ0JBQWdCLEdBQUUsTUFBVzs7OztHQXNCOUIifQ==

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;AAyBvE,eAAO,MAAM,6BAA6B,IAAqB,CAAC;AAEhE,wBAAsB,gBAAgB,CACpC,eAAe,EAAE,YAAY,EAAE,EAC/B,sBAAsB,KAAgC,EACtD,iBAAiB,GAAE,kBAAkB,EAAO;;;;GAqB7C"}
+{"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"}

package/dest/testing.js

@@ -3,14 +3,14 @@ import { Fr } from '@aztec/foundation/curves/bn254';
 import { computeFeePayerBalanceLeafSlot } from '@aztec/protocol-contracts/fee-juice';
 import { MerkleTreeId, PublicDataTreeLeaf } from '@aztec/stdlib/trees';
 import { NativeWorldStateService } from './native/index.js';
-async function generateGenesisValues(prefilledPublicData) {
-    if (!prefilledPublicData.length) {
+async function generateGenesisValues(genesis) {
+    if (!genesis.prefilledPublicData.length && genesis.genesisTimestamp === 0n) {
         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, prefilledPublicData);
+    const ws = await NativeWorldStateService.tmp(undefined /* rollupAddress */ , true, genesis);
     const genesisArchiveRoot = new Fr((await ws.getCommitted().getTreeInfo(MerkleTreeId.ARCHIVE)).root);
     await ws.close();
     return {
@@ -18,16 +18,20 @@ async function generateGenesisValues(prefilledPublicData) {
     };
 }
 export const defaultInitialAccountFeeJuice = new Fr(10n ** 22n);
-export async function getGenesisValues(initialAccounts, initialAccountFeeJuice = defaultInitialAccountFeeJuice, genesisPublicData = []) {
+export async function getGenesisValues(initialAccounts, initialAccountFeeJuice = defaultInitialAccountFeeJuice, genesisPublicData = [], genesisTimestamp = 0n) {
     // 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);
-    const { genesisArchiveRoot } = await generateGenesisValues(prefilledPublicData);
+    const genesis = {
+        prefilledPublicData,
+        genesisTimestamp
+    };
+    const { genesisArchiveRoot } = await generateGenesisValues(genesis);
     return {
         genesisArchiveRoot,
-        prefilledPublicData,
+        genesis,
         fundingNeeded: BigInt(initialAccounts.length) * initialAccountFeeJuice.toBigInt()
     };
 }

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

@@ -1,9 +1,7 @@
 import type { BlockNumber } from '@aztec/foundation/branded-types';
 import type { Fr } from '@aztec/foundation/curves/bn254';
-import type { IndexedTreeSnapshot, TreeSnapshot } from '@aztec/merkle-tree';
 import type { L2Block } from '@aztec/stdlib/block';
 import type { ForkMerkleTreeOperations, MerkleTreeReadOperations, ReadonlyWorldStateAccess } from '@aztec/stdlib/interfaces/server';
-import type { MerkleTreeId } from '@aztec/stdlib/trees';
 import type { WorldStateStatusFull, WorldStateStatusSummary } from '../native/message.js';
 /**
  *
@@ -22,13 +20,6 @@ import type { WorldStateStatusFull, WorldStateStatusSummary } from '../native/me
  */
 export declare const INITIAL_NULLIFIER_TREE_SIZE: number;
 export declare const INITIAL_PUBLIC_DATA_TREE_SIZE: number;
-export type TreeSnapshots = {
-    [MerkleTreeId.NULLIFIER_TREE]: IndexedTreeSnapshot;
-    [MerkleTreeId.NOTE_HASH_TREE]: TreeSnapshot<Fr>;
-    [MerkleTreeId.PUBLIC_DATA_TREE]: IndexedTreeSnapshot;
-    [MerkleTreeId.L1_TO_L2_MESSAGE_TREE]: TreeSnapshot<Fr>;
-    [MerkleTreeId.ARCHIVE]: TreeSnapshot<Fr>;
-};
 export interface MerkleTreeAdminDatabase extends ForkMerkleTreeOperations, ReadonlyWorldStateAccess {
     /**
      * Handles a single L2 block (i.e. Inserts the new note hashes into the merkle tree).
@@ -68,4 +59,4 @@ export interface MerkleTreeAdminDatabase extends ForkMerkleTreeOperations, Reado
     /** Deletes the db. */
     clear(): Promise<void>;
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibWVya2xlX3RyZWVfZGIuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy93b3JsZC1zdGF0ZS1kYi9tZXJrbGVfdHJlZV9kYi50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFDQSxPQUFPLEtBQUssRUFBRSxXQUFXLEVBQUUsTUFBTSxpQ0FBaUMsQ0FBQztBQUNuRSxPQUFPLEtBQUssRUFBRSxFQUFFLEVBQUUsTUFBTSxnQ0FBZ0MsQ0FBQztBQUN6RCxPQUFPLEtBQUssRUFBRSxtQkFBbUIsRUFBRSxZQUFZLEVBQUUsTUFBTSxvQkFBb0IsQ0FBQztBQUM1RSxPQUFPLEtBQUssRUFBRSxPQUFPLEVBQUUsTUFBTSxxQkFBcUIsQ0FBQztBQUNuRCxPQUFPLEtBQUssRUFDVix3QkFBd0IsRUFDeEIsd0JBQXdCLEVBQ3hCLHdCQUF3QixFQUN6QixNQUFNLGlDQUFpQyxDQUFDO0FBQ3pDLE9BQU8sS0FBSyxFQUFFLFlBQVksRUFBRSxNQUFNLHFCQUFxQixDQUFDO0FBRXhELE9BQU8sS0FBSyxFQUFFLG9CQUFvQixFQUFFLHVCQUF1QixFQUFFLE1BQU0sc0JBQXNCLENBQUM7QUFFMUY7Ozs7Ozs7Ozs7Ozs7O0dBY0c7QUFDSCxlQUFPLE1BQU0sMkJBQTJCLFFBQTRCLENBQUM7QUFFckUsZUFBTyxNQUFNLDZCQUE2QixRQUFtRCxDQUFDO0FBRTlGLE1BQU0sTUFBTSxhQUFhLEdBQUc7SUFDMUIsQ0FBQyxZQUFZLENBQUMsY0FBYyxDQUFDLEVBQUUsbUJBQW1CLENBQUM7SUFDbkQsQ0FBQyxZQUFZLENBQUMsY0FBYyxDQUFDLEVBQUUsWUFBWSxDQUFDLEVBQUUsQ0FBQyxDQUFDO0lBQ2hELENBQUMsWUFBWSxDQUFDLGdCQUFnQixDQUFDLEVBQUUsbUJBQW1CLENBQUM7SUFDckQsQ0FBQyxZQUFZLENBQUMscUJBQXFCLENBQUMsRUFBRSxZQUFZLENBQUMsRUFBRSxDQUFDLENBQUM7SUFDdkQsQ0FBQyxZQUFZLENBQUMsT0FBTyxDQUFDLEVBQUUsWUFBWSxDQUFDLEVBQUUsQ0FBQyxDQUFDO0NBQzFDLENBQUM7QUFFRixNQUFNLFdBQVcsdUJBQXdCLFNBQVEsd0JBQXdCLEVBQUUsd0JBQXdCO0lBQ2pHOzs7O09BSUc7SUFDSCx3QkFBd0IsQ0FBQyxLQUFLLEVBQUUsT0FBTyxFQUFFLGNBQWMsRUFBRSxFQUFFLEVBQUUsR0FBRyxPQUFPLENBQUMsb0JBQW9CLENBQUMsQ0FBQztJQUU5Rjs7T0FFRztJQUNILFlBQVksSUFBSSx3QkFBd0IsQ0FBQztJQUV6Qzs7OztPQUlHO0lBQ0gsc0JBQXNCLENBQUMsYUFBYSxFQUFFLFdBQVcsR0FBRyxPQUFPLENBQUMsb0JBQW9CLENBQUMsQ0FBQztJQUVsRjs7OztPQUlHO0lBQ0gsWUFBWSxDQUFDLGFBQWEsRUFBRSxXQUFXLEdBQUcsT0FBTyxDQUFDLG9CQUFvQixDQUFDLENBQUM7SUFFeEU7Ozs7T0FJRztJQUNILFlBQVksQ0FBQyxhQUFhLEVBQUUsV0FBVyxHQUFHLE9BQU8sQ0FBQyx1QkFBdUIsQ0FBQyxDQUFDO0lBRTNFOzs7T0FHRztJQUNILGdCQUFnQixJQUFJLE9BQU8sQ0FBQyx1QkFBdUIsQ0FBQyxDQUFDO0lBRXJELHlCQUF5QjtJQUN6QixLQUFLLElBQUksT0FBTyxDQUFDLElBQUksQ0FBQyxDQUFDO0lBRXZCLHNCQUFzQjtJQUN0QixLQUFLLElBQUksT0FBTyxDQUFDLElBQUksQ0FBQyxDQUFDO0NBQ3hCIn0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibWVya2xlX3RyZWVfZGIuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy93b3JsZC1zdGF0ZS1kYi9tZXJrbGVfdHJlZV9kYi50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFDQSxPQUFPLEtBQUssRUFBRSxXQUFXLEVBQUUsTUFBTSxpQ0FBaUMsQ0FBQztBQUNuRSxPQUFPLEtBQUssRUFBRSxFQUFFLEVBQUUsTUFBTSxnQ0FBZ0MsQ0FBQztBQUN6RCxPQUFPLEtBQUssRUFBRSxPQUFPLEVBQUUsTUFBTSxxQkFBcUIsQ0FBQztBQUNuRCxPQUFPLEtBQUssRUFDVix3QkFBd0IsRUFDeEIsd0JBQXdCLEVBQ3hCLHdCQUF3QixFQUN6QixNQUFNLGlDQUFpQyxDQUFDO0FBRXpDLE9BQU8sS0FBSyxFQUFFLG9CQUFvQixFQUFFLHVCQUF1QixFQUFFLE1BQU0sc0JBQXNCLENBQUM7QUFFMUY7Ozs7Ozs7Ozs7Ozs7O0dBY0c7QUFDSCxlQUFPLE1BQU0sMkJBQTJCLFFBQTRCLENBQUM7QUFFckUsZUFBTyxNQUFNLDZCQUE2QixRQUFtRCxDQUFDO0FBRTlGLE1BQU0sV0FBVyx1QkFBd0IsU0FBUSx3QkFBd0IsRUFBRSx3QkFBd0I7SUFDakc7Ozs7T0FJRztJQUNILHdCQUF3QixDQUFDLEtBQUssRUFBRSxPQUFPLEVBQUUsY0FBYyxFQUFFLEVBQUUsRUFBRSxHQUFHLE9BQU8sQ0FBQyxvQkFBb0IsQ0FBQyxDQUFDO0lBRTlGOztPQUVHO0lBQ0gsWUFBWSxJQUFJLHdCQUF3QixDQUFDO0lBRXpDOzs7O09BSUc7SUFDSCxzQkFBc0IsQ0FBQyxhQUFhLEVBQUUsV0FBVyxHQUFHLE9BQU8sQ0FBQyxvQkFBb0IsQ0FBQyxDQUFDO0lBRWxGOzs7O09BSUc7SUFDSCxZQUFZLENBQUMsYUFBYSxFQUFFLFdBQVcsR0FBRyxPQUFPLENBQUMsb0JBQW9CLENBQUMsQ0FBQztJQUV4RTs7OztPQUlHO0lBQ0gsWUFBWSxDQUFDLGFBQWEsRUFBRSxXQUFXLEdBQUcsT0FBTyxDQUFDLHVCQUF1QixDQUFDLENBQUM7SUFFM0U7OztPQUdHO0lBQ0gsZ0JBQWdCLElBQUksT0FBTyxDQUFDLHVCQUF1QixDQUFDLENBQUM7SUFFckQseUJBQXlCO0lBQ3pCLEtBQUssSUFBSSxPQUFPLENBQUMsSUFBSSxDQUFDLENBQUM7SUFFdkIsc0JBQXNCO0lBQ3RCLEtBQUssSUFBSSxPQUFPLENBQUMsSUFBSSxDQUFDLENBQUM7Q0FDeEIifQ==

package/dest/world-state-db/merkle_tree_db.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"merkle_tree_db.d.ts","sourceRoot":"","sources":["../../src/world-state-db/merkle_tree_db.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,iCAAiC,CAAC;AACnE,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AACzD,OAAO,KAAK,EAAE,mBAAmB,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAC5E,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AACnD,OAAO,KAAK,EACV,wBAAwB,EACxB,wBAAwB,EACxB,wBAAwB,EACzB,MAAM,iCAAiC,CAAC;AACzC,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AAExD,OAAO,KAAK,EAAE,oBAAoB,EAAE,uBAAuB,EAAE,MAAM,sBAAsB,CAAC;AAE1F;;;;;;;;;;;;;;GAcG;AACH,eAAO,MAAM,2BAA2B,QAA4B,CAAC;AAErE,eAAO,MAAM,6BAA6B,QAAmD,CAAC;AAE9F,MAAM,MAAM,aAAa,GAAG;IAC1B,CAAC,YAAY,CAAC,cAAc,CAAC,EAAE,mBAAmB,CAAC;IACnD,CAAC,YAAY,CAAC,cAAc,CAAC,EAAE,YAAY,CAAC,EAAE,CAAC,CAAC;IAChD,CAAC,YAAY,CAAC,gBAAgB,CAAC,EAAE,mBAAmB,CAAC;IACrD,CAAC,YAAY,CAAC,qBAAqB,CAAC,EAAE,YAAY,CAAC,EAAE,CAAC,CAAC;IACvD,CAAC,YAAY,CAAC,OAAO,CAAC,EAAE,YAAY,CAAC,EAAE,CAAC,CAAC;CAC1C,CAAC;AAEF,MAAM,WAAW,uBAAwB,SAAQ,wBAAwB,EAAE,wBAAwB;IACjG;;;;OAIG;IACH,wBAAwB,CAAC,KAAK,EAAE,OAAO,EAAE,cAAc,EAAE,EAAE,EAAE,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAAC;IAE9F;;OAEG;IACH,YAAY,IAAI,wBAAwB,CAAC;IAEzC;;;;OAIG;IACH,sBAAsB,CAAC,aAAa,EAAE,WAAW,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAAC;IAElF;;;;OAIG;IACH,YAAY,CAAC,aAAa,EAAE,WAAW,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAAC;IAExE;;;;OAIG;IACH,YAAY,CAAC,aAAa,EAAE,WAAW,GAAG,OAAO,CAAC,uBAAuB,CAAC,CAAC;IAE3E;;;OAGG;IACH,gBAAgB,IAAI,OAAO,CAAC,uBAAuB,CAAC,CAAC;IAErD,yBAAyB;IACzB,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IAEvB,sBAAsB;IACtB,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;CACxB"}
+{"version":3,"file":"merkle_tree_db.d.ts","sourceRoot":"","sources":["../../src/world-state-db/merkle_tree_db.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,iCAAiC,CAAC;AACnE,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AACzD,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AACnD,OAAO,KAAK,EACV,wBAAwB,EACxB,wBAAwB,EACxB,wBAAwB,EACzB,MAAM,iCAAiC,CAAC;AAEzC,OAAO,KAAK,EAAE,oBAAoB,EAAE,uBAAuB,EAAE,MAAM,sBAAsB,CAAC;AAE1F;;;;;;;;;;;;;;GAcG;AACH,eAAO,MAAM,2BAA2B,QAA4B,CAAC;AAErE,eAAO,MAAM,6BAA6B,QAAmD,CAAC;AAE9F,MAAM,WAAW,uBAAwB,SAAQ,wBAAwB,EAAE,wBAAwB;IACjG;;;;OAIG;IACH,wBAAwB,CAAC,KAAK,EAAE,OAAO,EAAE,cAAc,EAAE,EAAE,EAAE,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAAC;IAE9F;;OAEG;IACH,YAAY,IAAI,wBAAwB,CAAC;IAEzC;;;;OAIG;IACH,sBAAsB,CAAC,aAAa,EAAE,WAAW,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAAC;IAElF;;;;OAIG;IACH,YAAY,CAAC,aAAa,EAAE,WAAW,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAAC;IAExE;;;;OAIG;IACH,YAAY,CAAC,aAAa,EAAE,WAAW,GAAG,OAAO,CAAC,uBAAuB,CAAC,CAAC;IAE3E;;;OAGG;IACH,gBAAgB,IAAI,OAAO,CAAC,uBAAuB,CAAC,CAAC;IAErD,yBAAyB;IACzB,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IAEvB,sBAAsB;IACtB,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;CACxB"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aztec/world-state",
-  "version": "0.0.1-commit.86469d5",
+  "version": "0.0.1-commit.8655d4a",
   "type": "module",
   "exports": {
     ".": "./dest/index.js",
@@ -64,19 +64,20 @@
     ]
   },
   "dependencies": {
-    "@aztec/constants": "0.0.1-commit.86469d5",
-    "@aztec/foundation": "0.0.1-commit.86469d5",
-    "@aztec/kv-store": "0.0.1-commit.86469d5",
-    "@aztec/merkle-tree": "0.0.1-commit.86469d5",
-    "@aztec/native": "0.0.1-commit.86469d5",
-    "@aztec/protocol-contracts": "0.0.1-commit.86469d5",
-    "@aztec/stdlib": "0.0.1-commit.86469d5",
-    "@aztec/telemetry-client": "0.0.1-commit.86469d5",
+    "@aztec/bb.js": "0.0.1-commit.8655d4a",
+    "@aztec/constants": "0.0.1-commit.8655d4a",
+    "@aztec/foundation": "0.0.1-commit.8655d4a",
+    "@aztec/kv-store": "0.0.1-commit.8655d4a",
+    "@aztec/native": "0.0.1-commit.8655d4a",
+    "@aztec/protocol-contracts": "0.0.1-commit.8655d4a",
+    "@aztec/stdlib": "0.0.1-commit.8655d4a",
+    "@aztec/telemetry-client": "0.0.1-commit.8655d4a",
+    "msgpackr": "^1.11.2",
     "tslib": "^2.4.0",
-    "zod": "^3.23.8"
+    "zod": "^4"
   },
   "devDependencies": {
-    "@aztec/archiver": "0.0.1-commit.86469d5",
+    "@aztec/archiver": "0.0.1-commit.8655d4a",
     "@jest/globals": "^30.0.0",
     "@types/jest": "^30.0.0",
     "@types/node": "^22.15.17",

package/src/native/fork_checkpoint.ts

@@ -3,11 +3,14 @@ import type { MerkleTreeCheckpointOperations } from '@aztec/stdlib/interfaces/se
 export class ForkCheckpoint {
   private completed = false;
 
-  private constructor(private readonly fork: MerkleTreeCheckpointOperations) {}
+  private constructor(
+    private readonly fork: MerkleTreeCheckpointOperations,
+    public readonly depth: number,
+  ) {}
 
   static async new(fork: MerkleTreeCheckpointOperations): Promise<ForkCheckpoint> {
-    await fork.createCheckpoint();
-    return new ForkCheckpoint(fork);
+    const depth = await fork.createCheckpoint();
+    return new ForkCheckpoint(fork, depth);
   }
 
   async commit(): Promise<void> {
@@ -27,4 +30,17 @@ export class ForkCheckpoint {
     await this.fork.revertCheckpoint();
     this.completed = true;
   }
+
+  /**
+   * Reverts this checkpoint and any nested checkpoints created on top of it,
+   * leaving the checkpoint depth at the level it was before this checkpoint was created.
+   */
+  async revertToCheckpoint(): Promise<void> {
+    if (this.completed) {
+      return;
+    }
+
+    await this.fork.revertAllCheckpointsTo(this.depth - 1);
+    this.completed = true;
+  }
 }