@aztec/node-lib 0.85.0-alpha-testnet.1 → 0.85.0-alpha-testnet.3

package/dest/actions/build-snapshot-metadata.d.ts

@@ -0,0 +1,5 @@
+import type { Archiver } from '@aztec/archiver';
+import type { UploadSnapshotMetadata } from '@aztec/stdlib/snapshots';
+import type { UploadSnapshotConfig } from './upload-snapshot.js';
+export declare function buildSnapshotMetadata(archiver: Archiver, config: UploadSnapshotConfig): Promise<UploadSnapshotMetadata>;
+//# sourceMappingURL=build-snapshot-metadata.d.ts.map

package/dest/actions/build-snapshot-metadata.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"build-snapshot-metadata.d.ts","sourceRoot":"","sources":["../../src/actions/build-snapshot-metadata.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAChD,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,yBAAyB,CAAC;AAEtE,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,sBAAsB,CAAC;AAEjE,wBAAsB,qBAAqB,CACzC,QAAQ,EAAE,QAAQ,EAClB,MAAM,EAAE,oBAAoB,GAC3B,OAAO,CAAC,sBAAsB,CAAC,CAoBjC"}

package/dest/actions/build-snapshot-metadata.js

@@ -0,0 +1,19 @@
+export async function buildSnapshotMetadata(archiver, config) {
+    const [rollupAddress, l1BlockNumber, { latest }] = await Promise.all([
+        archiver.getRollupAddress(),
+        archiver.getL1BlockNumber(),
+        archiver.getL2Tips()
+    ]);
+    const { number: l2BlockNumber, hash: l2BlockHash } = latest;
+    if (!l2BlockHash) {
+        throw new Error(`Failed to get L2 block hash from archiver.`);
+    }
+    return {
+        l1ChainId: config.l1ChainId,
+        rollupVersion: config.rollupVersion,
+        rollupAddress,
+        l2BlockNumber,
+        l2BlockHash,
+        l1BlockNumber: Number(l1BlockNumber)
+    };
+}

package/dest/actions/create-backups.d.ts

@@ -0,0 +1,6 @@
+import type { Archiver } from '@aztec/archiver';
+import type { Logger } from '@aztec/foundation/log';
+import type { WorldStateSynchronizer } from '@aztec/stdlib/interfaces/server';
+import type { SnapshotDataUrls } from '@aztec/stdlib/snapshots';
+export declare function createBackups(backupDir: string, archiver: Archiver, worldState: WorldStateSynchronizer, log: Logger): Promise<SnapshotDataUrls>;
+//# sourceMappingURL=create-backups.d.ts.map

package/dest/actions/create-backups.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"create-backups.d.ts","sourceRoot":"","sources":["../../src/actions/create-backups.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAChD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AACpD,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,iCAAiC,CAAC;AAC9E,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAKhE,wBAAsB,aAAa,CACjC,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,QAAQ,EAClB,UAAU,EAAE,sBAAsB,EAClC,GAAG,EAAE,MAAM,6BA4BZ"}

package/dest/actions/create-backups.js

@@ -0,0 +1,32 @@
+import { existsSync } from 'fs';
+import { join } from 'path/posix';
+export async function createBackups(backupDir, archiver, worldState, log) {
+    try {
+        log.info(`Pausing archiver and world state sync to start snapshot upload`);
+        await archiver.stop();
+        await worldState.stopSync();
+        log.info(`Creating backups of lmdb environments to ${backupDir}`);
+        const [archiverPath, worldStatePaths] = await Promise.all([
+            archiver.backupTo(join(backupDir, 'archiver')),
+            worldState.backupTo(join(backupDir, 'world-state'))
+        ]);
+        const paths = {
+            ...worldStatePaths,
+            archiver: archiverPath
+        };
+        const missing = Object.entries(paths).filter(([_key, path])=>!path || !existsSync(path));
+        if (missing.length > 0) {
+            throw new Error(`Missing backup files: ${missing.map(([key, path])=>`${path} (${key})`).join(', ')}`);
+        }
+        log.info(`Data stores backed up to ${backupDir}`, {
+            paths
+        });
+        return paths;
+    } catch (err) {
+        throw new Error(`Error creating backups for snapshot upload: ${err}`);
+    } finally{
+        log.info(`Resuming archiver and world state sync`);
+        worldState.resumeSync();
+        archiver.resume();
+    }
+}

package/dest/actions/index.d.ts

@@ -1,3 +1,5 @@
 export * from './snapshot-sync.js';
 export * from './upload-snapshot.js';
+export * from './create-backups.js';
+export * from './build-snapshot-metadata.js';
 //# sourceMappingURL=index.d.ts.map

package/dest/actions/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/actions/index.ts"],"names":[],"mappings":"AAAA,cAAc,oBAAoB,CAAC;AACnC,cAAc,sBAAsB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/actions/index.ts"],"names":[],"mappings":"AAAA,cAAc,oBAAoB,CAAC;AACnC,cAAc,sBAAsB,CAAC;AACrC,cAAc,qBAAqB,CAAC;AACpC,cAAc,8BAA8B,CAAC"}

package/dest/actions/index.js

@@ -1,2 +1,4 @@
 export * from './snapshot-sync.js';
 export * from './upload-snapshot.js';
+export * from './create-backups.js';
+export * from './build-snapshot-metadata.js';

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

@@ -1,12 +1,26 @@
 import { type ArchiverConfig } from '@aztec/archiver';
 import { type EthereumClientConfig } from '@aztec/ethereum';
+import type { EthAddress } from '@aztec/foundation/eth-address';
 import type { Logger } from '@aztec/foundation/log';
 import type { DataStoreConfig } from '@aztec/kv-store/config';
 import type { ChainConfig } from '@aztec/stdlib/config';
+import { type SnapshotMetadata } from '@aztec/stdlib/snapshots';
 import type { SharedNodeConfig } from '../config/index.js';
 type SnapshotSyncConfig = Pick<SharedNodeConfig, 'syncMode' | 'snapshotsUrl'> & Pick<ChainConfig, 'l1ChainId' | 'rollupVersion'> & Pick<ArchiverConfig, 'archiverStoreMapSizeKb' | 'maxLogs'> & Required<DataStoreConfig> & EthereumClientConfig & {
     minL1BlocksToTriggerReplace?: number;
 };
+/**
+ * Connects to a remote snapshot index and downloads the latest snapshot if the local archiver is behind.
+ * Behaviour depends on syncing mode.
+ */
 export declare function trySnapshotSync(config: SnapshotSyncConfig, log: Logger): Promise<boolean>;
