@aztec/archiver 0.0.1-commit.b2a5d0dd1 → 0.0.1-commit.b3d3157a
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 +7 -5
- package/dest/archiver.d.ts +49 -14
- package/dest/archiver.d.ts.map +1 -1
- package/dest/archiver.js +216 -68
- package/dest/config.d.ts +4 -3
- package/dest/config.d.ts.map +1 -1
- package/dest/config.js +11 -16
- package/dest/errors.d.ts +19 -13
- package/dest/errors.d.ts.map +1 -1
- package/dest/errors.js +32 -16
- package/dest/factory.d.ts +12 -6
- package/dest/factory.d.ts.map +1 -1
- package/dest/factory.js +31 -21
- package/dest/index.d.ts +9 -2
- package/dest/index.d.ts.map +1 -1
- package/dest/index.js +8 -1
- package/dest/l1/calldata_retriever.d.ts +2 -1
- package/dest/l1/calldata_retriever.d.ts.map +1 -1
- package/dest/l1/calldata_retriever.js +13 -4
- package/dest/l1/trace_tx.d.ts +12 -66
- package/dest/l1/trace_tx.d.ts.map +1 -1
- 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 -49
- package/dest/modules/data_source_base.d.ts.map +1 -1
- package/dest/modules/data_source_base.js +269 -143
- package/dest/modules/data_store_updater.d.ts +18 -6
- package/dest/modules/data_store_updater.d.ts.map +1 -1
- package/dest/modules/data_store_updater.js +108 -59
- package/dest/modules/instrumentation.js +3 -1
- package/dest/modules/l1_synchronizer.d.ts +6 -5
- package/dest/modules/l1_synchronizer.d.ts.map +1 -1
- package/dest/modules/l1_synchronizer.js +203 -100
- 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 +4 -4
- package/dest/store/block_store.d.ts +155 -98
- package/dest/store/block_store.d.ts.map +1 -1
- package/dest/store/block_store.js +473 -265
- package/dest/store/contract_class_store.d.ts +17 -3
- package/dest/store/contract_class_store.d.ts.map +1 -1
- package/dest/store/contract_class_store.js +17 -1
- 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 -8
- package/dest/store/l2_tips_cache.d.ts.map +1 -1
- package/dest/store/l2_tips_cache.js +13 -96
- package/dest/store/log_store.d.ts +42 -40
- package/dest/store/log_store.d.ts.map +1 -1
- package/dest/store/log_store.js +257 -478
- 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 +9 -3
- package/dest/store/message_store.d.ts.map +1 -1
- package/dest/store/message_store.js +31 -1
- package/dest/test/fake_l1_state.d.ts +2 -1
- package/dest/test/fake_l1_state.d.ts.map +1 -1
- package/dest/test/fake_l1_state.js +25 -8
- package/dest/test/mock_l2_block_source.d.ts +47 -51
- package/dest/test/mock_l2_block_source.d.ts.map +1 -1
- package/dest/test/mock_l2_block_source.js +223 -185
- 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 +19 -8
- package/package.json +14 -14
- package/src/archiver.ts +265 -72
- package/src/config.ts +12 -19
- package/src/errors.ts +46 -23
- package/src/factory.ts +38 -20
- package/src/index.ts +16 -1
- package/src/l1/calldata_retriever.ts +14 -4
- package/src/modules/contract_data_source_adapter.ts +55 -0
- package/src/modules/data_source_base.ts +335 -187
- package/src/modules/data_store_updater.ts +118 -61
- package/src/modules/instrumentation.ts +1 -1
- package/src/modules/l1_synchronizer.ts +278 -120
- package/src/modules/outbox_trees_resolver.ts +199 -0
- package/src/modules/validation.ts +8 -7
- package/src/store/block_store.ts +566 -323
- package/src/store/contract_class_store.ts +28 -2
- 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 -115
- package/src/store/log_store.ts +296 -650
- package/src/store/log_store_codec.ts +132 -0
- package/src/store/message_store.ts +35 -2
- package/src/test/fake_l1_state.ts +24 -14
- package/src/test/mock_l2_block_source.ts +271 -239
- package/src/test/noop_l1_archiver.ts +39 -8
- package/dest/store/kv_archiver_store.d.ts +0 -383
- package/dest/store/kv_archiver_store.d.ts.map +0 -1
- package/dest/store/kv_archiver_store.js +0 -501
- package/src/store/kv_archiver_store.ts +0 -728
|
@@ -11,12 +11,12 @@ import { computeContractAddressFromInstance, computeContractClassId } from '@azt
|
|
|
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
15
|
l2TipsCache;
|
|
16
16
|
opts;
|
|
17
17
|
log;
|
|
18
|
-
constructor(
|
|
19
|
-
this.
|
|
18
|
+
constructor(stores, l2TipsCache, opts = {}){
|
|
19
|
+
this.stores = stores;
|
|
20
20
|
this.l2TipsCache = l2TipsCache;
|
|
21
21
|
this.opts = opts;
|
|
22
22
|
this.log = createLogger('archiver:store_updater');
|
|
@@ -30,21 +30,21 @@ import { computeContractAddressFromInstance, computeContractClassId } from '@azt
|
|
|
30
30
|
* @param pendingChainValidationStatus - Optional validation status to set.
|
|
31
31
|
* @returns True if the operation is successful.
|
|
32
32
|
*/ async addProposedBlock(block, pendingChainValidationStatus) {
|
|
33
|
-
const result = await this.
|
|
34
|
-
await this.
|
|
33
|
+
const result = await this.stores.db.transactionAsync(async ()=>{
|
|
34
|
+
await this.stores.blocks.addProposedBlock(block);
|
|
35
35
|
const opResults = await Promise.all([
|
|
36
36
|
// Update the pending chain validation status if provided
|
|
37
|
-
pendingChainValidationStatus && this.
|
|
37
|
+
pendingChainValidationStatus && this.stores.blocks.setPendingChainValidationStatus(pendingChainValidationStatus),
|
|
38
38
|
// Add any logs emitted during the retrieved block
|
|
39
|
-
this.
|
|
39
|
+
this.stores.logs.addLogs([
|
|
40
40
|
block
|
|
41
41
|
]),
|
|
42
42
|
// Unroll all logs emitted during the retrieved block and extract any contract classes and instances from it
|
|
43
43
|
this.addContractDataToDb(block)
|
|
44
44
|
]);
|
|
45
|
-
await this.l2TipsCache?.refresh();
|
|
46
45
|
return opResults.every(Boolean);
|
|
47
46
|
});
|
|
47
|
+
await this.l2TipsCache?.refresh();
|
|
48
48
|
return result;
|
|
49
49
|
}
|
|
50
50
|
/**
|
|
@@ -59,7 +59,7 @@ import { computeContractAddressFromInstance, computeContractClassId } from '@azt
|
|
|
59
59
|
* @param pendingChainValidationStatus - Optional validation status to set.
|
|
60
60
|
* @param promoteProposed - Optional promotion of the current proposed checkpoint (fast path when blocks are already local).
|
|
61
61
|
* @returns Result with information about any pruned blocks.
|
|
62
|
-
*/ async addCheckpoints(checkpoints, pendingChainValidationStatus, promoteProposed) {
|
|
62
|
+
*/ async addCheckpoints(checkpoints, pendingChainValidationStatus, promoteProposed, evictProposedFrom) {
|
|
63
63
|
for (const checkpoint of checkpoints){
|
|
64
64
|
validateCheckpoint(checkpoint.checkpoint, {
|
|
65
65
|
rollupManaLimit: this.opts?.rollupManaLimit
|
|
@@ -70,46 +70,56 @@ import { computeContractAddressFromInstance, computeContractClassId } from '@azt
|
|
|
70
70
|
rollupManaLimit: this.opts?.rollupManaLimit
|
|
71
71
|
});
|
|
72
72
|
}
|
|
73
|
-
const result = await this.
|
|
73
|
+
const result = await this.stores.db.transactionAsync(async ()=>{
|
|
74
74
|
// Before adding checkpoints, check for conflicts with local blocks if any
|
|
75
75
|
const { prunedBlocks, lastAlreadyInsertedBlockNumber } = await this.pruneMismatchingLocalBlocks(checkpoints);
|
|
76
|
-
await this.
|
|
76
|
+
await this.stores.blocks.addCheckpoints(checkpoints);
|
|
77
77
|
// Filter out blocks that were already inserted via addProposedBlock() to avoid duplicating logs/contract data
|
|
78
78
|
const newBlocks = checkpoints.flatMap((ch)=>ch.checkpoint.blocks).filter((b)=>lastAlreadyInsertedBlockNumber === undefined || b.number > lastAlreadyInsertedBlockNumber);
|
|
79
79
|
await Promise.all([
|
|
80
80
|
// Update the pending chain validation status if provided
|
|
81
|
-
pendingChainValidationStatus && this.
|
|
81
|
+
pendingChainValidationStatus && this.stores.blocks.setPendingChainValidationStatus(pendingChainValidationStatus),
|
|
82
82
|
// Add any logs emitted during the retrieved blocks
|
|
83
|
-
this.
|
|
83
|
+
this.stores.logs.addLogs(newBlocks),
|
|
84
84
|
// Unroll all logs emitted during the retrieved blocks and extract any contract classes and instances from them
|
|
85
85
|
...newBlocks.map((block)=>this.addContractDataToDb(block)),
|
|
86
|
-
// Promote the proposed checkpoint if requested
|
|
87
|
-
promoteProposed ? this.
|
|
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
|
|
88
90
|
]);
|
|
89
|
-
await this.l2TipsCache?.refresh();
|
|
90
91
|
return {
|
|
91
92
|
prunedBlocks,
|
|
92
93
|
lastAlreadyInsertedBlockNumber
|
|
93
94
|
};
|
|
94
95
|
});
|
|
96
|
+
await this.l2TipsCache?.refresh();
|
|
95
97
|
return result;
|
|
96
98
|
}
|
|
97
|
-
async
|
|
98
|
-
const result = await this.
|
|
99
|
-
await this.
|
|
100
|
-
await this.l2TipsCache?.refresh();
|
|
99
|
+
async addProposedCheckpoint(proposedCheckpoint) {
|
|
100
|
+
const result = await this.stores.db.transactionAsync(async ()=>{
|
|
101
|
+
await this.stores.blocks.addProposedCheckpoint(proposedCheckpoint);
|
|
101
102
|
});
|
|
103
|
+
await this.l2TipsCache?.refresh();
|
|
102
104
|
return result;
|
|
103
105
|
}
|
|
104
106
|
/**
|
|
105
107
|
* Checks for local proposed blocks that do not match the ones to be checkpointed and prunes them.
|
|
106
|
-
*
|
|
107
|
-
*
|
|
108
|
-
*
|
|
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.
|
|
109
119
|
*/ async pruneMismatchingLocalBlocks(checkpoints) {
|
|
110
120
|
const [lastCheckpointedBlockNumber, lastBlockNumber] = await Promise.all([
|
|
111
|
-
this.
|
|
112
|
-
this.
|
|
121
|
+
this.stores.blocks.getCheckpointedL2BlockNumber(),
|
|
122
|
+
this.stores.blocks.getLatestL2BlockNumber()
|
|
113
123
|
]);
|
|
114
124
|
// Exit early if there are no local uncheckpointed blocks
|
|
115
125
|
if (lastBlockNumber === lastCheckpointedBlockNumber) {
|
|
@@ -119,22 +129,25 @@ import { computeContractAddressFromInstance, computeContractClassId } from '@azt
|
|
|
119
129
|
};
|
|
120
130
|
}
|
|
121
131
|
// Get all uncheckpointed local blocks
|
|
122
|
-
const uncheckpointedLocalBlocks = await this.
|
|
132
|
+
const uncheckpointedLocalBlocks = await this.stores.blocks.getBlocksData({
|
|
133
|
+
from: BlockNumber.add(lastCheckpointedBlockNumber, 1),
|
|
134
|
+
limit: lastBlockNumber - lastCheckpointedBlockNumber
|
|
135
|
+
});
|
|
123
136
|
let lastAlreadyInsertedBlockNumber;
|
|
124
137
|
for (const publishedCheckpoint of checkpoints){
|
|
125
138
|
const checkpointBlocks = publishedCheckpoint.checkpoint.blocks;
|
|
126
139
|
const slot = publishedCheckpoint.checkpoint.slot;
|
|
127
|
-
const localBlocksInSlot = uncheckpointedLocalBlocks.filter((b)=>b.slot === slot);
|
|
128
140
|
if (checkpointBlocks.length === 0) {
|
|
129
141
|
this.log.warn(`Checkpoint ${publishedCheckpoint.checkpoint.number} for slot ${slot} has no blocks`);
|
|
130
142
|
continue;
|
|
131
143
|
}
|
|
132
|
-
// 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.
|
|
133
146
|
for (const checkpointBlock of checkpointBlocks){
|
|
134
147
|
const blockNumber = checkpointBlock.number;
|
|
135
|
-
const existingBlock =
|
|
148
|
+
const existingBlock = uncheckpointedLocalBlocks.find((b)=>b.header.getBlockNumber() === blockNumber);
|
|
136
149
|
const blockInfos = {
|
|
137
|
-
existingBlock: existingBlock?.
|
|
150
|
+
existingBlock: existingBlock?.header.toInspect(),
|
|
138
151
|
checkpointBlock: checkpointBlock.toBlockInfo()
|
|
139
152
|
};
|
|
140
153
|
if (!existingBlock) {
|
|
@@ -145,19 +158,23 @@ import { computeContractAddressFromInstance, computeContractClassId } from '@azt
|
|
|
145
158
|
} else {
|
|
146
159
|
this.log.info(`Conflict detected at block ${blockNumber} between checkpointed and local block`, blockInfos);
|
|
147
160
|
const prunedBlocks = await this.removeBlocksAfter(BlockNumber(blockNumber - 1));
|
|
161
|
+
await this.evictProposedCheckpointsForPrunedBlocks(prunedBlocks);
|
|
148
162
|
return {
|
|
149
163
|
prunedBlocks,
|
|
150
164
|
lastAlreadyInsertedBlockNumber
|
|
151
165
|
};
|
|
152
166
|
}
|
|
153
167
|
}
|
|
154
|
-
// If
|
|
155
|
-
//
|
|
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.
|
|
156
171
|
const lastCheckpointBlockNumber = checkpointBlocks.at(-1).number;
|
|
157
|
-
const
|
|
172
|
+
const localBlocksInSlot = uncheckpointedLocalBlocks.filter((b)=>b.header.getSlot() === slot);
|
|
173
|
+
const lastLocalBlockNumber = localBlocksInSlot.at(-1)?.header.getBlockNumber();
|
|
158
174
|
if (lastLocalBlockNumber !== undefined && lastLocalBlockNumber > lastCheckpointBlockNumber) {
|
|
159
175
|
this.log.warn(`Local chain for slot ${slot} ends at block ${lastLocalBlockNumber} but checkpoint ends at ${lastCheckpointBlockNumber}. Pruning blocks after block ${lastCheckpointBlockNumber}.`);
|
|
160
176
|
const prunedBlocks = await this.removeBlocksAfter(lastCheckpointBlockNumber);
|
|
177
|
+
await this.evictProposedCheckpointsForPrunedBlocks(prunedBlocks);
|
|
161
178
|
return {
|
|
162
179
|
prunedBlocks,
|
|
163
180
|
lastAlreadyInsertedBlockNumber
|
|
@@ -178,29 +195,60 @@ import { computeContractAddressFromInstance, computeContractClassId } from '@azt
|
|
|
178
195
|
* @returns The removed blocks.
|
|
179
196
|
* @throws Error if any block to be removed is checkpointed.
|
|
180
197
|
*/ async removeUncheckpointedBlocksAfter(blockNumber) {
|
|
181
|
-
const result = await this.
|
|
198
|
+
const result = await this.stores.db.transactionAsync(async ()=>{
|
|
182
199
|
// Verify we're only removing uncheckpointed blocks
|
|
183
|
-
const lastCheckpointedBlockNumber = await this.
|
|
200
|
+
const lastCheckpointedBlockNumber = await this.stores.blocks.getCheckpointedL2BlockNumber();
|
|
184
201
|
if (blockNumber < lastCheckpointedBlockNumber) {
|
|
185
202
|
throw new Error(`Cannot remove blocks after ${blockNumber} because checkpointed blocks exist up to ${lastCheckpointedBlockNumber}`);
|
|
186
203
|
}
|
|
187
|
-
const
|
|
188
|
-
|
|
189
|
-
|
|
190
|
-
await this.l2TipsCache?.refresh();
|
|
191
|
-
return result;
|
|
204
|
+
const prunedBlocks = await this.removeBlocksAfter(blockNumber);
|
|
205
|
+
await this.evictProposedCheckpointsForPrunedBlocks(prunedBlocks);
|
|
206
|
+
return prunedBlocks;
|
|
192
207
|
});
|
|
208
|
+
await this.l2TipsCache?.refresh();
|
|
193
209
|
return result;
|
|
194
210
|
}
|
|
195
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);
|
|
228
|
+
});
|
|
229
|
+
await this.l2TipsCache?.refresh();
|
|
230
|
+
return result;
|
|
231
|
+
}
|
|
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
|
+
/**
|
|
196
244
|
* Removes all blocks strictly after the given block number along with any logs and contract data.
|
|
197
245
|
* Does not remove their checkpoints.
|
|
198
246
|
*/ async removeBlocksAfter(blockNumber) {
|
|
199
247
|
// First get the blocks to be removed so we can clean up contract data
|
|
200
|
-
const removedBlocks = await this.
|
|
248
|
+
const removedBlocks = await this.stores.blocks.removeBlocksAfter(blockNumber);
|
|
201
249
|
// Clean up contract data and logs for the removed blocks
|
|
202
250
|
await Promise.all([
|
|
203
|
-
this.
|
|
251
|
+
this.stores.logs.deleteLogs(removedBlocks),
|
|
204
252
|
...removedBlocks.map((block)=>this.removeContractDataFromDb(block))
|
|
205
253
|
]);
|
|
206
254
|
return removedBlocks;
|
|
@@ -214,38 +262,39 @@ import { computeContractAddressFromInstance, computeContractClassId } from '@azt
|
|
|
214
262
|
* @param checkpointNumber - Remove all checkpoints strictly after this one.
|
|
215
263
|
* @returns True if the operation is successful.
|
|
216
264
|
*/ async removeCheckpointsAfter(checkpointNumber) {
|
|
217
|
-
|
|
218
|
-
const { blocksRemoved = [] } = await this.
|
|
265
|
+
const result = await this.stores.db.transactionAsync(async ()=>{
|
|
266
|
+
const { blocksRemoved = [] } = await this.stores.blocks.removeCheckpointsAfter(checkpointNumber);
|
|
219
267
|
const opResults = await Promise.all([
|
|
220
268
|
// Prune rolls back to the last proven block, which is by definition valid
|
|
221
|
-
this.
|
|
269
|
+
this.stores.blocks.setPendingChainValidationStatus({
|
|
222
270
|
valid: true
|
|
223
271
|
}),
|
|
224
272
|
// Remove contract data for all blocks being removed
|
|
225
273
|
...blocksRemoved.map((block)=>this.removeContractDataFromDb(block)),
|
|
226
|
-
this.
|
|
274
|
+
this.stores.logs.deleteLogs(blocksRemoved)
|
|
227
275
|
]);
|
|
228
|
-
await this.l2TipsCache?.refresh();
|
|
229
276
|
return opResults.every(Boolean);
|
|
230
277
|
});
|
|
278
|
+
await this.l2TipsCache?.refresh();
|
|
279
|
+
return result;
|
|
231
280
|
}
|
|
232
281
|
/**
|
|
233
282
|
* Updates the proven checkpoint number and refreshes the L2 tips cache.
|
|
234
283
|
* @param checkpointNumber - The checkpoint number to set as proven.
|
|
235
284
|
*/ async setProvenCheckpointNumber(checkpointNumber) {
|
|
236
|
-
await this.
|
|
237
|
-
await this.
|
|
238
|
-
await this.l2TipsCache?.refresh();
|
|
285
|
+
await this.stores.db.transactionAsync(async ()=>{
|
|
286
|
+
await this.stores.blocks.setProvenCheckpointNumber(checkpointNumber);
|
|
239
287
|
});
|
|
288
|
+
await this.l2TipsCache?.refresh();
|
|
240
289
|
}
|
|
241
290
|
/**
|
|
242
291
|
* Updates the finalized checkpoint number and refreshes the L2 tips cache.
|
|
243
292
|
* @param checkpointNumber - The checkpoint number to set as finalized.
|
|
244
293
|
*/ async setFinalizedCheckpointNumber(checkpointNumber) {
|
|
245
|
-
await this.
|
|
246
|
-
await this.
|
|
247
|
-
await this.l2TipsCache?.refresh();
|
|
294
|
+
await this.stores.db.transactionAsync(async ()=>{
|
|
295
|
+
await this.stores.blocks.setFinalizedCheckpointNumber(checkpointNumber);
|
|
248
296
|
});
|
|
297
|
+
await this.l2TipsCache?.refresh();
|
|
249
298
|
}
|
|
250
299
|
/** Extracts and stores contract data from a single block. */ addContractDataToDb(block) {
|
|
251
300
|
return this.updateContractDataOnDb(block, 0);
|
|
@@ -271,7 +320,7 @@ import { computeContractAddressFromInstance, computeContractClassId } from '@azt
|
|
|
271
320
|
const contractClasses = contractClassPublishedEvents.map((e)=>e.toContractClassPublic());
|
|
272
321
|
if (contractClasses.length > 0) {
|
|
273
322
|
contractClasses.forEach((c)=>this.log.verbose(`${Operation[operation]} contract class ${c.id.toString()}`));
|
|
274
|
-
return await this.
|
|
323
|
+
return await this.stores.contractClasses.deleteContractClasses(contractClasses, blockNum);
|
|
275
324
|
}
|
|
276
325
|
return true;
|
|
277
326
|
}
|
|
@@ -295,7 +344,7 @@ import { computeContractAddressFromInstance, computeContractClassId } from '@azt
|
|
|
295
344
|
}
|
|
296
345
|
if (contractClasses.length > 0) {
|
|
297
346
|
contractClasses.forEach((c)=>this.log.verbose(`${Operation[operation]} contract class ${c.id.toString()}`));
|
|
298
|
-
return await this.
|
|
347
|
+
return await this.stores.contractClasses.addContractClasses(contractClasses, blockNum);
|
|
299
348
|
}
|
|
300
349
|
return true;
|
|
301
350
|
}
|
|
@@ -319,9 +368,9 @@ import { computeContractAddressFromInstance, computeContractClassId } from '@azt
|
|
|
319
368
|
if (contractInstances.length > 0) {
|
|
320
369
|
contractInstances.forEach((c)=>this.log.verbose(`${Operation[operation]} contract instance at ${c.address.toString()}`));
|
|
321
370
|
if (operation == 0) {
|
|
322
|
-
return await this.
|
|
371
|
+
return await this.stores.contractInstances.addContractInstances(contractInstances, blockNum);
|
|
323
372
|
} else if (operation == 1) {
|
|
324
|
-
return await this.
|
|
373
|
+
return await this.stores.contractInstances.deleteContractInstances(contractInstances);
|
|
325
374
|
}
|
|
326
375
|
}
|
|
327
376
|
return true;
|
|
@@ -333,9 +382,9 @@ import { computeContractAddressFromInstance, computeContractClassId } from '@azt
|
|
|
333
382
|
if (contractUpdates.length > 0) {
|
|
334
383
|
contractUpdates.forEach((c)=>this.log.verbose(`${Operation[operation]} contract instance update at ${c.address.toString()}`));
|
|
335
384
|
if (operation == 0) {
|
|
336
|
-
return await this.
|
|
385
|
+
return await this.stores.contractInstances.addContractInstanceUpdates(contractUpdates, timestamp);
|
|
337
386
|
} else if (operation == 1) {
|
|
338
|
-
return await this.
|
|
387
|
+
return await this.stores.contractInstances.deleteContractInstanceUpdates(contractUpdates, timestamp);
|
|
339
388
|
}
|
|
340
389
|
}
|
|
341
390
|
return true;
|
|
@@ -85,7 +85,9 @@ export class ArchiverInstrumentation {
|
|
|
85
85
|
return;
|
|
86
86
|
}
|
|
87
87
|
this.syncDurationPerCheckpoint.record(Math.ceil(syncTimePerCheckpoint));
|
|
88
|
-
this.blockHeight.record(Math.max(...blocks.map((b)=>b.number))
|
|
88
|
+
this.blockHeight.record(Math.max(...blocks.map((b)=>b.number)), {
|
|
89
|
+
[Attributes.STATUS]: 'checkpointed'
|
|
90
|
+
});
|
|
89
91
|
this.checkpointHeight.record(Math.max(...blocks.map((b)=>b.checkpointNumber)));
|
|
90
92
|
this.syncBlockCount.add(blocks.length);
|
|
91
93
|
}
|
|
@@ -9,19 +9,19 @@ import { DateProvider } from '@aztec/foundation/timer';
|
|
|
9
9
|
import { type ArchiverEmitter } from '@aztec/stdlib/block';
|
|
10
10
|
import { type L1RollupConstants } from '@aztec/stdlib/epoch-helpers';
|
|
11
11
|
import { type Traceable, type Tracer } from '@aztec/telemetry-client';
|
|
12
|
-
import type
|
|
12
|
+
import { type ArchiverDataStores } from '../store/data_stores.js';
|
|
13
13
|
import type { L2TipsCache } from '../store/l2_tips_cache.js';
|
|
14
14
|
import type { ArchiverInstrumentation } from './instrumentation.js';
|
|
15
15
|
/**
|
|
16
16
|
* Handles L1 synchronization for the archiver.
|
|
17
|
-
* Responsible for fetching checkpoints, L1
|
|
17
|
+
* Responsible for fetching checkpoints, L1 to L2 messages, and handling L1 reorgs.
|
|
18
18
|
*/
|
|
19
19
|
export declare class ArchiverL1Synchronizer implements Traceable {
|
|
20
20
|
private readonly publicClient;
|
|
21
21
|
private readonly debugClient;
|
|
22
22
|
private readonly rollup;
|
|
23
23
|
private readonly inbox;
|
|
24
|
-
private readonly
|
|
24
|
+
private readonly stores;
|
|
25
25
|
private config;
|
|
26
26
|
private readonly blobClient;
|
|
27
27
|
private readonly epochCache;
|
|
@@ -35,7 +35,7 @@ export declare class ArchiverL1Synchronizer implements Traceable {
|
|
|
35
35
|
private l1Timestamp;
|
|
36
36
|
private readonly updater;
|
|
37
37
|
readonly tracer: Tracer;
|
|
38
|
-
constructor(publicClient: ViemPublicClient, debugClient: ViemPublicDebugClient, rollup: RollupContract, inbox: InboxContract,
|
|
38
|
+
constructor(publicClient: ViemPublicClient, debugClient: ViemPublicDebugClient, rollup: RollupContract, inbox: InboxContract, stores: ArchiverDataStores, config: {
|
|
39
39
|
batchSize: number;
|
|
40
40
|
skipValidateCheckpointAttestations?: boolean;
|
|
41
41
|
skipPromoteProposedCheckpointDuringL1Sync?: boolean;
|
|
@@ -55,6 +55,7 @@ export declare class ArchiverL1Synchronizer implements Traceable {
|
|
|
55
55
|
getL1BlockNumber(): bigint | undefined;
|
|
56
56
|
/** Returns the last L1 timestamp that was synced. */
|
|
57
57
|
getL1Timestamp(): bigint | undefined;
|
|
58
|
+
private getSignatureContext;
|
|
58
59
|
/** Checks that the ethereum node we are connected to has a latest timestamp no more than the allowed drift. Throw if not. */
|
|
59
60
|
testEthereumNodeSynced(): Promise<void>;
|
|
60
61
|
syncFromL1(initialSyncComplete: boolean): Promise<void>;
|
|
@@ -73,4 +74,4 @@ export declare class ArchiverL1Synchronizer implements Traceable {
|
|
|
73
74
|
private checkForNewCheckpointsBeforeL1SyncPoint;
|
|
74
75
|
private getCheckpointHeader;
|
|
75
76
|
}
|
|
76
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
77
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibDFfc3luY2hyb25pemVyLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvbW9kdWxlcy9sMV9zeW5jaHJvbml6ZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxLQUFLLEVBQUUsbUJBQW1CLEVBQUUsTUFBTSwyQkFBMkIsQ0FBQztBQUNyRSxPQUFPLEVBQUUsVUFBVSxFQUFFLE1BQU0sb0JBQW9CLENBQUM7QUFDaEQsT0FBTyxFQUFFLGFBQWEsRUFBMkIsY0FBYyxFQUFFLE1BQU0sMkJBQTJCLENBQUM7QUFHbkcsT0FBTyxLQUFLLEVBQUUsZ0JBQWdCLEVBQUUscUJBQXFCLEVBQUUsTUFBTSx1QkFBdUIsQ0FBQztBQUlyRixPQUFPLEVBQVksUUFBUSxFQUFFLE1BQU0sMEJBQTBCLENBQUM7QUFFOUQsT0FBTyxFQUFFLEVBQUUsRUFBRSxNQUFNLGdDQUFnQyxDQUFDO0FBRXBELE9BQU8sRUFBRSxLQUFLLE1BQU0sRUFBZ0IsTUFBTSx1QkFBdUIsQ0FBQztBQUdsRSxPQUFPLEVBQUUsWUFBWSxFQUFrQixNQUFNLHlCQUF5QixDQUFDO0FBRXZFLE9BQU8sRUFBRSxLQUFLLGVBQWUsRUFBc0QsTUFBTSxxQkFBcUIsQ0FBQztBQUUvRyxPQUFPLEVBQUUsS0FBSyxpQkFBaUIsRUFBd0MsTUFBTSw2QkFBNkIsQ0FBQztBQUczRyxPQUFPLEVBQUUsS0FBSyxTQUFTLEVBQUUsS0FBSyxNQUFNLEVBQXlCLE1BQU0seUJBQXlCLENBQUM7QUFZN0YsT0FBTyxFQUFFLEtBQUssa0JBQWtCLEVBQXlCLE1BQU0seUJBQXlCLENBQUM7QUFDekYsT0FBTyxLQUFLLEVBQUUsV0FBVyxFQUFFLE1BQU0sMkJBQTJCLENBQUM7QUFJN0QsT0FBTyxLQUFLLEVBQUUsdUJBQXVCLEVBQUUsTUFBTSxzQkFBc0IsQ0FBQztBQWVwRTs7O0dBR0c7QUFDSCxxQkFBYSxzQkFBdUIsWUFBVyxTQUFTO0lBU3BELE9BQU8sQ0FBQyxRQUFRLENBQUMs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
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"l1_synchronizer.d.ts","sourceRoot":"","sources":["../../src/modules/l1_synchronizer.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,2BAA2B,CAAC;AACrE,OAAO,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAChD,OAAO,EAAE,aAAa,EAA2B,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAGnG,OAAO,KAAK,EAAE,gBAAgB,EAAE,qBAAqB,EAAE,MAAM,uBAAuB,CAAC;AAIrF,OAAO,EAAY,QAAQ,EAAE,MAAM,0BAA0B,CAAC;AAE9D,OAAO,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;
|
|
1
|
+
{"version":3,"file":"l1_synchronizer.d.ts","sourceRoot":"","sources":["../../src/modules/l1_synchronizer.ts"],"names":[],"mappings":"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"}
|