@aztec/node-lib 5.3.0-nightly.20261016.a → 5.3.0-nightly.20261017

package/dest/actions/snapshot-sync.d.ts

@@ -7,16 +7,18 @@ import type { ChainConfig } from '@aztec/stdlib/config';
 import { type ReadOnlyFileStore } from '@aztec/stdlib/file-store';
 import type { DataStoreConfig } from '@aztec/stdlib/kv-store';
 import { type SnapshotMetadata } from '@aztec/stdlib/snapshots';
+import type { GenesisData } from '@aztec/stdlib/world-state';
+import { type WorldStateConfig } from '@aztec/world-state';
 import type { SharedNodeConfig } from '../config/index.js';
-type SnapshotSyncConfig = Pick<SharedNodeConfig, 'syncMode'> & Pick<ChainConfig, 'l1ChainId' | 'rollupVersion'> & Pick<L1ContractsConfig, 'aztecEpochDuration'> & Pick<ArchiverConfig, 'archiverStoreMapSizeKb'> & DataStoreConfig & Required<Pick<DataStoreConfig, 'rollupAddress'>> & EthereumClientConfig & {
+type SnapshotSyncConfig = Pick<SharedNodeConfig, 'syncMode'> & Pick<ChainConfig, 'l1ChainId' | 'rollupVersion'> & Pick<L1ContractsConfig, 'aztecEpochDuration'> & Pick<ArchiverConfig, 'archiverStoreMapSizeKb'> & WorldStateConfig & DataStoreConfig & Required<Pick<DataStoreConfig, 'rollupAddress'>> & EthereumClientConfig & {
     snapshotsUrls?: string[];
     minL1BlocksToTriggerReplace?: number;
 };
 /**
- * Connects to a remote snapshot index and downloads the latest snapshot if the local archiver is behind.
- * Behaviour depends on syncing mode.
+ * Validates local history and restores the newest compatible snapshot when bootstrap is needed.
+ * Fixed history boundaries are resolved against archived block and checkpoint metadata.
  */
-export declare function trySnapshotSync(config: SnapshotSyncConfig, log: Logger): Promise<boolean>;
+export declare function trySnapshotSync(config: SnapshotSyncConfig, log: Logger, genesis?: GenesisData): Promise<boolean>;
 /**
  * Downloads the given snapshot replacing any local data stores.
  */
@@ -24,6 +26,9 @@ export declare function snapshotSync(snapshot: Pick<SnapshotMetadata, 'dataUrls'
     dataDirectory: string;
     rollupAddress: EthAddress;
     fileStore: ReadOnlyFileStore;
+    worldStateDataDirectory?: string;
+    validateArchiver?: (stagingDirectory: string) => Promise<void>;
+    validate?: (stagingDirectory: string) => Promise<void>;
 }): Promise<void>;
 export {};
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic25hcHNob3Qtc3luYy5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2FjdGlvbnMvc25hcHNob3Qtc3luYy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBR0wsS0FBSyxjQUFjLEVBR3BCLE1BQU0saUJBQWlCLENBQUM7QUFFekIsT0FBTyxFQUFFLEtBQUssb0JBQW9CLEVBQW1CLE1BQU0sd0JBQXdCLENBQUM7QUFDcEYsT0FBTyxLQUFLLEVBQUUsaUJBQWlCLEVBQUUsTUFBTSx3QkFBd0IsQ0FBQztBQUNoRSxPQUFPLEtBQUssRUFBRSxVQUFVLEVBQUUsTUFBTSwrQkFBK0IsQ0FBQztBQUVoRSxPQUFPLEtBQUssRUFBRSxNQUFNLEVBQUUsTUFBTSx1QkFBdUIsQ0FBQztBQUdwRCxPQUFPLEtBQUssRUFBRSxXQUFXLEVBQUUsTUFBTSxzQkFBc0IsQ0FBQztBQUV4RCxPQUFPLEVBQUUsS0FBSyxpQkFBaUIsRUFBMkIsTUFBTSwwQkFBMEIsQ0FBQztBQUMzRixPQUFPLEtBQUssRUFBRSxlQUFlLEVBQUUsTUFBTSx3QkFBd0IsQ0FBQztBQUM5RCxPQUFPLEVBQ0wsS0FBSyxnQkFBZ0IsRUFLdEIsTUFBTSx5QkFBeUIsQ0FBQztBQU1qQyxPQUFPLEtBQUssRUFBRSxnQkFBZ0IsRUFBRSxNQUFNLG9CQUFvQixDQUFDO0FBSzNELEtBQUssa0JBQWtCLEdBQUcsSUFBSSxDQUFDLGdCQUFnQixFQUFFLFVBQVUsQ0FBQyxHQUMxRCxJQUFJLENBQUMsV0FBVyxFQUFFLFdBQVcsR0FBRyxlQUFlLENBQUMsR0FDaEQsSUFBSSxDQUFDLGlCQUFpQixFQUFFLG9CQUFvQixDQUFDLEdBQzdDLElBQUksQ0FBQyxjQUFjLEVBQUUsd0JBQXdCLENBQUMsR0FDOUMsZUFBZSxHQUNmLFFBQVEsQ0FBQyxJQUFJLENBQUMsZUFBZSxFQUFFLGVBQWUsQ0FBQyxDQUFDLEdBQ2hELG9CQUFvQixHQUFHO0lBQ3JCLGFBQWEsQ0FBQyxFQUFFLE1BQU0sRUFBRSxDQUFDO0lBQ3pCLDJCQUEyQixDQUFDLEVBQUUsTUFBTSxDQUFDO0NBQ3RDLENBQUM7QUFFSjs7O0dBR0c7QUFDSCx3QkFBc0IsZUFBZSxDQUFDLE1BQU0sRUFBRSxrQkFBa0IsRUFBRSxHQUFHLEVBQUUsTUFBTSxvQkF1SzVFO0FBRUQ7O0dBRUc7QUFDSCx3QkFBc0IsWUFBWSxDQUNoQyxRQUFRLEVBQUUsSUFBSSxDQUFDLGdCQUFnQixFQUFFLFVBQVUsQ0FBQyxFQUM1QyxHQUFHLEVBQUUsTUFBTSxFQUNYLE1BQU0sRUFBRTtJQUFFLGFBQWEsRUFBRSxNQUFNLENBQUM7SUFBQyxhQUFhLEVBQUUsVUFBVSxDQUFDO0lBQUMsU0FBUyxFQUFFLGlCQUFpQixDQUFBO0NBQUUsaUJBbUQzRiJ9
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic25hcHNob3Qtc3luYy5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2FjdGlvbnMvc25hcHNob3Qtc3luYy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBR0wsS0FBSyxjQUFjLEVBR3BCLE1BQU0saUJBQWlCLENBQUM7QUFFekIsT0FBTyxFQUFFLEtBQUssb0JBQW9CLEVBQW1CLE1BQU0sd0JBQXdCLENBQUM7QUFDcEYsT0FBTyxLQUFLLEVBQUUsaUJBQWlCLEVBQUUsTUFBTSx3QkFBd0IsQ0FBQztBQUVoRSxPQUFPLEtBQUssRUFBRSxVQUFVLEVBQUUsTUFBTSwrQkFBK0IsQ0FBQztBQUVoRSxPQUFPLEtBQUssRUFBRSxNQUFNLEVBQUUsTUFBTSx1QkFBdUIsQ0FBQztBQUdwRCxPQUFPLEtBQUssRUFBRSxXQUFXLEVBQUUsTUFBTSxzQkFBc0IsQ0FBQztBQUV4RCxPQUFPLEVBQUUsS0FBSyxpQkFBaUIsRUFBMkIsTUFBTSwwQkFBMEIsQ0FBQztBQUMzRixPQUFPLEtBQUssRUFBRSxlQUFlLEVBQUUsTUFBTSx3QkFBd0IsQ0FBQztBQUM5RCxPQUFPLEVBRUwsS0FBSyxnQkFBZ0IsRUFLdEIsTUFBTSx5QkFBeUIsQ0FBQztBQUNqQyxPQUFPLEtBQUssRUFBRSxXQUFXLEVBQUUsTUFBTSwyQkFBMkIsQ0FBQztBQUM3RCxPQUFPLEVBSUwsS0FBSyxnQkFBZ0IsRUFJdEIsTUFBTSxvQkFBb0IsQ0FBQztBQUs1QixPQUFPLEtBQUssRUFBRSxnQkFBZ0IsRUFBRSxNQUFNLG9CQUFvQixDQUFDO0FBSzNELEtBQUssa0JBQWtCLEdBQUcsSUFBSSxDQUFDLGdCQUFnQixFQUFFLFVBQVUsQ0FBQyxHQUMxRCxJQUFJLENBQUMsV0FBVyxFQUFFLFdBQVcsR0FBRyxlQUFlLENBQUMsR0FDaEQsSUFBSSxDQUFDLGlCQUFpQixFQUFFLG9CQUFvQixDQUFDLEdBQzdDLElBQUksQ0FBQyxjQUFjLEVBQUUsd0JBQXdCLENBQUMsR0FDOUMsZ0JBQWdCLEdBQ2hCLGVBQWUsR0FDZixRQUFRLENBQUMsSUFBSSxDQUFDLGVBQWUsRUFBRSxlQUFlLENBQUMsQ0FBQyxHQUNoRCxvQkFBb0IsR0FBRztJQUNyQixhQUFhLENBQUMsRUFBRSxNQUFNLEVBQUUsQ0FBQztJQUN6QiwyQkFBMkIsQ0FBQyxFQUFFLE1BQU0sQ0FBQztDQUN0QyxDQUFDO0FBRUo7OztHQUdHO0FBQ0gsd0JBQXNCLGVBQWUsQ0FBQyxNQUFNLEVBQUUsa0JBQWtCLEVBQUUsR0FBRyxFQUFFLE1BQU0sRUFBRSxPQUFPLENBQUMsRUFBRSxXQUFXLG9CQXNQbkc7QUFFRDs7R0FFRztBQUNILHdCQUFzQixZQUFZLENBQ2hDLFFBQVEsRUFBRSxJQUFJLENBQUMsZ0JBQWdCLEVBQUUsVUFBVSxDQUFDLEVBQzVDLEdBQUcsRUFBRSxNQUFNLEVBQ1gsTUFBTSxFQUFFO0lBQ04sYUFBYSxFQUFFLE1BQU0sQ0FBQztJQUN0QixhQUFhLEVBQUUsVUFBVSxDQUFDO0lBQzFCLFNBQVMsRUFBRSxpQkFBaUIsQ0FBQztJQUM3Qix1QkFBdUIsQ0FBQyxFQUFFLE1BQU0sQ0FBQztJQUNqQyxnQkFBZ0IsQ0FBQyxFQUFFLENBQUMsZ0JBQWdCLEVBQUUsTUFBTSxLQUFLLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FBQztJQUMvRCxRQUFRLENBQUMsRUFBRSxDQUFDLGdCQUFnQixFQUFFLE1BQU0sS0FBSyxPQUFPLENBQUMsSUFBSSxDQUFDLENBQUM7Q0FDeEQsaUJBcUVGIn0=

