@aztec/archiver 0.0.1-commit.2448fdb → 0.0.1-commit.2606882
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 +53 -16
- package/dest/archiver.d.ts.map +1 -1
- package/dest/archiver.js +229 -68
- package/dest/config.d.ts +4 -1
- package/dest/config.d.ts.map +1 -1
- package/dest/config.js +21 -14
- package/dest/errors.d.ts +50 -2
- package/dest/errors.d.ts.map +1 -1
- package/dest/errors.js +74 -2
- package/dest/factory.d.ts +13 -7
- package/dest/factory.d.ts.map +1 -1
- package/dest/factory.js +33 -24
- package/dest/index.d.ts +11 -3
- package/dest/index.d.ts.map +1 -1
- package/dest/index.js +10 -2
- 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 +15 -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/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 +40 -0
- package/dest/modules/data_source_base.d.ts +71 -47
- package/dest/modules/data_source_base.d.ts.map +1 -1
- package/dest/modules/data_source_base.js +269 -137
- package/dest/modules/data_store_updater.d.ts +30 -13
- package/dest/modules/data_store_updater.d.ts.map +1 -1
- package/dest/modules/data_store_updater.js +126 -109
- package/dest/modules/instrumentation.d.ts +18 -2
- package/dest/modules/instrumentation.d.ts.map +1 -1
- package/dest/modules/instrumentation.js +35 -7
- package/dest/modules/l1_synchronizer.d.ts +11 -6
- package/dest/modules/l1_synchronizer.d.ts.map +1 -1
- package/dest/modules/l1_synchronizer.js +418 -216
- 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 +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 +164 -66
- package/dest/store/block_store.d.ts.map +1 -1
- package/dest/store/block_store.js +605 -235
- 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 +18 -66
- 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 +31 -0
- 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 +13 -7
- package/dest/store/l2_tips_cache.d.ts.map +1 -1
- package/dest/store/l2_tips_cache.js +13 -76
- 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 +259 -443
- package/dest/store/log_store_codec.d.ts +70 -0
- package/dest/store/log_store_codec.d.ts.map +1 -0
- package/dest/store/log_store_codec.js +101 -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 +50 -8
- package/dest/test/fake_l1_state.d.ts +8 -3
- package/dest/test/fake_l1_state.d.ts.map +1 -1
- package/dest/test/fake_l1_state.js +75 -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 +51 -50
- package/dest/test/mock_l2_block_source.d.ts.map +1 -1
- package/dest/test/mock_l2_block_source.js +244 -181
- package/dest/test/noop_l1_archiver.d.ts +10 -6
- package/dest/test/noop_l1_archiver.d.ts.map +1 -1
- package/dest/test/noop_l1_archiver.js +22 -9
- package/package.json +14 -14
- package/src/archiver.ts +293 -75
- package/src/config.ts +24 -11
- package/src/errors.ts +117 -2
- package/src/factory.ts +40 -23
- package/src/index.ts +18 -2
- package/src/l1/calldata_retriever.ts +16 -5
- package/src/l1/data_retrieval.ts +52 -53
- package/src/l1/validate_historical_logs.ts +140 -0
- package/src/modules/contract_data_source_adapter.ts +55 -0
- package/src/modules/data_source_base.ts +341 -174
- package/src/modules/data_store_updater.ts +152 -137
- package/src/modules/instrumentation.ts +48 -8
- package/src/modules/l1_synchronizer.ts +556 -262
- package/src/modules/outbox_trees_resolver.ts +199 -0
- package/src/modules/validation.ts +10 -9
- package/src/store/block_store.ts +750 -285
- package/src/store/contract_class_store.ts +24 -100
- package/src/store/contract_instance_store.ts +43 -0
- package/src/store/data_stores.ts +104 -0
- package/src/store/function_names_cache.ts +37 -0
- package/src/store/l2_tips_cache.ts +16 -70
- package/src/store/log_store.ts +297 -609
- package/src/store/log_store_codec.ts +132 -0
- package/src/store/message_store.ts +59 -9
- package/src/structs/inbox_message.ts +1 -1
- package/src/test/fake_l1_state.ts +96 -29
- package/src/test/mock_l1_to_l2_message_source.ts +1 -0
- package/src/test/mock_l2_block_source.ts +299 -232
- package/src/test/noop_l1_archiver.ts +42 -9
- package/dest/store/kv_archiver_store.d.ts +0 -362
- package/dest/store/kv_archiver_store.d.ts.map +0 -1
- package/dest/store/kv_archiver_store.js +0 -475
- package/src/store/kv_archiver_store.ts +0 -685
|
@@ -1,24 +1,22 @@
|
|
|
1
1
|
import { BlockNumber } from '@aztec/foundation/branded-types';
|
|
2
2
|
import { filterAsync } from '@aztec/foundation/collection';
|
|
3
|
-
import { Fr } from '@aztec/foundation/curves/bn254';
|
|
4
3
|
import { createLogger } from '@aztec/foundation/log';
|
|
5
|
-
import { ContractClassPublishedEvent
|
|
4
|
+
import { ContractClassPublishedEvent } from '@aztec/protocol-contracts/class-registry';
|
|
6
5
|
import { ContractInstancePublishedEvent, ContractInstanceUpdatedEvent } from '@aztec/protocol-contracts/instance-registry';
|
|
7
6
|
import { validateCheckpoint } from '@aztec/stdlib/checkpoint';
|
|
8
|
-
import { computeContractAddressFromInstance, computeContractClassId
|
|
9
|
-
import groupBy from 'lodash.groupby';
|
|
7
|
+
import { computeContractAddressFromInstance, computeContractClassId } from '@aztec/stdlib/contract';
|
|
10
8
|
/** Operation type for contract data updates. */ var Operation = /*#__PURE__*/ function(Operation) {
|
|
11
9
|
Operation[Operation["Store"] = 0] = "Store";
|
|
12
10
|
Operation[Operation["Delete"] = 1] = "Delete";
|
|
13
11
|
return Operation;
|
|
14
12
|
}(Operation || {});
|
|
15
13
|
/** Archiver helper module to handle updates to the data store. */ export class ArchiverDataStoreUpdater {
|
|
16
|
-
|
|
14
|
+
stores;
|
|
17
15
|
l2TipsCache;
|
|
18
16
|
opts;
|
|
19
17
|
log;
|
|
20
|
-
constructor(
|
|
21
|
-
this.
|
|
18
|
+
constructor(stores, l2TipsCache, opts = {}){
|
|
19
|
+
this.stores = stores;
|
|
22
20
|
this.l2TipsCache = l2TipsCache;
|
|
23
21
|
this.opts = opts;
|
|
24
22
|
this.log = createLogger('archiver:store_updater');
|
|
@@ -26,77 +24,102 @@ import groupBy from 'lodash.groupby';
|
|
|
26
24
|
/**
|
|
27
25
|
* Adds a proposed block to the store with contract class/instance extraction from logs.
|
|
28
26
|
* This is an uncheckpointed block that has been proposed by the sequencer but not yet included in a checkpoint on L1.
|
|
29
|
-
* Extracts ContractClassPublished, ContractInstancePublished, ContractInstanceUpdated events
|
|
30
|
-
* and individually broadcasted functions from the block logs.
|
|
27
|
+
* Extracts ContractClassPublished, ContractInstancePublished, ContractInstanceUpdated events from the block logs.
|
|
31
28
|
*
|
|
32
29
|
* @param block - The proposed L2 block to add.
|
|
33
30
|
* @param pendingChainValidationStatus - Optional validation status to set.
|
|
34
31
|
* @returns True if the operation is successful.
|
|
35
32
|
*/ async addProposedBlock(block, pendingChainValidationStatus) {
|
|
36
|
-
const result = await this.
|
|
37
|
-
await this.
|
|
33
|
+
const result = await this.stores.db.transactionAsync(async ()=>{
|
|
34
|
+
await this.stores.blocks.addProposedBlock(block);
|
|
38
35
|
const opResults = await Promise.all([
|
|
39
36
|
// Update the pending chain validation status if provided
|
|
40
|
-
pendingChainValidationStatus && this.
|
|
37
|
+
pendingChainValidationStatus && this.stores.blocks.setPendingChainValidationStatus(pendingChainValidationStatus),
|
|
41
38
|
// Add any logs emitted during the retrieved block
|
|
42
|
-
this.
|
|
39
|
+
this.stores.logs.addLogs([
|
|
43
40
|
block
|
|
44
41
|
]),
|
|
45
42
|
// Unroll all logs emitted during the retrieved block and extract any contract classes and instances from it
|
|
46
43
|
this.addContractDataToDb(block)
|
|
47
44
|
]);
|
|
48
|
-
await this.l2TipsCache?.refresh();
|
|
49
45
|
return opResults.every(Boolean);
|
|
50
46
|
});
|
|
47
|
+
await this.l2TipsCache?.refresh();
|
|
51
48
|
return result;
|
|
52
49
|
}
|
|
53
50
|
/**
|
|
54
51
|
* Reconciles local blocks with incoming checkpoints from L1.
|
|
55
52
|
* Adds new checkpoints to the store with contract class/instance extraction from logs.
|
|
56
53
|
* Prunes any local blocks that conflict with checkpoint data (by comparing archive roots).
|
|
57
|
-
* Extracts ContractClassPublished, ContractInstancePublished, ContractInstanceUpdated events
|
|
58
|
-
*
|
|
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.
|
|
59
57
|
*
|
|
60
|
-
* @param checkpoints - The published checkpoints to add.
|
|
58
|
+
* @param checkpoints - The published checkpoints to add (excluding any being promoted from proposed).
|
|
61
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).
|
|
62
61
|
* @returns Result with information about any pruned blocks.
|
|
63
|
-
*/ async addCheckpoints(checkpoints, pendingChainValidationStatus) {
|
|
62
|
+
*/ async addCheckpoints(checkpoints, pendingChainValidationStatus, promoteProposed, evictProposedFrom) {
|
|
64
63
|
for (const checkpoint of checkpoints){
|
|
65
64
|
validateCheckpoint(checkpoint.checkpoint, {
|
|
66
65
|
rollupManaLimit: this.opts?.rollupManaLimit
|
|
67
66
|
});
|
|
68
67
|
}
|
|
69
|
-
|
|
68
|
+
if (promoteProposed) {
|
|
69
|
+
validateCheckpoint(promoteProposed.checkpoint.checkpoint, {
|
|
70
|
+
rollupManaLimit: this.opts?.rollupManaLimit
|
|
71
|
+
});
|
|
72
|
+
}
|
|
73
|
+
const result = await this.stores.db.transactionAsync(async ()=>{
|
|
70
74
|
// Before adding checkpoints, check for conflicts with local blocks if any
|
|
71
75
|
const { prunedBlocks, lastAlreadyInsertedBlockNumber } = await this.pruneMismatchingLocalBlocks(checkpoints);
|
|
72
|
-
await this.
|
|
76
|
+
await this.stores.blocks.addCheckpoints(checkpoints);
|
|
73
77
|
// Filter out blocks that were already inserted via addProposedBlock() to avoid duplicating logs/contract data
|
|
74
78
|
const newBlocks = checkpoints.flatMap((ch)=>ch.checkpoint.blocks).filter((b)=>lastAlreadyInsertedBlockNumber === undefined || b.number > lastAlreadyInsertedBlockNumber);
|
|
75
79
|
await Promise.all([
|
|
76
80
|
// Update the pending chain validation status if provided
|
|
77
|
-
pendingChainValidationStatus && this.
|
|
81
|
+
pendingChainValidationStatus && this.stores.blocks.setPendingChainValidationStatus(pendingChainValidationStatus),
|
|
78
82
|
// Add any logs emitted during the retrieved blocks
|
|
79
|
-
this.
|
|
83
|
+
this.stores.logs.addLogs(newBlocks),
|
|
80
84
|
// Unroll all logs emitted during the retrieved blocks and extract any contract classes and instances from them
|
|
81
|
-
...newBlocks.map((block)=>this.addContractDataToDb(block))
|
|
85
|
+
...newBlocks.map((block)=>this.addContractDataToDb(block)),
|
|
86
|
+
// Promote the proposed checkpoint if requested (uses explicit checkpoint number)
|
|
87
|
+
promoteProposed ? this.stores.blocks.promoteProposedToCheckpointed(promoteProposed.checkpoint.checkpoint.number, promoteProposed.l1, promoteProposed.attestations, promoteProposed.checkpoint.checkpoint.archive.root) : undefined,
|
|
88
|
+
// Evict pending checkpoints that diverged from what L1 mined
|
|
89
|
+
evictProposedFrom !== undefined ? this.stores.blocks.evictProposedCheckpointsFrom(evictProposedFrom) : undefined
|
|
82
90
|
]);
|
|
83
|
-
await this.l2TipsCache?.refresh();
|
|
84
91
|
return {
|
|
85
92
|
prunedBlocks,
|
|
86
93
|
lastAlreadyInsertedBlockNumber
|
|
87
94
|
};
|
|
88
95
|
});
|
|
96
|
+
await this.l2TipsCache?.refresh();
|
|
97
|
+
return result;
|
|
98
|
+
}
|
|
99
|
+
async addProposedCheckpoint(proposedCheckpoint) {
|
|
100
|
+
const result = await this.stores.db.transactionAsync(async ()=>{
|
|
101
|
+
await this.stores.blocks.addProposedCheckpoint(proposedCheckpoint);
|
|
102
|
+
});
|
|
103
|
+
await this.l2TipsCache?.refresh();
|
|
89
104
|
return result;
|
|
90
105
|
}
|
|
91
106
|
/**
|
|
92
107
|
* Checks for local proposed blocks that do not match the ones to be checkpointed and prunes them.
|
|
93
|
-
*
|
|
94
|
-
*
|
|
95
|
-
*
|
|
108
|
+
* Conflict detection is keyed on `blockNumber`: when a local proposed block and an L1
|
|
109
|
+
* checkpointed block share a block number but live at different slots (e.g. a different proposer
|
|
110
|
+
* mined the same block number one slot earlier), we still treat them as a conflict and prune.
|
|
111
|
+
* The trailing per-checkpoint prune that handles "local has extra trailing blocks within the
|
|
112
|
+
* same slot as the published checkpoint" remains scoped by slot to preserve pipelining: local
|
|
113
|
+
* blocks that live at a later slot than the checkpoint being processed represent speculation
|
|
114
|
+
* atop the just-confirmed tip (and may be referenced by a pending proposed checkpoint), so we
|
|
115
|
+
* leave them in place. This method handles multiple checkpoints but returns after pruning the
|
|
116
|
+
* first conflict found. This is correct because pruning from the first conflict point removes
|
|
117
|
+
* all subsequent blocks, and when checkpoints are added afterward, they include all the correct
|
|
118
|
+
* blocks.
|
|
96
119
|
*/ async pruneMismatchingLocalBlocks(checkpoints) {
|
|
97
120
|
const [lastCheckpointedBlockNumber, lastBlockNumber] = await Promise.all([
|
|
98
|
-
this.
|
|
99
|
-
this.
|
|
121
|
+
this.stores.blocks.getCheckpointedL2BlockNumber(),
|
|
122
|
+
this.stores.blocks.getLatestL2BlockNumber()
|
|
100
123
|
]);
|
|
101
124
|
// Exit early if there are no local uncheckpointed blocks
|
|
102
125
|
if (lastBlockNumber === lastCheckpointedBlockNumber) {
|
|
@@ -106,22 +129,25 @@ import groupBy from 'lodash.groupby';
|
|
|
106
129
|
};
|
|
107
130
|
}
|
|
108
131
|
// Get all uncheckpointed local blocks
|
|
109
|
-
const uncheckpointedLocalBlocks = await this.
|
|
132
|
+
const uncheckpointedLocalBlocks = await this.stores.blocks.getBlocksData({
|
|
133
|
+
from: BlockNumber.add(lastCheckpointedBlockNumber, 1),
|
|
134
|
+
limit: lastBlockNumber - lastCheckpointedBlockNumber
|
|
135
|
+
});
|
|
110
136
|
let lastAlreadyInsertedBlockNumber;
|
|
111
137
|
for (const publishedCheckpoint of checkpoints){
|
|
112
138
|
const checkpointBlocks = publishedCheckpoint.checkpoint.blocks;
|
|
113
139
|
const slot = publishedCheckpoint.checkpoint.slot;
|
|
114
|
-
const localBlocksInSlot = uncheckpointedLocalBlocks.filter((b)=>b.slot === slot);
|
|
115
140
|
if (checkpointBlocks.length === 0) {
|
|
116
141
|
this.log.warn(`Checkpoint ${publishedCheckpoint.checkpoint.number} for slot ${slot} has no blocks`);
|
|
117
142
|
continue;
|
|
118
143
|
}
|
|
119
|
-
// Find the first checkpoint block that conflicts with an existing local block and prune local afterwards
|
|
144
|
+
// Find the first checkpoint block that conflicts with an existing local block and prune local afterwards.
|
|
145
|
+
// Conflict detection joins on block number only — same block number at a different slot is still a conflict.
|
|
120
146
|
for (const checkpointBlock of checkpointBlocks){
|
|
121
147
|
const blockNumber = checkpointBlock.number;
|
|
122
|
-
const existingBlock =
|
|
148
|
+
const existingBlock = uncheckpointedLocalBlocks.find((b)=>b.header.getBlockNumber() === blockNumber);
|
|
123
149
|
const blockInfos = {
|
|
124
|
-
existingBlock: existingBlock?.
|
|
150
|
+
existingBlock: existingBlock?.header.toInspect(),
|
|
125
151
|
checkpointBlock: checkpointBlock.toBlockInfo()
|
|
126
152
|
};
|
|
127
153
|
if (!existingBlock) {
|
|
@@ -132,19 +158,23 @@ import groupBy from 'lodash.groupby';
|
|
|
132
158
|
} else {
|
|
133
159
|
this.log.info(`Conflict detected at block ${blockNumber} between checkpointed and local block`, blockInfos);
|
|
134
160
|
const prunedBlocks = await this.removeBlocksAfter(BlockNumber(blockNumber - 1));
|
|
161
|
+
await this.evictProposedCheckpointsForPrunedBlocks(prunedBlocks);
|
|
135
162
|
return {
|
|
136
163
|
prunedBlocks,
|
|
137
164
|
lastAlreadyInsertedBlockNumber
|
|
138
165
|
};
|
|
139
166
|
}
|
|
140
167
|
}
|
|
141
|
-
// If
|
|
142
|
-
//
|
|
168
|
+
// If the sequencer locally proposed extra blocks within this checkpoint's slot (e.g. local has
|
|
169
|
+
// [N, N+1] but L1 confirmed just [N]), prune the extras. Scoped to the checkpoint's slot so we
|
|
170
|
+
// do not throw away speculative blocks at later slots that belong to a pending proposed checkpoint.
|
|
143
171
|
const lastCheckpointBlockNumber = checkpointBlocks.at(-1).number;
|
|
144
|
-
const
|
|
172
|
+
const localBlocksInSlot = uncheckpointedLocalBlocks.filter((b)=>b.header.getSlot() === slot);
|
|
173
|
+
const lastLocalBlockNumber = localBlocksInSlot.at(-1)?.header.getBlockNumber();
|
|
145
174
|
if (lastLocalBlockNumber !== undefined && lastLocalBlockNumber > lastCheckpointBlockNumber) {
|
|
146
175
|
this.log.warn(`Local chain for slot ${slot} ends at block ${lastLocalBlockNumber} but checkpoint ends at ${lastCheckpointBlockNumber}. Pruning blocks after block ${lastCheckpointBlockNumber}.`);
|
|
147
176
|
const prunedBlocks = await this.removeBlocksAfter(lastCheckpointBlockNumber);
|
|
177
|
+
await this.evictProposedCheckpointsForPrunedBlocks(prunedBlocks);
|
|
148
178
|
return {
|
|
149
179
|
prunedBlocks,
|
|
150
180
|
lastAlreadyInsertedBlockNumber
|
|
@@ -165,27 +195,60 @@ import groupBy from 'lodash.groupby';
|
|
|
165
195
|
* @returns The removed blocks.
|
|
166
196
|
* @throws Error if any block to be removed is checkpointed.
|
|
167
197
|
*/ async removeUncheckpointedBlocksAfter(blockNumber) {
|
|
168
|
-
const result = await this.
|
|
198
|
+
const result = await this.stores.db.transactionAsync(async ()=>{
|
|
169
199
|
// Verify we're only removing uncheckpointed blocks
|
|
170
|
-
const lastCheckpointedBlockNumber = await this.
|
|
200
|
+
const lastCheckpointedBlockNumber = await this.stores.blocks.getCheckpointedL2BlockNumber();
|
|
171
201
|
if (blockNumber < lastCheckpointedBlockNumber) {
|
|
172
202
|
throw new Error(`Cannot remove blocks after ${blockNumber} because checkpointed blocks exist up to ${lastCheckpointedBlockNumber}`);
|
|
173
203
|
}
|
|
174
|
-
const
|
|
175
|
-
await this.
|
|
176
|
-
return
|
|
204
|
+
const prunedBlocks = await this.removeBlocksAfter(blockNumber);
|
|
205
|
+
await this.evictProposedCheckpointsForPrunedBlocks(prunedBlocks);
|
|
206
|
+
return prunedBlocks;
|
|
207
|
+
});
|
|
208
|
+
await this.l2TipsCache?.refresh();
|
|
209
|
+
return result;
|
|
210
|
+
}
|
|
211
|
+
/**
|
|
212
|
+
* Removes all blocks without a proposed checkpoint strictly after the specified block number and cleans up associated contract data.
|
|
213
|
+
* This handles removal of provisionally added blocks along with their contract classes/instances.
|
|
214
|
+
* Verifies that each block being removed is not part of a stored checkpoint (proposed or not).
|
|
215
|
+
* This differs from `removeUncheckpointedBlocksAfter` in that it also checks proposed checkpoints.
|
|
216
|
+
*
|
|
217
|
+
* @param blockNumber - Remove all blocks with number greater than this.
|
|
218
|
+
* @returns The removed blocks.
|
|
219
|
+
* @throws Error if any block to be removed is checkpointed.
|
|
220
|
+
*/ async removeBlocksWithoutProposedCheckpointAfter(blockNumber) {
|
|
221
|
+
const result = await this.stores.db.transactionAsync(async ()=>{
|
|
222
|
+
// Verify we're only removing uncheckpointed blocks
|
|
223
|
+
const lastCheckpointedBlockNumber = await this.stores.blocks.getProposedCheckpointL2BlockNumber();
|
|
224
|
+
if (blockNumber < lastCheckpointedBlockNumber) {
|
|
225
|
+
throw new Error(`Cannot remove blocks after ${blockNumber} because proposed checkpointed blocks exist up to ${lastCheckpointedBlockNumber}`);
|
|
226
|
+
}
|
|
227
|
+
return await this.removeBlocksAfter(blockNumber);
|
|
177
228
|
});
|
|
229
|
+
await this.l2TipsCache?.refresh();
|
|
178
230
|
return result;
|
|
179
231
|
}
|
|
180
232
|
/**
|
|
233
|
+
* Evicts pending proposed checkpoints that referenced any of the just-pruned blocks. Pruned
|
|
234
|
+
* blocks invalidate all proposed checkpoints from the lowest pruned block's checkpoint number
|
|
235
|
+
* onwards: those checkpoints either reference the pruned blocks directly or chain off them.
|
|
236
|
+
*/ async evictProposedCheckpointsForPrunedBlocks(prunedBlocks) {
|
|
237
|
+
if (prunedBlocks.length === 0) {
|
|
238
|
+
return;
|
|
239
|
+
}
|
|
240
|
+
const fromCheckpointNumber = prunedBlocks[0].checkpointNumber;
|
|
241
|
+
await this.stores.blocks.evictProposedCheckpointsFrom(fromCheckpointNumber);
|
|
242
|
+
}
|
|
243
|
+
/**
|
|
181
244
|
* Removes all blocks strictly after the given block number along with any logs and contract data.
|
|
182
245
|
* Does not remove their checkpoints.
|
|
183
246
|
*/ async removeBlocksAfter(blockNumber) {
|
|
184
247
|
// First get the blocks to be removed so we can clean up contract data
|
|
185
|
-
const removedBlocks = await this.
|
|
248
|
+
const removedBlocks = await this.stores.blocks.removeBlocksAfter(blockNumber);
|
|
186
249
|
// Clean up contract data and logs for the removed blocks
|
|
187
250
|
await Promise.all([
|
|
188
|
-
this.
|
|
251
|
+
this.stores.logs.deleteLogs(removedBlocks),
|
|
189
252
|
...removedBlocks.map((block)=>this.removeContractDataFromDb(block))
|
|
190
253
|
]);
|
|
191
254
|
return removedBlocks;
|
|
@@ -199,38 +262,39 @@ import groupBy from 'lodash.groupby';
|
|
|
199
262
|
* @param checkpointNumber - Remove all checkpoints strictly after this one.
|
|
200
263
|
* @returns True if the operation is successful.
|
|
201
264
|
*/ async removeCheckpointsAfter(checkpointNumber) {
|
|
202
|
-
|
|
203
|
-
const { blocksRemoved = [] } = await this.
|
|
265
|
+
const result = await this.stores.db.transactionAsync(async ()=>{
|
|
266
|
+
const { blocksRemoved = [] } = await this.stores.blocks.removeCheckpointsAfter(checkpointNumber);
|
|
204
267
|
const opResults = await Promise.all([
|
|
205
268
|
// Prune rolls back to the last proven block, which is by definition valid
|
|
206
|
-
this.
|
|
269
|
+
this.stores.blocks.setPendingChainValidationStatus({
|
|
207
270
|
valid: true
|
|
208
271
|
}),
|
|
209
272
|
// Remove contract data for all blocks being removed
|
|
210
273
|
...blocksRemoved.map((block)=>this.removeContractDataFromDb(block)),
|
|
211
|
-
this.
|
|
274
|
+
this.stores.logs.deleteLogs(blocksRemoved)
|
|
212
275
|
]);
|
|
213
|
-
await this.l2TipsCache?.refresh();
|
|
214
276
|
return opResults.every(Boolean);
|
|
215
277
|
});
|
|
278
|
+
await this.l2TipsCache?.refresh();
|
|
279
|
+
return result;
|
|
216
280
|
}
|
|
217
281
|
/**
|
|
218
282
|
* Updates the proven checkpoint number and refreshes the L2 tips cache.
|
|
219
283
|
* @param checkpointNumber - The checkpoint number to set as proven.
|
|
220
284
|
*/ async setProvenCheckpointNumber(checkpointNumber) {
|
|
221
|
-
await this.
|
|
222
|
-
await this.
|
|
223
|
-
await this.l2TipsCache?.refresh();
|
|
285
|
+
await this.stores.db.transactionAsync(async ()=>{
|
|
286
|
+
await this.stores.blocks.setProvenCheckpointNumber(checkpointNumber);
|
|
224
287
|
});
|
|
288
|
+
await this.l2TipsCache?.refresh();
|
|
225
289
|
}
|
|
226
290
|
/**
|
|
227
291
|
* Updates the finalized checkpoint number and refreshes the L2 tips cache.
|
|
228
292
|
* @param checkpointNumber - The checkpoint number to set as finalized.
|
|
229
293
|
*/ async setFinalizedCheckpointNumber(checkpointNumber) {
|
|
230
|
-
await this.
|
|
231
|
-
await this.
|
|
232
|
-
await this.l2TipsCache?.refresh();
|
|
294
|
+
await this.stores.db.transactionAsync(async ()=>{
|
|
295
|
+
await this.stores.blocks.setFinalizedCheckpointNumber(checkpointNumber);
|
|
233
296
|
});
|
|
297
|
+
await this.l2TipsCache?.refresh();
|
|
234
298
|
}
|
|
235
299
|
/** Extracts and stores contract data from a single block. */ addContractDataToDb(block) {
|
|
236
300
|
return this.updateContractDataOnDb(block, 0);
|
|
@@ -245,8 +309,7 @@ import groupBy from 'lodash.groupby';
|
|
|
245
309
|
return (await Promise.all([
|
|
246
310
|
this.updatePublishedContractClasses(contractClassLogs, block.number, operation),
|
|
247
311
|
this.updateDeployedContractInstances(privateLogs, block.number, operation),
|
|
248
|
-
this.updateUpdatedContractInstances(publicLogs, block.header.globalVariables.timestamp, operation)
|
|
249
|
-
operation === 0 ? this.storeBroadcastedIndividualFunctions(contractClassLogs, block.number) : Promise.resolve(true)
|
|
312
|
+
this.updateUpdatedContractInstances(publicLogs, block.header.globalVariables.timestamp, operation)
|
|
250
313
|
])).every(Boolean);
|
|
251
314
|
}
|
|
252
315
|
/**
|
|
@@ -257,7 +320,7 @@ import groupBy from 'lodash.groupby';
|
|
|
257
320
|
const contractClasses = contractClassPublishedEvents.map((e)=>e.toContractClassPublic());
|
|
258
321
|
if (contractClasses.length > 0) {
|
|
259
322
|
contractClasses.forEach((c)=>this.log.verbose(`${Operation[operation]} contract class ${c.id.toString()}`));
|
|
260
|
-
return await this.
|
|
323
|
+
return await this.stores.contractClasses.deleteContractClasses(contractClasses, blockNum);
|
|
261
324
|
}
|
|
262
325
|
return true;
|
|
263
326
|
}
|
|
@@ -281,7 +344,7 @@ import groupBy from 'lodash.groupby';
|
|
|
281
344
|
}
|
|
282
345
|
if (contractClasses.length > 0) {
|
|
283
346
|
contractClasses.forEach((c)=>this.log.verbose(`${Operation[operation]} contract class ${c.id.toString()}`));
|
|
284
|
-
return await this.
|
|
347
|
+
return await this.stores.contractClasses.addContractClasses(contractClasses, blockNum);
|
|
285
348
|
}
|
|
286
349
|
return true;
|
|
287
350
|
}
|
|
@@ -305,9 +368,9 @@ import groupBy from 'lodash.groupby';
|
|
|
305
368
|
if (contractInstances.length > 0) {
|
|
306
369
|
contractInstances.forEach((c)=>this.log.verbose(`${Operation[operation]} contract instance at ${c.address.toString()}`));
|
|
307
370
|
if (operation == 0) {
|
|
308
|
-
return await this.
|
|
371
|
+
return await this.stores.contractInstances.addContractInstances(contractInstances, blockNum);
|
|
309
372
|
} else if (operation == 1) {
|
|
310
|
-
return await this.
|
|
373
|
+
return await this.stores.contractInstances.deleteContractInstances(contractInstances);
|
|
311
374
|
}
|
|
312
375
|
}
|
|
313
376
|
return true;
|
|
@@ -319,56 +382,10 @@ import groupBy from 'lodash.groupby';
|
|
|
319
382
|
if (contractUpdates.length > 0) {
|
|
320
383
|
contractUpdates.forEach((c)=>this.log.verbose(`${Operation[operation]} contract instance update at ${c.address.toString()}`));
|
|
321
384
|
if (operation == 0) {
|
|
322
|
-
return await this.
|
|
385
|
+
return await this.stores.contractInstances.addContractInstanceUpdates(contractUpdates, timestamp);
|
|
323
386
|
} else if (operation == 1) {
|
|
324
|
-
return await this.
|
|
325
|
-
}
|
|
326
|
-
}
|
|
327
|
-
return true;
|
|
328
|
-
}
|
|
329
|
-
/**
|
|
330
|
-
* Stores the functions that were broadcasted individually.
|
|
331
|
-
*
|
|
332
|
-
* @dev Beware that there is not a delete variant of this, since they are added to contract classes
|
|
333
|
-
* and will be deleted as part of the class if needed.
|
|
334
|
-
*/ async storeBroadcastedIndividualFunctions(allLogs, _blockNum) {
|
|
335
|
-
// Filter out private and utility function broadcast events
|
|
336
|
-
const privateFnEvents = allLogs.filter((log)=>PrivateFunctionBroadcastedEvent.isPrivateFunctionBroadcastedEvent(log)).map((log)=>PrivateFunctionBroadcastedEvent.fromLog(log));
|
|
337
|
-
const utilityFnEvents = allLogs.filter((log)=>UtilityFunctionBroadcastedEvent.isUtilityFunctionBroadcastedEvent(log)).map((log)=>UtilityFunctionBroadcastedEvent.fromLog(log));
|
|
338
|
-
// Group all events by contract class id
|
|
339
|
-
for (const [classIdString, classEvents] of Object.entries(groupBy([
|
|
340
|
-
...privateFnEvents,
|
|
341
|
-
...utilityFnEvents
|
|
342
|
-
], (e)=>e.contractClassId.toString()))){
|
|
343
|
-
const contractClassId = Fr.fromHexString(classIdString);
|
|
344
|
-
const contractClass = await this.store.getContractClass(contractClassId);
|
|
345
|
-
if (!contractClass) {
|
|
346
|
-
this.log.warn(`Skipping broadcasted functions as contract class ${contractClassId.toString()} was not found`);
|
|
347
|
-
continue;
|
|
348
|
-
}
|
|
349
|
-
// Split private and utility functions, and filter out invalid ones
|
|
350
|
-
const allFns = classEvents.map((e)=>e.toFunctionWithMembershipProof());
|
|
351
|
-
const privateFns = allFns.filter((fn)=>'utilityFunctionsTreeRoot' in fn);
|
|
352
|
-
const utilityFns = allFns.filter((fn)=>'privateFunctionsArtifactTreeRoot' in fn);
|
|
353
|
-
const privateFunctionsWithValidity = await Promise.all(privateFns.map(async (fn)=>({
|
|
354
|
-
fn,
|
|
355
|
-
valid: await isValidPrivateFunctionMembershipProof(fn, contractClass)
|
|
356
|
-
})));
|
|
357
|
-
const validPrivateFns = privateFunctionsWithValidity.filter(({ valid })=>valid).map(({ fn })=>fn);
|
|
358
|
-
const utilityFunctionsWithValidity = await Promise.all(utilityFns.map(async (fn)=>({
|
|
359
|
-
fn,
|
|
360
|
-
valid: await isValidUtilityFunctionMembershipProof(fn, contractClass)
|
|
361
|
-
})));
|
|
362
|
-
const validUtilityFns = utilityFunctionsWithValidity.filter(({ valid })=>valid).map(({ fn })=>fn);
|
|
363
|
-
const validFnCount = validPrivateFns.length + validUtilityFns.length;
|
|
364
|
-
if (validFnCount !== allFns.length) {
|
|
365
|
-
this.log.warn(`Skipping ${allFns.length - validFnCount} invalid functions`);
|
|
366
|
-
}
|
|
367
|
-
// Store the functions in the contract class in a single operation
|
|
368
|
-
if (validFnCount > 0) {
|
|
369
|
-
this.log.verbose(`Storing ${validFnCount} functions for contract class ${contractClassId.toString()}`);
|
|
387
|
+
return await this.stores.contractInstances.deleteContractInstanceUpdates(contractUpdates, timestamp);
|
|
370
388
|
}
|
|
371
|
-
await this.store.addFunctions(contractClassId, validPrivateFns, validUtilityFns);
|
|
372
389
|
}
|
|
373
390
|
return true;
|
|
374
391
|
}
|
|
@@ -1,5 +1,7 @@
|
|
|
1
|
+
import type { SlotNumber } from '@aztec/foundation/branded-types';
|
|
1
2
|
import type { L2Block } from '@aztec/stdlib/block';
|
|
2
3
|
import type { CheckpointData } from '@aztec/stdlib/checkpoint';
|
|
4
|
+
import type { L1RollupConstants } from '@aztec/stdlib/epoch-helpers';
|
|
3
5
|
import { type LmdbStatsCallback, type TelemetryClient, type Tracer } from '@aztec/telemetry-client';
|
|
4
6
|
export declare class ArchiverInstrumentation {
|
|
5
7
|
private telemetry;
|
|
@@ -14,17 +16,21 @@ export declare class ArchiverInstrumentation {
|
|
|
14
16
|
private pruneDuration;
|
|
15
17
|
private pruneCount;
|
|
16
18
|
private syncDurationPerBlock;
|
|
19
|
+
private syncDurationPerCheckpoint;
|
|
17
20
|
private syncBlockCount;
|
|
18
21
|
private manaPerBlock;
|
|
19
22
|
private txsPerBlock;
|
|
20
23
|
private syncDurationPerMessage;
|
|
21
24
|
private syncMessageCount;
|
|
22
25
|
private blockProposalTxTargetCount;
|
|
26
|
+
private checkpointL1InclusionDelay;
|
|
27
|
+
private checkpointPromotedCount;
|
|
23
28
|
private log;
|
|
24
29
|
private constructor();
|
|
25
30
|
static new(telemetry: TelemetryClient, lmdbStats?: LmdbStatsCallback): Promise<ArchiverInstrumentation>;
|
|
26
31
|
isEnabled(): boolean;
|
|
27
|
-
|
|
32
|
+
processNewProposedBlock(syncTimePerBlock: number, block: L2Block): void;
|
|
33
|
+
processNewCheckpointedBlocks(syncTimePerCheckpoint: number, blocks: L2Block[]): void;
|
|
28
34
|
processNewMessages(count: number, syncPerMessageMs: number): void;
|
|
29
35
|
processPrune(duration: number): void;
|
|
30
36
|
updateLastProvenCheckpoint(checkpoint: CheckpointData): void;
|
|
@@ -35,5 +41,15 @@ export declare class ArchiverInstrumentation {
|
|
|
35
41
|
}[]): void;
|
|
36
42
|
updateL1BlockHeight(blockNumber: bigint): void;
|
|
37
43
|
recordBlockProposalTxTarget(target: string, usedTrace: boolean): void;
|
|
44
|
+
/** Records a checkpoint promoted from proposed (blob fetch skipped). */
|
|
45
|
+
processCheckpointPromoted(): void;
|
|
46
|
+
/**
|
|
47
|
+
* Records L1 inclusion timing for a checkpoint observed on L1 (seconds into the L2 slot).
|
|
48
|
+
*/
|
|
49
|
+
processCheckpointL1Timing(data: {
|
|
50
|
+
slotNumber: SlotNumber;
|
|
51
|
+
l1Timestamp: bigint;
|
|
52
|
+
l1Constants: Pick<L1RollupConstants, 'l1GenesisTime' | 'slotDuration'>;
|
|
53
|
+
}): void;
|
|
38
54
|
}
|
|
39
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
55
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5zdHJ1bWVudGF0aW9uLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvbW9kdWxlcy9pbnN0cnVtZW50YXRpb24udHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxLQUFLLEVBQUUsVUFBVSxFQUFFLE1BQU0saUNBQWlDLENBQUM7QUFFbEUsT0FBTyxLQUFLLEVBQUUsT0FBTyxFQUFFLE1BQU0scUJBQXFCLENBQUM7QUFDbkQsT0FBTyxLQUFLLEVBQUUsY0FBYyxFQUFFLE1BQU0sMEJBQTBCLENBQUM7QUFDL0QsT0FBTyxLQUFLLEVBQUUsaUJBQWlCLEVBQUUsTUFBTSw2QkFBNkIsQ0FBQztBQUVyRSxPQUFPLEVBS0wsS0FBSyxpQkFBaUIsRUFFdEIsS0FBSyxlQUFlLEVBQ3BCLEtBQUssTUFBTSxFQUdaLE1BQU0seUJBQXlCLENBQUM7QUFFakMscUJBQWEsdUJBQXVCO0lBK0JoQyxPQUFPLENBQUMsU0FBUztJQTlCbkIsU0FBZ0IsTUFBTSxFQUFFLE1BQU0sQ0FBQztJQUUvQixPQUFPLENBQUMsV0FBVyxDQUFRO0lBQzNCLE9BQU8sQ0FBQyxnQkFBZ0IsQ0FBUTtJQUNoQyxPQUFPLENBQUMsT0FBTyxDQUFnQjtJQUMvQixPQUFPLENBQUMsYUFBYSxDQUFRO0lBQzdCLE9BQU8sQ0FBQyxvQkFBb0IsQ0FBWTtJQUN4QyxPQUFPLENBQUMsb0JBQW9CLENBQWdCO0lBQzVDLE9BQU8sQ0FBQyxTQUFTLENBQWM7SUFFL0IsT0FBTyxDQUFDLGFBQWEsQ0FBWTtJQUNqQyxPQUFPLENBQUMsVUFBVSxDQUFnQjtJQUVsQyxPQUFPLENBQUMsb0JBQW9CLENBQVk7SUFDeEMsT0FBTyxDQUFDLHlCQUF5QixDQUFZO0lBQzdDLE9BQU8sQ0FBQyxjQUFjLENBQWdCO0lBQ3RDLE9BQU8sQ0FBQyxZQUFZLENBQVk7SUFDaEMsT0FBTyxDQUFDLFdBQVcsQ0FBWTtJQUUvQixPQUFPLENBQUMsc0JBQXNCLENBQVk7SUFDMUMsT0FBTyxDQUFDLGdCQUFnQixDQUFnQjtJQUV4QyxPQUFPLENBQUMsMEJBQTBCLENBQWdCO0lBRWxELE9BQU8sQ0FBQywwQkFBMEIsQ0FBWTtJQUM5QyxPQUFPLENBQUMsdUJBQXVCLENBQWdCO0lBRS9DLE9BQU8sQ0FBQyxHQUFHLENBQTRDO0lBRXZELE9BQU8sZUEwRE47SUFFRCxPQUFvQixHQUFHLENBQUMsU0FBUyxFQUFFLGVBQWUsRUFBRSxTQUFTLENBQUMsRUFBRSxpQkFBaUIsb0NBTWhGO0lBRU0sU0FBUyxJQUFJLE9BQU8sQ0FFMUI7SUFFTSx1QkFBdUIsQ0FBQyxnQkFBZ0IsRUFBRSxNQUFNLEVBQUUsS0FBSyxFQUFFLE9BQU8sUUFTdEU7SUFFTSw0QkFBNEIsQ0FBQyxxQkFBcUIsRUFBRSxNQUFNLEVBQUUsTUFBTSxFQUFFLE9BQU8sRUFBRSxRQVNuRjtJQUVNLGtCQUFrQixDQUFDLEtBQUssRUFBRSxNQUFNLEVBQUUsZ0JBQWdCLEVBQUUsTUFBTSxRQU1oRTtJQUVNLFlBQVksQ0FBQyxRQUFRLEVBQUUsTUFBTSxRQUduQztJQUVNLDBCQUEwQixDQUFDLFVBQVUsRUFBRSxjQUFjLFFBSTNEO0lBRU0scUJBQXFCLENBQUMsSUFBSSxFQUFFO1FBQUUsUUFBUSxFQUFFLE1BQU0sQ0FBQztRQUFDLGFBQWEsRUFBRSxNQUFNLENBQUM7UUFBQyxLQUFLLEVBQUUsTUFBTSxDQUFBO0tBQUUsRUFBRSxRQVc5RjtJQUVNLG1CQUFtQixDQUFDLFdBQVcsRUFBRSxNQUFNLFFBRTdDO0lBRU0sMkJBQTJCLENBQUMsTUFBTSxFQUFFLE1BQU0sRUFBRSxTQUFTLEVBQUUsT0FBTyxRQUtwRTtJQUVELHdFQUF3RTtJQUNqRSx5QkFBeUIsU0FFL0I7SUFFRDs7T0FFRztJQUNJLHlCQUF5QixDQUFDLElBQUksRUFBRTtRQUNyQyxVQUFVLEVBQUUsVUFBVSxDQUFDO1FBQ3ZCLFdBQVcsRUFBRSxNQUFNLENBQUM7UUFDcEIsV0FBVyxFQUFFLElBQUksQ0FBQyxpQkFBaUIsRUFBRSxlQUFlLEdBQUcsY0FBYyxDQUFDLENBQUM7S0FDeEUsR0FBRyxJQUFJLENBSVA7Q0FDRiJ9
|
|
@@ -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,eA0DN;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;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"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { createLogger } from '@aztec/foundation/log';
|
|
2
|
+
import { getTimestampForSlot } from '@aztec/stdlib/epoch-helpers';
|
|
2
3
|
import { Attributes, LmdbMetrics, Metrics, createUpDownCounterWithDefault } from '@aztec/telemetry-client';
|
|
3
4
|
export class ArchiverInstrumentation {
|
|
4
5
|
telemetry;
|
|
@@ -13,12 +14,15 @@ export class ArchiverInstrumentation {
|
|
|
13
14
|
pruneDuration;
|
|
14
15
|
pruneCount;
|
|
15
16
|
syncDurationPerBlock;
|
|
17
|
+
syncDurationPerCheckpoint;
|
|
16
18
|
syncBlockCount;
|
|
17
19
|
manaPerBlock;
|
|
18
20
|
txsPerBlock;
|
|
19
21
|
syncDurationPerMessage;
|
|
20
22
|
syncMessageCount;
|
|
21
23
|
blockProposalTxTargetCount;
|
|
24
|
+
checkpointL1InclusionDelay;
|
|
25
|
+
checkpointPromotedCount;
|
|
22
26
|
log;
|
|
23
27
|
constructor(telemetry, lmdbStats){
|
|
24
28
|
this.telemetry = telemetry;
|
|
@@ -37,6 +41,7 @@ export class ArchiverInstrumentation {
|
|
|
37
41
|
});
|
|
38
42
|
this.proofsSubmittedDelay = meter.createHistogram(Metrics.ARCHIVER_ROLLUP_PROOF_DELAY);
|
|
39
43
|
this.syncDurationPerBlock = meter.createHistogram(Metrics.ARCHIVER_SYNC_PER_BLOCK);
|
|
44
|
+
this.syncDurationPerCheckpoint = meter.createHistogram(Metrics.ARCHIVER_SYNC_PER_CHECKPOINT);
|
|
40
45
|
this.syncBlockCount = createUpDownCounterWithDefault(meter, Metrics.ARCHIVER_SYNC_BLOCK_COUNT);
|
|
41
46
|
this.manaPerBlock = meter.createHistogram(Metrics.ARCHIVER_MANA_PER_BLOCK);
|
|
42
47
|
this.txsPerBlock = meter.createHistogram(Metrics.ARCHIVER_TXS_PER_BLOCK);
|
|
@@ -50,6 +55,8 @@ export class ArchiverInstrumentation {
|
|
|
50
55
|
false
|
|
51
56
|
]
|
|
52
57
|
});
|
|
58
|
+
this.checkpointL1InclusionDelay = meter.createHistogram(Metrics.ARCHIVER_CHECKPOINT_L1_INCLUSION_DELAY);
|
|
59
|
+
this.checkpointPromotedCount = createUpDownCounterWithDefault(meter, Metrics.ARCHIVER_CHECKPOINT_PROMOTED_COUNT);
|
|
53
60
|
this.dbMetrics = new LmdbMetrics(meter, {
|
|
54
61
|
[Attributes.DB_DATA_TYPE]: 'archiver'
|
|
55
62
|
}, lmdbStats);
|
|
@@ -62,16 +69,27 @@ export class ArchiverInstrumentation {
|
|
|
62
69
|
isEnabled() {
|
|
63
70
|
return this.telemetry.isEnabled();
|
|
64
71
|
}
|
|
65
|
-
|
|
72
|
+
processNewProposedBlock(syncTimePerBlock, block) {
|
|
73
|
+
const attrs = {
|
|
74
|
+
[Attributes.STATUS]: 'proposed'
|
|
75
|
+
};
|
|
76
|
+
this.blockHeight.record(block.number, attrs);
|
|
66
77
|
this.syncDurationPerBlock.record(Math.ceil(syncTimePerBlock));
|
|
67
|
-
|
|
78
|
+
// Per block metrics
|
|
79
|
+
this.txCount.add(block.body.txEffects.length);
|
|
80
|
+
this.txsPerBlock.record(block.body.txEffects.length);
|
|
81
|
+
this.manaPerBlock.record(block.header.totalManaUsed.toNumber() / 1e6);
|
|
82
|
+
}
|
|
83
|
+
processNewCheckpointedBlocks(syncTimePerCheckpoint, blocks) {
|
|
84
|
+
if (blocks.length === 0) {
|
|
85
|
+
return;
|
|
86
|
+
}
|
|
87
|
+
this.syncDurationPerCheckpoint.record(Math.ceil(syncTimePerCheckpoint));
|
|
88
|
+
this.blockHeight.record(Math.max(...blocks.map((b)=>b.number)), {
|
|
89
|
+
[Attributes.STATUS]: 'checkpointed'
|
|
90
|
+
});
|
|
68
91
|
this.checkpointHeight.record(Math.max(...blocks.map((b)=>b.checkpointNumber)));
|
|
69
92
|
this.syncBlockCount.add(blocks.length);
|
|
70
|
-
for (const block of blocks){
|
|
71
|
-
this.txCount.add(block.body.txEffects.length);
|
|
72
|
-
this.txsPerBlock.record(block.body.txEffects.length);
|
|
73
|
-
this.manaPerBlock.record(block.header.totalManaUsed.toNumber() / 1e6);
|
|
74
|
-
}
|
|
75
93
|
}
|
|
76
94
|
processNewMessages(count, syncPerMessageMs) {
|
|
77
95
|
if (count === 0) {
|
|
@@ -114,4 +132,14 @@ export class ArchiverInstrumentation {
|
|
|
114
132
|
[Attributes.L1_BLOCK_PROPOSAL_USED_TRACE]: usedTrace
|
|
115
133
|
});
|
|
116
134
|
}
|
|
135
|
+
/** Records a checkpoint promoted from proposed (blob fetch skipped). */ processCheckpointPromoted() {
|
|
136
|
+
this.checkpointPromotedCount.add(1);
|
|
137
|
+
}
|
|
138
|
+
/**
|
|
139
|
+
* Records L1 inclusion timing for a checkpoint observed on L1 (seconds into the L2 slot).
|
|
140
|
+
*/ processCheckpointL1Timing(data) {
|
|
141
|
+
const slotStartTs = getTimestampForSlot(data.slotNumber, data.l1Constants);
|
|
142
|
+
const inclusionDelaySeconds = Number(data.l1Timestamp - slotStartTs);
|
|
143
|
+
this.checkpointL1InclusionDelay.record(inclusionDelaySeconds);
|
|
144
|
+
}
|
|
117
145
|
}
|