@aztec/archiver 0.0.1-commit.e6bd8901 → 0.0.1-commit.ec7ac5448

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.
Files changed (116) hide show
  1. package/README.md +12 -6
  2. package/dest/archiver.d.ts +14 -9
  3. package/dest/archiver.d.ts.map +1 -1
  4. package/dest/archiver.js +97 -115
  5. package/dest/config.d.ts +3 -3
  6. package/dest/config.d.ts.map +1 -1
  7. package/dest/config.js +2 -1
  8. package/dest/errors.d.ts +34 -10
  9. package/dest/errors.d.ts.map +1 -1
  10. package/dest/errors.js +45 -16
  11. package/dest/factory.d.ts +5 -4
  12. package/dest/factory.d.ts.map +1 -1
  13. package/dest/factory.js +32 -28
  14. package/dest/index.d.ts +2 -1
  15. package/dest/index.d.ts.map +1 -1
  16. package/dest/index.js +1 -0
  17. package/dest/l1/bin/retrieve-calldata.js +36 -33
  18. package/dest/l1/calldata_retriever.d.ts +73 -50
  19. package/dest/l1/calldata_retriever.d.ts.map +1 -1
  20. package/dest/l1/calldata_retriever.js +191 -259
  21. package/dest/l1/data_retrieval.d.ts +11 -11
  22. package/dest/l1/data_retrieval.d.ts.map +1 -1
  23. package/dest/l1/data_retrieval.js +36 -35
  24. package/dest/l1/spire_proposer.d.ts +5 -5
  25. package/dest/l1/spire_proposer.d.ts.map +1 -1
  26. package/dest/l1/spire_proposer.js +9 -17
  27. package/dest/l1/validate_trace.d.ts +6 -3
  28. package/dest/l1/validate_trace.d.ts.map +1 -1
  29. package/dest/l1/validate_trace.js +13 -9
  30. package/dest/modules/data_source_base.d.ts +17 -10
  31. package/dest/modules/data_source_base.d.ts.map +1 -1
  32. package/dest/modules/data_source_base.js +39 -77
  33. package/dest/modules/data_store_updater.d.ts +25 -12
  34. package/dest/modules/data_store_updater.d.ts.map +1 -1
  35. package/dest/modules/data_store_updater.js +125 -94
  36. package/dest/modules/instrumentation.d.ts +18 -3
  37. package/dest/modules/instrumentation.d.ts.map +1 -1
  38. package/dest/modules/instrumentation.js +53 -18
  39. package/dest/modules/l1_synchronizer.d.ts +7 -9
  40. package/dest/modules/l1_synchronizer.d.ts.map +1 -1
  41. package/dest/modules/l1_synchronizer.js +180 -139
  42. package/dest/modules/validation.d.ts +1 -1
  43. package/dest/modules/validation.d.ts.map +1 -1
  44. package/dest/modules/validation.js +2 -2
  45. package/dest/store/block_store.d.ts +69 -31
  46. package/dest/store/block_store.d.ts.map +1 -1
  47. package/dest/store/block_store.js +358 -137
  48. package/dest/store/contract_class_store.d.ts +2 -3
  49. package/dest/store/contract_class_store.d.ts.map +1 -1
  50. package/dest/store/contract_class_store.js +16 -72
  51. package/dest/store/contract_instance_store.d.ts +1 -1
  52. package/dest/store/contract_instance_store.d.ts.map +1 -1
  53. package/dest/store/contract_instance_store.js +6 -2
  54. package/dest/store/kv_archiver_store.d.ts +64 -27
  55. package/dest/store/kv_archiver_store.d.ts.map +1 -1
  56. package/dest/store/kv_archiver_store.js +77 -30
  57. package/dest/store/l2_tips_cache.d.ts +20 -0
  58. package/dest/store/l2_tips_cache.d.ts.map +1 -0
  59. package/dest/store/l2_tips_cache.js +109 -0
  60. package/dest/store/log_store.d.ts +6 -3
  61. package/dest/store/log_store.d.ts.map +1 -1
  62. package/dest/store/log_store.js +150 -53
  63. package/dest/store/message_store.d.ts +5 -1
  64. package/dest/store/message_store.d.ts.map +1 -1
  65. package/dest/store/message_store.js +21 -9
  66. package/dest/test/fake_l1_state.d.ts +21 -1
  67. package/dest/test/fake_l1_state.d.ts.map +1 -1
  68. package/dest/test/fake_l1_state.js +133 -26
  69. package/dest/test/index.js +3 -1
  70. package/dest/test/mock_archiver.d.ts +1 -1
  71. package/dest/test/mock_archiver.d.ts.map +1 -1
  72. package/dest/test/mock_archiver.js +3 -2
  73. package/dest/test/mock_l1_to_l2_message_source.d.ts +1 -1
  74. package/dest/test/mock_l1_to_l2_message_source.d.ts.map +1 -1
  75. package/dest/test/mock_l1_to_l2_message_source.js +2 -1
  76. package/dest/test/mock_l2_block_source.d.ts +30 -9
  77. package/dest/test/mock_l2_block_source.d.ts.map +1 -1
  78. package/dest/test/mock_l2_block_source.js +161 -90
  79. package/dest/test/mock_structs.d.ts +6 -2
  80. package/dest/test/mock_structs.d.ts.map +1 -1
  81. package/dest/test/mock_structs.js +20 -6
  82. package/dest/test/noop_l1_archiver.d.ts +26 -0
  83. package/dest/test/noop_l1_archiver.d.ts.map +1 -0
  84. package/dest/test/noop_l1_archiver.js +71 -0
  85. package/package.json +14 -13
  86. package/src/archiver.ts +128 -141
  87. package/src/config.ts +8 -1
  88. package/src/errors.ts +70 -26
  89. package/src/factory.ts +48 -26
  90. package/src/index.ts +1 -0
  91. package/src/l1/README.md +25 -68
  92. package/src/l1/bin/retrieve-calldata.ts +46 -39
  93. package/src/l1/calldata_retriever.ts +250 -379
  94. package/src/l1/data_retrieval.ts +32 -38
  95. package/src/l1/spire_proposer.ts +7 -15
  96. package/src/l1/validate_trace.ts +24 -6
  97. package/src/modules/data_source_base.ts +81 -101
  98. package/src/modules/data_store_updater.ts +138 -124
  99. package/src/modules/instrumentation.ts +63 -19
  100. package/src/modules/l1_synchronizer.ts +204 -174
  101. package/src/modules/validation.ts +2 -2
  102. package/src/store/block_store.ts +456 -177
  103. package/src/store/contract_class_store.ts +16 -110
  104. package/src/store/contract_instance_store.ts +8 -5
  105. package/src/store/kv_archiver_store.ts +120 -46
  106. package/src/store/l2_tips_cache.ts +128 -0
  107. package/src/store/log_store.ts +224 -63
  108. package/src/store/message_store.ts +27 -10
  109. package/src/structs/inbox_message.ts +1 -1
  110. package/src/test/fake_l1_state.ts +178 -30
  111. package/src/test/index.ts +3 -0
  112. package/src/test/mock_archiver.ts +3 -2
  113. package/src/test/mock_l1_to_l2_message_source.ts +1 -0
  114. package/src/test/mock_l2_block_source.ts +215 -88
  115. package/src/test/mock_structs.ts +42 -12
  116. package/src/test/noop_l1_archiver.ts +114 -0
