@aztec/archiver 0.0.1-commit.934299a21 → 0.0.1-commit.949a33fd8
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 +18 -10
- package/dest/archiver.d.ts.map +1 -1
- package/dest/archiver.js +146 -57
- package/dest/config.d.ts +5 -3
- package/dest/config.d.ts.map +1 -1
- package/dest/config.js +16 -4
- package/dest/errors.d.ts +61 -10
- package/dest/errors.d.ts.map +1 -1
- package/dest/errors.js +88 -14
- package/dest/factory.d.ts +4 -5
- package/dest/factory.d.ts.map +1 -1
- package/dest/factory.js +26 -22
- 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 +2 -1
- package/dest/l1/calldata_retriever.d.ts.map +1 -1
- package/dest/l1/calldata_retriever.js +11 -5
- package/dest/l1/data_retrieval.d.ts +24 -12
- package/dest/l1/data_retrieval.d.ts.map +1 -1
- package/dest/l1/data_retrieval.js +36 -37
- 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 +12 -6
- package/dest/modules/data_source_base.d.ts.map +1 -1
- package/dest/modules/data_source_base.js +24 -6
- package/dest/modules/data_store_updater.d.ts +28 -15
- package/dest/modules/data_store_updater.d.ts.map +1 -1
- package/dest/modules/data_store_updater.js +102 -80
- 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 +8 -2
- package/dest/modules/l1_synchronizer.d.ts.map +1 -1
- package/dest/modules/l1_synchronizer.js +292 -144
- package/dest/modules/validation.d.ts +4 -3
- package/dest/modules/validation.d.ts.map +1 -1
- package/dest/modules/validation.js +6 -6
- package/dest/store/block_store.d.ts +83 -17
- package/dest/store/block_store.d.ts.map +1 -1
- package/dest/store/block_store.js +399 -124
- 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 +70 -23
- package/dest/store/kv_archiver_store.d.ts.map +1 -1
- package/dest/store/kv_archiver_store.js +88 -27
- 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 +21 -9
- package/dest/test/fake_l1_state.d.ts +20 -1
- package/dest/test/fake_l1_state.d.ts.map +1 -1
- package/dest/test/fake_l1_state.js +114 -18
- 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 +19 -4
- package/dest/test/mock_l2_block_source.d.ts.map +1 -1
- package/dest/test/mock_l2_block_source.js +57 -7
- package/dest/test/mock_structs.d.ts +4 -1
- package/dest/test/mock_structs.d.ts.map +1 -1
- package/dest/test/mock_structs.js +13 -1
- package/dest/test/noop_l1_archiver.d.ts +4 -1
- package/dest/test/noop_l1_archiver.d.ts.map +1 -1
- package/dest/test/noop_l1_archiver.js +9 -3
- package/package.json +13 -13
- package/src/archiver.ts +179 -56
- package/src/config.ts +23 -2
- package/src/errors.ts +133 -22
- package/src/factory.ts +24 -15
- package/src/index.ts +2 -1
- package/src/l1/calldata_retriever.ts +17 -5
- package/src/l1/data_retrieval.ts +52 -53
- package/src/l1/validate_historical_logs.ts +140 -0
- package/src/modules/data_source_base.ts +43 -7
- package/src/modules/data_store_updater.ts +126 -109
- package/src/modules/instrumentation.ts +27 -7
- package/src/modules/l1_synchronizer.ts +371 -178
- package/src/modules/validation.ts +10 -9
- package/src/store/block_store.ts +489 -143
- 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 +133 -39
- package/src/store/l2_tips_cache.ts +58 -13
- package/src/store/log_store.ts +128 -32
- package/src/store/message_store.ts +27 -10
- package/src/structs/inbox_message.ts +1 -1
- package/src/test/fake_l1_state.ts +142 -29
- package/src/test/mock_l1_to_l2_message_source.ts +1 -0
- package/src/test/mock_l2_block_source.ts +73 -5
- package/src/test/mock_structs.ts +20 -6
- package/src/test/noop_l1_archiver.ts +10 -2
package/dest/errors.d.ts
CHANGED
|
@@ -1,12 +1,8 @@
|
|
|
1
|
+
import type { BlockNumber, CheckpointNumber } from '@aztec/foundation/branded-types';
|
|
1
2
|
import type { Fr } from '@aztec/foundation/schemas';
|
|
2
3
|
export declare class NoBlobBodiesFoundError extends Error {
|
|
3
4
|
constructor(l2BlockNum: number);
|
|
4
5
|
}
|
|
5
|
-
export declare class InitialBlockNumberNotSequentialError extends Error {
|
|
6
|
-
readonly newBlockNumber: number;
|
|
7
|
-
readonly previousBlockNumber: number | undefined;
|
|
8
|
-
constructor(newBlockNumber: number, previousBlockNumber: number | undefined);
|
|
9
|
-
}
|
|
10
6
|
export declare class BlockNumberNotSequentialError extends Error {
|
|
11
7
|
constructor(newBlockNumber: number, previous: number | undefined);
|
|
12
8
|
}
|
|
@@ -15,11 +11,11 @@ export declare class InitialCheckpointNumberNotSequentialError extends Error {
|
|
|
15
11
|
readonly previousCheckpointNumber: number | undefined;
|
|
16
12
|
constructor(newCheckpointNumber: number, previousCheckpointNumber: number | undefined);
|
|
17
13
|
}
|
|
18
|
-
export declare class
|
|
19
|
-
constructor(
|
|
14
|
+
export declare class BlockCheckpointNumberNotSequentialError extends Error {
|
|
15
|
+
constructor(blockNumber: BlockNumber, blockCheckpointNumber: CheckpointNumber, previous: CheckpointNumber | undefined);
|
|
20
16
|
}
|
|
21
|
-
export declare class
|
|
22
|
-
constructor(newCheckpointNumber:
|
|
17
|
+
export declare class CheckpointNumberNotSequentialError extends Error {
|
|
18
|
+
constructor(newCheckpointNumber: CheckpointNumber, previous: CheckpointNumber | undefined);
|
|
23
19
|
}
|
|
24
20
|
export declare class BlockIndexNotSequentialError extends Error {
|
|
25
21
|
constructor(newBlockIndex: number, previousBlockIndex: number | undefined);
|
|
@@ -33,9 +29,64 @@ export declare class CheckpointNotFoundError extends Error {
|
|
|
33
29
|
export declare class BlockNotFoundError extends Error {
|
|
34
30
|
constructor(blockNumber: number);
|
|
35
31
|
}
|
|
32
|
+
/** Thrown when a proposed block matches a block that was already checkpointed. This is expected for late proposals. */
|
|
33
|
+
export declare class BlockAlreadyCheckpointedError extends Error {
|
|
34
|
+
readonly blockNumber: number;
|
|
35
|
+
constructor(blockNumber: number);
|
|
36
|
+
}
|
|
37
|
+
/** Thrown when logs are added for a tag whose last stored log has a higher block number than the new log. */
|
|
38
|
+
export declare class OutOfOrderLogInsertionError extends Error {
|
|
39
|
+
readonly logType: 'private' | 'public';
|
|
40
|
+
readonly tag: string;
|
|
41
|
+
readonly lastBlockNumber: number;
|
|
42
|
+
readonly newBlockNumber: number;
|
|
43
|
+
constructor(logType: 'private' | 'public', tag: string, lastBlockNumber: number, newBlockNumber: number);
|
|
44
|
+
}
|
|
45
|
+
/** Thrown when L1 to L2 messages are requested for a checkpoint whose message tree hasn't been sealed yet. */
|
|
46
|
+
export declare class L1ToL2MessagesNotReadyError extends Error {
|
|
47
|
+
readonly checkpointNumber: number;
|
|
48
|
+
readonly inboxTreeInProgress: bigint;
|
|
49
|
+
constructor(checkpointNumber: number, inboxTreeInProgress: bigint);
|
|
50
|
+
}
|
|
51
|
+
/** Thrown when a proposed checkpoint number is stale (already processed). */
|
|
52
|
+
export declare class ProposedCheckpointStaleError extends Error {
|
|
53
|
+
readonly proposedCheckpointNumber: number;
|
|
54
|
+
readonly currentProposedNumber: number;
|
|
55
|
+
constructor(proposedCheckpointNumber: number, currentProposedNumber: number);
|
|
56
|
+
}
|
|
57
|
+
/** Thrown when a proposed checkpoint number is not the expected latestTip + 1. */
|
|
58
|
+
export declare class ProposedCheckpointNotSequentialError extends Error {
|
|
59
|
+
readonly proposedCheckpointNumber: number;
|
|
60
|
+
readonly latestTipNumber: number;
|
|
61
|
+
constructor(proposedCheckpointNumber: number, latestTipNumber: number);
|
|
62
|
+
}
|
|
63
|
+
/** Thrown when a proposed checkpoint or block L2 slot has already expired on L1. */
|
|
64
|
+
export declare class BlockOrCheckpointSlotExpiredError extends Error {
|
|
65
|
+
readonly slot: number;
|
|
66
|
+
readonly nextSlotStart: bigint;
|
|
67
|
+
readonly l1TimestampSynced: bigint | undefined;
|
|
68
|
+
constructor(slot: number, nextSlotStart: bigint, l1TimestampSynced: bigint | undefined);
|
|
69
|
+
}
|
|
70
|
+
/** Thrown when attempting to promote a proposed checkpoint but no proposed checkpoint exists in the store. */
|
|
71
|
+
export declare class NoProposedCheckpointToPromoteError extends Error {
|
|
72
|
+
constructor();
|
|
73
|
+
}
|
|
74
|
+
/** Thrown when the archive root of the proposed checkpoint does not match the expected one. */
|
|
75
|
+
export declare class ProposedCheckpointArchiveRootMismatchError extends Error {
|
|
76
|
+
readonly expectedArchiveRoot: Fr;
|
|
77
|
+
readonly actualArchiveRoot: Fr;
|
|
78
|
+
constructor(expectedArchiveRoot: Fr, actualArchiveRoot: Fr);
|
|
79
|
+
}
|
|
80
|
+
/** Thrown when the proposed checkpoint does not directly follow the latest confirmed checkpoint. */
|
|
81
|
+
export declare class ProposedCheckpointPromotionNotSequentialError extends Error {
|
|
82
|
+
readonly proposedCheckpointNumber: number;
|
|
83
|
+
readonly latestCheckpointNumber: number;
|
|
84
|
+
constructor(proposedCheckpointNumber: number, latestCheckpointNumber: number);
|
|
85
|
+
}
|
|
86
|
+
/** Thrown when a proposed block conflicts with an already checkpointed block (different content). */
|
|
36
87
|
export declare class CannotOverwriteCheckpointedBlockError extends Error {
|
|
37
88
|
readonly blockNumber: number;
|
|
38
89
|
readonly lastCheckpointedBlock: number;
|
|
39
90
|
constructor(blockNumber: number, lastCheckpointedBlock: number);
|
|
40
91
|
}
|
|
41
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
92
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZXJyb3JzLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvZXJyb3JzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sS0FBSyxFQUFFLFdBQVcsRUFBRSxnQkFBZ0IsRUFBRSxNQUFNLGlDQUFpQyxDQUFDO0FBQ3JGLE9BQU8sS0FBSyxFQUFFLEVBQUUsRUFBRSxNQUFNLDJCQUEyQixDQUFDO0FBRXBELHFCQUFhLHNCQUF1QixTQUFRLEtBQUs7SUFDL0MsWUFBWSxVQUFVLEVBQUUsTUFBTSxFQUc3QjtDQUNGO0FBRUQscUJBQWEsNkJBQThCLFNBQVEsS0FBSztJQUN0RCxZQUFZLGNBQWMsRUFBRSxNQUFNLEVBQUUsUUFBUSxFQUFFLE1BQU0sR0FBRyxTQUFTLEVBRy9EO0NBQ0Y7QUFFRCxxQkFBYSx5Q0FBMEMsU0FBUSxLQUFLO2FBRWhELG1CQUFtQixFQUFFLE1BQU07YUFDM0Isd0JBQXdCLEVBQUUsTUFBTSxHQUFHLFNBQVM7SUFGOUQsWUFDa0IsbUJBQW1CLEVBQUUsTUFBTSxFQUMzQix3QkFBd0IsRUFBRSxNQUFNLEdBQUcsU0FBUyxFQVE3RDtDQUNGO0FBRUQscUJBQWEsdUNBQXdDLFNBQVEsS0FBSztJQUNoRSxZQUNFLFdBQVcsRUFBRSxXQUFXLEVBQ3hCLHFCQUFxQixFQUFFLGdCQUFnQixFQUN2QyxRQUFRLEVBQUUsZ0JBQWdCLEdBQUcsU0FBUyxFQU12QztDQUNGO0FBRUQscUJBQWEsa0NBQW1DLFNBQVEsS0FBSztJQUMzRCxZQUFZLG1CQUFtQixFQUFFLGdCQUFnQixFQUFFLFFBQVEsRUFBRSxnQkFBZ0IsR0FBRyxTQUFTLEVBS3hGO0NBQ0Y7QUFFRCxxQkFBYSw0QkFBNkIsU0FBUSxLQUFLO0lBQ3JELFlBQVksYUFBYSxFQUFFLE1BQU0sRUFBRSxrQkFBa0IsRUFBRSxNQUFNLEdBQUcsU0FBUyxFQUt4RTtDQUNGO0FBRUQscUJBQWEsOEJBQStCLFNBQVEsS0FBSztJQUN2RCxZQUNFLGNBQWMsRUFBRSxN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
|
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,
|
|
1
|
+
{"version":3,"file":"errors.d.ts","sourceRoot":"","sources":["../src/errors.ts"],"names":[],"mappings":"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"}
|
package/dest/errors.js
CHANGED
|
@@ -1,18 +1,13 @@
|
|
|
1
1
|
export class NoBlobBodiesFoundError extends Error {
|
|
2
2
|
constructor(l2BlockNum){
|
|
3
3
|
super(`No blob bodies found for block ${l2BlockNum}`);
|
|
4
|
-
|
|
5
|
-
}
|
|
6
|
-
export class InitialBlockNumberNotSequentialError extends Error {
|
|
7
|
-
newBlockNumber;
|
|
8
|
-
previousBlockNumber;
|
|
9
|
-
constructor(newBlockNumber, previousBlockNumber){
|
|
10
|
-
super(`Cannot insert new block ${newBlockNumber} given previous block number in store is ${previousBlockNumber ?? 'undefined'}`), this.newBlockNumber = newBlockNumber, this.previousBlockNumber = previousBlockNumber;
|
|
4
|
+
this.name = 'NoBlobBodiesFoundError';
|
|
11
5
|
}
|
|
12
6
|
}
|
|
13
7
|
export class BlockNumberNotSequentialError extends Error {
|
|
14
8
|
constructor(newBlockNumber, previous){
|
|
15
|
-
super(`Cannot insert new block ${newBlockNumber} given previous block number
|
|
9
|
+
super(`Cannot insert new block ${newBlockNumber} given previous block number is ${previous ?? 'undefined'}`);
|
|
10
|
+
this.name = 'BlockNumberNotSequentialError';
|
|
16
11
|
}
|
|
17
12
|
}
|
|
18
13
|
export class InitialCheckpointNumberNotSequentialError extends Error {
|
|
@@ -20,39 +15,118 @@ export class InitialCheckpointNumberNotSequentialError extends Error {
|
|
|
20
15
|
previousCheckpointNumber;
|
|
21
16
|
constructor(newCheckpointNumber, previousCheckpointNumber){
|
|
22
17
|
super(`Cannot insert new checkpoint ${newCheckpointNumber} given previous checkpoint number in store is ${previousCheckpointNumber ?? 'undefined'}`), this.newCheckpointNumber = newCheckpointNumber, this.previousCheckpointNumber = previousCheckpointNumber;
|
|
18
|
+
this.name = 'InitialCheckpointNumberNotSequentialError';
|
|
23
19
|
}
|
|
24
20
|
}
|
|
25
|
-
export class
|
|
26
|
-
constructor(
|
|
27
|
-
super(`Cannot insert new checkpoint ${
|
|
21
|
+
export class BlockCheckpointNumberNotSequentialError extends Error {
|
|
22
|
+
constructor(blockNumber, blockCheckpointNumber, previous){
|
|
23
|
+
super(`Cannot insert new block ${blockNumber} for checkpoint ${blockCheckpointNumber} given previous checkpoint number is ${previous ?? 'undefined'}`);
|
|
24
|
+
this.name = 'BlockCheckpointNumberNotSequentialError';
|
|
28
25
|
}
|
|
29
26
|
}
|
|
30
|
-
export class
|
|
27
|
+
export class CheckpointNumberNotSequentialError extends Error {
|
|
31
28
|
constructor(newCheckpointNumber, previous){
|
|
32
|
-
super(`Cannot insert
|
|
29
|
+
super(`Cannot insert new checkpoint ${newCheckpointNumber} given previous checkpoint number is ${previous ?? 'undefined'}`);
|
|
30
|
+
this.name = 'CheckpointNumberNotSequentialError';
|
|
33
31
|
}
|
|
34
32
|
}
|
|
35
33
|
export class BlockIndexNotSequentialError extends Error {
|
|
36
34
|
constructor(newBlockIndex, previousBlockIndex){
|
|
37
35
|
super(`Cannot insert new block at checkpoint index ${newBlockIndex} given previous block index is ${previousBlockIndex ?? 'undefined'}`);
|
|
36
|
+
this.name = 'BlockIndexNotSequentialError';
|
|
38
37
|
}
|
|
39
38
|
}
|
|
40
39
|
export class BlockArchiveNotConsistentError extends Error {
|
|
41
40
|
constructor(newBlockNumber, previousBlockNumber, newBlockArchive, previousBlockArchive){
|
|
42
41
|
super(`Cannot insert new block number ${newBlockNumber} with archive ${newBlockArchive.toString()} previous block number is ${previousBlockNumber ?? 'undefined'}, previous archive is ${previousBlockArchive?.toString() ?? 'undefined'}`);
|
|
42
|
+
this.name = 'BlockArchiveNotConsistentError';
|
|
43
43
|
}
|
|
44
44
|
}
|
|
45
45
|
export class CheckpointNotFoundError extends Error {
|
|
46
46
|
constructor(checkpointNumber){
|
|
47
47
|
super(`Failed to find expected checkpoint number ${checkpointNumber}`);
|
|
48
|
+
this.name = 'CheckpointNotFoundError';
|
|
48
49
|
}
|
|
49
50
|
}
|
|
50
51
|
export class BlockNotFoundError extends Error {
|
|
51
52
|
constructor(blockNumber){
|
|
52
53
|
super(`Failed to find expected block number ${blockNumber}`);
|
|
54
|
+
this.name = 'BlockNotFoundError';
|
|
55
|
+
}
|
|
56
|
+
}
|
|
57
|
+
/** Thrown when a proposed block matches a block that was already checkpointed. This is expected for late proposals. */ export class BlockAlreadyCheckpointedError extends Error {
|
|
58
|
+
blockNumber;
|
|
59
|
+
constructor(blockNumber){
|
|
60
|
+
super(`Block ${blockNumber} has already been checkpointed with the same content`), this.blockNumber = blockNumber;
|
|
61
|
+
this.name = 'BlockAlreadyCheckpointedError';
|
|
62
|
+
}
|
|
63
|
+
}
|
|
64
|
+
/** 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 {
|
|
65
|
+
logType;
|
|
66
|
+
tag;
|
|
67
|
+
lastBlockNumber;
|
|
68
|
+
newBlockNumber;
|
|
69
|
+
constructor(logType, tag, lastBlockNumber, newBlockNumber){
|
|
70
|
+
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;
|
|
71
|
+
this.name = 'OutOfOrderLogInsertionError';
|
|
72
|
+
}
|
|
73
|
+
}
|
|
74
|
+
/** Thrown when L1 to L2 messages are requested for a checkpoint whose message tree hasn't been sealed yet. */ export class L1ToL2MessagesNotReadyError extends Error {
|
|
75
|
+
checkpointNumber;
|
|
76
|
+
inboxTreeInProgress;
|
|
77
|
+
constructor(checkpointNumber, inboxTreeInProgress){
|
|
78
|
+
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;
|
|
79
|
+
this.name = 'L1ToL2MessagesNotReadyError';
|
|
80
|
+
}
|
|
81
|
+
}
|
|
82
|
+
/** Thrown when a proposed checkpoint number is stale (already processed). */ export class ProposedCheckpointStaleError extends Error {
|
|
83
|
+
proposedCheckpointNumber;
|
|
84
|
+
currentProposedNumber;
|
|
85
|
+
constructor(proposedCheckpointNumber, currentProposedNumber){
|
|
86
|
+
super(`Stale proposed checkpoint ${proposedCheckpointNumber}: current proposed is ${currentProposedNumber}`), this.proposedCheckpointNumber = proposedCheckpointNumber, this.currentProposedNumber = currentProposedNumber;
|
|
87
|
+
this.name = 'ProposedCheckpointStaleError';
|
|
88
|
+
}
|
|
89
|
+
}
|
|
90
|
+
/** Thrown when a proposed checkpoint number is not the expected latestTip + 1. */ export class ProposedCheckpointNotSequentialError extends Error {
|
|
91
|
+
proposedCheckpointNumber;
|
|
92
|
+
latestTipNumber;
|
|
93
|
+
constructor(proposedCheckpointNumber, latestTipNumber){
|
|
94
|
+
super(`Proposed checkpoint ${proposedCheckpointNumber} is not sequential: expected ${latestTipNumber + 1} (latest tip + 1, where tip is highest of confirmed or pending)`), this.proposedCheckpointNumber = proposedCheckpointNumber, this.latestTipNumber = latestTipNumber;
|
|
95
|
+
this.name = 'ProposedCheckpointNotSequentialError';
|
|
96
|
+
}
|
|
97
|
+
}
|
|
98
|
+
/** Thrown when a proposed checkpoint or block L2 slot has already expired on L1. */ export class BlockOrCheckpointSlotExpiredError extends Error {
|
|
99
|
+
slot;
|
|
100
|
+
nextSlotStart;
|
|
101
|
+
l1TimestampSynced;
|
|
102
|
+
constructor(slot, nextSlotStart, l1TimestampSynced){
|
|
103
|
+
super(`Checkpoint or block for slot ${slot} is expired: L1 synced to ${l1TimestampSynced} which is past the next slot start ${nextSlotStart}. ` + `If the checkpoint still lands via a late L1 tx, the archiver will pick it up via normal L1-sync (not the pending-queue shortcut).`), this.slot = slot, this.nextSlotStart = nextSlotStart, this.l1TimestampSynced = l1TimestampSynced;
|
|
104
|
+
this.name = 'BlockOrCheckpointSlotExpiredError';
|
|
105
|
+
}
|
|
106
|
+
}
|
|
107
|
+
/** Thrown when attempting to promote a proposed checkpoint but no proposed checkpoint exists in the store. */ export class NoProposedCheckpointToPromoteError extends Error {
|
|
108
|
+
constructor(){
|
|
109
|
+
super('Cannot promote proposed checkpoint: no proposed checkpoint exists');
|
|
110
|
+
this.name = 'NoProposedCheckpointToPromoteError';
|
|
111
|
+
}
|
|
112
|
+
}
|
|
113
|
+
/** Thrown when the archive root of the proposed checkpoint does not match the expected one. */ export class ProposedCheckpointArchiveRootMismatchError extends Error {
|
|
114
|
+
expectedArchiveRoot;
|
|
115
|
+
actualArchiveRoot;
|
|
116
|
+
constructor(expectedArchiveRoot, actualArchiveRoot){
|
|
117
|
+
super(`Cannot promote proposed checkpoint: archive root mismatch (expected ${expectedArchiveRoot}, got ${actualArchiveRoot})`), this.expectedArchiveRoot = expectedArchiveRoot, this.actualArchiveRoot = actualArchiveRoot;
|
|
118
|
+
this.name = 'ProposedCheckpointArchiveRootMismatchError';
|
|
119
|
+
}
|
|
120
|
+
}
|
|
121
|
+
/** Thrown when the proposed checkpoint does not directly follow the latest confirmed checkpoint. */ export class ProposedCheckpointPromotionNotSequentialError extends Error {
|
|
122
|
+
proposedCheckpointNumber;
|
|
123
|
+
latestCheckpointNumber;
|
|
124
|
+
constructor(proposedCheckpointNumber, latestCheckpointNumber){
|
|
125
|
+
super(`Cannot promote proposed checkpoint: not sequential (latest ${latestCheckpointNumber}, proposed ${proposedCheckpointNumber})`), this.proposedCheckpointNumber = proposedCheckpointNumber, this.latestCheckpointNumber = latestCheckpointNumber;
|
|
126
|
+
this.name = 'ProposedCheckpointPromotionNotSequentialError';
|
|
53
127
|
}
|
|
54
128
|
}
|
|
55
|
-
export class CannotOverwriteCheckpointedBlockError extends Error {
|
|
129
|
+
/** Thrown when a proposed block conflicts with an already checkpointed block (different content). */ export class CannotOverwriteCheckpointedBlockError extends Error {
|
|
56
130
|
blockNumber;
|
|
57
131
|
lastCheckpointedBlock;
|
|
58
132
|
constructor(blockNumber, lastCheckpointedBlock){
|
package/dest/factory.d.ts
CHANGED
|
@@ -1,11 +1,10 @@
|
|
|
1
|
-
import type { DataStoreConfig } from '@aztec/kv-store
|
|
2
|
-
import type { L1RollupConstants } from '@aztec/stdlib/epoch-helpers';
|
|
1
|
+
import type { DataStoreConfig } from '@aztec/stdlib/kv-store';
|
|
3
2
|
import { Archiver, type ArchiverDeps } from './archiver.js';
|
|
4
3
|
import { type ArchiverConfig } from './config.js';
|
|
5
4
|
import { KVArchiverDataStore } from './store/kv_archiver_store.js';
|
|
6
5
|
export declare const ARCHIVER_STORE_NAME = "archiver";
|
|
7
6
|
/** Creates an archiver store. */
|
|
8
|
-
export declare function createArchiverStore(userConfig: Pick<ArchiverConfig, 'archiverStoreMapSizeKb' | 'maxLogs'> & DataStoreConfig
|
|
7
|
+
export declare function createArchiverStore(userConfig: Pick<ArchiverConfig, 'archiverStoreMapSizeKb' | 'maxLogs'> & DataStoreConfig): Promise<KVArchiverDataStore>;
|
|
9
8
|
/**
|
|
10
9
|
* Creates a local archiver.
|
|
11
10
|
* @param config - The archiver configuration.
|
|
@@ -16,6 +15,6 @@ export declare function createArchiverStore(userConfig: Pick<ArchiverConfig, 'ar
|
|
|
16
15
|
export declare function createArchiver(config: ArchiverConfig & DataStoreConfig, deps: ArchiverDeps, opts?: {
|
|
17
16
|
blockUntilSync: boolean;
|
|
18
17
|
}): Promise<Archiver>;
|
|
19
|
-
/** 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). */
|
|
20
19
|
export declare function registerProtocolContracts(store: KVArchiverDataStore): Promise<void>;
|
|
21
|
-
//# 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';
|
|
@@ -21,13 +22,13 @@ import { ArchiverL1Synchronizer } from './modules/l1_synchronizer.js';
|
|
|
21
22
|
import { ARCHIVER_DB_VERSION, KVArchiverDataStore } from './store/kv_archiver_store.js';
|
|
22
23
|
import { L2TipsCache } from './store/l2_tips_cache.js';
|
|
23
24
|
export const ARCHIVER_STORE_NAME = 'archiver';
|
|
24
|
-
/** Creates an archiver store. */ export async function createArchiverStore(userConfig
|
|
25
|
+
/** Creates an archiver store. */ export async function createArchiverStore(userConfig) {
|
|
25
26
|
const config = {
|
|
26
27
|
...userConfig,
|
|
27
28
|
dataStoreMapSizeKb: userConfig.archiverStoreMapSizeKb ?? userConfig.dataStoreMapSizeKb
|
|
28
29
|
};
|
|
29
30
|
const store = await createStore(ARCHIVER_STORE_NAME, ARCHIVER_DB_VERSION, config);
|
|
30
|
-
return new KVArchiverDataStore(store, config.maxLogs
|
|
31
|
+
return new KVArchiverDataStore(store, config.maxLogs);
|
|
31
32
|
}
|
|
32
33
|
/**
|
|
33
34
|
* Creates a local archiver.
|
|
@@ -38,39 +39,39 @@ export const ARCHIVER_STORE_NAME = 'archiver';
|
|
|
38
39
|
*/ export async function createArchiver(config, deps, opts = {
|
|
39
40
|
blockUntilSync: true
|
|
40
41
|
}) {
|
|
41
|
-
const archiverStore = await createArchiverStore(config
|
|
42
|
-
epochDuration: config.aztecEpochDuration
|
|
43
|
-
});
|
|
42
|
+
const archiverStore = await createArchiverStore(config);
|
|
44
43
|
await registerProtocolContracts(archiverStore);
|
|
45
44
|
// Create Ethereum clients
|
|
46
45
|
const chain = createEthereumChain(config.l1RpcUrls, config.l1ChainId);
|
|
46
|
+
const httpTimeout = config.l1HttpTimeoutMS;
|
|
47
47
|
const publicClient = createPublicClient({
|
|
48
48
|
chain: chain.chainInfo,
|
|
49
|
-
transport:
|
|
50
|
-
|
|
51
|
-
|
|
49
|
+
transport: makeL1HttpTransport(config.l1RpcUrls, {
|
|
50
|
+
timeout: httpTimeout
|
|
51
|
+
}),
|
|
52
52
|
pollingInterval: config.viemPollingIntervalMS
|
|
53
53
|
});
|
|
54
54
|
// Create debug client using debug RPC URLs if available, otherwise fall back to regular RPC URLs
|
|
55
55
|
const debugRpcUrls = config.l1DebugRpcUrls.length > 0 ? config.l1DebugRpcUrls : config.l1RpcUrls;
|
|
56
56
|
const debugClient = createPublicClient({
|
|
57
57
|
chain: chain.chainInfo,
|
|
58
|
-
transport:
|
|
59
|
-
|
|
60
|
-
|
|
58
|
+
transport: makeL1HttpTransport(debugRpcUrls, {
|
|
59
|
+
timeout: httpTimeout
|
|
60
|
+
}),
|
|
61
61
|
pollingInterval: config.viemPollingIntervalMS
|
|
62
62
|
});
|
|
63
63
|
// Create L1 contract instances
|
|
64
64
|
const rollup = new RollupContract(publicClient, config.l1Contracts.rollupAddress);
|
|
65
65
|
const inbox = new InboxContract(publicClient, config.l1Contracts.inboxAddress);
|
|
66
66
|
// Fetch L1 constants from rollup contract
|
|
67
|
-
const [l1StartBlock, l1GenesisTime, proofSubmissionEpochs, genesisArchiveRoot, slashingProposerAddress, targetCommitteeSize] = await Promise.all([
|
|
67
|
+
const [l1StartBlock, l1GenesisTime, proofSubmissionEpochs, genesisArchiveRoot, slashingProposerAddress, targetCommitteeSize, rollupManaLimit] = await Promise.all([
|
|
68
68
|
rollup.getL1StartBlock(),
|
|
69
69
|
rollup.getL1GenesisTime(),
|
|
70
70
|
rollup.getProofSubmissionEpochs(),
|
|
71
71
|
rollup.getGenesisArchiveTreeRoot(),
|
|
72
72
|
rollup.getSlashingProposerAddress(),
|
|
73
|
-
rollup.getTargetCommitteeSize()
|
|
73
|
+
rollup.getTargetCommitteeSize(),
|
|
74
|
+
rollup.getManaLimit()
|
|
74
75
|
]);
|
|
75
76
|
const l1StartBlockHash = await publicClient.getBlock({
|
|
76
77
|
blockNumber: l1StartBlock,
|
|
@@ -86,13 +87,15 @@ export const ARCHIVER_STORE_NAME = 'archiver';
|
|
|
86
87
|
ethereumSlotDuration,
|
|
87
88
|
proofSubmissionEpochs: Number(proofSubmissionEpochs),
|
|
88
89
|
targetCommitteeSize,
|
|
89
|
-
genesisArchiveRoot: Fr.fromString(genesisArchiveRoot.toString())
|
|
90
|
+
genesisArchiveRoot: Fr.fromString(genesisArchiveRoot.toString()),
|
|
91
|
+
rollupManaLimit: Number(rollupManaLimit)
|
|
90
92
|
};
|
|
91
93
|
const archiverConfig = merge({
|
|
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
|
package/dest/index.d.ts
CHANGED
|
@@ -8,5 +8,6 @@ export { type L1PublishedData } from './structs/published.js';
|
|
|
8
8
|
export { KVArchiverDataStore, ARCHIVER_DB_VERSION } from './store/kv_archiver_store.js';
|
|
9
9
|
export { ContractInstanceStore } from './store/contract_instance_store.js';
|
|
10
10
|
export { L2TipsCache } from './store/l2_tips_cache.js';
|
|
11
|
-
export {
|
|
12
|
-
|
|
11
|
+
export { retrieveL2ProofVerifiedEvents } from './l1/data_retrieval.js';
|
|
12
|
+
export { CalldataRetriever } from './l1/calldata_retriever.js';
|
|
13
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3NyYy9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxjQUFjLGNBQWMsQ0FBQztBQUM3QixjQUFjLGlCQUFpQixDQUFDO0FBQ2hDLGNBQWMsZUFBZSxDQUFDO0FBQzlCLGNBQWMsK0JBQStCLENBQUM7QUFDOUMsY0FBYyxpQ0FBaUMsQ0FBQztBQUNoRCxjQUFjLGFBQWEsQ0FBQztBQUU1QixPQUFPLEVBQUUsS0FBSyxlQUFlLEVBQUUsTUFBTSx3QkFBd0IsQ0FBQztBQUM5RCxPQUFPLEVBQUUsbUJBQW1CLEVBQUUsbUJBQW1CLEVBQUUsTUFBTSw4QkFBOEIsQ0FBQztBQUN4RixPQUFPLEVBQUUscUJBQXFCLEVBQUUsTUFBTSxvQ0FBb0MsQ0FBQztBQUMzRSxPQUFPLEVBQUUsV0FBVyxFQUFFLE1BQU0sMEJBQTBCLENBQUM7QUFFdkQsT0FBTyxFQUFFLDZCQUE2QixFQUFFLE1BQU0sd0JBQXdCLENBQUM7QUFDdkUsT0FBTyxFQUFFLGlCQUFpQixFQUFFLE1BQU0sNEJBQTRCLENBQUMifQ==
|
package/dest/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,cAAc,CAAC;AAC7B,cAAc,iBAAiB,CAAC;AAChC,cAAc,eAAe,CAAC;AAC9B,cAAc,+BAA+B,CAAC;AAC9C,cAAc,iCAAiC,CAAC;AAChD,cAAc,aAAa,CAAC;AAE5B,OAAO,EAAE,KAAK,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAC9D,OAAO,EAAE,mBAAmB,EAAE,mBAAmB,EAAE,MAAM,8BAA8B,CAAC;AACxF,OAAO,EAAE,qBAAqB,EAAE,MAAM,oCAAoC,CAAC;AAC3E,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AAEvD,OAAO,EAAE,6BAA6B,EAAE,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,cAAc,CAAC;AAC7B,cAAc,iBAAiB,CAAC;AAChC,cAAc,eAAe,CAAC;AAC9B,cAAc,+BAA+B,CAAC;AAC9C,cAAc,iCAAiC,CAAC;AAChD,cAAc,aAAa,CAAC;AAE5B,OAAO,EAAE,KAAK,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAC9D,OAAO,EAAE,mBAAmB,EAAE,mBAAmB,EAAE,MAAM,8BAA8B,CAAC;AACxF,OAAO,EAAE,qBAAqB,EAAE,MAAM,oCAAoC,CAAC;AAC3E,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AAEvD,OAAO,EAAE,6BAA6B,EAAE,MAAM,wBAAwB,CAAC;AACvE,OAAO,EAAE,iBAAiB,EAAE,MAAM,4BAA4B,CAAC"}
|
package/dest/index.js
CHANGED
|
@@ -7,4 +7,5 @@ export * from './config.js';
|
|
|
7
7
|
export { KVArchiverDataStore, ARCHIVER_DB_VERSION } from './store/kv_archiver_store.js';
|
|
8
8
|
export { ContractInstanceStore } from './store/contract_instance_store.js';
|
|
9
9
|
export { L2TipsCache } from './store/l2_tips_cache.js';
|
|
10
|
-
export {
|
|
10
|
+
export { retrieveL2ProofVerifiedEvents } from './l1/data_retrieval.js';
|
|
11
|
+
export { CalldataRetriever } from './l1/calldata_retriever.js';
|
|
@@ -33,6 +33,7 @@ export declare class CalldataRetriever {
|
|
|
33
33
|
/** Clears the trace-failure warned set. For testing only. */
|
|
34
34
|
static resetTraceFailureWarnedForTesting(): void;
|
|
35
35
|
constructor(publicClient: ViemPublicClient, debugClient: ViemPublicDebugClient, targetCommitteeSize: number, instrumentation: ArchiverInstrumentation | undefined, logger: Logger, rollupAddress: EthAddress);
|
|
36
|
+
private getSignatureContext;
|
|
36
37
|
/**
|
|
37
38
|
* Gets checkpoint header and metadata from the calldata of an L1 transaction.
|
|
38
39
|
* Tries multicall3 decoding, falls back to trace-based extraction.
|
|
@@ -132,4 +133,4 @@ export declare class CalldataRetriever {
|
|
|
132
133
|
private getCommitteeAttestationsStructDef;
|
|
133
134
|
}
|
|
134
135
|
export {};
|
|
135
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
136
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2FsbGRhdGFfcmV0cmlldmVyLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvbDEvY2FsbGRhdGFfcmV0cmlldmVyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUNBLE9BQU8sS0FBSyxFQUFFLGdCQUFnQixFQUFFLHFCQUFxQixFQUFFLE1BQU0sdUJBQXVCLENBQUM7QUFDckYsT0FBTyxFQUFFLGdCQUFnQixFQUFFLE1BQU0saUNBQWlDLENBQUM7QUFFbkUsT0FBTyxFQUFFLEVBQUUsRUFBRSxNQUFNLGdDQUFnQyxDQUFDO0FBQ3BELE9BQU8sRUFBRSxVQUFVLEVBQUUsTUFBTSwrQkFBK0IsQ0FBQztBQUMzRCxPQUFPLEtBQUssRUFBRSxNQUFNLEVBQUUsTUFBTSx1QkFBdUIsQ0FBQztBQUVwRCxPQUFPLEVBQUUsb0JBQW9CLEVBQUUsTUFBTSxxQkFBcUIsQ0FBQztBQUUzRCxPQUFPLEVBQUUsZ0JBQWdCLEVBQUUsTUFBTSxzQkFBc0IsQ0FBQztBQUV4RCxPQUFPLEVBRUwsS0FBSyxHQUFHLEVBQ1IsS0FBSyxXQUFXLEVBT2pCLE1BQU0sTUFBTSxDQUFDO0FBRWQsT0FBTyxLQUFLLEVBQUUsdUJBQXVCLEVBQUUsTUFBTSwrQkFBK0IsQ0FBQztBQU03RSx1REFBdUQ7QUFDdkQsS0FBSyxjQUFjLEdBQUc7SUFDcEIsZ0JBQWdCLEVBQUUsZ0JBQWdCLENBQUM7SUFDbkMsV0FBVyxFQUFFLEVBQUUsQ0FBQztJQUNoQixNQUFNLEVBQUUsZ0JBQWdCLENBQUM7SUFDekIsWUFBWSxFQUFFLG9CQUFvQixFQUFFLENBQUM7SUFDckMsU0FBUyxFQUFFLE1BQU0sQ0FBQztJQUNsQixxQkFBcUIsRUFBRSxNQUFNLENBQUM7Q0FDL0IsQ0FBQztBQUVGOzs7O0dBSUc7QUFDSCxxQkFBYSxpQkFBaUI7SUFVMUIsT0FBTyxDQUFDLFFBQVEsQ0FBQyxZQUFZO0lBQzdCLE9BQU8sQ0FBQyxRQUFRLENBQUMsV0FBVztJQUM1QixPQUFPLENBQUMsUUFBUSxDQUFDLG1CQUFtQjtJQUNwQyxPQUFPLENBQUMsUUFBUSxDQUFDLGVBQWU7SUFDaEMsT0FBTyxDQUFDLFFBQVEsQ0FBQyxNQUFNO0lBQ3ZCLE9BQU8sQ0FBQyxRQUFRLENBQUMsYUFBYTtJQWRoQyw0RkFBNEY7SUFDNUYsT0FBTyxDQUFDLE1BQU0sQ0FBQyxRQUFRLENBQUMsMEJBQTBCLENBQTRCO0lBRTlFLDZEQUE2RDtJQUM3RCxNQUFNLENBQUMsaUNBQWlDLElBQUksSUFBSSxDQUUvQztJQUVELFlBQ21CLFlBQVksRUFBRSxnQkFBZ0IsRUFDOUIsV0FBVyxFQUFFLHFCQUFxQixFQUNsQyxtQkFBbUIsRUFBRSxNQUFNLEVBQzNCLGVBQWUsRUFBRSx1QkFBdUIsR0FBRyxTQUFTLEVBQ3BELE1BQU0sRUFBRSxNQUFNLEVBQ2QsYUFBYSxFQUFFLFVBQVUsRUFDeEM7SUFFSixPQUFPLENBQUMsbUJBQW1CO0lBTzNCOzs7Ozs7OztPQVFHO0lBQ0cseUJBQXlCLENBQzdCLE1BQU0sRUFBRSxLQUFLLE1BQU0sRUFBRSxFQUNyQixXQUFXLEVBQUUsTUFBTSxFQUFFLEVBQ3JCLGdCQUFnQixFQUFFLGdCQUFnQixFQUNsQyxjQUFjLEVBQUU7UUFDZCxnQkFBZ0IsRUFBRSxHQUFHLENBQUM7UUFDdEIsYUFBYSxFQUFFLEdBQUcsQ0FBQztLQUNwQixHQUNBLE9BQU8sQ0FBQyxjQUFjLENBQUMsQ0FJekI7SUFFRCxzR0FBc0c7SUFDdEcsVUFBZ0IsbUJBQW1CLENBQ2pDLEVBQUUsRUFBRSxXQUFXLEVBQ2YsZ0JBQWdCLEVBQUUsZ0JBQWdCLEVBQ2xDLGNBQWMsRUFBRTtRQUFFLGdCQUFnQixFQUFFLEdBQUcsQ0FBQztRQUFDLGFBQWEsRUFBRSxHQUFHLENBQUE7S0FBRSxHQUM1RCxPQUFPLENBQUMsY0FBYyxDQUFDLENBeUN6QjtJQUVEOzs7Ozs7Ozs7T0FTRztJQUNILFVBQWdCLHNCQUFzQixDQUNwQyxFQUFFLEVBQUUsV0FBVyxFQUNmLGNBQWMsRUFBRTtRQUFFLGdCQUFnQixFQUFFLEdBQUcsQ0FBQztRQUFDLGFBQWEsRUFBRSxHQUFHLENBQUE7S0FBRSxFQUM3RCxnQkFBZ0IsRUFBRSxnQkFBZ0IsRUFDbEMsU0FBUyxFQUFFLEdBQUcsR0FDYixPQUFPLENBQUMsY0FBYyxHQUFHLFNBQVMsQ0FBQyxDQThCckM7SUFFRDs7Ozs7Ozs7O09BU0c7SUFDSCxTQUFTLENBQUMsbUJBQW1CLENBQzNCLEVBQUUsRUFBRTtRQUFFLEVBQUUsRUFBRSxHQUFHLEdBQUcsSUFBSSxHQUFHLFNBQVMsQ0FBQztRQUFDLEtBQUssRUFBRSxHQUFHLENBQUM7UUFBQyxJQUFJLEVBQUUsR0FBRyxDQUFBO0tBQUUsRUFDekQsY0FBYyxFQUFFO1FBQUUsZ0JBQWdCLEVBQUUsR0FBRyxDQUFDO1FBQUMsYUFBYSxFQUFFLEdBQUcsQ0FBQTtLQUFFLEVBQzdELGdCQUFnQixFQUFFLGdCQUFnQixFQUNsQyxTQUFTLEVBQUUsR0FBRyxHQUNiLGNBQWMsR0FBRyxTQUFTLENBa0Y1QjtJQUVEOzs7Ozs7OztPQVFHO0lBQ0gsU0FBUyxDQUFDLHNCQUFzQixDQUM5QixFQUFFLEVBQUU7UUFBRSxFQUFFLEVBQUUsR0FBRyxHQUFHLElBQUksR0FBRyxTQUFTLENBQUM7UUFBQyxLQUFLLEVBQUUsR0FBRyxDQUFDO1FBQUMsSUFBSSxFQUFFLEdBQUcsQ0FBQTtLQUFFLEVBQ3pELGNBQWMsRUFBRTtRQUFFLGdCQUFnQixFQUFFLEdBQUcsQ0FBQztRQUFDLGFBQWEsRUFBRSxHQUFHLENBQUE7S0FBRSxFQUM3RCxnQkFBZ0IsRUFBRSxnQkFBZ0IsRUFDbEMsU0FBUyxFQUFFLEdBQUcsR0FDYixjQUFjLEdBQUcsU0FBUyxDQXdCNUI7SUFFRDs7Ozs7O09BTUc7SUFDSCxVQUFnQix1QkFBdUIsQ0FBQyxNQUFNLEVBQUUsR0FBRyxHQUFHLE9BQU8sQ0FBQyxHQUFHLENBQUMsQ0FtRGpFO0lBRUQ7Ozs7Ozs7O09BUUc7SUFDSCxTQUFTLENBQUMseUJBQXlCLENBQ2pDLGVBQWUsRUFBRSxHQUFHLEVBQ3BCLGNBQWMsRUFBRTtRQUFFLGdCQUFnQixFQUFFLEdBQUcsQ0FBQztRQUFDLGFBQWEsRUFBRSxHQUFHLENBQUE7S0FBRSxFQUM3RCxnQkFBZ0IsRUFBRSxnQkFBZ0IsRUFDbEMsU0FBUyxFQUFFLEdBQUcsR0FDYixjQUFjLEdBQUcsU0FBUyxDQWlFNUI7SUFFRCx3RUFBd0U7SUFDeEUsT0FBTyxDQUFDLHVCQUF1QjtJQUkvQixvSEFBb0g7SUFDcEgsT0FBTyxDQUFDLG9CQUFvQjtJQVU1Qjs7O09BR0c7SUFDSCxPQUFPLENBQUMsaUNBQWlDO0NBK0IxQyJ9
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"calldata_retriever.d.ts","sourceRoot":"","sources":["../../src/l1/calldata_retriever.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,gBAAgB,EAAE,qBAAqB,EAAE,MAAM,uBAAuB,CAAC;AACrF,OAAO,EAAE,gBAAgB,EAAE,MAAM,iCAAiC,CAAC;
|
|
1
|
+
{"version":3,"file":"calldata_retriever.d.ts","sourceRoot":"","sources":["../../src/l1/calldata_retriever.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,9 +1,10 @@
|
|
|
1
1
|
import { MULTI_CALL_3_ADDRESS } from '@aztec/ethereum/contracts';
|
|
2
|
+
import { LruSet } from '@aztec/foundation/collection';
|
|
2
3
|
import { Fr } from '@aztec/foundation/curves/bn254';
|
|
3
4
|
import { EthAddress } from '@aztec/foundation/eth-address';
|
|
4
5
|
import { RollupAbi } from '@aztec/l1-artifacts';
|
|
5
6
|
import { CommitteeAttestation } from '@aztec/stdlib/block';
|
|
6
|
-
import { ConsensusPayload,
|
|
7
|
+
import { ConsensusPayload, getHashedSignaturePayloadTypedData } from '@aztec/stdlib/p2p';
|
|
7
8
|
import { CheckpointHeader } from '@aztec/stdlib/rollup';
|
|
8
9
|
import { decodeFunctionData, encodeAbiParameters, hexToBytes, keccak256, multicall3Abi, toFunctionSelector } from 'viem';
|
|
9
10
|
import { getSuccessfulCallsFromDebug } from './debug_tx.js';
|
|
@@ -20,7 +21,7 @@ import { getSuccessfulCallsFromTrace } from './trace_tx.js';
|
|
|
20
21
|
instrumentation;
|
|
21
22
|
logger;
|
|
22
23
|
rollupAddress;
|
|
23
|
-
/** Tx hashes we've already logged for trace+debug failure (log once per tx per process). */ static traceFailureWarnedTxHashes = new
|
|
24
|
+
/** Tx hashes we've already logged for trace+debug failure (log once per tx per process). */ static traceFailureWarnedTxHashes = new LruSet(1000);
|
|
24
25
|
/** Clears the trace-failure warned set. For testing only. */ static resetTraceFailureWarnedForTesting() {
|
|
25
26
|
CalldataRetriever.traceFailureWarnedTxHashes.clear();
|
|
26
27
|
}
|
|
@@ -32,6 +33,12 @@ import { getSuccessfulCallsFromTrace } from './trace_tx.js';
|
|
|
32
33
|
this.logger = logger;
|
|
33
34
|
this.rollupAddress = rollupAddress;
|
|
34
35
|
}
|
|
36
|
+
getSignatureContext() {
|
|
37
|
+
return {
|
|
38
|
+
chainId: this.publicClient.chain.id,
|
|
39
|
+
rollupAddress: this.rollupAddress
|
|
40
|
+
};
|
|
41
|
+
}
|
|
35
42
|
/**
|
|
36
43
|
* Gets checkpoint header and metadata from the calldata of an L1 transaction.
|
|
37
44
|
* Tries multicall3 decoding, falls back to trace-based extraction.
|
|
@@ -371,9 +378,8 @@ import { getSuccessfulCallsFromTrace } from './trace_tx.js';
|
|
|
371
378
|
]));
|
|
372
379
|
}
|
|
373
380
|
/** Computes the keccak256 payload digest from the checkpoint header, archive root, and fee asset price modifier. */ computePayloadDigest(header, archiveRoot, feeAssetPriceModifier) {
|
|
374
|
-
const consensusPayload = new ConsensusPayload(header, archiveRoot, feeAssetPriceModifier);
|
|
375
|
-
|
|
376
|
-
return keccak256(payloadToSign);
|
|
381
|
+
const consensusPayload = new ConsensusPayload(header, archiveRoot, feeAssetPriceModifier, this.getSignatureContext());
|
|
382
|
+
return getHashedSignaturePayloadTypedData(consensusPayload).toString();
|
|
377
383
|
}
|
|
378
384
|
/**
|
|
379
385
|
* Extracts the CommitteeAttestations struct definition from RollupAbi.
|