@aztec/archiver 0.0.1-commit.f146247c → 0.0.1-commit.f1b29a41e
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/dest/archiver.d.ts +9 -6
- package/dest/archiver.d.ts.map +1 -1
- package/dest/archiver.js +76 -111
- package/dest/config.d.ts +3 -3
- package/dest/config.d.ts.map +1 -1
- package/dest/config.js +2 -1
- 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 +31 -26
- package/dest/index.d.ts +2 -1
- package/dest/index.d.ts.map +1 -1
- package/dest/index.js +1 -0
- package/dest/l1/bin/retrieve-calldata.js +36 -33
- package/dest/l1/calldata_retriever.d.ts +73 -50
- package/dest/l1/calldata_retriever.d.ts.map +1 -1
- package/dest/l1/calldata_retriever.js +191 -259
- package/dest/l1/data_retrieval.d.ts +9 -9
- package/dest/l1/data_retrieval.d.ts.map +1 -1
- package/dest/l1/data_retrieval.js +21 -19
- package/dest/l1/spire_proposer.d.ts +5 -5
- package/dest/l1/spire_proposer.d.ts.map +1 -1
- package/dest/l1/spire_proposer.js +9 -17
- package/dest/modules/data_source_base.d.ts +14 -7
- package/dest/modules/data_source_base.d.ts.map +1 -1
- package/dest/modules/data_source_base.js +39 -77
- package/dest/modules/data_store_updater.d.ts +25 -12
- package/dest/modules/data_store_updater.d.ts.map +1 -1
- package/dest/modules/data_store_updater.js +125 -94
- package/dest/modules/instrumentation.d.ts +15 -2
- package/dest/modules/instrumentation.d.ts.map +1 -1
- package/dest/modules/instrumentation.js +19 -2
- package/dest/modules/l1_synchronizer.d.ts +5 -8
- package/dest/modules/l1_synchronizer.d.ts.map +1 -1
- package/dest/modules/l1_synchronizer.js +73 -33
- 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 +65 -28
- package/dest/store/block_store.d.ts.map +1 -1
- package/dest/store/block_store.js +311 -134
- 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 +62 -21
- package/dest/store/kv_archiver_store.d.ts.map +1 -1
- package/dest/store/kv_archiver_store.js +75 -22
- package/dest/store/l2_tips_cache.d.ts +20 -0
- package/dest/store/l2_tips_cache.d.ts.map +1 -0
- package/dest/store/l2_tips_cache.js +109 -0
- 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 +148 -51
- 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 +14 -1
- package/dest/test/fake_l1_state.d.ts +13 -1
- package/dest/test/fake_l1_state.d.ts.map +1 -1
- package/dest/test/fake_l1_state.js +95 -23
- package/dest/test/mock_archiver.d.ts +1 -1
- package/dest/test/mock_archiver.d.ts.map +1 -1
- package/dest/test/mock_archiver.js +3 -2
- package/dest/test/mock_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 +26 -5
- package/dest/test/mock_l2_block_source.d.ts.map +1 -1
- package/dest/test/mock_l2_block_source.js +160 -89
- 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 -1
- package/package.json +13 -13
- package/src/archiver.ts +93 -132
- package/src/config.ts +8 -1
- package/src/errors.ts +70 -26
- package/src/factory.ts +46 -24
- package/src/index.ts +1 -0
- package/src/l1/README.md +25 -68
- package/src/l1/bin/retrieve-calldata.ts +46 -39
- package/src/l1/calldata_retriever.ts +250 -379
- package/src/l1/data_retrieval.ts +23 -25
- package/src/l1/spire_proposer.ts +7 -15
- package/src/modules/data_source_base.ts +78 -98
- package/src/modules/data_store_updater.ts +138 -124
- package/src/modules/instrumentation.ts +29 -2
- package/src/modules/l1_synchronizer.ts +86 -43
- package/src/modules/validation.ts +2 -2
- package/src/store/block_store.ts +393 -170
- 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 +117 -36
- package/src/store/l2_tips_cache.ts +128 -0
- package/src/store/log_store.ts +219 -58
- package/src/store/message_store.ts +20 -1
- package/src/test/fake_l1_state.ts +125 -26
- package/src/test/mock_archiver.ts +3 -2
- package/src/test/mock_l1_to_l2_message_source.ts +1 -0
- package/src/test/mock_l2_block_source.ts +209 -82
- package/src/test/mock_structs.ts +20 -6
- package/src/test/noop_l1_archiver.ts +7 -1
|
@@ -7,7 +7,7 @@ import { ContractClassStore } from './contract_class_store.js';
|
|
|
7
7
|
import { ContractInstanceStore } from './contract_instance_store.js';
|
|
8
8
|
import { LogStore } from './log_store.js';
|
|
9
9
|
import { MessageStore } from './message_store.js';
|
|
10
|
-
export const ARCHIVER_DB_VERSION =
|
|
10
|
+
export const ARCHIVER_DB_VERSION = 6;
|
|
11
11
|
export const MAX_FUNCTION_SIGNATURES = 1000;
|
|
12
12
|
export const MAX_FUNCTION_NAME_LEN = 256;
|
|
13
13
|
/**
|
|
@@ -23,16 +23,19 @@ export const MAX_FUNCTION_NAME_LEN = 256;
|
|
|
23
23
|
#contractInstanceStore;
|
|
24
24
|
functionNames;
|
|
25
25
|
#log;
|
|
26
|
-
constructor(db, logsMaxPageSize = 1000
|
|
26
|
+
constructor(db, logsMaxPageSize = 1000){
|
|
27
27
|
this.db = db;
|
|
28
28
|
this.functionNames = new Map();
|
|
29
29
|
this.#log = createLogger('archiver:data-store');
|
|
30
|
-
this.#blockStore = new BlockStore(db
|
|
30
|
+
this.#blockStore = new BlockStore(db);
|
|
31
31
|
this.#logStore = new LogStore(db, this.#blockStore, logsMaxPageSize);
|
|
32
32
|
this.#messageStore = new MessageStore(db);
|
|
33
33
|
this.#contractClassStore = new ContractClassStore(db);
|
|
34
34
|
this.#contractInstanceStore = new ContractInstanceStore(db);
|
|
35
35
|
}
|
|
36
|
+
/** Returns the underlying block store. Used by L2TipsCache. */ get blockStore() {
|
|
37
|
+
return this.#blockStore;
|
|
38
|
+
}
|
|
36
39
|
/** Opens a new transaction to the underlying store and runs all operations within it. */ transactionAsync(callback) {
|
|
37
40
|
return this.db.transactionAsync(callback);
|
|
38
41
|
}
|
|
@@ -92,12 +95,11 @@ export const MAX_FUNCTION_NAME_LEN = 256;
|
|
|
92
95
|
}
|
|
93
96
|
/**
|
|
94
97
|
* Add new contract classes from an L2 block to the store's list.
|
|
95
|
-
* @param data - List of contract classes to be added.
|
|
96
|
-
* @param bytecodeCommitments - Bytecode commitments for the contract classes.
|
|
98
|
+
* @param data - List of contract classes (with bytecode commitments) to be added.
|
|
97
99
|
* @param blockNumber - Number of the L2 block the contracts were registered in.
|
|
98
100
|
* @returns True if the operation is successful.
|
|
99
|
-
*/ async addContractClasses(data,
|
|
100
|
-
return (await Promise.all(data.map((c
|
|
101
|
+
*/ async addContractClasses(data, blockNumber) {
|
|
102
|
+
return (await Promise.all(data.map((c)=>this.#contractClassStore.addContractClass(c, c.publicBytecodeCommitment, blockNumber)))).every(Boolean);
|
|
101
103
|
}
|
|
102
104
|
async deleteContractClasses(data, blockNumber) {
|
|
103
105
|
return (await Promise.all(data.map((c)=>this.#contractClassStore.deleteContractClasses(c, blockNumber)))).every(Boolean);
|
|
@@ -105,9 +107,6 @@ export const MAX_FUNCTION_NAME_LEN = 256;
|
|
|
105
107
|
getBytecodeCommitment(contractClassId) {
|
|
106
108
|
return this.#contractClassStore.getBytecodeCommitment(contractClassId);
|
|
107
109
|
}
|
|
108
|
-
/** Adds private functions to a contract class. */ addFunctions(contractClassId, privateFunctions, utilityFunctions) {
|
|
109
|
-
return this.#contractClassStore.addFunctions(contractClassId, privateFunctions, utilityFunctions);
|
|
110
|
-
}
|
|
111
110
|
/**
|
|
112
111
|
* Add new contract instances from an L2 block to the store's list.
|
|
113
112
|
* @param data - List of contract instances to be added.
|
|
@@ -131,13 +130,13 @@ export const MAX_FUNCTION_NAME_LEN = 256;
|
|
|
131
130
|
return (await Promise.all(data.map((update, logIndex)=>this.#contractInstanceStore.deleteContractInstanceUpdate(update, timestamp, logIndex)))).every(Boolean);
|
|
132
131
|
}
|
|
133
132
|
/**
|
|
134
|
-
* Append new proposed
|
|
135
|
-
*
|
|
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.
|
|
136
135
|
* For checkpointed blocks (already published to L1), use addCheckpoints() instead.
|
|
137
|
-
* @param
|
|
136
|
+
* @param block - The proposed L2 block to be added to the store.
|
|
138
137
|
* @returns True if the operation is successful.
|
|
139
|
-
*/
|
|
140
|
-
return this.#blockStore.
|
|
138
|
+
*/ addProposedBlock(block, opts = {}) {
|
|
139
|
+
return this.#blockStore.addProposedBlock(block, opts);
|
|
141
140
|
}
|
|
142
141
|
/**
|
|
143
142
|
* Returns an array of checkpoint objects
|
|
@@ -151,7 +150,7 @@ export const MAX_FUNCTION_NAME_LEN = 256;
|
|
|
151
150
|
* Returns the number of the latest block
|
|
152
151
|
* @returns The number of the latest block
|
|
153
152
|
*/ getLatestBlockNumber() {
|
|
154
|
-
return this.#blockStore.
|
|
153
|
+
return this.#blockStore.getLatestL2BlockNumber();
|
|
155
154
|
}
|
|
156
155
|
/**
|
|
157
156
|
* Removes all checkpoints with checkpoint number > checkpointNumber.
|
|
@@ -240,6 +239,18 @@ export const MAX_FUNCTION_NAME_LEN = 256;
|
|
|
240
239
|
return this.#blockStore.getBlockHeaderByArchive(archive);
|
|
241
240
|
}
|
|
242
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
|
+
/**
|
|
243
254
|
* Gets a tx effect.
|
|
244
255
|
* @param txHash - The hash of the tx corresponding to the tx effect.
|
|
245
256
|
* @returns The requested tx effect with block info (or undefined if not found).
|
|
@@ -250,8 +261,8 @@ export const MAX_FUNCTION_NAME_LEN = 256;
|
|
|
250
261
|
* Gets a receipt of a settled tx.
|
|
251
262
|
* @param txHash - The hash of a tx we try to get the receipt for.
|
|
252
263
|
* @returns The requested tx receipt (or undefined if not found).
|
|
253
|
-
*/ getSettledTxReceipt(txHash) {
|
|
254
|
-
return this.#blockStore.getSettledTxReceipt(txHash);
|
|
264
|
+
*/ getSettledTxReceipt(txHash, l1Constants) {
|
|
265
|
+
return this.#blockStore.getSettledTxReceipt(txHash, l1Constants);
|
|
255
266
|
}
|
|
256
267
|
/**
|
|
257
268
|
* Append new logs to the store's list.
|
|
@@ -298,9 +309,10 @@ export const MAX_FUNCTION_NAME_LEN = 256;
|
|
|
298
309
|
* array implies no logs match that tag.
|
|
299
310
|
* @param tags - The tags to search for.
|
|
300
311
|
* @param page - The page number (0-indexed) for pagination. Returns at most 10 logs per tag per page.
|
|
301
|
-
|
|
312
|
+
* @param upToBlockNumber - If set, only return logs from blocks up to and including this block number.
|
|
313
|
+
*/ getPrivateLogsByTags(tags, page, upToBlockNumber) {
|
|
302
314
|
try {
|
|
303
|
-
return this.#logStore.getPrivateLogsByTags(tags, page);
|
|
315
|
+
return this.#logStore.getPrivateLogsByTags(tags, page, upToBlockNumber);
|
|
304
316
|
} catch (err) {
|
|
305
317
|
return Promise.reject(err);
|
|
306
318
|
}
|
|
@@ -311,9 +323,10 @@ export const MAX_FUNCTION_NAME_LEN = 256;
|
|
|
311
323
|
* @param contractAddress - The contract address to search logs for.
|
|
312
324
|
* @param tags - The tags to search for.
|
|
313
325
|
* @param page - The page number (0-indexed) for pagination. Returns at most 10 logs per tag per page.
|
|
314
|
-
|
|
326
|
+
* @param upToBlockNumber - If set, only return logs from blocks up to and including this block number.
|
|
327
|
+
*/ getPublicLogsByTagsFromContract(contractAddress, tags, page, upToBlockNumber) {
|
|
315
328
|
try {
|
|
316
|
-
return this.#logStore.getPublicLogsByTagsFromContract(contractAddress, tags, page);
|
|
329
|
+
return this.#logStore.getPublicLogsByTagsFromContract(contractAddress, tags, page, upToBlockNumber);
|
|
317
330
|
} catch (err) {
|
|
318
331
|
return Promise.reject(err);
|
|
319
332
|
}
|
|
@@ -352,6 +365,18 @@ export const MAX_FUNCTION_NAME_LEN = 256;
|
|
|
352
365
|
*/ async setProvenCheckpointNumber(checkpointNumber) {
|
|
353
366
|
await this.#blockStore.setProvenCheckpointNumber(checkpointNumber);
|
|
354
367
|
}
|
|
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();
|
|
373
|
+
}
|
|
374
|
+
/**
|
|
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
|
+
}
|
|
355
380
|
async setBlockSynchedL1BlockNumber(l1BlockNumber) {
|
|
356
381
|
await this.#blockStore.setSynchedL1BlockNumber(l1BlockNumber);
|
|
357
382
|
}
|
|
@@ -384,6 +409,9 @@ export const MAX_FUNCTION_NAME_LEN = 256;
|
|
|
384
409
|
/** Deletes all L1 to L2 messages up until (excluding) the target checkpoint number. */ rollbackL1ToL2MessagesToCheckpoint(targetCheckpointNumber) {
|
|
385
410
|
return this.#messageStore.rollbackL1ToL2MessagesToCheckpoint(targetCheckpointNumber);
|
|
386
411
|
}
|
|
412
|
+
/** Persists the inbox tree-in-progress checkpoint number from L1 state. */ setInboxTreeInProgress(value) {
|
|
413
|
+
return this.#messageStore.setInboxTreeInProgress(value);
|
|
414
|
+
}
|
|
387
415
|
/** Returns an async iterator to all L1 to L2 messages on the range. */ iterateL1ToL2Messages(range = {}) {
|
|
388
416
|
return this.#messageStore.iterateL1ToL2Messages(range);
|
|
389
417
|
}
|
|
@@ -397,6 +425,28 @@ export const MAX_FUNCTION_NAME_LEN = 256;
|
|
|
397
425
|
return this.#blockStore.setPendingChainValidationStatus(status);
|
|
398
426
|
}
|
|
399
427
|
/**
|
|
428
|
+
* Gets the L2 block number of the proposed checkpoint.
|
|
429
|
+
* @returns The block number of the proposed checkpoint, or the checkpointed block number if none.
|
|
430
|
+
*/ getProposedCheckpointL2BlockNumber() {
|
|
431
|
+
return this.#blockStore.getProposedCheckpointL2BlockNumber();
|
|
432
|
+
}
|
|
433
|
+
/** Returns the checkpoint data at the proposed tip */ getProposedCheckpoint() {
|
|
434
|
+
return this.#blockStore.getProposedCheckpoint();
|
|
435
|
+
}
|
|
436
|
+
/** Returns the proposed checkpoint data, or undefined if no proposed checkpoint exists. No fallback to confirmed. */ getProposedCheckpointOnly() {
|
|
437
|
+
return this.#blockStore.getProposedCheckpointOnly();
|
|
438
|
+
}
|
|
439
|
+
/**
|
|
440
|
+
* Set proposed checkpoint
|
|
441
|
+
* @param proposedCheckpoint
|
|
442
|
+
* @returns
|
|
443
|
+
*/ setProposedCheckpoint(proposedCheckpoint) {
|
|
444
|
+
return this.#blockStore.setProposedCheckpoint(proposedCheckpoint);
|
|
445
|
+
}
|
|
446
|
+
/** Deletes the proposed checkpoint from storage. */ deleteProposedCheckpoint() {
|
|
447
|
+
return this.#blockStore.deleteProposedCheckpoint();
|
|
448
|
+
}
|
|
449
|
+
/**
|
|
400
450
|
* Gets the number of the latest L2 block processed.
|
|
401
451
|
* @returns The number of the latest L2 block processed.
|
|
402
452
|
*/ getCheckpointedL2BlockNumber() {
|
|
@@ -428,6 +478,9 @@ export const MAX_FUNCTION_NAME_LEN = 256;
|
|
|
428
478
|
*/ getCheckpointData(checkpointNumber) {
|
|
429
479
|
return this.#blockStore.getCheckpointData(checkpointNumber);
|
|
430
480
|
}
|
|
481
|
+
/** Returns checkpoint data for all checkpoints whose slot falls within the given range (inclusive). */ getCheckpointDataForSlotRange(startSlot, endSlot) {
|
|
482
|
+
return this.#blockStore.getCheckpointDataForSlotRange(startSlot, endSlot);
|
|
483
|
+
}
|
|
431
484
|
/**
|
|
432
485
|
* Gets all blocks that have the given slot number.
|
|
433
486
|
* @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,
|
|
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":"
|
|
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"}
|