@aztec-labs/node-lib 6.1.0-nightly.20261113 → 6.1.0-nightly.20261114
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dest/actions/create-backups.d.ts +7 -2
- package/dest/actions/create-backups.d.ts.map +1 -1
- package/dest/actions/create-backups.js +9 -3
- package/dest/actions/snapshot-sync.d.ts +5 -4
- package/dest/actions/snapshot-sync.d.ts.map +1 -1
- package/dest/actions/snapshot-sync.js +5 -5
- package/dest/actions/upload-snapshot.d.ts +9 -6
- package/dest/actions/upload-snapshot.d.ts.map +1 -1
- package/dest/actions/upload-snapshot.js +23 -22
- package/package.json +12 -12
- package/src/actions/create-backups.ts +9 -2
- package/src/actions/snapshot-sync.ts +12 -6
- package/src/actions/upload-snapshot.ts +26 -22
|
@@ -2,5 +2,10 @@ import type { Archiver } from '@aztec-labs/archiver';
|
|
|
2
2
|
import type { Logger } from '@aztec-labs/foundation/log';
|
|
3
3
|
import type { WorldStateSynchronizer } from '@aztec-labs/stdlib/interfaces/server';
|
|
4
4
|
import type { SnapshotDataUrls } from '@aztec-labs/stdlib/snapshots';
|
|
5
|
-
|
|
6
|
-
|
|
5
|
+
import type { UploadSnapshotConfig } from './upload-snapshot.js';
|
|
6
|
+
/** Copies both databases and captures their metadata while syncing is paused, then resumes syncing. */
|
|
7
|
+
export declare function createBackups(backupDir: string, archiver: Archiver, worldState: WorldStateSynchronizer, config: UploadSnapshotConfig, log: Logger): Promise<{
|
|
8
|
+
paths: SnapshotDataUrls;
|
|
9
|
+
metadata: import("@aztec-labs/stdlib/snapshots").UploadSnapshotMetadata;
|
|
10
|
+
}>;
|
|
11
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY3JlYXRlLWJhY2t1cHMuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9hY3Rpb25zL2NyZWF0ZS1iYWNrdXBzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sS0FBSyxFQUFFLFFBQVEsRUFBRSxNQUFNLHNCQUFzQixDQUFDO0FBQ3JELE9BQU8sS0FBSyxFQUFFLE1BQU0sRUFBRSxNQUFNLDRCQUE0QixDQUFDO0FBRXpELE9BQU8sS0FBSyxFQUFFLHNCQUFzQixFQUFFLE1BQU0sc0NBQXNDLENBQUM7QUFDbkYsT0FBTyxLQUFLLEVBQUUsZ0JBQWdCLEVBQUUsTUFBTSw4QkFBOEIsQ0FBQztBQUtyRSxPQUFPLEtBQUssRUFBRSxvQkFBb0IsRUFBRSxNQUFNLHNCQUFzQixDQUFDO0FBRWpFLHVHQUF1RztBQUN2Ryx3QkFBc0IsYUFBYSxDQUNqQyxTQUFTLEVBQUUsTUFBTSxFQUNqQixRQUFRLEVBQUUsUUFBUSxFQUNsQixVQUFVLEVBQUUsc0JBQXNCLEVBQ2xDLE1BQU0sRUFBRSxvQkFBb0IsRUFDNUIsR0FBRyxFQUFFLE1BQU07OztHQTZCWiJ9
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"create-backups.d.ts","sourceRoot":"","sources":["../../src/actions/create-backups.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AACrD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,4BAA4B,CAAC;
|
|
1
|
+
{"version":3,"file":"create-backups.d.ts","sourceRoot":"","sources":["../../src/actions/create-backups.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AACrD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,4BAA4B,CAAC;AAEzD,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,sCAAsC,CAAC;AACnF,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,8BAA8B,CAAC;AAKrE,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,sBAAsB,CAAC;AAEjE,uGAAuG;AACvG,wBAAsB,aAAa,CACjC,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,QAAQ,EAClB,UAAU,EAAE,sBAAsB,EAClC,MAAM,EAAE,oBAAoB,EAC5B,GAAG,EAAE,MAAM;;;GA6BZ"}
|
|
@@ -1,12 +1,14 @@
|
|
|
1
|
+
import { allToCompletion } from '@aztec-labs/foundation/promise';
|
|
1
2
|
import { existsSync } from 'fs';
|
|
2
3
|
import { join } from 'path/posix';
|
|
3
|
-
|
|
4
|
+
import { buildSnapshotMetadata } from './build-snapshot-metadata.js';
|
|
5
|
+
/** Copies both databases and captures their metadata while syncing is paused, then resumes syncing. */ export async function createBackups(backupDir, archiver, worldState, config, log) {
|
|
4
6
|
try {
|
|
5
7
|
log.info(`Pausing archiver and world state sync to start snapshot upload`);
|
|
6
8
|
await archiver.stop();
|
|
7
9
|
await worldState.stopSync();
|
|
8
10
|
log.info(`Creating backups of lmdb environments to ${backupDir}`);
|
|
9
|
-
const [archiverPath, worldStatePaths] = await
|
|
11
|
+
const [archiverPath, worldStatePaths] = await allToCompletion([
|
|
10
12
|
archiver.backupTo(join(backupDir, 'archiver')),
|
|
11
13
|
worldState.backupTo(join(backupDir, 'world-state'))
|
|
12
14
|
]);
|
|
@@ -18,10 +20,14 @@ export async function createBackups(backupDir, archiver, worldState, log) {
|
|
|
18
20
|
if (missing.length > 0) {
|
|
19
21
|
throw new Error(`Missing backup files: ${missing.map(([key, path])=>`${path} (${key})`).join(', ')}`);
|
|
20
22
|
}
|
|
23
|
+
const metadata = await buildSnapshotMetadata(archiver, config);
|
|
21
24
|
log.info(`Data stores backed up to ${backupDir}`, {
|
|
22
25
|
paths
|
|
23
26
|
});
|
|
24
|
-
return
|
|
27
|
+
return {
|
|
28
|
+
paths,
|
|
29
|
+
metadata
|
|
30
|
+
};
|
|
25
31
|
} catch (err) {
|
|
26
32
|
throw new Error(`Error creating backups for snapshot upload: ${err}`);
|
|
27
33
|
} finally{
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { type ArchiverConfig } from '@aztec-labs/archiver';
|
|
2
|
-
import { type EthereumClientConfig } from '@aztec-labs/ethereum/client';
|
|
3
2
|
import type { L1ContractsConfig } from '@aztec-labs/ethereum/config';
|
|
3
|
+
import type { ViemPublicClient } from '@aztec-labs/ethereum/types';
|
|
4
4
|
import type { EthAddress } from '@aztec-labs/foundation/eth-address';
|
|
5
5
|
import type { Logger } from '@aztec-labs/foundation/log';
|
|
6
6
|
import type { ChainConfig } from '@aztec-labs/stdlib/config';
|
|
@@ -10,15 +10,16 @@ import { type SnapshotMetadata } from '@aztec-labs/stdlib/snapshots';
|
|
|
10
10
|
import type { GenesisData } from '@aztec-labs/stdlib/world-state';
|
|
11
11
|
import { type WorldStateConfig } from '@aztec-labs/world-state';
|
|
12
12
|
import type { SharedNodeConfig } from '../config/index.js';
|
|
13
|
-
type SnapshotSyncConfig = Pick<SharedNodeConfig, 'syncMode'> & Pick<ChainConfig, 'l1ChainId' | 'rollupVersion'> & Pick<L1ContractsConfig, 'aztecEpochDuration'> & Pick<ArchiverConfig, 'archiverStoreMapSizeKb'> & WorldStateConfig & DataStoreConfig & Required<Pick<DataStoreConfig, 'rollupAddress'>> &
|
|
13
|
+
type SnapshotSyncConfig = Pick<SharedNodeConfig, 'syncMode'> & Pick<ChainConfig, 'l1ChainId' | 'rollupVersion'> & Pick<L1ContractsConfig, 'aztecEpochDuration'> & Pick<ArchiverConfig, 'archiverStoreMapSizeKb'> & WorldStateConfig & DataStoreConfig & Required<Pick<DataStoreConfig, 'rollupAddress'>> & {
|
|
14
14
|
snapshotsUrls?: string[];
|
|
15
15
|
minL1BlocksToTriggerReplace?: number;
|
|
16
16
|
};
|
|
17
17
|
/**
|
|
18
18
|
* Validates local history and restores the newest compatible snapshot when bootstrap is needed.
|
|
19
19
|
* Fixed history boundaries are resolved against archived block and checkpoint metadata.
|
|
20
|
+
* @param l1Client - Reads the current L1 block, to decide whether the local archiver is far enough behind.
|
|
20
21
|
*/
|
|
21
|
-
export declare function trySnapshotSync(config: SnapshotSyncConfig, log: Logger, genesis?: GenesisData): Promise<boolean>;
|
|
22
|
+
export declare function trySnapshotSync(config: SnapshotSyncConfig, l1Client: Pick<ViemPublicClient, 'getBlockNumber'>, log: Logger, genesis?: GenesisData): Promise<boolean>;
|
|
22
23
|
/**
|
|
23
24
|
* Downloads the given snapshot replacing any local data stores.
|
|
24
25
|
*/
|
|
@@ -31,4 +32,4 @@ export declare function snapshotSync(snapshot: Pick<SnapshotMetadata, 'dataUrls'
|
|
|
31
32
|
validate?: (stagingDirectory: string) => Promise<void>;
|
|
32
33
|
}): Promise<void>;
|
|
33
34
|
export {};
|
|
34
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
35
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic25hcHNob3Qtc3luYy5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2FjdGlvbnMvc25hcHNob3Qtc3luYy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBR0wsS0FBSyxjQUFjLEVBR3BCLE1BQU0sc0JBQXNCLENBQUM7QUFFOUIsT0FBTyxLQUFLLEVBQUUsaUJBQWlCLEVBQUUsTUFBTSw2QkFBNkIsQ0FBQztBQUNyRSxPQUFPLEtBQUssRUFBRSxnQkFBZ0IsRUFBRSxNQUFNLDRCQUE0QixDQUFDO0FBRW5FLE9BQU8sS0FBSyxFQUFFLFVBQVUsRUFBRSxNQUFNLG9DQUFvQyxDQUFDO0FBRXJFLE9BQU8sS0FBSyxFQUFFLE1BQU0sRUFBRSxNQUFNLDRCQUE0QixDQUFDO0FBR3pELE9BQU8sS0FBSyxFQUFFLFdBQVcsRUFBRSxNQUFNLDJCQUEyQixDQUFDO0FBRzdELE9BQU8sRUFBRSxLQUFLLGlCQUFpQixFQUEyQixNQUFNLCtCQUErQixDQUFDO0FBQ2hHLE9BQU8sS0FBSyxFQUFFLGVBQWUsRUFBRSxNQUFNLDZCQUE2QixDQUFDO0FBQ25FLE9BQU8sRUFFTCxLQUFLLGdCQUFnQixFQUt0QixNQUFNLDhCQUE4QixDQUFDO0FBQ3RDLE9BQU8sS0FBSyxFQUFFLFdBQVcsRUFBRSxNQUFNLGdDQUFnQyxDQUFDO0FBQ2xFLE9BQU8sRUFJTCxLQUFLLGdCQUFnQixFQUt0QixNQUFNLHlCQUF5QixDQUFDO0FBSWpDLE9BQU8sS0FBSyxFQUFFLGdCQUFnQixFQUFFLE1BQU0sb0JBQW9CLENBQUM7QUFLM0QsS0FBSyxrQkFBa0IsR0FBRyxJQUFJLENBQUMsZ0JBQWdCLEVBQUUsVUFBVSxDQUFDLEdBQzFELElBQUksQ0FBQyxXQUFXLEVBQUUsV0FBVyxHQUFHLGVBQWUsQ0FBQyxHQUNoRCxJQUFJLENBQUMsaUJBQWlCLEVBQUUsb0JBQW9CLENBQUMsR0FDN0MsSUFBSSxDQUFDLGNBQWMsRUFBRSx3QkFBd0IsQ0FBQyxHQUM5QyxnQkFBZ0IsR0FDaEIsZUFBZSxHQUNmLFFBQVEsQ0FBQyxJQUFJLENBQUMsZUFBZSxFQUFFLGVBQWUsQ0FBQyxDQUFDLEdBQUc7SUFDakQsYUFBYSxDQUFDLEVBQUUsTUFBTSxFQUFFLENBQUM7SUFDekIsMkJBQTJCLENBQUMsRUFBRSxNQUFNLENBQUM7Q0FDdEMsQ0FBQztBQUVKOzs7O0dBSUc7QUFDSCx3QkFBc0IsZUFBZSxDQUNuQyxNQUFNLEVBQUUsa0JBQWtCLEVBQzFCLFFBQVEsRUFBRSxJQUFJLENBQUMsZ0JBQWdCLEVBQUUsZ0JBQWdCLENBQUMsRUFDbEQsR0FBRyxFQUFFLE1BQU0sRUFDWCxPQUFPLENBQUMsRUFBRSxXQUFXLG9CQWtQdEI7QUFFRDs7R0FFRztBQUNILHdCQUFzQixZQUFZLENBQ2hDLFFBQVEsRUFBRSxJQUFJLENBQUMsZ0JBQWdCLEVBQUUsVUFBVSxDQUFDLEVBQzVDLEdBQUcsRUFBRSxNQUFNLEVBQ1gsTUFBTSxFQUFFO0lBQ04sYUFBYSxFQUFFLE1BQU0sQ0FBQztJQUN0QixhQUFhLEVBQUUsVUFBVSxDQUFDO0lBQzFCLFNBQVMsRUFBRSxpQkFBaUIsQ0FBQztJQUM3Qix1QkFBdUIsQ0FBQyxFQUFFLE1BQU0sQ0FBQztJQUNqQyxnQkFBZ0IsQ0FBQyxFQUFFLENBQUMsZ0JBQWdCLEVBQUUsTUFBTSxLQUFLLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FBQztJQUMvRCxRQUFRLENBQUMsRUFBRSxDQUFDLGdCQUFnQixFQUFFLE1BQU0sS0FBSyxPQUFPLENBQUMsSUFBSSxDQUFDLENBQUM7Q0FDeEQsaUJBcUVGIn0=
|
|
@@ -1 +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,sBAAsB,CAAC;AAE9B,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"snapshot-sync.d.ts","sourceRoot":"","sources":["../../src/actions/snapshot-sync.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,KAAK,cAAc,EAGpB,MAAM,sBAAsB,CAAC;AAE9B,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,6BAA6B,CAAC;AACrE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,4BAA4B,CAAC;AAEnE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,oCAAoC,CAAC;AAErE,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,4BAA4B,CAAC;AAGzD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAC;AAG7D,OAAO,EAAE,KAAK,iBAAiB,EAA2B,MAAM,+BAA+B,CAAC;AAChG,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,6BAA6B,CAAC;AACnE,OAAO,EAEL,KAAK,gBAAgB,EAKtB,MAAM,8BAA8B,CAAC;AACtC,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,gCAAgC,CAAC;AAClE,OAAO,EAIL,KAAK,gBAAgB,EAKtB,MAAM,yBAAyB,CAAC;AAIjC,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,GAAG;IACjD,aAAa,CAAC,EAAE,MAAM,EAAE,CAAC;IACzB,2BAA2B,CAAC,EAAE,MAAM,CAAC;CACtC,CAAC;AAEJ;;;;GAIG;AACH,wBAAsB,eAAe,CACnC,MAAM,EAAE,kBAAkB,EAC1B,QAAQ,EAAE,IAAI,CAAC,gBAAgB,EAAE,gBAAgB,CAAC,EAClD,GAAG,EAAE,MAAM,EACX,OAAO,CAAC,EAAE,WAAW,oBAkPtB;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"}
|
|
@@ -1,6 +1,5 @@
|
|
|
1
1
|
import { ARCHIVER_DB_VERSION, ARCHIVER_STORE_NAME, createArchiverStore, getArchiverSynchPoint } from '@aztec-labs/archiver';
|
|
2
2
|
import { INITIAL_L2_BLOCK_NUM } from '@aztec-labs/constants';
|
|
3
|
-
import { getPublicClient } from '@aztec-labs/ethereum/client';
|
|
4
3
|
import { BlockNumber } from '@aztec-labs/foundation/branded-types';
|
|
5
4
|
import { tryRmDir } from '@aztec-labs/foundation/fs';
|
|
6
5
|
import { P2P_STORE_NAME } from '@aztec-labs/p2p';
|
|
@@ -9,7 +8,7 @@ import { DatabaseVersionManager } from '@aztec-labs/stdlib/database-version/mana
|
|
|
9
8
|
import { DatabaseVersion } from '@aztec-labs/stdlib/database-version/version';
|
|
10
9
|
import { createReadOnlyFileStore } from '@aztec-labs/stdlib/file-store';
|
|
11
10
|
import { SnapshotDataKeys, downloadSnapshot, getSnapshotIndex, makeSnapshotPaths } from '@aztec-labs/stdlib/snapshots';
|
|
12
|
-
import { NATIVE_WORLD_STATE_DBS, WORLD_STATE_DB_VERSION, WORLD_STATE_DIR, createWorldState, getWorldStateHistoryStartCheckpoint, validateWorldStateHistory } from '@aztec-labs/world-state';
|
|
11
|
+
import { NATIVE_WORLD_STATE_DBS, WORLD_STATE_DB_VERSION, WORLD_STATE_DIR, createWorldState, getWorldStateHistoryStartCheckpoint, resolveWorldStateHistoryRetention, validateWorldStateHistory } from '@aztec-labs/world-state';
|
|
13
12
|
import { copyFile, mkdir, mkdtemp, readFile, rename, stat, unlink } from 'fs/promises';
|
|
14
13
|
import { join } from 'path';
|
|
15
14
|
// Half day worth of L1 blocks
|
|
@@ -17,7 +16,8 @@ const MIN_L1_BLOCKS_TO_TRIGGER_REPLACE = 86400 / 2 / 12;
|
|
|
17
16
|
/**
|
|
18
17
|
* Validates local history and restores the newest compatible snapshot when bootstrap is needed.
|
|
19
18
|
* Fixed history boundaries are resolved against archived block and checkpoint metadata.
|
|
20
|
-
|
|
19
|
+
* @param l1Client - Reads the current L1 block, to decide whether the local archiver is far enough behind.
|
|
20
|
+
*/ export async function trySnapshotSync(config, l1Client, log, genesis) {
|
|
21
21
|
const { syncMode, snapshotsUrls, dataDirectory, l1ChainId, rollupVersion, rollupAddress } = config;
|
|
22
22
|
const historyStartCheckpoint = getWorldStateHistoryStartCheckpoint(config);
|
|
23
23
|
let maxSnapshotBlock;
|
|
@@ -67,7 +67,7 @@ const MIN_L1_BLOCKS_TO_TRIGGER_REPLACE = 86400 / 2 / 12;
|
|
|
67
67
|
log.verbose(`Skipping non-forced snapshot sync as archiver is already synced to L2 block ${archiverL2BlockNumber}.`);
|
|
68
68
|
return false;
|
|
69
69
|
}
|
|
70
|
-
const currentL1BlockNumber = await
|
|
70
|
+
const currentL1BlockNumber = await l1Client.getBlockNumber();
|
|
71
71
|
if (historyStartCheckpoint === undefined && archiverL1BlockNumber && currentL1BlockNumber >= archiverL1BlockNumber && currentL1BlockNumber - archiverL1BlockNumber < minL1BlocksToTriggerReplace) {
|
|
72
72
|
log.verbose(`Skipping snapshot sync as archiver is less than ${currentL1BlockNumber - archiverL1BlockNumber} L1 blocks behind.`, {
|
|
73
73
|
archiverL1BlockNumber,
|
|
@@ -341,7 +341,7 @@ async function validateLocalWorldStateHistory(config, log, genesis) {
|
|
|
341
341
|
oldestHistoricBlock: summary.oldestHistoricalBlock,
|
|
342
342
|
latestBlock: summary.unfinalizedBlockNumber,
|
|
343
343
|
historyStartCheckpoint: getWorldStateHistoryStartCheckpoint(config),
|
|
344
|
-
historyRetention: config.worldStateHistoryRetention
|
|
344
|
+
historyRetention: resolveWorldStateHistoryRetention(config.worldStateHistoryRetention)
|
|
345
345
|
});
|
|
346
346
|
} finally{
|
|
347
347
|
await worldState.close();
|
|
@@ -1,12 +1,15 @@
|
|
|
1
1
|
import { type Archiver } from '@aztec-labs/archiver';
|
|
2
2
|
import type { Logger } from '@aztec-labs/foundation/log';
|
|
3
3
|
import type { ChainConfig } from '@aztec-labs/stdlib/config';
|
|
4
|
+
import type { FileStore } from '@aztec-labs/stdlib/file-store';
|
|
4
5
|
import type { WorldStateSynchronizer } from '@aztec-labs/stdlib/interfaces/server';
|
|
5
6
|
import type { DataStoreConfig } from '@aztec-labs/stdlib/kv-store';
|
|
6
7
|
export type UploadSnapshotConfig = Pick<ChainConfig, 'l1ChainId' | 'rollupVersion'> & Pick<DataStoreConfig, 'dataDirectory'>;
|
|
7
|
-
/**
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
8
|
+
/** Local database copies and frozen metadata, owned until asynchronous disposal removes the temporary files. */
|
|
9
|
+
export interface CapturedSnapshot extends AsyncDisposable {
|
|
10
|
+
/** Publishes the captured data and its index entry to the store. */
|
|
11
|
+
upload(store: FileStore): Promise<void>;
|
|
12
|
+
}
|
|
13
|
+
/** Captures consistent database copies and metadata, resuming syncing before returning. Use with `await using`. */
|
|
14
|
+
export declare function captureSnapshot(archiver: Archiver, worldState: WorldStateSynchronizer, config: UploadSnapshotConfig, log: Logger): Promise<CapturedSnapshot>;
|
|
15
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidXBsb2FkLXNuYXBzaG90LmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvYWN0aW9ucy91cGxvYWQtc25hcHNob3QudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUF1QixLQUFLLFFBQVEsRUFBRSxNQUFNLHNCQUFzQixDQUFDO0FBRTFFLE9BQU8sS0FBSyxFQUFFLE1BQU0sRUFBRSxNQUFNLDRCQUE0QixDQUFDO0FBQ3pELE9BQU8sS0FBSyxFQUFFLFdBQVcsRUFBRSxNQUFNLDJCQUEyQixDQUFDO0FBQzdELE9BQU8sS0FBSyxFQUFFLFNBQVMsRUFBRSxNQUFNLCtCQUErQixDQUFDO0FBQy9ELE9BQU8sS0FBSyxFQUFFLHNCQUFzQixFQUFFLE1BQU0sc0NBQXNDLENBQUM7QUFDbkYsT0FBTyxLQUFLLEVBQUUsZUFBZSxFQUFFLE1BQU0sNkJBQTZCLENBQUM7QUFTbkUsTUFBTSxNQUFNLG9CQUFvQixHQUFHLElBQUksQ0FBQyxXQUFXLEVBQUUsV0FBVyxHQUFHLGVBQWUsQ0FBQyxHQUNqRixJQUFJLENBQUMsZUFBZSxFQUFFLGVBQWUsQ0FBQyxDQUFDO0FBRXpDLGdIQUFnSDtBQUNoSCxNQUFNLFdBQVcsZ0JBQWlCLFNBQVEsZUFBZTtJQUN2RCxvRUFBb0U7SUFDcEUsTUFBTSxDQUFDLEtBQUssRUFBRSxTQUFTLEdBQUcsT0FBTyxDQUFDLElBQUksQ0FBQyxDQUFDO0NBQ3pDO0FBRUQsbUhBQW1IO0FBQ25ILHdCQUFzQixlQUFlLENBQ25DLFFBQVEsRUFBRSxRQUFRLEVBQ2xCLFVBQVUsRUFBRSxzQkFBc0IsRUFDbEMsTUFBTSxFQUFFLG9CQUFvQixFQUM1QixHQUFHLEVBQUUsTUFBTSxHQUNWLE9BQU8sQ0FBQyxnQkFBZ0IsQ0FBQyxDQXNCM0IifQ==
|
|
@@ -1 +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,sBAAsB,CAAC;AAE1E,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,4BAA4B,CAAC;AACzD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAC;
|
|
1
|
+
{"version":3,"file":"upload-snapshot.d.ts","sourceRoot":"","sources":["../../src/actions/upload-snapshot.ts"],"names":[],"mappings":"AAAA,OAAO,EAAuB,KAAK,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AAE1E,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,4BAA4B,CAAC;AACzD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAC;AAC7D,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,+BAA+B,CAAC;AAC/D,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,sCAAsC,CAAC;AACnF,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,6BAA6B,CAAC;AASnE,MAAM,MAAM,oBAAoB,GAAG,IAAI,CAAC,WAAW,EAAE,WAAW,GAAG,eAAe,CAAC,GACjF,IAAI,CAAC,eAAe,EAAE,eAAe,CAAC,CAAC;AAEzC,gHAAgH;AAChH,MAAM,WAAW,gBAAiB,SAAQ,eAAe;IACvD,oEAAoE;IACpE,MAAM,CAAC,KAAK,EAAE,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CACzC;AAED,mHAAmH;AACnH,wBAAsB,eAAe,CACnC,QAAQ,EAAE,QAAQ,EAClB,UAAU,EAAE,sBAAsB,EAClC,MAAM,EAAE,oBAAoB,EAC5B,GAAG,EAAE,MAAM,GACV,OAAO,CAAC,gBAAgB,CAAC,CAsB3B"}
|
|
@@ -1,38 +1,39 @@
|
|
|
1
1
|
import { ARCHIVER_DB_VERSION } from '@aztec-labs/archiver';
|
|
2
2
|
import { tryRmDir } from '@aztec-labs/foundation/fs';
|
|
3
|
-
import { createFileStore } from '@aztec-labs/stdlib/file-store';
|
|
4
3
|
import { uploadSnapshotToIndex } from '@aztec-labs/stdlib/snapshots';
|
|
5
4
|
import { WORLD_STATE_DB_VERSION } from '@aztec-labs/world-state';
|
|
6
5
|
import { mkdtemp } from 'fs/promises';
|
|
7
6
|
import { tmpdir } from 'os';
|
|
8
7
|
import { join } from 'path';
|
|
9
|
-
import { buildSnapshotMetadata } from './build-snapshot-metadata.js';
|
|
10
8
|
import { createBackups } from './create-backups.js';
|
|
11
|
-
/**
|
|
12
|
-
* Pauses the archiver and world state sync, creates backups of the archiver and world state lmdb environments,
|
|
13
|
-
* and uploads them to the specified location. Location must be a URL supported by our file store (eg `gs://bucketname/path`).
|
|
14
|
-
*/ export async function uploadSnapshot(location, archiver, worldState, config, log) {
|
|
15
|
-
const store = await createFileStore(location);
|
|
16
|
-
if (!store) {
|
|
17
|
-
throw new Error(`Failed to create file store for snapshot upload for location ${location}.`);
|
|
18
|
-
}
|
|
9
|
+
/** Captures consistent database copies and metadata, resuming syncing before returning. Use with `await using`. */ export async function captureSnapshot(archiver, worldState, config, log) {
|
|
19
10
|
const backupDir = await mkdtemp(join(config.dataDirectory ?? tmpdir(), 'snapshot-'));
|
|
11
|
+
const cleanup = async ()=>{
|
|
12
|
+
log.info(`Cleaning up backup dir ${backupDir}`, {
|
|
13
|
+
backupDir
|
|
14
|
+
});
|
|
15
|
+
await tryRmDir(backupDir, log);
|
|
16
|
+
};
|
|
20
17
|
try {
|
|
21
|
-
const paths = await createBackups(backupDir, archiver, worldState, log);
|
|
18
|
+
const { paths, metadata } = await createBackups(backupDir, archiver, worldState, config, log);
|
|
22
19
|
const versions = {
|
|
23
20
|
archiver: ARCHIVER_DB_VERSION,
|
|
24
21
|
worldState: WORLD_STATE_DB_VERSION
|
|
25
22
|
};
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
23
|
+
return {
|
|
24
|
+
async upload (store) {
|
|
25
|
+
log.info(`Uploading snapshot`, {
|
|
26
|
+
snapshot: metadata
|
|
27
|
+
});
|
|
28
|
+
const snapshot = await uploadSnapshotToIndex(paths, versions, metadata, store);
|
|
29
|
+
log.info(`Snapshot uploaded successfully`, {
|
|
30
|
+
snapshot
|
|
31
|
+
});
|
|
32
|
+
},
|
|
33
|
+
[Symbol.asyncDispose]: cleanup
|
|
34
|
+
};
|
|
35
|
+
} catch (err) {
|
|
36
|
+
await cleanup();
|
|
37
|
+
throw err;
|
|
37
38
|
}
|
|
38
39
|
}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@aztec-labs/node-lib",
|
|
3
|
-
"version": "6.1.0-nightly.
|
|
3
|
+
"version": "6.1.0-nightly.20261114",
|
|
4
4
|
"type": "module",
|
|
5
5
|
"typedocOptions": {
|
|
6
6
|
"entryPoints": [
|
|
@@ -65,20 +65,20 @@
|
|
|
65
65
|
]
|
|
66
66
|
},
|
|
67
67
|
"dependencies": {
|
|
68
|
-
"@aztec-labs/archiver": "6.1.0-nightly.
|
|
69
|
-
"@aztec-labs/blob-lib": "6.1.0-nightly.
|
|
70
|
-
"@aztec-labs/constants": "6.1.0-nightly.
|
|
71
|
-
"@aztec-labs/ethereum": "6.1.0-nightly.
|
|
72
|
-
"@aztec-labs/foundation": "6.1.0-nightly.
|
|
73
|
-
"@aztec-labs/kv-store": "6.1.0-nightly.
|
|
74
|
-
"@aztec-labs/p2p": "6.1.0-nightly.
|
|
75
|
-
"@aztec-labs/stdlib": "6.1.0-nightly.
|
|
76
|
-
"@aztec-labs/telemetry-client": "6.1.0-nightly.
|
|
77
|
-
"@aztec-labs/world-state": "6.1.0-nightly.
|
|
68
|
+
"@aztec-labs/archiver": "6.1.0-nightly.20261114",
|
|
69
|
+
"@aztec-labs/blob-lib": "6.1.0-nightly.20261114",
|
|
70
|
+
"@aztec-labs/constants": "6.1.0-nightly.20261114",
|
|
71
|
+
"@aztec-labs/ethereum": "6.1.0-nightly.20261114",
|
|
72
|
+
"@aztec-labs/foundation": "6.1.0-nightly.20261114",
|
|
73
|
+
"@aztec-labs/kv-store": "6.1.0-nightly.20261114",
|
|
74
|
+
"@aztec-labs/p2p": "6.1.0-nightly.20261114",
|
|
75
|
+
"@aztec-labs/stdlib": "6.1.0-nightly.20261114",
|
|
76
|
+
"@aztec-labs/telemetry-client": "6.1.0-nightly.20261114",
|
|
77
|
+
"@aztec-labs/world-state": "6.1.0-nightly.20261114",
|
|
78
78
|
"tslib": "^2.4.0"
|
|
79
79
|
},
|
|
80
80
|
"devDependencies": {
|
|
81
|
-
"@aztec-labs/node-keystore": "6.1.0-nightly.
|
|
81
|
+
"@aztec-labs/node-keystore": "6.1.0-nightly.20261114",
|
|
82
82
|
"@jest/globals": "^30.0.0",
|
|
83
83
|
"@types/jest": "^30.0.0",
|
|
84
84
|
"@types/node": "^22.15.17",
|
|
@@ -1,14 +1,20 @@
|
|
|
1
1
|
import type { Archiver } from '@aztec-labs/archiver';
|
|
2
2
|
import type { Logger } from '@aztec-labs/foundation/log';
|
|
3
|
+
import { allToCompletion } from '@aztec-labs/foundation/promise';
|
|
3
4
|
import type { WorldStateSynchronizer } from '@aztec-labs/stdlib/interfaces/server';
|
|
4
5
|
import type { SnapshotDataUrls } from '@aztec-labs/stdlib/snapshots';
|
|
5
6
|
import { existsSync } from 'fs';
|
|
6
7
|
import { join } from 'path/posix';
|
|
7
8
|
|
|
9
|
+
import { buildSnapshotMetadata } from './build-snapshot-metadata.js';
|
|
10
|
+
import type { UploadSnapshotConfig } from './upload-snapshot.js';
|
|
11
|
+
|
|
12
|
+
/** Copies both databases and captures their metadata while syncing is paused, then resumes syncing. */
|
|
8
13
|
export async function createBackups(
|
|
9
14
|
backupDir: string,
|
|
10
15
|
archiver: Archiver,
|
|
11
16
|
worldState: WorldStateSynchronizer,
|
|
17
|
+
config: UploadSnapshotConfig,
|
|
12
18
|
log: Logger,
|
|
13
19
|
) {
|
|
14
20
|
try {
|
|
@@ -17,7 +23,7 @@ export async function createBackups(
|
|
|
17
23
|
await worldState.stopSync();
|
|
18
24
|
|
|
19
25
|
log.info(`Creating backups of lmdb environments to ${backupDir}`);
|
|
20
|
-
const [archiverPath, worldStatePaths] = await
|
|
26
|
+
const [archiverPath, worldStatePaths] = await allToCompletion([
|
|
21
27
|
archiver.backupTo(join(backupDir, 'archiver')),
|
|
22
28
|
worldState.backupTo(join(backupDir, 'world-state')),
|
|
23
29
|
]);
|
|
@@ -28,8 +34,9 @@ export async function createBackups(
|
|
|
28
34
|
throw new Error(`Missing backup files: ${missing.map(([key, path]) => `${path} (${key})`).join(', ')}`);
|
|
29
35
|
}
|
|
30
36
|
|
|
37
|
+
const metadata = await buildSnapshotMetadata(archiver, config);
|
|
31
38
|
log.info(`Data stores backed up to ${backupDir}`, { paths });
|
|
32
|
-
return paths;
|
|
39
|
+
return { paths, metadata };
|
|
33
40
|
} catch (err) {
|
|
34
41
|
throw new Error(`Error creating backups for snapshot upload: ${err}`);
|
|
35
42
|
} finally {
|
|
@@ -6,8 +6,8 @@ import {
|
|
|
6
6
|
getArchiverSynchPoint,
|
|
7
7
|
} from '@aztec-labs/archiver';
|
|
8
8
|
import { INITIAL_L2_BLOCK_NUM } from '@aztec-labs/constants';
|
|
9
|
-
import { type EthereumClientConfig, getPublicClient } from '@aztec-labs/ethereum/client';
|
|
10
9
|
import type { L1ContractsConfig } from '@aztec-labs/ethereum/config';
|
|
10
|
+
import type { ViemPublicClient } from '@aztec-labs/ethereum/types';
|
|
11
11
|
import { BlockNumber } from '@aztec-labs/foundation/branded-types';
|
|
12
12
|
import type { EthAddress } from '@aztec-labs/foundation/eth-address';
|
|
13
13
|
import { tryRmDir } from '@aztec-labs/foundation/fs';
|
|
@@ -35,6 +35,7 @@ import {
|
|
|
35
35
|
type WorldStateConfig,
|
|
36
36
|
createWorldState,
|
|
37
37
|
getWorldStateHistoryStartCheckpoint,
|
|
38
|
+
resolveWorldStateHistoryRetention,
|
|
38
39
|
validateWorldStateHistory,
|
|
39
40
|
} from '@aztec-labs/world-state';
|
|
40
41
|
import { copyFile, mkdir, mkdtemp, readFile, rename, stat, unlink } from 'fs/promises';
|
|
@@ -51,8 +52,7 @@ type SnapshotSyncConfig = Pick<SharedNodeConfig, 'syncMode'> &
|
|
|
51
52
|
Pick<ArchiverConfig, 'archiverStoreMapSizeKb'> &
|
|
52
53
|
WorldStateConfig &
|
|
53
54
|
DataStoreConfig &
|
|
54
|
-
Required<Pick<DataStoreConfig, 'rollupAddress'>> &
|
|
55
|
-
EthereumClientConfig & {
|
|
55
|
+
Required<Pick<DataStoreConfig, 'rollupAddress'>> & {
|
|
56
56
|
snapshotsUrls?: string[];
|
|
57
57
|
minL1BlocksToTriggerReplace?: number;
|
|
58
58
|
};
|
|
@@ -60,8 +60,14 @@ type SnapshotSyncConfig = Pick<SharedNodeConfig, 'syncMode'> &
|
|
|
60
60
|
/**
|
|
61
61
|
* Validates local history and restores the newest compatible snapshot when bootstrap is needed.
|
|
62
62
|
* Fixed history boundaries are resolved against archived block and checkpoint metadata.
|
|
63
|
+
* @param l1Client - Reads the current L1 block, to decide whether the local archiver is far enough behind.
|
|
63
64
|
*/
|
|
64
|
-
export async function trySnapshotSync(
|
|
65
|
+
export async function trySnapshotSync(
|
|
66
|
+
config: SnapshotSyncConfig,
|
|
67
|
+
l1Client: Pick<ViemPublicClient, 'getBlockNumber'>,
|
|
68
|
+
log: Logger,
|
|
69
|
+
genesis?: GenesisData,
|
|
70
|
+
) {
|
|
65
71
|
const { syncMode, snapshotsUrls, dataDirectory, l1ChainId, rollupVersion, rollupAddress } = config;
|
|
66
72
|
const historyStartCheckpoint = getWorldStateHistoryStartCheckpoint(config);
|
|
67
73
|
let maxSnapshotBlock: BlockNumber | undefined;
|
|
@@ -120,7 +126,7 @@ export async function trySnapshotSync(config: SnapshotSyncConfig, log: Logger, g
|
|
|
120
126
|
return false;
|
|
121
127
|
}
|
|
122
128
|
|
|
123
|
-
const currentL1BlockNumber = await
|
|
129
|
+
const currentL1BlockNumber = await l1Client.getBlockNumber();
|
|
124
130
|
if (
|
|
125
131
|
historyStartCheckpoint === undefined &&
|
|
126
132
|
archiverL1BlockNumber &&
|
|
@@ -445,7 +451,7 @@ async function validateLocalWorldStateHistory(config: SnapshotSyncConfig, log: L
|
|
|
445
451
|
oldestHistoricBlock: summary.oldestHistoricalBlock,
|
|
446
452
|
latestBlock: summary.unfinalizedBlockNumber,
|
|
447
453
|
historyStartCheckpoint: getWorldStateHistoryStartCheckpoint(config),
|
|
448
|
-
historyRetention: config.worldStateHistoryRetention,
|
|
454
|
+
historyRetention: resolveWorldStateHistoryRetention(config.worldStateHistoryRetention),
|
|
449
455
|
});
|
|
450
456
|
} finally {
|
|
451
457
|
await worldState.close();
|
|
@@ -2,7 +2,7 @@ import { ARCHIVER_DB_VERSION, type Archiver } from '@aztec-labs/archiver';
|
|
|
2
2
|
import { tryRmDir } from '@aztec-labs/foundation/fs';
|
|
3
3
|
import type { Logger } from '@aztec-labs/foundation/log';
|
|
4
4
|
import type { ChainConfig } from '@aztec-labs/stdlib/config';
|
|
5
|
-
import {
|
|
5
|
+
import type { FileStore } from '@aztec-labs/stdlib/file-store';
|
|
6
6
|
import type { WorldStateSynchronizer } from '@aztec-labs/stdlib/interfaces/server';
|
|
7
7
|
import type { DataStoreConfig } from '@aztec-labs/stdlib/kv-store';
|
|
8
8
|
import { uploadSnapshotToIndex } from '@aztec-labs/stdlib/snapshots';
|
|
@@ -11,39 +11,43 @@ import { mkdtemp } from 'fs/promises';
|
|
|
11
11
|
import { tmpdir } from 'os';
|
|
12
12
|
import { join } from 'path';
|
|
13
13
|
|
|
14
|
-
import { buildSnapshotMetadata } from './build-snapshot-metadata.js';
|
|
15
14
|
import { createBackups } from './create-backups.js';
|
|
16
15
|
|
|
17
16
|
export type UploadSnapshotConfig = Pick<ChainConfig, 'l1ChainId' | 'rollupVersion'> &
|
|
18
17
|
Pick<DataStoreConfig, 'dataDirectory'>;
|
|
19
18
|
|
|
20
|
-
/**
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
19
|
+
/** Local database copies and frozen metadata, owned until asynchronous disposal removes the temporary files. */
|
|
20
|
+
export interface CapturedSnapshot extends AsyncDisposable {
|
|
21
|
+
/** Publishes the captured data and its index entry to the store. */
|
|
22
|
+
upload(store: FileStore): Promise<void>;
|
|
23
|
+
}
|
|
24
|
+
|
|
25
|
+
/** Captures consistent database copies and metadata, resuming syncing before returning. Use with `await using`. */
|
|
26
|
+
export async function captureSnapshot(
|
|
26
27
|
archiver: Archiver,
|
|
27
28
|
worldState: WorldStateSynchronizer,
|
|
28
29
|
config: UploadSnapshotConfig,
|
|
29
30
|
log: Logger,
|
|
30
|
-
) {
|
|
31
|
-
const store = await createFileStore(location);
|
|
32
|
-
if (!store) {
|
|
33
|
-
throw new Error(`Failed to create file store for snapshot upload for location ${location}.`);
|
|
34
|
-
}
|
|
35
|
-
|
|
31
|
+
): Promise<CapturedSnapshot> {
|
|
36
32
|
const backupDir = await mkdtemp(join(config.dataDirectory ?? tmpdir(), 'snapshot-'));
|
|
33
|
+
const cleanup = async () => {
|
|
34
|
+
log.info(`Cleaning up backup dir ${backupDir}`, { backupDir });
|
|
35
|
+
await tryRmDir(backupDir, log);
|
|
36
|
+
};
|
|
37
37
|
|
|
38
38
|
try {
|
|
39
|
-
const paths = await createBackups(backupDir, archiver, worldState, log);
|
|
39
|
+
const { paths, metadata } = await createBackups(backupDir, archiver, worldState, config, log);
|
|
40
40
|
const versions = { archiver: ARCHIVER_DB_VERSION, worldState: WORLD_STATE_DB_VERSION };
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
41
|
+
return {
|
|
42
|
+
async upload(store: FileStore): Promise<void> {
|
|
43
|
+
log.info(`Uploading snapshot`, { snapshot: metadata });
|
|
44
|
+
const snapshot = await uploadSnapshotToIndex(paths, versions, metadata, store);
|
|
45
|
+
log.info(`Snapshot uploaded successfully`, { snapshot });
|
|
46
|
+
},
|
|
47
|
+
[Symbol.asyncDispose]: cleanup,
|
|
48
|
+
};
|
|
49
|
+
} catch (err) {
|
|
50
|
+
await cleanup();
|
|
51
|
+
throw err;
|
|
48
52
|
}
|
|
49
53
|
}
|