@aztec/archiver 0.0.1-commit.a072138 → 0.0.1-commit.a4600f49
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 +19 -11
- package/dest/archiver.d.ts +76 -18
- package/dest/archiver.d.ts.map +1 -1
- package/dest/archiver.js +330 -162
- package/dest/config.d.ts +7 -3
- package/dest/config.d.ts.map +1 -1
- package/dest/config.js +38 -14
- package/dest/errors.d.ts +55 -9
- package/dest/errors.d.ts.map +1 -1
- package/dest/errors.js +81 -14
- package/dest/factory.d.ts +13 -9
- package/dest/factory.d.ts.map +1 -1
- package/dest/factory.js +58 -39
- package/dest/index.d.ts +12 -3
- package/dest/index.d.ts.map +1 -1
- package/dest/index.js +11 -2
- package/dest/l1/bin/retrieve-calldata.js +36 -33
- package/dest/l1/calldata_retriever.d.ts +81 -50
- package/dest/l1/calldata_retriever.d.ts.map +1 -1
- package/dest/l1/calldata_retriever.js +202 -260
- package/dest/l1/data_retrieval.d.ts +32 -18
- 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/trace_tx.d.ts +12 -66
- package/dest/l1/trace_tx.d.ts.map +1 -1
- 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/contract_data_source_adapter.d.ts +25 -0
- package/dest/modules/contract_data_source_adapter.d.ts.map +1 -0
- package/dest/modules/contract_data_source_adapter.js +32 -0
- package/dest/modules/data_source_base.d.ts +74 -46
- package/dest/modules/data_source_base.d.ts.map +1 -1
- package/dest/modules/data_source_base.js +252 -190
- package/dest/modules/data_store_updater.d.ts +49 -17
- package/dest/modules/data_store_updater.d.ts.map +1 -1
- package/dest/modules/data_store_updater.js +213 -122
- package/dest/modules/instrumentation.d.ts +29 -3
- package/dest/modules/instrumentation.d.ts.map +1 -1
- package/dest/modules/instrumentation.js +67 -11
- package/dest/modules/l1_synchronizer.d.ts +16 -14
- package/dest/modules/l1_synchronizer.d.ts.map +1 -1
- package/dest/modules/l1_synchronizer.js +488 -219
- package/dest/modules/outbox_trees_resolver.d.ts +62 -0
- package/dest/modules/outbox_trees_resolver.d.ts.map +1 -0
- package/dest/modules/outbox_trees_resolver.js +162 -0
- package/dest/modules/validation.d.ts +30 -7
- package/dest/modules/validation.d.ts.map +1 -1
- package/dest/modules/validation.js +35 -17
- package/dest/store/block_store.d.ts +185 -74
- package/dest/store/block_store.d.ts.map +1 -1
- package/dest/store/block_store.js +760 -275
- package/dest/store/contract_class_store.d.ts +17 -4
- package/dest/store/contract_class_store.d.ts.map +1 -1
- package/dest/store/contract_class_store.js +42 -68
- package/dest/store/contract_instance_store.d.ts +28 -1
- package/dest/store/contract_instance_store.d.ts.map +1 -1
- package/dest/store/contract_instance_store.js +54 -2
- package/dest/store/data_stores.d.ts +68 -0
- package/dest/store/data_stores.d.ts.map +1 -0
- package/dest/store/data_stores.js +54 -0
- package/dest/store/function_names_cache.d.ts +17 -0
- package/dest/store/function_names_cache.d.ts.map +1 -0
- package/dest/store/function_names_cache.js +30 -0
- package/dest/store/l2_tips_cache.d.ts +25 -0
- package/dest/store/l2_tips_cache.d.ts.map +1 -0
- package/dest/store/l2_tips_cache.js +26 -0
- package/dest/store/log_store.d.ts +42 -37
- package/dest/store/log_store.d.ts.map +1 -1
- package/dest/store/log_store.js +262 -388
- package/dest/store/log_store_codec.d.ts +78 -0
- package/dest/store/log_store_codec.d.ts.map +1 -0
- package/dest/store/log_store_codec.js +110 -0
- package/dest/store/message_store.d.ts +11 -1
- package/dest/store/message_store.d.ts.map +1 -1
- package/dest/store/message_store.js +51 -9
- package/dest/test/fake_l1_state.d.ts +25 -1
- package/dest/test/fake_l1_state.d.ts.map +1 -1
- package/dest/test/fake_l1_state.js +166 -32
- 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_l2_block_source.d.ts +61 -47
- package/dest/test/mock_l2_block_source.d.ts.map +1 -1
- package/dest/test/mock_l2_block_source.js +306 -211
- 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 +15 -3
- package/dest/test/noop_l1_archiver.d.ts +17 -6
- package/dest/test/noop_l1_archiver.d.ts.map +1 -1
- package/dest/test/noop_l1_archiver.js +31 -11
- package/package.json +14 -14
- package/src/archiver.ts +427 -185
- package/src/config.ts +43 -13
- package/src/errors.ts +122 -21
- package/src/factory.ts +86 -37
- package/src/index.ts +19 -2
- package/src/l1/README.md +25 -68
- package/src/l1/bin/retrieve-calldata.ts +46 -39
- package/src/l1/calldata_retriever.ts +267 -379
- package/src/l1/data_retrieval.ts +66 -70
- package/src/l1/spire_proposer.ts +7 -15
- package/src/l1/validate_historical_logs.ts +140 -0
- package/src/modules/contract_data_source_adapter.ts +46 -0
- package/src/modules/data_source_base.ts +337 -238
- package/src/modules/data_store_updater.ts +250 -154
- package/src/modules/instrumentation.ts +71 -11
- package/src/modules/l1_synchronizer.ts +659 -269
- package/src/modules/outbox_trees_resolver.ts +199 -0
- package/src/modules/validation.ts +80 -23
- package/src/store/block_store.ts +932 -347
- package/src/store/contract_class_store.ts +49 -103
- package/src/store/contract_instance_store.ts +68 -5
- package/src/store/data_stores.ts +104 -0
- package/src/store/function_names_cache.ts +37 -0
- package/src/store/l2_tips_cache.ts +35 -0
- package/src/store/log_store.ts +304 -499
- package/src/store/log_store_codec.ts +143 -0
- package/src/store/message_store.ts +60 -10
- package/src/structs/inbox_message.ts +1 -1
- package/src/test/fake_l1_state.ts +213 -42
- package/src/test/mock_archiver.ts +3 -2
- package/src/test/mock_l2_block_source.ts +378 -233
- package/src/test/mock_structs.ts +25 -8
- package/src/test/noop_l1_archiver.ts +61 -12
- package/dest/store/kv_archiver_store.d.ts +0 -340
- package/dest/store/kv_archiver_store.d.ts.map +0 -1
- package/dest/store/kv_archiver_store.js +0 -446
- package/src/store/kv_archiver_store.ts +0 -639
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"data_store_updater.d.ts","sourceRoot":"","sources":["../../src/modules/data_store_updater.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,gBAAgB,EAAE,MAAM,iCAAiC,CAAC;
|
|
1
|
+
{"version":3,"file":"data_store_updater.d.ts","sourceRoot":"","sources":["../../src/modules/data_store_updater.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,gBAAgB,EAAE,MAAM,iCAAiC,CAAC;AAQhF,OAAO,KAAK,EAAE,oBAAoB,EAAE,OAAO,EAAE,wBAAwB,EAAE,MAAM,qBAAqB,CAAC;AACnG,OAAO,EACL,KAAK,eAAe,EACpB,KAAK,uBAAuB,EAC5B,KAAK,mBAAmB,EAEzB,MAAM,0BAA0B,CAAC;AASlC,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAClE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAC;AAQ7D,6EAA6E;AAC7E,KAAK,0BAA0B,GAAG;IAChC,mEAAmE;IACnE,YAAY,EAAE,OAAO,EAAE,GAAG,SAAS,CAAC;IACpC,iFAAiF;IACjF,8BAA8B,EAAE,WAAW,GAAG,SAAS,CAAC;CACzD,CAAC;AAEF,kEAAkE;AAClE,qBAAa,wBAAwB;IAIjC,OAAO,CAAC,MAAM;IACd,OAAO,CAAC,WAAW,CAAC;IACpB,OAAO,CAAC,IAAI;IALd,OAAO,CAAC,QAAQ,CAAC,GAAG,CAA0C;IAE9D,YACU,MAAM,EAAE,kBAAkB,EAC1B,WAAW,CAAC,yBAAa,EACzB,IAAI,GAAE;QAAE,eAAe,CAAC,EAAE,MAAM,CAAA;KAAO,EAC7C;IAEJ;;;;;;;;OAQG;IACU,gBAAgB,CAC3B,KAAK,EAAE,OAAO,EACd,4BAA4B,CAAC,EAAE,wBAAwB,GACtD,OAAO,CAAC,OAAO,CAAC,CAkBlB;IAED;;;;;;;;;;;;OAYG;IACU,cAAc,CACzB,WAAW,EAAE,mBAAmB,EAAE,EAClC,4BAA4B,CAAC,EAAE,wBAAwB,EACvD,eAAe,CAAC,EAAE;QAChB,EAAE,EAAE,eAAe,CAAC;QACpB,YAAY,EAAE,oBAAoB,EAAE,CAAC;QACrC,UAAU,EAAE,mBAAmB,CAAC;KACjC,EACD,iBAAiB,CAAC,EAAE,gBAAgB,GACnC,OAAO,CAAC,0BAA0B,CAAC,CA+CrC;IAEY,qBAAqB,CAAC,kBAAkB,EAAE,uBAAuB,iBAM7E;YAgBa,2BAA2B;IAuEzC;;;;;;;;OAQG;IACU,+BAA+B,CAAC,WAAW,EAAE,WAAW,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC,CAiBzF;IAED;;;;;;;;;OASG;IACU,0CAA0C,CAAC,WAAW,EAAE,WAAW,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC,CAcpG;YAOa,uCAAuC;YAYvC,iBAAiB;IAa/B;;;;;;;;OAQG;IACU,sBAAsB,CAAC,gBAAgB,EAAE,gBAAgB,GAAG,OAAO,CAAC,OAAO,CAAC,CAgBxF;IAED;;;OAGG;IACU,yBAAyB,CAAC,gBAAgB,EAAE,gBAAgB,GAAG,OAAO,CAAC,IAAI,CAAC,CAKxF;IAED;;;OAGG;IACU,4BAA4B,CAAC,gBAAgB,EAAE,gBAAgB,GAAG,OAAO,CAAC,IAAI,CAAC,CAK3F;IAED,6DAA6D;IAC7D,OAAO,CAAC,mBAAmB;IAI3B,qDAAqD;IACrD,OAAO,CAAC,wBAAwB;YAKlB,sBAAsB;YAiBtB,8BAA8B;YA+C9B,+BAA+B;YA0C/B,8BAA8B;CAsB7C"}
|
|
@@ -1,85 +1,126 @@
|
|
|
1
1
|
import { BlockNumber } from '@aztec/foundation/branded-types';
|
|
2
|
-
import {
|
|
2
|
+
import { filterAsync } from '@aztec/foundation/collection';
|
|
3
3
|
import { createLogger } from '@aztec/foundation/log';
|
|
4
|
-
import { ContractClassPublishedEvent
|
|
4
|
+
import { ContractClassPublishedEvent } from '@aztec/protocol-contracts/class-registry';
|
|
5
5
|
import { ContractInstancePublishedEvent, ContractInstanceUpdatedEvent } from '@aztec/protocol-contracts/instance-registry';
|
|
6
|
-
import {
|
|
7
|
-
import
|
|
6
|
+
import { validateCheckpoint } from '@aztec/stdlib/checkpoint';
|
|
7
|
+
import { computeContractAddressFromInstance, computeContractClassId } from '@aztec/stdlib/contract';
|
|
8
8
|
/** Operation type for contract data updates. */ var Operation = /*#__PURE__*/ function(Operation) {
|
|
9
9
|
Operation[Operation["Store"] = 0] = "Store";
|
|
10
10
|
Operation[Operation["Delete"] = 1] = "Delete";
|
|
11
11
|
return Operation;
|
|
12
12
|
}(Operation || {});
|
|
13
13
|
/** Archiver helper module to handle updates to the data store. */ export class ArchiverDataStoreUpdater {
|
|
14
|
-
|
|
14
|
+
stores;
|
|
15
|
+
l2TipsCache;
|
|
16
|
+
opts;
|
|
15
17
|
log;
|
|
16
|
-
constructor(
|
|
17
|
-
this.
|
|
18
|
+
constructor(stores, l2TipsCache, opts = {}){
|
|
19
|
+
this.stores = stores;
|
|
20
|
+
this.l2TipsCache = l2TipsCache;
|
|
21
|
+
this.opts = opts;
|
|
18
22
|
this.log = createLogger('archiver:store_updater');
|
|
19
23
|
}
|
|
20
24
|
/**
|
|
21
|
-
* Adds proposed
|
|
22
|
-
*
|
|
23
|
-
* Extracts ContractClassPublished, ContractInstancePublished, ContractInstanceUpdated events
|
|
24
|
-
* and individually broadcasted functions from the block logs.
|
|
25
|
+
* Adds a proposed block to the store with contract class/instance extraction from logs.
|
|
26
|
+
* This is an uncheckpointed block that has been proposed by the sequencer but not yet included in a checkpoint on L1.
|
|
27
|
+
* Extracts ContractClassPublished, ContractInstancePublished, ContractInstanceUpdated events from the block logs.
|
|
25
28
|
*
|
|
26
|
-
* @param
|
|
29
|
+
* @param block - The proposed L2 block to add.
|
|
27
30
|
* @param pendingChainValidationStatus - Optional validation status to set.
|
|
28
31
|
* @returns True if the operation is successful.
|
|
29
|
-
*/
|
|
30
|
-
|
|
31
|
-
await this.
|
|
32
|
+
*/ async addProposedBlock(block, pendingChainValidationStatus) {
|
|
33
|
+
const result = await this.stores.db.transactionAsync(async ()=>{
|
|
34
|
+
await this.stores.blocks.addProposedBlock(block);
|
|
32
35
|
const opResults = await Promise.all([
|
|
33
36
|
// Update the pending chain validation status if provided
|
|
34
|
-
pendingChainValidationStatus && this.
|
|
35
|
-
// Add any logs emitted during the retrieved
|
|
36
|
-
this.
|
|
37
|
-
|
|
38
|
-
|
|
37
|
+
pendingChainValidationStatus && this.stores.blocks.setPendingChainValidationStatus(pendingChainValidationStatus),
|
|
38
|
+
// Add any logs emitted during the retrieved block
|
|
39
|
+
this.stores.logs.addLogs([
|
|
40
|
+
block
|
|
41
|
+
]),
|
|
42
|
+
// Unroll all logs emitted during the retrieved block and extract any contract classes and instances from it
|
|
43
|
+
this.addContractDataToDb(block)
|
|
39
44
|
]);
|
|
40
45
|
return opResults.every(Boolean);
|
|
41
46
|
});
|
|
47
|
+
await this.l2TipsCache?.refresh();
|
|
48
|
+
return result;
|
|
42
49
|
}
|
|
43
50
|
/**
|
|
44
51
|
* Reconciles local blocks with incoming checkpoints from L1.
|
|
45
52
|
* Adds new checkpoints to the store with contract class/instance extraction from logs.
|
|
46
53
|
* Prunes any local blocks that conflict with checkpoint data (by comparing archive roots).
|
|
47
|
-
* Extracts ContractClassPublished, ContractInstancePublished, ContractInstanceUpdated events
|
|
48
|
-
*
|
|
54
|
+
* Extracts ContractClassPublished, ContractInstancePublished, ContractInstanceUpdated events from the checkpoint block logs.
|
|
55
|
+
* If `promoteProposed` is supplied, the proposed-checkpoint promotion runs inside the same transaction
|
|
56
|
+
* as the added checkpoints so both updates are applied atomically.
|
|
49
57
|
*
|
|
50
|
-
* @param checkpoints - The published checkpoints to add.
|
|
58
|
+
* @param checkpoints - The published checkpoints to add (excluding any being promoted from proposed).
|
|
51
59
|
* @param pendingChainValidationStatus - Optional validation status to set.
|
|
60
|
+
* @param promoteProposed - Optional promotion of the current proposed checkpoint (fast path when blocks are already local).
|
|
52
61
|
* @returns Result with information about any pruned blocks.
|
|
53
|
-
*/ addCheckpoints(checkpoints, pendingChainValidationStatus) {
|
|
54
|
-
|
|
62
|
+
*/ async addCheckpoints(checkpoints, pendingChainValidationStatus, promoteProposed, evictProposedFrom) {
|
|
63
|
+
for (const checkpoint of checkpoints){
|
|
64
|
+
validateCheckpoint(checkpoint.checkpoint, {
|
|
65
|
+
rollupManaLimit: this.opts?.rollupManaLimit
|
|
66
|
+
});
|
|
67
|
+
}
|
|
68
|
+
if (promoteProposed) {
|
|
69
|
+
validateCheckpoint(promoteProposed.checkpoint.checkpoint, {
|
|
70
|
+
rollupManaLimit: this.opts?.rollupManaLimit
|
|
71
|
+
});
|
|
72
|
+
}
|
|
73
|
+
const result = await this.stores.db.transactionAsync(async ()=>{
|
|
55
74
|
// Before adding checkpoints, check for conflicts with local blocks if any
|
|
56
75
|
const { prunedBlocks, lastAlreadyInsertedBlockNumber } = await this.pruneMismatchingLocalBlocks(checkpoints);
|
|
57
|
-
await this.
|
|
58
|
-
//
|
|
59
|
-
|
|
76
|
+
const insertedCheckpoints = await this.stores.blocks.addCheckpoints(checkpoints);
|
|
77
|
+
// Skip blocks already inserted via addProposedBlock() and blocks of already-stored checkpoints
|
|
78
|
+
// re-included by an L1 reorg: their logs/contract data were extracted when first inserted.
|
|
79
|
+
const newBlocks = insertedCheckpoints.flatMap((ch)=>ch.checkpoint.blocks).filter((b)=>lastAlreadyInsertedBlockNumber === undefined || b.number > lastAlreadyInsertedBlockNumber);
|
|
60
80
|
await Promise.all([
|
|
61
81
|
// Update the pending chain validation status if provided
|
|
62
|
-
pendingChainValidationStatus && this.
|
|
82
|
+
pendingChainValidationStatus && this.stores.blocks.setPendingChainValidationStatus(pendingChainValidationStatus),
|
|
63
83
|
// Add any logs emitted during the retrieved blocks
|
|
64
|
-
this.
|
|
84
|
+
this.stores.logs.addLogs(newBlocks),
|
|
65
85
|
// Unroll all logs emitted during the retrieved blocks and extract any contract classes and instances from them
|
|
66
|
-
...newBlocks.map((block)=>this.addContractDataToDb(block))
|
|
86
|
+
...newBlocks.map((block)=>this.addContractDataToDb(block)),
|
|
87
|
+
// Promote the proposed checkpoint if requested (uses explicit checkpoint number)
|
|
88
|
+
promoteProposed ? this.stores.blocks.promoteProposedToCheckpointed(promoteProposed.checkpoint.checkpoint.number, promoteProposed.l1, promoteProposed.attestations, promoteProposed.checkpoint.checkpoint.archive.root) : undefined,
|
|
89
|
+
// Evict pending checkpoints that diverged from what L1 mined
|
|
90
|
+
evictProposedFrom !== undefined ? this.stores.blocks.evictProposedCheckpointsFrom(evictProposedFrom) : undefined
|
|
67
91
|
]);
|
|
68
92
|
return {
|
|
69
93
|
prunedBlocks,
|
|
70
94
|
lastAlreadyInsertedBlockNumber
|
|
71
95
|
};
|
|
72
96
|
});
|
|
97
|
+
await this.l2TipsCache?.refresh();
|
|
98
|
+
return result;
|
|
99
|
+
}
|
|
100
|
+
async addProposedCheckpoint(proposedCheckpoint) {
|
|
101
|
+
const result = await this.stores.db.transactionAsync(async ()=>{
|
|
102
|
+
await this.stores.blocks.addProposedCheckpoint(proposedCheckpoint);
|
|
103
|
+
});
|
|
104
|
+
await this.l2TipsCache?.refresh();
|
|
105
|
+
return result;
|
|
73
106
|
}
|
|
74
107
|
/**
|
|
75
108
|
* Checks for local proposed blocks that do not match the ones to be checkpointed and prunes them.
|
|
76
|
-
*
|
|
77
|
-
*
|
|
78
|
-
*
|
|
109
|
+
* Conflict detection is keyed on `blockNumber`: when a local proposed block and an L1
|
|
110
|
+
* checkpointed block share a block number but live at different slots (e.g. a different proposer
|
|
111
|
+
* mined the same block number one slot earlier), we still treat them as a conflict and prune.
|
|
112
|
+
* The trailing per-checkpoint prune that handles "local has extra trailing blocks within the
|
|
113
|
+
* same slot as the published checkpoint" remains scoped by slot to preserve pipelining: local
|
|
114
|
+
* blocks that live at a later slot than the checkpoint being processed represent speculation
|
|
115
|
+
* atop the just-confirmed tip (and may be referenced by a pending proposed checkpoint), so we
|
|
116
|
+
* leave them in place. This method handles multiple checkpoints but returns after pruning the
|
|
117
|
+
* first conflict found. This is correct because pruning from the first conflict point removes
|
|
118
|
+
* all subsequent blocks, and when checkpoints are added afterward, they include all the correct
|
|
119
|
+
* blocks.
|
|
79
120
|
*/ async pruneMismatchingLocalBlocks(checkpoints) {
|
|
80
121
|
const [lastCheckpointedBlockNumber, lastBlockNumber] = await Promise.all([
|
|
81
|
-
this.
|
|
82
|
-
this.
|
|
122
|
+
this.stores.blocks.getCheckpointedL2BlockNumber(),
|
|
123
|
+
this.stores.blocks.getLatestL2BlockNumber()
|
|
83
124
|
]);
|
|
84
125
|
// Exit early if there are no local uncheckpointed blocks
|
|
85
126
|
if (lastBlockNumber === lastCheckpointedBlockNumber) {
|
|
@@ -89,22 +130,25 @@ import groupBy from 'lodash.groupby';
|
|
|
89
130
|
};
|
|
90
131
|
}
|
|
91
132
|
// Get all uncheckpointed local blocks
|
|
92
|
-
const uncheckpointedLocalBlocks = await this.
|
|
133
|
+
const uncheckpointedLocalBlocks = await this.stores.blocks.getBlocksData({
|
|
134
|
+
from: BlockNumber.add(lastCheckpointedBlockNumber, 1),
|
|
135
|
+
limit: lastBlockNumber - lastCheckpointedBlockNumber
|
|
136
|
+
});
|
|
93
137
|
let lastAlreadyInsertedBlockNumber;
|
|
94
138
|
for (const publishedCheckpoint of checkpoints){
|
|
95
139
|
const checkpointBlocks = publishedCheckpoint.checkpoint.blocks;
|
|
96
140
|
const slot = publishedCheckpoint.checkpoint.slot;
|
|
97
|
-
const localBlocksInSlot = uncheckpointedLocalBlocks.filter((b)=>b.slot === slot);
|
|
98
141
|
if (checkpointBlocks.length === 0) {
|
|
99
142
|
this.log.warn(`Checkpoint ${publishedCheckpoint.checkpoint.number} for slot ${slot} has no blocks`);
|
|
100
143
|
continue;
|
|
101
144
|
}
|
|
102
|
-
// Find the first checkpoint block that conflicts with an existing local block and prune local afterwards
|
|
145
|
+
// Find the first checkpoint block that conflicts with an existing local block and prune local afterwards.
|
|
146
|
+
// Conflict detection joins on block number only — same block number at a different slot is still a conflict.
|
|
103
147
|
for (const checkpointBlock of checkpointBlocks){
|
|
104
148
|
const blockNumber = checkpointBlock.number;
|
|
105
|
-
const existingBlock =
|
|
149
|
+
const existingBlock = uncheckpointedLocalBlocks.find((b)=>b.header.getBlockNumber() === blockNumber);
|
|
106
150
|
const blockInfos = {
|
|
107
|
-
existingBlock: existingBlock?.
|
|
151
|
+
existingBlock: existingBlock?.header.toInspect(),
|
|
108
152
|
checkpointBlock: checkpointBlock.toBlockInfo()
|
|
109
153
|
};
|
|
110
154
|
if (!existingBlock) {
|
|
@@ -113,21 +157,25 @@ import groupBy from 'lodash.groupby';
|
|
|
113
157
|
this.log.verbose(`Block number ${blockNumber} already inserted and matches checkpoint`, blockInfos);
|
|
114
158
|
lastAlreadyInsertedBlockNumber = blockNumber;
|
|
115
159
|
} else {
|
|
116
|
-
this.log.
|
|
160
|
+
this.log.info(`Conflict detected at block ${blockNumber} between checkpointed and local block`, blockInfos);
|
|
117
161
|
const prunedBlocks = await this.removeBlocksAfter(BlockNumber(blockNumber - 1));
|
|
162
|
+
await this.evictProposedCheckpointsForPrunedBlocks(prunedBlocks);
|
|
118
163
|
return {
|
|
119
164
|
prunedBlocks,
|
|
120
165
|
lastAlreadyInsertedBlockNumber
|
|
121
166
|
};
|
|
122
167
|
}
|
|
123
168
|
}
|
|
124
|
-
// If
|
|
125
|
-
//
|
|
169
|
+
// If the sequencer locally proposed extra blocks within this checkpoint's slot (e.g. local has
|
|
170
|
+
// [N, N+1] but L1 confirmed just [N]), prune the extras. Scoped to the checkpoint's slot so we
|
|
171
|
+
// do not throw away speculative blocks at later slots that belong to a pending proposed checkpoint.
|
|
126
172
|
const lastCheckpointBlockNumber = checkpointBlocks.at(-1).number;
|
|
127
|
-
const
|
|
173
|
+
const localBlocksInSlot = uncheckpointedLocalBlocks.filter((b)=>b.header.getSlot() === slot);
|
|
174
|
+
const lastLocalBlockNumber = localBlocksInSlot.at(-1)?.header.getBlockNumber();
|
|
128
175
|
if (lastLocalBlockNumber !== undefined && lastLocalBlockNumber > lastCheckpointBlockNumber) {
|
|
129
176
|
this.log.warn(`Local chain for slot ${slot} ends at block ${lastLocalBlockNumber} but checkpoint ends at ${lastCheckpointBlockNumber}. Pruning blocks after block ${lastCheckpointBlockNumber}.`);
|
|
130
177
|
const prunedBlocks = await this.removeBlocksAfter(lastCheckpointBlockNumber);
|
|
178
|
+
await this.evictProposedCheckpointsForPrunedBlocks(prunedBlocks);
|
|
131
179
|
return {
|
|
132
180
|
prunedBlocks,
|
|
133
181
|
lastAlreadyInsertedBlockNumber
|
|
@@ -147,25 +195,61 @@ import groupBy from 'lodash.groupby';
|
|
|
147
195
|
* @param blockNumber - Remove all blocks with number greater than this.
|
|
148
196
|
* @returns The removed blocks.
|
|
149
197
|
* @throws Error if any block to be removed is checkpointed.
|
|
150
|
-
*/ removeUncheckpointedBlocksAfter(blockNumber) {
|
|
151
|
-
|
|
198
|
+
*/ async removeUncheckpointedBlocksAfter(blockNumber) {
|
|
199
|
+
const result = await this.stores.db.transactionAsync(async ()=>{
|
|
152
200
|
// Verify we're only removing uncheckpointed blocks
|
|
153
|
-
const lastCheckpointedBlockNumber = await this.
|
|
201
|
+
const lastCheckpointedBlockNumber = await this.stores.blocks.getCheckpointedL2BlockNumber();
|
|
154
202
|
if (blockNumber < lastCheckpointedBlockNumber) {
|
|
155
203
|
throw new Error(`Cannot remove blocks after ${blockNumber} because checkpointed blocks exist up to ${lastCheckpointedBlockNumber}`);
|
|
156
204
|
}
|
|
205
|
+
const prunedBlocks = await this.removeBlocksAfter(blockNumber);
|
|
206
|
+
await this.evictProposedCheckpointsForPrunedBlocks(prunedBlocks);
|
|
207
|
+
return prunedBlocks;
|
|
208
|
+
});
|
|
209
|
+
await this.l2TipsCache?.refresh();
|
|
210
|
+
return result;
|
|
211
|
+
}
|
|
212
|
+
/**
|
|
213
|
+
* Removes all blocks without a proposed checkpoint strictly after the specified block number and cleans up associated contract data.
|
|
214
|
+
* This handles removal of provisionally added blocks along with their contract classes/instances.
|
|
215
|
+
* Verifies that each block being removed is not part of a stored checkpoint (proposed or not).
|
|
216
|
+
* This differs from `removeUncheckpointedBlocksAfter` in that it also checks proposed checkpoints.
|
|
217
|
+
*
|
|
218
|
+
* @param blockNumber - Remove all blocks with number greater than this.
|
|
219
|
+
* @returns The removed blocks.
|
|
220
|
+
* @throws Error if any block to be removed is checkpointed.
|
|
221
|
+
*/ async removeBlocksWithoutProposedCheckpointAfter(blockNumber) {
|
|
222
|
+
const result = await this.stores.db.transactionAsync(async ()=>{
|
|
223
|
+
// Verify we're only removing uncheckpointed blocks
|
|
224
|
+
const lastCheckpointedBlockNumber = await this.stores.blocks.getProposedCheckpointL2BlockNumber();
|
|
225
|
+
if (blockNumber < lastCheckpointedBlockNumber) {
|
|
226
|
+
throw new Error(`Cannot remove blocks after ${blockNumber} because proposed checkpointed blocks exist up to ${lastCheckpointedBlockNumber}`);
|
|
227
|
+
}
|
|
157
228
|
return await this.removeBlocksAfter(blockNumber);
|
|
158
229
|
});
|
|
230
|
+
await this.l2TipsCache?.refresh();
|
|
231
|
+
return result;
|
|
232
|
+
}
|
|
233
|
+
/**
|
|
234
|
+
* Evicts pending proposed checkpoints that referenced any of the just-pruned blocks. Pruned
|
|
235
|
+
* blocks invalidate all proposed checkpoints from the lowest pruned block's checkpoint number
|
|
236
|
+
* onwards: those checkpoints either reference the pruned blocks directly or chain off them.
|
|
237
|
+
*/ async evictProposedCheckpointsForPrunedBlocks(prunedBlocks) {
|
|
238
|
+
if (prunedBlocks.length === 0) {
|
|
239
|
+
return;
|
|
240
|
+
}
|
|
241
|
+
const fromCheckpointNumber = prunedBlocks[0].checkpointNumber;
|
|
242
|
+
await this.stores.blocks.evictProposedCheckpointsFrom(fromCheckpointNumber);
|
|
159
243
|
}
|
|
160
244
|
/**
|
|
161
245
|
* Removes all blocks strictly after the given block number along with any logs and contract data.
|
|
162
246
|
* Does not remove their checkpoints.
|
|
163
247
|
*/ async removeBlocksAfter(blockNumber) {
|
|
164
248
|
// First get the blocks to be removed so we can clean up contract data
|
|
165
|
-
const removedBlocks = await this.
|
|
249
|
+
const removedBlocks = await this.stores.blocks.removeBlocksAfter(blockNumber);
|
|
166
250
|
// Clean up contract data and logs for the removed blocks
|
|
167
251
|
await Promise.all([
|
|
168
|
-
this.
|
|
252
|
+
this.stores.logs.deleteLogs(removedBlocks),
|
|
169
253
|
...removedBlocks.map((block)=>this.removeContractDataFromDb(block))
|
|
170
254
|
]);
|
|
171
255
|
return removedBlocks;
|
|
@@ -179,17 +263,39 @@ import groupBy from 'lodash.groupby';
|
|
|
179
263
|
* @param checkpointNumber - Remove all checkpoints strictly after this one.
|
|
180
264
|
* @returns True if the operation is successful.
|
|
181
265
|
*/ async removeCheckpointsAfter(checkpointNumber) {
|
|
182
|
-
const
|
|
183
|
-
|
|
184
|
-
|
|
185
|
-
|
|
186
|
-
|
|
187
|
-
|
|
188
|
-
|
|
189
|
-
|
|
190
|
-
|
|
191
|
-
|
|
192
|
-
|
|
266
|
+
const result = await this.stores.db.transactionAsync(async ()=>{
|
|
267
|
+
const { blocksRemoved = [] } = await this.stores.blocks.removeCheckpointsAfter(checkpointNumber);
|
|
268
|
+
const opResults = await Promise.all([
|
|
269
|
+
// Prune rolls back to the last proven block, which is by definition valid
|
|
270
|
+
this.stores.blocks.setPendingChainValidationStatus({
|
|
271
|
+
valid: true
|
|
272
|
+
}),
|
|
273
|
+
// Remove contract data for all blocks being removed
|
|
274
|
+
...blocksRemoved.map((block)=>this.removeContractDataFromDb(block)),
|
|
275
|
+
this.stores.logs.deleteLogs(blocksRemoved)
|
|
276
|
+
]);
|
|
277
|
+
return opResults.every(Boolean);
|
|
278
|
+
});
|
|
279
|
+
await this.l2TipsCache?.refresh();
|
|
280
|
+
return result;
|
|
281
|
+
}
|
|
282
|
+
/**
|
|
283
|
+
* Updates the proven checkpoint number and refreshes the L2 tips cache.
|
|
284
|
+
* @param checkpointNumber - The checkpoint number to set as proven.
|
|
285
|
+
*/ async setProvenCheckpointNumber(checkpointNumber) {
|
|
286
|
+
await this.stores.db.transactionAsync(async ()=>{
|
|
287
|
+
await this.stores.blocks.setProvenCheckpointNumber(checkpointNumber);
|
|
288
|
+
});
|
|
289
|
+
await this.l2TipsCache?.refresh();
|
|
290
|
+
}
|
|
291
|
+
/**
|
|
292
|
+
* Updates the finalized checkpoint number and refreshes the L2 tips cache.
|
|
293
|
+
* @param checkpointNumber - The checkpoint number to set as finalized.
|
|
294
|
+
*/ async setFinalizedCheckpointNumber(checkpointNumber) {
|
|
295
|
+
await this.stores.db.transactionAsync(async ()=>{
|
|
296
|
+
await this.stores.blocks.setFinalizedCheckpointNumber(checkpointNumber);
|
|
297
|
+
});
|
|
298
|
+
await this.l2TipsCache?.refresh();
|
|
193
299
|
}
|
|
194
300
|
/** Extracts and stores contract data from a single block. */ addContractDataToDb(block) {
|
|
195
301
|
return this.updateContractDataOnDb(block, 0);
|
|
@@ -204,37 +310,68 @@ import groupBy from 'lodash.groupby';
|
|
|
204
310
|
return (await Promise.all([
|
|
205
311
|
this.updatePublishedContractClasses(contractClassLogs, block.number, operation),
|
|
206
312
|
this.updateDeployedContractInstances(privateLogs, block.number, operation),
|
|
207
|
-
this.updateUpdatedContractInstances(publicLogs, block.header.globalVariables.timestamp, operation)
|
|
208
|
-
operation === 0 ? this.storeBroadcastedIndividualFunctions(contractClassLogs, block.number) : Promise.resolve(true)
|
|
313
|
+
this.updateUpdatedContractInstances(publicLogs, block.header.globalVariables.timestamp, operation)
|
|
209
314
|
])).every(Boolean);
|
|
210
315
|
}
|
|
211
316
|
/**
|
|
212
317
|
* Extracts and stores contract classes out of ContractClassPublished events emitted by the class registry contract.
|
|
213
318
|
*/ async updatePublishedContractClasses(allLogs, blockNum, operation) {
|
|
214
319
|
const contractClassPublishedEvents = allLogs.filter((log)=>ContractClassPublishedEvent.isContractClassPublishedEvent(log)).map((log)=>ContractClassPublishedEvent.fromLog(log));
|
|
215
|
-
|
|
320
|
+
if (operation == 1) {
|
|
321
|
+
const contractClasses = contractClassPublishedEvents.map((e)=>e.toContractClassPublic());
|
|
322
|
+
if (contractClasses.length > 0) {
|
|
323
|
+
contractClasses.forEach((c)=>this.log.verbose(`${Operation[operation]} contract class ${c.id.toString()}`));
|
|
324
|
+
return await this.stores.contractClasses.deleteContractClasses(contractClasses, blockNum);
|
|
325
|
+
}
|
|
326
|
+
return true;
|
|
327
|
+
}
|
|
328
|
+
// Compute bytecode commitments and validate class IDs in a single pass.
|
|
329
|
+
const contractClasses = [];
|
|
330
|
+
for (const event of contractClassPublishedEvents){
|
|
331
|
+
const contractClass = await event.toContractClassPublicWithBytecodeCommitment();
|
|
332
|
+
const computedClassId = await computeContractClassId({
|
|
333
|
+
artifactHash: contractClass.artifactHash,
|
|
334
|
+
privateFunctionsRoot: contractClass.privateFunctionsRoot,
|
|
335
|
+
publicBytecodeCommitment: contractClass.publicBytecodeCommitment
|
|
336
|
+
});
|
|
337
|
+
if (!computedClassId.equals(contractClass.id)) {
|
|
338
|
+
this.log.warn(`Skipping contract class with mismatched id at block ${blockNum}. Claimed ${contractClass.id}, computed ${computedClassId}`, {
|
|
339
|
+
blockNum,
|
|
340
|
+
contractClassId: event.contractClassId.toString()
|
|
341
|
+
});
|
|
342
|
+
continue;
|
|
343
|
+
}
|
|
344
|
+
contractClasses.push(contractClass);
|
|
345
|
+
}
|
|
216
346
|
if (contractClasses.length > 0) {
|
|
217
347
|
contractClasses.forEach((c)=>this.log.verbose(`${Operation[operation]} contract class ${c.id.toString()}`));
|
|
218
|
-
|
|
219
|
-
// TODO: Will probably want to create some worker threads to compute these bytecode commitments as they are expensive
|
|
220
|
-
const commitments = await Promise.all(contractClasses.map((c)=>computePublicBytecodeCommitment(c.packedBytecode)));
|
|
221
|
-
return await this.store.addContractClasses(contractClasses, commitments, blockNum);
|
|
222
|
-
} else if (operation == 1) {
|
|
223
|
-
return await this.store.deleteContractClasses(contractClasses, blockNum);
|
|
224
|
-
}
|
|
348
|
+
return await this.stores.contractClasses.addContractClasses(contractClasses, blockNum);
|
|
225
349
|
}
|
|
226
350
|
return true;
|
|
227
351
|
}
|
|
228
352
|
/**
|
|
229
353
|
* Extracts and stores contract instances out of ContractInstancePublished events emitted by the canonical deployer contract.
|
|
230
354
|
*/ async updateDeployedContractInstances(allLogs, blockNum, operation) {
|
|
231
|
-
const
|
|
355
|
+
const allInstances = allLogs.filter((log)=>ContractInstancePublishedEvent.isContractInstancePublishedEvent(log)).map((log)=>ContractInstancePublishedEvent.fromLog(log)).map((e)=>e.toContractInstance());
|
|
356
|
+
// Verify that each instance's address matches the one derived from its fields if we're adding
|
|
357
|
+
const contractInstances = operation === 1 ? allInstances : await filterAsync(allInstances, async (instance)=>{
|
|
358
|
+
const computedAddress = await computeContractAddressFromInstance(instance);
|
|
359
|
+
if (!computedAddress.equals(instance.address)) {
|
|
360
|
+
this.log.warn(`Found contract instance with mismatched address at block ${blockNum}. Claimed ${instance.address} but computed ${computedAddress}.`, {
|
|
361
|
+
instanceAddress: instance.address.toString(),
|
|
362
|
+
computedAddress: computedAddress.toString(),
|
|
363
|
+
blockNum
|
|
364
|
+
});
|
|
365
|
+
return false;
|
|
366
|
+
}
|
|
367
|
+
return true;
|
|
368
|
+
});
|
|
232
369
|
if (contractInstances.length > 0) {
|
|
233
370
|
contractInstances.forEach((c)=>this.log.verbose(`${Operation[operation]} contract instance at ${c.address.toString()}`));
|
|
234
371
|
if (operation == 0) {
|
|
235
|
-
return await this.
|
|
372
|
+
return await this.stores.contractInstances.addContractInstances(contractInstances, blockNum);
|
|
236
373
|
} else if (operation == 1) {
|
|
237
|
-
return await this.
|
|
374
|
+
return await this.stores.contractInstances.deleteContractInstances(contractInstances);
|
|
238
375
|
}
|
|
239
376
|
}
|
|
240
377
|
return true;
|
|
@@ -246,56 +383,10 @@ import groupBy from 'lodash.groupby';
|
|
|
246
383
|
if (contractUpdates.length > 0) {
|
|
247
384
|
contractUpdates.forEach((c)=>this.log.verbose(`${Operation[operation]} contract instance update at ${c.address.toString()}`));
|
|
248
385
|
if (operation == 0) {
|
|
249
|
-
return await this.
|
|
386
|
+
return await this.stores.contractInstances.addContractInstanceUpdates(contractUpdates, timestamp);
|
|
250
387
|
} else if (operation == 1) {
|
|
251
|
-
return await this.
|
|
252
|
-
}
|
|
253
|
-
}
|
|
254
|
-
return true;
|
|
255
|
-
}
|
|
256
|
-
/**
|
|
257
|
-
* Stores the functions that were broadcasted individually.
|
|
258
|
-
*
|
|
259
|
-
* @dev Beware that there is not a delete variant of this, since they are added to contract classes
|
|
260
|
-
* and will be deleted as part of the class if needed.
|
|
261
|
-
*/ async storeBroadcastedIndividualFunctions(allLogs, _blockNum) {
|
|
262
|
-
// Filter out private and utility function broadcast events
|
|
263
|
-
const privateFnEvents = allLogs.filter((log)=>PrivateFunctionBroadcastedEvent.isPrivateFunctionBroadcastedEvent(log)).map((log)=>PrivateFunctionBroadcastedEvent.fromLog(log));
|
|
264
|
-
const utilityFnEvents = allLogs.filter((log)=>UtilityFunctionBroadcastedEvent.isUtilityFunctionBroadcastedEvent(log)).map((log)=>UtilityFunctionBroadcastedEvent.fromLog(log));
|
|
265
|
-
// Group all events by contract class id
|
|
266
|
-
for (const [classIdString, classEvents] of Object.entries(groupBy([
|
|
267
|
-
...privateFnEvents,
|
|
268
|
-
...utilityFnEvents
|
|
269
|
-
], (e)=>e.contractClassId.toString()))){
|
|
270
|
-
const contractClassId = Fr.fromHexString(classIdString);
|
|
271
|
-
const contractClass = await this.store.getContractClass(contractClassId);
|
|
272
|
-
if (!contractClass) {
|
|
273
|
-
this.log.warn(`Skipping broadcasted functions as contract class ${contractClassId.toString()} was not found`);
|
|
274
|
-
continue;
|
|
275
|
-
}
|
|
276
|
-
// Split private and utility functions, and filter out invalid ones
|
|
277
|
-
const allFns = classEvents.map((e)=>e.toFunctionWithMembershipProof());
|
|
278
|
-
const privateFns = allFns.filter((fn)=>'utilityFunctionsTreeRoot' in fn);
|
|
279
|
-
const utilityFns = allFns.filter((fn)=>'privateFunctionsArtifactTreeRoot' in fn);
|
|
280
|
-
const privateFunctionsWithValidity = await Promise.all(privateFns.map(async (fn)=>({
|
|
281
|
-
fn,
|
|
282
|
-
valid: await isValidPrivateFunctionMembershipProof(fn, contractClass)
|
|
283
|
-
})));
|
|
284
|
-
const validPrivateFns = privateFunctionsWithValidity.filter(({ valid })=>valid).map(({ fn })=>fn);
|
|
285
|
-
const utilityFunctionsWithValidity = await Promise.all(utilityFns.map(async (fn)=>({
|
|
286
|
-
fn,
|
|
287
|
-
valid: await isValidUtilityFunctionMembershipProof(fn, contractClass)
|
|
288
|
-
})));
|
|
289
|
-
const validUtilityFns = utilityFunctionsWithValidity.filter(({ valid })=>valid).map(({ fn })=>fn);
|
|
290
|
-
const validFnCount = validPrivateFns.length + validUtilityFns.length;
|
|
291
|
-
if (validFnCount !== allFns.length) {
|
|
292
|
-
this.log.warn(`Skipping ${allFns.length - validFnCount} invalid functions`);
|
|
293
|
-
}
|
|
294
|
-
// Store the functions in the contract class in a single operation
|
|
295
|
-
if (validFnCount > 0) {
|
|
296
|
-
this.log.verbose(`Storing ${validFnCount} functions for contract class ${contractClassId.toString()}`);
|
|
388
|
+
return await this.stores.contractInstances.deleteContractInstanceUpdates(contractUpdates, timestamp);
|
|
297
389
|
}
|
|
298
|
-
return await this.store.addFunctions(contractClassId, validPrivateFns, validUtilityFns);
|
|
299
390
|
}
|
|
300
391
|
return true;
|
|
301
392
|
}
|
|
@@ -1,9 +1,13 @@
|
|
|
1
|
+
import type { SlotNumber } from '@aztec/foundation/branded-types';
|
|
1
2
|
import type { L2Block } from '@aztec/stdlib/block';
|
|
3
|
+
import type { CheckpointData } from '@aztec/stdlib/checkpoint';
|
|
4
|
+
import type { L1RollupConstants } from '@aztec/stdlib/epoch-helpers';
|
|
2
5
|
import { type LmdbStatsCallback, type TelemetryClient, type Tracer } from '@aztec/telemetry-client';
|
|
3
6
|
export declare class ArchiverInstrumentation {
|
|
4
7
|
private telemetry;
|
|
5
8
|
readonly tracer: Tracer;
|
|
6
9
|
private blockHeight;
|
|
10
|
+
private checkpointHeight;
|
|
7
11
|
private txCount;
|
|
8
12
|
private l1BlockHeight;
|
|
9
13
|
private proofsSubmittedDelay;
|
|
@@ -12,20 +16,32 @@ export declare class ArchiverInstrumentation {
|
|
|
12
16
|
private pruneDuration;
|
|
13
17
|
private pruneCount;
|
|
14
18
|
private syncDurationPerBlock;
|
|
19
|
+
private syncDurationPerCheckpoint;
|
|
15
20
|
private syncBlockCount;
|
|
16
21
|
private manaPerBlock;
|
|
17
22
|
private txsPerBlock;
|
|
18
23
|
private syncDurationPerMessage;
|
|
19
24
|
private syncMessageCount;
|
|
20
25
|
private blockProposalTxTargetCount;
|
|
26
|
+
private checkpointL1InclusionDelay;
|
|
27
|
+
private checkpointPromotedCount;
|
|
21
28
|
private log;
|
|
22
29
|
private constructor();
|
|
23
30
|
static new(telemetry: TelemetryClient, lmdbStats?: LmdbStatsCallback): Promise<ArchiverInstrumentation>;
|
|
24
31
|
isEnabled(): boolean;
|
|
25
|
-
|
|
32
|
+
processNewProposedBlock(syncTimePerBlock: number, block: L2Block): void;
|
|
33
|
+
processNewCheckpointedBlocks(syncTimePerCheckpoint: number, blocks: L2Block[]): void;
|
|
26
34
|
processNewMessages(count: number, syncPerMessageMs: number): void;
|
|
27
35
|
processPrune(duration: number): void;
|
|
28
|
-
|
|
36
|
+
/**
|
|
37
|
+
* Records a pending-chain reorg, where the archiver dropped proposed blocks (and world-state follows by pruning). The
|
|
38
|
+
* type distinguishes the cause: 'uncheckpointed' (slot ended without a checkpoint), 'l1_conflict' (proposed blocks
|
|
39
|
+
* conflicting with an L1 checkpoint), 'orphan' (no matching proposed checkpoint arrived before the deadline), or
|
|
40
|
+
* 'l1_mismatch' (the local checkpointed tip diverged from L1 — an L1 reorg or a pruned/missed-proof checkpoint — so
|
|
41
|
+
* already-checkpointed blocks were rewound).
|
|
42
|
+
*/
|
|
43
|
+
recordPrune(pruneType: 'uncheckpointed' | 'l1_conflict' | 'orphan' | 'l1_mismatch'): void;
|
|
44
|
+
updateLastProvenCheckpoint(checkpoint: CheckpointData): void;
|
|
29
45
|
processProofsVerified(logs: {
|
|
30
46
|
proverId: string;
|
|
31
47
|
l2BlockNumber: bigint;
|
|
@@ -33,5 +49,15 @@ export declare class ArchiverInstrumentation {
|
|
|
33
49
|
}[]): void;
|
|
34
50
|
updateL1BlockHeight(blockNumber: bigint): void;
|
|
35
51
|
recordBlockProposalTxTarget(target: string, usedTrace: boolean): void;
|
|
52
|
+
/** Records a checkpoint promoted from proposed (blob fetch skipped). */
|
|
53
|
+
processCheckpointPromoted(): void;
|
|
54
|
+
/**
|
|
55
|
+
* Records L1 inclusion timing for a checkpoint observed on L1 (seconds into the L2 slot).
|
|
56
|
+
*/
|
|
57
|
+
processCheckpointL1Timing(data: {
|
|
58
|
+
slotNumber: SlotNumber;
|
|
59
|
+
l1Timestamp: bigint;
|
|
60
|
+
l1Constants: Pick<L1RollupConstants, 'l1GenesisTime' | 'slotDuration'>;
|
|
61
|
+
}): void;
|
|
36
62
|
}
|
|
37
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
63
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5zdHJ1bWVudGF0aW9uLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvbW9kdWxlcy9pbnN0cnVtZW50YXRpb24udHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxLQUFLLEVBQUUsVUFBVSxFQUFFLE1BQU0saUNBQWlDLENBQUM7QUFFbEUsT0FBTyxLQUFLLEVBQUUsT0FBTyxFQUFFLE1BQU0scUJBQXFCLENBQUM7QUFDbkQsT0FBTyxLQUFLLEVBQUUsY0FBYyxFQUFFLE1BQU0sMEJBQTBCLENBQUM7QUFDL0QsT0FBTyxLQUFLLEVBQUUsaUJBQWlCLEVBQUUsTUFBTSw2QkFBNkIsQ0FBQztBQUVyRSxPQUFPLEVBS0wsS0FBSyxpQkFBaUIsRUFFdEIsS0FBSyxlQUFlLEVBQ3BCLEtBQUssTUFBTSxFQUdaLE1BQU0seUJBQXlCLENBQUM7QUFFakMscUJBQWEsdUJBQXVCO0lBK0JoQyxPQUFPLENBQUMsU0FBUztJQTlCbkIsU0FBZ0IsTUFBTSxFQUFFLE1BQU0sQ0FBQztJQUUvQixPQUFPLENBQUMsV0FBVyxDQUFRO0lBQzNCLE9BQU8sQ0FBQyxnQkFBZ0IsQ0FBUTtJQUNoQyxPQUFPLENBQUMsT0FBTyxDQUFnQjtJQUMvQixPQUFPLENBQUMsYUFBYSxDQUFRO0lBQzdCLE9BQU8sQ0FBQyxvQkFBb0IsQ0FBWTtJQUN4QyxPQUFPLENBQUMsb0JBQW9CLENBQWdCO0lBQzVDLE9BQU8sQ0FBQyxTQUFTLENBQWM7SUFFL0IsT0FBTyxDQUFDLGFBQWEsQ0FBWTtJQUNqQyxPQUFPLENBQUMsVUFBVSxDQUFnQjtJQUVsQyxPQUFPLENBQUMsb0JBQW9CLENBQVk7SUFDeEMsT0FBTyxDQUFDLHlCQUF5QixDQUFZO0lBQzdDLE9BQU8sQ0FBQyxjQUFjLENBQWdCO0lBQ3RDLE9BQU8sQ0FBQyxZQUFZLENBQVk7SUFDaEMsT0FBTyxDQUFDLFdBQVcsQ0FBWTtJQUUvQixPQUFPLENBQUMsc0JBQXNCLENBQVk7SUFDMUMsT0FBTyxDQUFDLGdCQUFnQixDQUFnQjtJQUV4QyxPQUFPLENBQUMsMEJBQTBCLENBQWdCO0lBRWxELE9BQU8sQ0FBQywwQkFBMEIsQ0FBWTtJQUM5QyxPQUFPLENBQUMsdUJBQXVCLENBQWdCO0lBRS9DLE9BQU8sQ0FBQyxHQUFHLENBQTRDO0lBRXZELE9BQU8sZUE0RE47SUFFRCxPQUFvQixHQUFHLENBQUMsU0FBUyxFQUFFLGVBQWUsRUFBRSxTQUFTLENBQUMsRUFBRSxpQkFBaUIsb0NBTWhGO0lBRU0sU0FBUyxJQUFJLE9BQU8sQ0FFMUI7SUFFTSx1QkFBdUIsQ0FBQyxnQkFBZ0IsRUFBRSxNQUFNLEVBQUUsS0FBSyxFQUFFLE9BQU8sUUFTdEU7SUFFTSw0QkFBNEIsQ0FBQyxxQkFBcUIsRUFBRSxNQUFNLEVBQUUsTUFBTSxFQUFFLE9BQU8sRUFBRSxRQVNuRjtJQUVNLGtCQUFrQixDQUFDLEtBQUssRUFBRSxNQUFNLEVBQUUsZ0JBQWdCLEVBQUUsTUFBTSxRQU1oRTtJQUVNLFlBQVksQ0FBQyxRQUFRLEVBQUUsTUFBTSxRQUduQztJQUVEOzs7Ozs7T0FNRztJQUNJLFdBQVcsQ0FBQyxTQUFTLEVBQUUsZ0JBQWdCLEdBQUcsYUFBYSxHQUFHLFFBQVEsR0FBRyxhQUFhLFFBRXhGO0lBRU0sMEJBQTBCLENBQUMsVUFBVSxFQUFFLGNBQWMsUUFJM0Q7SUFFTSxxQkFBcUIsQ0FBQyxJQUFJLEVBQUU7UUFBRSxRQUFRLEVBQUUsTUFBTSxDQUFDO1FBQUMsYUFBYSxFQUFFLE1BQU0sQ0FBQztRQUFDLEtBQUssRUFBRSxNQUFNLENBQUE7S0FBRSxFQUFFLFFBVzlGO0lBRU0sbUJBQW1CLENBQUMsV0FBVyxFQUFFLE1BQU0sUUFFN0M7SUFFTSwyQkFBMkIsQ0FBQyxNQUFNLEVBQUUsTUFBTSxFQUFFLFNBQVMsRUFBRSxPQUFPLFFBS3BFO0lBRUQsd0VBQXdFO0lBQ2pFLHlCQUF5QixTQUUvQjtJQUVEOztPQUVHO0lBQ0kseUJBQXlCLENBQUMsSUFBSSxFQUFFO1FBQ3JDLFVBQVUsRUFBRSxVQUFVLENBQUM7UUFDdkIsV0FBVyxFQUFFLE1BQU0sQ0FBQztRQUNwQixXQUFXLEVBQUUsSUFBSSxDQUFDLGlCQUFpQixFQUFFLGVBQWUsR0FBRyxjQUFjLENBQUMsQ0FBQztLQUN4RSxHQUFHLElBQUksQ0FJUDtDQUNGIn0=
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"instrumentation.d.ts","sourceRoot":"","sources":["../../src/modules/instrumentation.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"instrumentation.d.ts","sourceRoot":"","sources":["../../src/modules/instrumentation.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,iCAAiC,CAAC;AAElE,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AACnD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAC;AAC/D,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,6BAA6B,CAAC;AAErE,OAAO,EAKL,KAAK,iBAAiB,EAEtB,KAAK,eAAe,EACpB,KAAK,MAAM,EAGZ,MAAM,yBAAyB,CAAC;AAEjC,qBAAa,uBAAuB;IA+BhC,OAAO,CAAC,SAAS;IA9BnB,SAAgB,MAAM,EAAE,MAAM,CAAC;IAE/B,OAAO,CAAC,WAAW,CAAQ;IAC3B,OAAO,CAAC,gBAAgB,CAAQ;IAChC,OAAO,CAAC,OAAO,CAAgB;IAC/B,OAAO,CAAC,aAAa,CAAQ;IAC7B,OAAO,CAAC,oBAAoB,CAAY;IACxC,OAAO,CAAC,oBAAoB,CAAgB;IAC5C,OAAO,CAAC,SAAS,CAAc;IAE/B,OAAO,CAAC,aAAa,CAAY;IACjC,OAAO,CAAC,UAAU,CAAgB;IAElC,OAAO,CAAC,oBAAoB,CAAY;IACxC,OAAO,CAAC,yBAAyB,CAAY;IAC7C,OAAO,CAAC,cAAc,CAAgB;IACtC,OAAO,CAAC,YAAY,CAAY;IAChC,OAAO,CAAC,WAAW,CAAY;IAE/B,OAAO,CAAC,sBAAsB,CAAY;IAC1C,OAAO,CAAC,gBAAgB,CAAgB;IAExC,OAAO,CAAC,0BAA0B,CAAgB;IAElD,OAAO,CAAC,0BAA0B,CAAY;IAC9C,OAAO,CAAC,uBAAuB,CAAgB;IAE/C,OAAO,CAAC,GAAG,CAA4C;IAEvD,OAAO,eA4DN;IAED,OAAoB,GAAG,CAAC,SAAS,EAAE,eAAe,EAAE,SAAS,CAAC,EAAE,iBAAiB,oCAMhF;IAEM,SAAS,IAAI,OAAO,CAE1B;IAEM,uBAAuB,CAAC,gBAAgB,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,QAStE;IAEM,4BAA4B,CAAC,qBAAqB,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,QASnF;IAEM,kBAAkB,CAAC,KAAK,EAAE,MAAM,EAAE,gBAAgB,EAAE,MAAM,QAMhE;IAEM,YAAY,CAAC,QAAQ,EAAE,MAAM,QAGnC;IAED;;;;;;OAMG;IACI,WAAW,CAAC,SAAS,EAAE,gBAAgB,GAAG,aAAa,GAAG,QAAQ,GAAG,aAAa,QAExF;IAEM,0BAA0B,CAAC,UAAU,EAAE,cAAc,QAI3D;IAEM,qBAAqB,CAAC,IAAI,EAAE;QAAE,QAAQ,EAAE,MAAM,CAAC;QAAC,aAAa,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,EAAE,QAW9F;IAEM,mBAAmB,CAAC,WAAW,EAAE,MAAM,QAE7C;IAEM,2BAA2B,CAAC,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,OAAO,QAKpE;IAED,wEAAwE;IACjE,yBAAyB,SAE/B;IAED;;OAEG;IACI,yBAAyB,CAAC,IAAI,EAAE;QACrC,UAAU,EAAE,UAAU,CAAC;QACvB,WAAW,EAAE,MAAM,CAAC;QACpB,WAAW,EAAE,IAAI,CAAC,iBAAiB,EAAE,eAAe,GAAG,cAAc,CAAC,CAAC;KACxE,GAAG,IAAI,CAIP;CACF"}
|