@aztec-labs/world-state 6.0.0-rc.3 → 6.0.0-rc.4
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/README.md +24 -0
- package/dest/native/ipc_world_state_instance.d.ts +2 -1
- package/dest/native/ipc_world_state_instance.d.ts.map +1 -1
- package/dest/native/ipc_world_state_instance.js +20 -1
- package/dest/native/merkle_trees_facade.d.ts +2 -1
- package/dest/native/merkle_trees_facade.d.ts.map +1 -1
- package/dest/native/merkle_trees_facade.js +1 -0
- package/dest/native/native_world_state.d.ts +1 -1
- package/dest/native/native_world_state.d.ts.map +1 -1
- package/dest/native/native_world_state.js +1 -0
- package/dest/synchronizer/config.d.ts +14 -3
- package/dest/synchronizer/config.d.ts.map +1 -1
- package/dest/synchronizer/config.js +47 -4
- package/dest/synchronizer/factory.d.ts +1 -1
- package/dest/synchronizer/factory.d.ts.map +1 -1
- package/dest/synchronizer/factory.js +2 -1
- package/dest/synchronizer/history.d.ts +9 -0
- package/dest/synchronizer/history.d.ts.map +1 -0
- package/dest/synchronizer/history.js +35 -0
- package/dest/synchronizer/index.d.ts +2 -1
- package/dest/synchronizer/index.d.ts.map +1 -1
- package/dest/synchronizer/index.js +1 -0
- package/dest/synchronizer/server_world_state_synchronizer.d.ts +1 -3
- package/dest/synchronizer/server_world_state_synchronizer.d.ts.map +1 -1
- package/dest/synchronizer/server_world_state_synchronizer.js +22 -12
- package/package.json +10 -10
- package/src/native/ipc_world_state_instance.ts +22 -1
- package/src/native/merkle_trees_facade.ts +1 -0
- package/src/native/native_world_state.ts +1 -0
- package/src/synchronizer/config.ts +47 -7
- package/src/synchronizer/factory.ts +2 -1
- package/src/synchronizer/history.ts +53 -0
- package/src/synchronizer/index.ts +1 -0
- package/src/synchronizer/server_world_state_synchronizer.ts +24 -17
package/README.md
CHANGED
|
@@ -33,6 +33,30 @@ Once a new block is received, the synchronizer checks the uncommitted root value
|
|
|
33
33
|
|
|
34
34
|
The interface to the Merkle Tree DB offers a unified asynchronous API to the set of trees available. Reads from the Merkle Trees need to be marked as to whether they should include uncommitted state. For this reason, the MerkleTreeReadOperationsFacade exists to abstract this detail away from the end consumer.
|
|
35
35
|
|
|
36
|
+
### History retention
|
|
37
|
+
|
|
38
|
+
`WS_HISTORY_RETENTION` (CLI: `--world-state-history-retention`) selects one history retention policy:
|
|
39
|
+
|
|
40
|
+
- `rolling:N` retains the latest N finalized checkpoints and all newer state. The default is `rolling:64`.
|
|
41
|
+
- `pinned:N` retains every block in checkpoint N and every later checkpoint permanently.
|
|
42
|
+
- `archive` retains all history from genesis and disables history pruning.
|
|
43
|
+
|
|
44
|
+
Rolling counts and pinned checkpoint numbers must be positive integers. Pruning preserves complete checkpoints and always
|
|
45
|
+
retains the checkpoint containing the finalized tip. A future pin prunes to the finalized checkpoint until the pin is reached,
|
|
46
|
+
then keeps that boundary fixed.
|
|
47
|
+
|
|
48
|
+
Increasing a rolling window accumulates more history as the chain advances; it does not require an existing database or
|
|
49
|
+
snapshot to contain that history already. Pinned and archive modes reject a database missing required history, including
|
|
50
|
+
with `SYNC_MODE=force-snapshot`. Use a fresh world-state database to rebuild missing history.
|
|
51
|
+
|
|
52
|
+
When bootstrapping a fresh database in pinned mode, snapshot sync tries compatible snapshots in checkpoint N or earlier,
|
|
53
|
+
newest first. Snapshot block numbers are mapped to checkpoints using the archived metadata. Missing or incompatible
|
|
54
|
+
snapshots are skipped. If none can be used, the node rebuilds from genesis. Archive mode starts from genesis unless a
|
|
55
|
+
snapshot contains full history from genesis. `SYNC_MODE=full` always skips snapshot downloads.
|
|
56
|
+
|
|
57
|
+
The former `WS_NUM_HISTORIC_CHECKPOINTS` and `WS_NUM_HISTORIC_BLOCKS` settings are removed. Replace positive values N with
|
|
58
|
+
`WS_HISTORY_RETENTION=rolling:N`, and values below 1 with `WS_HISTORY_RETENTION=archive`.
|
|
59
|
+
|
|
36
60
|
# Building/Testing
|
|
37
61
|
|
|
38
62
|
Building the package is as simple as calling `yarn build` from the package root.
|
|
@@ -5,6 +5,7 @@ import { type Logger, type LoggerBindings } from '@aztec-labs/foundation/log';
|
|
|
5
5
|
import type { IndexedTreeId, TreeInfo } from '@aztec-labs/stdlib/interfaces/server';
|
|
6
6
|
import { MerkleTreeId } from '@aztec-labs/stdlib/trees';
|
|
7
7
|
import type { GenesisData, WorldStateRevision } from '@aztec-labs/stdlib/world-state';
|
|
8
|
+
import { Buffer } from 'buffer';
|
|
8
9
|
import type { WorldStateInstrumentation } from '../instrumentation/instrumentation.js';
|
|
9
10
|
import type { WorldStateTreeMapSizes } from '../synchronizer/factory.js';
|
|
10
11
|
import type { BlockStateReference, SerializedBatchInsertionResult, SerializedIndexedLeaf, SerializedLeafValue, SerializedSequentialInsertionResult, SerializedSiblingPathAndIndex, TreeStateReference, WorldStateStatusFull, WorldStateStatusSummary } from './message.js';
|
|
@@ -88,4 +89,4 @@ export declare function getWsdbOptions(dataDir: string, wsTreeMapSizes: WorldSta
|
|
|
88
89
|
mapSizes: Record<number, number>;
|
|
89
90
|
initialHeaderGeneratorPoint: number;
|
|
90
91
|
};
|
|
91
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
92
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaXBjX3dvcmxkX3N0YXRlX2luc3RhbmNlLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvbmF0aXZlL2lwY193b3JsZF9zdGF0ZV9pbnN0YW5jZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFDQSxPQUFPLEVBQVksV0FBVyxFQUFFLE1BQU0sd0JBQXdCLENBQUM7QUFzQi9ELE9BQU8sS0FBSyxFQUFFLFdBQVcsRUFBRSxNQUFNLHNDQUFzQyxDQUFDO0FBRXhFLE9BQU8sS0FBSyxFQUFFLEVBQUUsRUFBRSxNQUFNLHFDQUFxQyxDQUFDO0FBQzlELE9BQU8sRUFBRSxLQUFLLE1BQU0sRUFBRSxLQUFLLGNBQWMsRUFBZ0IsTUFBTSw0QkFBNEIsQ0FBQztBQUM1RixPQUFPLEtBQUssRUFBRSxhQUFhLEVBQUUsUUFBUSxFQUFFLE1BQU0sc0NBQXNDLENBQUM7QUFDcEYsT0FBTyxFQUFFLFlBQVksRUFBRSxNQUFNLDBCQUEwQixDQUFDO0FBQ3hELE9BQU8sS0FBSyxFQUFFLFdBQVcsRUFBRSxrQkFBa0IsRUFBRSxNQUFNLGdDQUFnQyxDQUFDO0FBQ3RGLE9BQU8sRUFBRSxNQUFNLEVBQUUsTUFBTSxRQUFRLENBQUM7QUFHaEMsT0FBTyxLQUFLLEVBQUUseUJBQXlCLEVBQUUsTUFBTSx1Q0FBdUMsQ0FBQztBQUN2RixPQUFPLEtBQUssRUFBRSxzQkFBc0IsRUFBRSxNQUFNLDRCQUE0QixDQUFDO0FBQ3pFLE9BQU8sS0FBSyxFQUNWLG1CQUFtQixFQUVuQiw4QkFBOEIsRUFDOUIscUJBQXFCLEVBQ3JCLG1CQUFtQixFQUNuQixtQ0FBbUMsRUFDbkMsNkJBQTZCLEVBRzdCLGtCQUFrQixFQUdsQixvQkFBb0IsRUFDcEIsdUJBQXVCLEVBQ3hCLE1BQU0sY0FBYyxDQUFDO0FBQ3RCLE9BQU8sS0FBSyxFQUFFLHdCQUF3QixFQUFFLE1BQU0sa0NBQWtDLENBQUM7QUE2U2pGOzs7O0dBSUc7QUFDSCxxQkFBYSxhQUFjLFlBQVcsd0JBQXdC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
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ipc_world_state_instance.d.ts","sourceRoot":"","sources":["../../src/native/ipc_world_state_instance.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"ipc_world_state_instance.d.ts","sourceRoot":"","sources":["../../src/native/ipc_world_state_instance.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,10 @@
|
|
|
1
|
+
import { IpcProcessExitedError } from '@aztec-foundation/ipc-runtime';
|
|
1
2
|
import { WsdbService } from '@aztec-foundation/wsdb';
|
|
2
3
|
import { ARCHIVE_HEIGHT, DomainSeparator, L1_TO_L2_MSG_TREE_HEIGHT, MAX_NULLIFIERS_PER_TX, MAX_TOTAL_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX, NOTE_HASH_TREE_HEIGHT, NULLIFIER_TREE_HEIGHT, PUBLIC_DATA_TREE_HEIGHT } from '@aztec-labs/constants';
|
|
4
|
+
import { getEnv } from '@aztec-labs/foundation/config/env';
|
|
3
5
|
import { createLogger } from '@aztec-labs/foundation/log';
|
|
4
6
|
import { MerkleTreeId } from '@aztec-labs/stdlib/trees';
|
|
7
|
+
import { Buffer } from 'buffer';
|
|
5
8
|
import { cpus } from 'node:os';
|
|
6
9
|
// ————— Request conversion helpers —————
|
|
7
10
|
function toWsdbRevision(rev) {
|
|
@@ -272,7 +275,7 @@ function convertStatusFull(s) {
|
|
|
272
275
|
* initializes its database, so spawn resolves as soon as the socket is up and the first calls block
|
|
273
276
|
* until initialization completes.
|
|
274
277
|
*/ static async spawn(dataDir, wsTreeMapSizes, genesis, instrumentation, bindings, threads = getWsdbThreadCount()) {
|
|
275
|
-
const transport =
|
|
278
|
+
const transport = getEnv().WSDB_TRANSPORT === 'shm' ? 'shm' : 'uds';
|
|
276
279
|
const wsdb = await WsdbService.spawn({
|
|
277
280
|
transport,
|
|
278
281
|
extraArgs: getWsdbExtraArgs(dataDir, wsTreeMapSizes, genesis, threads),
|
|
@@ -639,11 +642,27 @@ function convertStatusFull(s) {
|
|
|
639
642
|
this.instrumentation.recordRoundTrip(durationMs * 1000, operation);
|
|
640
643
|
return response;
|
|
641
644
|
} catch (error) {
|
|
645
|
+
if (error instanceof IpcProcessExitedError) {
|
|
646
|
+
exitOnWsdbDeath(operation, error, this.log);
|
|
647
|
+
}
|
|
642
648
|
this.log.error(`Call ${operation} failed: ${error}`, error);
|
|
643
649
|
throw error;
|
|
644
650
|
}
|
|
645
651
|
}
|
|
646
652
|
}
|
|
653
|
+
/**
|
|
654
|
+
* Exits the process because wsdb died under it. wsdb holds the forks and uncommitted state every caller depends on,
|
|
655
|
+
* so a respawn would leave them dangling and nothing can continue: crash like the in-process world state did, and let
|
|
656
|
+
* the orchestrator restart the node. Every wsdb call funnels through {@link IpcWorldState.send}, so this is the one
|
|
657
|
+
* place that needs it; it moves to the IPC backend's `exitOnDeath` option once callers use the wsdb API directly.
|
|
658
|
+
*/ function exitOnWsdbDeath(operation, error, log) {
|
|
659
|
+
log.fatal(`World state database process died during ${operation}; exiting`, error, {
|
|
660
|
+
code: error.code,
|
|
661
|
+
signal: error.signal,
|
|
662
|
+
logPath: error.logPath
|
|
663
|
+
});
|
|
664
|
+
process.exit(1);
|
|
665
|
+
}
|
|
647
666
|
/**
|
|
648
667
|
* Helper to create WsdbOptions from standard world state config.
|
|
649
668
|
* Returns the options needed to construct a wsdb service command line.
|
|
@@ -6,6 +6,7 @@ import type { BatchInsertionResult, IndexedTreeId, MerkleTreeLeafType, MerkleTre
|
|
|
6
6
|
import { MerkleTreeId, NullifierLeaf, PublicDataTreeLeaf } from '@aztec-labs/stdlib/trees';
|
|
7
7
|
import { type BlockHeader, StateReference } from '@aztec-labs/stdlib/tx';
|
|
8
8
|
import type { WorldStateRevision } from '@aztec-labs/stdlib/world-state';
|
|
9
|
+
import { Buffer } from 'buffer';
|
|
9
10
|
import { type SerializedLeafValue } from './message.js';
|
|
10
11
|
import type { NativeWorldStateInstance } from './native_world_state_instance.js';
|
|
11
12
|
export declare class MerkleTreesFacade implements MerkleTreeReadOperations {
|
|
@@ -55,4 +56,4 @@ export declare class MerkleTreesForkFacade extends MerkleTreesFacade implements
|
|
|
55
56
|
revertAllCheckpointsTo(depth: number): Promise<void>;
|
|
56
57
|
}
|
|
57
58
|
export declare function serializeLeaf(leaf: Fr | BlockHash | NullifierLeaf | PublicDataTreeLeaf): SerializedLeafValue;
|
|
58
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
59
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibWVya2xlX3RyZWVzX2ZhY2FkZS5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL25hdGl2ZS9tZXJrbGVfdHJlZXNfZmFjYWRlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxXQUFXLEVBQUUsTUFBTSxzQ0FBc0MsQ0FBQztBQUNuRSxPQUFPLEVBQUUsRUFBRSxFQUFFLE1BQU0scUNBQXFDLENBQUM7QUFJekQsT0FBTyxFQUFFLEtBQUssdUJBQXVCLEVBQUUsV0FBVyxFQUFFLE1BQU0sOEJBQThCLENBQUM7QUFDekYsT0FBTyxFQUFFLFNBQVMsRUFBRSxNQUFNLDBCQUEwQixDQUFDO0FBQ3JELE9BQU8sS0FBSyxFQUNWLG9CQUFvQixFQUNwQixhQUFhLEVBQ2Isa0JBQWtCLEVBQ2xCLHdCQUF3QixFQUN4Qix5QkFBeUIsRUFDekIseUJBQXlCLEVBQ3pCLFFBQVEsRUFDVCxNQUFNLHNDQUFzQyxDQUFDO0FBQzlDLE9BQU8sRUFDTCxZQUFZLEVBQ1osYUFBYSxFQUViLGtCQUFrQixFQUVuQixNQUFNLDBCQUEwQixDQUFDO0FBQ2xDLE9BQU8sRUFBRSxLQUFLLFdBQVcsRUFBeUIsY0FBYyxFQUFFLE1BQU0sdUJBQXVCLENBQUM7QUFDaEcsT0FBTyxLQUFLLEVBQUUsa0JBQWtCLEVBQUUsTUFBTSxnQ0FBZ0MsQ0FBQztBQUV6RSxPQUFPLEVBQUUsTUFBTSxFQUFFLE1BQU0sUUFBUSxDQUFDO0FBRWhDLE9BQU8sRUFFTCxLQUFLLG1CQUFtQixFQUd6QixNQUFNLGNBQWMsQ0FBQztBQUN0QixPQUFPLEtBQUssRUFBRSx3QkFBd0IsRUFBRSxNQUFNLGtDQUFrQyxDQUFDO0FBRWpGLHFCQUFhLGlCQUFrQixZQUFXLHdCQUF3QjtJQUU5RCxTQUFTLENBQUMsUUFBUSxDQUFDLFFBQVEsRUFBRSx3QkFBd0I7SUFDckQsU0FBUyxDQUFDLFFBQVEsQ0FBQyxhQUFhLEVBQUUsV0FBVztJQUM3QyxTQUFTLENBQUMsUUFB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
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"merkle_trees_facade.d.ts","sourceRoot":"","sources":["../../src/native/merkle_trees_facade.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,sCAAsC,CAAC;AACnE,OAAO,EAAE,EAAE,EAAE,MAAM,qCAAqC,CAAC;AAIzD,OAAO,EAAE,KAAK,uBAAuB,EAAE,WAAW,EAAE,MAAM,8BAA8B,CAAC;AACzF,OAAO,EAAE,SAAS,EAAE,MAAM,0BAA0B,CAAC;AACrD,OAAO,KAAK,EACV,oBAAoB,EACpB,aAAa,EACb,kBAAkB,EAClB,wBAAwB,EACxB,yBAAyB,EACzB,yBAAyB,EACzB,QAAQ,EACT,MAAM,sCAAsC,CAAC;AAC9C,OAAO,EACL,YAAY,EACZ,aAAa,EAEb,kBAAkB,EAEnB,MAAM,0BAA0B,CAAC;AAClC,OAAO,EAAE,KAAK,WAAW,EAAyB,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAChG,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,gCAAgC,CAAC;
|
|
1
|
+
{"version":3,"file":"merkle_trees_facade.d.ts","sourceRoot":"","sources":["../../src/native/merkle_trees_facade.ts"],"names":[],"mappings":"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"}
|
|
@@ -9,6 +9,7 @@ import { BlockHash } from '@aztec-labs/stdlib/block';
|
|
|
9
9
|
import { MerkleTreeId, NullifierLeaf, NullifierLeafPreimage, PublicDataTreeLeaf, PublicDataTreeLeafPreimage } from '@aztec-labs/stdlib/trees';
|
|
10
10
|
import { PartialStateReference, StateReference } from '@aztec-labs/stdlib/tx';
|
|
11
11
|
import assert from 'assert';
|
|
12
|
+
import { Buffer } from 'buffer';
|
|
12
13
|
import { blockStateReference, treeStateReferenceToSnapshot } from './message.js';
|
|
13
14
|
export class MerkleTreesFacade {
|
|
14
15
|
instance;
|
|
@@ -74,4 +74,4 @@ export declare class NativeWorldStateService implements MerkleTreeDatabase {
|
|
|
74
74
|
backupTo(dstPath: string, compact?: boolean): Promise<Record<Exclude<SnapshotDataKeys, 'archiver'>, string>>;
|
|
75
75
|
}
|
|
76
76
|
export declare const NATIVE_WORLD_STATE_DBS: readonly [readonly ["l1-to-l2-message-tree", "L1ToL2MessageTree"], readonly ["archive-tree", "ArchiveTree"], readonly ["public-data-tree", "PublicDataTree"], readonly ["note-hash-tree", "NoteHashTree"], readonly ["nullifier-tree", "NullifierTree"]];
|
|
77
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
77
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibmF0aXZlX3dvcmxkX3N0YXRlLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvbmF0aXZlL25hdGl2ZV93b3JsZF9zdGF0ZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFDQSxPQUFPLEVBQUUsV0FBVyxFQUFFLE1BQU0sc0NBQXNDLENBQUM7QUFFbkUsT0FBTyxFQUFFLEVBQUUsRUFBRSxNQUFNLHFDQUFxQyxDQUFDO0FBQ3pELE9BQU8sRUFBRSxVQUFVLEVBQUUsTUFBTSxvQ0FBb0MsQ0FBQztBQUNoRSxPQUFPLEVBQUUsS0FBSyxNQUFNLEVBQUUsS0FBSyxjQUFjLEVBQWdCLE1BQU0sNEJBQTRCLENBQUM7QUFFNUYsT0FBTyxLQUFLLEVBQUUsT0FBTyxFQUFFLE1BQU0sMEJBQTBCLENBQUM7QUFFeEQsT0FBTyxLQUFLLEVBQ1YsYUFBYSxFQUNiLHdCQUF3QixFQUN4Qix5QkFBeUIsRUFDMUIsTUFBTSxzQ0FBc0MsQ0FBQztBQUM5QyxPQUFPLEtBQUssRUFBRSxnQkFBZ0IsRUFBRSxNQUFNLDhCQUE4QixDQUFDO0FBQ3JFLE9BQU8sRUFBK0IsS0FBSyxxQkFBcUIsRUFBc0IsTUFBTSwwQkFBMEIsQ0FBQztBQUN2SCxPQUFPLEVBQUUsV0FBVyxFQUEwRCxNQUFNLHVCQUF1QixDQUFDO0FBQzVHLE9BQU8sRUFBRSxLQUFLLFdBQVcsRUFBc0IsTUFBTSxnQ0FBZ0MsQ0FBQztBQU90RixPQUFPLEVBQUUseUJBQXlCLEVBQUUsTUFBTSx1Q0FBdUMsQ0FBQztBQUNsRixPQUFPLEtBQUssRUFBRSxzQkFBc0IsRUFBRSxNQUFNLDRCQUE0QixDQUFDO0FBQ3pFLE9BQU8sS0FBSyxFQUFFLHVCQUF1QixJQUFJLGtCQUFrQixFQUFFLE1BQU0scUNBQXFDLENBQUM7QUFDekcsT0FBTyxFQUFFLGFBQWEsRUFBRSxNQUFNLCtCQUErQixDQUFDO0FBRTlELE9BQU8sRUFDTCxLQUFLLG9CQUFvQixFQUN6QixLQUFLLHVCQUF1QixFQUs3QixN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
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"native_world_state.d.ts","sourceRoot":"","sources":["../../src/native/native_world_state.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,MAAM,sCAAsC,CAAC;AAEnE,OAAO,EAAE,EAAE,EAAE,MAAM,qCAAqC,CAAC;AACzD,OAAO,EAAE,UAAU,EAAE,MAAM,oCAAoC,CAAC;AAChE,OAAO,EAAE,KAAK,MAAM,EAAE,KAAK,cAAc,EAAgB,MAAM,4BAA4B,CAAC;AAE5F,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,0BAA0B,CAAC;AAExD,OAAO,KAAK,EACV,aAAa,EACb,wBAAwB,EACxB,yBAAyB,EAC1B,MAAM,sCAAsC,CAAC;AAC9C,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,8BAA8B,CAAC;AACrE,OAAO,EAA+B,KAAK,qBAAqB,EAAsB,MAAM,0BAA0B,CAAC;AACvH,OAAO,EAAE,WAAW,EAA0D,MAAM,uBAAuB,CAAC;AAC5G,OAAO,EAAE,KAAK,WAAW,EAAsB,MAAM,gCAAgC,CAAC;AAOtF,OAAO,EAAE,yBAAyB,EAAE,MAAM,uCAAuC,CAAC;AAClF,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,4BAA4B,CAAC;AACzE,OAAO,KAAK,EAAE,uBAAuB,IAAI,kBAAkB,EAAE,MAAM,qCAAqC,CAAC;AACzG,OAAO,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAC;AAE9D,OAAO,EACL,KAAK,oBAAoB,EACzB,KAAK,uBAAuB,EAK7B,MAAM,cAAc,CAAC;AACtB,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,kCAAkC,CAAC;AAIjF,eAAO,MAAM,sBAAsB,IAAI,CAAC;AAExC,eAAO,MAAM,eAAe,gBAAgB,CAAC;AAE7C,qBAAa,uBAAwB,YAAW,kBAAkB;IAM9D,SAAS,CAAC,QAAQ,EAAE,wBAAwB;IAC5C,SAAS,CAAC,QAAQ,CAAC,yBAAyB,EAAE,yBAAyB;IACvE,SAAS,CAAC,QAAQ,CAAC,GAAG,EAAE,MAAM;IAC9B,OAAO,CAAC,QAAQ,CAAC,OAAO;IACxB,OAAO,CAAC,QAAQ,CAAC,OAAO;IACxB,+DAA+D;IAC/D,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAC;IAXpC,SAAS,CAAC,aAAa,EAAE,WAAW,GAAG,SAAS,CAAC;IAEjD,OAAO,CAAC,mBAAmB,CAAsC;IAEjE,SAAS,aACG,QAAQ,EAAE,wBAAwB,EACzB,yBAAyB,EAAE,yBAAyB,EACpD,GAAG,EAAE,MAAM,EACb,OAAO,GAAE,WAAkC,EAC3C,OAAO,sBAA0B;IAClD,+DAA+D;IAC9C,gBAAgB,CAAC,uDAAyC,EACzE;IAEJ,OAAa,GAAG,CACd,aAAa,EAAE,UAAU,EACzB,OAAO,EAAE,MAAM,EACf,cAAc,EAAE,sBAAsB,EACtC,OAAO,GAAE,WAAkC,EAC3C,eAAe,4BAAsD,EACrE,QAAQ,CAAC,EAAE,cAAc,EACzB,OAAO,sBAA0B,GAChC,OAAO,CAAC,uBAAuB,CAAC,
|
|
1
|
+
{"version":3,"file":"native_world_state.d.ts","sourceRoot":"","sources":["../../src/native/native_world_state.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,MAAM,sCAAsC,CAAC;AAEnE,OAAO,EAAE,EAAE,EAAE,MAAM,qCAAqC,CAAC;AACzD,OAAO,EAAE,UAAU,EAAE,MAAM,oCAAoC,CAAC;AAChE,OAAO,EAAE,KAAK,MAAM,EAAE,KAAK,cAAc,EAAgB,MAAM,4BAA4B,CAAC;AAE5F,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,0BAA0B,CAAC;AAExD,OAAO,KAAK,EACV,aAAa,EACb,wBAAwB,EACxB,yBAAyB,EAC1B,MAAM,sCAAsC,CAAC;AAC9C,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,8BAA8B,CAAC;AACrE,OAAO,EAA+B,KAAK,qBAAqB,EAAsB,MAAM,0BAA0B,CAAC;AACvH,OAAO,EAAE,WAAW,EAA0D,MAAM,uBAAuB,CAAC;AAC5G,OAAO,EAAE,KAAK,WAAW,EAAsB,MAAM,gCAAgC,CAAC;AAOtF,OAAO,EAAE,yBAAyB,EAAE,MAAM,uCAAuC,CAAC;AAClF,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,4BAA4B,CAAC;AACzE,OAAO,KAAK,EAAE,uBAAuB,IAAI,kBAAkB,EAAE,MAAM,qCAAqC,CAAC;AACzG,OAAO,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAC;AAE9D,OAAO,EACL,KAAK,oBAAoB,EACzB,KAAK,uBAAuB,EAK7B,MAAM,cAAc,CAAC;AACtB,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,kCAAkC,CAAC;AAIjF,eAAO,MAAM,sBAAsB,IAAI,CAAC;AAExC,eAAO,MAAM,eAAe,gBAAgB,CAAC;AAE7C,qBAAa,uBAAwB,YAAW,kBAAkB;IAM9D,SAAS,CAAC,QAAQ,EAAE,wBAAwB;IAC5C,SAAS,CAAC,QAAQ,CAAC,yBAAyB,EAAE,yBAAyB;IACvE,SAAS,CAAC,QAAQ,CAAC,GAAG,EAAE,MAAM;IAC9B,OAAO,CAAC,QAAQ,CAAC,OAAO;IACxB,OAAO,CAAC,QAAQ,CAAC,OAAO;IACxB,+DAA+D;IAC/D,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAC;IAXpC,SAAS,CAAC,aAAa,EAAE,WAAW,GAAG,SAAS,CAAC;IAEjD,OAAO,CAAC,mBAAmB,CAAsC;IAEjE,SAAS,aACG,QAAQ,EAAE,wBAAwB,EACzB,yBAAyB,EAAE,yBAAyB,EACpD,GAAG,EAAE,MAAM,EACb,OAAO,GAAE,WAAkC,EAC3C,OAAO,sBAA0B;IAClD,+DAA+D;IAC9C,gBAAgB,CAAC,uDAAyC,EACzE;IAEJ,OAAa,GAAG,CACd,aAAa,EAAE,UAAU,EACzB,OAAO,EAAE,MAAM,EACf,cAAc,EAAE,sBAAsB,EACtC,OAAO,GAAE,WAAkC,EAC3C,eAAe,4BAAsD,EACrE,QAAQ,CAAC,EAAE,cAAc,EACzB,OAAO,sBAA0B,GAChC,OAAO,CAAC,uBAAuB,CAAC,CAmClC;IAED,OAAa,GAAG,CACd,aAAa,UAAO,EACpB,OAAO,GAAE,WAAkC,EAC3C,eAAe,4BAAsD,EACrE,QAAQ,CAAC,EAAE,cAAc,EACzB,OAAO,CAAC,EAAE,MAAM,GACf,OAAO,CAAC,uBAAuB,CAAC,CAiDlC;IAED,MAAM,CAAC,SAAS,CACd,OAAO,GAAE,WAAkC,EAC3C,eAAe,4BAAsD,EACrE,QAAQ,CAAC,EAAE,cAAc,GACxB,OAAO,CAAC,uBAAuB,CAAC,CAMlC;IAED,OAAa,OAAO,CAClB,WAAW,EAAE,qBAAqB,CAAC,OAAO,aAAa,CAAC,CAAC,CAAC,CAAC,EAC3D,eAAe,4BAAsD,EACrE,QAAQ,CAAC,EAAE,cAAc,EACzB,OAAO,GAAE,WAAkC,EAC3C,OAAO,sBAA0B,EACjC,gBAAgB,CAAC,EAAE,MAAM,OAAO,CAAC,wBAAwB,CAAC,GACzD,OAAO,CAAC,uBAAuB,CAAC,CAMlC;IAED,UAAgB,IAAI,kBAmBnB;IAEY,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CAUlC;IAED,wEAAwE;IACjE,UAAU,IAAI,MAAM,CAK1B;IAEM,YAAY,IAAI,wBAAwB,CAE9C;IAEM,WAAW,CAAC,WAAW,EAAE,WAAW,GAAG,wBAAwB,CAMrE;IAEY,IAAI,CACf,WAAW,CAAC,EAAE,WAAW,EACzB,IAAI,GAAE;QAAE,YAAY,CAAC,EAAE,MAAM,CAAA;KAAO,GACnC,OAAO,CAAC,yBAAyB,CAAC,CAepC;IAEM,gBAAgB,IAAI,WAAW,CAErC;IAEY,wBAAwB,CAAC,OAAO,EAAE,OAAO,EAAE,cAAc,EAAE,EAAE,EAAE,GAAG,OAAO,CAAC,oBAAoB,CAAC,CA0C3G;IAEY,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CAMlC;IAEK,CAAC,MAAM,CAAC,YAAY,CAAC,IAAI,OAAO,CAAC,IAAI,CAAC,CAE3C;YAEa,kBAAkB;IAQhC,OAAO,CAAC,+BAA+B;IAMvC,OAAO,CAAC,uBAAuB;IAM/B,OAAO,CAAC,mBAAmB;IAI3B;;;;OAIG;IACU,YAAY,CAAC,aAAa,EAAE,WAAW,oCASnD;IAED;;;;OAIG;IACU,sBAAsB,CAAC,aAAa,EAAE,WAAW,iCAQ7D;IAED;;;;OAIG;IACU,YAAY,CAAC,aAAa,EAAE,WAAW,iCAQnD;IAEY,gBAAgB,qCAK5B;IAED,UAAU,CAAC,EAAE,SAAS,aAAa,EACjC,OAAO,EAAE,EAAE,EACX,KAAK,EAAE,qBAAqB,GAAG,MAAM,EACrC,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,IAAI,CAAC,CAEf;YAEa,wBAAwB;IAazB,QAAQ,CACnB,OAAO,EAAE,MAAM,EACf,OAAO,GAAE,OAAc,GACtB,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,gBAAgB,EAAE,UAAU,CAAC,EAAE,MAAM,CAAC,CAAC,CAGhE;CACF;AAGD,eAAO,MAAM,sBAAsB,0PAMzB,CAAC"}
|
|
@@ -1,4 +1,15 @@
|
|
|
1
|
+
import { CheckpointNumber } from '@aztec-labs/foundation/branded-types';
|
|
1
2
|
import { type ConfigMappingsType } from '@aztec-labs/foundation/config';
|
|
3
|
+
/** Controls whether world-state history follows the finalized tip or retains a fixed checkpoint boundary. */
|
|
4
|
+
export type WorldStateHistoryRetention = {
|
|
5
|
+
type: 'rolling';
|
|
6
|
+
checkpoints: number;
|
|
7
|
+
} | {
|
|
8
|
+
type: 'pinned';
|
|
9
|
+
checkpoint: CheckpointNumber;
|
|
10
|
+
} | {
|
|
11
|
+
type: 'archive';
|
|
12
|
+
};
|
|
2
13
|
/** World State synchronizer configuration values. */
|
|
3
14
|
export interface WorldStateConfig {
|
|
4
15
|
/** The frequency in which to check. */
|
|
@@ -19,8 +30,8 @@ export interface WorldStateConfig {
|
|
|
19
30
|
publicDataTreeMapSizeKb?: number;
|
|
20
31
|
/** Optional directory for the world state DB, if unspecified will default to the general data directory */
|
|
21
32
|
worldStateDataDirectory?: string;
|
|
22
|
-
/** The
|
|
23
|
-
|
|
33
|
+
/** The policy for retaining historic checkpoints. */
|
|
34
|
+
worldStateHistoryRetention: WorldStateHistoryRetention;
|
|
24
35
|
}
|
|
25
36
|
export declare const worldStateConfigMappings: ConfigMappingsType<WorldStateConfig>;
|
|
26
37
|
/**
|
|
@@ -28,4 +39,4 @@ export declare const worldStateConfigMappings: ConfigMappingsType<WorldStateConf
|
|
|
28
39
|
* @returns The configuration values for the world state synchronizer.
|
|
29
40
|
*/
|
|
30
41
|
export declare function getWorldStateConfigFromEnv(): WorldStateConfig;
|
|
31
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
42
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29uZmlnLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvc3luY2hyb25pemVyL2NvbmZpZy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsZ0JBQWdCLEVBQUUsTUFBTSxzQ0FBc0MsQ0FBQztBQUN4RSxPQUFPLEVBQ0wsS0FBSyxrQkFBa0IsRUFJeEIsTUFBTSwrQkFBK0IsQ0FBQztBQUV2Qyw2R0FBNkc7QUFDN0csTUFBTSxNQUFNLDBCQUEwQixHQUNsQztJQUFFLElBQUksRUFBRSxTQUFTLENBQUM7SUFBQyxXQUFXLEVBQUUsTUFBTSxDQUFBO0NBQUUsR0FDeEM7SUFBRSxJQUFJLEVBQUUsUUFBUSxDQUFDO0lBQUMsVUFBVSxFQUFFLGdCQUFnQixDQUFBO0NBQUUsR0FDaEQ7SUFBRSxJQUFJLEVBQUUsU0FBUyxDQUFBO0NBQUUsQ0FBQztBQXdCeEIscURBQXFEO0FBQ3JELE1BQU0sV0FBVyxnQkFBZ0I7SUFDL0IsdUNBQXVDO0lBQ3ZDLDhCQUE4QixFQUFFLE1BQU0sQ0FBQztJQUV2QywyRkFBMkY7SUFDM0YsK0JBQStCLENBQUMsRUFBRSxNQUFNLENBQUM7SUFFekMsbUpBQW1KO0lBQ25KLHFCQUFxQixDQUFDLEVBQUUsTUFBTSxDQUFDO0lBRS9CLDJKQUEySjtJQUMzSixvQkFBb0IsQ0FBQyxFQUFFLE1BQU0sQ0FBQztJQUU5Qiw2SkFBNko7SUFDN0osc0JBQXNCLENBQUMsRUFBRSxNQUFNLENBQUM7SUFFaEMsNkpBQTZKO0lBQzdKLHFCQUFxQixDQUFDLEVBQUUsTUFBTSxDQUFDO0lBRS9CLDJKQUEySjtJQUMzSixvQkFBb0IsQ0FBQyxFQUFFLE1BQU0sQ0FBQztJQUU5QiwrSkFBK0o7SUFDL0osdUJBQXVCLENBQUMsRUFBRSxNQUFNLENBQUM7SUFFakMsMkdBQTJHO0lBQzNHLHVCQUF1QixDQUFDLEVBQUUsTUFBTSxDQUFDO0lBRWpDLHFEQUFxRDtJQUNyRCwwQkFBMEIsRUFBRSwwQkFBMEIsQ0FBQztDQUN4RDtBQUVELGVBQU8sTUFBTSx3QkFBd0IsRUFBRSxrQkFBa0IsQ0FBQyxnQkFBZ0IsQ0FvRXpFLENBQUM7QUFFRjs7O0dBR0c7QUFDSCx3QkFBZ0IsMEJBQTBCLElBQUksZ0JBQWdCLENBRTdEIn0=
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../src/synchronizer/config.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,kBAAkB,EAIxB,MAAM,+BAA+B,CAAC;AAEvC,qDAAqD;AACrD,MAAM,WAAW,gBAAgB;IAC/B,uCAAuC;IACvC,8BAA8B,EAAE,MAAM,CAAC;IAEvC,2FAA2F;IAC3F,+BAA+B,CAAC,EAAE,MAAM,CAAC;IAEzC,mJAAmJ;IACnJ,qBAAqB,CAAC,EAAE,MAAM,CAAC;IAE/B,2JAA2J;IAC3J,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAE9B,6JAA6J;IAC7J,sBAAsB,CAAC,EAAE,MAAM,CAAC;IAEhC,6JAA6J;IAC7J,qBAAqB,CAAC,EAAE,MAAM,CAAC;IAE/B,2JAA2J;IAC3J,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAE9B,+JAA+J;IAC/J,uBAAuB,CAAC,EAAE,MAAM,CAAC;IAEjC,2GAA2G;IAC3G,uBAAuB,CAAC,EAAE,MAAM,CAAC;IAEjC,
|
|
1
|
+
{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../src/synchronizer/config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,sCAAsC,CAAC;AACxE,OAAO,EACL,KAAK,kBAAkB,EAIxB,MAAM,+BAA+B,CAAC;AAEvC,6GAA6G;AAC7G,MAAM,MAAM,0BAA0B,GAClC;IAAE,IAAI,EAAE,SAAS,CAAC;IAAC,WAAW,EAAE,MAAM,CAAA;CAAE,GACxC;IAAE,IAAI,EAAE,QAAQ,CAAC;IAAC,UAAU,EAAE,gBAAgB,CAAA;CAAE,GAChD;IAAE,IAAI,EAAE,SAAS,CAAA;CAAE,CAAC;AAwBxB,qDAAqD;AACrD,MAAM,WAAW,gBAAgB;IAC/B,uCAAuC;IACvC,8BAA8B,EAAE,MAAM,CAAC;IAEvC,2FAA2F;IAC3F,+BAA+B,CAAC,EAAE,MAAM,CAAC;IAEzC,mJAAmJ;IACnJ,qBAAqB,CAAC,EAAE,MAAM,CAAC;IAE/B,2JAA2J;IAC3J,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAE9B,6JAA6J;IAC7J,sBAAsB,CAAC,EAAE,MAAM,CAAC;IAEhC,6JAA6J;IAC7J,qBAAqB,CAAC,EAAE,MAAM,CAAC;IAE/B,2JAA2J;IAC3J,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAE9B,+JAA+J;IAC/J,uBAAuB,CAAC,EAAE,MAAM,CAAC;IAEjC,2GAA2G;IAC3G,uBAAuB,CAAC,EAAE,MAAM,CAAC;IAEjC,qDAAqD;IACrD,0BAA0B,EAAE,0BAA0B,CAAC;CACxD;AAED,eAAO,MAAM,wBAAwB,EAAE,kBAAkB,CAAC,gBAAgB,CAoEzE,CAAC;AAEF;;;GAGG;AACH,wBAAgB,0BAA0B,IAAI,gBAAgB,CAE7D"}
|
|
@@ -1,4 +1,31 @@
|
|
|
1
|
+
import { CheckpointNumber } from '@aztec-labs/foundation/branded-types';
|
|
1
2
|
import { getConfigFromMappings, numberConfigHelper, optionalNumberConfigHelper } from '@aztec-labs/foundation/config';
|
|
3
|
+
function parseHistoryRetention(value) {
|
|
4
|
+
if (value === 'archive') {
|
|
5
|
+
return {
|
|
6
|
+
type: 'archive'
|
|
7
|
+
};
|
|
8
|
+
}
|
|
9
|
+
const match = /^(rolling|pinned):([0-9]+)$/.exec(value);
|
|
10
|
+
const count = Number(match?.[2]);
|
|
11
|
+
if (!match || !Number.isSafeInteger(count) || count < 1) {
|
|
12
|
+
throw new Error('Expected rolling:<positive checkpoint count>, pinned:<positive checkpoint number>, or archive');
|
|
13
|
+
}
|
|
14
|
+
return match[1] === 'rolling' ? {
|
|
15
|
+
type: 'rolling',
|
|
16
|
+
checkpoints: count
|
|
17
|
+
} : {
|
|
18
|
+
type: 'pinned',
|
|
19
|
+
checkpoint: CheckpointNumber(count)
|
|
20
|
+
};
|
|
21
|
+
}
|
|
22
|
+
function migrateLegacyHistoryRetention(value) {
|
|
23
|
+
const checkpoints = Number(value);
|
|
24
|
+
if (!value.trim() || !Number.isSafeInteger(checkpoints)) {
|
|
25
|
+
throw new Error(`Invalid legacy history retention '${value}'; expected a whole number`);
|
|
26
|
+
}
|
|
27
|
+
return checkpoints < 1 ? 'archive' : `rolling:${checkpoints}`;
|
|
28
|
+
}
|
|
2
29
|
export const worldStateConfigMappings = {
|
|
3
30
|
worldStateBlockCheckIntervalMS: {
|
|
4
31
|
env: 'WS_BLOCK_CHECK_INTERVAL_MS',
|
|
@@ -44,13 +71,29 @@ export const worldStateConfigMappings = {
|
|
|
44
71
|
env: 'WS_DATA_DIRECTORY',
|
|
45
72
|
description: 'Optional directory for the world state database'
|
|
46
73
|
},
|
|
47
|
-
|
|
48
|
-
env: '
|
|
49
|
-
description: 'The number of historic checkpoints worth of blocks to maintain. Values less than 1 mean all history is maintained',
|
|
74
|
+
worldStateHistoryRetention: {
|
|
75
|
+
env: 'WS_HISTORY_RETENTION',
|
|
50
76
|
fallback: [
|
|
77
|
+
'WS_NUM_HISTORIC_CHECKPOINTS',
|
|
51
78
|
'WS_NUM_HISTORIC_BLOCKS'
|
|
52
79
|
],
|
|
53
|
-
|
|
80
|
+
deprecatedFallback: [
|
|
81
|
+
{
|
|
82
|
+
env: 'WS_NUM_HISTORIC_CHECKPOINTS',
|
|
83
|
+
transform: migrateLegacyHistoryRetention
|
|
84
|
+
},
|
|
85
|
+
{
|
|
86
|
+
env: 'WS_NUM_HISTORIC_BLOCKS',
|
|
87
|
+
transform: migrateLegacyHistoryRetention
|
|
88
|
+
}
|
|
89
|
+
],
|
|
90
|
+
description: 'World-state history retention: rolling:N retains N finalized checkpoints, pinned:N retains checkpoint N onwards, archive retains all history.',
|
|
91
|
+
parseEnv: parseHistoryRetention,
|
|
92
|
+
defaultValue: {
|
|
93
|
+
type: 'rolling',
|
|
94
|
+
checkpoints: 64
|
|
95
|
+
},
|
|
96
|
+
printDefault: (value)=>value.type === 'archive' ? 'archive' : value.type === 'rolling' ? `rolling:${value.checkpoints}` : `pinned:${value.checkpoint}`
|
|
54
97
|
}
|
|
55
98
|
};
|
|
56
99
|
/**
|
|
@@ -17,4 +17,4 @@ export interface WorldStateTreeMapSizes {
|
|
|
17
17
|
}
|
|
18
18
|
export declare function createWorldStateSynchronizer(config: WorldStateConfig & DataStoreConfig, l2BlockSource: L2BlockSource & L1ToL2MessageSource, genesisOrNativeWorldState: GenesisData | NativeWorldStateService, client?: TelemetryClient, bindings?: LoggerBindings): Promise<ServerWorldStateSynchronizer>;
|
|
19
19
|
export declare function createWorldState(config: Pick<WorldStateConfig, 'worldStateDataDirectory' | 'worldStateDbMapSizeKb' | 'archiveTreeMapSizeKb' | 'nullifierTreeMapSizeKb' | 'noteHashTreeMapSizeKb' | 'messageTreeMapSizeKb' | 'publicDataTreeMapSizeKb'> & Pick<DataStoreConfig, 'dataDirectory' | 'dataStoreMapSizeKb' | 'rollupAddress'>, genesis?: GenesisData, instrumentation?: WorldStateInstrumentation, bindings?: LoggerBindings): Promise<NativeWorldStateService>;
|
|
20
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
20
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZmFjdG9yeS5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3N5bmNocm9uaXplci9mYWN0b3J5LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUNBLE9BQU8sS0FBSyxFQUFFLGNBQWMsRUFBRSxNQUFNLDRCQUE0QixDQUFDO0FBRWpFLE9BQU8sS0FBSyxFQUFFLGFBQWEsRUFBRSxNQUFNLDBCQUEwQixDQUFDO0FBQzlELE9BQU8sS0FBSyxFQUFFLGVBQWUsRUFBRSxNQUFNLDZCQUE2QixDQUFDO0FBQ25FLE9BQU8sS0FBSyxFQUFFLG1CQUFtQixFQUFFLE1BQU0sOEJBQThCLENBQUM7QUFDeEUsT0FBTyxFQUFFLEtBQUssV0FBVyxFQUFpQixNQUFNLGdDQUFnQyxDQUFDO0FBQ2pGLE9BQU8sRUFBRSxLQUFLLGVBQWUsRUFBc0IsTUFBTSw4QkFBOEIsQ0FBQztBQUV4RixPQUFPLEVBQUUseUJBQXlCLEVBQUUsTUFBTSx1Q0FBdUMsQ0FBQztBQUNsRixPQUFPLEVBQUUsdUJBQXVCLEVBQUUsTUFBTSxpQ0FBaUMsQ0FBQztBQUMxRSxPQUFPLEtBQUssRUFBRSxnQkFBZ0IsRUFBRSxNQUFNLGFBQWEsQ0FBQztBQUNwRCxPQUFPLEVBQUUsNEJBQTRCLEVBQUUsTUFBTSxzQ0FBc0MsQ0FBQztBQUVwRixNQUFNLFdBQVcsc0JBQXNCO0lBQ3JDLG9CQUFvQixFQUFFLE1BQU0sQ0FBQztJQUM3QixzQkFBc0IsRUFBRSxNQUFNLENBQUM7SUFDL0IscUJBQXFCLEVBQUUsTUFBTSxDQUFDO0lBQzlCLG9CQUFvQixFQUFFLE1BQU0sQ0FBQztJQUM3Qix1QkFBdUIsRUFBRSxNQUFNLENBQUM7Q0FDakM7QUFFRCx3QkFBc0IsNEJBQTRCLENBQ2hELE1BQU0sRUFBRSxnQkFBZ0IsR0FBRyxlQUFlLEVBQzFDLGFBQWEsRUFBRSxhQUFhLEdBQUcsbUJBQW1CLEVBQ2xELHlCQUF5QixFQUFFLFdBQVcsR0FBRyx1QkFBdUIsRUFDaEUsTUFBTSxHQUFFLGVBQXNDLEVBQzlDLFFBQVEsQ0FBQyxFQUFFLGNBQWMseUNBTzFCO0FBRUQsd0JBQXNCLGdCQUFnQixDQUNwQyxNQUFNLEVBQUUsSUFBSSxDQUNWLGdCQUFnQixFQUNkLHlCQUF5QixHQUN6Qix1QkFBdUIsR0FDdkIsc0JBQXNCLEdBQ3RCLHdCQUF3QixHQUN4Qix1QkFBdUIsR0FDdkIsc0JBQXNCLEdBQ3RCLHlCQUF5QixDQUM1QixHQUNDLElBQUksQ0FBQyxlQUFlLEVBQUUsZUFBZSxHQUFHLG9CQUFvQixHQUFHLGVBQWUsQ0FBQyxFQUNqRixPQUFPLEdBQUUsV0FBa0MsRUFDM0MsZUFBZSxHQUFFLHlCQUErRSxFQUNoRyxRQUFRLENBQUMsRUFBRSxjQUFjLG9DQWtDMUIifQ==
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"factory.d.ts","sourceRoot":"","sources":["../../src/synchronizer/factory.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"factory.d.ts","sourceRoot":"","sources":["../../src/synchronizer/factory.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AAEjE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AAC9D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,6BAA6B,CAAC;AACnE,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,8BAA8B,CAAC;AACxE,OAAO,EAAE,KAAK,WAAW,EAAiB,MAAM,gCAAgC,CAAC;AACjF,OAAO,EAAE,KAAK,eAAe,EAAsB,MAAM,8BAA8B,CAAC;AAExF,OAAO,EAAE,yBAAyB,EAAE,MAAM,uCAAuC,CAAC;AAClF,OAAO,EAAE,uBAAuB,EAAE,MAAM,iCAAiC,CAAC;AAC1E,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AACpD,OAAO,EAAE,4BAA4B,EAAE,MAAM,sCAAsC,CAAC;AAEpF,MAAM,WAAW,sBAAsB;IACrC,oBAAoB,EAAE,MAAM,CAAC;IAC7B,sBAAsB,EAAE,MAAM,CAAC;IAC/B,qBAAqB,EAAE,MAAM,CAAC;IAC9B,oBAAoB,EAAE,MAAM,CAAC;IAC7B,uBAAuB,EAAE,MAAM,CAAC;CACjC;AAED,wBAAsB,4BAA4B,CAChD,MAAM,EAAE,gBAAgB,GAAG,eAAe,EAC1C,aAAa,EAAE,aAAa,GAAG,mBAAmB,EAClD,yBAAyB,EAAE,WAAW,GAAG,uBAAuB,EAChE,MAAM,GAAE,eAAsC,EAC9C,QAAQ,CAAC,EAAE,cAAc,yCAO1B;AAED,wBAAsB,gBAAgB,CACpC,MAAM,EAAE,IAAI,CACV,gBAAgB,EACd,yBAAyB,GACzB,uBAAuB,GACvB,sBAAsB,GACtB,wBAAwB,GACxB,uBAAuB,GACvB,sBAAsB,GACtB,yBAAyB,CAC5B,GACC,IAAI,CAAC,eAAe,EAAE,eAAe,GAAG,oBAAoB,GAAG,eAAe,CAAC,EACjF,OAAO,GAAE,WAAkC,EAC3C,eAAe,GAAE,yBAA+E,EAChG,QAAQ,CAAC,EAAE,cAAc,oCAkC1B"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { getEnv } from '@aztec-labs/foundation/config/env';
|
|
1
2
|
import { DEFAULT_GENESIS_DATA } from '@aztec-labs/protocol-contracts';
|
|
2
3
|
import { isGenesisData } from '@aztec-labs/stdlib/world-state';
|
|
3
4
|
import { getTelemetryClient } from '@aztec-labs/telemetry-client';
|
|
@@ -26,6 +27,6 @@ export async function createWorldState(config, genesis = DEFAULT_GENESIS_DATA, i
|
|
|
26
27
|
const merkleTrees = dataDirectory ? await NativeWorldStateService.new(config.rollupAddress, dataDirectory, wsTreeMapSizes, genesis, instrumentation, bindings) : await NativeWorldStateService.tmp(![
|
|
27
28
|
'true',
|
|
28
29
|
'1'
|
|
29
|
-
].includes(
|
|
30
|
+
].includes(getEnv().DEBUG_WORLD_STATE), genesis, instrumentation, bindings);
|
|
30
31
|
return merkleTrees;
|
|
31
32
|
}
|
|
@@ -0,0 +1,9 @@
|
|
|
1
|
+
import { CheckpointNumber } from '@aztec-labs/foundation/branded-types';
|
|
2
|
+
import type { L2BlockSource } from '@aztec-labs/stdlib/block';
|
|
3
|
+
import type { WorldStateStatusSummary } from '../native/message.js';
|
|
4
|
+
import type { WorldStateConfig } from './config.js';
|
|
5
|
+
/** Returns the fixed checkpoint boundary, or undefined for a rolling checkpoint window. */
|
|
6
|
+
export declare function getWorldStateHistoryStartCheckpoint(config: Pick<WorldStateConfig, 'worldStateHistoryRetention'>): CheckpointNumber | undefined;
|
|
7
|
+
/** Rejects a database whose retained history cannot satisfy the configured pruning policy. */
|
|
8
|
+
export declare function validateWorldStateHistory(config: Pick<WorldStateConfig, 'worldStateHistoryRetention'>, summary: WorldStateStatusSummary, blockSource?: Pick<L2BlockSource, 'getBlockData'>): Promise<void>;
|
|
9
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaGlzdG9yeS5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3N5bmNocm9uaXplci9oaXN0b3J5LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxnQkFBZ0IsRUFBRSxNQUFNLHNDQUFzQyxDQUFDO0FBQ3hFLE9BQU8sS0FBSyxFQUFFLGFBQWEsRUFBRSxNQUFNLDBCQUEwQixDQUFDO0FBRTlELE9BQU8sS0FBSyxFQUFFLHVCQUF1QixFQUFFLE1BQU0sc0JBQXNCLENBQUM7QUFDcEUsT0FBTyxLQUFLLEVBQUUsZ0JBQWdCLEVBQUUsTUFBTSxhQUFhLENBQUM7QUFFcEQsMkZBQTJGO0FBQzNGLHdCQUFnQixtQ0FBbUMsQ0FDakQsTUFBTSxFQUFFLElBQUksQ0FBQyxnQkFBZ0IsRUFBRSw0QkFBNEIsQ0FBQyxHQUMzRCxnQkFBZ0IsR0FBRyxTQUFTLENBRzlCO0FBRUQsOEZBQThGO0FBQzlGLHdCQUFzQix5QkFBeUIsQ0FDN0MsTUFBTSxFQUFFLElBQUksQ0FBQyxnQkFBZ0IsRUFBRSw0QkFBNEIsQ0FBQyxFQUM1RCxPQUFPLEVBQUUsdUJBQXVCLEVBQ2hDLFdBQVcsQ0FBQyxFQUFFLElBQUksQ0FBQyxhQUFhLEVBQUUsY0FBYyxDQUFDLEdBQ2hELE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FpQ2YifQ==
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"history.d.ts","sourceRoot":"","sources":["../../src/synchronizer/history.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,sCAAsC,CAAC;AACxE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AAE9D,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,sBAAsB,CAAC;AACpE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAEpD,2FAA2F;AAC3F,wBAAgB,mCAAmC,CACjD,MAAM,EAAE,IAAI,CAAC,gBAAgB,EAAE,4BAA4B,CAAC,GAC3D,gBAAgB,GAAG,SAAS,CAG9B;AAED,8FAA8F;AAC9F,wBAAsB,yBAAyB,CAC7C,MAAM,EAAE,IAAI,CAAC,gBAAgB,EAAE,4BAA4B,CAAC,EAC5D,OAAO,EAAE,uBAAuB,EAChC,WAAW,CAAC,EAAE,IAAI,CAAC,aAAa,EAAE,cAAc,CAAC,GAChD,OAAO,CAAC,IAAI,CAAC,CAiCf"}
|
|
@@ -0,0 +1,35 @@
|
|
|
1
|
+
import { CheckpointNumber } from '@aztec-labs/foundation/branded-types';
|
|
2
|
+
/** Returns the fixed checkpoint boundary, or undefined for a rolling checkpoint window. */ export function getWorldStateHistoryStartCheckpoint(config) {
|
|
3
|
+
const policy = config.worldStateHistoryRetention;
|
|
4
|
+
return policy.type === 'archive' ? CheckpointNumber.ZERO : policy.type === 'pinned' ? policy.checkpoint : undefined;
|
|
5
|
+
}
|
|
6
|
+
/** Rejects a database whose retained history cannot satisfy the configured pruning policy. */ export async function validateWorldStateHistory(config, summary, blockSource) {
|
|
7
|
+
const startCheckpoint = getWorldStateHistoryStartCheckpoint(config);
|
|
8
|
+
const { oldestHistoricalBlock, unfinalizedBlockNumber, finalizedBlockNumber } = summary;
|
|
9
|
+
if (oldestHistoricalBlock <= 1) {
|
|
10
|
+
return;
|
|
11
|
+
}
|
|
12
|
+
const available = `World state retains blocks ${oldestHistoricalBlock} to ${unfinalizedBlockNumber}`;
|
|
13
|
+
const recovery = 'Use a fresh world-state database to rebuild the required history from a snapshot or genesis.';
|
|
14
|
+
if (startCheckpoint === CheckpointNumber.ZERO) {
|
|
15
|
+
throw new Error(`${available}, but all checkpoint history is required. ${recovery}`);
|
|
16
|
+
}
|
|
17
|
+
const oldest = await blockSource?.getBlockData({
|
|
18
|
+
number: oldestHistoricalBlock
|
|
19
|
+
});
|
|
20
|
+
let requiredCheckpoint = startCheckpoint;
|
|
21
|
+
if (config.worldStateHistoryRetention.type === 'rolling') {
|
|
22
|
+
const finalized = await blockSource?.getBlockData({
|
|
23
|
+
number: finalizedBlockNumber
|
|
24
|
+
});
|
|
25
|
+
if (finalized) {
|
|
26
|
+
requiredCheckpoint = CheckpointNumber(Math.max(1, finalized.checkpointNumber - config.worldStateHistoryRetention.checkpoints + 1));
|
|
27
|
+
}
|
|
28
|
+
}
|
|
29
|
+
if (!oldest || requiredCheckpoint === undefined) {
|
|
30
|
+
throw new Error(`${available}, but its checkpoint history could not be verified against the archiver.`);
|
|
31
|
+
}
|
|
32
|
+
if (oldest.checkpointNumber > requiredCheckpoint || oldest.checkpointNumber === requiredCheckpoint && oldest.indexWithinCheckpoint !== 0) {
|
|
33
|
+
throw new Error(`${available}, but history is required from the start of checkpoint ${requiredCheckpoint}. ${recovery}`);
|
|
34
|
+
}
|
|
35
|
+
}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
export * from './server_world_state_synchronizer.js';
|
|
2
2
|
export * from './factory.js';
|
|
3
3
|
export * from './errors.js';
|
|
4
|
-
|
|
4
|
+
export * from './history.js';
|
|
5
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9zeW5jaHJvbml6ZXIvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsY0FBYyxzQ0FBc0MsQ0FBQztBQUNyRCxjQUFjLGNBQWMsQ0FBQztBQUM3QixjQUFjLGFBQWEsQ0FBQztBQUM1QixjQUFjLGNBQWMsQ0FBQyJ9
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/synchronizer/index.ts"],"names":[],"mappings":"AAAA,cAAc,sCAAsC,CAAC;AACrD,cAAc,cAAc,CAAC;AAC7B,cAAc,aAAa,CAAC"}
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/synchronizer/index.ts"],"names":[],"mappings":"AAAA,cAAc,sCAAsC,CAAC;AACrD,cAAc,cAAc,CAAC;AAC7B,cAAc,aAAa,CAAC;AAC5B,cAAc,cAAc,CAAC"}
|
|
@@ -22,9 +22,7 @@ export declare class ServerWorldStateSynchronizer implements WorldStateSynchroni
|
|
|
22
22
|
private readonly config;
|
|
23
23
|
private instrumentation;
|
|
24
24
|
private readonly log;
|
|
25
|
-
private readonly merkleTreeCommitted;
|
|
26
25
|
private latestBlockNumberAtStart;
|
|
27
|
-
private historyToKeep;
|
|
28
26
|
private currentState;
|
|
29
27
|
private syncPromise;
|
|
30
28
|
protected blockStream: EventDrivenL2BlockStream | undefined;
|
|
@@ -91,4 +89,4 @@ export declare class ServerWorldStateSynchronizer implements WorldStateSynchroni
|
|
|
91
89
|
private startPruning;
|
|
92
90
|
private pruneHistory;
|
|
93
91
|
}
|
|
94
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
92
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2VydmVyX3dvcmxkX3N0YXRlX3N5bmNocm9uaXplci5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3N5bmNocm9uaXplci9zZXJ2ZXJfd29ybGRfc3RhdGVfc3luY2hyb25pemVyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUNBLE9BQU8sRUFBRSxXQUFXLEVBQW9CLE1BQU0sc0NBQXNDLENBQUM7QUFDckYsT0FBTyxLQUFLLEVBQUUsRUFBRSxFQUFFLE1BQU0scUNBQXFDLENBQUM7QUFDOUQsT0FBTyxFQUFFLEtBQUssTUFBTSxFQUFnQixNQUFNLDRCQUE0QixDQUFDO0FBS3ZFLE9BQU8sRUFDTCxLQUFLLFNBQVMsRUFDZCx3QkFBd0IsRUFDeEIsS0FBSyxPQUFPLEVBQ1osS0FBSyxhQUFhLEVBQ2xCLEtBQUssa0JBQWtCLEVBQ3ZCLEtBQUsseUJBQXlCLEVBQzlCLEtBQUssOEJBQThCLEVBQ25DLEtBQUssY0FBYyxFQUNwQixNQUFNLDBCQUEwQixDQUFDO0FBQ2xDLE9BQU8sRUFHTCxLQUFLLHNCQUFzQixFQUMzQixLQUFLLDRCQUE0QixFQUNsQyxNQUFNLHNDQUFzQyxDQUFDO0FBQzlDLE9BQU8sS0FBSyxFQUFFLG1CQUFtQixFQUFFLE1BQU0sOEJBQThCLENBQUM7QUFDeEUsT0FBTyxLQUFLLEVBQUUsZ0JBQWdCLEVBQUUsTUFBTSw4QkFBOEIsQ0FBQztBQUVyRSxPQUFPLEVBQWdCLEtBQUssd0JBQXdCLEVBQUUsS0FBSyx5QkFBeUIsRUFBRSxNQUFNLDBCQUEwQixDQUFDO0FBR3ZILE9BQU8sRUFBRSx5QkFBeUIsRUFBRSxNQUFNLHVDQUF1QyxDQUFDO0FBQ2xGLE9BQU8sS0FBSyxFQUFFLG9CQUFvQixFQUFFLE1BQU0sc0JBQXNCLENBQUM7QUFDakUsT0FBTyxLQUFLLEVBQUUsdUJBQXVCLEVBQUUsTUFBTSxxQ0FBcUMsQ0FBQztBQUNuRixPQUFPLEtBQUssRUFBRSxnQkFBZ0IsRUFBRSxNQUFNLGFBQWEsQ0FB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
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"server_world_state_synchronizer.d.ts","sourceRoot":"","sources":["../../src/synchronizer/server_world_state_synchronizer.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAoB,MAAM,sCAAsC,CAAC;AACrF,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,qCAAqC,CAAC;AAC9D,OAAO,EAAE,KAAK,MAAM,EAAgB,MAAM,4BAA4B,CAAC;AAKvE,OAAO,EACL,KAAK,SAAS,EACd,wBAAwB,EACxB,KAAK,OAAO,EACZ,KAAK,aAAa,EAClB,KAAK,kBAAkB,EACvB,KAAK,yBAAyB,EAC9B,KAAK,8BAA8B,EACnC,KAAK,cAAc,EACpB,MAAM,0BAA0B,CAAC;AAClC,OAAO,EAGL,KAAK,sBAAsB,EAC3B,KAAK,4BAA4B,EAClC,MAAM,sCAAsC,CAAC;AAC9C,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,8BAA8B,CAAC;AACxE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,8BAA8B,CAAC;AAErE,OAAO,EAAgB,KAAK,wBAAwB,EAAE,KAAK,yBAAyB,EAAE,MAAM,0BAA0B,CAAC;AAGvH,OAAO,EAAE,yBAAyB,EAAE,MAAM,uCAAuC,CAAC;AAClF,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,sBAAsB,CAAC;AACjE,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,qCAAqC,CAAC;AACnF,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"server_world_state_synchronizer.d.ts","sourceRoot":"","sources":["../../src/synchronizer/server_world_state_synchronizer.ts"],"names":[],"mappings":"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"}
|
|
@@ -11,6 +11,7 @@ import { MerkleTreeId } from '@aztec-labs/stdlib/trees';
|
|
|
11
11
|
import { getTelemetryClient } from '@aztec-labs/telemetry-client';
|
|
12
12
|
import { WorldStateInstrumentation } from '../instrumentation/instrumentation.js';
|
|
13
13
|
import { WorldStateSynchronizerError } from './errors.js';
|
|
14
|
+
import { validateWorldStateHistory } from './history.js';
|
|
14
15
|
// four checkpoint's worth of blocks
|
|
15
16
|
const MAX_BLOCK_PRUNE = 40;
|
|
16
17
|
/**
|
|
@@ -23,9 +24,7 @@ const MAX_BLOCK_PRUNE = 40;
|
|
|
23
24
|
config;
|
|
24
25
|
instrumentation;
|
|
25
26
|
log;
|
|
26
|
-
merkleTreeCommitted;
|
|
27
27
|
latestBlockNumberAtStart;
|
|
28
|
-
historyToKeep;
|
|
29
28
|
currentState;
|
|
30
29
|
syncPromise;
|
|
31
30
|
blockStream;
|
|
@@ -52,10 +51,10 @@ const MAX_BLOCK_PRUNE = 40;
|
|
|
52
51
|
this.pruningSleep = new InterruptibleSleep();
|
|
53
52
|
this.pruningPaused = false;
|
|
54
53
|
this.stopping = false;
|
|
55
|
-
this.merkleTreeCommitted = this.merkleTreeDb.getCommitted();
|
|
56
54
|
this.mutationQueue.start();
|
|
57
|
-
this.
|
|
58
|
-
|
|
55
|
+
this.log.info('Created world state synchronizer', {
|
|
56
|
+
historyRetention: config.worldStateHistoryRetention
|
|
57
|
+
});
|
|
59
58
|
}
|
|
60
59
|
getCommitted() {
|
|
61
60
|
return this.merkleTreeDb.getCommitted();
|
|
@@ -68,7 +67,7 @@ const MAX_BLOCK_PRUNE = 40;
|
|
|
68
67
|
// Block 0's snapshot is the pre-genesis archive view (size 0), so archive leaf 0 is not visible from it;
|
|
69
68
|
// verify against the initial header hash instead. For later blocks, read archive leaf `blockNumber` from the
|
|
70
69
|
// snapshot's own view so the exact handle we return is validated against the requested fork.
|
|
71
|
-
const actualHash = blockNumber === BlockNumber.ZERO ? (await this.
|
|
70
|
+
const actualHash = blockNumber === BlockNumber.ZERO ? (await this.merkleTreeDb.getCommitted().getInitialHeader().hash()).toString() : (await snapshot.getLeafValue(MerkleTreeId.ARCHIVE, BigInt(blockNumber)))?.toString();
|
|
72
71
|
if (actualHash === undefined) {
|
|
73
72
|
// A missing archive leaf means either the block's history has been pruned away (permanent: the block predates
|
|
74
73
|
// the oldest historical block kept by world state) or a reorg flipped the fork between the sync and this read
|
|
@@ -127,6 +126,15 @@ const MAX_BLOCK_PRUNE = 40;
|
|
|
127
126
|
if (this.currentState !== WorldStateRunningState.IDLE) {
|
|
128
127
|
return this.syncPromise;
|
|
129
128
|
}
|
|
129
|
+
const summary = await this.merkleTreeDb.getStatusSummary();
|
|
130
|
+
if (this.config.worldStateHistoryRetention.type !== 'rolling') {
|
|
131
|
+
await validateWorldStateHistory(this.config, summary, this.l2BlockSource);
|
|
132
|
+
}
|
|
133
|
+
this.log.info('World state history available at startup', {
|
|
134
|
+
oldestHistoricBlock: summary.oldestHistoricalBlock,
|
|
135
|
+
latestBlock: summary.unfinalizedBlockNumber,
|
|
136
|
+
historyRetention: this.config.worldStateHistoryRetention
|
|
137
|
+
});
|
|
130
138
|
// Get the current latest block number
|
|
131
139
|
this.latestBlockNumberAtStart = BlockNumber(await this.l2BlockSource.getBlockNumber());
|
|
132
140
|
const blockToDownloadFrom = await this.getLatestBlockNumber() + 1;
|
|
@@ -270,10 +278,11 @@ const MAX_BLOCK_PRUNE = 40;
|
|
|
270
278
|
return updatedBlockNumber;
|
|
271
279
|
}
|
|
272
280
|
/** Returns the L2 block hash for a given number. Used by the L2BlockStream for detecting reorgs. */ async getL2BlockHash(number) {
|
|
273
|
-
|
|
274
|
-
|
|
275
|
-
|
|
276
|
-
|
|
281
|
+
// Block 0 is read from the archive as well (its first leaf is the initial header hash, which init asserts) rather
|
|
282
|
+
// than from the in-memory initial header, so every block stream poll reaches wsdb and a node idling at genesis
|
|
283
|
+
// still notices when wsdb dies. The committed view is fetched per call because clear() replaces the instance.
|
|
284
|
+
const leaf = await this.merkleTreeDb.getCommitted().getLeafValue(MerkleTreeId.ARCHIVE, BigInt(number));
|
|
285
|
+
return leaf?.toString();
|
|
277
286
|
}
|
|
278
287
|
/**
|
|
279
288
|
* Returns the proposed, proven, and finalized block tips of the chain. World state drives its block stream with
|
|
@@ -421,7 +430,8 @@ const MAX_BLOCK_PRUNE = 40;
|
|
|
421
430
|
return;
|
|
422
431
|
}
|
|
423
432
|
const summary = await this.merkleTreeDb.setFinalized(blockNumber);
|
|
424
|
-
|
|
433
|
+
const policy = this.config.worldStateHistoryRetention;
|
|
434
|
+
if (policy.type === 'archive') {
|
|
425
435
|
return;
|
|
426
436
|
}
|
|
427
437
|
const finalisedBlockData = await this.l2BlockSource.getBlockData({
|
|
@@ -432,7 +442,7 @@ const MAX_BLOCK_PRUNE = 40;
|
|
|
432
442
|
return;
|
|
433
443
|
}
|
|
434
444
|
// Compute the required historic checkpoint number
|
|
435
|
-
const newHistoricCheckpointNumber = finalisedBlockData.checkpointNumber -
|
|
445
|
+
const newHistoricCheckpointNumber = policy.type === 'rolling' ? finalisedBlockData.checkpointNumber - policy.checkpoints + 1 : Math.min(policy.checkpoint, finalisedBlockData.checkpointNumber);
|
|
436
446
|
if (newHistoricCheckpointNumber <= 1) {
|
|
437
447
|
return;
|
|
438
448
|
}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@aztec-labs/world-state",
|
|
3
|
-
"version": "6.0.0-rc.
|
|
3
|
+
"version": "6.0.0-rc.4",
|
|
4
4
|
"type": "module",
|
|
5
5
|
"exports": {
|
|
6
6
|
".": "./dest/index.js",
|
|
@@ -64,19 +64,19 @@
|
|
|
64
64
|
]
|
|
65
65
|
},
|
|
66
66
|
"dependencies": {
|
|
67
|
-
"@aztec-foundation/wsdb": "6.0.0-rc.
|
|
68
|
-
"@aztec-labs/constants": "6.0.0-rc.
|
|
69
|
-
"@aztec-labs/foundation": "6.0.0-rc.
|
|
70
|
-
"@aztec-labs/protocol-contracts": "6.0.0-rc.
|
|
71
|
-
"@aztec-labs/stdlib": "6.0.0-rc.
|
|
72
|
-
"@aztec-labs/telemetry-client": "6.0.0-rc.
|
|
67
|
+
"@aztec-foundation/wsdb": "6.0.0-rc.7",
|
|
68
|
+
"@aztec-labs/constants": "6.0.0-rc.4",
|
|
69
|
+
"@aztec-labs/foundation": "6.0.0-rc.4",
|
|
70
|
+
"@aztec-labs/protocol-contracts": "6.0.0-rc.4",
|
|
71
|
+
"@aztec-labs/stdlib": "6.0.0-rc.4",
|
|
72
|
+
"@aztec-labs/telemetry-client": "6.0.0-rc.4",
|
|
73
73
|
"msgpackr": "^1.11.2",
|
|
74
74
|
"tslib": "^2.4.0",
|
|
75
75
|
"zod": "~4.4.3"
|
|
76
76
|
},
|
|
77
77
|
"devDependencies": {
|
|
78
|
-
"@aztec-foundation/ipc-runtime": "6.0.0-rc.
|
|
79
|
-
"@aztec-labs/archiver": "6.0.0-rc.
|
|
78
|
+
"@aztec-foundation/ipc-runtime": "6.0.0-rc.7",
|
|
79
|
+
"@aztec-labs/archiver": "6.0.0-rc.4",
|
|
80
80
|
"@jest/globals": "^30.0.0",
|
|
81
81
|
"@types/jest": "^30.0.0",
|
|
82
82
|
"@types/node": "^22.15.17",
|
|
@@ -93,6 +93,6 @@
|
|
|
93
93
|
],
|
|
94
94
|
"types": "./dest/index.d.ts",
|
|
95
95
|
"engines": {
|
|
96
|
-
"node": ">=20.
|
|
96
|
+
"node": ">=20.16"
|
|
97
97
|
}
|
|
98
98
|
}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { IpcProcessExitedError } from '@aztec-foundation/ipc-runtime';
|
|
1
2
|
import { AsyncApi, WsdbService } from '@aztec-foundation/wsdb';
|
|
2
3
|
import type {
|
|
3
4
|
WorldStateDBStats as WsdbDBStats,
|
|
@@ -21,11 +22,13 @@ import {
|
|
|
21
22
|
PUBLIC_DATA_TREE_HEIGHT,
|
|
22
23
|
} from '@aztec-labs/constants';
|
|
23
24
|
import type { BlockNumber } from '@aztec-labs/foundation/branded-types';
|
|
25
|
+
import { getEnv } from '@aztec-labs/foundation/config/env';
|
|
24
26
|
import type { Fr } from '@aztec-labs/foundation/curves/bn254';
|
|
25
27
|
import { type Logger, type LoggerBindings, createLogger } from '@aztec-labs/foundation/log';
|
|
26
28
|
import type { IndexedTreeId, TreeInfo } from '@aztec-labs/stdlib/interfaces/server';
|
|
27
29
|
import { MerkleTreeId } from '@aztec-labs/stdlib/trees';
|
|
28
30
|
import type { GenesisData, WorldStateRevision } from '@aztec-labs/stdlib/world-state';
|
|
31
|
+
import { Buffer } from 'buffer';
|
|
29
32
|
import { cpus } from 'node:os';
|
|
30
33
|
|
|
31
34
|
import type { WorldStateInstrumentation } from '../instrumentation/instrumentation.js';
|
|
@@ -382,7 +385,7 @@ export class IpcWorldState implements NativeWorldStateInstance {
|
|
|
382
385
|
bindings?: LoggerBindings,
|
|
383
386
|
threads: number = getWsdbThreadCount(),
|
|
384
387
|
): Promise<IpcWorldState> {
|
|
385
|
-
const transport =
|
|
388
|
+
const transport = getEnv().WSDB_TRANSPORT === 'shm' ? 'shm' : 'uds';
|
|
386
389
|
const wsdb = await WsdbService.spawn({
|
|
387
390
|
transport,
|
|
388
391
|
extraArgs: getWsdbExtraArgs(dataDir, wsTreeMapSizes, genesis, threads),
|
|
@@ -806,12 +809,30 @@ export class IpcWorldState implements NativeWorldStateInstance {
|
|
|
806
809
|
this.instrumentation.recordRoundTrip(durationMs * 1000, operation);
|
|
807
810
|
return response;
|
|
808
811
|
} catch (error) {
|
|
812
|
+
if (error instanceof IpcProcessExitedError) {
|
|
813
|
+
exitOnWsdbDeath(operation, error, this.log);
|
|
814
|
+
}
|
|
809
815
|
this.log.error(`Call ${operation} failed: ${error}`, error);
|
|
810
816
|
throw error;
|
|
811
817
|
}
|
|
812
818
|
}
|
|
813
819
|
}
|
|
814
820
|
|
|
821
|
+
/**
|
|
822
|
+
* Exits the process because wsdb died under it. wsdb holds the forks and uncommitted state every caller depends on,
|
|
823
|
+
* so a respawn would leave them dangling and nothing can continue: crash like the in-process world state did, and let
|
|
824
|
+
* the orchestrator restart the node. Every wsdb call funnels through {@link IpcWorldState.send}, so this is the one
|
|
825
|
+
* place that needs it; it moves to the IPC backend's `exitOnDeath` option once callers use the wsdb API directly.
|
|
826
|
+
*/
|
|
827
|
+
function exitOnWsdbDeath(operation: WorldStateOperationName, error: IpcProcessExitedError, log: Logger): never {
|
|
828
|
+
log.fatal(`World state database process died during ${operation}; exiting`, error, {
|
|
829
|
+
code: error.code,
|
|
830
|
+
signal: error.signal,
|
|
831
|
+
logPath: error.logPath,
|
|
832
|
+
});
|
|
833
|
+
process.exit(1);
|
|
834
|
+
}
|
|
835
|
+
|
|
815
836
|
/**
|
|
816
837
|
* Helper to create WsdbOptions from standard world state config.
|
|
817
838
|
* Returns the options needed to construct a wsdb service command line.
|
|
@@ -24,6 +24,7 @@ import {
|
|
|
24
24
|
import { type BlockHeader, PartialStateReference, StateReference } from '@aztec-labs/stdlib/tx';
|
|
25
25
|
import type { WorldStateRevision } from '@aztec-labs/stdlib/world-state';
|
|
26
26
|
import assert from 'assert';
|
|
27
|
+
import { Buffer } from 'buffer';
|
|
27
28
|
|
|
28
29
|
import {
|
|
29
30
|
type SerializedIndexedLeaf,
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { CheckpointNumber } from '@aztec-labs/foundation/branded-types';
|
|
1
2
|
import {
|
|
2
3
|
type ConfigMappingsType,
|
|
3
4
|
getConfigFromMappings,
|
|
@@ -5,6 +6,34 @@ import {
|
|
|
5
6
|
optionalNumberConfigHelper,
|
|
6
7
|
} from '@aztec-labs/foundation/config';
|
|
7
8
|
|
|
9
|
+
/** Controls whether world-state history follows the finalized tip or retains a fixed checkpoint boundary. */
|
|
10
|
+
export type WorldStateHistoryRetention =
|
|
11
|
+
| { type: 'rolling'; checkpoints: number }
|
|
12
|
+
| { type: 'pinned'; checkpoint: CheckpointNumber }
|
|
13
|
+
| { type: 'archive' };
|
|
14
|
+
|
|
15
|
+
function parseHistoryRetention(value: string): WorldStateHistoryRetention {
|
|
16
|
+
if (value === 'archive') {
|
|
17
|
+
return { type: 'archive' };
|
|
18
|
+
}
|
|
19
|
+
const match = /^(rolling|pinned):([0-9]+)$/.exec(value);
|
|
20
|
+
const count = Number(match?.[2]);
|
|
21
|
+
if (!match || !Number.isSafeInteger(count) || count < 1) {
|
|
22
|
+
throw new Error('Expected rolling:<positive checkpoint count>, pinned:<positive checkpoint number>, or archive');
|
|
23
|
+
}
|
|
24
|
+
return match[1] === 'rolling'
|
|
25
|
+
? { type: 'rolling', checkpoints: count }
|
|
26
|
+
: { type: 'pinned', checkpoint: CheckpointNumber(count) };
|
|
27
|
+
}
|
|
28
|
+
|
|
29
|
+
function migrateLegacyHistoryRetention(value: string): string {
|
|
30
|
+
const checkpoints = Number(value);
|
|
31
|
+
if (!value.trim() || !Number.isSafeInteger(checkpoints)) {
|
|
32
|
+
throw new Error(`Invalid legacy history retention '${value}'; expected a whole number`);
|
|
33
|
+
}
|
|
34
|
+
return checkpoints < 1 ? 'archive' : `rolling:${checkpoints}`;
|
|
35
|
+
}
|
|
36
|
+
|
|
8
37
|
/** World State synchronizer configuration values. */
|
|
9
38
|
export interface WorldStateConfig {
|
|
10
39
|
/** The frequency in which to check. */
|
|
@@ -34,8 +63,8 @@ export interface WorldStateConfig {
|
|
|
34
63
|
/** Optional directory for the world state DB, if unspecified will default to the general data directory */
|
|
35
64
|
worldStateDataDirectory?: string;
|
|
36
65
|
|
|
37
|
-
/** The
|
|
38
|
-
|
|
66
|
+
/** The policy for retaining historic checkpoints. */
|
|
67
|
+
worldStateHistoryRetention: WorldStateHistoryRetention;
|
|
39
68
|
}
|
|
40
69
|
|
|
41
70
|
export const worldStateConfigMappings: ConfigMappingsType<WorldStateConfig> = {
|
|
@@ -88,12 +117,23 @@ export const worldStateConfigMappings: ConfigMappingsType<WorldStateConfig> = {
|
|
|
88
117
|
env: 'WS_DATA_DIRECTORY',
|
|
89
118
|
description: 'Optional directory for the world state database',
|
|
90
119
|
},
|
|
91
|
-
|
|
92
|
-
env: '
|
|
120
|
+
worldStateHistoryRetention: {
|
|
121
|
+
env: 'WS_HISTORY_RETENTION',
|
|
122
|
+
fallback: ['WS_NUM_HISTORIC_CHECKPOINTS', 'WS_NUM_HISTORIC_BLOCKS'],
|
|
123
|
+
deprecatedFallback: [
|
|
124
|
+
{ env: 'WS_NUM_HISTORIC_CHECKPOINTS', transform: migrateLegacyHistoryRetention },
|
|
125
|
+
{ env: 'WS_NUM_HISTORIC_BLOCKS', transform: migrateLegacyHistoryRetention },
|
|
126
|
+
],
|
|
93
127
|
description:
|
|
94
|
-
'
|
|
95
|
-
|
|
96
|
-
|
|
128
|
+
'World-state history retention: rolling:N retains N finalized checkpoints, pinned:N retains checkpoint N onwards, archive retains all history.',
|
|
129
|
+
parseEnv: parseHistoryRetention,
|
|
130
|
+
defaultValue: { type: 'rolling', checkpoints: 64 },
|
|
131
|
+
printDefault: (value: WorldStateHistoryRetention) =>
|
|
132
|
+
value.type === 'archive'
|
|
133
|
+
? 'archive'
|
|
134
|
+
: value.type === 'rolling'
|
|
135
|
+
? `rolling:${value.checkpoints}`
|
|
136
|
+
: `pinned:${value.checkpoint}`,
|
|
97
137
|
},
|
|
98
138
|
};
|
|
99
139
|
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { getEnv } from '@aztec-labs/foundation/config/env';
|
|
1
2
|
import type { LoggerBindings } from '@aztec-labs/foundation/log';
|
|
2
3
|
import { DEFAULT_GENESIS_DATA } from '@aztec-labs/protocol-contracts';
|
|
3
4
|
import type { L2BlockSource } from '@aztec-labs/stdlib/block';
|
|
@@ -74,7 +75,7 @@ export async function createWorldState(
|
|
|
74
75
|
bindings,
|
|
75
76
|
)
|
|
76
77
|
: await NativeWorldStateService.tmp(
|
|
77
|
-
!['true', '1'].includes(
|
|
78
|
+
!['true', '1'].includes(getEnv().DEBUG_WORLD_STATE!),
|
|
78
79
|
genesis,
|
|
79
80
|
instrumentation,
|
|
80
81
|
bindings,
|
|
@@ -0,0 +1,53 @@
|
|
|
1
|
+
import { CheckpointNumber } from '@aztec-labs/foundation/branded-types';
|
|
2
|
+
import type { L2BlockSource } from '@aztec-labs/stdlib/block';
|
|
3
|
+
|
|
4
|
+
import type { WorldStateStatusSummary } from '../native/message.js';
|
|
5
|
+
import type { WorldStateConfig } from './config.js';
|
|
6
|
+
|
|
7
|
+
/** Returns the fixed checkpoint boundary, or undefined for a rolling checkpoint window. */
|
|
8
|
+
export function getWorldStateHistoryStartCheckpoint(
|
|
9
|
+
config: Pick<WorldStateConfig, 'worldStateHistoryRetention'>,
|
|
10
|
+
): CheckpointNumber | undefined {
|
|
11
|
+
const policy = config.worldStateHistoryRetention;
|
|
12
|
+
return policy.type === 'archive' ? CheckpointNumber.ZERO : policy.type === 'pinned' ? policy.checkpoint : undefined;
|
|
13
|
+
}
|
|
14
|
+
|
|
15
|
+
/** Rejects a database whose retained history cannot satisfy the configured pruning policy. */
|
|
16
|
+
export async function validateWorldStateHistory(
|
|
17
|
+
config: Pick<WorldStateConfig, 'worldStateHistoryRetention'>,
|
|
18
|
+
summary: WorldStateStatusSummary,
|
|
19
|
+
blockSource?: Pick<L2BlockSource, 'getBlockData'>,
|
|
20
|
+
): Promise<void> {
|
|
21
|
+
const startCheckpoint = getWorldStateHistoryStartCheckpoint(config);
|
|
22
|
+
const { oldestHistoricalBlock, unfinalizedBlockNumber, finalizedBlockNumber } = summary;
|
|
23
|
+
if (oldestHistoricalBlock <= 1) {
|
|
24
|
+
return;
|
|
25
|
+
}
|
|
26
|
+
const available = `World state retains blocks ${oldestHistoricalBlock} to ${unfinalizedBlockNumber}`;
|
|
27
|
+
const recovery = 'Use a fresh world-state database to rebuild the required history from a snapshot or genesis.';
|
|
28
|
+
if (startCheckpoint === CheckpointNumber.ZERO) {
|
|
29
|
+
throw new Error(`${available}, but all checkpoint history is required. ${recovery}`);
|
|
30
|
+
}
|
|
31
|
+
|
|
32
|
+
const oldest = await blockSource?.getBlockData({ number: oldestHistoricalBlock });
|
|
33
|
+
let requiredCheckpoint = startCheckpoint;
|
|
34
|
+
if (config.worldStateHistoryRetention.type === 'rolling') {
|
|
35
|
+
const finalized = await blockSource?.getBlockData({ number: finalizedBlockNumber });
|
|
36
|
+
if (finalized) {
|
|
37
|
+
requiredCheckpoint = CheckpointNumber(
|
|
38
|
+
Math.max(1, finalized.checkpointNumber - config.worldStateHistoryRetention.checkpoints + 1),
|
|
39
|
+
);
|
|
40
|
+
}
|
|
41
|
+
}
|
|
42
|
+
if (!oldest || requiredCheckpoint === undefined) {
|
|
43
|
+
throw new Error(`${available}, but its checkpoint history could not be verified against the archiver.`);
|
|
44
|
+
}
|
|
45
|
+
if (
|
|
46
|
+
oldest.checkpointNumber > requiredCheckpoint ||
|
|
47
|
+
(oldest.checkpointNumber === requiredCheckpoint && oldest.indexWithinCheckpoint !== 0)
|
|
48
|
+
) {
|
|
49
|
+
throw new Error(
|
|
50
|
+
`${available}, but history is required from the start of checkpoint ${requiredCheckpoint}. ${recovery}`,
|
|
51
|
+
);
|
|
52
|
+
}
|
|
53
|
+
}
|
|
@@ -33,6 +33,7 @@ import type { WorldStateStatusFull } from '../native/message.js';
|
|
|
33
33
|
import type { MerkleTreeAdminDatabase } from '../world-state-db/merkle_tree_db.js';
|
|
34
34
|
import type { WorldStateConfig } from './config.js';
|
|
35
35
|
import { WorldStateSynchronizerError } from './errors.js';
|
|
36
|
+
import { validateWorldStateHistory } from './history.js';
|
|
36
37
|
|
|
37
38
|
export type { SnapshotDataKeys };
|
|
38
39
|
|
|
@@ -47,10 +48,7 @@ const MAX_BLOCK_PRUNE = 40;
|
|
|
47
48
|
export class ServerWorldStateSynchronizer
|
|
48
49
|
implements WorldStateSynchronizer, L2BlockStreamLocalDataProvider, L2BlockStreamEventHandler
|
|
49
50
|
{
|
|
50
|
-
private readonly merkleTreeCommitted: MerkleTreeReadOperations;
|
|
51
|
-
|
|
52
51
|
private latestBlockNumberAtStart = BlockNumber.ZERO;
|
|
53
|
-
private historyToKeep: number | undefined;
|
|
54
52
|
private currentState: WorldStateRunningState = WorldStateRunningState.IDLE;
|
|
55
53
|
|
|
56
54
|
private syncPromise = promiseWithResolvers<void>();
|
|
@@ -75,14 +73,8 @@ export class ServerWorldStateSynchronizer
|
|
|
75
73
|
private instrumentation = new WorldStateInstrumentation(getTelemetryClient()),
|
|
76
74
|
private readonly log: Logger = createLogger('world_state'),
|
|
77
75
|
) {
|
|
78
|
-
this.merkleTreeCommitted = this.merkleTreeDb.getCommitted();
|
|
79
76
|
this.mutationQueue.start();
|
|
80
|
-
this.
|
|
81
|
-
this.log.info(
|
|
82
|
-
`Created world state synchroniser with block history of ${
|
|
83
|
-
this.historyToKeep === undefined ? 'infinity' : this.historyToKeep
|
|
84
|
-
}`,
|
|
85
|
-
);
|
|
77
|
+
this.log.info('Created world state synchronizer', { historyRetention: config.worldStateHistoryRetention });
|
|
86
78
|
}
|
|
87
79
|
|
|
88
80
|
public getCommitted(): MerkleTreeReadOperations {
|
|
@@ -100,7 +92,7 @@ export class ServerWorldStateSynchronizer
|
|
|
100
92
|
// snapshot's own view so the exact handle we return is validated against the requested fork.
|
|
101
93
|
const actualHash =
|
|
102
94
|
blockNumber === BlockNumber.ZERO
|
|
103
|
-
? (await this.
|
|
95
|
+
? (await this.merkleTreeDb.getCommitted().getInitialHeader().hash()).toString()
|
|
104
96
|
: (await snapshot.getLeafValue(MerkleTreeId.ARCHIVE, BigInt(blockNumber)))?.toString();
|
|
105
97
|
|
|
106
98
|
if (actualHash === undefined) {
|
|
@@ -168,6 +160,16 @@ export class ServerWorldStateSynchronizer
|
|
|
168
160
|
return this.syncPromise;
|
|
169
161
|
}
|
|
170
162
|
|
|
163
|
+
const summary = await this.merkleTreeDb.getStatusSummary();
|
|
164
|
+
if (this.config.worldStateHistoryRetention.type !== 'rolling') {
|
|
165
|
+
await validateWorldStateHistory(this.config, summary, this.l2BlockSource);
|
|
166
|
+
}
|
|
167
|
+
this.log.info('World state history available at startup', {
|
|
168
|
+
oldestHistoricBlock: summary.oldestHistoricalBlock,
|
|
169
|
+
latestBlock: summary.unfinalizedBlockNumber,
|
|
170
|
+
historyRetention: this.config.worldStateHistoryRetention,
|
|
171
|
+
});
|
|
172
|
+
|
|
171
173
|
// Get the current latest block number
|
|
172
174
|
this.latestBlockNumberAtStart = BlockNumber(await this.l2BlockSource.getBlockNumber());
|
|
173
175
|
|
|
@@ -343,10 +345,11 @@ export class ServerWorldStateSynchronizer
|
|
|
343
345
|
|
|
344
346
|
/** Returns the L2 block hash for a given number. Used by the L2BlockStream for detecting reorgs. */
|
|
345
347
|
public async getL2BlockHash(number: BlockNumber): Promise<string | undefined> {
|
|
346
|
-
|
|
347
|
-
|
|
348
|
-
|
|
349
|
-
|
|
348
|
+
// Block 0 is read from the archive as well (its first leaf is the initial header hash, which init asserts) rather
|
|
349
|
+
// than from the in-memory initial header, so every block stream poll reaches wsdb and a node idling at genesis
|
|
350
|
+
// still notices when wsdb dies. The committed view is fetched per call because clear() replaces the instance.
|
|
351
|
+
const leaf = await this.merkleTreeDb.getCommitted().getLeafValue(MerkleTreeId.ARCHIVE, BigInt(number));
|
|
352
|
+
return leaf?.toString();
|
|
350
353
|
}
|
|
351
354
|
|
|
352
355
|
/**
|
|
@@ -506,7 +509,8 @@ export class ServerWorldStateSynchronizer
|
|
|
506
509
|
return;
|
|
507
510
|
}
|
|
508
511
|
const summary = await this.merkleTreeDb.setFinalized(blockNumber);
|
|
509
|
-
|
|
512
|
+
const policy = this.config.worldStateHistoryRetention;
|
|
513
|
+
if (policy.type === 'archive') {
|
|
510
514
|
return;
|
|
511
515
|
}
|
|
512
516
|
const finalisedBlockData = await this.l2BlockSource.getBlockData({ number: summary.finalizedBlockNumber });
|
|
@@ -517,7 +521,10 @@ export class ServerWorldStateSynchronizer
|
|
|
517
521
|
return;
|
|
518
522
|
}
|
|
519
523
|
// Compute the required historic checkpoint number
|
|
520
|
-
const newHistoricCheckpointNumber =
|
|
524
|
+
const newHistoricCheckpointNumber =
|
|
525
|
+
policy.type === 'rolling'
|
|
526
|
+
? finalisedBlockData.checkpointNumber - policy.checkpoints + 1
|
|
527
|
+
: Math.min(policy.checkpoint, finalisedBlockData.checkpointNumber);
|
|
521
528
|
if (newHistoricCheckpointNumber <= 1) {
|
|
522
529
|
return;
|
|
523
530
|
}
|