@aztec/archiver 0.0.1-commit.dbf9cec → 0.0.1-commit.ddcf04837
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +12 -6
- package/dest/archiver.d.ts +8 -7
- package/dest/archiver.d.ts.map +1 -1
- package/dest/archiver.js +77 -26
- package/dest/config.d.ts +3 -3
- package/dest/config.d.ts.map +1 -1
- package/dest/config.js +3 -2
- package/dest/errors.d.ts +34 -10
- package/dest/errors.d.ts.map +1 -1
- package/dest/errors.js +45 -16
- package/dest/factory.d.ts +4 -5
- package/dest/factory.d.ts.map +1 -1
- package/dest/factory.js +24 -21
- package/dest/l1/calldata_retriever.d.ts +1 -1
- package/dest/l1/calldata_retriever.d.ts.map +1 -1
- package/dest/l1/calldata_retriever.js +2 -1
- package/dest/l1/data_retrieval.d.ts +3 -3
- package/dest/l1/data_retrieval.d.ts.map +1 -1
- package/dest/l1/data_retrieval.js +14 -15
- package/dest/modules/data_source_base.d.ts +8 -6
- package/dest/modules/data_source_base.d.ts.map +1 -1
- package/dest/modules/data_source_base.js +11 -5
- package/dest/modules/data_store_updater.d.ts +18 -12
- package/dest/modules/data_store_updater.d.ts.map +1 -1
- package/dest/modules/data_store_updater.js +87 -77
- package/dest/modules/instrumentation.d.ts +4 -2
- package/dest/modules/instrumentation.d.ts.map +1 -1
- package/dest/modules/instrumentation.js +17 -6
- package/dest/modules/l1_synchronizer.d.ts +4 -2
- package/dest/modules/l1_synchronizer.d.ts.map +1 -1
- package/dest/modules/l1_synchronizer.js +166 -129
- package/dest/modules/validation.d.ts +1 -1
- package/dest/modules/validation.d.ts.map +1 -1
- package/dest/modules/validation.js +2 -2
- package/dest/store/block_store.d.ts +50 -16
- package/dest/store/block_store.d.ts.map +1 -1
- package/dest/store/block_store.js +290 -121
- package/dest/store/contract_class_store.d.ts +2 -3
- package/dest/store/contract_class_store.d.ts.map +1 -1
- package/dest/store/contract_class_store.js +7 -67
- package/dest/store/contract_instance_store.d.ts +1 -1
- package/dest/store/contract_instance_store.d.ts.map +1 -1
- package/dest/store/contract_instance_store.js +6 -2
- package/dest/store/kv_archiver_store.d.ts +45 -22
- package/dest/store/kv_archiver_store.d.ts.map +1 -1
- package/dest/store/kv_archiver_store.js +57 -27
- package/dest/store/l2_tips_cache.d.ts +2 -1
- package/dest/store/l2_tips_cache.d.ts.map +1 -1
- package/dest/store/l2_tips_cache.js +27 -7
- package/dest/store/log_store.d.ts +6 -3
- package/dest/store/log_store.d.ts.map +1 -1
- package/dest/store/log_store.js +95 -20
- package/dest/store/message_store.d.ts +5 -1
- package/dest/store/message_store.d.ts.map +1 -1
- package/dest/store/message_store.js +21 -9
- package/dest/test/fake_l1_state.d.ts +16 -1
- package/dest/test/fake_l1_state.d.ts.map +1 -1
- package/dest/test/fake_l1_state.js +77 -8
- 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 +10 -4
- package/dest/test/mock_l2_block_source.d.ts.map +1 -1
- package/dest/test/mock_l2_block_source.js +35 -7
- package/dest/test/mock_structs.d.ts +4 -1
- package/dest/test/mock_structs.d.ts.map +1 -1
- package/dest/test/mock_structs.js +13 -1
- package/dest/test/noop_l1_archiver.d.ts +4 -1
- package/dest/test/noop_l1_archiver.d.ts.map +1 -1
- package/dest/test/noop_l1_archiver.js +5 -2
- package/package.json +13 -13
- package/src/archiver.ts +98 -31
- package/src/config.ts +9 -2
- package/src/errors.ts +70 -26
- package/src/factory.ts +23 -15
- package/src/l1/calldata_retriever.ts +2 -1
- package/src/l1/data_retrieval.ts +8 -12
- package/src/modules/data_source_base.ts +26 -7
- package/src/modules/data_store_updater.ts +96 -107
- package/src/modules/instrumentation.ts +19 -7
- package/src/modules/l1_synchronizer.ts +189 -161
- package/src/modules/validation.ts +2 -2
- package/src/store/block_store.ts +371 -141
- package/src/store/contract_class_store.ts +8 -106
- package/src/store/contract_instance_store.ts +8 -5
- package/src/store/kv_archiver_store.ts +81 -39
- package/src/store/l2_tips_cache.ts +58 -13
- package/src/store/log_store.ts +128 -32
- package/src/store/message_store.ts +27 -10
- package/src/structs/inbox_message.ts +1 -1
- package/src/test/fake_l1_state.ts +103 -13
- package/src/test/mock_l1_to_l2_message_source.ts +1 -0
- package/src/test/mock_l2_block_source.ts +52 -5
- package/src/test/mock_structs.ts +20 -6
- package/src/test/noop_l1_archiver.ts +7 -2
package/src/store/log_store.ts
CHANGED
|
@@ -1,7 +1,6 @@
|
|
|
1
1
|
import { INITIAL_L2_BLOCK_NUM } from '@aztec/constants';
|
|
2
2
|
import { BlockNumber } from '@aztec/foundation/branded-types';
|
|
3
|
-
import { filterAsync } from '@aztec/foundation/collection';
|
|
4
|
-
import { Fr } from '@aztec/foundation/curves/bn254';
|
|
3
|
+
import { compactArray, filterAsync } from '@aztec/foundation/collection';
|
|
5
4
|
import { createLogger } from '@aztec/foundation/log';
|
|
6
5
|
import { BufferReader, numToUInt32BE } from '@aztec/foundation/serialize';
|
|
7
6
|
import type { AztecAsyncKVStore, AztecAsyncMap } from '@aztec/kv-store';
|
|
@@ -22,6 +21,7 @@ import {
|
|
|
22
21
|
} from '@aztec/stdlib/logs';
|
|
23
22
|
import { TxHash } from '@aztec/stdlib/tx';
|
|
24
23
|
|
|
24
|
+
import { OutOfOrderLogInsertionError } from '../errors.js';
|
|
25
25
|
import type { BlockStore } from './block_store.js';
|
|
26
26
|
|
|
27
27
|
/**
|
|
@@ -165,10 +165,21 @@ export class LogStore {
|
|
|
165
165
|
|
|
166
166
|
for (const taggedLogBuffer of currentPrivateTaggedLogs) {
|
|
167
167
|
if (taggedLogBuffer.logBuffers && taggedLogBuffer.logBuffers.length > 0) {
|
|
168
|
-
privateTaggedLogs.
|
|
169
|
-
|
|
170
|
-
|
|
171
|
-
|
|
168
|
+
const newLogs = privateTaggedLogs.get(taggedLogBuffer.tag)!;
|
|
169
|
+
if (newLogs.length === 0) {
|
|
170
|
+
continue;
|
|
171
|
+
}
|
|
172
|
+
const lastExisting = TxScopedL2Log.fromBuffer(taggedLogBuffer.logBuffers.at(-1)!);
|
|
173
|
+
const firstNew = TxScopedL2Log.fromBuffer(newLogs[0]);
|
|
174
|
+
if (lastExisting.blockNumber > firstNew.blockNumber) {
|
|
175
|
+
throw new OutOfOrderLogInsertionError(
|
|
176
|
+
'private',
|
|
177
|
+
taggedLogBuffer.tag,
|
|
178
|
+
lastExisting.blockNumber,
|
|
179
|
+
firstNew.blockNumber,
|
|
180
|
+
);
|
|
181
|
+
}
|
|
182
|
+
privateTaggedLogs.set(taggedLogBuffer.tag, taggedLogBuffer.logBuffers.concat(newLogs));
|
|
172
183
|
}
|
|
173
184
|
}
|
|
174
185
|
|
|
@@ -200,10 +211,21 @@ export class LogStore {
|
|
|
200
211
|
|
|
201
212
|
for (const taggedLogBuffer of currentPublicTaggedLogs) {
|
|
202
213
|
if (taggedLogBuffer.logBuffers && taggedLogBuffer.logBuffers.length > 0) {
|
|
203
|
-
publicTaggedLogs.
|
|
204
|
-
|
|
205
|
-
|
|
206
|
-
|
|
214
|
+
const newLogs = publicTaggedLogs.get(taggedLogBuffer.tag)!;
|
|
215
|
+
if (newLogs.length === 0) {
|
|
216
|
+
continue;
|
|
217
|
+
}
|
|
218
|
+
const lastExisting = TxScopedL2Log.fromBuffer(taggedLogBuffer.logBuffers.at(-1)!);
|
|
219
|
+
const firstNew = TxScopedL2Log.fromBuffer(newLogs[0]);
|
|
220
|
+
if (lastExisting.blockNumber > firstNew.blockNumber) {
|
|
221
|
+
throw new OutOfOrderLogInsertionError(
|
|
222
|
+
'public',
|
|
223
|
+
taggedLogBuffer.tag,
|
|
224
|
+
lastExisting.blockNumber,
|
|
225
|
+
firstNew.blockNumber,
|
|
226
|
+
);
|
|
227
|
+
}
|
|
228
|
+
publicTaggedLogs.set(taggedLogBuffer.tag, taggedLogBuffer.logBuffers.concat(newLogs));
|
|
207
229
|
}
|
|
208
230
|
}
|
|
209
231
|
|
|
@@ -279,29 +301,58 @@ export class LogStore {
|
|
|
279
301
|
}
|
|
280
302
|
|
|
281
303
|
#unpackBlockHash(reader: BufferReader): BlockHash {
|
|
282
|
-
|
|
283
|
-
|
|
284
|
-
if (!blockHash) {
|
|
304
|
+
if (reader.remainingBytes() === 0) {
|
|
285
305
|
throw new Error('Failed to read block hash from log entry buffer');
|
|
286
306
|
}
|
|
287
307
|
|
|
288
|
-
return
|
|
308
|
+
return BlockHash.fromBuffer(reader);
|
|
289
309
|
}
|
|
290
310
|
|
|
291
311
|
deleteLogs(blocks: L2Block[]): Promise<boolean> {
|
|
292
312
|
return this.db.transactionAsync(async () => {
|
|
293
|
-
|
|
294
|
-
|
|
295
|
-
|
|
296
|
-
|
|
297
|
-
|
|
298
|
-
|
|
299
|
-
|
|
300
|
-
|
|
301
|
-
|
|
302
|
-
|
|
313
|
+
const blockNumbers = new Set(blocks.map(block => block.number));
|
|
314
|
+
const firstBlockToDelete = Math.min(...blockNumbers);
|
|
315
|
+
|
|
316
|
+
// Collect all unique private tags across all blocks being deleted
|
|
317
|
+
const allPrivateTags = new Set(
|
|
318
|
+
compactArray(await Promise.all(blocks.map(block => this.#privateLogKeysByBlock.getAsync(block.number)))).flat(),
|
|
319
|
+
);
|
|
320
|
+
|
|
321
|
+
// Trim private logs: for each tag, delete all instances including and after the first block being deleted.
|
|
322
|
+
// This hinges on the invariant that logs for a given tag are always inserted in order of block number, which is enforced in #addPrivateLogs.
|
|
323
|
+
for (const tag of allPrivateTags) {
|
|
324
|
+
const existing = await this.#privateLogsByTag.getAsync(tag);
|
|
325
|
+
if (existing === undefined || existing.length === 0) {
|
|
326
|
+
continue;
|
|
327
|
+
}
|
|
328
|
+
const lastIndexToKeep = existing.findLastIndex(
|
|
329
|
+
buf => TxScopedL2Log.getBlockNumberFromBuffer(buf) < firstBlockToDelete,
|
|
330
|
+
);
|
|
331
|
+
const remaining = existing.slice(0, lastIndexToKeep + 1);
|
|
332
|
+
await (remaining.length > 0 ? this.#privateLogsByTag.set(tag, remaining) : this.#privateLogsByTag.delete(tag));
|
|
333
|
+
}
|
|
334
|
+
|
|
335
|
+
// Collect all unique public keys across all blocks being deleted
|
|
336
|
+
const allPublicKeys = new Set(
|
|
337
|
+
compactArray(await Promise.all(blocks.map(block => this.#publicLogKeysByBlock.getAsync(block.number)))).flat(),
|
|
303
338
|
);
|
|
304
339
|
|
|
340
|
+
// And do the same as we did with private logs
|
|
341
|
+
for (const key of allPublicKeys) {
|
|
342
|
+
const existing = await this.#publicLogsByContractAndTag.getAsync(key);
|
|
343
|
+
if (existing === undefined || existing.length === 0) {
|
|
344
|
+
continue;
|
|
345
|
+
}
|
|
346
|
+
const lastIndexToKeep = existing.findLastIndex(
|
|
347
|
+
buf => TxScopedL2Log.getBlockNumberFromBuffer(buf) < firstBlockToDelete,
|
|
348
|
+
);
|
|
349
|
+
const remaining = existing.slice(0, lastIndexToKeep + 1);
|
|
350
|
+
await (remaining.length > 0
|
|
351
|
+
? this.#publicLogsByContractAndTag.set(key, remaining)
|
|
352
|
+
: this.#publicLogsByContractAndTag.delete(key));
|
|
353
|
+
}
|
|
354
|
+
|
|
355
|
+
// After trimming the tagged logs, we can delete the block-level keys that track which tags are in which blocks.
|
|
305
356
|
await Promise.all(
|
|
306
357
|
blocks.map(block =>
|
|
307
358
|
Promise.all([
|
|
@@ -322,17 +373,30 @@ export class LogStore {
|
|
|
322
373
|
* array implies no logs match that tag.
|
|
323
374
|
* @param tags - The tags to search for.
|
|
324
375
|
* @param page - The page number (0-indexed) for pagination.
|
|
376
|
+
* @param upToBlockNumber - If set, only return logs from blocks up to and including this block number.
|
|
325
377
|
* @returns An array of log arrays, one per tag. Returns at most MAX_LOGS_PER_TAG logs per tag per page. If
|
|
326
378
|
* MAX_LOGS_PER_TAG logs are returned for a tag, the caller should fetch the next page to check for more logs.
|
|
327
379
|
*/
|
|
328
|
-
async getPrivateLogsByTags(
|
|
380
|
+
async getPrivateLogsByTags(
|
|
381
|
+
tags: SiloedTag[],
|
|
382
|
+
page: number = 0,
|
|
383
|
+
upToBlockNumber?: BlockNumber,
|
|
384
|
+
): Promise<TxScopedL2Log[][]> {
|
|
329
385
|
const logs = await Promise.all(tags.map(tag => this.#privateLogsByTag.getAsync(tag.toString())));
|
|
386
|
+
|
|
330
387
|
const start = page * MAX_LOGS_PER_TAG;
|
|
331
388
|
const end = start + MAX_LOGS_PER_TAG;
|
|
332
389
|
|
|
333
|
-
return logs.map(
|
|
334
|
-
|
|
335
|
-
|
|
390
|
+
return logs.map(logBuffers => {
|
|
391
|
+
const deserialized = logBuffers?.slice(start, end).map(buf => TxScopedL2Log.fromBuffer(buf)) ?? [];
|
|
392
|
+
if (upToBlockNumber !== undefined) {
|
|
393
|
+
const cutoff = deserialized.findIndex(log => log.blockNumber > upToBlockNumber);
|
|
394
|
+
if (cutoff !== -1) {
|
|
395
|
+
return deserialized.slice(0, cutoff);
|
|
396
|
+
}
|
|
397
|
+
}
|
|
398
|
+
return deserialized;
|
|
399
|
+
});
|
|
336
400
|
}
|
|
337
401
|
|
|
338
402
|
/**
|
|
@@ -341,6 +405,7 @@ export class LogStore {
|
|
|
341
405
|
* @param contractAddress - The contract address to search logs for.
|
|
342
406
|
* @param tags - The tags to search for.
|
|
343
407
|
* @param page - The page number (0-indexed) for pagination.
|
|
408
|
+
* @param upToBlockNumber - If set, only return logs from blocks up to and including this block number.
|
|
344
409
|
* @returns An array of log arrays, one per tag. Returns at most MAX_LOGS_PER_TAG logs per tag per page. If
|
|
345
410
|
* MAX_LOGS_PER_TAG logs are returned for a tag, the caller should fetch the next page to check for more logs.
|
|
346
411
|
*/
|
|
@@ -348,6 +413,7 @@ export class LogStore {
|
|
|
348
413
|
contractAddress: AztecAddress,
|
|
349
414
|
tags: Tag[],
|
|
350
415
|
page: number = 0,
|
|
416
|
+
upToBlockNumber?: BlockNumber,
|
|
351
417
|
): Promise<TxScopedL2Log[][]> {
|
|
352
418
|
const logs = await Promise.all(
|
|
353
419
|
tags.map(tag => {
|
|
@@ -358,9 +424,16 @@ export class LogStore {
|
|
|
358
424
|
const start = page * MAX_LOGS_PER_TAG;
|
|
359
425
|
const end = start + MAX_LOGS_PER_TAG;
|
|
360
426
|
|
|
361
|
-
return logs.map(
|
|
362
|
-
|
|
363
|
-
|
|
427
|
+
return logs.map(logBuffers => {
|
|
428
|
+
const deserialized = logBuffers?.slice(start, end).map(buf => TxScopedL2Log.fromBuffer(buf)) ?? [];
|
|
429
|
+
if (upToBlockNumber !== undefined) {
|
|
430
|
+
const cutoff = deserialized.findIndex(log => log.blockNumber > upToBlockNumber);
|
|
431
|
+
if (cutoff !== -1) {
|
|
432
|
+
return deserialized.slice(0, cutoff);
|
|
433
|
+
}
|
|
434
|
+
}
|
|
435
|
+
return deserialized;
|
|
436
|
+
});
|
|
364
437
|
}
|
|
365
438
|
|
|
366
439
|
/**
|
|
@@ -588,11 +661,24 @@ export class LogStore {
|
|
|
588
661
|
txLogs: PublicLog[],
|
|
589
662
|
filter: LogFilter = {},
|
|
590
663
|
): boolean {
|
|
664
|
+
if (filter.fromBlock && blockNumber < filter.fromBlock) {
|
|
665
|
+
return false;
|
|
666
|
+
}
|
|
667
|
+
if (filter.toBlock && blockNumber >= filter.toBlock) {
|
|
668
|
+
return false;
|
|
669
|
+
}
|
|
670
|
+
if (filter.txHash && !txHash.equals(filter.txHash)) {
|
|
671
|
+
return false;
|
|
672
|
+
}
|
|
673
|
+
|
|
591
674
|
let maxLogsHit = false;
|
|
592
675
|
let logIndex = typeof filter.afterLog?.logIndex === 'number' ? filter.afterLog.logIndex + 1 : 0;
|
|
593
676
|
for (; logIndex < txLogs.length; logIndex++) {
|
|
594
677
|
const log = txLogs[logIndex];
|
|
595
|
-
if (
|
|
678
|
+
if (
|
|
679
|
+
(!filter.contractAddress || log.contractAddress.equals(filter.contractAddress)) &&
|
|
680
|
+
(!filter.tag || log.fields[0]?.equals(filter.tag))
|
|
681
|
+
) {
|
|
596
682
|
results.push(
|
|
597
683
|
new ExtendedPublicLog(new LogId(BlockNumber(blockNumber), blockHash, txHash, txIndex, logIndex), log),
|
|
598
684
|
);
|
|
@@ -616,6 +702,16 @@ export class LogStore {
|
|
|
616
702
|
txLogs: ContractClassLog[],
|
|
617
703
|
filter: LogFilter = {},
|
|
618
704
|
): boolean {
|
|
705
|
+
if (filter.fromBlock && blockNumber < filter.fromBlock) {
|
|
706
|
+
return false;
|
|
707
|
+
}
|
|
708
|
+
if (filter.toBlock && blockNumber >= filter.toBlock) {
|
|
709
|
+
return false;
|
|
710
|
+
}
|
|
711
|
+
if (filter.txHash && !txHash.equals(filter.txHash)) {
|
|
712
|
+
return false;
|
|
713
|
+
}
|
|
714
|
+
|
|
619
715
|
let maxLogsHit = false;
|
|
620
716
|
let logIndex = typeof filter.afterLog?.logIndex === 'number' ? filter.afterLog.logIndex + 1 : 0;
|
|
621
717
|
for (; logIndex < txLogs.length; logIndex++) {
|
|
@@ -14,6 +14,7 @@ import {
|
|
|
14
14
|
} from '@aztec/kv-store';
|
|
15
15
|
import { InboxLeaf } from '@aztec/stdlib/messaging';
|
|
16
16
|
|
|
17
|
+
import { L1ToL2MessagesNotReadyError } from '../errors.js';
|
|
17
18
|
import {
|
|
18
19
|
type InboxMessage,
|
|
19
20
|
deserializeInboxMessage,
|
|
@@ -40,6 +41,8 @@ export class MessageStore {
|
|
|
40
41
|
#lastSynchedL1Block: AztecAsyncSingleton<Buffer>;
|
|
41
42
|
/** Stores total messages stored */
|
|
42
43
|
#totalMessageCount: AztecAsyncSingleton<bigint>;
|
|
44
|
+
/** Stores the checkpoint number whose message tree is currently being filled on L1. */
|
|
45
|
+
#inboxTreeInProgress: AztecAsyncSingleton<bigint>;
|
|
43
46
|
|
|
44
47
|
#log = createLogger('archiver:message_store');
|
|
45
48
|
|
|
@@ -48,6 +51,7 @@ export class MessageStore {
|
|
|
48
51
|
this.#l1ToL2MessageIndices = db.openMap('archiver_l1_to_l2_message_indices');
|
|
49
52
|
this.#lastSynchedL1Block = db.openSingleton('archiver_last_l1_block_id');
|
|
50
53
|
this.#totalMessageCount = db.openSingleton('archiver_l1_to_l2_message_count');
|
|
54
|
+
this.#inboxTreeInProgress = db.openSingleton('archiver_inbox_tree_in_progress');
|
|
51
55
|
}
|
|
52
56
|
|
|
53
57
|
public async getTotalL1ToL2MessageCount(): Promise<bigint> {
|
|
@@ -137,7 +141,7 @@ export class MessageStore {
|
|
|
137
141
|
);
|
|
138
142
|
}
|
|
139
143
|
|
|
140
|
-
// Check the first message in a
|
|
144
|
+
// Check the first message in a checkpoint has the correct index.
|
|
141
145
|
if (
|
|
142
146
|
(!lastMessage || message.checkpointNumber > lastMessage.checkpointNumber) &&
|
|
143
147
|
message.index !== expectedStart
|
|
@@ -157,15 +161,6 @@ export class MessageStore {
|
|
|
157
161
|
lastMessage = message;
|
|
158
162
|
}
|
|
159
163
|
|
|
160
|
-
// Update the L1 sync point to that of the last message added.
|
|
161
|
-
const currentSyncPoint = await this.getSynchedL1Block();
|
|
162
|
-
if (!currentSyncPoint || currentSyncPoint.l1BlockNumber < lastMessage!.l1BlockNumber) {
|
|
163
|
-
await this.setSynchedL1Block({
|
|
164
|
-
l1BlockNumber: lastMessage!.l1BlockNumber,
|
|
165
|
-
l1BlockHash: lastMessage!.l1BlockHash,
|
|
166
|
-
});
|
|
167
|
-
}
|
|
168
|
-
|
|
169
164
|
// Update total message count with the number of inserted messages.
|
|
170
165
|
await this.increaseTotalMessageCount(messageCount);
|
|
171
166
|
});
|
|
@@ -185,7 +180,29 @@ export class MessageStore {
|
|
|
185
180
|
return msg ? deserializeInboxMessage(msg) : undefined;
|
|
186
181
|
}
|
|
187
182
|
|
|
183
|
+
/** Returns the inbox tree-in-progress checkpoint number from L1, or undefined if not yet set. */
|
|
184
|
+
public getInboxTreeInProgress(): Promise<bigint | undefined> {
|
|
185
|
+
return this.#inboxTreeInProgress.getAsync();
|
|
186
|
+
}
|
|
187
|
+
|
|
188
|
+
/** Atomically updates the message sync state: the L1 sync point and the inbox tree-in-progress marker. */
|
|
189
|
+
public setMessageSyncState(l1Block: L1BlockId, treeInProgress: bigint | undefined): Promise<void> {
|
|
190
|
+
return this.db.transactionAsync(async () => {
|
|
191
|
+
await this.setSynchedL1Block(l1Block);
|
|
192
|
+
if (treeInProgress !== undefined) {
|
|
193
|
+
await this.#inboxTreeInProgress.set(treeInProgress);
|
|
194
|
+
} else {
|
|
195
|
+
await this.#inboxTreeInProgress.delete();
|
|
196
|
+
}
|
|
197
|
+
});
|
|
198
|
+
}
|
|
199
|
+
|
|
188
200
|
public async getL1ToL2Messages(checkpointNumber: CheckpointNumber): Promise<Fr[]> {
|
|
201
|
+
const treeInProgress = await this.#inboxTreeInProgress.getAsync();
|
|
202
|
+
if (treeInProgress !== undefined && BigInt(checkpointNumber) >= treeInProgress) {
|
|
203
|
+
throw new L1ToL2MessagesNotReadyError(checkpointNumber, treeInProgress);
|
|
204
|
+
}
|
|
205
|
+
|
|
189
206
|
const messages: Fr[] = [];
|
|
190
207
|
|
|
191
208
|
const [startIndex, endIndex] = InboxLeaf.indexRangeForCheckpoint(checkpointNumber);
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import type { BlobClientInterface } from '@aztec/blob-client/client';
|
|
2
2
|
import { type Blob, getBlobsPerL1Block, getPrefixedEthBlobCommitments } from '@aztec/blob-lib';
|
|
3
|
+
import { INITIAL_CHECKPOINT_NUMBER } from '@aztec/constants';
|
|
3
4
|
import type { CheckpointProposedLog, InboxContract, MessageSentLog, RollupContract } from '@aztec/ethereum/contracts';
|
|
4
5
|
import { MULTI_CALL_3_ADDRESS } from '@aztec/ethereum/contracts';
|
|
5
6
|
import type { ViemPublicClient } from '@aztec/ethereum/types';
|
|
@@ -150,8 +151,12 @@ export class FakeL1State {
|
|
|
150
151
|
// Computed from checkpoints based on L1 block visibility
|
|
151
152
|
private pendingCheckpointNumber: CheckpointNumber = CheckpointNumber(0);
|
|
152
153
|
|
|
154
|
+
// The L1 block number reported as "finalized" (defaults to the start block)
|
|
155
|
+
private finalizedL1BlockNumber: bigint;
|
|
156
|
+
|
|
153
157
|
constructor(private readonly config: FakeL1StateConfig) {
|
|
154
158
|
this.l1BlockNumber = config.l1StartBlock;
|
|
159
|
+
this.finalizedL1BlockNumber = config.l1StartBlock;
|
|
155
160
|
this.lastArchive = new AppendOnlyTreeSnapshot(config.genesisArchiveRoot, 1);
|
|
156
161
|
}
|
|
157
162
|
|
|
@@ -283,11 +288,30 @@ export class FakeL1State {
|
|
|
283
288
|
this.updatePendingCheckpointNumber();
|
|
284
289
|
}
|
|
285
290
|
|
|
291
|
+
/** Sets the L1 block number that will be reported as "finalized". */
|
|
292
|
+
setFinalizedL1BlockNumber(blockNumber: bigint): void {
|
|
293
|
+
this.finalizedL1BlockNumber = blockNumber;
|
|
294
|
+
}
|
|
295
|
+
|
|
286
296
|
/** Marks a checkpoint as proven. Updates provenCheckpointNumber. */
|
|
287
297
|
markCheckpointAsProven(checkpointNumber: CheckpointNumber): void {
|
|
288
298
|
this.provenCheckpointNumber = checkpointNumber;
|
|
289
299
|
}
|
|
290
300
|
|
|
301
|
+
/**
|
|
302
|
+
* Simulates what `rollup.getProvenCheckpointNumber({ blockNumber: atL1Block })` would return.
|
|
303
|
+
*/
|
|
304
|
+
getProvenCheckpointNumberAtL1Block(atL1Block: bigint): CheckpointNumber {
|
|
305
|
+
if (this.provenCheckpointNumber === 0) {
|
|
306
|
+
return CheckpointNumber(0);
|
|
307
|
+
}
|
|
308
|
+
const checkpoint = this.checkpoints.find(cp => cp.checkpointNumber === this.provenCheckpointNumber);
|
|
309
|
+
if (checkpoint && checkpoint.l1BlockNumber <= atL1Block) {
|
|
310
|
+
return this.provenCheckpointNumber;
|
|
311
|
+
}
|
|
312
|
+
return CheckpointNumber(0);
|
|
313
|
+
}
|
|
314
|
+
|
|
291
315
|
/** Sets the target committee size for attestation validation. */
|
|
292
316
|
setTargetCommitteeSize(size: number): void {
|
|
293
317
|
this.targetCommitteeSize = size;
|
|
@@ -308,6 +332,21 @@ export class FakeL1State {
|
|
|
308
332
|
this.updatePendingCheckpointNumber();
|
|
309
333
|
}
|
|
310
334
|
|
|
335
|
+
/**
|
|
336
|
+
* Moves a checkpoint to a different L1 block number (simulates L1 reorg that
|
|
337
|
+
* re-includes the same checkpoint transaction in a different block).
|
|
338
|
+
* The checkpoint content stays the same — only the L1 metadata changes.
|
|
339
|
+
* Auto-updates pending status.
|
|
340
|
+
*/
|
|
341
|
+
moveCheckpointToL1Block(checkpointNumber: CheckpointNumber, newL1BlockNumber: bigint): void {
|
|
342
|
+
for (const cpData of this.checkpoints) {
|
|
343
|
+
if (cpData.checkpointNumber === checkpointNumber) {
|
|
344
|
+
cpData.l1BlockNumber = newL1BlockNumber;
|
|
345
|
+
}
|
|
346
|
+
}
|
|
347
|
+
this.updatePendingCheckpointNumber();
|
|
348
|
+
}
|
|
349
|
+
|
|
311
350
|
/**
|
|
312
351
|
* Removes messages after a given total index (simulates L1 reorg).
|
|
313
352
|
* Auto-updates rolling hash.
|
|
@@ -406,6 +445,11 @@ export class FakeL1State {
|
|
|
406
445
|
});
|
|
407
446
|
});
|
|
408
447
|
|
|
448
|
+
mockRollup.getProvenCheckpointNumber.mockImplementation((options?: { blockNumber?: bigint }) => {
|
|
449
|
+
const atBlock = options?.blockNumber ?? this.l1BlockNumber;
|
|
450
|
+
return Promise.resolve(this.getProvenCheckpointNumberAtL1Block(atBlock));
|
|
451
|
+
});
|
|
452
|
+
|
|
409
453
|
mockRollup.canPruneAtTime.mockImplementation(() => Promise.resolve(this.canPruneResult));
|
|
410
454
|
|
|
411
455
|
// Mock the wrapper method for fetching checkpoint events
|
|
@@ -422,21 +466,44 @@ export class FakeL1State {
|
|
|
422
466
|
createMockInboxContract(_publicClient: MockProxy<ViemPublicClient>): MockProxy<InboxContract> {
|
|
423
467
|
const mockInbox = mock<InboxContract>();
|
|
424
468
|
|
|
425
|
-
mockInbox.getState.mockImplementation(() =>
|
|
426
|
-
|
|
427
|
-
|
|
428
|
-
|
|
429
|
-
|
|
430
|
-
|
|
431
|
-
|
|
469
|
+
mockInbox.getState.mockImplementation((opts: { blockTag?: string; blockNumber?: bigint } = {}) => {
|
|
470
|
+
// Filter messages visible at the given block number (or all if not specified)
|
|
471
|
+
const blockNumber = opts.blockNumber ?? this.l1BlockNumber;
|
|
472
|
+
const visibleMessages = this.messages.filter(m => m.l1BlockNumber <= blockNumber);
|
|
473
|
+
|
|
474
|
+
// treeInProgress must be > any sealed checkpoint. On L1, a checkpoint can only be proposed
|
|
475
|
+
// after its messages are sealed, so treeInProgress > checkpointNumber for all published checkpoints.
|
|
476
|
+
const maxFromMessages =
|
|
477
|
+
visibleMessages.length > 0 ? Math.max(...visibleMessages.map(m => Number(m.checkpointNumber))) + 1 : 0;
|
|
478
|
+
const maxFromCheckpoints =
|
|
479
|
+
this.checkpoints.length > 0
|
|
480
|
+
? Math.max(
|
|
481
|
+
...this.checkpoints
|
|
482
|
+
.filter(cp => !cp.pruned && cp.l1BlockNumber <= blockNumber)
|
|
483
|
+
.map(cp => Number(cp.checkpointNumber)),
|
|
484
|
+
0,
|
|
485
|
+
) + 1
|
|
486
|
+
: 0;
|
|
487
|
+
const treeInProgress = Math.max(maxFromMessages, maxFromCheckpoints, INITIAL_CHECKPOINT_NUMBER);
|
|
488
|
+
|
|
489
|
+
// Compute rolling hash only for visible messages
|
|
490
|
+
const rollingHash =
|
|
491
|
+
visibleMessages.length > 0 ? visibleMessages[visibleMessages.length - 1].rollingHash : Buffer16.ZERO;
|
|
492
|
+
|
|
493
|
+
return Promise.resolve({
|
|
494
|
+
messagesRollingHash: rollingHash,
|
|
495
|
+
totalMessagesInserted: BigInt(visibleMessages.length),
|
|
496
|
+
treeInProgress: BigInt(treeInProgress),
|
|
497
|
+
});
|
|
498
|
+
});
|
|
432
499
|
|
|
433
500
|
// Mock the wrapper methods for fetching message events
|
|
434
501
|
mockInbox.getMessageSentEvents.mockImplementation((fromBlock: bigint, toBlock: bigint) =>
|
|
435
502
|
Promise.resolve(this.getMessageSentLogs(fromBlock, toBlock)),
|
|
436
503
|
);
|
|
437
504
|
|
|
438
|
-
mockInbox.getMessageSentEventByHash.mockImplementation((
|
|
439
|
-
Promise.resolve(this.
|
|
505
|
+
mockInbox.getMessageSentEventByHash.mockImplementation((msgHash: string, l1BlockHash: string) =>
|
|
506
|
+
Promise.resolve(this.getMessageSentLogByHash(msgHash, l1BlockHash) as MessageSentLog),
|
|
440
507
|
);
|
|
441
508
|
|
|
442
509
|
return mockInbox;
|
|
@@ -449,10 +516,13 @@ export class FakeL1State {
|
|
|
449
516
|
publicClient.getChainId.mockResolvedValue(1);
|
|
450
517
|
publicClient.getBlockNumber.mockImplementation(() => Promise.resolve(this.l1BlockNumber));
|
|
451
518
|
|
|
452
|
-
|
|
453
|
-
|
|
454
|
-
|
|
455
|
-
|
|
519
|
+
publicClient.getBlock.mockImplementation((async (args: { blockNumber?: bigint; blockTag?: string } = {}) => {
|
|
520
|
+
let blockNum: bigint;
|
|
521
|
+
if (args.blockTag === 'finalized') {
|
|
522
|
+
blockNum = this.finalizedL1BlockNumber;
|
|
523
|
+
} else {
|
|
524
|
+
blockNum = args.blockNumber ?? (await publicClient.getBlockNumber());
|
|
525
|
+
}
|
|
456
526
|
return {
|
|
457
527
|
number: blockNum,
|
|
458
528
|
timestamp: BigInt(blockNum) * BigInt(this.config.ethereumSlotDuration) + this.config.l1GenesisTime,
|
|
@@ -553,6 +623,26 @@ export class FakeL1State {
|
|
|
553
623
|
}));
|
|
554
624
|
}
|
|
555
625
|
|
|
626
|
+
private getMessageSentLogByHash(msgHash: string, l1BlockHash: string): MessageSentLog | undefined {
|
|
627
|
+
const msg = this.messages.find(
|
|
628
|
+
msg => msg.leaf.toString() === msgHash && Buffer32.fromBigInt(msg.l1BlockNumber).toString() === l1BlockHash,
|
|
629
|
+
);
|
|
630
|
+
if (!msg) {
|
|
631
|
+
return undefined;
|
|
632
|
+
}
|
|
633
|
+
return {
|
|
634
|
+
l1BlockNumber: msg.l1BlockNumber,
|
|
635
|
+
l1BlockHash: Buffer32.fromBigInt(msg.l1BlockNumber),
|
|
636
|
+
l1TransactionHash: `0x${msg.l1BlockNumber.toString(16)}` as `0x${string}`,
|
|
637
|
+
args: {
|
|
638
|
+
checkpointNumber: msg.checkpointNumber,
|
|
639
|
+
index: msg.index,
|
|
640
|
+
leaf: msg.leaf,
|
|
641
|
+
rollingHash: msg.rollingHash,
|
|
642
|
+
},
|
|
643
|
+
};
|
|
644
|
+
}
|
|
645
|
+
|
|
556
646
|
private async makeRollupTx(
|
|
557
647
|
checkpoint: Checkpoint,
|
|
558
648
|
signers: Secp256k1Signer[],
|