package/dest/actions/snapshot-sync.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"snapshot-sync.d.ts","sourceRoot":"","sources":["../../src/actions/snapshot-sync.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,KAAK,cAAc,EAGpB,MAAM,iBAAiB,CAAC;AAEzB,OAAO,EAAE,KAAK,oBAAoB,EAAmB,MAAM,wBAAwB,CAAC;AACpF,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAChE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAEhE,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAGpD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAExD,OAAO,EAAE,KAAK,iBAAiB,EAA2B,MAAM,0BAA0B,CAAC;AAC3F,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAC9D,OAAO,EACL,KAAK,gBAAgB,EAKtB,MAAM,yBAAyB,CAAC;AAMjC,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAK3D,KAAK,kBAAkB,GAAG,IAAI,CAAC,gBAAgB,EAAE,UAAU,CAAC,GAC1D,IAAI,CAAC,WAAW,EAAE,WAAW,GAAG,eAAe,CAAC,GAChD,IAAI,CAAC,iBAAiB,EAAE,oBAAoB,CAAC,GAC7C,IAAI,CAAC,cAAc,EAAE,wBAAwB,CAAC,GAC9C,eAAe,GACf,QAAQ,CAAC,IAAI,CAAC,eAAe,EAAE,eAAe,CAAC,CAAC,GAChD,oBAAoB,GAAG;IACrB,aAAa,CAAC,EAAE,MAAM,EAAE,CAAC;IACzB,2BAA2B,CAAC,EAAE,MAAM,CAAC;CACtC,CAAC;AAEJ;;;GAGG;AACH,wBAAsB,eAAe,CAAC,MAAM,EAAE,kBAAkB,EAAE,GAAG,EAAE,MAAM,oBAuK5E;AAED;;GAEG;AACH,wBAAsB,YAAY,CAChC,QAAQ,EAAE,IAAI,CAAC,gBAAgB,EAAE,UAAU,CAAC,EAC5C,GAAG,EAAE,MAAM,EACX,MAAM,EAAE;IAAE,aAAa,EAAE,MAAM,CAAC;IAAC,aAAa,EAAE,UAAU,CAAC;IAAC,SAAS,EAAE,iBAAiB,CAAA;CAAE,iBAmD3F"}
+{"version":3,"file":"snapshot-sync.d.ts","sourceRoot":"","sources":["../../src/actions/snapshot-sync.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,KAAK,cAAc,EAGpB,MAAM,iBAAiB,CAAC;AAEzB,OAAO,EAAE,KAAK,oBAAoB,EAAmB,MAAM,wBAAwB,CAAC;AACpF,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAEhE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAEhE,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAGpD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAExD,OAAO,EAAE,KAAK,iBAAiB,EAA2B,MAAM,0BAA0B,CAAC;AAC3F,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAC9D,OAAO,EAEL,KAAK,gBAAgB,EAKtB,MAAM,yBAAyB,CAAC;AACjC,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAC;AAC7D,OAAO,EAIL,KAAK,gBAAgB,EAItB,MAAM,oBAAoB,CAAC;AAK5B,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAK3D,KAAK,kBAAkB,GAAG,IAAI,CAAC,gBAAgB,EAAE,UAAU,CAAC,GAC1D,IAAI,CAAC,WAAW,EAAE,WAAW,GAAG,eAAe,CAAC,GAChD,IAAI,CAAC,iBAAiB,EAAE,oBAAoB,CAAC,GAC7C,IAAI,CAAC,cAAc,EAAE,wBAAwB,CAAC,GAC9C,gBAAgB,GAChB,eAAe,GACf,QAAQ,CAAC,IAAI,CAAC,eAAe,EAAE,eAAe,CAAC,CAAC,GAChD,oBAAoB,GAAG;IACrB,aAAa,CAAC,EAAE,MAAM,EAAE,CAAC;IACzB,2BAA2B,CAAC,EAAE,MAAM,CAAC;CACtC,CAAC;AAEJ;;;GAGG;AACH,wBAAsB,eAAe,CAAC,MAAM,EAAE,kBAAkB,EAAE,GAAG,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,WAAW,oBAsPnG;AAED;;GAEG;AACH,wBAAsB,YAAY,CAChC,QAAQ,EAAE,IAAI,CAAC,gBAAgB,EAAE,UAAU,CAAC,EAC5C,GAAG,EAAE,MAAM,EACX,MAAM,EAAE;IACN,aAAa,EAAE,MAAM,CAAC;IACtB,aAAa,EAAE,UAAU,CAAC;IAC1B,SAAS,EAAE,iBAAiB,CAAC;IAC7B,uBAAuB,CAAC,EAAE,MAAM,CAAC;IACjC,gBAAgB,CAAC,EAAE,CAAC,gBAAgB,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IAC/D,QAAQ,CAAC,EAAE,CAAC,gBAAgB,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;CACxD,iBAqEF"}

package/dest/actions/snapshot-sync.js

@@ -1,22 +1,33 @@
 import { ARCHIVER_DB_VERSION, ARCHIVER_STORE_NAME, createArchiverStore, getArchiverSynchPoint } from '@aztec/archiver';
 import { INITIAL_L2_BLOCK_NUM } from '@aztec/constants';
 import { getPublicClient } from '@aztec/ethereum/client';
+import { BlockNumber } from '@aztec/foundation/branded-types';
 import { tryRmDir } from '@aztec/foundation/fs';
 import { P2P_STORE_NAME } from '@aztec/p2p';
 import { GENESIS_BLOCK_HEADER_HASH } from '@aztec/stdlib/block';
 import { DatabaseVersionManager } from '@aztec/stdlib/database-version/manager';
 import { createReadOnlyFileStore } from '@aztec/stdlib/file-store';
-import { downloadSnapshot, getLatestSnapshotMetadata, makeSnapshotPaths } from '@aztec/stdlib/snapshots';
-import { NATIVE_WORLD_STATE_DBS, WORLD_STATE_DB_VERSION, WORLD_STATE_DIR } from '@aztec/world-state';
-import { mkdir, mkdtemp, rename } from 'fs/promises';
+import { SnapshotDataKeys, downloadSnapshot, getSnapshotIndex, makeSnapshotPaths } from '@aztec/stdlib/snapshots';
+import { NATIVE_WORLD_STATE_DBS, WORLD_STATE_DB_VERSION, WORLD_STATE_DIR, createWorldState, getWorldStateHistoryStartCheckpoint, validateWorldStateHistory } from '@aztec/world-state';
+import { copyFile, mkdir, mkdtemp, rename, stat, unlink } from 'fs/promises';
 import { join } from 'path';
 // Half day worth of L1 blocks
 const MIN_L1_BLOCKS_TO_TRIGGER_REPLACE = 86400 / 2 / 12;
 /**
- * Connects to a remote snapshot index and downloads the latest snapshot if the local archiver is behind.
- * Behaviour depends on syncing mode.
- */ export async function trySnapshotSync(config, log) {
+ * Validates local history and restores the newest compatible snapshot when bootstrap is needed.
+ * Fixed history boundaries are resolved against archived block and checkpoint metadata.
+ */ export async function trySnapshotSync(config, log, genesis) {
     const { syncMode, snapshotsUrls, dataDirectory, l1ChainId, rollupVersion, rollupAddress } = config;
+    const historyStartCheckpoint = config.worldStatePruneBeforeCheckpoint;
+    let maxSnapshotBlock = historyStartCheckpoint === 0 ? BlockNumber.ZERO : undefined;
+    const worldStateDirectory = config.worldStateDataDirectory ?? dataDirectory;
+    if (historyStartCheckpoint !== undefined && worldStateDirectory && await hasWorldStateDatabase(worldStateDirectory)) {
+        await validateLocalWorldStateHistory(config, log, genesis);
+        log.info('Using existing world-state database with compatible retained history', {
+            historyStartCheckpoint
+        });
+        return false;
+    }
     if (syncMode === 'full') {
         log.debug('Snapshot sync is disabled. Running full sync.', {
             syncMode: syncMode
@@ -51,12 +62,12 @@ const MIN_L1_BLOCKS_TO_TRIGGER_REPLACE = 86400 / 2 / 12;
         await archiverStore.db.close();
     }
     const minL1BlocksToTriggerReplace = config.minL1BlocksToTriggerReplace ?? MIN_L1_BLOCKS_TO_TRIGGER_REPLACE;
-    if (syncMode === 'snapshot' && archiverL2BlockNumber !== undefined && archiverL2BlockNumber >= INITIAL_L2_BLOCK_NUM) {
+    if (historyStartCheckpoint === undefined && syncMode === 'snapshot' && archiverL2BlockNumber !== undefined && archiverL2BlockNumber >= INITIAL_L2_BLOCK_NUM) {
         log.verbose(`Skipping non-forced snapshot sync as archiver is already synced to L2 block ${archiverL2BlockNumber}.`);
         return false;
     }
     const currentL1BlockNumber = await getPublicClient(config).getBlockNumber();
-    if (archiverL1BlockNumber && currentL1BlockNumber >= archiverL1BlockNumber && currentL1BlockNumber - archiverL1BlockNumber < minL1BlocksToTriggerReplace) {
+    if (historyStartCheckpoint === undefined && archiverL1BlockNumber && currentL1BlockNumber >= archiverL1BlockNumber && currentL1BlockNumber - archiverL1BlockNumber < minL1BlocksToTriggerReplace) {
         log.verbose(`Skipping snapshot sync as archiver is less than ${currentL1BlockNumber - archiverL1BlockNumber} L1 blocks behind.`, {
             archiverL1BlockNumber,
             currentL1BlockNumber,
@@ -78,52 +89,54 @@ const MIN_L1_BLOCKS_TO_TRIGGER_REPLACE = 86400 / 2 / 12;
             log.error(`Invalid config for downloading snapshots from ${snapshotsUrl}`, err);
             continue;
         }
-        let snapshot;
+        let snapshots;
         try {
-            snapshot = await getLatestSnapshotMetadata(indexMetadata, fileStore);
+            snapshots = (await getSnapshotIndex(indexMetadata, fileStore))?.snapshots ?? [];
         } catch (err) {
-            log.error(`Failed to get latest snapshot metadata from ${snapshotsUrl}. Skipping this URL.`, err, {
+            log.error(`Failed to read snapshot index from ${snapshotsUrl}. Skipping this URL.`, err, {
                 ...indexMetadata,
                 snapshotsUrl
             });
             continue;
         }
-        if (!snapshot) {
+        if (snapshots.length === 0) {
             log.verbose(`No snapshot found at ${snapshotsUrl}. Skipping this URL.`, {
                 ...indexMetadata,
                 snapshotsUrl
             });
             continue;
         }
-        if (snapshot.schemaVersions.archiver !== ARCHIVER_DB_VERSION) {
-            log.warn(`Skipping snapshot from ${snapshotsUrl} as it has schema version ${snapshot.schemaVersions.archiver} but expected ${ARCHIVER_DB_VERSION}.`, snapshot);
-            continue;
-        }
-        if (snapshot.schemaVersions.worldState !== WORLD_STATE_DB_VERSION) {
-            log.warn(`Skipping snapshot from ${snapshotsUrl} as it has world state schema version ${snapshot.schemaVersions.worldState} but we expected ${WORLD_STATE_DB_VERSION}.`, snapshot);
-            continue;
-        }
-        if (archiverL1BlockNumber && snapshot.l1BlockNumber < archiverL1BlockNumber) {
-            log.verbose(`Skipping snapshot from ${snapshotsUrl} since local archiver is at L1 block ${archiverL1BlockNumber} which is further than snapshot at ${snapshot.l1BlockNumber}`, {
+        for (const snapshot of snapshots){
+            if (snapshot.schemaVersions.archiver !== ARCHIVER_DB_VERSION) {
+                log.warn(`Skipping snapshot from ${snapshotsUrl} as it has schema version ${snapshot.schemaVersions.archiver} but expected ${ARCHIVER_DB_VERSION}.`, snapshot);
+                continue;
+            }
+            if (snapshot.schemaVersions.worldState !== WORLD_STATE_DB_VERSION) {
+                log.warn(`Skipping snapshot from ${snapshotsUrl} as it has world state schema version ${snapshot.schemaVersions.worldState} but we expected ${WORLD_STATE_DB_VERSION}.`, snapshot);
+                continue;
+            }
+            if (historyStartCheckpoint === undefined && archiverL1BlockNumber && snapshot.l1BlockNumber < archiverL1BlockNumber) {
+                log.verbose(`Skipping snapshot from ${snapshotsUrl} since local archiver is at L1 block ${archiverL1BlockNumber} which is further than snapshot at ${snapshot.l1BlockNumber}`, {
+                    snapshot,
+                    archiverL1BlockNumber,
+                    snapshotsUrl
+                });
+                continue;
+            }
+            if (historyStartCheckpoint === undefined && archiverL1BlockNumber && snapshot.l1BlockNumber - Number(archiverL1BlockNumber) < minL1BlocksToTriggerReplace) {
+                log.verbose(`Skipping snapshot from ${snapshotsUrl} as archiver is less than ${snapshot.l1BlockNumber - Number(archiverL1BlockNumber)} L1 blocks behind this snapshot.`, {
+                    snapshot,
+                    archiverL1BlockNumber,
+                    snapshotsUrl
+                });
+                continue;
+            }
+            snapshotCandidates.push({
                 snapshot,
-                archiverL1BlockNumber,
-                snapshotsUrl
-            });
-            continue;
-        }
-        if (archiverL1BlockNumber && snapshot.l1BlockNumber - Number(archiverL1BlockNumber) < minL1BlocksToTriggerReplace) {
-            log.verbose(`Skipping snapshot from ${snapshotsUrl} as archiver is less than ${snapshot.l1BlockNumber - Number(archiverL1BlockNumber)} L1 blocks behind this snapshot.`, {
-                snapshot,
-                archiverL1BlockNumber,
-                snapshotsUrl
+                url: snapshotsUrl,
+                fileStore
             });
-            continue;
         }
-        snapshotCandidates.push({
-            snapshot,
-            url: snapshotsUrl,
-            fileStore
-        });
     }
     if (snapshotCandidates.length === 0) {
         log.verbose(`No valid snapshots found from any URL, skipping snapshot sync`, {
@@ -132,20 +145,64 @@ const MIN_L1_BLOCKS_TO_TRIGGER_REPLACE = 86400 / 2 / 12;
         });
         return false;
     }
-    // Sort candidates by L1 block number (highest first)
-    snapshotCandidates.sort((a, b)=>b.snapshot.l1BlockNumber - a.snapshot.l1BlockNumber);
+    snapshotCandidates.sort((a, b)=>historyStartCheckpoint === undefined ? b.snapshot.l1BlockNumber - a.snapshot.l1BlockNumber : b.snapshot.l2BlockNumber - a.snapshot.l2BlockNumber || b.snapshot.l1BlockNumber - a.snapshot.l1BlockNumber);
     // Try each candidate in order until one succeeds
     for (const { snapshot, url, fileStore } of snapshotCandidates){
+        if (maxSnapshotBlock !== undefined && snapshot.l2BlockNumber > maxSnapshotBlock) {
+            continue;
+        }
         const { l1BlockNumber, l2BlockNumber } = snapshot;
         log.info(`Attempting to sync from snapshot at L1 block ${l1BlockNumber} L2 block ${l2BlockNumber}`, {
             snapshot,
             snapshotsUrl: url
         });
         try {
+            const available = await Promise.all(Object.values(snapshot.dataUrls).map((path)=>fileStore.exists(path)));
+            if (!available.every(Boolean)) {
+                log.warn('Skipping snapshot with missing database files', {
+                    l1BlockNumber,
+                    l2BlockNumber,
+                    snapshotsUrl: url
+                });
+                continue;
+            }
             await snapshotSync(snapshot, log, {
                 dataDirectory: config.dataDirectory,
                 rollupAddress: config.rollupAddress,
-                fileStore
+                fileStore,
+                worldStateDataDirectory: config.worldStateDataDirectory,
+                validateArchiver: historyStartCheckpoint === undefined || historyStartCheckpoint === 0 ? undefined : async (stagingDirectory)=>{
+                    const stores = await createArchiverStore({
+                        ...config,
+                        dataDirectory: stagingDirectory
+                    }, GENESIS_BLOCK_HEADER_HASH);
+                    try {
+                        const latestBlockNumber = await stores.blocks.getLatestL2BlockNumber();
+                        if (latestBlockNumber === undefined) {
+                            throw new Error('Snapshot archiver has no blocks');
+                        }
+                        const latestBlock = await stores.blocks.getBlockData({
+                            number: latestBlockNumber
+                        });
+                        if (!latestBlock) {
+                            throw new Error(`Snapshot archiver is missing block ${latestBlockNumber}`);
+                        }
+                        if (latestBlock.checkpointNumber > historyStartCheckpoint) {
+                            const checkpoint = await stores.blocks.getCheckpointData(historyStartCheckpoint);
+                            if (checkpoint) {
+                                maxSnapshotBlock = BlockNumber(checkpoint.startBlock + checkpoint.blockCount - 1);
+                            }
+                            throw new Error(`Snapshot is at checkpoint ${latestBlock.checkpointNumber}, after requested checkpoint ${historyStartCheckpoint}`);
+                        }
+                    } finally{
+                        await stores.db.close();
+                    }
+                },
+                validate: historyStartCheckpoint === undefined ? undefined : (stagingDirectory)=>validateLocalWorldStateHistory({
+                        ...config,
+                        dataDirectory: stagingDirectory,
+                        worldStateDataDirectory: stagingDirectory
+                    }, log, genesis)
             });
             log.info(`Snapshot synced to L1 block ${l1BlockNumber} L2 block ${l2BlockNumber}`, {
                 snapshot,
@@ -180,11 +237,26 @@ const MIN_L1_BLOCKS_TO_TRIGGER_REPLACE = 86400 / 2 / 12;
         });
         downloadDir = await mkdtemp(join(dataDirectory, 'download-'));
         const downloadPaths = makeSnapshotPaths(downloadDir);
+        await prepareTarget(join(downloadDir, ARCHIVER_STORE_NAME), ARCHIVER_DB_VERSION, rollupAddress);
+        await prepareTarget(join(downloadDir, WORLD_STATE_DIR), WORLD_STATE_DB_VERSION, rollupAddress);
+        downloadPaths.archiver = join(downloadDir, ARCHIVER_STORE_NAME, 'data.mdb');
+        for (const [name, dir] of NATIVE_WORLD_STATE_DBS){
+            downloadPaths[name] = join(downloadDir, WORLD_STATE_DIR, dir, 'data.mdb');
+        }
         log.info(`Downloading snapshot to ${downloadDir}`, {
             snapshot,
             downloadPaths
         });
-        await downloadSnapshot(snapshot, downloadPaths, fileStore);
+        if (config.validateArchiver) {
+            await downloadSnapshot(snapshot, downloadPaths, fileStore, [
+                'archiver'
+            ]);
+            await config.validateArchiver(downloadDir);
+            await downloadSnapshot(snapshot, downloadPaths, fileStore, SnapshotDataKeys.filter((key)=>key !== 'archiver'));
+        } else {
+            await downloadSnapshot(snapshot, downloadPaths, fileStore);
+        }
+        await config.validate?.(downloadDir);
         log.info(`Snapshot downloaded at ${downloadDir}`, {
             snapshot,
             downloadPaths
@@ -199,14 +271,14 @@ const MIN_L1_BLOCKS_TO_TRIGGER_REPLACE = 86400 / 2 / 12;
             rollupAddress
         });
         // Same for the world state dbs, only that we do not close them, since we assume they are not yet in use
-        const worldStateBasePath = join(dataDirectory, WORLD_STATE_DIR);
+        const worldStateBasePath = join(config.worldStateDataDirectory ?? dataDirectory, WORLD_STATE_DIR);
         await prepareTarget(worldStateBasePath, WORLD_STATE_DB_VERSION, rollupAddress);
         for (const [name, dir] of NATIVE_WORLD_STATE_DBS){
             const path = join(worldStateBasePath, dir);
             await mkdir(path, {
                 recursive: true
             });
-            await rename(downloadPaths[name], join(path, 'data.mdb'));
+            await moveSnapshotFile(downloadPaths[name], join(path, 'data.mdb'));
             log.info(`World state database ${name} set up from snapshot`, {
                 path,
                 dbVersion: WORLD_STATE_DB_VERSION,
@@ -225,6 +297,54 @@ const MIN_L1_BLOCKS_TO_TRIGGER_REPLACE = 86400 / 2 / 12;
         }
     }
 }
+async function moveSnapshotFile(source, destination) {
+    try {
+        await rename(source, destination);
+    } catch (err) {
+        if (!err || typeof err !== 'object' || !('code' in err) || err.code !== 'EXDEV') {
+            throw err;
+        }
+        await copyFile(source, destination);
+        await unlink(source);
+    }
+}
+async function hasWorldStateDatabase(dataDirectory) {
+    const sizes = await Promise.all(NATIVE_WORLD_STATE_DBS.map(async ([, directory])=>{
+        try {
+            return (await stat(join(dataDirectory, WORLD_STATE_DIR, directory, 'data.mdb'))).size;
+        } catch (err) {
+            if (err && typeof err === 'object' && 'code' in err && err.code === 'ENOENT') {
+                return 0;
+            }
+            throw err;
+        }
+    }));
+    return sizes.some((size)=>size > 0);
+}
+async function validateLocalWorldStateHistory(config, log, genesis) {
+    const worldState = await createWorldState(config, genesis);
+    try {
+        const summary = await worldState.getStatusSummary();
+        if (getWorldStateHistoryStartCheckpoint(config) !== 0 && summary.oldestHistoricalBlock > 1) {
+            const archiverStore = await createArchiverStore(config, GENESIS_BLOCK_HEADER_HASH);
+            try {
+                await validateWorldStateHistory(config, summary, archiverStore.blocks);
+            } finally{
+                await archiverStore.db.close();
+            }
+        } else {
+            await validateWorldStateHistory(config, summary);
+        }
+        log.info('Validated retained world-state history', {
+            oldestHistoricBlock: summary.oldestHistoricalBlock,
+            latestBlock: summary.unfinalizedBlockNumber,
+            historyStartCheckpoint: getWorldStateHistoryStartCheckpoint(config),
+            checkpointHistory: config.worldStateCheckpointHistory
+        });
+    } finally{
+        await worldState.close();
+    }
+}
 /** Deletes target dir and writes the new version file. */ async function prepareTarget(target, schemaVersion, rollupAddress) {
     const noOpen = ()=>Promise.resolve(undefined);
     const versionManager = new DatabaseVersionManager({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aztec/node-lib",
-  "version": "5.3.0-nightly.20261016.a",
+  "version": "5.3.0-nightly.20261017",
   "type": "module",
   "typedocOptions": {
     "entryPoints": [
@@ -66,28 +66,28 @@
     ]
   },
   "dependencies": {
-    "@aztec/archiver": "5.3.0-nightly.20261016.a",
-    "@aztec/bb-prover": "5.3.0-nightly.20261016.a",
-    "@aztec/blob-client": "5.3.0-nightly.20261016.a",
-    "@aztec/constants": "5.3.0-nightly.20261016.a",
-    "@aztec/epoch-cache": "5.3.0-nightly.20261016.a",
-    "@aztec/ethereum": "5.3.0-nightly.20261016.a",
-    "@aztec/foundation": "5.3.0-nightly.20261016.a",
-    "@aztec/kv-store": "5.3.0-nightly.20261016.a",
-    "@aztec/p2p": "5.3.0-nightly.20261016.a",
-    "@aztec/protocol-contracts": "5.3.0-nightly.20261016.a",
-    "@aztec/prover-client": "5.3.0-nightly.20261016.a",
-    "@aztec/sequencer-client": "5.3.0-nightly.20261016.a",
-    "@aztec/simulator": "5.3.0-nightly.20261016.a",
-    "@aztec/stdlib": "5.3.0-nightly.20261016.a",
-    "@aztec/telemetry-client": "5.3.0-nightly.20261016.a",
-    "@aztec/validator-client": "5.3.0-nightly.20261016.a",
-    "@aztec/world-state": "5.3.0-nightly.20261016.a",
+    "@aztec/archiver": "5.3.0-nightly.20261017",
+    "@aztec/bb-prover": "5.3.0-nightly.20261017",
+    "@aztec/blob-client": "5.3.0-nightly.20261017",
+    "@aztec/constants": "5.3.0-nightly.20261017",
+    "@aztec/epoch-cache": "5.3.0-nightly.20261017",
+    "@aztec/ethereum": "5.3.0-nightly.20261017",
+    "@aztec/foundation": "5.3.0-nightly.20261017",
+    "@aztec/kv-store": "5.3.0-nightly.20261017",
+    "@aztec/p2p": "5.3.0-nightly.20261017",
+    "@aztec/protocol-contracts": "5.3.0-nightly.20261017",
+    "@aztec/prover-client": "5.3.0-nightly.20261017",
+    "@aztec/sequencer-client": "5.3.0-nightly.20261017",
+    "@aztec/simulator": "5.3.0-nightly.20261017",
+    "@aztec/stdlib": "5.3.0-nightly.20261017",
+    "@aztec/telemetry-client": "5.3.0-nightly.20261017",
+    "@aztec/validator-client": "5.3.0-nightly.20261017",
+    "@aztec/world-state": "5.3.0-nightly.20261017",
     "tslib": "^2.4.0"
   },
   "devDependencies": {
-    "@aztec/blob-lib": "5.3.0-nightly.20261016.a",
-    "@aztec/node-keystore": "5.3.0-nightly.20261016.a",
+    "@aztec/blob-lib": "5.3.0-nightly.20261017",
+    "@aztec/node-keystore": "5.3.0-nightly.20261017",
     "@jest/globals": "^30.0.0",
     "@types/jest": "^30.0.0",
     "@types/node": "^22.15.17",

package/src/actions/snapshot-sync.ts

@@ -8,6 +8,7 @@ import {
 import { INITIAL_L2_BLOCK_NUM } from '@aztec/constants';
 import { type EthereumClientConfig, getPublicClient } from '@aztec/ethereum/client';
 import type { L1ContractsConfig } from '@aztec/ethereum/config';
+import { BlockNumber } from '@aztec/foundation/branded-types';
 import type { EthAddress } from '@aztec/foundation/eth-address';
 import { tryRmDir } from '@aztec/foundation/fs';
 import type { Logger } from '@aztec/foundation/log';
@@ -18,15 +19,25 @@ import { DatabaseVersionManager } from '@aztec/stdlib/database-version/manager';
 import { type ReadOnlyFileStore, createReadOnlyFileStore } from '@aztec/stdlib/file-store';
 import type { DataStoreConfig } from '@aztec/stdlib/kv-store';
 import {
+  SnapshotDataKeys,
   type SnapshotMetadata,
   type SnapshotsIndexMetadata,
   downloadSnapshot,
-  getLatestSnapshotMetadata,
+  getSnapshotIndex,
   makeSnapshotPaths,
 } from '@aztec/stdlib/snapshots';
-import { NATIVE_WORLD_STATE_DBS, WORLD_STATE_DB_VERSION, WORLD_STATE_DIR } from '@aztec/world-state';
-
-import { mkdir, mkdtemp, rename } from 'fs/promises';
+import type { GenesisData } from '@aztec/stdlib/world-state';
+import {
+  NATIVE_WORLD_STATE_DBS,
+  WORLD_STATE_DB_VERSION,
+  WORLD_STATE_DIR,
+  type WorldStateConfig,
+  createWorldState,
+  getWorldStateHistoryStartCheckpoint,
+  validateWorldStateHistory,
+} from '@aztec/world-state';
+
+import { copyFile, mkdir, mkdtemp, rename, stat, unlink } from 'fs/promises';
 import { join } from 'path';
 
 import type { SharedNodeConfig } from '../config/index.js';
@@ -38,6 +49,7 @@ type SnapshotSyncConfig = Pick<SharedNodeConfig, 'syncMode'> &
   Pick<ChainConfig, 'l1ChainId' | 'rollupVersion'> &
   Pick<L1ContractsConfig, 'aztecEpochDuration'> &
   Pick<ArchiverConfig, 'archiverStoreMapSizeKb'> &
+  WorldStateConfig &
   DataStoreConfig &
   Required<Pick<DataStoreConfig, 'rollupAddress'>> &
   EthereumClientConfig & {
@@ -46,11 +58,23 @@ type SnapshotSyncConfig = Pick<SharedNodeConfig, 'syncMode'> &
   };
 
 /**
- * Connects to a remote snapshot index and downloads the latest snapshot if the local archiver is behind.
- * Behaviour depends on syncing mode.
+ * Validates local history and restores the newest compatible snapshot when bootstrap is needed.
+ * Fixed history boundaries are resolved against archived block and checkpoint metadata.
  */
-export async function trySnapshotSync(config: SnapshotSyncConfig, log: Logger) {
+export async function trySnapshotSync(config: SnapshotSyncConfig, log: Logger, genesis?: GenesisData) {
   const { syncMode, snapshotsUrls, dataDirectory, l1ChainId, rollupVersion, rollupAddress } = config;
+  const historyStartCheckpoint = config.worldStatePruneBeforeCheckpoint;
+  let maxSnapshotBlock = historyStartCheckpoint === 0 ? BlockNumber.ZERO : undefined;
+  const worldStateDirectory = config.worldStateDataDirectory ?? dataDirectory;
+  if (
+    historyStartCheckpoint !== undefined &&
+    worldStateDirectory &&
+    (await hasWorldStateDatabase(worldStateDirectory))
+  ) {
+    await validateLocalWorldStateHistory(config, log, genesis);
+    log.info('Using existing world-state database with compatible retained history', { historyStartCheckpoint });
+    return false;
+  }
   if (syncMode === 'full') {
     log.debug('Snapshot sync is disabled. Running full sync.', { syncMode: syncMode });
     return false;
@@ -84,7 +108,12 @@ export async function trySnapshotSync(config: SnapshotSyncConfig, log: Logger) {
   }
 
   const minL1BlocksToTriggerReplace = config.minL1BlocksToTriggerReplace ?? MIN_L1_BLOCKS_TO_TRIGGER_REPLACE;
-  if (syncMode === 'snapshot' && archiverL2BlockNumber !== undefined && archiverL2BlockNumber >= INITIAL_L2_BLOCK_NUM) {
+  if (
+    historyStartCheckpoint === undefined &&
+    syncMode === 'snapshot' &&
+    archiverL2BlockNumber !== undefined &&
+    archiverL2BlockNumber >= INITIAL_L2_BLOCK_NUM
+  ) {
     log.verbose(
       `Skipping non-forced snapshot sync as archiver is already synced to L2 block ${archiverL2BlockNumber}.`,
     );
@@ -93,6 +122,7 @@ export async function trySnapshotSync(config: SnapshotSyncConfig, log: Logger) {
 
   const currentL1BlockNumber = await getPublicClient(config).getBlockNumber();
   if (
+    historyStartCheckpoint === undefined &&
     archiverL1BlockNumber &&
     currentL1BlockNumber >= archiverL1BlockNumber &&
     currentL1BlockNumber - archiverL1BlockNumber < minL1BlocksToTriggerReplace
@@ -112,7 +142,7 @@ export async function trySnapshotSync(config: SnapshotSyncConfig, log: Logger) {
     rollupAddress,
   };
 
-  // Fetch latest snapshot from each URL
+  // Index entries may outlive their database files, so retain older candidates for download fallback.
   type SnapshotCandidate = { snapshot: SnapshotMetadata; url: string; fileStore: ReadOnlyFileStore };
   const snapshotCandidates: SnapshotCandidate[] = [];
 
@@ -125,57 +155,67 @@ export async function trySnapshotSync(config: SnapshotSyncConfig, log: Logger) {
       continue;
     }
 
-    let snapshot: SnapshotMetadata | undefined;
+    let snapshots: SnapshotMetadata[];
     try {
-      snapshot = await getLatestSnapshotMetadata(indexMetadata, fileStore);
+      snapshots = (await getSnapshotIndex(indexMetadata, fileStore))?.snapshots ?? [];
     } catch (err) {
-      log.error(`Failed to get latest snapshot metadata from ${snapshotsUrl}. Skipping this URL.`, err, {
+      log.error(`Failed to read snapshot index from ${snapshotsUrl}. Skipping this URL.`, err, {
         ...indexMetadata,
         snapshotsUrl,
       });
       continue;
     }
 
-    if (!snapshot) {
+    if (snapshots.length === 0) {
       log.verbose(`No snapshot found at ${snapshotsUrl}. Skipping this URL.`, { ...indexMetadata, snapshotsUrl });
       continue;
     }
 
-    if (snapshot.schemaVersions.archiver !== ARCHIVER_DB_VERSION) {
-      log.warn(
-        `Skipping snapshot from ${snapshotsUrl} as it has schema version ${snapshot.schemaVersions.archiver} but expected ${ARCHIVER_DB_VERSION}.`,
-        snapshot,
-      );
-      continue;
-    }
-
-    if (snapshot.schemaVersions.worldState !== WORLD_STATE_DB_VERSION) {
-      log.warn(
-        `Skipping snapshot from ${snapshotsUrl} as it has world state schema version ${snapshot.schemaVersions.worldState} but we expected ${WORLD_STATE_DB_VERSION}.`,
-        snapshot,
-      );
-      continue;
-    }
-
-    if (archiverL1BlockNumber && snapshot.l1BlockNumber < archiverL1BlockNumber) {
-      log.verbose(
-        `Skipping snapshot from ${snapshotsUrl} since local archiver is at L1 block ${archiverL1BlockNumber} which is further than snapshot at ${snapshot.l1BlockNumber}`,
-        { snapshot, archiverL1BlockNumber, snapshotsUrl },
-      );
-      continue;
-    }
-
-    if (archiverL1BlockNumber && snapshot.l1BlockNumber - Number(archiverL1BlockNumber) < minL1BlocksToTriggerReplace) {
-      log.verbose(
-        `Skipping snapshot from ${snapshotsUrl} as archiver is less than ${
-          snapshot.l1BlockNumber - Number(archiverL1BlockNumber)
-        } L1 blocks behind this snapshot.`,
-        { snapshot, archiverL1BlockNumber, snapshotsUrl },
-      );
-      continue;
+    for (const snapshot of snapshots) {
+      if (snapshot.schemaVersions.archiver !== ARCHIVER_DB_VERSION) {
+        log.warn(
+          `Skipping snapshot from ${snapshotsUrl} as it has schema version ${snapshot.schemaVersions.archiver} but expected ${ARCHIVER_DB_VERSION}.`,
+          snapshot,
+        );
+        continue;
+      }
+
+      if (snapshot.schemaVersions.worldState !== WORLD_STATE_DB_VERSION) {
+        log.warn(
+          `Skipping snapshot from ${snapshotsUrl} as it has world state schema version ${snapshot.schemaVersions.worldState} but we expected ${WORLD_STATE_DB_VERSION}.`,
+          snapshot,
+        );
+        continue;
+      }
+
+      if (
+        historyStartCheckpoint === undefined &&
+        archiverL1BlockNumber &&
+        snapshot.l1BlockNumber < archiverL1BlockNumber
+      ) {
+        log.verbose(
+          `Skipping snapshot from ${snapshotsUrl} since local archiver is at L1 block ${archiverL1BlockNumber} which is further than snapshot at ${snapshot.l1BlockNumber}`,
+          { snapshot, archiverL1BlockNumber, snapshotsUrl },
+        );
+        continue;
+      }
+
+      if (
+        historyStartCheckpoint === undefined &&
+        archiverL1BlockNumber &&
+        snapshot.l1BlockNumber - Number(archiverL1BlockNumber) < minL1BlocksToTriggerReplace
+      ) {
+        log.verbose(
+          `Skipping snapshot from ${snapshotsUrl} as archiver is less than ${
+            snapshot.l1BlockNumber - Number(archiverL1BlockNumber)
+          } L1 blocks behind this snapshot.`,
+          { snapshot, archiverL1BlockNumber, snapshotsUrl },
+        );
+        continue;
+      }
+
+      snapshotCandidates.push({ snapshot, url: snapshotsUrl, fileStore });
     }
-
-    snapshotCandidates.push({ snapshot, url: snapshotsUrl, fileStore });
   }
 
   if (snapshotCandidates.length === 0) {
@@ -183,11 +223,17 @@ export async function trySnapshotSync(config: SnapshotSyncConfig, log: Logger) {
     return false;
   }
 
-  // Sort candidates by L1 block number (highest first)
-  snapshotCandidates.sort((a, b) => b.snapshot.l1BlockNumber - a.snapshot.l1BlockNumber);
+  snapshotCandidates.sort((a, b) =>
+    historyStartCheckpoint === undefined
+      ? b.snapshot.l1BlockNumber - a.snapshot.l1BlockNumber
+      : b.snapshot.l2BlockNumber - a.snapshot.l2BlockNumber || b.snapshot.l1BlockNumber - a.snapshot.l1BlockNumber,
+  );
 
   // Try each candidate in order until one succeeds
   for (const { snapshot, url, fileStore } of snapshotCandidates) {
+    if (maxSnapshotBlock !== undefined && snapshot.l2BlockNumber > maxSnapshotBlock) {
+      continue;
+    }
     const { l1BlockNumber, l2BlockNumber } = snapshot;
     log.info(`Attempting to sync from snapshot at L1 block ${l1BlockNumber} L2 block ${l2BlockNumber}`, {
       snapshot,
@@ -195,10 +241,55 @@ export async function trySnapshotSync(config: SnapshotSyncConfig, log: Logger) {
     });
 
     try {
+      const available = await Promise.all(Object.values(snapshot.dataUrls).map(path => fileStore.exists(path)));
+      if (!available.every(Boolean)) {
+        log.warn('Skipping snapshot with missing database files', { l1BlockNumber, l2BlockNumber, snapshotsUrl: url });
+        continue;
+      }
       await snapshotSync(snapshot, log, {
         dataDirectory: config.dataDirectory!,
         rollupAddress: config.rollupAddress,
         fileStore,
+        worldStateDataDirectory: config.worldStateDataDirectory,
+        validateArchiver:
+          historyStartCheckpoint === undefined || historyStartCheckpoint === 0
+            ? undefined
+            : async stagingDirectory => {
+                const stores = await createArchiverStore(
+                  { ...config, dataDirectory: stagingDirectory },
+                  GENESIS_BLOCK_HEADER_HASH,
+                );
+                try {
+                  const latestBlockNumber = await stores.blocks.getLatestL2BlockNumber();
+                  if (latestBlockNumber === undefined) {
+                    throw new Error('Snapshot archiver has no blocks');
+                  }
+                  const latestBlock = await stores.blocks.getBlockData({ number: latestBlockNumber });
+                  if (!latestBlock) {
+                    throw new Error(`Snapshot archiver is missing block ${latestBlockNumber}`);
+                  }
+                  if (latestBlock.checkpointNumber > historyStartCheckpoint) {
+                    const checkpoint = await stores.blocks.getCheckpointData(historyStartCheckpoint);
+                    if (checkpoint) {
+                      maxSnapshotBlock = BlockNumber(checkpoint.startBlock + checkpoint.blockCount - 1);
+                    }
+                    throw new Error(
+                      `Snapshot is at checkpoint ${latestBlock.checkpointNumber}, after requested checkpoint ${historyStartCheckpoint}`,
+                    );
+                  }
+                } finally {
+                  await stores.db.close();
+                }
+              },
+        validate:
+          historyStartCheckpoint === undefined
+            ? undefined
+            : stagingDirectory =>
+                validateLocalWorldStateHistory(
+                  { ...config, dataDirectory: stagingDirectory, worldStateDataDirectory: stagingDirectory },
+                  log,
+                  genesis,
+                ),
       });
       log.info(`Snapshot synced to L1 block ${l1BlockNumber} L2 block ${l2BlockNumber}`, {
         snapshot,
@@ -224,7 +315,14 @@ export async function trySnapshotSync(config: SnapshotSyncConfig, log: Logger) {
 export async function snapshotSync(
   snapshot: Pick<SnapshotMetadata, 'dataUrls'>,
   log: Logger,
-  config: { dataDirectory: string; rollupAddress: EthAddress; fileStore: ReadOnlyFileStore },
+  config: {
+    dataDirectory: string;
+    rollupAddress: EthAddress;
+    fileStore: ReadOnlyFileStore;
+    worldStateDataDirectory?: string;
+    validateArchiver?: (stagingDirectory: string) => Promise<void>;
+    validate?: (stagingDirectory: string) => Promise<void>;
+  },
 ) {
   const { dataDirectory, rollupAddress, fileStore } = config;
   if (!dataDirectory) {
@@ -238,8 +336,26 @@ export async function snapshotSync(
     await mkdir(dataDirectory, { recursive: true });
     downloadDir = await mkdtemp(join(dataDirectory, 'download-'));
     const downloadPaths = makeSnapshotPaths(downloadDir);
+    await prepareTarget(join(downloadDir, ARCHIVER_STORE_NAME), ARCHIVER_DB_VERSION, rollupAddress);
+    await prepareTarget(join(downloadDir, WORLD_STATE_DIR), WORLD_STATE_DB_VERSION, rollupAddress);
+    downloadPaths.archiver = join(downloadDir, ARCHIVER_STORE_NAME, 'data.mdb');
+    for (const [name, dir] of NATIVE_WORLD_STATE_DBS) {
+      downloadPaths[name] = join(downloadDir, WORLD_STATE_DIR, dir, 'data.mdb');
+    }
     log.info(`Downloading snapshot to ${downloadDir}`, { snapshot, downloadPaths });
-    await downloadSnapshot(snapshot, downloadPaths, fileStore);
+    if (config.validateArchiver) {
+      await downloadSnapshot(snapshot, downloadPaths, fileStore, ['archiver']);
+      await config.validateArchiver(downloadDir);
+      await downloadSnapshot(
+        snapshot,
+        downloadPaths,
+        fileStore,
+        SnapshotDataKeys.filter(key => key !== 'archiver'),
+      );
+    } else {
+      await downloadSnapshot(snapshot, downloadPaths, fileStore);
+    }
+    await config.validate?.(downloadDir);
     log.info(`Snapshot downloaded at ${downloadDir}`, { snapshot, downloadPaths });
 
     // If download was successful, clear lock and version, and move download there
@@ -253,12 +369,12 @@ export async function snapshotSync(
     });
 
     // Same for the world state dbs, only that we do not close them, since we assume they are not yet in use
-    const worldStateBasePath = join(dataDirectory, WORLD_STATE_DIR);
+    const worldStateBasePath = join(config.worldStateDataDirectory ?? dataDirectory, WORLD_STATE_DIR);
     await prepareTarget(worldStateBasePath, WORLD_STATE_DB_VERSION, rollupAddress);
     for (const [name, dir] of NATIVE_WORLD_STATE_DBS) {
       const path = join(worldStateBasePath, dir);
       await mkdir(path, { recursive: true });
-      await rename(downloadPaths[name], join(path, 'data.mdb'));
+      await moveSnapshotFile(downloadPaths[name], join(path, 'data.mdb'));
       log.info(`World state database ${name} set up from snapshot`, {
         path,
         dbVersion: WORLD_STATE_DB_VERSION,
@@ -277,6 +393,59 @@ export async function snapshotSync(
   }
 }
 
+async function moveSnapshotFile(source: string, destination: string) {
+  try {
+    await rename(source, destination);
+  } catch (err) {
+    if (!err || typeof err !== 'object' || !('code' in err) || err.code !== 'EXDEV') {
+      throw err;
+    }
+    await copyFile(source, destination);
+    await unlink(source);
+  }
+}
+
+async function hasWorldStateDatabase(dataDirectory: string): Promise<boolean> {
+  const sizes = await Promise.all(
+    NATIVE_WORLD_STATE_DBS.map(async ([, directory]) => {
+      try {
+        return (await stat(join(dataDirectory, WORLD_STATE_DIR, directory, 'data.mdb'))).size;
+      } catch (err) {
+        if (err && typeof err === 'object' && 'code' in err && err.code === 'ENOENT') {
+          return 0;
+        }
+        throw err;
+      }
+    }),
+  );
+  return sizes.some(size => size > 0);
+}
+
+async function validateLocalWorldStateHistory(config: SnapshotSyncConfig, log: Logger, genesis?: GenesisData) {
+  const worldState = await createWorldState(config, genesis);
+  try {
+    const summary = await worldState.getStatusSummary();
+    if (getWorldStateHistoryStartCheckpoint(config) !== 0 && summary.oldestHistoricalBlock > 1) {
+      const archiverStore = await createArchiverStore(config, GENESIS_BLOCK_HEADER_HASH);
+      try {
+        await validateWorldStateHistory(config, summary, archiverStore.blocks);
+      } finally {
+        await archiverStore.db.close();
+      }
+    } else {
+      await validateWorldStateHistory(config, summary);
+    }
+    log.info('Validated retained world-state history', {
+      oldestHistoricBlock: summary.oldestHistoricalBlock,
+      latestBlock: summary.unfinalizedBlockNumber,
+      historyStartCheckpoint: getWorldStateHistoryStartCheckpoint(config),
+      checkpointHistory: config.worldStateCheckpointHistory,
+    });
+  } finally {
+    await worldState.close();
+  }
+}
+
 /** Deletes target dir and writes the new version file. */
 async function prepareTarget(target: string, schemaVersion: number, rollupAddress: EthAddress) {
   const noOpen = () => Promise.resolve(undefined);