+/**
+ * Downloads the given snapshot replacing any local data stores.
+ */
+export declare function snapshotSync(snapshot: Pick<SnapshotMetadata, 'dataUrls'>, log: Logger, config: {
+    dataDirectory: string;
+    rollupAddress: EthAddress;
+    snapshotsUrl: string;
+}): Promise<void>;
 export {};
 //# sourceMappingURL=snapshot-sync.d.ts.map

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,iBAAiB,CAAC;AAG7E,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AACpD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAC9D,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAexD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAK3D,KAAK,kBAAkB,GAAG,IAAI,CAAC,gBAAgB,EAAE,UAAU,GAAG,cAAc,CAAC,GAC3E,IAAI,CAAC,WAAW,EAAE,WAAW,GAAG,eAAe,CAAC,GAChD,IAAI,CAAC,cAAc,EAAE,wBAAwB,GAAG,SAAS,CAAC,GAC1D,QAAQ,CAAC,eAAe,CAAC,GACzB,oBAAoB,GAAG;IACrB,2BAA2B,CAAC,EAAE,MAAM,CAAC;CACtC,CAAC;AAEJ,wBAAsB,eAAe,CAAC,MAAM,EAAE,kBAAkB,EAAE,GAAG,EAAE,MAAM,oBAwJ5E"}
+{"version":3,"file":"snapshot-sync.d.ts","sourceRoot":"","sources":["../../src/actions/snapshot-sync.ts"],"names":[],"mappings":"AAAA,OAAO,EAA4C,KAAK,cAAc,EAAuB,MAAM,iBAAiB,CAAC;AAErH,OAAO,EAAE,KAAK,oBAAoB,EAAmB,MAAM,iBAAiB,CAAC;AAC7E,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAEhE,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AACpD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAC9D,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAGxD,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,GAAG,cAAc,CAAC,GAC3E,IAAI,CAAC,WAAW,EAAE,WAAW,GAAG,eAAe,CAAC,GAChD,IAAI,CAAC,cAAc,EAAE,wBAAwB,GAAG,SAAS,CAAC,GAC1D,QAAQ,CAAC,eAAe,CAAC,GACzB,oBAAoB,GAAG;IACrB,2BAA2B,CAAC,EAAE,MAAM,CAAC;CACtC,CAAC;AAEJ;;;GAGG;AACH,wBAAsB,eAAe,CAAC,MAAM,EAAE,kBAAkB,EAAE,GAAG,EAAE,MAAM,oBA2H5E;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,YAAY,EAAE,MAAM,CAAA;CAAE,iBAuCnF"}

package/dest/actions/snapshot-sync.js

@@ -4,125 +4,160 @@ import { getPublicClient } from '@aztec/ethereum';
 import { tryRmDir } from '@aztec/foundation/fs';
 import { DatabaseVersionManager } from '@aztec/stdlib/database-version';
 import { createReadOnlyFileStore } from '@aztec/stdlib/file-store';
-import { downloadSnapshot, getLatestSnapshotMetadata, makeSnapshotLocalPaths } from '@aztec/stdlib/snapshots';
+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 { join } from 'path';
 // Half day worth of L1 blocks
 const MIN_L1_BLOCKS_TO_TRIGGER_REPLACE = 86400 / 2 / 12;