@@ -1,14 +1,13 @@
1
1
  import { toArray } from '@aztec/foundation/iterable';
2
2
  import { createLogger } from '@aztec/foundation/log';
3
3
  import { FunctionSelector } from '@aztec/stdlib/abi';
4
- import { L2BlockHash } from '@aztec/stdlib/block';
5
4
  import { join } from 'path';
6
5
  import { BlockStore } from './block_store.js';
7
6
  import { ContractClassStore } from './contract_class_store.js';
8
7
  import { ContractInstanceStore } from './contract_instance_store.js';
9
8
  import { LogStore } from './log_store.js';
10
9
  import { MessageStore } from './message_store.js';
11
- export const ARCHIVER_DB_VERSION = 5;
10
+ export const ARCHIVER_DB_VERSION = 6;
12
11
  export const MAX_FUNCTION_SIGNATURES = 1000;
13
12
  export const MAX_FUNCTION_NAME_LEN = 256;
14
13
  /**
@@ -24,16 +23,19 @@ export const MAX_FUNCTION_NAME_LEN = 256;
24
23
  #contractInstanceStore;
25
24
  functionNames;
26
25
  #log;
27
- constructor(db, logsMaxPageSize = 1000, l1Constants){
26
+ constructor(db, logsMaxPageSize = 1000){
28
27
  this.db = db;
29
28
  this.functionNames = new Map();
30
29
  this.#log = createLogger('archiver:data-store');
31
- this.#blockStore = new BlockStore(db, l1Constants);
30
+ this.#blockStore = new BlockStore(db);
32
31
  this.#logStore = new LogStore(db, this.#blockStore, logsMaxPageSize);
33
32
  this.#messageStore = new MessageStore(db);
34
33
  this.#contractClassStore = new ContractClassStore(db);
35
34
  this.#contractInstanceStore = new ContractInstanceStore(db);
36
35
  }
36
+ /** Returns the underlying block store. Used by L2TipsCache. */ get blockStore() {
37
+ return this.#blockStore;
38
+ }
37
39
  /** Opens a new transaction to the underlying store and runs all operations within it. */ transactionAsync(callback) {
38
40
  return this.db.transactionAsync(callback);
39
41
  }
@@ -93,12 +95,11 @@ export const MAX_FUNCTION_NAME_LEN = 256;
93
95
  }
