@aztec/archiver 0.0.1-commit.aada20e3 → 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 +13 -8
- package/dest/archiver.d.ts.map +1 -1
- package/dest/archiver.js +90 -114
- 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 +50 -10
- package/dest/errors.d.ts.map +1 -1
- package/dest/errors.js +67 -16
- package/dest/factory.d.ts +4 -5
- package/dest/factory.d.ts.map +1 -1
- package/dest/factory.js +33 -27
- package/dest/index.d.ts +4 -2
- package/dest/index.d.ts.map +1 -1
- package/dest/index.js +3 -1
- package/dest/l1/bin/retrieve-calldata.js +36 -33
- package/dest/l1/calldata_retriever.d.ts +73 -50
- package/dest/l1/calldata_retriever.d.ts.map +1 -1
- package/dest/l1/calldata_retriever.js +191 -259
- package/dest/l1/data_retrieval.d.ts +26 -17
- package/dest/l1/data_retrieval.d.ts.map +1 -1
- package/dest/l1/data_retrieval.js +42 -47
- package/dest/l1/spire_proposer.d.ts +5 -5
- package/dest/l1/spire_proposer.d.ts.map +1 -1
- package/dest/l1/spire_proposer.js +9 -17
- 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 +14 -7
- package/dest/modules/data_source_base.d.ts.map +1 -1
- package/dest/modules/data_source_base.js +39 -77
- package/dest/modules/data_store_updater.d.ts +35 -15
- package/dest/modules/data_store_updater.d.ts.map +1 -1
- package/dest/modules/data_store_updater.js +137 -96
- package/dest/modules/instrumentation.d.ts +21 -3
- package/dest/modules/instrumentation.d.ts.map +1 -1
- package/dest/modules/instrumentation.js +41 -8
- package/dest/modules/l1_synchronizer.d.ts +10 -9
- package/dest/modules/l1_synchronizer.d.ts.map +1 -1
- package/dest/modules/l1_synchronizer.js +279 -150
- 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 +73 -28
- package/dest/store/block_store.d.ts.map +1 -1
- package/dest/store/block_store.js +395 -136
- 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 +67 -24
- package/dest/store/kv_archiver_store.d.ts.map +1 -1
- package/dest/store/kv_archiver_store.js +82 -27
- package/dest/store/l2_tips_cache.d.ts +20 -0
- package/dest/store/l2_tips_cache.d.ts.map +1 -0
- package/dest/store/l2_tips_cache.js +109 -0
- 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 +150 -55
- 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 +24 -1
- package/dest/test/fake_l1_state.d.ts.map +1 -1
- package/dest/test/fake_l1_state.js +145 -28
- package/dest/test/mock_archiver.d.ts +1 -1
- package/dest/test/mock_archiver.d.ts.map +1 -1
- package/dest/test/mock_archiver.js +3 -2
- 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 +26 -5
- package/dest/test/mock_l2_block_source.d.ts.map +1 -1
- package/dest/test/mock_l2_block_source.js +160 -89
- 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 +120 -137
- package/src/config.ts +22 -2
- package/src/errors.ts +104 -26
- package/src/factory.ts +47 -24
- package/src/index.ts +3 -1
- package/src/l1/README.md +25 -68
- package/src/l1/bin/retrieve-calldata.ts +46 -39
- package/src/l1/calldata_retriever.ts +250 -379
- package/src/l1/data_retrieval.ts +58 -69
- package/src/l1/spire_proposer.ts +7 -15
- package/src/l1/validate_historical_logs.ts +140 -0
- package/src/modules/data_source_base.ts +78 -98
- package/src/modules/data_store_updater.ts +164 -126
- package/src/modules/instrumentation.ts +56 -9
- package/src/modules/l1_synchronizer.ts +357 -188
- package/src/modules/validation.ts +2 -2
- package/src/store/block_store.ts +503 -172
- 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 +130 -41
- package/src/store/l2_tips_cache.ts +134 -0
- package/src/store/log_store.ts +221 -63
- package/src/store/message_store.ts +27 -10
- package/src/structs/inbox_message.ts +1 -1
- package/src/test/fake_l1_state.ts +193 -32
- package/src/test/mock_archiver.ts +3 -2
- package/src/test/mock_l1_to_l2_message_source.ts +1 -0
- package/src/test/mock_l2_block_source.ts +209 -82
- package/src/test/mock_structs.ts +20 -6
- package/src/test/noop_l1_archiver.ts +10 -2
package/dest/errors.d.ts
CHANGED
|
@@ -2,11 +2,6 @@ import type { Fr } from '@aztec/foundation/schemas';
|
|
|
2
2
|
export declare class NoBlobBodiesFoundError extends Error {
|
|
3
3
|
constructor(l2BlockNum: number);
|
|
4
4
|
}
|
|
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
5
|
export declare class BlockNumberNotSequentialError extends Error {
|
|
11
6
|
constructor(newBlockNumber: number, previous: number | undefined);
|
|
12
7
|
}
|
|
@@ -16,10 +11,7 @@ export declare class InitialCheckpointNumberNotSequentialError extends Error {
|
|
|
16
11
|
constructor(newCheckpointNumber: number, previousCheckpointNumber: number | undefined);
|
|
17
12
|
}
|
|
18
13
|
export declare class CheckpointNumberNotSequentialError extends Error {
|
|
19
|
-
constructor(newCheckpointNumber: number, previous: number | undefined);
|
|
20
|
-
}
|
|
21
|
-
export declare class CheckpointNumberNotConsistentError extends Error {
|
|
22
|
-
constructor(newCheckpointNumber: number, previous: number | undefined);
|
|
14
|
+
constructor(newCheckpointNumber: number, previous: number | undefined, source?: 'confirmed' | 'proposed');
|
|
23
15
|
}
|
|
24
16
|
export declare class BlockIndexNotSequentialError extends Error {
|
|
25
17
|
constructor(newBlockIndex: number, previousBlockIndex: number | undefined);
|
|
@@ -33,9 +25,57 @@ export declare class CheckpointNotFoundError extends Error {
|
|
|
33
25
|
export declare class BlockNotFoundError extends Error {
|
|
34
26
|
constructor(blockNumber: number);
|
|
35
27
|
}
|
|
28
|
+
/** Thrown when a proposed block matches a block that was already checkpointed. This is expected for late proposals. */
|
|
29
|
+
export declare class BlockAlreadyCheckpointedError extends Error {
|
|
30
|
+
readonly blockNumber: number;
|
|
31
|
+
constructor(blockNumber: number);
|
|
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
|
+
}
|
|
75
|
+
/** Thrown when a proposed block conflicts with an already checkpointed block (different content). */
|
|
36
76
|
export declare class CannotOverwriteCheckpointedBlockError extends Error {
|
|
37
77
|
readonly blockNumber: number;
|
|
38
78
|
readonly lastCheckpointedBlock: number;
|
|
39
79
|
constructor(blockNumber: number, lastCheckpointedBlock: number);
|
|
40
80
|
}
|
|
41
|
-
//# 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,
|
|
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,YACE,mBAAmB,EAAE,MAAM,EAC3B,QAAQ,EAAE,MAAM,GAAG,SAAS,EAC5B,MAAM,GAAE,WAAW,GAAG,UAAwB,EAK/C;CACF;AAED,qBAAa,4BAA6B,SAAQ,KAAK;IACrD,YAAY,aAAa,EAAE,MAAM,EAAE,kBAAkB,EAAE,MAAM,GAAG,SAAS,EAIxE;CACF;AAED,qBAAa,8BAA+B,SAAQ,KAAK;IACvD,YACE,cAAc,EAAE,MAAM,EACtB,mBAAmB,EAAE,MAAM,GAAG,SAAS,EACvC,eAAe,EAAE,EAAE,EACnB,oBAAoB,EAAE,EAAE,EAKzB;CACF;AAED,qBAAa,uBAAwB,SAAQ,KAAK;IAChD,YAAY,gBAAgB,EAAE,MAAM,EAEnC;CACF;AAED,qBAAa,kBAAmB,SAAQ,KAAK;IAC3C,YAAY,WAAW,EAAE,MAAM,EAE9B;CACF;AAED,uHAAuH;AACvH,qBAAa,6BAA8B,SAAQ,KAAK;aAC1B,WAAW,EAAE,MAAM;IAA/C,YAA4B,WAAW,EAAE,MAAM,EAG9C;CACF;AAED,6GAA6G;AAC7G,qBAAa,2BAA4B,SAAQ,KAAK;aAElC,OAAO,EAAE,SAAS,GAAG,QAAQ;aAC7B,GAAG,EAAE,MAAM;aACX,eAAe,EAAE,MAAM;aACvB,cAAc,EAAE,MAAM;IAJxC,YACkB,OAAO,EAAE,SAAS,GAAG,QAAQ,EAC7B,GAAG,EAAE,MAAM,EACX,eAAe,EAAE,MAAM,EACvB,cAAc,EAAE,MAAM,EAOvC;CACF;AAED,8GAA8G;AAC9G,qBAAa,2BAA4B,SAAQ,KAAK;aAElC,gBAAgB,EAAE,MAAM;aACxB,mBAAmB,EAAE,MAAM;IAF7C,YACkB,gBAAgB,EAAE,MAAM,EACxB,mBAAmB,EAAE,MAAM,EAO5C;CACF;AAED,6EAA6E;AAC7E,qBAAa,4BAA6B,SAAQ,KAAK;aAEnC,wBAAwB,EAAE,MAAM;aAChC,qBAAqB,EAAE,MAAM;IAF/C,YACkB,wBAAwB,EAAE,MAAM,EAChC,qBAAqB,EAAE,MAAM,EAI9C;CACF;AAED,kFAAkF;AAClF,qBAAa,oCAAqC,SAAQ,KAAK;aAE3C,wBAAwB,EAAE,MAAM;aAChC,yBAAyB,EAAE,MAAM;IAFnD,YACkB,wBAAwB,EAAE,MAAM,EAChC,yBAAyB,EAAE,MAAM,EAMlD;CACF;AAED,8GAA8G;AAC9G,qBAAa,kCAAmC,SAAQ,KAAK;IAC3D,cAGC;CACF;AAED,+FAA+F;AAC/F,qBAAa,0CAA2C,SAAQ,KAAK;aAEjD,mBAAmB,EAAE,EAAE;aACvB,iBAAiB,EAAE,EAAE;IAFvC,YACkB,mBAAmB,EAAE,EAAE,EACvB,iBAAiB,EAAE,EAAE,EAMtC;CACF;AAED,oGAAoG;AACpG,qBAAa,6CAA8C,SAAQ,KAAK;aAEpD,wBAAwB,EAAE,MAAM;aAChC,sBAAsB,EAAE,MAAM;IAFhD,YACkB,wBAAwB,EAAE,MAAM,EAChC,sBAAsB,EAAE,MAAM,EAM/C;CACF;AAED,qGAAqG;AACrG,qBAAa,qCAAsC,SAAQ,KAAK;aAE5C,WAAW,EAAE,MAAM;aACnB,qBAAqB,EAAE,MAAM;IAF/C,YACkB,WAAW,EAAE,MAAM,EACnB,qBAAqB,EAAE,MAAM,EAM9C;CACF"}
|
package/dest/errors.js
CHANGED
|
@@ -3,16 +3,9 @@ export class NoBlobBodiesFoundError extends Error {
|
|
|
3
3
|
super(`No blob bodies found for block ${l2BlockNum}`);
|
|
4
4
|
}
|
|
5
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;
|
|
11
|
-
}
|
|
12
|
-
}
|
|
13
6
|
export class BlockNumberNotSequentialError extends Error {
|
|
14
7
|
constructor(newBlockNumber, previous){
|
|
15
|
-
super(`Cannot insert new block ${newBlockNumber} given previous block number
|
|
8
|
+
super(`Cannot insert new block ${newBlockNumber} given previous block number is ${previous ?? 'undefined'}`);
|
|
16
9
|
}
|
|
17
10
|
}
|
|
18
11
|
export class InitialCheckpointNumberNotSequentialError extends Error {
|
|
@@ -23,13 +16,8 @@ export class InitialCheckpointNumberNotSequentialError extends Error {
|
|
|
23
16
|
}
|
|
24
17
|
}
|
|
25
18
|
export class CheckpointNumberNotSequentialError extends Error {
|
|
26
|
-
constructor(newCheckpointNumber, previous){
|
|
27
|
-
super(`Cannot insert new checkpoint ${newCheckpointNumber} given previous checkpoint number
|
|
28
|
-
}
|
|
29
|
-
}
|
|
30
|
-
export class CheckpointNumberNotConsistentError extends Error {
|
|
31
|
-
constructor(newCheckpointNumber, previous){
|
|
32
|
-
super(`Cannot insert block for new checkpoint ${newCheckpointNumber} given previous block was checkpoint ${previous ?? 'undefined'}`);
|
|
19
|
+
constructor(newCheckpointNumber, previous, source = 'confirmed'){
|
|
20
|
+
super(`Cannot insert new checkpoint ${newCheckpointNumber} given previous ${source} checkpoint number is ${previous ?? 'undefined'}`);
|
|
33
21
|
}
|
|
34
22
|
}
|
|
35
23
|
export class BlockIndexNotSequentialError extends Error {
|
|
@@ -52,7 +40,70 @@ export class BlockNotFoundError extends Error {
|
|
|
52
40
|
super(`Failed to find expected block number ${blockNumber}`);
|
|
53
41
|
}
|
|
54
42
|
}
|
|
55
|
-
export class
|
|
43
|
+
/** Thrown when a proposed block matches a block that was already checkpointed. This is expected for late proposals. */ export class BlockAlreadyCheckpointedError extends Error {
|
|
44
|
+
blockNumber;
|
|
45
|
+
constructor(blockNumber){
|
|
46
|
+
super(`Block ${blockNumber} has already been checkpointed with the same content`), this.blockNumber = blockNumber;
|
|
47
|
+
this.name = 'BlockAlreadyCheckpointedError';
|
|
48
|
+
}
|
|
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
|
+
}
|
|
106
|
+
/** Thrown when a proposed block conflicts with an already checkpointed block (different content). */ export class CannotOverwriteCheckpointedBlockError extends Error {
|
|
56
107
|
blockNumber;
|
|
57
108
|
lastCheckpointedBlock;
|
|
58
109
|
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,20 +14,21 @@ 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';
|
|
20
21
|
import { ArchiverL1Synchronizer } from './modules/l1_synchronizer.js';
|
|
21
22
|
import { ARCHIVER_DB_VERSION, KVArchiverDataStore } from './store/kv_archiver_store.js';
|
|
23
|
+
import { L2TipsCache } from './store/l2_tips_cache.js';
|
|
22
24
|
export const ARCHIVER_STORE_NAME = 'archiver';
|
|
23
|
-
/** Creates an archiver store. */ export async function createArchiverStore(userConfig
|
|
25
|
+
/** Creates an archiver store. */ export async function createArchiverStore(userConfig) {
|
|
24
26
|
const config = {
|
|
25
27
|
...userConfig,
|
|
26
28
|
dataStoreMapSizeKb: userConfig.archiverStoreMapSizeKb ?? userConfig.dataStoreMapSizeKb
|
|
27
29
|
};
|
|
28
30
|
const store = await createStore(ARCHIVER_STORE_NAME, ARCHIVER_DB_VERSION, config);
|
|
29
|
-
return new KVArchiverDataStore(store, config.maxLogs
|
|
31
|
+
return new KVArchiverDataStore(store, config.maxLogs);
|
|
30
32
|
}
|
|
31
33
|
/**
|
|
32
34
|
* Creates a local archiver.
|
|
@@ -37,38 +39,39 @@ export const ARCHIVER_STORE_NAME = 'archiver';
|
|
|
37
39
|
*/ export async function createArchiver(config, deps, opts = {
|
|
38
40
|
blockUntilSync: true
|
|
39
41
|
}) {
|
|
40
|
-
const archiverStore = await createArchiverStore(config
|
|
41
|
-
epochDuration: config.aztecEpochDuration
|
|
42
|
-
});
|
|
42
|
+
const archiverStore = await createArchiverStore(config);
|
|
43
43
|
await registerProtocolContracts(archiverStore);
|
|
44
44
|
// Create Ethereum clients
|
|
45
45
|
const chain = createEthereumChain(config.l1RpcUrls, config.l1ChainId);
|
|
46
|
+
const httpTimeout = config.l1HttpTimeoutMS;
|
|
46
47
|
const publicClient = createPublicClient({
|
|
47
48
|
chain: chain.chainInfo,
|
|
48
|
-
transport:
|
|
49
|
-
|
|
50
|
-
|
|
49
|
+
transport: makeL1HttpTransport(config.l1RpcUrls, {
|
|
50
|
+
timeout: httpTimeout
|
|
51
|
+
}),
|
|
51
52
|
pollingInterval: config.viemPollingIntervalMS
|
|
52
53
|
});
|
|
53
54
|
// Create debug client using debug RPC URLs if available, otherwise fall back to regular RPC URLs
|
|
54
55
|
const debugRpcUrls = config.l1DebugRpcUrls.length > 0 ? config.l1DebugRpcUrls : config.l1RpcUrls;
|
|
55
56
|
const debugClient = createPublicClient({
|
|
56
57
|
chain: chain.chainInfo,
|
|
57
|
-
transport:
|
|
58
|
-
|
|
59
|
-
|
|
58
|
+
transport: makeL1HttpTransport(debugRpcUrls, {
|
|
59
|
+
timeout: httpTimeout
|
|
60
|
+
}),
|
|
60
61
|
pollingInterval: config.viemPollingIntervalMS
|
|
61
62
|
});
|
|
62
63
|
// Create L1 contract instances
|
|
63
64
|
const rollup = new RollupContract(publicClient, config.l1Contracts.rollupAddress);
|
|
64
65
|
const inbox = new InboxContract(publicClient, config.l1Contracts.inboxAddress);
|
|
65
66
|
// Fetch L1 constants from rollup contract
|
|
66
|
-
const [l1StartBlock, l1GenesisTime, proofSubmissionEpochs, genesisArchiveRoot, slashingProposerAddress] = await Promise.all([
|
|
67
|
+
const [l1StartBlock, l1GenesisTime, proofSubmissionEpochs, genesisArchiveRoot, slashingProposerAddress, targetCommitteeSize, rollupManaLimit] = await Promise.all([
|
|
67
68
|
rollup.getL1StartBlock(),
|
|
68
69
|
rollup.getL1GenesisTime(),
|
|
69
70
|
rollup.getProofSubmissionEpochs(),
|
|
70
71
|
rollup.getGenesisArchiveTreeRoot(),
|
|
71
|
-
rollup.getSlashingProposerAddress()
|
|
72
|
+
rollup.getSlashingProposerAddress(),
|
|
73
|
+
rollup.getTargetCommitteeSize(),
|
|
74
|
+
rollup.getManaLimit()
|
|
72
75
|
]);
|
|
73
76
|
const l1StartBlockHash = await publicClient.getBlock({
|
|
74
77
|
blockNumber: l1StartBlock,
|
|
@@ -83,48 +86,51 @@ export const ARCHIVER_STORE_NAME = 'archiver';
|
|
|
83
86
|
slotDuration,
|
|
84
87
|
ethereumSlotDuration,
|
|
85
88
|
proofSubmissionEpochs: Number(proofSubmissionEpochs),
|
|
86
|
-
|
|
89
|
+
targetCommitteeSize,
|
|
90
|
+
genesisArchiveRoot: Fr.fromString(genesisArchiveRoot.toString()),
|
|
91
|
+
rollupManaLimit: Number(rollupManaLimit)
|
|
87
92
|
};
|
|
88
93
|
const archiverConfig = merge({
|
|
89
94
|
pollingIntervalMs: 10_000,
|
|
90
95
|
batchSize: 100,
|
|
91
96
|
maxAllowedEthClientDriftSeconds: 300,
|
|
92
|
-
ethereumAllowNoDebugHosts: false
|
|
97
|
+
ethereumAllowNoDebugHosts: false,
|
|
98
|
+
skipHistoricalLogsCheck: false
|
|
93
99
|
}, mapArchiverConfig(config));
|
|
94
100
|
const epochCache = deps.epochCache ?? await EpochCache.create(config.l1Contracts.rollupAddress, config, deps);
|
|
95
101
|
const telemetry = deps.telemetry ?? getTelemetryClient();
|
|
96
102
|
const instrumentation = await ArchiverInstrumentation.new(telemetry, ()=>archiverStore.estimateSize());
|
|
97
103
|
// Create the event emitter that will be shared by archiver and synchronizer
|
|
98
104
|
const events = new EventEmitter();
|
|
105
|
+
// Create L2 tips cache shared by archiver and synchronizer
|
|
106
|
+
const l2TipsCache = new L2TipsCache(archiverStore.blockStore);
|
|
99
107
|
// Create the L1 synchronizer
|
|
100
|
-
const synchronizer = new ArchiverL1Synchronizer(publicClient, debugClient, rollup, inbox,
|
|
101
|
-
...config.l1Contracts,
|
|
102
|
-
slashingProposerAddress
|
|
103
|
-
}, archiverStore, archiverConfig, deps.blobClient, epochCache, deps.dateProvider ?? new DateProvider(), instrumentation, l1Constants, events, instrumentation.tracer);
|
|
108
|
+
const synchronizer = new ArchiverL1Synchronizer(publicClient, debugClient, rollup, inbox, archiverStore, archiverConfig, deps.blobClient, epochCache, deps.dateProvider ?? new DateProvider(), instrumentation, l1Constants, events, instrumentation.tracer, l2TipsCache, undefined);
|
|
104
109
|
const archiver = new Archiver(publicClient, debugClient, rollup, {
|
|
105
110
|
...config.l1Contracts,
|
|
106
111
|
slashingProposerAddress
|
|
107
|
-
}, archiverStore, archiverConfig, deps.blobClient, instrumentation, l1Constants, synchronizer, events);
|
|
112
|
+
}, archiverStore, archiverConfig, deps.blobClient, instrumentation, l1Constants, synchronizer, events, l2TipsCache);
|
|
108
113
|
await archiver.start(opts.blockUntilSync);
|
|
109
114
|
return archiver;
|
|
110
115
|
}
|
|
111
|
-
/** 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) {
|
|
112
117
|
const blockNumber = 0;
|
|
113
118
|
for (const name of protocolContractNames){
|
|
114
119
|
const provider = new BundledProtocolContractsProvider();
|
|
115
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);
|
|
116
126
|
const contractClassPublic = {
|
|
117
127
|
...contract.contractClass,
|
|
118
|
-
|
|
119
|
-
utilityFunctions: []
|
|
128
|
+
publicBytecodeCommitment
|
|
120
129
|
};
|
|
121
130
|
const publicFunctionSignatures = contract.artifact.functions.filter((fn)=>fn.functionType === FunctionType.PUBLIC).map((fn)=>decodeFunctionSignature(fn.name, fn.parameters));
|
|
122
131
|
await store.registerContractFunctionSignatures(publicFunctionSignatures);
|
|
123
|
-
const bytecodeCommitment = await computePublicBytecodeCommitment(contractClassPublic.packedBytecode);
|
|
124
132
|
await store.addContractClasses([
|
|
125
133
|
contractClassPublic
|
|
126
|
-
], [
|
|
127
|
-
bytecodeCommitment
|
|
128
134
|
], BlockNumber(blockNumber));
|
|
129
135
|
await store.addContractInstances([
|
|
130
136
|
contract.instance
|
package/dest/index.d.ts
CHANGED
|
@@ -7,5 +7,7 @@ export * from './config.js';
|
|
|
7
7
|
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
|
-
export {
|
|
11
|
-
|
|
10
|
+
export { L2TipsCache } from './store/l2_tips_cache.js';
|
|
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;
|
|
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
|
@@ -6,4 +6,6 @@ export * from './modules/data_store_updater.js';
|
|
|
6
6
|
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
|
-
export {
|
|
9
|
+
export { L2TipsCache } from './store/l2_tips_cache.js';
|
|
10
|
+
export { retrieveL2ProofVerifiedEvents } from './l1/data_retrieval.js';
|
|
11
|
+
export { CalldataRetriever } from './l1/calldata_retriever.js';
|
|
@@ -1,8 +1,9 @@
|
|
|
1
1
|
#!/usr/bin/env node
|
|
2
|
-
import {
|
|
2
|
+
import { CheckpointNumber } from '@aztec/foundation/branded-types';
|
|
3
3
|
import { EthAddress } from '@aztec/foundation/eth-address';
|
|
4
4
|
import { createLogger } from '@aztec/foundation/log';
|
|
5
|
-
import {
|
|
5
|
+
import { RollupAbi } from '@aztec/l1-artifacts/RollupAbi';
|
|
6
|
+
import { createPublicClient, decodeEventLog, getAbiItem, http, toEventSelector } from 'viem';
|
|
6
7
|
import { mainnet } from 'viem/chains';
|
|
7
8
|
import { CalldataRetriever } from '../calldata_retriever.js';
|
|
8
9
|
const logger = createLogger('archiver:calldata-test');
|
|
@@ -73,49 +74,51 @@ async function main() {
|
|
|
73
74
|
throw new Error(`Transaction ${txHash} not found`);
|
|
74
75
|
}
|
|
75
76
|
logger.info(`Transaction found in block ${tx.blockNumber}`);
|
|
76
|
-
// For simplicity, use zero addresses for optional contract addresses
|
|
77
|
-
// In production, these would be fetched from the rollup contract or configuration
|
|
78
|
-
const slashingProposerAddress = EthAddress.ZERO;
|
|
79
|
-
const governanceProposerAddress = EthAddress.ZERO;
|
|
80
|
-
const slashFactoryAddress = undefined;
|
|
81
|
-
logger.info('Using zero addresses for governance/slashing (can be configured if needed)');
|
|
82
77
|
// Create CalldataRetriever
|
|
83
|
-
const retriever = new CalldataRetriever(publicClient, publicClient, targetCommitteeSize, undefined, logger,
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
slashingProposerAddress,
|
|
87
|
-
slashFactoryAddress
|
|
88
|
-
});
|
|
89
|
-
// Extract L2 block number from transaction logs
|
|
90
|
-
logger.info('Decoding transaction to extract L2 block number...');
|
|
78
|
+
const retriever = new CalldataRetriever(publicClient, publicClient, targetCommitteeSize, undefined, logger, rollupAddress);
|
|
79
|
+
// Extract checkpoint number and hashes from transaction logs
|
|
80
|
+
logger.info('Decoding transaction to extract checkpoint number and hashes...');
|
|
91
81
|
const receipt = await publicClient.getTransactionReceipt({
|
|
92
82
|
hash: txHash
|
|
93
83
|
});
|
|
94
|
-
|
|
84
|
+
// Look for CheckpointProposed event
|
|
85
|
+
const checkpointProposedEventAbi = getAbiItem({
|
|
86
|
+
abi: RollupAbi,
|
|
87
|
+
name: 'CheckpointProposed'
|
|
88
|
+
});
|
|
89
|
+
const checkpointProposedLog = receipt.logs.find((log)=>{
|
|
95
90
|
try {
|
|
96
|
-
|
|
97
|
-
return log.address.toLowerCase() === rollupAddress.toString().toLowerCase() && log.topics[0] === '0x2f1d0e696fa5186494a2f2f89a0e0bcbb15d607f6c5eac4637e07e1e5e7d3c00' // L2BlockProposed event signature
|
|
98
|
-
;
|
|
91
|
+
return log.address.toLowerCase() === rollupAddress.toString().toLowerCase() && log.topics[0] === toEventSelector(checkpointProposedEventAbi);
|
|
99
92
|
} catch {
|
|
100
93
|
return false;
|
|
101
94
|
}
|
|
102
95
|
});
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
96
|
+
if (!checkpointProposedLog || checkpointProposedLog.topics[1] === undefined) {
|
|
97
|
+
throw new Error(`Checkpoint proposed event not found`);
|
|
98
|
+
}
|
|
99
|
+
const checkpointNumber = CheckpointNumber.fromBigInt(BigInt(checkpointProposedLog.topics[1]));
|
|
100
|
+
// Decode the full event to extract attestationsHash and payloadDigest
|
|
101
|
+
const decodedEvent = decodeEventLog({
|
|
102
|
+
abi: RollupAbi,
|
|
103
|
+
data: checkpointProposedLog.data,
|
|
104
|
+
topics: checkpointProposedLog.topics
|
|
105
|
+
});
|
|
106
|
+
const eventArgs = decodedEvent.args;
|
|
107
|
+
if (!eventArgs.attestationsHash || !eventArgs.payloadDigest) {
|
|
108
|
+
throw new Error(`CheckpointProposed event missing attestationsHash or payloadDigest`);
|
|
112
109
|
}
|
|
110
|
+
const expectedHashes = {
|
|
111
|
+
attestationsHash: eventArgs.attestationsHash,
|
|
112
|
+
payloadDigest: eventArgs.payloadDigest
|
|
113
|
+
};
|
|
114
|
+
logger.info(`Checkpoint Number: ${checkpointNumber}`);
|
|
115
|
+
logger.info(`Attestations Hash: ${expectedHashes.attestationsHash}`);
|
|
116
|
+
logger.info(`Payload Digest: ${expectedHashes.payloadDigest}`);
|
|
113
117
|
logger.info('');
|
|
114
|
-
logger.info('Retrieving
|
|
118
|
+
logger.info('Retrieving checkpoint from rollup transaction...');
|
|
115
119
|
logger.info('');
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
logger.info(' Successfully retrieved block header!');
|
|
120
|
+
const result = await retriever.getCheckpointFromRollupTx(txHash, [], checkpointNumber, expectedHashes);
|
|
121
|
+
logger.info(' Successfully retrieved block header!');
|
|
119
122
|
logger.info('');
|
|
120
123
|
logger.info('Block Header Details:');
|
|
121
124
|
logger.info('====================');
|