@aztec/archiver 0.0.1-commit.b1c78909e → 0.0.1-commit.b2a5d0dd1
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 +12 -6
- package/dest/archiver.d.ts +7 -5
- package/dest/archiver.d.ts.map +1 -1
- package/dest/archiver.js +39 -15
- package/dest/config.d.ts +5 -3
- package/dest/config.d.ts.map +1 -1
- package/dest/config.js +15 -3
- package/dest/errors.d.ts +44 -2
- package/dest/errors.d.ts.map +1 -1
- package/dest/errors.js +58 -2
- package/dest/factory.d.ts +2 -2
- package/dest/factory.d.ts.map +1 -1
- package/dest/factory.js +18 -14
- package/dest/index.d.ts +3 -2
- package/dest/index.d.ts.map +1 -1
- package/dest/index.js +2 -1
- package/dest/l1/calldata_retriever.d.ts +1 -1
- package/dest/l1/calldata_retriever.d.ts.map +1 -1
- package/dest/l1/calldata_retriever.js +2 -1
- package/dest/l1/data_retrieval.d.ts +19 -10
- package/dest/l1/data_retrieval.d.ts.map +1 -1
- package/dest/l1/data_retrieval.js +25 -32
- package/dest/l1/validate_historical_logs.d.ts +23 -0
- package/dest/l1/validate_historical_logs.d.ts.map +1 -0
- package/dest/l1/validate_historical_logs.js +108 -0
- package/dest/modules/data_source_base.d.ts +6 -4
- package/dest/modules/data_source_base.d.ts.map +1 -1
- package/dest/modules/data_source_base.js +11 -5
- package/dest/modules/data_store_updater.d.ts +15 -10
- package/dest/modules/data_store_updater.d.ts.map +1 -1
- package/dest/modules/data_store_updater.js +69 -68
- package/dest/modules/instrumentation.d.ts +7 -2
- package/dest/modules/instrumentation.d.ts.map +1 -1
- package/dest/modules/instrumentation.js +22 -6
- package/dest/modules/l1_synchronizer.d.ts +6 -2
- package/dest/modules/l1_synchronizer.d.ts.map +1 -1
- package/dest/modules/l1_synchronizer.js +244 -146
- package/dest/modules/validation.d.ts +1 -1
- package/dest/modules/validation.d.ts.map +1 -1
- package/dest/modules/validation.js +2 -2
- package/dest/store/block_store.d.ts +49 -6
- package/dest/store/block_store.d.ts.map +1 -1
- package/dest/store/block_store.js +277 -67
- package/dest/store/contract_class_store.d.ts +2 -3
- package/dest/store/contract_class_store.d.ts.map +1 -1
- package/dest/store/contract_class_store.js +7 -67
- package/dest/store/contract_instance_store.d.ts +1 -1
- package/dest/store/contract_instance_store.d.ts.map +1 -1
- package/dest/store/contract_instance_store.js +6 -2
- package/dest/store/kv_archiver_store.d.ts +39 -18
- package/dest/store/kv_archiver_store.d.ts.map +1 -1
- package/dest/store/kv_archiver_store.js +45 -20
- package/dest/store/l2_tips_cache.d.ts +2 -1
- package/dest/store/l2_tips_cache.d.ts.map +1 -1
- package/dest/store/l2_tips_cache.js +27 -7
- package/dest/store/log_store.d.ts +6 -3
- package/dest/store/log_store.d.ts.map +1 -1
- package/dest/store/log_store.js +95 -20
- package/dest/store/message_store.d.ts +5 -1
- package/dest/store/message_store.d.ts.map +1 -1
- package/dest/store/message_store.js +20 -8
- package/dest/test/fake_l1_state.d.ts +14 -3
- package/dest/test/fake_l1_state.d.ts.map +1 -1
- package/dest/test/fake_l1_state.js +63 -10
- package/dest/test/mock_l1_to_l2_message_source.d.ts +1 -1
- package/dest/test/mock_l1_to_l2_message_source.d.ts.map +1 -1
- package/dest/test/mock_l1_to_l2_message_source.js +2 -1
- package/dest/test/mock_l2_block_source.d.ts +7 -2
- package/dest/test/mock_l2_block_source.d.ts.map +1 -1
- package/dest/test/mock_l2_block_source.js +30 -5
- package/dest/test/noop_l1_archiver.d.ts +1 -1
- package/dest/test/noop_l1_archiver.d.ts.map +1 -1
- package/dest/test/noop_l1_archiver.js +4 -2
- package/package.json +13 -13
- package/src/archiver.ts +57 -18
- package/src/config.ts +22 -2
- package/src/errors.ts +94 -2
- package/src/factory.ts +18 -10
- package/src/index.ts +2 -1
- package/src/l1/calldata_retriever.ts +2 -1
- package/src/l1/data_retrieval.ts +36 -45
- package/src/l1/validate_historical_logs.ts +140 -0
- package/src/modules/data_source_base.ts +24 -5
- package/src/modules/data_store_updater.ts +94 -97
- package/src/modules/instrumentation.ts +27 -7
- package/src/modules/l1_synchronizer.ts +314 -177
- package/src/modules/validation.ts +2 -2
- package/src/store/block_store.ts +364 -76
- package/src/store/contract_class_store.ts +8 -106
- package/src/store/contract_instance_store.ts +8 -5
- package/src/store/kv_archiver_store.ts +77 -34
- package/src/store/l2_tips_cache.ts +58 -13
- package/src/store/log_store.ts +128 -32
- package/src/store/message_store.ts +26 -9
- package/src/structs/inbox_message.ts +1 -1
- package/src/test/fake_l1_state.ts +87 -15
- package/src/test/mock_l1_to_l2_message_source.ts +1 -0
- package/src/test/mock_l2_block_source.ts +44 -3
- package/src/test/noop_l1_archiver.ts +3 -1
package/README.md
CHANGED
|
@@ -43,14 +43,18 @@ Two independent syncpoints track progress on L1:
|
|
|
43
43
|
|
|
44
44
|
### L1-to-L2 Messages
|
|
45
45
|
|
|
46
|
-
Messages are synced from the Inbox contract
|
|
46
|
+
Messages are synced from the Inbox contract. The sync compares local state (message count and rolling hash) against the Inbox contract state on L1, downloads any missing messages, and verifies consistency afterwards. On success, the syncpoint advances to the current L1 block. On failure (L1 reorg or inconsistency), the syncpoint rolls back to the last known-good message and the operation retries (up to 3 times within the same sync iteration).
|
|
47
47
|
|
|
48
48
|
1. Query Inbox state at the current L1 block (message count + rolling hash)
|
|
49
|
-
2. Compare local
|
|
50
|
-
3. If they match,
|
|
51
|
-
4. If mismatch,
|
|
52
|
-
- If
|
|
53
|
-
5.
|
|
49
|
+
2. Compare local state against remote
|
|
50
|
+
3. If they match, advance syncpoint and return
|
|
51
|
+
4. If mismatch, fetch `MessageSent` events in batches and store them
|
|
52
|
+
- If storing fails due to a rolling hash mismatch (indicating an L1 reorg changed or removed messages), find the last common message with L1, delete everything after, reset the syncpoint, and retry
|
|
53
|
+
5. After storing, verify local state matches the remote state queried in step 1
|
|
54
|
+
- If still mismatched (e.g., messages missed due to a concurrent L1 reorg), rollback and retry
|
|
55
|
+
6. On success, advance the syncpoint
|
|
56
|
+
|
|
57
|
+
The syncpoint and the `inboxTreeInProgress` marker (which tracks which checkpoint's messages are currently being filled on L1) are updated atomically. The marker is only advanced after messages are stored, so concurrent reads don't see an unsealed checkpoint as readable before its messages are available.
|
|
54
58
|
|
|
55
59
|
### Checkpoints
|
|
56
60
|
|
|
@@ -81,6 +85,8 @@ The `blocksSynchedTo` syncpoint is updated:
|
|
|
81
85
|
|
|
82
86
|
Note that the `blocksSynchedTo` pointer is NOT updated during normal sync when there are no new checkpoints. This protects against small L1 reorgs that could add a checkpoint on an L1 block we have flagged as already synced.
|
|
83
87
|
|
|
88
|
+
The `messagesSynchedTo` pointer is always advanced to the current L1 block on success. If a rolling hash mismatch or post-download inconsistency is detected, the pointer rolls back to the last common message and the operation retries. The rolling hash chain and pre/post-sync consistency checks provide the primary reorg protection.
|
|
89
|
+
|
|
84
90
|
### Block Queue
|
|
85
91
|
|
|
86
92
|
The archiver implements `L2BlockSink`, allowing other subsystems to push blocks before they appear on L1:
|
package/dest/archiver.d.ts
CHANGED
|
@@ -11,7 +11,7 @@ import { type Logger } from '@aztec/foundation/log';
|
|
|
11
11
|
import { RunningPromise } from '@aztec/foundation/running-promise';
|
|
12
12
|
import { DateProvider } from '@aztec/foundation/timer';
|
|
13
13
|
import { type ArchiverEmitter, L2Block, type L2BlockSink, type L2Tips, type ValidateCheckpointResult } from '@aztec/stdlib/block';
|
|
14
|
-
import { PublishedCheckpoint } from '@aztec/stdlib/checkpoint';
|
|
14
|
+
import { type ProposedCheckpointInput, PublishedCheckpoint } from '@aztec/stdlib/checkpoint';
|
|
15
15
|
import { type L1RollupConstants } from '@aztec/stdlib/epoch-helpers';
|
|
16
16
|
import { type TelemetryClient, type Traceable, type Tracer } from '@aztec/telemetry-client';
|
|
17
17
|
import { type ArchiverConfig } from './config.js';
|
|
@@ -61,23 +61,23 @@ export declare class Archiver extends ArchiverDataSourceBase implements L2BlockS
|
|
|
61
61
|
/** In-memory cache for L2 chain tips. */
|
|
62
62
|
private readonly l2TipsCache;
|
|
63
63
|
readonly tracer: Tracer;
|
|
64
|
+
private readonly instrumentation;
|
|
64
65
|
/**
|
|
65
66
|
* Creates a new instance of the Archiver.
|
|
66
67
|
* @param publicClient - A client for interacting with the Ethereum node.
|
|
67
68
|
* @param debugClient - A client for interacting with the Ethereum node for debug/trace methods.
|
|
68
69
|
* @param rollup - Rollup contract instance.
|
|
69
70
|
* @param inbox - Inbox contract instance.
|
|
70
|
-
* @param l1Addresses - L1 contract addresses (registry, governance proposer,
|
|
71
|
+
* @param l1Addresses - L1 contract addresses (registry, governance proposer, slashing proposer).
|
|
71
72
|
* @param dataStore - An archiver data store for storage & retrieval of blocks, encrypted logs & contract data.
|
|
72
73
|
* @param config - Archiver configuration options.
|
|
73
74
|
* @param blobClient - Client for retrieving blob data.
|
|
74
|
-
* @param epochCache - Cache for epoch-related data.
|
|
75
75
|
* @param dateProvider - Provider for current date/time.
|
|
76
76
|
* @param instrumentation - Instrumentation for metrics and tracing.
|
|
77
77
|
* @param l1Constants - L1 rollup constants.
|
|
78
78
|
* @param log - A logger.
|
|
79
79
|
*/
|
|
80
|
-
constructor(publicClient: ViemPublicClient, debugClient: ViemPublicDebugClient, rollup: RollupContract, l1Addresses: Pick<L1ContractAddresses, 'registryAddress' | '
|
|
80
|
+
constructor(publicClient: ViemPublicClient, debugClient: ViemPublicDebugClient, rollup: RollupContract, l1Addresses: Pick<L1ContractAddresses, 'rollupAddress' | 'registryAddress' | 'inboxAddress' | 'governanceProposerAddress'> & {
|
|
81
81
|
slashingProposerAddress: EthAddress;
|
|
82
82
|
}, dataStore: KVArchiverDataStore, config: {
|
|
83
83
|
pollingIntervalMs: number;
|
|
@@ -85,6 +85,7 @@ export declare class Archiver extends ArchiverDataSourceBase implements L2BlockS
|
|
|
85
85
|
skipValidateCheckpointAttestations?: boolean;
|
|
86
86
|
maxAllowedEthClientDriftSeconds: number;
|
|
87
87
|
ethereumAllowNoDebugHosts?: boolean;
|
|
88
|
+
skipHistoricalLogsCheck?: boolean;
|
|
88
89
|
}, blobClient: BlobClientInterface, instrumentation: ArchiverInstrumentation, l1Constants: L1RollupConstants & {
|
|
89
90
|
l1StartBlockHash: Buffer32;
|
|
90
91
|
genesisArchiveRoot: Fr;
|
|
@@ -105,6 +106,7 @@ export declare class Archiver extends ArchiverDataSourceBase implements L2BlockS
|
|
|
105
106
|
* @returns A promise that resolves when the block has been added to the store, or rejects on error.
|
|
106
107
|
*/
|
|
107
108
|
addBlock(block: L2Block): Promise<void>;
|
|
109
|
+
setProposedCheckpoint(pending: ProposedCheckpointInput): Promise<void>;
|
|
108
110
|
private processQueuedBlocks;
|
|
109
111
|
waitForInitialSync(): Promise<void>;
|
|
110
112
|
private sync;
|
|
@@ -136,4 +138,4 @@ export declare class Archiver extends ArchiverDataSourceBase implements L2BlockS
|
|
|
136
138
|
getL2Tips(): Promise<L2Tips>;
|
|
137
139
|
rollbackTo(targetL2BlockNumber: BlockNumber): Promise<void>;
|
|
138
140
|
}
|
|
139
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
141
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYXJjaGl2ZXIuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3NyYy9hcmNoaXZlci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEtBQUssRUFBRSxtQkFBbUIsRUFBRSxNQUFNLDJCQUEyQixDQUFDO0FBQ3JFLE9BQU8sRUFBRSxVQUFVLEVBQUUsTUFBTSxvQkFBb0IsQ0FBQztBQUNoRCxPQUFPLEVBQXVCLGNBQWMsRUFBRSxNQUFNLDJCQUEyQixDQUFDO0FBQ2hGLE9BQU8sS0FBSyxFQUFFLG1CQUFtQixFQUFFLE1BQU0sdUNBQXVDLENBQUM7QUFDakYsT0FBTyxLQUFLLEVBQUUsZ0JBQWdCLEVBQUUscUJBQXFCLEVBQUUsTUFBTSx1QkFBdUIsQ0FBQztBQUNyRixPQUFPLEVBQUUsV0FBVyxFQUFFLGdCQUFnQixFQUFFLFdBQVcsRUFBRSxVQUFVLEVBQUUsTUFBTSxpQ0FBaUMsQ0FBQztBQUN6RyxPQUFPLEVBQUUsUUFBUSxFQUFFLE1BQU0sMEJBQTBCLENBQUM7QUFFcEQsT0FBTyxFQUFFLEVBQUUsRUFBRSxNQUFNLGdDQUFnQyxDQUFDO0FBQ3BELE9BQU8sRUFBRSxVQUFVLEVBQUUsTUFBTSwrQkFBK0IsQ0FBQztBQUMzRCxPQUFPLEVBQUUsS0FBSyxNQUFNLEVBQWdCLE1BQU0sdUJBQXVCLENBQUM7QUFFbEUsT0FBTyxFQUFFLGNBQWMsRUFBMkIsTUFBTSxtQ0FBbUMsQ0FBQztBQUM1RixPQUFPLEVBQUUsWUFBWSxFQUFXLE1BQU0seUJBQXlCLENBQUM7QUFDaEUsT0FBTyxFQUNMLEtBQUssZUFBZSxFQUNwQixPQUFPLEVBQ1AsS0FBSyxXQUFXLEVBQ2hCLEtBQUssTUFBTSxFQUNYLEtBQUssd0JBQXdCLEVBQzlCLE1BQU0scUJBQXFCLENBQUM7QUFDN0IsT0FBTyxFQUFFLEtBQUssdUJBQXVCLEVBQUUsbUJBQW1CLEVBQUUsTUFBTSwwQkFBMEIsQ0FBQztBQUM3RixPQUFPLEVBQ0wsS0FBSyxpQkFBaUIsRUFLdkIsTUFBTSw2QkFBNkIsQ0FBQztBQUNyQyxPQUFPLEVBQUUsS0FBSyxlQUFlLEVBQUUsS0FBSyxTQUFTLEVBQUUsS0FBSyxNQUFNLEVBQWEsTUFBTSx5QkFBeUIsQ0FBQztBQUV2RyxPQUFPLEVBQUUsS0FBSyxjQUFjLEVBQXFCLE1BQU0sYUFBYSxDQUFDO0FBSXJFLE9BQU8sRUFBRSxzQkFBc0IsRUFBRSxNQUFNLCtCQUErQixDQUFDO0FBRXZFLE9BQU8sS0FBSyxFQUFFLHVCQUF1QixFQUFFLE1BQU0sOEJBQThCLENBQUM7QUFDNUUsT0FBTyxLQUFLLEVBQUUsc0JBQXNCLEVBQUUsTUFBTSw4QkFBOEIsQ0FBQztBQUMzRSxPQUFPLEtBQUssRUFBRSxtQkFBbUIsRUFBRSxNQUFNLDhCQUE4QixDQUFDO0FBQ3hFLE9BQU8sRUFBRSxXQUFXLEVBQUUsTUFBTSwwQkFBMEIsQ0FBQztBQUV2RCwyREFBMkQ7QUFDM0QsWUFBWSxFQUFFLGVBQWUsRUFBRSxDQUFDO0FBU2hDLE1BQU0sTUFBTSxZQUFZLEdBQUc7SUFDekIsU0FBUyxDQUFDLEVBQUUsZUFBZSxDQUFDO0lBQzVCLFVBQVUsRUFBRSxtQkFBbUIsQ0FBQztJQUNoQyxVQUFVLENBQUMsRUFBRSxVQUFVLENBQUM7SUFDeEIsWUFBWSxDQUFDLEVBQUUsWUFBWSxDQUFDO0NBQzdCLENBQUM7QUFFRjs7OztHQUlHO0FBQ0gscUJBQWEsUUFBUyxTQUFRLHNCQUF1QixZQUFXLFdBQVcsRUFBRSxTQUFTO0lBMENsRixPQUFPLENBQUMsUUFBUSxDQUFDLFlBQVk7SUFDN0IsT0FBTyxDQUFDLFFBQVEsQ0FBQyxXQUFXO0lBQzVCLE9BQU8sQ0FBQyxRQUFRLENBQUMsTUFBTTtJQUN2QixPQUFPLENBQUMsUUFBUSxDQUFDLFdBQVc7SUFNNUIsUUFBUSxDQUFDLFNBQVMsRUFBRSxtQkFBbUI7SUFDdkMsT0FBTyxDQUFDLE1BQU07SUFRZCxPQUFPLENBQUMsUUFBUSxDQUFDLFVBQVU7dUJBRUMsV0FBVyxFQUFFLGlCQUFpQixHQUFHO1FBQzNELGdCQUFnQixFQUFFLFFBQVEsQ0FBQztRQUMzQixrQkFBa0IsRUFBRSxFQUFFLENBQUM7S0FDeEI7SUFJRCxPQUFPLENBQUMsUUFBUSxDQUFDLEdBQUc7SUFwRXRCLHNHQUFzRztJQUN0RyxTQUFnQixNQUFNLEVBQUUsZUFBZSxDQUFDO0lBRXhDLHVFQUF1RTtJQUN2RSxTQUFTLENBQUMsY0FBYyxFQUFFLGNBQWMsQ0FBQztJQUV6Qyw4RUFBOEU7SUFDOUUsT0FBTyxDQUFDLFFBQVEsQ0FBQyxZQUFZLENBQXlCO0lBRXRELE9BQU8sQ0FBQyxtQkFBbUIsQ0FBa0I7SUFDN0MsT0FBTyxDQUFDLGtCQUFrQixDQUE2QjtJQUV2RCw0RUFBNEU7SUFDNUUsT0FBTyxDQUFDLFVBQVUsQ0FBeUI7SUFFM0MsNENBQTRDO0lBQzVDLE9BQU8sQ0FBQyxRQUFRLENBQUMsT0FBTyxDQUEyQjtJQUVuRCx5Q0FBeUM7SUFDekMsT0FBTyxDQUFDLFFBQVEsQ0FBQyxXQUFXLENBQWM7SUFFMUMsU0FBZ0IsTUFBTSxFQUFFLE1BQU0sQ0FBQztJQUUvQixPQUFPLENBQUMsUUFBUSxDQUFDLGVBQWUsQ0FBMEI7SUFFMUQ7Ozs7Ozs7Ozs7Ozs7O09BY0c7SUFDSCxZQUNtQixZQUFZLEVBQUUsZ0JBQWdCLEVBQzlCLFdBQVcsRUFBRSxxQkFBcUIsRUFDbEMsTUFBTSxFQUFFLGNBQWMsRUFDdEIsV0FBVyxFQUFFLElBQUksQ0FDaEMsbUJBQW1CLEVBQ25CLGVBQWUsR0FBRyxpQkFBaUIsR0FBRyxjQUFjLEdBQUcsMkJBQTJCLENBQ25GLEdBQUc7UUFDRix1QkFBdUIsRUFBRSxVQUFVLENBQUM7S0FDckMsRUFDUSxTQUFTLEVBQUUsbUJBQW1CLEVBQy9CLE1BQU0sRUFBRTtRQUNkLGlCQUFpQixFQUFFLE1BQU0sQ0FBQztRQUMxQixTQUFTLEVBQUUsTUFBTSxDQUFDO1FBQ2xCLGtDQUFrQyxDQUFDLEVBQUUsT0FBTyxDQUFDO1FBQzdDLCtCQUErQixFQUFFLE1BQU0sQ0FBQztRQUN4Qyx5QkFBeUIsQ0FBQyxFQUFFLE9BQU8sQ0FBQztRQUNwQyx1QkFBdUIsQ0FBQyxFQUFFLE9BQU8sQ0FBQztLQUNuQyxFQUNnQixVQUFVLEVBQUUsbUJBQW1CLEVBQ2hELGVBQWUsRUFBRSx1QkFBdUIsRUFDWixXQUFXLEVBQUUsaUJBQWlCLEdBQUc7UUFDM0QsZ0JBQWdCLEVBQUUsUUFBUSxDQUFDO1FBQzNCLGtCQUFrQixFQUFFLEVBQUUsQ0FBQztLQUN4QixFQUNELFlBQVksRUFBRSxzQkFBc0IsRUFDcEMsTUFBTSxFQUFFLGVBQWUsRUFDdkIsV0FBVyxDQUFDLEVBQUUsV0FBVyxFQUNSLEdBQUcsR0FBRSxNQUFpQyxFQXNCeEQ7SUFFRCw4QkFBOEI7SUFDdkIsWUFBWSxDQUFDLFNBQVMsRUFBRSxPQUFPLENBQUMsY0FBYyxDQUFDLFFBR3JEO0lBRUQ7OztPQUdHO0lBQ1UsS0FBSyxDQUFDLGdCQUFnQixFQUFFLE9BQU8sR0FBRyxPQUFPLENBQUMsSUFBSSxDQUFDLENBc0MzRDtJQUVNLGFBQWEsa0JBRW5CO0lBRUQ7Ozs7OztPQU1HO0lBQ0ksUUFBUSxDQUFDLEtBQUssRUFBRSxPQUFPLEdBQUcsT0FBTyxDQUFDLElBQUksQ0FBQyxDQVM3QztJQUVZLHFCQUFxQixDQUFDLE9BQU8sRUFBRSx1QkFBdUIsR0FBRyxPQUFPLENBQUMsSUFBSSxDQUFDLENBRWxGO1lBT2EsbUJBQW1CO0lBMkMxQixrQkFBa0Isa0JBRXhCO1lBTWEsSUFBSTtZQU9KLFVBQVU7SUFxQnhCLHlDQUF5QztJQUNsQyxNQUFNLFNBTVo7SUFFRDs7O09BR0c7SUFDVSxJQUFJLElBQUksT0FBTyxDQUFDLElBQUksQ0FBQyxDQU1qQztJQUVNLFFBQVEsQ0FBQyxRQUFRLEVBQUUsTUFBTSxHQUFHLE9BQU8sQ0FBQyxNQUFNLENBQUMsQ0FFakQ7SUFFTSxjQUFjLElBQUksT0FBTyxDQUFDLGlCQUFpQixDQUFDLENBRWxEO0lBRU0sZ0JBQWdCLElBQUksT0FBTyxDQUFDO1FBQUUsa0JBQWtCLEVBQUUsRUFBRSxDQUFBO0tBQUUsQ0FBQyxDQUU3RDtJQUVNLGdCQUFnQixJQUFJLE9BQU8sQ0FBQyxVQUFVLENBQUMsQ0FFN0M7SUFFTSxrQkFBa0IsSUFBSSxPQUFPLENBQUMsVUFBVSxDQUFDLENBRS9DO0lBRU0sZ0JBQWdCLElBQUksTUFBTSxHQUFHLFNBQVMsQ0FFNUM7SUFFTSxjQUFjLElBQUksT0FBTyxDQUFDLE1BQU0sR0FBRyxTQUFTLENBQUMsQ0FFbkQ7SUFFWSxxQkFBcUIsSUFBSSxPQUFPLENBQUMsVUFBVSxHQUFHLFNBQVMsQ0FBQyxDQTJCcEU7SUFFWSxzQkFBc0IsSUFBSSxPQUFPLENBQUMsV0FBVyxHQUFHLFNBQVMsQ0FBQyxDQWN0RTtJQUVZLGVBQWUsQ0FBQyxXQUFXLEVBQUUsV0FBVyxHQUFHLE9BQU8sQ0FBQyxPQUFPLENBQUMsQ0E2QnZFO0lBRUQsbUZBQW1GO0lBQzVFLHFCQUFxQixJQUFJLE9BQU8sQ0FFdEM7SUFFTSxzQkFBc0IsQ0FBQyxnQkFBZ0IsRUFBRSxnQkFBZ0IsR0FBRyxPQUFPLENBQUMsT0FBTyxDQUFDLENBRWxGO0lBRUQsdUVBQXVFO0lBQzFELGNBQWMsQ0FDekIsV0FBVyxFQUFFLG1CQUFtQixFQUFFLEVBQ2xDLDRCQUE0QixDQUFDLEVBQUUsd0JBQXdCLEdBQ3RELE9BQU8sQ0FBQyxPQUFPLENBQUMsQ0FHbEI7SUFFTSxTQUFTLElBQUksT0FBTyxDQUFDLE1BQU0sQ0FBQyxDQUVsQztJQUVZLFVBQVUsQ0FBQyxtQkFBbUIsRUFBRSxXQUFXLEdBQUcsT0FBTyxDQUFDLElBQUksQ0FBQyxDQTREdkU7Q0FDRiJ9
|
package/dest/archiver.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"archiver.d.ts","sourceRoot":"","sources":["../src/archiver.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,2BAA2B,CAAC;AACrE,OAAO,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAChD,OAAO,EAAuB,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAChF,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,uCAAuC,CAAC;AACjF,OAAO,KAAK,EAAE,gBAAgB,EAAE,qBAAqB,EAAE,MAAM,uBAAuB,CAAC;AACrF,OAAO,EAAE,WAAW,EAAE,gBAAgB,EAAE,WAAW,EAAE,UAAU,EAAE,MAAM,iCAAiC,CAAC;AACzG,OAAO,EAAE,QAAQ,EAAE,MAAM,0BAA0B,CAAC;AAEpD,OAAO,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AACpD,OAAO,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAC3D,OAAO,EAAE,KAAK,MAAM,EAAgB,MAAM,uBAAuB,CAAC;AAElE,OAAO,EAAE,cAAc,EAA2B,MAAM,mCAAmC,CAAC;AAC5F,OAAO,EAAE,YAAY,
|
|
1
|
+
{"version":3,"file":"archiver.d.ts","sourceRoot":"","sources":["../src/archiver.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,2BAA2B,CAAC;AACrE,OAAO,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAChD,OAAO,EAAuB,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAChF,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,uCAAuC,CAAC;AACjF,OAAO,KAAK,EAAE,gBAAgB,EAAE,qBAAqB,EAAE,MAAM,uBAAuB,CAAC;AACrF,OAAO,EAAE,WAAW,EAAE,gBAAgB,EAAE,WAAW,EAAE,UAAU,EAAE,MAAM,iCAAiC,CAAC;AACzG,OAAO,EAAE,QAAQ,EAAE,MAAM,0BAA0B,CAAC;AAEpD,OAAO,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AACpD,OAAO,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAC3D,OAAO,EAAE,KAAK,MAAM,EAAgB,MAAM,uBAAuB,CAAC;AAElE,OAAO,EAAE,cAAc,EAA2B,MAAM,mCAAmC,CAAC;AAC5F,OAAO,EAAE,YAAY,EAAW,MAAM,yBAAyB,CAAC;AAChE,OAAO,EACL,KAAK,eAAe,EACpB,OAAO,EACP,KAAK,WAAW,EAChB,KAAK,MAAM,EACX,KAAK,wBAAwB,EAC9B,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,KAAK,uBAAuB,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AAC7F,OAAO,EACL,KAAK,iBAAiB,EAKvB,MAAM,6BAA6B,CAAC;AACrC,OAAO,EAAE,KAAK,eAAe,EAAE,KAAK,SAAS,EAAE,KAAK,MAAM,EAAa,MAAM,yBAAyB,CAAC;AAEvG,OAAO,EAAE,KAAK,cAAc,EAAqB,MAAM,aAAa,CAAC;AAIrE,OAAO,EAAE,sBAAsB,EAAE,MAAM,+BAA+B,CAAC;AAEvE,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,8BAA8B,CAAC;AAC5E,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,8BAA8B,CAAC;AAC3E,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,8BAA8B,CAAC;AACxE,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AAEvD,2DAA2D;AAC3D,YAAY,EAAE,eAAe,EAAE,CAAC;AAShC,MAAM,MAAM,YAAY,GAAG;IACzB,SAAS,CAAC,EAAE,eAAe,CAAC;IAC5B,UAAU,EAAE,mBAAmB,CAAC;IAChC,UAAU,CAAC,EAAE,UAAU,CAAC;IACxB,YAAY,CAAC,EAAE,YAAY,CAAC;CAC7B,CAAC;AAEF;;;;GAIG;AACH,qBAAa,QAAS,SAAQ,sBAAuB,YAAW,WAAW,EAAE,SAAS;IA0ClF,OAAO,CAAC,QAAQ,CAAC,YAAY;IAC7B,OAAO,CAAC,QAAQ,CAAC,WAAW;IAC5B,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,WAAW;IAM5B,QAAQ,CAAC,SAAS,EAAE,mBAAmB;IACvC,OAAO,CAAC,MAAM;IAQd,OAAO,CAAC,QAAQ,CAAC,UAAU;uBAEC,WAAW,EAAE,iBAAiB,GAAG;QAC3D,gBAAgB,EAAE,QAAQ,CAAC;QAC3B,kBAAkB,EAAE,EAAE,CAAC;KACxB;IAID,OAAO,CAAC,QAAQ,CAAC,GAAG;IApEtB,sGAAsG;IACtG,SAAgB,MAAM,EAAE,eAAe,CAAC;IAExC,uEAAuE;IACvE,SAAS,CAAC,cAAc,EAAE,cAAc,CAAC;IAEzC,8EAA8E;IAC9E,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAyB;IAEtD,OAAO,CAAC,mBAAmB,CAAkB;IAC7C,OAAO,CAAC,kBAAkB,CAA6B;IAEvD,4EAA4E;IAC5E,OAAO,CAAC,UAAU,CAAyB;IAE3C,4CAA4C;IAC5C,OAAO,CAAC,QAAQ,CAAC,OAAO,CAA2B;IAEnD,yCAAyC;IACzC,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAc;IAE1C,SAAgB,MAAM,EAAE,MAAM,CAAC;IAE/B,OAAO,CAAC,QAAQ,CAAC,eAAe,CAA0B;IAE1D;;;;;;;;;;;;;;OAcG;IACH,YACmB,YAAY,EAAE,gBAAgB,EAC9B,WAAW,EAAE,qBAAqB,EAClC,MAAM,EAAE,cAAc,EACtB,WAAW,EAAE,IAAI,CAChC,mBAAmB,EACnB,eAAe,GAAG,iBAAiB,GAAG,cAAc,GAAG,2BAA2B,CACnF,GAAG;QACF,uBAAuB,EAAE,UAAU,CAAC;KACrC,EACQ,SAAS,EAAE,mBAAmB,EAC/B,MAAM,EAAE;QACd,iBAAiB,EAAE,MAAM,CAAC;QAC1B,SAAS,EAAE,MAAM,CAAC;QAClB,kCAAkC,CAAC,EAAE,OAAO,CAAC;QAC7C,+BAA+B,EAAE,MAAM,CAAC;QACxC,yBAAyB,CAAC,EAAE,OAAO,CAAC;QACpC,uBAAuB,CAAC,EAAE,OAAO,CAAC;KACnC,EACgB,UAAU,EAAE,mBAAmB,EAChD,eAAe,EAAE,uBAAuB,EACZ,WAAW,EAAE,iBAAiB,GAAG;QAC3D,gBAAgB,EAAE,QAAQ,CAAC;QAC3B,kBAAkB,EAAE,EAAE,CAAC;KACxB,EACD,YAAY,EAAE,sBAAsB,EACpC,MAAM,EAAE,eAAe,EACvB,WAAW,CAAC,EAAE,WAAW,EACR,GAAG,GAAE,MAAiC,EAsBxD;IAED,8BAA8B;IACvB,YAAY,CAAC,SAAS,EAAE,OAAO,CAAC,cAAc,CAAC,QAGrD;IAED;;;OAGG;IACU,KAAK,CAAC,gBAAgB,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC,CAsC3D;IAEM,aAAa,kBAEnB;IAED;;;;;;OAMG;IACI,QAAQ,CAAC,KAAK,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC,CAS7C;IAEY,qBAAqB,CAAC,OAAO,EAAE,uBAAuB,GAAG,OAAO,CAAC,IAAI,CAAC,CAElF;YAOa,mBAAmB;IA2C1B,kBAAkB,kBAExB;YAMa,IAAI;YAOJ,UAAU;IAqBxB,yCAAyC;IAClC,MAAM,SAMZ;IAED;;;OAGG;IACU,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC,CAMjC;IAEM,QAAQ,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAEjD;IAEM,cAAc,IAAI,OAAO,CAAC,iBAAiB,CAAC,CAElD;IAEM,gBAAgB,IAAI,OAAO,CAAC;QAAE,kBAAkB,EAAE,EAAE,CAAA;KAAE,CAAC,CAE7D;IAEM,gBAAgB,IAAI,OAAO,CAAC,UAAU,CAAC,CAE7C;IAEM,kBAAkB,IAAI,OAAO,CAAC,UAAU,CAAC,CAE/C;IAEM,gBAAgB,IAAI,MAAM,GAAG,SAAS,CAE5C;IAEM,cAAc,IAAI,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAEnD;IAEY,qBAAqB,IAAI,OAAO,CAAC,UAAU,GAAG,SAAS,CAAC,CA2BpE;IAEY,sBAAsB,IAAI,OAAO,CAAC,WAAW,GAAG,SAAS,CAAC,CActE;IAEY,eAAe,CAAC,WAAW,EAAE,WAAW,GAAG,OAAO,CAAC,OAAO,CAAC,CA6BvE;IAED,mFAAmF;IAC5E,qBAAqB,IAAI,OAAO,CAEtC;IAEM,sBAAsB,CAAC,gBAAgB,EAAE,gBAAgB,GAAG,OAAO,CAAC,OAAO,CAAC,CAElF;IAED,uEAAuE;IAC1D,cAAc,CACzB,WAAW,EAAE,mBAAmB,EAAE,EAClC,4BAA4B,CAAC,EAAE,wBAAwB,GACtD,OAAO,CAAC,OAAO,CAAC,CAGlB;IAEM,SAAS,IAAI,OAAO,CAAC,MAAM,CAAC,CAElC;IAEY,UAAU,CAAC,mBAAmB,EAAE,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC,CA4DvE;CACF"}
|
package/dest/archiver.js
CHANGED
|
@@ -379,10 +379,12 @@ import { EthAddress } from '@aztec/foundation/eth-address';
|
|
|
379
379
|
import { createLogger } from '@aztec/foundation/log';
|
|
380
380
|
import { promiseWithResolvers } from '@aztec/foundation/promise';
|
|
381
381
|
import { RunningPromise, makeLoggingErrorHandler } from '@aztec/foundation/running-promise';
|
|
382
|
+
import { elapsed } from '@aztec/foundation/timer';
|
|
382
383
|
import { getEpochAtSlot, getSlotAtNextL1Block, getSlotRangeForEpoch, getTimestampRangeForEpoch } from '@aztec/stdlib/epoch-helpers';
|
|
383
384
|
import { trackSpan } from '@aztec/telemetry-client';
|
|
384
385
|
import { mapArchiverConfig } from './config.js';
|
|
385
386
|
import { BlockAlreadyCheckpointedError, NoBlobBodiesFoundError } from './errors.js';
|
|
387
|
+
import { validateAndLogHistoricalLogsAvailability } from './l1/validate_historical_logs.js';
|
|
386
388
|
import { validateAndLogTraceAvailability } from './l1/validate_trace.js';
|
|
387
389
|
import { ArchiverDataSourceBase } from './modules/data_source_base.js';
|
|
388
390
|
import { ArchiverDataStoreUpdater } from './modules/data_store_updater.js';
|
|
@@ -420,17 +422,17 @@ _dec = trackSpan('Archiver.sync');
|
|
|
420
422
|
/** Helper to handle updates to the store */ updater;
|
|
421
423
|
/** In-memory cache for L2 chain tips. */ l2TipsCache;
|
|
422
424
|
tracer;
|
|
425
|
+
instrumentation;
|
|
423
426
|
/**
|
|
424
427
|
* Creates a new instance of the Archiver.
|
|
425
428
|
* @param publicClient - A client for interacting with the Ethereum node.
|
|
426
429
|
* @param debugClient - A client for interacting with the Ethereum node for debug/trace methods.
|
|
427
430
|
* @param rollup - Rollup contract instance.
|
|
428
431
|
* @param inbox - Inbox contract instance.
|
|
429
|
-
* @param l1Addresses - L1 contract addresses (registry, governance proposer,
|
|
432
|
+
* @param l1Addresses - L1 contract addresses (registry, governance proposer, slashing proposer).
|
|
430
433
|
* @param dataStore - An archiver data store for storage & retrieval of blocks, encrypted logs & contract data.
|
|
431
434
|
* @param config - Archiver configuration options.
|
|
432
435
|
* @param blobClient - Client for retrieving blob data.
|
|
433
|
-
* @param epochCache - Cache for epoch-related data.
|
|
434
436
|
* @param dateProvider - Provider for current date/time.
|
|
435
437
|
* @param instrumentation - Instrumentation for metrics and tracing.
|
|
436
438
|
* @param l1Constants - L1 rollup constants.
|
|
@@ -438,6 +440,7 @@ _dec = trackSpan('Archiver.sync');
|
|
|
438
440
|
*/ constructor(publicClient, debugClient, rollup, l1Addresses, dataStore, config, blobClient, instrumentation, l1Constants, synchronizer, events, l2TipsCache, log = createLogger('archiver')){
|
|
439
441
|
super(dataStore, l1Constants), this.publicClient = publicClient, this.debugClient = debugClient, this.rollup = rollup, this.l1Addresses = l1Addresses, this.dataStore = dataStore, this.config = config, this.blobClient = blobClient, this.l1Constants = l1Constants, this.log = log, this.initialSyncComplete = (_initProto(this), false), this.blockQueue = [];
|
|
440
442
|
this.tracer = instrumentation.tracer;
|
|
443
|
+
this.instrumentation = instrumentation;
|
|
441
444
|
this.initialSyncPromise = promiseWithResolvers();
|
|
442
445
|
this.synchronizer = synchronizer;
|
|
443
446
|
this.events = events;
|
|
@@ -463,6 +466,12 @@ _dec = trackSpan('Archiver.sync');
|
|
|
463
466
|
await this.blobClient.testSources();
|
|
464
467
|
await this.synchronizer.testEthereumNodeSynced();
|
|
465
468
|
await validateAndLogTraceAvailability(this.debugClient, this.config.ethereumAllowNoDebugHosts ?? false, this.log.getBindings());
|
|
469
|
+
await validateAndLogHistoricalLogsAvailability(this.publicClient, {
|
|
470
|
+
rollupAddress: this.l1Addresses.rollupAddress,
|
|
471
|
+
inboxAddress: this.l1Addresses.inboxAddress,
|
|
472
|
+
registryAddress: this.l1Addresses.registryAddress,
|
|
473
|
+
governanceProposerAddress: this.l1Addresses.governanceProposerAddress
|
|
474
|
+
}, this.config.skipHistoricalLogsCheck ?? false, this.log.getBindings());
|
|
466
475
|
// Log initial state for the archiver
|
|
467
476
|
const { l1StartBlock } = this.l1Constants;
|
|
468
477
|
const { blocksSynchedTo = l1StartBlock, messagesSynchedTo = l1StartBlock } = await this.store.getSynchPoint();
|
|
@@ -501,6 +510,9 @@ _dec = trackSpan('Archiver.sync');
|
|
|
501
510
|
});
|
|
502
511
|
});
|
|
503
512
|
}
|
|
513
|
+
async setProposedCheckpoint(pending) {
|
|
514
|
+
await this.updater.setProposedCheckpoint(pending);
|
|
515
|
+
}
|
|
504
516
|
/**
|
|
505
517
|
* Processes all queued blocks, adding them to the store.
|
|
506
518
|
* Called at the beginning of each sync iteration.
|
|
@@ -528,7 +540,8 @@ _dec = trackSpan('Archiver.sync');
|
|
|
528
540
|
continue;
|
|
529
541
|
}
|
|
530
542
|
try {
|
|
531
|
-
await this.updater.addProposedBlock(block);
|
|
543
|
+
const [durationMs] = await elapsed(()=>this.updater.addProposedBlock(block));
|
|
544
|
+
this.instrumentation.processNewProposedBlock(durationMs, block);
|
|
532
545
|
this.log.debug(`Added block ${block.number} to store`);
|
|
533
546
|
resolve();
|
|
534
547
|
} catch (err) {
|
|
@@ -611,19 +624,30 @@ _dec = trackSpan('Archiver.sync');
|
|
|
611
624
|
getL1Timestamp() {
|
|
612
625
|
return Promise.resolve(this.synchronizer.getL1Timestamp());
|
|
613
626
|
}
|
|
614
|
-
getSyncedL2SlotNumber() {
|
|
627
|
+
async getSyncedL2SlotNumber() {
|
|
628
|
+
// The synced L2 slot is the latest slot for which we have all L1 data,
|
|
629
|
+
// either because we have seen all L1 blocks for that slot, or because
|
|
630
|
+
// we have seen the corresponding checkpoint.
|
|
631
|
+
let slotFromL1Sync;
|
|
615
632
|
const l1Timestamp = this.synchronizer.getL1Timestamp();
|
|
616
|
-
if (l1Timestamp
|
|
617
|
-
|
|
633
|
+
if (l1Timestamp !== undefined) {
|
|
634
|
+
const nextL1BlockSlot = getSlotAtNextL1Block(l1Timestamp, this.l1Constants);
|
|
635
|
+
if (Number(nextL1BlockSlot) > 0) {
|
|
636
|
+
slotFromL1Sync = SlotNumber.add(nextL1BlockSlot, -1);
|
|
637
|
+
}
|
|
618
638
|
}
|
|
619
|
-
|
|
620
|
-
|
|
621
|
-
|
|
622
|
-
|
|
623
|
-
|
|
624
|
-
|
|
639
|
+
let slotFromCheckpoint;
|
|
640
|
+
const latestCheckpointNumber = await this.store.getSynchedCheckpointNumber();
|
|
641
|
+
if (latestCheckpointNumber > 0) {
|
|
642
|
+
const checkpointData = await this.store.getCheckpointData(latestCheckpointNumber);
|
|
643
|
+
if (checkpointData) {
|
|
644
|
+
slotFromCheckpoint = checkpointData.header.slotNumber;
|
|
645
|
+
}
|
|
625
646
|
}
|
|
626
|
-
|
|
647
|
+
if (slotFromL1Sync === undefined && slotFromCheckpoint === undefined) {
|
|
648
|
+
return undefined;
|
|
649
|
+
}
|
|
650
|
+
return SlotNumber(Math.max(slotFromL1Sync ?? 0, slotFromCheckpoint ?? 0));
|
|
627
651
|
}
|
|
628
652
|
async getSyncedL2EpochNumber() {
|
|
629
653
|
const syncedSlot = await this.getSyncedL2SlotNumber();
|
|
@@ -716,10 +740,10 @@ _dec = trackSpan('Archiver.sync');
|
|
|
716
740
|
await this.store.rollbackL1ToL2MessagesToCheckpoint(targetCheckpointNumber);
|
|
717
741
|
this.log.info(`Setting L1 syncpoints to ${targetL1BlockNumber}`);
|
|
718
742
|
await this.store.setCheckpointSynchedL1BlockNumber(targetL1BlockNumber);
|
|
719
|
-
await this.store.
|
|
743
|
+
await this.store.setMessageSyncState({
|
|
720
744
|
l1BlockNumber: targetL1BlockNumber,
|
|
721
745
|
l1BlockHash: targetL1BlockHash
|
|
722
|
-
});
|
|
746
|
+
}, undefined);
|
|
723
747
|
if (targetL2BlockNumber < currentProvenBlock) {
|
|
724
748
|
this.log.info(`Rolling back proven L2 checkpoint to ${targetCheckpointNumber}`);
|
|
725
749
|
await this.updater.setProvenCheckpointNumber(targetCheckpointNumber);
|
package/dest/config.d.ts
CHANGED
|
@@ -2,7 +2,7 @@ import { type BlobClientConfig } from '@aztec/blob-client/client/config';
|
|
|
2
2
|
import { type L1ContractsConfig } from '@aztec/ethereum/config';
|
|
3
3
|
import { type L1ReaderConfig } from '@aztec/ethereum/l1-reader';
|
|
4
4
|
import { type ConfigMappingsType } from '@aztec/foundation/config';
|
|
5
|
-
import { type ChainConfig } from '@aztec/stdlib/config';
|
|
5
|
+
import { type ChainConfig, type PipelineConfig } from '@aztec/stdlib/config';
|
|
6
6
|
import type { ArchiverSpecificConfig } from '@aztec/stdlib/interfaces/server';
|
|
7
7
|
/**
|
|
8
8
|
* The archiver configuration.
|
|
@@ -11,7 +11,7 @@ import type { ArchiverSpecificConfig } from '@aztec/stdlib/interfaces/server';
|
|
|
11
11
|
* Results of calls to eth_blockNumber are cached by viem with this cache being updated periodically at the interval specified by viemPollingIntervalMS.
|
|
12
12
|
* As a result the maximum observed polling time for new blocks will be viemPollingIntervalMS + archiverPollingIntervalMS.
|
|
13
13
|
*/
|
|
14
|
-
export type ArchiverConfig = ArchiverSpecificConfig & L1ReaderConfig & L1ContractsConfig & BlobClientConfig & ChainConfig;
|
|
14
|
+
export type ArchiverConfig = ArchiverSpecificConfig & L1ReaderConfig & L1ContractsConfig & PipelineConfig & BlobClientConfig & ChainConfig;
|
|
15
15
|
export declare const archiverConfigMappings: ConfigMappingsType<ArchiverConfig>;
|
|
16
16
|
/**
|
|
17
17
|
* Returns the archiver configuration from the environment variables.
|
|
@@ -24,7 +24,9 @@ export declare function mapArchiverConfig(config: Partial<ArchiverConfig>): {
|
|
|
24
24
|
pollingIntervalMs: number | undefined;
|
|
25
25
|
batchSize: number | undefined;
|
|
26
26
|
skipValidateCheckpointAttestations: boolean | undefined;
|
|
27
|
+
skipPromoteProposedCheckpointDuringL1Sync: boolean | undefined;
|
|
27
28
|
maxAllowedEthClientDriftSeconds: number | undefined;
|
|
28
29
|
ethereumAllowNoDebugHosts: boolean | undefined;
|
|
30
|
+
skipHistoricalLogsCheck: boolean | undefined;
|
|
29
31
|
};
|
|
30
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
32
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29uZmlnLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvY29uZmlnLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxLQUFLLGdCQUFnQixFQUEyQixNQUFNLGtDQUFrQyxDQUFDO0FBQ2xHLE9BQU8sRUFBRSxLQUFLLGlCQUFpQixFQUE2QixNQUFNLHdCQUF3QixDQUFDO0FBRTNGLE9BQU8sRUFBRSxLQUFLLGNBQWMsRUFBMEIsTUFBTSwyQkFBMkIsQ0FBQztBQUN4RixPQUFPLEVBQ0wsS0FBSyxrQkFBa0IsRUFJeEIsTUFBTSwwQkFBMEIsQ0FBQztBQUNsQyxPQUFPLEVBQ0wsS0FBSyxXQUFXLEVBQ2hCLEtBQUssY0FBYyxFQUdwQixNQUFNLHNCQUFzQixDQUFDO0FBQzlCLE9BQU8sS0FBSyxFQUFFLHNCQUFzQixFQUFFLE1BQU0saUNBQWlDLENBQUM7QUFFOUU7Ozs7OztHQU1HO0FBQ0gsTUFBTSxNQUFNLGNBQWMsR0FBRyxzQkFBc0IsR0FDakQsY0FBYyxHQUNkLGlCQUFpQixHQUNqQixjQUFjLEdBQ2QsZ0JBQWdCLEdBQ2hCLFdBQVcsQ0FBQztBQUVkLGVBQU8sTUFBTSxzQkFBc0IsRUFBRSxrQkFBa0IsQ0FBQyxjQUFjLENBNERyRSxDQUFDO0FBRUY7Ozs7R0FJRztBQUNILHdCQUFnQix3QkFBd0IsSUFBSSxjQUFjLENBRXpEO0FBRUQsZ0ZBQWdGO0FBQ2hGLHdCQUFnQixpQkFBaUIsQ0FBQyxNQUFNLEVBQUUsT0FBTyxDQUFDLGNBQWMsQ0FBQzs7Ozs7Ozs7RUFVaEUifQ==
|
package/dest/config.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,gBAAgB,EAA2B,MAAM,kCAAkC,CAAC;AAClG,OAAO,EAAE,KAAK,iBAAiB,EAA6B,MAAM,wBAAwB,CAAC;AAE3F,OAAO,EAAE,KAAK,cAAc,EAA0B,MAAM,2BAA2B,CAAC;AACxF,OAAO,EACL,KAAK,kBAAkB,EAIxB,MAAM,0BAA0B,CAAC;AAClC,OAAO,
|
|
1
|
+
{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,gBAAgB,EAA2B,MAAM,kCAAkC,CAAC;AAClG,OAAO,EAAE,KAAK,iBAAiB,EAA6B,MAAM,wBAAwB,CAAC;AAE3F,OAAO,EAAE,KAAK,cAAc,EAA0B,MAAM,2BAA2B,CAAC;AACxF,OAAO,EACL,KAAK,kBAAkB,EAIxB,MAAM,0BAA0B,CAAC;AAClC,OAAO,EACL,KAAK,WAAW,EAChB,KAAK,cAAc,EAGpB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,iCAAiC,CAAC;AAE9E;;;;;;GAMG;AACH,MAAM,MAAM,cAAc,GAAG,sBAAsB,GACjD,cAAc,GACd,iBAAiB,GACjB,cAAc,GACd,gBAAgB,GAChB,WAAW,CAAC;AAEd,eAAO,MAAM,sBAAsB,EAAE,kBAAkB,CAAC,cAAc,CA4DrE,CAAC;AAEF;;;;GAIG;AACH,wBAAgB,wBAAwB,IAAI,cAAc,CAEzD;AAED,gFAAgF;AAChF,wBAAgB,iBAAiB,CAAC,MAAM,EAAE,OAAO,CAAC,cAAc,CAAC;;;;;;;;EAUhE"}
|
package/dest/config.js
CHANGED
|
@@ -3,9 +3,10 @@ import { l1ContractsConfigMappings } from '@aztec/ethereum/config';
|
|
|
3
3
|
import { l1ContractAddressesMapping } from '@aztec/ethereum/l1-contract-addresses';
|
|
4
4
|
import { l1ReaderConfigMappings } from '@aztec/ethereum/l1-reader';
|
|
5
5
|
import { booleanConfigHelper, getConfigFromMappings, numberConfigHelper } from '@aztec/foundation/config';
|
|
6
|
-
import { chainConfigMappings } from '@aztec/stdlib/config';
|
|
6
|
+
import { chainConfigMappings, pipelineConfigMappings } from '@aztec/stdlib/config';
|
|
7
7
|
export const archiverConfigMappings = {
|
|
8
8
|
...blobClientConfigMapping,
|
|
9
|
+
...pipelineConfigMappings,
|
|
9
10
|
archiverPollingIntervalMS: {
|
|
10
11
|
env: 'ARCHIVER_POLLING_INTERVAL_MS',
|
|
11
12
|
description: 'The polling interval in ms for retrieving new L2 blocks and encrypted logs.',
|
|
@@ -23,13 +24,17 @@ export const archiverConfigMappings = {
|
|
|
23
24
|
},
|
|
24
25
|
archiverStoreMapSizeKb: {
|
|
25
26
|
env: 'ARCHIVER_STORE_MAP_SIZE_KB',
|
|
26
|
-
parseEnv: (val)
|
|
27
|
+
parseEnv: (val)=>+val,
|
|
27
28
|
description: 'The maximum possible size of the archiver DB in KB. Overwrites the general dataStoreMapSizeKb.'
|
|
28
29
|
},
|
|
29
30
|
skipValidateCheckpointAttestations: {
|
|
30
31
|
description: 'Skip validating checkpoint attestations (for testing purposes only)',
|
|
31
32
|
...booleanConfigHelper(false)
|
|
32
33
|
},
|
|
34
|
+
skipPromoteProposedCheckpointDuringL1Sync: {
|
|
35
|
+
description: 'Skip promoting proposed checkpoints during L1 sync (for testing purposes only)',
|
|
36
|
+
...booleanConfigHelper(false)
|
|
37
|
+
},
|
|
33
38
|
maxAllowedEthClientDriftSeconds: {
|
|
34
39
|
env: 'MAX_ALLOWED_ETH_CLIENT_DRIFT_SECONDS',
|
|
35
40
|
description: 'Maximum allowed drift in seconds between the Ethereum client and current time.',
|
|
@@ -40,6 +45,11 @@ export const archiverConfigMappings = {
|
|
|
40
45
|
description: 'Whether to allow starting the archiver without debug/trace method support on Ethereum hosts',
|
|
41
46
|
...booleanConfigHelper(true)
|
|
42
47
|
},
|
|
48
|
+
archiverSkipHistoricalLogsCheck: {
|
|
49
|
+
env: 'ARCHIVER_SKIP_HISTORICAL_LOGS_CHECK',
|
|
50
|
+
description: 'Skip the startup check that probes the L1 RPC for historical Rollup contract logs. ' + 'Set to true to bypass the check when the connected RPC node is known to prune old logs.',
|
|
51
|
+
...booleanConfigHelper(false)
|
|
52
|
+
},
|
|
43
53
|
...chainConfigMappings,
|
|
44
54
|
...l1ReaderConfigMappings,
|
|
45
55
|
viemPollingIntervalMS: {
|
|
@@ -65,7 +75,9 @@ export const archiverConfigMappings = {
|
|
|
65
75
|
pollingIntervalMs: config.archiverPollingIntervalMS,
|
|
66
76
|
batchSize: config.archiverBatchSize,
|
|
67
77
|
skipValidateCheckpointAttestations: config.skipValidateCheckpointAttestations,
|
|
78
|
+
skipPromoteProposedCheckpointDuringL1Sync: config.skipPromoteProposedCheckpointDuringL1Sync,
|
|
68
79
|
maxAllowedEthClientDriftSeconds: config.maxAllowedEthClientDriftSeconds,
|
|
69
|
-
ethereumAllowNoDebugHosts: config.ethereumAllowNoDebugHosts
|
|
80
|
+
ethereumAllowNoDebugHosts: config.ethereumAllowNoDebugHosts,
|
|
81
|
+
skipHistoricalLogsCheck: config.archiverSkipHistoricalLogsCheck
|
|
70
82
|
};
|
|
71
83
|
}
|
package/dest/errors.d.ts
CHANGED
|
@@ -11,7 +11,7 @@ export declare class InitialCheckpointNumberNotSequentialError extends Error {
|
|
|
11
11
|
constructor(newCheckpointNumber: number, previousCheckpointNumber: number | undefined);
|
|
12
12
|
}
|
|
13
13
|
export declare class CheckpointNumberNotSequentialError extends Error {
|
|
14
|
-
constructor(newCheckpointNumber: number, previous: number | undefined);
|
|
14
|
+
constructor(newCheckpointNumber: number, previous: number | undefined, source?: 'confirmed' | 'proposed');
|
|
15
15
|
}
|
|
16
16
|
export declare class BlockIndexNotSequentialError extends Error {
|
|
17
17
|
constructor(newBlockIndex: number, previousBlockIndex: number | undefined);
|
|
@@ -30,10 +30,52 @@ export declare class BlockAlreadyCheckpointedError extends Error {
|
|
|
30
30
|
readonly blockNumber: number;
|
|
31
31
|
constructor(blockNumber: number);
|
|
32
32
|
}
|
|
33
|
+
/** Thrown when logs are added for a tag whose last stored log has a higher block number than the new log. */
|
|
34
|
+
export declare class OutOfOrderLogInsertionError extends Error {
|
|
35
|
+
readonly logType: 'private' | 'public';
|
|
36
|
+
readonly tag: string;
|
|
37
|
+
readonly lastBlockNumber: number;
|
|
38
|
+
readonly newBlockNumber: number;
|
|
39
|
+
constructor(logType: 'private' | 'public', tag: string, lastBlockNumber: number, newBlockNumber: number);
|
|
40
|
+
}
|
|
41
|
+
/** Thrown when L1 to L2 messages are requested for a checkpoint whose message tree hasn't been sealed yet. */
|
|
42
|
+
export declare class L1ToL2MessagesNotReadyError extends Error {
|
|
43
|
+
readonly checkpointNumber: number;
|
|
44
|
+
readonly inboxTreeInProgress: bigint;
|
|
45
|
+
constructor(checkpointNumber: number, inboxTreeInProgress: bigint);
|
|
46
|
+
}
|
|
47
|
+
/** Thrown when a proposed checkpoint number is stale (already processed). */
|
|
48
|
+
export declare class ProposedCheckpointStaleError extends Error {
|
|
49
|
+
readonly proposedCheckpointNumber: number;
|
|
50
|
+
readonly currentProposedNumber: number;
|
|
51
|
+
constructor(proposedCheckpointNumber: number, currentProposedNumber: number);
|
|
52
|
+
}
|
|
53
|
+
/** Thrown when a proposed checkpoint number is not the expected confirmed + 1. */
|
|
54
|
+
export declare class ProposedCheckpointNotSequentialError extends Error {
|
|
55
|
+
readonly proposedCheckpointNumber: number;
|
|
56
|
+
readonly confirmedCheckpointNumber: number;
|
|
57
|
+
constructor(proposedCheckpointNumber: number, confirmedCheckpointNumber: number);
|
|
58
|
+
}
|
|
59
|
+
/** Thrown when attempting to promote a proposed checkpoint but no proposed checkpoint exists in the store. */
|
|
60
|
+
export declare class NoProposedCheckpointToPromoteError extends Error {
|
|
61
|
+
constructor();
|
|
62
|
+
}
|
|
63
|
+
/** Thrown when the archive root of the proposed checkpoint does not match the expected one. */
|
|
64
|
+
export declare class ProposedCheckpointArchiveRootMismatchError extends Error {
|
|
65
|
+
readonly expectedArchiveRoot: Fr;
|
|
66
|
+
readonly actualArchiveRoot: Fr;
|
|
67
|
+
constructor(expectedArchiveRoot: Fr, actualArchiveRoot: Fr);
|
|
68
|
+
}
|
|
69
|
+
/** Thrown when the proposed checkpoint does not directly follow the latest confirmed checkpoint. */
|
|
70
|
+
export declare class ProposedCheckpointPromotionNotSequentialError extends Error {
|
|
71
|
+
readonly proposedCheckpointNumber: number;
|
|
72
|
+
readonly latestCheckpointNumber: number;
|
|
73
|
+
constructor(proposedCheckpointNumber: number, latestCheckpointNumber: number);
|
|
74
|
+
}
|
|
33
75
|
/** Thrown when a proposed block conflicts with an already checkpointed block (different content). */
|
|
34
76
|
export declare class CannotOverwriteCheckpointedBlockError extends Error {
|
|
35
77
|
readonly blockNumber: number;
|
|
36
78
|
readonly lastCheckpointedBlock: number;
|
|
37
79
|
constructor(blockNumber: number, lastCheckpointedBlock: number);
|
|
38
80
|
}
|
|
39
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
81
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZXJyb3JzLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvZXJyb3JzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sS0FBSyxFQUFFLEVBQUUsRUFBRSxNQUFNLDJCQUEyQixDQUFDO0FBRXBELHFCQUFhLHNCQUF1QixTQUFRLEtBQUs7SUFDL0MsWUFBWSxVQUFVLEVBQUUsTUFBTSxFQUU3QjtDQUNGO0FBRUQscUJBQWEsNkJBQThCLFNBQVEsS0FBSztJQUN0RCxZQUFZLGNBQWMsRUFBRSxNQUFNLEVBQUUsUUFBUSxFQUFFLE1BQU0sR0FBRyxTQUFTLEVBRS9EO0NBQ0Y7QUFFRCxxQkFBYSx5Q0FBMEMsU0FBUSxLQUFLO2FBRWhELG1CQUFtQixFQUFFLE1BQU07YUFDM0Isd0JBQXdCLEVBQUUsTUFBTSxHQUFHLFNBQVM7SUFGOUQsWUFDa0IsbUJBQW1CLEVBQUUsTUFBTSxFQUMzQix3QkFBd0IsRUFBRSxNQUFNLEdBQUcsU0FBUyxFQU83RDtDQUNGO0FBRUQscUJBQWEsa0NBQW1DLFNBQVEsS0FBSztJQUMzRCxZQUNFLG1CQUFtQixFQUFFLE1BQU0sRUFDM0IsUUFBUSxFQUFFLE1BQU0sR0FBRyxTQUFTLEVBQzVCLE1BQU0sR0FBRSxXQUFXLEdBQUcsVUFBd0IsRUFLL0M7Q0FDRjtBQUVELHFCQUFhLDRCQUE2QixTQUFRLEtBQUs7SUFDckQsWUFBWSxhQUFhLEVBQUUsTUFBTSxFQUFFLGtCQUFrQixFQUFFLE1BQU0sR0FBRyxTQUFTLEVBSXhFO0NBQ0Y7QUFFRCxxQkFBYSw4QkFBK0IsU0FBUSxLQUFLO0lBQ3ZELFlBQ0UsY0FBYyxFQUFFLE1BQU0sRUFDdEIsbUJBQW1CLEVBQUUsTUFBTSxHQUFHLFNBQVMsRUFDdkMsZUFBZSxFQUFFLEVBQUUsRUFDbkIsb0JBQW9CLEVBQUUsRUFBRSxFQUt6QjtDQUNGO0FBRUQscUJBQWEsdUJBQXdCLFNBQVEsS0FBSztJQUNoRCxZQUFZLGdCQUFnQixFQUFFLE1BQU0sRUFFbkM7Q0FDRjtBQUVELHFCQUFhLGtCQUFtQixTQUFRLEtBQUs7SUFDM0MsWUFBWSxXQUFXLEVBQUUsTUFBTSxFQUU5QjtDQUNGO0FBRUQsdUhBQXVIO0FBQ3ZILHFCQUFhLDZCQUE4QixTQUFRLEtBQUs7YUFDMUIsV0FBVyxFQUFFLE1BQU07SUFBL0MsWUFBNEIsV0FBVyxFQUFFLE1BQU0sRUFHOUM7Q0FDRjtBQUVELDZHQUE2RztBQUM3RyxxQkFBYSwyQkFBNEIsU0FBUSxLQUFLO2FBRWxDLE9BQU8sRUFBRSxTQUFTLEdBQUcsUUFBUTthQUM3QixHQUFHLEVBQUUsTUFBTTthQUNYLGVBQWUsRUFBRSxNQUFNO2FBQ3ZCLGNBQWMsRUFBRSxNQUFNO0lBSnhDLFlBQ2tCLE9BQU8sRUFBRSxTQUFTLEdBQUcsUUFBUSxFQUM3QixHQUFHLEVBQUUsTUFBTSxFQUNYLGVBQWUsRUFBRSxNQUFNLEVBQ3ZCLGNBQWMsRUFBRSxNQUFNLEVBT3ZDO0NBQ0Y7QUFFRCw4R0FBOEc7QUFDOUcscUJBQWEsMkJBQTRCLFNBQVEsS0FBSzthQUVsQyxnQkFBZ0IsRUFBRSxNQUFNO2FBQ3hCLG1CQUFtQixFQUFFLE1BQU07SUFGN0MsWUFDa0IsZ0JBQWdCLEVBQUUsTUFBTSxFQUN4QixtQkFBbUIsRUFBRSxNQUFNLEVBTzVDO0NBQ0Y7QUFFRCw2RUFBNkU7QUFDN0UscUJBQWEsNEJBQTZCLFNBQVEsS0FBSzthQUVuQyx3QkFBd0IsRUFBRSxNQUFNO2FBQ2hDLHFCQUFxQixFQUFFLE1BQU07SUFGL0MsWUFDa0Isd0JBQXdCLEVBQUUsTUFBTSxFQUNoQyxxQkFBcUIsRUFBRSxNQUFNLEVBSTlDO0NBQ0Y7QUFFRCxrRkFBa0Y7QUFDbEYscUJBQWEsb0NBQXFDLFNBQVEsS0FBSzthQUUzQyx3QkFBd0IsRUFBRSxNQUFNO2FBQ2hDLHlCQUF5QixFQUFFLE1BQU07SUFGbkQsWUFDa0Isd0JBQXdCLEVBQUUsTUFBTSxFQUNoQyx5QkFBeUIsRUFBRSxNQUFNLEVBTWxEO0NBQ0Y7QUFFRCw4R0FBOEc7QUFDOUcscUJBQWEsa0NBQW1DLFNBQVEsS0FBSztJQUMzRCxjQUdDO0NBQ0Y7QUFFRCwrRkFBK0Y7QUFDL0YscUJBQWEsMENBQTJDLFNBQVEsS0FBSzthQUVqRCxtQkFBbUIsRUFBRSxFQUFFO2FBQ3ZCLGlCQUFpQixFQUFFLEVBQUU7SUFGdkMsWUFDa0IsbUJBQW1CLEVBQUUsRUFBRSxFQUN2QixpQkFBaUIsRUFBRSxFQUFFLEVBTXRDO0NBQ0Y7QUFFRCxvR0FBb0c7QUFDcEcscUJBQWEsNkNBQThDLFNBQVEsS0FBSzthQUVwRCx3QkFBd0IsRUFBRSxNQUFNO2FBQ2hDLHNCQUFzQixFQUFFLE1BQU07SUFGaEQsWUFDa0Isd0JBQXdCLEVBQUUsTUFBTSxFQUNoQyxzQkFBc0IsRUFBRSxNQUFNLEVBTS9DO0NBQ0Y7QUFFRCxxR0FBcUc7QUFDckcscUJBQWEscUNBQXNDLFNBQVEsS0FBSzthQUU1QyxXQUFXLEVBQUUsTUFBTTthQUNuQixxQkFBcUIsRUFBRSxNQUFNO0lBRi9DLFlBQ2tCLFdBQVcsRUFBRSxNQUFNLEVBQ25CLHFCQUFxQixFQUFFLE1BQU0sRUFNOUM7Q0FDRiJ9
|
package/dest/errors.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"errors.d.ts","sourceRoot":"","sources":["../src/errors.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,2BAA2B,CAAC;AAEpD,qBAAa,sBAAuB,SAAQ,KAAK;IAC/C,YAAY,UAAU,EAAE,MAAM,EAE7B;CACF;AAED,qBAAa,6BAA8B,SAAQ,KAAK;IACtD,YAAY,cAAc,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,SAAS,EAE/D;CACF;AAED,qBAAa,yCAA0C,SAAQ,KAAK;aAEhD,mBAAmB,EAAE,MAAM;aAC3B,wBAAwB,EAAE,MAAM,GAAG,SAAS;IAF9D,YACkB,mBAAmB,EAAE,MAAM,EAC3B,wBAAwB,EAAE,MAAM,GAAG,SAAS,EAO7D;CACF;AAED,qBAAa,kCAAmC,SAAQ,KAAK;IAC3D,
|
|
1
|
+
{"version":3,"file":"errors.d.ts","sourceRoot":"","sources":["../src/errors.ts"],"names":[],"mappings":"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"}
|
package/dest/errors.js
CHANGED
|
@@ -16,8 +16,8 @@ export class InitialCheckpointNumberNotSequentialError extends Error {
|
|
|
16
16
|
}
|
|
17
17
|
}
|
|
18
18
|
export class CheckpointNumberNotSequentialError extends Error {
|
|
19
|
-
constructor(newCheckpointNumber, previous){
|
|
20
|
-
super(`Cannot insert new checkpoint ${newCheckpointNumber} given previous checkpoint number
|
|
19
|
+
constructor(newCheckpointNumber, previous, source = 'confirmed'){
|
|
20
|
+
super(`Cannot insert new checkpoint ${newCheckpointNumber} given previous ${source} checkpoint number is ${previous ?? 'undefined'}`);
|
|
21
21
|
}
|
|
22
22
|
}
|
|
23
23
|
export class BlockIndexNotSequentialError extends Error {
|
|
@@ -47,6 +47,62 @@ export class BlockNotFoundError extends Error {
|
|
|
47
47
|
this.name = 'BlockAlreadyCheckpointedError';
|
|
48
48
|
}
|
|
49
49
|
}
|
|
50
|
+
/** Thrown when logs are added for a tag whose last stored log has a higher block number than the new log. */ export class OutOfOrderLogInsertionError extends Error {
|
|
51
|
+
logType;
|
|
52
|
+
tag;
|
|
53
|
+
lastBlockNumber;
|
|
54
|
+
newBlockNumber;
|
|
55
|
+
constructor(logType, tag, lastBlockNumber, newBlockNumber){
|
|
56
|
+
super(`Out-of-order ${logType} log insertion for tag ${tag}: ` + `last existing log is from block ${lastBlockNumber} but new log is from block ${newBlockNumber}`), this.logType = logType, this.tag = tag, this.lastBlockNumber = lastBlockNumber, this.newBlockNumber = newBlockNumber;
|
|
57
|
+
this.name = 'OutOfOrderLogInsertionError';
|
|
58
|
+
}
|
|
59
|
+
}
|
|
60
|
+
/** Thrown when L1 to L2 messages are requested for a checkpoint whose message tree hasn't been sealed yet. */ export class L1ToL2MessagesNotReadyError extends Error {
|
|
61
|
+
checkpointNumber;
|
|
62
|
+
inboxTreeInProgress;
|
|
63
|
+
constructor(checkpointNumber, inboxTreeInProgress){
|
|
64
|
+
super(`Cannot get L1 to L2 messages for checkpoint ${checkpointNumber}: ` + `inbox tree in progress is ${inboxTreeInProgress}, messages not yet sealed`), this.checkpointNumber = checkpointNumber, this.inboxTreeInProgress = inboxTreeInProgress;
|
|
65
|
+
this.name = 'L1ToL2MessagesNotReadyError';
|
|
66
|
+
}
|
|
67
|
+
}
|
|
68
|
+
/** Thrown when a proposed checkpoint number is stale (already processed). */ export class ProposedCheckpointStaleError extends Error {
|
|
69
|
+
proposedCheckpointNumber;
|
|
70
|
+
currentProposedNumber;
|
|
71
|
+
constructor(proposedCheckpointNumber, currentProposedNumber){
|
|
72
|
+
super(`Stale proposed checkpoint ${proposedCheckpointNumber}: current proposed is ${currentProposedNumber}`), this.proposedCheckpointNumber = proposedCheckpointNumber, this.currentProposedNumber = currentProposedNumber;
|
|
73
|
+
this.name = 'ProposedCheckpointStaleError';
|
|
74
|
+
}
|
|
75
|
+
}
|
|
76
|
+
/** Thrown when a proposed checkpoint number is not the expected confirmed + 1. */ export class ProposedCheckpointNotSequentialError extends Error {
|
|
77
|
+
proposedCheckpointNumber;
|
|
78
|
+
confirmedCheckpointNumber;
|
|
79
|
+
constructor(proposedCheckpointNumber, confirmedCheckpointNumber){
|
|
80
|
+
super(`Proposed checkpoint ${proposedCheckpointNumber} is not sequential: expected ${confirmedCheckpointNumber + 1} (confirmed + 1)`), this.proposedCheckpointNumber = proposedCheckpointNumber, this.confirmedCheckpointNumber = confirmedCheckpointNumber;
|
|
81
|
+
this.name = 'ProposedCheckpointNotSequentialError';
|
|
82
|
+
}
|
|
83
|
+
}
|
|
84
|
+
/** Thrown when attempting to promote a proposed checkpoint but no proposed checkpoint exists in the store. */ export class NoProposedCheckpointToPromoteError extends Error {
|
|
85
|
+
constructor(){
|
|
86
|
+
super('Cannot promote proposed checkpoint: no proposed checkpoint exists');
|
|
87
|
+
this.name = 'NoProposedCheckpointToPromoteError';
|
|
88
|
+
}
|
|
89
|
+
}
|
|
90
|
+
/** Thrown when the archive root of the proposed checkpoint does not match the expected one. */ export class ProposedCheckpointArchiveRootMismatchError extends Error {
|
|
91
|
+
expectedArchiveRoot;
|
|
92
|
+
actualArchiveRoot;
|
|
93
|
+
constructor(expectedArchiveRoot, actualArchiveRoot){
|
|
94
|
+
super(`Cannot promote proposed checkpoint: archive root mismatch (expected ${expectedArchiveRoot}, got ${actualArchiveRoot})`), this.expectedArchiveRoot = expectedArchiveRoot, this.actualArchiveRoot = actualArchiveRoot;
|
|
95
|
+
this.name = 'ProposedCheckpointArchiveRootMismatchError';
|
|
96
|
+
}
|
|
97
|
+
}
|
|
98
|
+
/** Thrown when the proposed checkpoint does not directly follow the latest confirmed checkpoint. */ export class ProposedCheckpointPromotionNotSequentialError extends Error {
|
|
99
|
+
proposedCheckpointNumber;
|
|
100
|
+
latestCheckpointNumber;
|
|
101
|
+
constructor(proposedCheckpointNumber, latestCheckpointNumber){
|
|
102
|
+
super(`Cannot promote proposed checkpoint: not sequential (latest ${latestCheckpointNumber}, proposed ${proposedCheckpointNumber})`), this.proposedCheckpointNumber = proposedCheckpointNumber, this.latestCheckpointNumber = latestCheckpointNumber;
|
|
103
|
+
this.name = 'ProposedCheckpointPromotionNotSequentialError';
|
|
104
|
+
}
|
|
105
|
+
}
|
|
50
106
|
/** Thrown when a proposed block conflicts with an already checkpointed block (different content). */ export class CannotOverwriteCheckpointedBlockError extends Error {
|
|
51
107
|
blockNumber;
|
|
52
108
|
lastCheckpointedBlock;
|
package/dest/factory.d.ts
CHANGED
|
@@ -15,6 +15,6 @@ export declare function createArchiverStore(userConfig: Pick<ArchiverConfig, 'ar
|
|
|
15
15
|
export declare function createArchiver(config: ArchiverConfig & DataStoreConfig, deps: ArchiverDeps, opts?: {
|
|
16
16
|
blockUntilSync: boolean;
|
|
17
17
|
}): Promise<Archiver>;
|
|
18
|
-
/** Registers protocol contracts in the archiver store. */
|
|
18
|
+
/** Registers protocol contracts in the archiver store. Idempotent — skips contracts that already exist (e.g. on node restart). */
|
|
19
19
|
export declare function registerProtocolContracts(store: KVArchiverDataStore): Promise<void>;
|
|
20
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
20
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZmFjdG9yeS5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vc3JjL2ZhY3RvcnkudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBZ0JBLE9BQU8sS0FBSyxFQUFFLGVBQWUsRUFBRSxNQUFNLHdCQUF3QixDQUFDO0FBTTlELE9BQU8sRUFBRSxRQUFRLEVBQUUsS0FBSyxZQUFZLEVBQUUsTUFBTSxlQUFlLENBQUM7QUFDNUQsT0FBTyxFQUFFLEtBQUssY0FBYyxFQUFxQixNQUFNLGFBQWEsQ0FBQztBQUdyRSxPQUFPLEVBQXVCLG1CQUFtQixFQUFFLE1BQU0sOEJBQThCLENBQUM7QUFHeEYsZUFBTyxNQUFNLG1CQUFtQixhQUFhLENBQUM7QUFFOUMsaUNBQWlDO0FBQ2pDLHdCQUFzQixtQkFBbUIsQ0FDdkMsVUFBVSxFQUFFLElBQUksQ0FBQyxjQUFjLEVBQUUsd0JBQXdCLEdBQUcsU0FBUyxDQUFDLEdBQUcsZUFBZSxnQ0FRekY7QUFFRDs7Ozs7O0dBTUc7QUFDSCx3QkFBc0IsY0FBYyxDQUNsQyxNQUFNLEVBQUUsY0FBYyxHQUFHLGVBQWUsRUFDeEMsSUFBSSxFQUFFLFlBQVksRUFDbEIsSUFBSSxHQUFFO0lBQUUsY0FBYyxFQUFFLE9BQU8sQ0FBQTtDQUE2QixHQUMzRCxPQUFPLENBQUMsUUFBUSxDQUFDLENBd0huQjtBQUVELG9JQUFrSTtBQUNsSSx3QkFBc0IseUJBQXlCLENBQUMsS0FBSyxFQUFFLG1CQUFtQixpQkF5QnpFIn0=
|
package/dest/factory.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"factory.d.ts","sourceRoot":"","sources":["../src/factory.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"factory.d.ts","sourceRoot":"","sources":["../src/factory.ts"],"names":[],"mappings":"AAgBA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAM9D,OAAO,EAAE,QAAQ,EAAE,KAAK,YAAY,EAAE,MAAM,eAAe,CAAC;AAC5D,OAAO,EAAE,KAAK,cAAc,EAAqB,MAAM,aAAa,CAAC;AAGrE,OAAO,EAAuB,mBAAmB,EAAE,MAAM,8BAA8B,CAAC;AAGxF,eAAO,MAAM,mBAAmB,aAAa,CAAC;AAE9C,iCAAiC;AACjC,wBAAsB,mBAAmB,CACvC,UAAU,EAAE,IAAI,CAAC,cAAc,EAAE,wBAAwB,GAAG,SAAS,CAAC,GAAG,eAAe,gCAQzF;AAED;;;;;;GAMG;AACH,wBAAsB,cAAc,CAClC,MAAM,EAAE,cAAc,GAAG,eAAe,EACxC,IAAI,EAAE,YAAY,EAClB,IAAI,GAAE;IAAE,cAAc,EAAE,OAAO,CAAA;CAA6B,GAC3D,OAAO,CAAC,QAAQ,CAAC,CAwHnB;AAED,oIAAkI;AAClI,wBAAsB,yBAAyB,CAAC,KAAK,EAAE,mBAAmB,iBAyBzE"}
|
package/dest/factory.js
CHANGED
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { EpochCache } from '@aztec/epoch-cache';
|
|
2
2
|
import { createEthereumChain } from '@aztec/ethereum/chain';
|
|
3
|
+
import { makeL1HttpTransport } from '@aztec/ethereum/client';
|
|
3
4
|
import { InboxContract, RollupContract } from '@aztec/ethereum/contracts';
|
|
4
5
|
import { BlockNumber } from '@aztec/foundation/branded-types';
|
|
5
6
|
import { Buffer32 } from '@aztec/foundation/buffer';
|
|
@@ -13,7 +14,7 @@ import { FunctionType, decodeFunctionSignature } from '@aztec/stdlib/abi';
|
|
|
13
14
|
import { computePublicBytecodeCommitment } from '@aztec/stdlib/contract';
|
|
14
15
|
import { getTelemetryClient } from '@aztec/telemetry-client';
|
|
15
16
|
import { EventEmitter } from 'events';
|
|
16
|
-
import { createPublicClient
|
|
17
|
+
import { createPublicClient } from 'viem';
|
|
17
18
|
import { Archiver } from './archiver.js';
|
|
18
19
|
import { mapArchiverConfig } from './config.js';
|
|
19
20
|
import { ArchiverInstrumentation } from './modules/instrumentation.js';
|
|
@@ -42,20 +43,21 @@ export const ARCHIVER_STORE_NAME = 'archiver';
|
|
|
42
43
|
await registerProtocolContracts(archiverStore);
|
|
43
44
|
// Create Ethereum clients
|
|
44
45
|
const chain = createEthereumChain(config.l1RpcUrls, config.l1ChainId);
|
|
46
|
+
const httpTimeout = config.l1HttpTimeoutMS;
|
|
45
47
|
const publicClient = createPublicClient({
|
|
46
48
|
chain: chain.chainInfo,
|
|
47
|
-
transport:
|
|
48
|
-
|
|
49
|
-
|
|
49
|
+
transport: makeL1HttpTransport(config.l1RpcUrls, {
|
|
50
|
+
timeout: httpTimeout
|
|
51
|
+
}),
|
|
50
52
|
pollingInterval: config.viemPollingIntervalMS
|
|
51
53
|
});
|
|
52
54
|
// Create debug client using debug RPC URLs if available, otherwise fall back to regular RPC URLs
|
|
53
55
|
const debugRpcUrls = config.l1DebugRpcUrls.length > 0 ? config.l1DebugRpcUrls : config.l1RpcUrls;
|
|
54
56
|
const debugClient = createPublicClient({
|
|
55
57
|
chain: chain.chainInfo,
|
|
56
|
-
transport:
|
|
57
|
-
|
|
58
|
-
|
|
58
|
+
transport: makeL1HttpTransport(debugRpcUrls, {
|
|
59
|
+
timeout: httpTimeout
|
|
60
|
+
}),
|
|
59
61
|
pollingInterval: config.viemPollingIntervalMS
|
|
60
62
|
});
|
|
61
63
|
// Create L1 contract instances
|
|
@@ -92,7 +94,8 @@ export const ARCHIVER_STORE_NAME = 'archiver';
|
|
|
92
94
|
pollingIntervalMs: 10_000,
|
|
93
95
|
batchSize: 100,
|
|
94
96
|
maxAllowedEthClientDriftSeconds: 300,
|
|
95
|
-
ethereumAllowNoDebugHosts: false
|
|
97
|
+
ethereumAllowNoDebugHosts: false,
|
|
98
|
+
skipHistoricalLogsCheck: false
|
|
96
99
|
}, mapArchiverConfig(config));
|
|
97
100
|
const epochCache = deps.epochCache ?? await EpochCache.create(config.l1Contracts.rollupAddress, config, deps);
|
|
98
101
|
const telemetry = deps.telemetry ?? getTelemetryClient();
|
|
@@ -110,23 +113,24 @@ export const ARCHIVER_STORE_NAME = 'archiver';
|
|
|
110
113
|
await archiver.start(opts.blockUntilSync);
|
|
111
114
|
return archiver;
|
|
112
115
|
}
|
|
113
|
-
/** Registers protocol contracts in the archiver store. */ export async function registerProtocolContracts(store) {
|
|
116
|
+
/** Registers protocol contracts in the archiver store. Idempotent — skips contracts that already exist (e.g. on node restart). */ export async function registerProtocolContracts(store) {
|
|
114
117
|
const blockNumber = 0;
|
|
115
118
|
for (const name of protocolContractNames){
|
|
116
119
|
const provider = new BundledProtocolContractsProvider();
|
|
117
120
|
const contract = await provider.getProtocolContractArtifact(name);
|
|
121
|
+
// Skip if already registered (happens on node restart with a persisted store).
|
|
122
|
+
if (await store.getContractClass(contract.contractClass.id)) {
|
|
123
|
+
continue;
|
|
124
|
+
}
|
|
125
|
+
const publicBytecodeCommitment = await computePublicBytecodeCommitment(contract.contractClass.packedBytecode);
|
|
118
126
|
const contractClassPublic = {
|
|
119
127
|
...contract.contractClass,
|
|
120
|
-
|
|
121
|
-
utilityFunctions: []
|
|
128
|
+
publicBytecodeCommitment
|
|
122
129
|
};
|
|
123
130
|
const publicFunctionSignatures = contract.artifact.functions.filter((fn)=>fn.functionType === FunctionType.PUBLIC).map((fn)=>decodeFunctionSignature(fn.name, fn.parameters));
|
|
124
131
|
await store.registerContractFunctionSignatures(publicFunctionSignatures);
|
|
125
|
-
const bytecodeCommitment = await computePublicBytecodeCommitment(contractClassPublic.packedBytecode);
|
|
126
132
|
await store.addContractClasses([
|
|
127
133
|
contractClassPublic
|
|
128
|
-
], [
|
|
129
|
-
bytecodeCommitment
|
|
130
134
|
], BlockNumber(blockNumber));
|
|
131
135
|
await store.addContractInstances([
|
|
132
136
|
contract.instance
|