-export async function trySnapshotSync(config, log) {
-    let archiverStore;
+/**
+ * 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) {
+    const { syncMode, snapshotsUrl, dataDirectory, l1ChainId, rollupVersion, l1Contracts } = config;
+    if (syncMode === 'full') {
+        log.debug('Snapshot sync is disabled. Running full sync.', {
+            syncMode: syncMode
+        });
+        return false;
+    }
+    if (!snapshotsUrl) {
+        log.verbose('Snapshot sync is disabled. No snapshots URL provided.');
+        return false;
+    }
+    if (!dataDirectory) {
+        log.verbose('Snapshot sync is disabled. No local data directory defined.');
+        return false;
+    }
+    let fileStore;
+    try {
+        fileStore = await createReadOnlyFileStore(snapshotsUrl, log);
+    } catch (err) {
+        log.error(`Invalid config for downloading snapshots`, err);
+        return false;
+    }
+    // Create an archiver store to check the current state
+    log.verbose(`Creating temporary archiver data store`);
+    const archiverStore = await createArchiverStore(config);
+    let archiverL1BlockNumber;
+    let archiverL2BlockNumber;
+    try {
+        [archiverL1BlockNumber, archiverL2BlockNumber] = await Promise.all([
+            archiverStore.getSynchPoint().then((s)=>s.blocksSynchedTo),
+            archiverStore.getSynchedL2BlockNumber()
+        ]);
+    } finally{
+        log.verbose(`Closing temporary archiver data store`, {
+            archiverL1BlockNumber,
+            archiverL2BlockNumber
+        });
+        await archiverStore.close();
+    }
+    const minL1BlocksToTriggerReplace = config.minL1BlocksToTriggerReplace ?? MIN_L1_BLOCKS_TO_TRIGGER_REPLACE;
+    if (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 < minL1BlocksToTriggerReplace) {
+        log.verbose(`Skipping snapshot sync as archiver is less than ${currentL1BlockNumber - archiverL1BlockNumber} L1 blocks behind.`, {
+            archiverL1BlockNumber,
+            currentL1BlockNumber,
+            minL1BlocksToTriggerReplace
+        });
+        return false;
+    }
+    const indexMetadata = {
+        l1ChainId,
+        rollupVersion,
+        rollupAddress: l1Contracts.rollupAddress
+    };
+    let snapshot;
+    try {
+        snapshot = await getLatestSnapshotMetadata(indexMetadata, fileStore);
+    } catch (err) {
+        log.error(`Failed to get latest snapshot metadata. Skipping snapshot sync.`, err, {
+            ...indexMetadata,
+            snapshotsUrl
+        });
+        return false;
+    }
+    if (!snapshot) {
+        log.verbose(`No snapshot found. Skipping snapshot sync.`, {
+            ...indexMetadata,
+            snapshotsUrl
+        });
+        return false;
+    }
+    if (snapshot.schemaVersions.archiver !== ARCHIVER_DB_VERSION) {
+        log.warn(`Skipping snapshot sync as last snapshot has schema version ${snapshot.schemaVersions.archiver} but expected ${ARCHIVER_DB_VERSION}.`, snapshot);
+        return false;
+    }
+    if (snapshot.schemaVersions.worldState !== WORLD_STATE_DB_VERSION) {
+        log.warn(`Skipping snapshot sync as last snapshot has world state schema version ${snapshot.schemaVersions.worldState} but we expected ${WORLD_STATE_DB_VERSION}.`, snapshot);
+        return false;
+    }
+    if (archiverL1BlockNumber && snapshot.l1BlockNumber < archiverL1BlockNumber) {
+        log.verbose(`Skipping snapshot sync since local archiver is at L1 block ${archiverL1BlockNumber} which is further than last snapshot at ${snapshot.l1BlockNumber}`, {
+            snapshot,
+            archiverL1BlockNumber
+        });
+        return false;
+    }
+    if (archiverL1BlockNumber && snapshot.l1BlockNumber - Number(archiverL1BlockNumber) < minL1BlocksToTriggerReplace) {
+        log.verbose(`Skipping snapshot sync as archiver is less than ${snapshot.l1BlockNumber - Number(archiverL1BlockNumber)} L1 blocks behind latest snapshot.`, {
+            snapshot,
+            archiverL1BlockNumber
+        });
+        return false;
+    }
+    const { l1BlockNumber, l2BlockNumber } = snapshot;
+    log.info(`Syncing from snapshot at L1 block ${l1BlockNumber} L2 block ${l2BlockNumber}`, {
+        snapshot,
+        snapshotsUrl
+    });
+    await snapshotSync(snapshot, log, {
+        dataDirectory: config.dataDirectory,
+        rollupAddress: config.l1Contracts.rollupAddress,
+        snapshotsUrl
+    });
+    log.info(`Snapshot synced to L1 block ${l1BlockNumber} L2 block ${l2BlockNumber}`, {
+        snapshot
+    });
+    return true;
+}
+/**
+ * Downloads the given snapshot replacing any local data stores.
+ */ export async function snapshotSync(snapshot, log, config) {
+    const { dataDirectory, rollupAddress } = config;
+    if (!dataDirectory) {
+        throw new Error(`No local data directory defined. Cannot sync snapshot.`);
+    }
+    const fileStore = await createReadOnlyFileStore(config.snapshotsUrl, log);
     let downloadDir;
     try {
-        const { syncMode, snapshotsUrl, dataDirectory, l1ChainId, rollupVersion, l1Contracts } = config;
-        if (syncMode === 'full') {
-            log.debug('Snapshot sync is disabled. Running full sync.', {
-                syncMode: syncMode
-            });
-            return false;
-        }
-        if (!snapshotsUrl) {
-            log.verbose('Snapshot sync is disabled. No snapshots URL provided.');
-            return false;
-        }
-        if (!dataDirectory) {
-            log.verbose('Snapshot sync is disabled. No local data directory defined.');
-            return false;
-        }
-        let fileStore;
-        try {
-            fileStore = await createReadOnlyFileStore(snapshotsUrl, log);
-        } catch (err) {
-            log.error(`Invalid config for downloading snapshots`, err);
-            return false;
-        }
-        // Create an archiver store to check the current sync state
-        archiverStore = await createArchiverStore(config);
-        const minL1BlocksToTriggerReplace = config.minL1BlocksToTriggerReplace ?? MIN_L1_BLOCKS_TO_TRIGGER_REPLACE;
-        const archiverL2BlockNumber = await archiverStore.getSynchedL2BlockNumber();
-        if (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();
-        const archiverL1BlockNumber = await archiverStore.getSynchPoint().then((s)=>s.blocksSynchedTo);
-        if (archiverL1BlockNumber && currentL1BlockNumber - archiverL1BlockNumber < minL1BlocksToTriggerReplace) {
-            log.verbose(`Skipping snapshot sync as archiver is less than ${currentL1BlockNumber - archiverL1BlockNumber} L1 blocks behind.`, {
-                archiverL1BlockNumber,
-                currentL1BlockNumber,
-                minL1BlocksToTriggerReplace
-            });
-            return false;
-        }
-        const indexMetadata = {
-            l1ChainId,
-            rollupVersion,
-            rollupAddress: l1Contracts.rollupAddress
-        };
-        let snapshot;
-        try {
-            snapshot = await getLatestSnapshotMetadata(indexMetadata, fileStore);
-        } catch (err) {
-            log.error(`Failed to get latest snapshot metadata. Skipping snapshot sync.`, err, {
-                ...indexMetadata,
-                snapshotsUrl
-            });
-            return false;
-        }
-        if (!snapshot) {
-            log.verbose(`No snapshot found. Skipping snapshot sync.`, {
-                ...indexMetadata,
-                snapshotsUrl
-            });
-            return false;
-        }
-        if (snapshot.schemaVersions.archiver !== ARCHIVER_DB_VERSION) {
-            log.warn(`Skipping snapshot sync as last snapshot has schema version ${snapshot.schemaVersions.archiver} but expected ${ARCHIVER_DB_VERSION}.`, snapshot);
-            return false;
-        }
-        if (snapshot.schemaVersions.worldState !== WORLD_STATE_DB_VERSION) {
-            log.warn(`Skipping snapshot sync as last snapshot has world state schema version ${snapshot.schemaVersions.worldState} but we expected ${WORLD_STATE_DB_VERSION}.`, snapshot);
-            return false;
-        }
-        if (archiverL1BlockNumber && snapshot.l1BlockNumber < archiverL1BlockNumber) {
-            log.verbose(`Skipping snapshot sync since local archiver is at L1 block ${archiverL1BlockNumber} which is further than last snapshot at ${snapshot.l1BlockNumber}`, {
-                snapshot,
-                archiverL1BlockNumber
-            });
-            return false;
-        }
-        if (archiverL1BlockNumber && snapshot.l1BlockNumber - Number(archiverL1BlockNumber) < minL1BlocksToTriggerReplace) {
-            log.verbose(`Skipping snapshot sync as archiver is less than ${snapshot.l1BlockNumber - Number(archiverL1BlockNumber)} L1 blocks behind latest snapshot.`, {
-                snapshot,
-                archiverL1BlockNumber
-            });
-            return false;
-        }
-        // Green light. Download the snapshot to a temp location.
+        // Download the snapshot to a temp location.
         downloadDir = await mkdtemp(join(dataDirectory, 'download-'));
-        const downloadPaths = makeSnapshotLocalPaths(downloadDir);
-        log.info(`Downloading snapshot at L1 block ${snapshot.l1BlockNumber} L2 block ${snapshot.l2BlockNumber} from ${snapshotsUrl} to ${downloadDir} for snapshot sync`, {
+        const downloadPaths = makeSnapshotPaths(downloadDir);
+        log.info(`Downloading snapshot to ${downloadDir}`, {
             snapshot,
             downloadPaths
         });
         await downloadSnapshot(snapshot, downloadPaths, fileStore);
         log.info(`Snapshot downloaded at ${downloadDir}`, {
-            snapshotsUrl,
             snapshot,
             downloadPaths
         });
-        // If download was successful, close the archiver store, clear lock and version, and move download there
-        await archiverStore.close();
-        archiverStore = undefined;
+        // If download was successful, clear lock and version, and move download there
         const archiverPath = join(dataDirectory, ARCHIVER_STORE_NAME);
-        await prepareTarget(archiverPath, ARCHIVER_DB_VERSION, l1Contracts.rollupAddress);
+        await prepareTarget(archiverPath, ARCHIVER_DB_VERSION, rollupAddress);
         await rename(downloadPaths.archiver, join(archiverPath, 'data.mdb'));
         log.info(`Archiver database set up from snapshot`, {
             path: archiverPath
         });
         // 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);
-        await prepareTarget(worldStateBasePath, WORLD_STATE_DB_VERSION, l1Contracts.rollupAddress);
+        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, {
@@ -133,19 +168,11 @@ export async function trySnapshotSync(config, log) {
                 path
             });
         }
-        log.info(`Snapshot synced to L1 block ${snapshot.l1BlockNumber} L2 block ${snapshot.l2BlockNumber}`, {
-            snapshot
-        });
     } finally{
-        if (archiverStore) {
-            log.verbose(`Closing temporary archiver data store`);
-            await archiverStore.close();
-        }
         if (downloadDir) {
             await tryRmDir(downloadDir, log);
         }
     }
-    return true;
 }
 /** Deletes target dir and writes the new version file. */ async function prepareTarget(target, schemaVersion, rollupAddress) {
     const noOpen = ()=>Promise.resolve(undefined);

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

@@ -3,11 +3,10 @@ import type { Logger } from '@aztec/foundation/log';
 import type { DataStoreConfig } from '@aztec/kv-store/config';
 import type { ChainConfig } from '@aztec/stdlib/config';
 import type { WorldStateSynchronizer } from '@aztec/stdlib/interfaces/server';
-type UploadSnapshotConfig = Pick<ChainConfig, 'l1ChainId' | 'rollupVersion'> & Pick<DataStoreConfig, 'dataDirectory'>;
+export type UploadSnapshotConfig = Pick<ChainConfig, 'l1ChainId' | 'rollupVersion'> & Pick<DataStoreConfig, 'dataDirectory'>;
 /**
  * Pauses the archiver and world state sync, creates backups of the archiver and world state lmdb environments,
  * and uploads them to the specified location. Location must be a URL supported by our file store (eg `gs://bucketname/path`).
  */
 export declare function uploadSnapshot(location: string, archiver: Archiver, worldState: WorldStateSynchronizer, config: UploadSnapshotConfig, log: Logger): Promise<void>;
-export {};
 //# sourceMappingURL=upload-snapshot.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"upload-snapshot.d.ts","sourceRoot":"","sources":["../../src/actions/upload-snapshot.ts"],"names":[],"mappings":"AAAA,OAAO,EAAuB,KAAK,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAErE,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AACpD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAC9D,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAExD,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,iCAAiC,CAAC;AAU9E,KAAK,oBAAoB,GAAG,IAAI,CAAC,WAAW,EAAE,WAAW,GAAG,eAAe,CAAC,GAAG,IAAI,CAAC,eAAe,EAAE,eAAe,CAAC,CAAC;AAEtH;;;GAGG;AACH,wBAAsB,cAAc,CAClC,QAAQ,EAAE,MAAM,EAChB,QAAQ,EAAE,QAAQ,EAClB,UAAU,EAAE,sBAAsB,EAClC,MAAM,EAAE,oBAAoB,EAC5B,GAAG,EAAE,MAAM,iBAoBZ"}
+{"version":3,"file":"upload-snapshot.d.ts","sourceRoot":"","sources":["../../src/actions/upload-snapshot.ts"],"names":[],"mappings":"AAAA,OAAO,EAAuB,KAAK,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAErE,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AACpD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAC9D,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAExD,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,iCAAiC,CAAC;AAW9E,MAAM,MAAM,oBAAoB,GAAG,IAAI,CAAC,WAAW,EAAE,WAAW,GAAG,eAAe,CAAC,GACjF,IAAI,CAAC,eAAe,EAAE,eAAe,CAAC,CAAC;AAEzC;;;GAGG;AACH,wBAAsB,cAAc,CAClC,QAAQ,EAAE,MAAM,EAChB,QAAQ,EAAE,QAAQ,EAClB,UAAU,EAAE,sBAAsB,EAClC,MAAM,EAAE,oBAAoB,EAC5B,GAAG,EAAE,MAAM,iBAoBZ"}

package/dest/actions/upload-snapshot.js

@@ -1,12 +1,13 @@
 import { ARCHIVER_DB_VERSION } from '@aztec/archiver';
 import { tryRmDir } from '@aztec/foundation/fs';
 import { createFileStore } from '@aztec/stdlib/file-store';
-import { uploadSnapshot as uploadSnapshotToStore } from '@aztec/stdlib/snapshots';
+import { uploadSnapshotToIndex } from '@aztec/stdlib/snapshots';
 import { WORLD_STATE_DB_VERSION } from '@aztec/world-state';
-import { existsSync } from 'fs';
 import { mkdtemp } from 'fs/promises';
 import { tmpdir } from 'os';
 import { join } from 'path';
+import { buildSnapshotMetadata } from './build-snapshot-metadata.js';
+import { createBackups } from './create-backups.js';
 /**
  * Pauses the archiver and world state sync, creates backups of the archiver and world state lmdb environments,
  * and uploads them to the specified location. Location must be a URL supported by our file store (eg `gs://bucketname/path`).
@@ -26,7 +27,7 @@ import { join } from 'path';
         log.info(`Uploading snapshot to ${location}`, {
             snapshot: metadata
         });
-        const snapshot = await uploadSnapshotToStore(paths, versions, metadata, store);
+        const snapshot = await uploadSnapshotToIndex(paths, versions, metadata, store);
         log.info(`Snapshot uploaded successfully`, {
             snapshot
         });
@@ -35,52 +36,3 @@ import { join } from 'path';
         await tryRmDir(backupDir, log);
     }
 }
-async function buildSnapshotMetadata(archiver, config) {
-    const [rollupAddress, l1BlockNumber, { latest }] = await Promise.all([
-        archiver.getRollupAddress(),
-        archiver.getL1BlockNumber(),
-        archiver.getL2Tips()
-    ]);
-    const { number: l2BlockNumber, hash: l2BlockHash } = latest;
-    if (!l2BlockHash) {
-        throw new Error(`Failed to get L2 block hash from archiver.`);
-    }
-    return {
-        l1ChainId: config.l1ChainId,
-        rollupVersion: config.rollupVersion,
-        rollupAddress,
-        l2BlockNumber,
-        l2BlockHash,
-        l1BlockNumber: Number(l1BlockNumber)
-    };
-}
-async function createBackups(backupDir, archiver, worldState, log) {
-    try {
-        log.info(`Pausing archiver and world state sync to start snapshot upload`);
-        await archiver.stop();
-        await worldState.stopSync();
-        log.info(`Creating backups of lmdb environments to ${backupDir}`);
-        const [archiverPath, worldStatePaths] = await Promise.all([
-            archiver.backupTo(join(backupDir, 'archiver')),
-            worldState.backupTo(join(backupDir, 'world-state'))
-        ]);
-        const paths = {
-            ...worldStatePaths,
-            archiver: archiverPath
-        };
-        const missing = Object.entries(paths).filter(([_key, path])=>!path || !existsSync(path));
-        if (missing.length > 0) {
-            throw new Error(`Missing backup files: ${missing.map(([key, path])=>`${path} (${key})`).join(', ')}`);
-        }
-        log.info(`Data stores backed up to ${backupDir}`, {
-            paths
-        });
-        return paths;
-    } catch (err) {
-        throw new Error(`Error creating backups for snapshot upload: ${err}`);
-    } finally{
-        log.info(`Resuming archiver and world state sync`);
-        worldState.resumeSync();
-        archiver.resume();
-    }
-}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aztec/node-lib",
-  "version": "0.85.0-alpha-testnet.1",
+  "version": "0.85.0-alpha-testnet.3",
   "type": "module",
   "exports": {
     "./actions": "./dest/actions/index.js",
@@ -52,24 +52,24 @@
     ]
   },
   "dependencies": {
-    "@aztec/archiver": "0.85.0-alpha-testnet.1",
-    "@aztec/bb-prover": "0.85.0-alpha-testnet.1",
-    "@aztec/blob-sink": "0.85.0-alpha-testnet.1",
-    "@aztec/constants": "0.85.0-alpha-testnet.1",
-    "@aztec/epoch-cache": "0.85.0-alpha-testnet.1",
-    "@aztec/ethereum": "0.85.0-alpha-testnet.1",
-    "@aztec/foundation": "0.85.0-alpha-testnet.1",
-    "@aztec/kv-store": "0.85.0-alpha-testnet.1",
-    "@aztec/merkle-tree": "0.85.0-alpha-testnet.1",
-    "@aztec/p2p": "0.85.0-alpha-testnet.1",
-    "@aztec/protocol-contracts": "0.85.0-alpha-testnet.1",
-    "@aztec/prover-client": "0.85.0-alpha-testnet.1",
-    "@aztec/sequencer-client": "0.85.0-alpha-testnet.1",
-    "@aztec/simulator": "0.85.0-alpha-testnet.1",
-    "@aztec/stdlib": "0.85.0-alpha-testnet.1",
-    "@aztec/telemetry-client": "0.85.0-alpha-testnet.1",
-    "@aztec/validator-client": "0.85.0-alpha-testnet.1",
-    "@aztec/world-state": "0.85.0-alpha-testnet.1",
+    "@aztec/archiver": "0.85.0-alpha-testnet.3",
+    "@aztec/bb-prover": "0.85.0-alpha-testnet.3",
+    "@aztec/blob-sink": "0.85.0-alpha-testnet.3",
+    "@aztec/constants": "0.85.0-alpha-testnet.3",
+    "@aztec/epoch-cache": "0.85.0-alpha-testnet.3",
+    "@aztec/ethereum": "0.85.0-alpha-testnet.3",
+    "@aztec/foundation": "0.85.0-alpha-testnet.3",
+    "@aztec/kv-store": "0.85.0-alpha-testnet.3",
+    "@aztec/merkle-tree": "0.85.0-alpha-testnet.3",
+    "@aztec/p2p": "0.85.0-alpha-testnet.3",
+    "@aztec/protocol-contracts": "0.85.0-alpha-testnet.3",
+    "@aztec/prover-client": "0.85.0-alpha-testnet.3",
+    "@aztec/sequencer-client": "0.85.0-alpha-testnet.3",
+    "@aztec/simulator": "0.85.0-alpha-testnet.3",
+    "@aztec/stdlib": "0.85.0-alpha-testnet.3",
+    "@aztec/telemetry-client": "0.85.0-alpha-testnet.3",
+    "@aztec/validator-client": "0.85.0-alpha-testnet.3",
+    "@aztec/world-state": "0.85.0-alpha-testnet.3",
     "tslib": "^2.4.0"
   },
   "devDependencies": {

package/src/actions/build-snapshot-metadata.ts

@@ -0,0 +1,29 @@
+import type { Archiver } from '@aztec/archiver';
+import type { UploadSnapshotMetadata } from '@aztec/stdlib/snapshots';
+
+import type { UploadSnapshotConfig } from './upload-snapshot.js';
+
+export async function buildSnapshotMetadata(
+  archiver: Archiver,
+  config: UploadSnapshotConfig,
+): Promise<UploadSnapshotMetadata> {
+  const [rollupAddress, l1BlockNumber, { latest }] = await Promise.all([
+    archiver.getRollupAddress(),
+    archiver.getL1BlockNumber(),
+    archiver.getL2Tips(),
+  ] as const);
+
+  const { number: l2BlockNumber, hash: l2BlockHash } = latest;
+  if (!l2BlockHash) {
+    throw new Error(`Failed to get L2 block hash from archiver.`);
+  }
+
+  return {
+    l1ChainId: config.l1ChainId,
+    rollupVersion: config.rollupVersion,
+    rollupAddress,
+    l2BlockNumber,
+    l2BlockHash,
+    l1BlockNumber: Number(l1BlockNumber),
+  };
+}

package/src/actions/create-backups.ts

@@ -0,0 +1,41 @@
+import type { Archiver } from '@aztec/archiver';
+import type { Logger } from '@aztec/foundation/log';
+import type { WorldStateSynchronizer } from '@aztec/stdlib/interfaces/server';
+import type { SnapshotDataUrls } from '@aztec/stdlib/snapshots';
+
+import { existsSync } from 'fs';
+import { join } from 'path/posix';
+
+export async function createBackups(
+  backupDir: string,
+  archiver: Archiver,
+  worldState: WorldStateSynchronizer,
+  log: Logger,
+) {
+  try {
+    log.info(`Pausing archiver and world state sync to start snapshot upload`);
+    await archiver.stop();
+    await worldState.stopSync();
+
+    log.info(`Creating backups of lmdb environments to ${backupDir}`);
+    const [archiverPath, worldStatePaths] = await Promise.all([
+      archiver.backupTo(join(backupDir, 'archiver')),
+      worldState.backupTo(join(backupDir, 'world-state')),
+    ]);
+    const paths: SnapshotDataUrls = { ...worldStatePaths, archiver: archiverPath };
+
+    const missing = Object.entries(paths).filter(([_key, path]) => !path || !existsSync(path));
+    if (missing.length > 0) {
+      throw new Error(`Missing backup files: ${missing.map(([key, path]) => `${path} (${key})`).join(', ')}`);
+    }
+
+    log.info(`Data stores backed up to ${backupDir}`, { paths });
+    return paths;
+  } catch (err) {
+    throw new Error(`Error creating backups for snapshot upload: ${err}`);
+  } finally {
+    log.info(`Resuming archiver and world state sync`);
+    worldState.resumeSync();
+    archiver.resume();
+  }
+}

package/src/actions/index.ts

@@ -1,2 +1,4 @@
 export * from './snapshot-sync.js';
 export * from './upload-snapshot.js';
+export * from './create-backups.js';
+export * from './build-snapshot-metadata.js';

package/src/actions/snapshot-sync.ts

@@ -1,10 +1,4 @@
-import {
-  ARCHIVER_DB_VERSION,
-  ARCHIVER_STORE_NAME,
-  type ArchiverConfig,
-  type ArchiverDataStore,
-  createArchiverStore,
-} from '@aztec/archiver';
+import { ARCHIVER_DB_VERSION, ARCHIVER_STORE_NAME, type ArchiverConfig, createArchiverStore } from '@aztec/archiver';
 import { INITIAL_L2_BLOCK_NUM } from '@aztec/constants';
 import { type EthereumClientConfig, getPublicClient } from '@aztec/ethereum';
 import type { EthAddress } from '@aztec/foundation/eth-address';
@@ -19,7 +13,7 @@ import {
   type SnapshotsIndexMetadata,
   downloadSnapshot,
   getLatestSnapshotMetadata,
-  makeSnapshotLocalPaths,
+  makeSnapshotPaths,
 } from '@aztec/stdlib/snapshots';
 import { NATIVE_WORLD_STATE_DBS, WORLD_STATE_DB_VERSION, WORLD_STATE_DIR } from '@aztec/world-state';
 
@@ -39,158 +33,180 @@ type SnapshotSyncConfig = Pick<SharedNodeConfig, 'syncMode' | 'snapshotsUrl'> &
     minL1BlocksToTriggerReplace?: number;
   };
 
+/**
+ * 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: SnapshotSyncConfig, log: Logger) {
-  let archiverStore: ArchiverDataStore | undefined;
-  let downloadDir: string | undefined;
+  const { syncMode, snapshotsUrl, dataDirectory, l1ChainId, rollupVersion, l1Contracts } = config;
+  if (syncMode === 'full') {
+    log.debug('Snapshot sync is disabled. Running full sync.', { syncMode: syncMode });
+    return false;
+  }
+
+  if (!snapshotsUrl) {
+    log.verbose('Snapshot sync is disabled. No snapshots URL provided.');
+    return false;
+  }
+
+  if (!dataDirectory) {
+    log.verbose('Snapshot sync is disabled. No local data directory defined.');
+    return false;
+  }
 
+  let fileStore: ReadOnlyFileStore;
   try {
-    const { syncMode, snapshotsUrl, dataDirectory, l1ChainId, rollupVersion, l1Contracts } = config;
-    if (syncMode === 'full') {
-      log.debug('Snapshot sync is disabled. Running full sync.', { syncMode: syncMode });
-      return false;
-    }
+    fileStore = await createReadOnlyFileStore(snapshotsUrl, log);
+  } catch (err) {
+    log.error(`Invalid config for downloading snapshots`, err);
+    return false;
+  }
 
-    if (!snapshotsUrl) {
-      log.verbose('Snapshot sync is disabled. No snapshots URL provided.');
-      return false;
-    }
+  // Create an archiver store to check the current state
+  log.verbose(`Creating temporary archiver data store`);
+  const archiverStore = await createArchiverStore(config);
+  let archiverL1BlockNumber: bigint | undefined;
+  let archiverL2BlockNumber: number | undefined;
+  try {
+    [archiverL1BlockNumber, archiverL2BlockNumber] = await Promise.all([
+      archiverStore.getSynchPoint().then(s => s.blocksSynchedTo),
+      archiverStore.getSynchedL2BlockNumber(),
+    ] as const);
+  } finally {
+    log.verbose(`Closing temporary archiver data store`, { archiverL1BlockNumber, archiverL2BlockNumber });
+    await archiverStore.close();
+  }
 
-    if (!dataDirectory) {
-      log.verbose('Snapshot sync is disabled. No local data directory defined.');
-      return false;
-    }
+  const minL1BlocksToTriggerReplace = config.minL1BlocksToTriggerReplace ?? MIN_L1_BLOCKS_TO_TRIGGER_REPLACE;
+  if (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;
+  }
 
-    let fileStore: ReadOnlyFileStore;
-    try {
-      fileStore = await createReadOnlyFileStore(snapshotsUrl, log);
-    } catch (err) {
-      log.error(`Invalid config for downloading snapshots`, err);
-      return false;
-    }
+  const currentL1BlockNumber = await getPublicClient(config).getBlockNumber();
+  if (archiverL1BlockNumber && currentL1BlockNumber - archiverL1BlockNumber < minL1BlocksToTriggerReplace) {
+    log.verbose(
+      `Skipping snapshot sync as archiver is less than ${
+        currentL1BlockNumber - archiverL1BlockNumber
+      } L1 blocks behind.`,
+      { archiverL1BlockNumber, currentL1BlockNumber, minL1BlocksToTriggerReplace },
+    );
+    return false;
+  }
 
-    // Create an archiver store to check the current sync state
-    archiverStore = await createArchiverStore(config);
-
-    const minL1BlocksToTriggerReplace = config.minL1BlocksToTriggerReplace ?? MIN_L1_BLOCKS_TO_TRIGGER_REPLACE;
-    const archiverL2BlockNumber = await archiverStore.getSynchedL2BlockNumber();
-    if (
-      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 indexMetadata: SnapshotsIndexMetadata = {
+    l1ChainId,
+    rollupVersion,
+    rollupAddress: l1Contracts.rollupAddress,
+  };
+  let snapshot: SnapshotMetadata | undefined;
+  try {
+    snapshot = await getLatestSnapshotMetadata(indexMetadata, fileStore);
+  } catch (err) {
+    log.error(`Failed to get latest snapshot metadata. Skipping snapshot sync.`, err, {
+      ...indexMetadata,
+      snapshotsUrl,
+    });
+    return false;
+  }
 
-    const currentL1BlockNumber = await getPublicClient(config).getBlockNumber();
-    const archiverL1BlockNumber = await archiverStore.getSynchPoint().then(s => s.blocksSynchedTo);
-    if (archiverL1BlockNumber && currentL1BlockNumber - archiverL1BlockNumber < minL1BlocksToTriggerReplace) {
-      log.verbose(
-        `Skipping snapshot sync as archiver is less than ${
-          currentL1BlockNumber - archiverL1BlockNumber
-        } L1 blocks behind.`,
-        { archiverL1BlockNumber, currentL1BlockNumber, minL1BlocksToTriggerReplace },
-      );
-      return false;
-    }
+  if (!snapshot) {
+    log.verbose(`No snapshot found. Skipping snapshot sync.`, { ...indexMetadata, snapshotsUrl });
+    return false;
+  }
 
-    const indexMetadata: SnapshotsIndexMetadata = {
-      l1ChainId,
-      rollupVersion,
-      rollupAddress: l1Contracts.rollupAddress,
-    };
-    let snapshot: SnapshotMetadata | undefined;
-    try {
-      snapshot = await getLatestSnapshotMetadata(indexMetadata, fileStore);
-    } catch (err) {
-      log.error(`Failed to get latest snapshot metadata. Skipping snapshot sync.`, err, {
-        ...indexMetadata,
-        snapshotsUrl,
-      });
-      return false;
-    }
+  if (snapshot.schemaVersions.archiver !== ARCHIVER_DB_VERSION) {
+    log.warn(
+      `Skipping snapshot sync as last snapshot has schema version ${snapshot.schemaVersions.archiver} but expected ${ARCHIVER_DB_VERSION}.`,
+      snapshot,
+    );
+    return false;
+  }
 
-    if (!snapshot) {
-      log.verbose(`No snapshot found. Skipping snapshot sync.`, { ...indexMetadata, snapshotsUrl });
-      return false;
-    }
+  if (snapshot.schemaVersions.worldState !== WORLD_STATE_DB_VERSION) {
+    log.warn(
+      `Skipping snapshot sync as last snapshot has world state schema version ${snapshot.schemaVersions.worldState} but we expected ${WORLD_STATE_DB_VERSION}.`,
+      snapshot,
+    );
+    return false;
+  }
 
-    if (snapshot.schemaVersions.archiver !== ARCHIVER_DB_VERSION) {
-      log.warn(
-        `Skipping snapshot sync as last snapshot has schema version ${snapshot.schemaVersions.archiver} but expected ${ARCHIVER_DB_VERSION}.`,
-        snapshot,
-      );
-      return false;
-    }
+  if (archiverL1BlockNumber && snapshot.l1BlockNumber < archiverL1BlockNumber) {
+    log.verbose(
+      `Skipping snapshot sync since local archiver is at L1 block ${archiverL1BlockNumber} which is further than last snapshot at ${snapshot.l1BlockNumber}`,
+      { snapshot, archiverL1BlockNumber },
+    );
+    return false;
+  }
 
-    if (snapshot.schemaVersions.worldState !== WORLD_STATE_DB_VERSION) {
-      log.warn(
-        `Skipping snapshot sync as last snapshot has world state schema version ${snapshot.schemaVersions.worldState} but we expected ${WORLD_STATE_DB_VERSION}.`,
-        snapshot,
-      );
-      return false;
-    }
+  if (archiverL1BlockNumber && snapshot.l1BlockNumber - Number(archiverL1BlockNumber) < minL1BlocksToTriggerReplace) {
+    log.verbose(
+      `Skipping snapshot sync as archiver is less than ${
+        snapshot.l1BlockNumber - Number(archiverL1BlockNumber)
+      } L1 blocks behind latest snapshot.`,
+      { snapshot, archiverL1BlockNumber },
+    );
+    return false;
+  }
 
-    if (archiverL1BlockNumber && snapshot.l1BlockNumber < archiverL1BlockNumber) {
-      log.verbose(
-        `Skipping snapshot sync since local archiver is at L1 block ${archiverL1BlockNumber} which is further than last snapshot at ${snapshot.l1BlockNumber}`,
-        { snapshot, archiverL1BlockNumber },
-      );
-      return false;
-    }
+  const { l1BlockNumber, l2BlockNumber } = snapshot;
+  log.info(`Syncing from snapshot at L1 block ${l1BlockNumber} L2 block ${l2BlockNumber}`, { snapshot, snapshotsUrl });
+  await snapshotSync(snapshot, log, {
+    dataDirectory: config.dataDirectory!,
+    rollupAddress: config.l1Contracts.rollupAddress,
+    snapshotsUrl,
+  });
+  log.info(`Snapshot synced to L1 block ${l1BlockNumber} L2 block ${l2BlockNumber}`, { snapshot });
+  return true;
+}
 
-    if (archiverL1BlockNumber && snapshot.l1BlockNumber - Number(archiverL1BlockNumber) < minL1BlocksToTriggerReplace) {
-      log.verbose(
-        `Skipping snapshot sync as archiver is less than ${
-          snapshot.l1BlockNumber - Number(archiverL1BlockNumber)
-        } L1 blocks behind latest snapshot.`,
-        { snapshot, archiverL1BlockNumber },
-      );
-      return false;
-    }
+/**
+ * Downloads the given snapshot replacing any local data stores.
+ */
+export async function snapshotSync(
+  snapshot: Pick<SnapshotMetadata, 'dataUrls'>,
+  log: Logger,
+  config: { dataDirectory: string; rollupAddress: EthAddress; snapshotsUrl: string },
+) {
+  const { dataDirectory, rollupAddress } = config;
+  if (!dataDirectory) {
+    throw new Error(`No local data directory defined. Cannot sync snapshot.`);
+  }
+
+  const fileStore = await createReadOnlyFileStore(config.snapshotsUrl, log);
 
-    // Green light. Download the snapshot to a temp location.
+  let downloadDir: string | undefined;
+
+  try {
+    // Download the snapshot to a temp location.
     downloadDir = await mkdtemp(join(dataDirectory, 'download-'));
-    const downloadPaths = makeSnapshotLocalPaths(downloadDir);
-    log.info(
-      `Downloading snapshot at L1 block ${snapshot.l1BlockNumber} L2 block ${snapshot.l2BlockNumber} from ${snapshotsUrl} to ${downloadDir} for snapshot sync`,
-      { snapshot, downloadPaths },
-    );
+    const downloadPaths = makeSnapshotPaths(downloadDir);
+    log.info(`Downloading snapshot to ${downloadDir}`, { snapshot, downloadPaths });
     await downloadSnapshot(snapshot, downloadPaths, fileStore);
-    log.info(`Snapshot downloaded at ${downloadDir}`, { snapshotsUrl, snapshot, downloadPaths });
+    log.info(`Snapshot downloaded at ${downloadDir}`, { snapshot, downloadPaths });
 
-    // If download was successful, close the archiver store, clear lock and version, and move download there
-    await archiverStore.close();
-    archiverStore = undefined;
+    // If download was successful, clear lock and version, and move download there
     const archiverPath = join(dataDirectory, ARCHIVER_STORE_NAME);
-    await prepareTarget(archiverPath, ARCHIVER_DB_VERSION, l1Contracts.rollupAddress);
+    await prepareTarget(archiverPath, ARCHIVER_DB_VERSION, rollupAddress);
     await rename(downloadPaths.archiver, join(archiverPath, 'data.mdb'));
     log.info(`Archiver database set up from snapshot`, { path: archiverPath });
 
     // 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);
-    await prepareTarget(worldStateBasePath, WORLD_STATE_DB_VERSION, l1Contracts.rollupAddress);
+    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'));
       log.info(`World state database ${name} set up from snapshot`, { path });
     }
-
-    log.info(`Snapshot synced to L1 block ${snapshot.l1BlockNumber} L2 block ${snapshot.l2BlockNumber}`, { snapshot });
   } finally {
-    if (archiverStore) {
-      log.verbose(`Closing temporary archiver data store`);
-      await archiverStore.close();
-    }
     if (downloadDir) {
       await tryRmDir(downloadDir, log);
     }
   }
-
-  return true;
 }
 
 /** Deletes target dir and writes the new version file. */

package/src/actions/upload-snapshot.ts

@@ -5,16 +5,18 @@ import type { DataStoreConfig } from '@aztec/kv-store/config';
 import type { ChainConfig } from '@aztec/stdlib/config';
 import { createFileStore } from '@aztec/stdlib/file-store';
 import type { WorldStateSynchronizer } from '@aztec/stdlib/interfaces/server';
-import type { SnapshotDataUrls, UploadSnapshotMetadata } from '@aztec/stdlib/snapshots';
-import { uploadSnapshot as uploadSnapshotToStore } from '@aztec/stdlib/snapshots';
+import { uploadSnapshotToIndex } from '@aztec/stdlib/snapshots';
 import { WORLD_STATE_DB_VERSION } from '@aztec/world-state';
 
-import { existsSync } from 'fs';
 import { mkdtemp } from 'fs/promises';
 import { tmpdir } from 'os';
 import { join } from 'path';
 
-type UploadSnapshotConfig = Pick<ChainConfig, 'l1ChainId' | 'rollupVersion'> & Pick<DataStoreConfig, 'dataDirectory'>;
+import { buildSnapshotMetadata } from './build-snapshot-metadata.js';
+import { createBackups } from './create-backups.js';
+
+export type UploadSnapshotConfig = Pick<ChainConfig, 'l1ChainId' | 'rollupVersion'> &
+  Pick<DataStoreConfig, 'dataDirectory'>;
 
 /**
  * Pauses the archiver and world state sync, creates backups of the archiver and world state lmdb environments,
@@ -39,64 +41,10 @@ export async function uploadSnapshot(
     const versions = { archiver: ARCHIVER_DB_VERSION, worldState: WORLD_STATE_DB_VERSION };
     const metadata = await buildSnapshotMetadata(archiver, config);
     log.info(`Uploading snapshot to ${location}`, { snapshot: metadata });
-    const snapshot = await uploadSnapshotToStore(paths, versions, metadata, store);
+    const snapshot = await uploadSnapshotToIndex(paths, versions, metadata, store);
     log.info(`Snapshot uploaded successfully`, { snapshot });
   } finally {
     log.info(`Cleaning up backup dir ${backupDir}`);
     await tryRmDir(backupDir, log);
   }
 }
-
-async function buildSnapshotMetadata(
-  archiver: Archiver,
-  config: UploadSnapshotConfig,
-): Promise<UploadSnapshotMetadata> {
-  const [rollupAddress, l1BlockNumber, { latest }] = await Promise.all([
-    archiver.getRollupAddress(),
-    archiver.getL1BlockNumber(),
-    archiver.getL2Tips(),
-  ] as const);
-
-  const { number: l2BlockNumber, hash: l2BlockHash } = latest;
-  if (!l2BlockHash) {
-    throw new Error(`Failed to get L2 block hash from archiver.`);
-  }
-
-  return {
-    l1ChainId: config.l1ChainId,
-    rollupVersion: config.rollupVersion,
-    rollupAddress,
-    l2BlockNumber,
-    l2BlockHash,
-    l1BlockNumber: Number(l1BlockNumber),
-  };
-}
-
-async function createBackups(backupDir: string, archiver: Archiver, worldState: WorldStateSynchronizer, log: Logger) {
-  try {
-    log.info(`Pausing archiver and world state sync to start snapshot upload`);
-    await archiver.stop();
-    await worldState.stopSync();
-
-    log.info(`Creating backups of lmdb environments to ${backupDir}`);
-    const [archiverPath, worldStatePaths] = await Promise.all([
-      archiver.backupTo(join(backupDir, 'archiver')),
-      worldState.backupTo(join(backupDir, 'world-state')),
-    ]);
-    const paths: SnapshotDataUrls = { ...worldStatePaths, archiver: archiverPath };
-
-    const missing = Object.entries(paths).filter(([_key, path]) => !path || !existsSync(path));
-    if (missing.length > 0) {
-      throw new Error(`Missing backup files: ${missing.map(([key, path]) => `${path} (${key})`).join(', ')}`);
-    }
-
-    log.info(`Data stores backed up to ${backupDir}`, { paths });
-    return paths;
-  } catch (err) {
-    throw new Error(`Error creating backups for snapshot upload: ${err}`);
-  } finally {
-    log.info(`Resuming archiver and world state sync`);
-    worldState.resumeSync();
-    archiver.resume();
-  }
-}