@aztec/archiver 0.0.1-commit.d6f2b3f94 → 0.0.1-commit.d939eb5aa
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 +12 -8
- package/dest/archiver.d.ts.map +1 -1
- package/dest/archiver.js +83 -114
- 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 +29 -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 +32 -28
- 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 +11 -11
- package/dest/l1/data_retrieval.d.ts.map +1 -1
- package/dest/l1/data_retrieval.js +35 -34
- 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 +18 -3
- package/dest/modules/instrumentation.d.ts.map +1 -1
- package/dest/modules/instrumentation.js +36 -8
- package/dest/modules/l1_synchronizer.d.ts +7 -9
- package/dest/modules/l1_synchronizer.d.ts.map +1 -1
- package/dest/modules/l1_synchronizer.js +179 -137
- 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 +66 -28
- package/dest/store/block_store.d.ts.map +1 -1
- package/dest/store/block_store.js +357 -136
- 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 +61 -24
- package/dest/store/kv_archiver_store.d.ts.map +1 -1
- package/dest/store/kv_archiver_store.js +75 -27
- 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 +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 +21 -1
- package/dest/test/fake_l1_state.d.ts.map +1 -1
- package/dest/test/fake_l1_state.js +133 -26
- 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 -2
- package/package.json +13 -13
- package/src/archiver.ts +106 -139
- package/src/config.ts +9 -2
- package/src/errors.ts +70 -26
- package/src/factory.ts +30 -16
- package/src/index.ts +1 -0
- package/src/l1/README.md +25 -68
- package/src/l1/bin/retrieve-calldata.ts +40 -27
- package/src/l1/calldata_retriever.ts +250 -379
- package/src/l1/data_retrieval.ts +31 -37
- 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 +48 -9
- package/src/modules/l1_synchronizer.ts +203 -172
- package/src/modules/validation.ts +2 -2
- package/src/store/block_store.ts +451 -172
- 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 +115 -41
- package/src/store/l2_tips_cache.ts +134 -0
- 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 +178 -30
- 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 -2
|
@@ -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,13 +365,20 @@ export const MAX_FUNCTION_NAME_LEN = 256;
|
|
|
352
365
|
*/ async setProvenCheckpointNumber(checkpointNumber) {
|
|
353
366
|
await this.#blockStore.setProvenCheckpointNumber(checkpointNumber);
|
|
354
367
|
}
|
|
355
|
-
|
|
356
|
-
|
|
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();
|
|
357
373
|
}
|
|
358
374
|
/**
|
|
359
|
-
* Stores the
|
|
360
|
-
|
|
361
|
-
|
|
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);
|
|
362
382
|
}
|
|
363
383
|
/**
|
|
364
384
|
* Returns the number of the most recent proven block
|
|
@@ -384,6 +404,9 @@ export const MAX_FUNCTION_NAME_LEN = 256;
|
|
|
384
404
|
/** Deletes all L1 to L2 messages up until (excluding) the target checkpoint number. */ rollbackL1ToL2MessagesToCheckpoint(targetCheckpointNumber) {
|
|
385
405
|
return this.#messageStore.rollbackL1ToL2MessagesToCheckpoint(targetCheckpointNumber);
|
|
386
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
|
+
}
|
|
387
410
|
/** Returns an async iterator to all L1 to L2 messages on the range. */ iterateL1ToL2Messages(range = {}) {
|
|
388
411
|
return this.#messageStore.iterateL1ToL2Messages(range);
|
|
389
412
|
}
|
|
@@ -397,6 +420,28 @@ export const MAX_FUNCTION_NAME_LEN = 256;
|
|
|
397
420
|
return this.#blockStore.setPendingChainValidationStatus(status);
|
|
398
421
|
}
|
|
399
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
|
+
/**
|
|
400
445
|
* Gets the number of the latest L2 block processed.
|
|
401
446
|
* @returns The number of the latest L2 block processed.
|
|
402
447
|
*/ getCheckpointedL2BlockNumber() {
|
|
@@ -428,6 +473,9 @@ export const MAX_FUNCTION_NAME_LEN = 256;
|
|
|
428
473
|
*/ getCheckpointData(checkpointNumber) {
|
|
429
474
|
return this.#blockStore.getCheckpointData(checkpointNumber);
|
|
430
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
|
+
}
|
|
431
479
|
/**
|
|
432
480
|
* Gets all blocks that have the given slot number.
|
|
433
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,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibDJfdGlwc19jYWNoZS5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3N0b3JlL2wyX3RpcHNfY2FjaGUudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBRUEsT0FBTyxFQUtMLEtBQUssTUFBTSxFQUNaLE1BQU0scUJBQXFCLENBQUM7QUFFN0IsT0FBTyxLQUFLLEVBQUUsVUFBVSxFQUFFLE1BQU0sa0JBQWtCLENBQUM7QUFFbkQ7Ozs7R0FJRztBQUNILHFCQUFhLFdBQVc7O0lBR1YsT0FBTyxDQUFDLFVBQVU7SUFBOUIsWUFBb0IsVUFBVSxFQUFFLFVBQVUsRUFBSTtJQUU5Qyw0RUFBNEU7SUFDckUsU0FBUyxJQUFJLE9BQU8sQ0FBQyxNQUFNLENBQUMsQ0FFbEM7SUFFRCxpSEFBaUg7SUFDcEcsT0FBTyxJQUFJLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FHcEM7WUFFYSxhQUFhO1lBMEViLG9DQUFvQztZQWFwQyx1QkFBdUI7Q0FhdEMifQ==
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"l2_tips_cache.d.ts","sourceRoot":"","sources":["../../src/store/l2_tips_cache.ts"],"names":[],"mappings":"AAEA,OAAO,EAKL,KAAK,MAAM,EACZ,MAAM,qBAAqB,CAAC;AAE7B,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 { INITIAL_L2_BLOCK_NUM } from '@aztec/constants';
|
|
2
|
+
import { BlockNumber, CheckpointNumber } from '@aztec/foundation/branded-types';
|
|
3
|
+
import { GENESIS_BLOCK_HEADER_HASH, 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,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibG9nX3N0b3JlLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvc3RvcmUvbG9nX3N0b3JlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUNBLE9BQU8sRUFBRSxXQUFXLEVBQUUsTUFBTSxpQ0FBaUMsQ0FBQztBQUk5RCxPQUFPLEtBQUssRUFBRSxpQkFBaUIsRUFBaUIsTUFBTSxpQkFBaUIsQ0FBQztBQUN4RSxPQUFPLEtBQUssRUFBRSxZQUFZLEVBQUUsTUFBTSw2QkFBNkIsQ0FBQztBQUNoRSxPQUFPLEVBQWEsT0FBTyxFQUFFLE1BQU0scUJBQXFCLENBQUM7QUFFekQsT0FBTyxLQUFLLEVBQUUsNEJBQTRCLEVBQUUscUJBQXFCLEVBQUUsTUFBTSxpQ0FBaUMsQ0FBQztBQUMzRyxPQUFPLEVBSUwsS0FBSyxTQUFTLEVBR2QsS0FBSyxTQUFTLEVBQ2QsR0FBRyxFQUNILGFBQWEsRUFDZCxNQUFNLG9CQUFvQixDQUFDO0FBSTVCLE9BQU8sS0FBSyxFQUFFLFVBQVUsRUFBRSxNQUFNLGtCQUFrQixDQUFDO0FBRW5EOztHQUVHO0FBQ0gscUJBQWEsUUFBUTs7SUFhakIsT0FBTyxDQUFDLEVBQUU7SUFDVixPQUFPLENBQUMsVUFBVTtJQUZwQixZQUNVLEVBQUUsRUFBRSxpQkFBaUIsRUFDckIsVUFBVSxFQUFFLFVBQVUsRUFDOUIsZUFBZSxHQUFFLE1BQWEsRUFVL0I7SUFvT0Q7Ozs7T0FJRztJQUNILE9BQU8sQ0FBQyxNQUFNLEVBQUUsT0FBTyxFQUFFLEdBQUcsT0FBTyxDQUFDLE9BQU8sQ0FBQyxDQVMzQztJQWNELFVBQVUsQ0FBQyxNQUFNLEVBQUUsT0FBTyxFQUFFLEdBQUcsT0FBTyxDQUFDLE9BQU8sQ0FBQyxDQTBEOUM7SUFFRDs7Ozs7Ozs7T0FRRztJQUNHLG9CQUFvQixDQUN4QixJQUFJLEVBQUUsU0FBUyxFQUFFLEVBQ2pCLElBQUksR0FBRSxNQUFVLEVBQ2hCLGVBQWUsQ0FBQyxFQUFFLFdBQVcsR0FDNUIsT0FBTyxDQUFDLGFBQWEsRUFBRSxFQUFFLENBQUMsQ0FnQjVCO0lBRUQ7Ozs7Ozs7OztPQVNHO0lBQ0csK0JBQStCLENBQ25DLGVBQWUsRUFBRSxZQUFZLEVBQzdCLElBQUksRUFBRSxHQUFHLEVBQUUsRUFDWCxJQUFJLEdBQUUsTUFBVSxFQUNoQixlQUFlLENBQUMsRUFBRSxXQUFXLEdBQzVCLE9BQU8sQ0FBQyxhQUFhLEVBQUUsRUFBRSxDQUFDLENBb0I1QjtJQUVEOzs7O09BSUc7SUFDSCxhQUFhLENBQUMsTUFBTSxFQUFFLFNBQVMsR0FBRyxPQUFPLENBQUMscUJBQXFCLENBQUMsQ0FRL0Q7SUErRkQ7Ozs7T0FJRztJQUNILG9CQUFvQixDQUFDLE1BQU0sRUFBRSxTQUFTLEdBQUcsT0FBTyxDQUFDLDRCQUE0QixDQUFDLENBUTdFO0NBNktGIn0=
|
|
@@ -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;AAI9D,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;IAcD,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"}
|
package/dest/store/log_store.js
CHANGED
|
@@ -1,13 +1,13 @@
|
|
|
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 { BlockHash } from '@aztec/stdlib/block';
|
|
8
7
|
import { MAX_LOGS_PER_TAG } from '@aztec/stdlib/interfaces/api-limit';
|
|
9
8
|
import { ContractClassLog, ExtendedContractClassLog, ExtendedPublicLog, LogId, PublicLog, TxScopedL2Log } from '@aztec/stdlib/logs';
|
|
10
9
|
import { TxHash } from '@aztec/stdlib/tx';
|
|
10
|
+
import { OutOfOrderLogInsertionError } from '../errors.js';
|
|
11
11
|
/**
|
|
12
12
|
* A store for logs
|
|
13
13
|
*/ export class LogStore {
|
|
@@ -108,7 +108,16 @@ import { TxHash } from '@aztec/stdlib/tx';
|
|
|
108
108
|
})));
|
|
109
109
|
for (const taggedLogBuffer of currentPrivateTaggedLogs){
|
|
110
110
|
if (taggedLogBuffer.logBuffers && taggedLogBuffer.logBuffers.length > 0) {
|
|
111
|
-
|
|
111
|
+
const newLogs = privateTaggedLogs.get(taggedLogBuffer.tag);
|
|
112
|
+
if (newLogs.length === 0) {
|
|
113
|
+
continue;
|
|
114
|
+
}
|
|
115
|
+
const lastExisting = TxScopedL2Log.fromBuffer(taggedLogBuffer.logBuffers.at(-1));
|
|
116
|
+
const firstNew = TxScopedL2Log.fromBuffer(newLogs[0]);
|
|
117
|
+
if (lastExisting.blockNumber > firstNew.blockNumber) {
|
|
118
|
+
throw new OutOfOrderLogInsertionError('private', taggedLogBuffer.tag, lastExisting.blockNumber, firstNew.blockNumber);
|
|
119
|
+
}
|
|
120
|
+
privateTaggedLogs.set(taggedLogBuffer.tag, taggedLogBuffer.logBuffers.concat(newLogs));
|
|
112
121
|
}
|
|
113
122
|
}
|
|
114
123
|
for (const block of newBlocks){
|
|
@@ -130,7 +139,16 @@ import { TxHash } from '@aztec/stdlib/tx';
|
|
|
130
139
|
})));
|
|
131
140
|
for (const taggedLogBuffer of currentPublicTaggedLogs){
|
|
132
141
|
if (taggedLogBuffer.logBuffers && taggedLogBuffer.logBuffers.length > 0) {
|
|
133
|
-
|
|
142
|
+
const newLogs = publicTaggedLogs.get(taggedLogBuffer.tag);
|
|
143
|
+
if (newLogs.length === 0) {
|
|
144
|
+
continue;
|
|
145
|
+
}
|
|
146
|
+
const lastExisting = TxScopedL2Log.fromBuffer(taggedLogBuffer.logBuffers.at(-1));
|
|
147
|
+
const firstNew = TxScopedL2Log.fromBuffer(newLogs[0]);
|
|
148
|
+
if (lastExisting.blockNumber > firstNew.blockNumber) {
|
|
149
|
+
throw new OutOfOrderLogInsertionError('public', taggedLogBuffer.tag, lastExisting.blockNumber, firstNew.blockNumber);
|
|
150
|
+
}
|
|
151
|
+
publicTaggedLogs.set(taggedLogBuffer.tag, taggedLogBuffer.logBuffers.concat(newLogs));
|
|
134
152
|
}
|
|
135
153
|
}
|
|
136
154
|
for (const block of newBlocks){
|
|
@@ -184,22 +202,41 @@ import { TxHash } from '@aztec/stdlib/tx';
|
|
|
184
202
|
]);
|
|
185
203
|
}
|
|
186
204
|
#unpackBlockHash(reader) {
|
|
187
|
-
|
|
188
|
-
if (!blockHash) {
|
|
205
|
+
if (reader.remainingBytes() === 0) {
|
|
189
206
|
throw new Error('Failed to read block hash from log entry buffer');
|
|
190
207
|
}
|
|
191
|
-
return
|
|
208
|
+
return BlockHash.fromBuffer(reader);
|
|
192
209
|
}
|
|
193
210
|
deleteLogs(blocks) {
|
|
194
211
|
return this.db.transactionAsync(async ()=>{
|
|
195
|
-
|
|
196
|
-
|
|
197
|
-
|
|
198
|
-
|
|
199
|
-
|
|
200
|
-
|
|
201
|
-
|
|
202
|
-
|
|
212
|
+
const blockNumbers = new Set(blocks.map((block)=>block.number));
|
|
213
|
+
const firstBlockToDelete = Math.min(...blockNumbers);
|
|
214
|
+
// Collect all unique private tags across all blocks being deleted
|
|
215
|
+
const allPrivateTags = new Set(compactArray(await Promise.all(blocks.map((block)=>this.#privateLogKeysByBlock.getAsync(block.number)))).flat());
|
|
216
|
+
// Trim private logs: for each tag, delete all instances including and after the first block being deleted.
|
|
217
|
+
// This hinges on the invariant that logs for a given tag are always inserted in order of block number, which is enforced in #addPrivateLogs.
|
|
218
|
+
for (const tag of allPrivateTags){
|
|
219
|
+
const existing = await this.#privateLogsByTag.getAsync(tag);
|
|
220
|
+
if (existing === undefined || existing.length === 0) {
|
|
221
|
+
continue;
|
|
222
|
+
}
|
|
223
|
+
const lastIndexToKeep = existing.findLastIndex((buf)=>TxScopedL2Log.getBlockNumberFromBuffer(buf) < firstBlockToDelete);
|
|
224
|
+
const remaining = existing.slice(0, lastIndexToKeep + 1);
|
|
225
|
+
await (remaining.length > 0 ? this.#privateLogsByTag.set(tag, remaining) : this.#privateLogsByTag.delete(tag));
|
|
226
|
+
}
|
|
227
|
+
// Collect all unique public keys across all blocks being deleted
|
|
228
|
+
const allPublicKeys = new Set(compactArray(await Promise.all(blocks.map((block)=>this.#publicLogKeysByBlock.getAsync(block.number)))).flat());
|
|
229
|
+
// And do the same as we did with private logs
|
|
230
|
+
for (const key of allPublicKeys){
|
|
231
|
+
const existing = await this.#publicLogsByContractAndTag.getAsync(key);
|
|
232
|
+
if (existing === undefined || existing.length === 0) {
|
|
233
|
+
continue;
|
|
234
|
+
}
|
|
235
|
+
const lastIndexToKeep = existing.findLastIndex((buf)=>TxScopedL2Log.getBlockNumberFromBuffer(buf) < firstBlockToDelete);
|
|
236
|
+
const remaining = existing.slice(0, lastIndexToKeep + 1);
|
|
237
|
+
await (remaining.length > 0 ? this.#publicLogsByContractAndTag.set(key, remaining) : this.#publicLogsByContractAndTag.delete(key));
|
|
238
|
+
}
|
|
239
|
+
// After trimming the tagged logs, we can delete the block-level keys that track which tags are in which blocks.
|
|
203
240
|
await Promise.all(blocks.map((block)=>Promise.all([
|
|
204
241
|
this.#publicLogsByBlock.delete(block.number),
|
|
205
242
|
this.#privateLogKeysByBlock.delete(block.number),
|
|
@@ -214,13 +251,23 @@ import { TxHash } from '@aztec/stdlib/tx';
|
|
|
214
251
|
* array implies no logs match that tag.
|
|
215
252
|
* @param tags - The tags to search for.
|
|
216
253
|
* @param page - The page number (0-indexed) for pagination.
|
|
254
|
+
* @param upToBlockNumber - If set, only return logs from blocks up to and including this block number.
|
|
217
255
|
* @returns An array of log arrays, one per tag. Returns at most MAX_LOGS_PER_TAG logs per tag per page. If
|
|
218
256
|
* MAX_LOGS_PER_TAG logs are returned for a tag, the caller should fetch the next page to check for more logs.
|
|
219
|
-
*/ async getPrivateLogsByTags(tags, page = 0) {
|
|
257
|
+
*/ async getPrivateLogsByTags(tags, page = 0, upToBlockNumber) {
|
|
220
258
|
const logs = await Promise.all(tags.map((tag)=>this.#privateLogsByTag.getAsync(tag.toString())));
|
|
221
259
|
const start = page * MAX_LOGS_PER_TAG;
|
|
222
260
|
const end = start + MAX_LOGS_PER_TAG;
|
|
223
|
-
return logs.map((logBuffers)=>
|
|
261
|
+
return logs.map((logBuffers)=>{
|
|
262
|
+
const deserialized = logBuffers?.slice(start, end).map((buf)=>TxScopedL2Log.fromBuffer(buf)) ?? [];
|
|
263
|
+
if (upToBlockNumber !== undefined) {
|
|
264
|
+
const cutoff = deserialized.findIndex((log)=>log.blockNumber > upToBlockNumber);
|
|
265
|
+
if (cutoff !== -1) {
|
|
266
|
+
return deserialized.slice(0, cutoff);
|
|
267
|
+
}
|
|
268
|
+
}
|
|
269
|
+
return deserialized;
|
|
270
|
+
});
|
|
224
271
|
}
|
|
225
272
|
/**
|
|
226
273
|
* Gets public logs that match any of the `tags` from the specified contract. For each tag, an array of matching
|
|
@@ -228,16 +275,26 @@ import { TxHash } from '@aztec/stdlib/tx';
|
|
|
228
275
|
* @param contractAddress - The contract address to search logs for.
|
|
229
276
|
* @param tags - The tags to search for.
|
|
230
277
|
* @param page - The page number (0-indexed) for pagination.
|
|
278
|
+
* @param upToBlockNumber - If set, only return logs from blocks up to and including this block number.
|
|
231
279
|
* @returns An array of log arrays, one per tag. Returns at most MAX_LOGS_PER_TAG logs per tag per page. If
|
|
232
280
|
* MAX_LOGS_PER_TAG logs are returned for a tag, the caller should fetch the next page to check for more logs.
|
|
233
|
-
*/ async getPublicLogsByTagsFromContract(contractAddress, tags, page = 0) {
|
|
281
|
+
*/ async getPublicLogsByTagsFromContract(contractAddress, tags, page = 0, upToBlockNumber) {
|
|
234
282
|
const logs = await Promise.all(tags.map((tag)=>{
|
|
235
283
|
const key = `${contractAddress.toString()}_${tag.value.toString()}`;
|
|
236
284
|
return this.#publicLogsByContractAndTag.getAsync(key);
|
|
237
285
|
}));
|
|
238
286
|
const start = page * MAX_LOGS_PER_TAG;
|
|
239
287
|
const end = start + MAX_LOGS_PER_TAG;
|
|
240
|
-
return logs.map((logBuffers)=>
|
|
288
|
+
return logs.map((logBuffers)=>{
|
|
289
|
+
const deserialized = logBuffers?.slice(start, end).map((buf)=>TxScopedL2Log.fromBuffer(buf)) ?? [];
|
|
290
|
+
if (upToBlockNumber !== undefined) {
|
|
291
|
+
const cutoff = deserialized.findIndex((log)=>log.blockNumber > upToBlockNumber);
|
|
292
|
+
if (cutoff !== -1) {
|
|
293
|
+
return deserialized.slice(0, cutoff);
|
|
294
|
+
}
|
|
295
|
+
}
|
|
296
|
+
return deserialized;
|
|
297
|
+
});
|
|
241
298
|
}
|
|
242
299
|
/**
|
|
243
300
|
* Gets public logs based on the provided filter.
|
|
@@ -424,11 +481,20 @@ import { TxHash } from '@aztec/stdlib/tx';
|
|
|
424
481
|
};
|
|
425
482
|
}
|
|
426
483
|
#accumulatePublicLogs(results, blockNumber, blockHash, txIndex, txHash, txLogs, filter = {}) {
|
|
484
|
+
if (filter.fromBlock && blockNumber < filter.fromBlock) {
|
|
485
|
+
return false;
|
|
486
|
+
}
|
|
487
|
+
if (filter.toBlock && blockNumber >= filter.toBlock) {
|
|
488
|
+
return false;
|
|
489
|
+
}
|
|
490
|
+
if (filter.txHash && !txHash.equals(filter.txHash)) {
|
|
491
|
+
return false;
|
|
492
|
+
}
|
|
427
493
|
let maxLogsHit = false;
|
|
428
494
|
let logIndex = typeof filter.afterLog?.logIndex === 'number' ? filter.afterLog.logIndex + 1 : 0;
|
|
429
495
|
for(; logIndex < txLogs.length; logIndex++){
|
|
430
496
|
const log = txLogs[logIndex];
|
|
431
|
-
if (!filter.contractAddress || log.contractAddress.equals(filter.contractAddress)) {
|
|
497
|
+
if ((!filter.contractAddress || log.contractAddress.equals(filter.contractAddress)) && (!filter.tag || log.fields[0]?.equals(filter.tag))) {
|
|
432
498
|
results.push(new ExtendedPublicLog(new LogId(BlockNumber(blockNumber), blockHash, txHash, txIndex, logIndex), log));
|
|
433
499
|
if (results.length >= this.#logsMaxPageSize) {
|
|
434
500
|
maxLogsHit = true;
|
|
@@ -439,6 +505,15 @@ import { TxHash } from '@aztec/stdlib/tx';
|
|
|
439
505
|
return maxLogsHit;
|
|
440
506
|
}
|
|
441
507
|
#accumulateContractClassLogs(results, blockNumber, blockHash, txIndex, txHash, txLogs, filter = {}) {
|
|
508
|
+
if (filter.fromBlock && blockNumber < filter.fromBlock) {
|
|
509
|
+
return false;
|
|
510
|
+
}
|
|
511
|
+
if (filter.toBlock && blockNumber >= filter.toBlock) {
|
|
512
|
+
return false;
|
|
513
|
+
}
|
|
514
|
+
if (filter.txHash && !txHash.equals(filter.txHash)) {
|
|
515
|
+
return false;
|
|
516
|
+
}
|
|
442
517
|
let maxLogsHit = false;
|
|
443
518
|
let logIndex = typeof filter.afterLog?.logIndex === 'number' ? filter.afterLog.logIndex + 1 : 0;
|
|
444
519
|
for(; logIndex < txLogs.length; logIndex++){
|
|
@@ -29,6 +29,10 @@ export declare class MessageStore {
|
|
|
29
29
|
*/
|
|
30
30
|
getL1ToL2MessageIndex(l1ToL2Message: Fr): Promise<bigint | undefined>;
|
|
31
31
|
getLastMessage(): Promise<InboxMessage | undefined>;
|
|
32
|
+
/** Returns the inbox tree-in-progress checkpoint number from L1, or undefined if not yet set. */
|
|
33
|
+
getInboxTreeInProgress(): Promise<bigint | undefined>;
|
|
34
|
+
/** Atomically updates the message sync state: the L1 sync point and the inbox tree-in-progress marker. */
|
|
35
|
+
setMessageSyncState(l1Block: L1BlockId, treeInProgress: bigint | undefined): Promise<void>;
|
|
32
36
|
getL1ToL2Messages(checkpointNumber: CheckpointNumber): Promise<Fr[]>;
|
|
33
37
|
iterateL1ToL2Messages(range?: CustomRange<bigint>): AsyncIterableIterator<InboxMessage>;
|
|
34
38
|
removeL1ToL2Messages(startIndex: bigint): Promise<void>;
|
|
@@ -37,4 +41,4 @@ export declare class MessageStore {
|
|
|
37
41
|
private leafToIndexKey;
|
|
38
42
|
private increaseTotalMessageCount;
|
|
39
43
|
}
|
|
40
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
44
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibWVzc2FnZV9zdG9yZS5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3N0b3JlL21lc3NhZ2Vfc3RvcmUudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxLQUFLLEVBQUUsU0FBUyxFQUFFLE1BQU0sMEJBQTBCLENBQUM7QUFDMUQsT0FBTyxFQUFFLGdCQUFnQixFQUFFLE1BQU0saUNBQWlDLENBQUM7QUFFbkUsT0FBTyxFQUFFLEVBQUUsRUFBRSxNQUFNLGdDQUFnQyxDQUFDO0FBSXBELE9BQU8sRUFDTCxLQUFLLGlCQUFpQixFQUd0QixLQUFLLFdBQVcsRUFFakIsTUFBTSxpQkFBaUIsQ0FBQztBQUl6QixPQUFPLEVBQ0wsS0FBSyxZQUFZLEVBSWxCLE1BQU0sNkJBQTZCLENBQUM7QUFFckMscUJBQWEsaUJBQWtCLFNBQVEsS0FBSzthQUd4QixZQUFZLEVBQUUsWUFBWTtJQUY1QyxZQUNFLE9BQU8sRUFBRSxNQUFNLEVBQ0MsWUFBWSxFQUFFLFlBQVksRUFJM0M7Q0FDRjtBQUVELHFCQUFhLFlBQVk7O0lBY1gsT0FBTyxDQUFDLEVBQUU7SUFBdEIsWUFBb0IsRUFBRSxFQUFFLGlCQUFpQixFQU14QztJQUVZLDBCQUEwQixJQUFJLE9BQU8sQ0FBQyxNQUFNLENBQUMsQ0FFekQ7SUFFRCxxQ0FBcUM7SUFDeEIsaUJBQWlCLElBQUksT0FBTyxDQUFDLFNBQVMsR0FBRyxTQUFTLENBQUMsQ0FRL0Q7SUFFRCxvQ0FBb0M7SUFDdkIsaUJBQWlCLENBQUMsT0FBTyxFQUFFLFNBQVMsR0FBRyxPQUFPLENBQUMsSUFBSSxDQUFDLENBR2hFO0lBRUQ7Ozs7T0FJRztJQUNJLGlCQUFpQixDQUFDLFFBQVEsRUFBRSxZQUFZLEVBQUUsR0FBRyxPQUFPLENBQUMsSUFBSSxDQUFDLENBb0ZoRTtJQUVEOzs7O09BSUc7SUFDSSxxQkFBcUIsQ0FBQyxhQUFhLEVBQUUsRUFBRSxHQUFHLE9BQU8sQ0FBQyxNQUFNLEdBQUcsU0FBUyxDQUFDLENBRTNFO0lBRVksY0FBYyxJQUFJLE9BQU8sQ0FBQyxZQUFZLEdBQUcsU0FBUyxDQUFDLENBRy9EO0lBRUQsaUdBQWlHO0lBQzFGLHNCQUFzQixJQUFJLE9BQU8sQ0FBQyxNQUFNLEdBQUcsU0FBUyxDQUFDLENBRTNEO0lBRUQsMEdBQTBHO0lBQ25HLG1CQUFtQixDQUFDLE9BQU8sRUFBRSxTQUFTLEVBQUUsY0FBYyxFQUFFLE1BQU0sR0FBRyxTQUFTLEdBQUcsT0FBTyxDQUFDLElBQUksQ0FBQyxDQVNoRztJQUVZLGlCQUFpQixDQUFDLGdCQUFnQixFQUFFLGdCQUFnQixHQUFHLE9BQU8sQ0FBQyxFQUFFLEVBQUUsQ0FBQyxDQTRCaEY7SUFFYSxxQkFBcUIsQ0FBQyxLQUFLLEdBQUUsV0FBVyxDQUFDLE1BQU0sQ0FBTSxHQUFHLHFCQUFxQixDQUFDLFlBQVksQ0FBQyxDQUt4RztJQUVNLG9CQUFvQixDQUFDLFVBQVUsRUFBRSxNQUFNLEdBQUcsT0FBTyxDQUFDLElBQUksQ0FBQyxDQWdCN0Q7SUFFTSxrQ0FBa0MsQ0FBQyxzQkFBc0IsRUFBRSxnQkFBZ0IsR0FBRyxPQUFPLENBQUMsSUFBSSxDQUFDLENBSWpHO0lBRUQsT0FBTyxDQUFDLFVBQVU7SUFJbEIsT0FBTyxDQUFDLGNBQWM7WUFJUix5QkFBeUI7Q0FTeEMifQ==
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"message_store.d.ts","sourceRoot":"","sources":["../../src/store/message_store.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,0BAA0B,CAAC;AAC1D,OAAO,EAAE,gBAAgB,EAAE,MAAM,iCAAiC,CAAC;AAEnE,OAAO,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AAIpD,OAAO,EACL,KAAK,iBAAiB,EAGtB,KAAK,WAAW,EAEjB,MAAM,iBAAiB,CAAC;
|
|
1
|
+
{"version":3,"file":"message_store.d.ts","sourceRoot":"","sources":["../../src/store/message_store.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,0BAA0B,CAAC;AAC1D,OAAO,EAAE,gBAAgB,EAAE,MAAM,iCAAiC,CAAC;AAEnE,OAAO,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AAIpD,OAAO,EACL,KAAK,iBAAiB,EAGtB,KAAK,WAAW,EAEjB,MAAM,iBAAiB,CAAC;AAIzB,OAAO,EACL,KAAK,YAAY,EAIlB,MAAM,6BAA6B,CAAC;AAErC,qBAAa,iBAAkB,SAAQ,KAAK;aAGxB,YAAY,EAAE,YAAY;IAF5C,YACE,OAAO,EAAE,MAAM,EACC,YAAY,EAAE,YAAY,EAI3C;CACF;AAED,qBAAa,YAAY;;IAcX,OAAO,CAAC,EAAE;IAAtB,YAAoB,EAAE,EAAE,iBAAiB,EAMxC;IAEY,0BAA0B,IAAI,OAAO,CAAC,MAAM,CAAC,CAEzD;IAED,qCAAqC;IACxB,iBAAiB,IAAI,OAAO,CAAC,SAAS,GAAG,SAAS,CAAC,CAQ/D;IAED,oCAAoC;IACvB,iBAAiB,CAAC,OAAO,EAAE,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC,CAGhE;IAED;;;;OAIG;IACI,iBAAiB,CAAC,QAAQ,EAAE,YAAY,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAoFhE;IAED;;;;OAIG;IACI,qBAAqB,CAAC,aAAa,EAAE,EAAE,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAE3E;IAEY,cAAc,IAAI,OAAO,CAAC,YAAY,GAAG,SAAS,CAAC,CAG/D;IAED,iGAAiG;IAC1F,sBAAsB,IAAI,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAE3D;IAED,0GAA0G;IACnG,mBAAmB,CAAC,OAAO,EAAE,SAAS,EAAE,cAAc,EAAE,MAAM,GAAG,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC,CAShG;IAEY,iBAAiB,CAAC,gBAAgB,EAAE,gBAAgB,GAAG,OAAO,CAAC,EAAE,EAAE,CAAC,CA4BhF;IAEa,qBAAqB,CAAC,KAAK,GAAE,WAAW,CAAC,MAAM,CAAM,GAAG,qBAAqB,CAAC,YAAY,CAAC,CAKxG;IAEM,oBAAoB,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAgB7D;IAEM,kCAAkC,CAAC,sBAAsB,EAAE,gBAAgB,GAAG,OAAO,CAAC,IAAI,CAAC,CAIjG;IAED,OAAO,CAAC,UAAU;IAIlB,OAAO,CAAC,cAAc;YAIR,yBAAyB;CASxC"}
|