94
96
  /**
95
97
  * Add new contract classes from an L2 block to the store's list.
96
- * @param data - List of contract classes to be added.
97
- * @param bytecodeCommitments - Bytecode commitments for the contract classes.
98
+ * @param data - List of contract classes (with bytecode commitments) to be added.
98
99
  * @param blockNumber - Number of the L2 block the contracts were registered in.
99
100
  * @returns True if the operation is successful.
100
- */ async addContractClasses(data, bytecodeCommitments, blockNumber) {
101
- return (await Promise.all(data.map((c, i)=>this.#contractClassStore.addContractClass(c, bytecodeCommitments[i], blockNumber)))).every(Boolean);
101
+ */ async addContractClasses(data, blockNumber) {
102
+ return (await Promise.all(data.map((c)=>this.#contractClassStore.addContractClass(c, c.publicBytecodeCommitment, blockNumber)))).every(Boolean);
102
103
  }
103
104
  async deleteContractClasses(data, blockNumber) {
104
105
  return (await Promise.all(data.map((c)=>this.#contractClassStore.deleteContractClasses(c, blockNumber)))).every(Boolean);
@@ -106,9 +107,6 @@ export const MAX_FUNCTION_NAME_LEN = 256;
106
107
  getBytecodeCommitment(contractClassId) {
107
108
  return this.#contractClassStore.getBytecodeCommitment(contractClassId);
108
109
  }
109
- /** Adds private functions to a contract class. */ addFunctions(contractClassId, privateFunctions, utilityFunctions) {
110
- return this.#contractClassStore.addFunctions(contractClassId, privateFunctions, utilityFunctions);
111
- }
112
110
  /**
113
111
  * Add new contract instances from an L2 block to the store's list.
114
112
  * @param data - List of contract instances to be added.
@@ -132,13 +130,13 @@ export const MAX_FUNCTION_NAME_LEN = 256;
132
130
  return (await Promise.all(data.map((update, logIndex)=>this.#contractInstanceStore.deleteContractInstanceUpdate(update, timestamp, logIndex)))).every(Boolean);
133
131
  }
134
132
  /**
135
- * Append new proposed blocks to the store's list.
136
- * These are uncheckpointed blocks that have been proposed by the sequencer but not yet included in a checkpoint on L1.
133
+ * Append a new proposed block to the store.
134
+ * This is an uncheckpointed block that has been proposed by the sequencer but not yet included in a checkpoint on L1.
137
135
  * For checkpointed blocks (already published to L1), use addCheckpoints() instead.
138
- * @param blocks - The proposed L2 blocks to be added to the store.
136
+ * @param block - The proposed L2 block to be added to the store.
139
137
  * @returns True if the operation is successful.
140
- */ addProposedBlocks(blocks, opts = {}) {
141
- return this.#blockStore.addProposedBlocks(blocks, opts);
138
+ */ addProposedBlock(block, opts = {}) {
139
+ return this.#blockStore.addProposedBlock(block, opts);
142
140
  }
143
141
  /**
144
142
  * Returns an array of checkpoint objects
@@ -152,7 +150,7 @@ export const MAX_FUNCTION_NAME_LEN = 256;
152
150
  * Returns the number of the latest block
153
151
  * @returns The number of the latest block
154
152
  */ getLatestBlockNumber() {
155
- return this.#blockStore.getLatestBlockNumber();
153
+ return this.#blockStore.getLatestL2BlockNumber();
156
154
  }
157
155
  /**
158
156
  * Removes all checkpoints with checkpoint number > checkpointNumber.
@@ -196,7 +194,7 @@ export const MAX_FUNCTION_NAME_LEN = 256;
196
194
  * Returns the block for the given hash, or undefined if not exists.
197
195
  * @param blockHash - The block hash to return.
198
196
  */ getBlockByHash(blockHash) {
199
- return this.#blockStore.getBlockByHash(L2BlockHash.fromField(blockHash));
197
+ return this.#blockStore.getBlockByHash(blockHash);
200
198
  }
201
199
  /**
202
200
  * Returns the block for the given archive root, or undefined if not exists.
@@ -232,7 +230,7 @@ export const MAX_FUNCTION_NAME_LEN = 256;
232
230
  * Returns the block header for the given hash, or undefined if not exists.
233
231
  * @param blockHash - The block hash to return.
234
232
  */ getBlockHeaderByHash(blockHash) {
235
- return this.#blockStore.getBlockHeaderByHash(L2BlockHash.fromField(blockHash));
233
+ return this.#blockStore.getBlockHeaderByHash(blockHash);
236
234
  }
237
235
  /**
238
236
  * Returns the block header for the given archive root, or undefined if not exists.
@@ -241,6 +239,18 @@ export const MAX_FUNCTION_NAME_LEN = 256;
241
239
  return this.#blockStore.getBlockHeaderByArchive(archive);
242
240
  }
243
241
  /**
242
+ * Gets block metadata (without tx data) by block number.
243
+ * @param blockNumber - The block number to return.
244
+ */ getBlockData(blockNumber) {
245
+ return this.#blockStore.getBlockData(blockNumber);
246
+ }
247
+ /**
248
+ * Gets block metadata (without tx data) by archive root.
249
+ * @param archive - The archive root to return.
250
+ */ getBlockDataByArchive(archive) {
251
+ return this.#blockStore.getBlockDataByArchive(archive);
252
+ }
253
+ /**
244
254
  * Gets a tx effect.
245
255
  * @param txHash - The hash of the tx corresponding to the tx effect.
246
256
  * @returns The requested tx effect with block info (or undefined if not found).
@@ -251,8 +261,8 @@ export const MAX_FUNCTION_NAME_LEN = 256;
251
261
  * Gets a receipt of a settled tx.
252
262
  * @param txHash - The hash of a tx we try to get the receipt for.
253
263
  * @returns The requested tx receipt (or undefined if not found).
254
- */ getSettledTxReceipt(txHash) {
255
- return this.#blockStore.getSettledTxReceipt(txHash);
264
+ */ getSettledTxReceipt(txHash, l1Constants) {
265
+ return this.#blockStore.getSettledTxReceipt(txHash, l1Constants);
256
266
  }
257
267
  /**
258
268
  * Append new logs to the store's list.
@@ -299,9 +309,10 @@ export const MAX_FUNCTION_NAME_LEN = 256;
299
309
  * array implies no logs match that tag.
300
310
  * @param tags - The tags to search for.
301
311
  * @param page - The page number (0-indexed) for pagination. Returns at most 10 logs per tag per page.
302
- */ getPrivateLogsByTags(tags, page) {
312
+ * @param upToBlockNumber - If set, only return logs from blocks up to and including this block number.
313
+ */ getPrivateLogsByTags(tags, page, upToBlockNumber) {
303
314
  try {
304
- return this.#logStore.getPrivateLogsByTags(tags, page);
315
+ return this.#logStore.getPrivateLogsByTags(tags, page, upToBlockNumber);
305
316
  } catch (err) {
306
317
  return Promise.reject(err);
307
318
  }
@@ -312,9 +323,10 @@ export const MAX_FUNCTION_NAME_LEN = 256;
312
323
  * @param contractAddress - The contract address to search logs for.
313
324
  * @param tags - The tags to search for.
314
325
  * @param page - The page number (0-indexed) for pagination. Returns at most 10 logs per tag per page.
315
- */ getPublicLogsByTagsFromContract(contractAddress, tags, page) {
326
+ * @param upToBlockNumber - If set, only return logs from blocks up to and including this block number.
327
+ */ getPublicLogsByTagsFromContract(contractAddress, tags, page, upToBlockNumber) {
316
328
  try {
317
- return this.#logStore.getPublicLogsByTagsFromContract(contractAddress, tags, page);
329
+ return this.#logStore.getPublicLogsByTagsFromContract(contractAddress, tags, page, upToBlockNumber);
318
330
  } catch (err) {
319
331
  return Promise.reject(err);
320
332
  }
@@ -353,13 +365,20 @@ export const MAX_FUNCTION_NAME_LEN = 256;
353
365
  */ async setProvenCheckpointNumber(checkpointNumber) {
354
366
  await this.#blockStore.setProvenCheckpointNumber(checkpointNumber);
355
367
  }
356
- async setBlockSynchedL1BlockNumber(l1BlockNumber) {
357
- await this.#blockStore.setSynchedL1BlockNumber(l1BlockNumber);
368
+ /**
369
+ * Gets the number of the latest finalized checkpoint processed.
370
+ * @returns The number of the latest finalized checkpoint processed.
371
+ */ getFinalizedCheckpointNumber() {
372
+ return this.#blockStore.getFinalizedCheckpointNumber();
358
373
  }
359
374
  /**
360
- * Stores the l1 block that messages have been synched until
361
- */ async setMessageSynchedL1Block(l1Block) {
362
- await this.#messageStore.setSynchedL1Block(l1Block);
375
+ * Stores the number of the latest finalized checkpoint processed.
376
+ * @param checkpointNumber - The number of the latest finalized checkpoint processed.
377
+ */ async setFinalizedCheckpointNumber(checkpointNumber) {
378
+ await this.#blockStore.setFinalizedCheckpointNumber(checkpointNumber);
379
+ }
380
+ async setBlockSynchedL1BlockNumber(l1BlockNumber) {
381
+ await this.#blockStore.setSynchedL1BlockNumber(l1BlockNumber);
363
382
  }
364
383
  /**
365
384
  * Returns the number of the most recent proven block
@@ -385,6 +404,9 @@ export const MAX_FUNCTION_NAME_LEN = 256;
385
404
  /** Deletes all L1 to L2 messages up until (excluding) the target checkpoint number. */ rollbackL1ToL2MessagesToCheckpoint(targetCheckpointNumber) {
386
405
  return this.#messageStore.rollbackL1ToL2MessagesToCheckpoint(targetCheckpointNumber);
387
406
  }
407
+ /** Atomically updates the message sync state: the L1 sync point and the inbox tree-in-progress marker. */ setMessageSyncState(l1Block, treeInProgress) {
408
+ return this.#messageStore.setMessageSyncState(l1Block, treeInProgress);
409
+ }
388
410
  /** Returns an async iterator to all L1 to L2 messages on the range. */ iterateL1ToL2Messages(range = {}) {
389
411
  return this.#messageStore.iterateL1ToL2Messages(range);
390
412
  }
@@ -398,6 +420,28 @@ export const MAX_FUNCTION_NAME_LEN = 256;
398
420
  return this.#blockStore.setPendingChainValidationStatus(status);
399
421
  }
400
422
  /**
423
+ * Gets the L2 block number of the proposed checkpoint.
424
+ * @returns The block number of the proposed checkpoint, or the checkpointed block number if none.
425
+ */ getProposedCheckpointL2BlockNumber() {
426
+ return this.#blockStore.getProposedCheckpointL2BlockNumber();
427
+ }
428
+ /** Returns the checkpoint data at the proposed tip */ getProposedCheckpoint() {
429
+ return this.#blockStore.getProposedCheckpoint();
430
+ }
431
+ /** Returns the proposed checkpoint data, or undefined if no proposed checkpoint exists. No fallback to confirmed. */ getProposedCheckpointOnly() {
432
+ return this.#blockStore.getProposedCheckpointOnly();
433
+ }
434
+ /**
435
+ * Set proposed checkpoint
436
+ * @param proposedCheckpoint
437
+ * @returns
438
+ */ setProposedCheckpoint(proposedCheckpoint) {
439
+ return this.#blockStore.setProposedCheckpoint(proposedCheckpoint);
440
+ }
441
+ /** Deletes the proposed checkpoint from storage. */ deleteProposedCheckpoint() {
442
+ return this.#blockStore.deleteProposedCheckpoint();
443
+ }
444
+ /**
401
445
  * Gets the number of the latest L2 block processed.
402
446
  * @returns The number of the latest L2 block processed.
403
447
  */ getCheckpointedL2BlockNumber() {
@@ -429,6 +473,9 @@ export const MAX_FUNCTION_NAME_LEN = 256;
429
473
  */ getCheckpointData(checkpointNumber) {
430
474
  return this.#blockStore.getCheckpointData(checkpointNumber);
431
475
  }
476
+ /** Returns checkpoint data for all checkpoints whose slot falls within the given range (inclusive). */ getCheckpointDataForSlotRange(startSlot, endSlot) {
477
+ return this.#blockStore.getCheckpointDataForSlotRange(startSlot, endSlot);
478
+ }
432
479
  /**
433
480
  * Gets all blocks that have the given slot number.
434
481
  * @param slotNumber - The slot number to search for.
@@ -0,0 +1,20 @@
1
+ import { type L2Tips } from '@aztec/stdlib/block';
2
+ import type { BlockStore } from './block_store.js';
3
+ /**
4
+ * In-memory cache for L2 chain tips (proposed, checkpointed, proven, finalized).
5
+ * Populated from the BlockStore on first access, then kept up-to-date by the ArchiverDataStoreUpdater.
6
+ * Refresh calls should happen within the store transaction that mutates block data to ensure consistency.
7
+ */
8
+ export declare class L2TipsCache {
9
+ #private;
10
+ private blockStore;
11
+ constructor(blockStore: BlockStore);
12
+ /** Returns the cached L2 tips. Loads from the block store on first call. */
13
+ getL2Tips(): Promise<L2Tips>;
14
+ /** Reloads the L2 tips from the block store. Should be called within the store transaction that mutates data. */
15
+ refresh(): Promise<void>;
16
+ private loadFromStore;
17
+ private getCheckpointIdForProposedCheckpoint;
18
+ private getCheckpointIdForBlock;
19
+ }
20
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibDJfdGlwc19jYWNoZS5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3N0b3JlL2wyX3RpcHNfY2FjaGUudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBRUEsT0FBTyxFQUFxRSxLQUFLLE1BQU0sRUFBRSxNQUFNLHFCQUFxQixDQUFDO0FBRXJILE9BQU8sS0FBSyxFQUFFLFVBQVUsRUFBRSxNQUFNLGtCQUFrQixDQUFDO0FBRW5EOzs7O0dBSUc7QUFDSCxxQkFBYSxXQUFXOztJQUdWLE9BQU8sQ0FBQyxVQUFVO0lBQTlCLFlBQW9CLFVBQVUsRUFBRSxVQUFVLEVBQUk7SUFFOUMsNEVBQTRFO0lBQ3JFLFNBQVMsSUFBSSxPQUFPLENBQUMsTUFBTSxDQUFDLENBRWxDO0lBRUQsaUhBQWlIO0lBQ3BHLE9BQU8sSUFBSSxPQUFPLENBQUMsSUFBSSxDQUFDLENBR3BDO1lBRWEsYUFBYTtZQTBFYixvQ0FBb0M7WUFhcEMsdUJBQXVCO0NBYXRDIn0=
@@ -0,0 +1 @@
1
+ {"version":3,"file":"l2_tips_cache.d.ts","sourceRoot":"","sources":["../../src/store/l2_tips_cache.ts"],"names":[],"mappings":"AAEA,OAAO,EAAqE,KAAK,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAErH,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAEnD;;;;GAIG;AACH,qBAAa,WAAW;;IAGV,OAAO,CAAC,UAAU;IAA9B,YAAoB,UAAU,EAAE,UAAU,EAAI;IAE9C,4EAA4E;IACrE,SAAS,IAAI,OAAO,CAAC,MAAM,CAAC,CAElC;IAED,iHAAiH;IACpG,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC,CAGpC;YAEa,aAAa;YA0Eb,oCAAoC;YAapC,uBAAuB;CAatC"}
@@ -0,0 +1,109 @@
1
+ import { GENESIS_BLOCK_HEADER_HASH, INITIAL_L2_BLOCK_NUM } from '@aztec/constants';
2
+ import { BlockNumber, CheckpointNumber } from '@aztec/foundation/branded-types';
3
+ import { GENESIS_CHECKPOINT_HEADER_HASH } from '@aztec/stdlib/block';
4
+ /**
5
+ * In-memory cache for L2 chain tips (proposed, checkpointed, proven, finalized).
6
+ * Populated from the BlockStore on first access, then kept up-to-date by the ArchiverDataStoreUpdater.
7
+ * Refresh calls should happen within the store transaction that mutates block data to ensure consistency.
8
+ */ export class L2TipsCache {
9
+ blockStore;
10
+ #tipsPromise;
11
+ constructor(blockStore){
12
+ this.blockStore = blockStore;
13
+ }
14
+ /** Returns the cached L2 tips. Loads from the block store on first call. */ getL2Tips() {
15
+ return this.#tipsPromise ??= this.loadFromStore();
16
+ }
17
+ /** Reloads the L2 tips from the block store. Should be called within the store transaction that mutates data. */ async refresh() {
18
+ this.#tipsPromise = this.loadFromStore();
19
+ await this.#tipsPromise;
20
+ }
21
+ async loadFromStore() {
22
+ const [latestBlockNumber, provenBlockNumber, proposedCheckpointBlockNumber, checkpointedBlockNumber, finalizedBlockNumber] = await Promise.all([
23
+ this.blockStore.getLatestL2BlockNumber(),
24
+ this.blockStore.getProvenBlockNumber(),
25
+ this.blockStore.getProposedCheckpointL2BlockNumber(),
26
+ this.blockStore.getCheckpointedL2BlockNumber(),
27
+ this.blockStore.getFinalizedL2BlockNumber()
28
+ ]);
29
+ const genesisBlockHeader = {
30
+ blockHash: GENESIS_BLOCK_HEADER_HASH,
31
+ checkpointNumber: CheckpointNumber.ZERO
32
+ };
33
+ const beforeInitialBlockNumber = BlockNumber(INITIAL_L2_BLOCK_NUM - 1);
34
+ const getBlockData = (blockNumber)=>blockNumber > beforeInitialBlockNumber ? this.blockStore.getBlockData(blockNumber) : genesisBlockHeader;
35
+ const [latestBlockData, provenBlockData, proposedCheckpointBlockData, checkpointedBlockData, finalizedBlockData] = await Promise.all([
36
+ latestBlockNumber,
37
+ provenBlockNumber,
38
+ proposedCheckpointBlockNumber,
39
+ checkpointedBlockNumber,
40
+ finalizedBlockNumber
41
+ ].map(getBlockData));
42
+ if (!latestBlockData || !provenBlockData || !finalizedBlockData || !checkpointedBlockData || !proposedCheckpointBlockData) {
43
+ throw new Error('Failed to load block data for L2 tips');
44
+ }
45
+ const [provenCheckpointId, finalizedCheckpointId, proposedCheckpointId, checkpointedCheckpointId] = await Promise.all([
46
+ this.getCheckpointIdForBlock(provenBlockData),
47
+ this.getCheckpointIdForBlock(finalizedBlockData),
48
+ this.getCheckpointIdForProposedCheckpoint(checkpointedBlockData),
49
+ this.getCheckpointIdForBlock(checkpointedBlockData)
50
+ ]);
51
+ return {
52
+ proposed: {
53
+ number: latestBlockNumber,
54
+ hash: latestBlockData.blockHash.toString()
55
+ },
56
+ proven: {
57
+ block: {
58
+ number: provenBlockNumber,
59
+ hash: provenBlockData.blockHash.toString()
60
+ },
61
+ checkpoint: provenCheckpointId
62
+ },
63
+ proposedCheckpoint: {
64
+ block: {
65
+ number: proposedCheckpointBlockNumber,
66
+ hash: proposedCheckpointBlockData.blockHash.toString()
67
+ },
68
+ checkpoint: proposedCheckpointId
69
+ },
70
+ finalized: {
71
+ block: {
72
+ number: finalizedBlockNumber,
73
+ hash: finalizedBlockData.blockHash.toString()
74
+ },
75
+ checkpoint: finalizedCheckpointId
76
+ },
77
+ checkpointed: {
78
+ block: {
79
+ number: checkpointedBlockNumber,
80
+ hash: checkpointedBlockData.blockHash.toString()
81
+ },
82
+ checkpoint: checkpointedCheckpointId
83
+ }
84
+ };
85
+ }
86
+ async getCheckpointIdForProposedCheckpoint(checkpointedBlockData) {
87
+ const checkpointData = await this.blockStore.getProposedCheckpointOnly();
88
+ if (!checkpointData) {
89
+ return this.getCheckpointIdForBlock(checkpointedBlockData);
90
+ }
91
+ return {
92
+ number: checkpointData.checkpointNumber,
93
+ hash: checkpointData.header.hash().toString()
94
+ };
95
+ }
96
+ async getCheckpointIdForBlock(blockData) {
97
+ const checkpointData = await this.blockStore.getCheckpointData(blockData.checkpointNumber);
98
+ if (!checkpointData) {
99
+ return {
100
+ number: CheckpointNumber.ZERO,
101
+ hash: GENESIS_CHECKPOINT_HEADER_HASH.toString()
102
+ };
103
+ }
104
+ return {
105
+ number: checkpointData.checkpointNumber,
106
+ hash: checkpointData.header.hash().toString()
107
+ };
108
+ }
109
+ }
@@ -1,3 +1,4 @@
1
+ import { BlockNumber } from '@aztec/foundation/branded-types';
1
2
  import type { AztecAsyncKVStore } from '@aztec/kv-store';
2
3
  import type { AztecAddress } from '@aztec/stdlib/aztec-address';
3
4
  import { L2Block } from '@aztec/stdlib/block';
@@ -24,20 +25,22 @@ export declare class LogStore {
24
25
  * array implies no logs match that tag.
25
26
  * @param tags - The tags to search for.
26
27
  * @param page - The page number (0-indexed) for pagination.
28
+ * @param upToBlockNumber - If set, only return logs from blocks up to and including this block number.
27
29
  * @returns An array of log arrays, one per tag. Returns at most MAX_LOGS_PER_TAG logs per tag per page. If
28
30
  * MAX_LOGS_PER_TAG logs are returned for a tag, the caller should fetch the next page to check for more logs.
29
31
  */
30
- getPrivateLogsByTags(tags: SiloedTag[], page?: number): Promise<TxScopedL2Log[][]>;
32
+ getPrivateLogsByTags(tags: SiloedTag[], page?: number, upToBlockNumber?: BlockNumber): Promise<TxScopedL2Log[][]>;
31
33
  /**
32
34
  * Gets public logs that match any of the `tags` from the specified contract. For each tag, an array of matching
33
35
  * logs is returned. An empty array implies no logs match that tag.
34
36
  * @param contractAddress - The contract address to search logs for.
35
37
  * @param tags - The tags to search for.
36
38
  * @param page - The page number (0-indexed) for pagination.
39
+ * @param upToBlockNumber - If set, only return logs from blocks up to and including this block number.
37
40
  * @returns An array of log arrays, one per tag. Returns at most MAX_LOGS_PER_TAG logs per tag per page. If
38
41
  * MAX_LOGS_PER_TAG logs are returned for a tag, the caller should fetch the next page to check for more logs.
39
42
  */
40
- getPublicLogsByTagsFromContract(contractAddress: AztecAddress, tags: Tag[], page?: number): Promise<TxScopedL2Log[][]>;
43
+ getPublicLogsByTagsFromContract(contractAddress: AztecAddress, tags: Tag[], page?: number, upToBlockNumber?: BlockNumber): Promise<TxScopedL2Log[][]>;
41
44
  /**
42
45
  * Gets public logs based on the provided filter.
43
46
  * @param filter - The filter to apply to the logs.
@@ -51,4 +54,4 @@ export declare class LogStore {
51
54
  */
52
55
  getContractClassLogs(filter: LogFilter): Promise<GetContractClassLogsResponse>;
53
56
  }
54
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibG9nX3N0b3JlLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvc3RvcmUvbG9nX3N0b3JlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQU1BLE9BQU8sS0FBSyxFQUFFLGlCQUFpQixFQUFpQixNQUFNLGlCQUFpQixDQUFDO0FBQ3hFLE9BQU8sS0FBSyxFQUFFLFlBQVksRUFBRSxNQUFNLDZCQUE2QixDQUFDO0FBQ2hFLE9BQU8sRUFBRSxPQUFPLEVBQWUsTUFBTSxxQkFBcUIsQ0FBQztBQUUzRCxPQUFPLEtBQUssRUFBRSw0QkFBNEIsRUFBRSxxQkFBcUIsRUFBRSxNQUFNLGlDQUFpQyxDQUFDO0FBQzNHLE9BQU8sRUFJTCxLQUFLLFNBQVMsRUFHZCxLQUFLLFNBQVMsRUFDZCxHQUFHLEVBQ0gsYUFBYSxFQUNkLE1BQU0sb0JBQW9CLENBQUM7QUFFNUIsT0FBTyxLQUFLLEVBQUUsVUFBVSxFQUFFLE1BQU0sa0JBQWtCLENBQUM7QUFFbkQ7O0dBRUc7QUFDSCxxQkFBYSxRQUFROztJQWFqQixPQUFPLENBQUMsRUFBRTtJQUNWLE9BQU8sQ0FBQyxVQUFVO0lBRnBCLFlBQ1UsRUFBRSxFQUFFLGlCQUFpQixFQUNyQixVQUFVLEVBQUUsVUFBVSxFQUM5QixlQUFlLEdBQUUsTUFBYSxFQVUvQjtJQTRNRDs7OztPQUlHO0lBQ0gsT0FBTyxDQUFDLE1BQU0sRUFBRSxPQUFPLEVBQUUsR0FBRyxPQUFPLENBQUMsT0FBTyxDQUFDLENBUzNDO0lBZ0JELFVBQVUsQ0FBQyxNQUFNLEVBQUUsT0FBTyxFQUFFLEdBQUcsT0FBTyxDQUFDLE9BQU8sQ0FBQyxDQTJCOUM7SUFFRDs7Ozs7OztPQU9HO0lBQ0csb0JBQW9CLENBQUMsSUFBSSxFQUFFLFNBQVMsRUFBRSxFQUFFLElBQUksR0FBRSxNQUFVLEdBQUcsT0FBTyxDQUFDLGFBQWEsRUFBRSxFQUFFLENBQUMsQ0FRMUY7SUFFRDs7Ozs7Ozs7T0FRRztJQUNHLCtCQUErQixDQUNuQyxlQUFlLEVBQUUsWUFBWSxFQUM3QixJQUFJLEVBQUUsR0FBRyxFQUFFLEVBQ1gsSUFBSSxHQUFFLE1BQVUsR0FDZixPQUFPLENBQUMsYUFBYSxFQUFFLEVBQUUsQ0FBQyxDQWE1QjtJQUVEOzs7O09BSUc7SUFDSCxhQUFhLENBQUMsTUFBTSxFQUFFLFNBQVMsR0FBRyxPQUFPLENBQUMscUJBQXFCLENBQUMsQ0FRL0Q7SUE2RUQ7Ozs7T0FJRztJQUNILG9CQUFvQixDQUFDLE1BQU0sRUFBRSxTQUFTLEdBQUcsT0FBTyxDQUFDLDRCQUE0QixDQUFDLENBUTdFO0NBNkdGIn0=
57
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibG9nX3N0b3JlLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvc3RvcmUvbG9nX3N0b3JlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUNBLE9BQU8sRUFBRSxXQUFXLEVBQUUsTUFBTSxpQ0FBaUMsQ0FBQztBQUs5RCxPQUFPLEtBQUssRUFBRSxpQkFBaUIsRUFBaUIsTUFBTSxpQkFBaUIsQ0FBQztBQUN4RSxPQUFPLEtBQUssRUFBRSxZQUFZLEVBQUUsTUFBTSw2QkFBNkIsQ0FBQztBQUNoRSxPQUFPLEVBQWEsT0FBTyxFQUFFLE1BQU0scUJBQXFCLENBQUM7QUFFekQsT0FBTyxLQUFLLEVBQUUsNEJBQTRCLEVBQUUscUJBQXFCLEVBQUUsTUFBTSxpQ0FBaUMsQ0FBQztBQUMzRyxPQUFPLEVBSUwsS0FBSyxTQUFTLEVBR2QsS0FBSyxTQUFTLEVBQ2QsR0FBRyxFQUNILGFBQWEsRUFDZCxNQUFNLG9CQUFvQixDQUFDO0FBSTVCLE9BQU8sS0FBSyxFQUFFLFVBQVUsRUFBRSxNQUFNLGtCQUFrQixDQUFDO0FBRW5EOztHQUVHO0FBQ0gscUJBQWEsUUFBUTs7SUFhakIsT0FBTyxDQUFDLEVBQUU7SUFDVixPQUFPLENBQUMsVUFBVTtJQUZwQixZQUNVLEVBQUUsRUFBRSxpQkFBaUIsRUFDckIsVUFBVSxFQUFFLFVBQVUsRUFDOUIsZUFBZSxHQUFFLE1BQWEsRUFVL0I7SUFvT0Q7Ozs7T0FJRztJQUNILE9BQU8sQ0FBQyxNQUFNLEVBQUUsT0FBTyxFQUFFLEdBQUcsT0FBTyxDQUFDLE9BQU8sQ0FBQyxDQVMzQztJQWdCRCxVQUFVLENBQUMsTUFBTSxFQUFFLE9BQU8sRUFBRSxHQUFHLE9BQU8sQ0FBQyxPQUFPLENBQUMsQ0EwRDlDO0lBRUQ7Ozs7Ozs7O09BUUc7SUFDRyxvQkFBb0IsQ0FDeEIsSUFBSSxFQUFFLFNBQVMsRUFBRSxFQUNqQixJQUFJLEdBQUUsTUFBVSxFQUNoQixlQUFlLENBQUMsRUFBRSxXQUFXLEdBQzVCLE9BQU8sQ0FBQyxhQUFhLEVBQUUsRUFBRSxDQUFDLENBZ0I1QjtJQUVEOzs7Ozs7Ozs7T0FTRztJQUNHLCtCQUErQixDQUNuQyxlQUFlLEVBQUUsWUFBWSxFQUM3QixJQUFJLEVBQUUsR0FBRyxFQUFFLEVBQ1gsSUFBSSxHQUFFLE1BQVUsRUFDaEIsZUFBZSxDQUFDLEVBQUUsV0FBVyxHQUM1QixPQUFPLENBQUMsYUFBYSxFQUFFLEVBQUUsQ0FBQyxDQW9CNUI7SUFFRDs7OztPQUlHO0lBQ0gsYUFBYSxDQUFDLE1BQU0sRUFBRSxTQUFTLEdBQUcsT0FBTyxDQUFDLHFCQUFxQixDQUFDLENBUS9EO0lBK0ZEOzs7O09BSUc7SUFDSCxvQkFBb0IsQ0FBQyxNQUFNLEVBQUUsU0FBUyxHQUFHLE9BQU8sQ0FBQyw0QkFBNEIsQ0FBQyxDQVE3RTtDQTZLRiJ9
@@ -1 +1 @@
1
- {"version":3,"file":"log_store.d.ts","sourceRoot":"","sources":["../../src/store/log_store.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,iBAAiB,EAAiB,MAAM,iBAAiB,CAAC;AACxE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAChE,OAAO,EAAE,OAAO,EAAe,MAAM,qBAAqB,CAAC;AAE3D,OAAO,KAAK,EAAE,4BAA4B,EAAE,qBAAqB,EAAE,MAAM,iCAAiC,CAAC;AAC3G,OAAO,EAIL,KAAK,SAAS,EAGd,KAAK,SAAS,EACd,GAAG,EACH,aAAa,EACd,MAAM,oBAAoB,CAAC;AAE5B,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAEnD;;GAEG;AACH,qBAAa,QAAQ;;IAajB,OAAO,CAAC,EAAE;IACV,OAAO,CAAC,UAAU;IAFpB,YACU,EAAE,EAAE,iBAAiB,EACrB,UAAU,EAAE,UAAU,EAC9B,eAAe,GAAE,MAAa,EAU/B;IA4MD;;;;OAIG;IACH,OAAO,CAAC,MAAM,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,OAAO,CAAC,CAS3C;IAgBD,UAAU,CAAC,MAAM,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,OAAO,CAAC,CA2B9C;IAED;;;;;;;OAOG;IACG,oBAAoB,CAAC,IAAI,EAAE,SAAS,EAAE,EAAE,IAAI,GAAE,MAAU,GAAG,OAAO,CAAC,aAAa,EAAE,EAAE,CAAC,CAQ1F;IAED;;;;;;;;OAQG;IACG,+BAA+B,CACnC,eAAe,EAAE,YAAY,EAC7B,IAAI,EAAE,GAAG,EAAE,EACX,IAAI,GAAE,MAAU,GACf,OAAO,CAAC,aAAa,EAAE,EAAE,CAAC,CAa5B;IAED;;;;OAIG;IACH,aAAa,CAAC,MAAM,EAAE,SAAS,GAAG,OAAO,CAAC,qBAAqB,CAAC,CAQ/D;IA6ED;;;;OAIG;IACH,oBAAoB,CAAC,MAAM,EAAE,SAAS,GAAG,OAAO,CAAC,4BAA4B,CAAC,CAQ7E;CA6GF"}
1
+ {"version":3,"file":"log_store.d.ts","sourceRoot":"","sources":["../../src/store/log_store.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,MAAM,iCAAiC,CAAC;AAK9D,OAAO,KAAK,EAAE,iBAAiB,EAAiB,MAAM,iBAAiB,CAAC;AACxE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAChE,OAAO,EAAa,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAEzD,OAAO,KAAK,EAAE,4BAA4B,EAAE,qBAAqB,EAAE,MAAM,iCAAiC,CAAC;AAC3G,OAAO,EAIL,KAAK,SAAS,EAGd,KAAK,SAAS,EACd,GAAG,EACH,aAAa,EACd,MAAM,oBAAoB,CAAC;AAI5B,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAEnD;;GAEG;AACH,qBAAa,QAAQ;;IAajB,OAAO,CAAC,EAAE;IACV,OAAO,CAAC,UAAU;IAFpB,YACU,EAAE,EAAE,iBAAiB,EACrB,UAAU,EAAE,UAAU,EAC9B,eAAe,GAAE,MAAa,EAU/B;IAoOD;;;;OAIG;IACH,OAAO,CAAC,MAAM,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,OAAO,CAAC,CAS3C;IAgBD,UAAU,CAAC,MAAM,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,OAAO,CAAC,CA0D9C;IAED;;;;;;;;OAQG;IACG,oBAAoB,CACxB,IAAI,EAAE,SAAS,EAAE,EACjB,IAAI,GAAE,MAAU,EAChB,eAAe,CAAC,EAAE,WAAW,GAC5B,OAAO,CAAC,aAAa,EAAE,EAAE,CAAC,CAgB5B;IAED;;;;;;;;;OASG;IACG,+BAA+B,CACnC,eAAe,EAAE,YAAY,EAC7B,IAAI,EAAE,GAAG,EAAE,EACX,IAAI,GAAE,MAAU,EAChB,eAAe,CAAC,EAAE,WAAW,GAC5B,OAAO,CAAC,aAAa,EAAE,EAAE,CAAC,CAoB5B;IAED;;;;OAIG;IACH,aAAa,CAAC,MAAM,EAAE,SAAS,GAAG,OAAO,CAAC,qBAAqB,CAAC,CAQ/D;IA+FD;;;;OAIG;IACH,oBAAoB,CAAC,MAAM,EAAE,SAAS,GAAG,OAAO,CAAC,4BAA4B,CAAC,CAQ7E;CA6KF"}