@aztec/archiver 0.61.0 → 0.63.0
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/archiver.d.ts +13 -5
- package/dest/archiver/archiver.d.ts.map +1 -1
- package/dest/archiver/archiver.js +49 -26
- package/dest/archiver/archiver_store.d.ts +10 -5
- package/dest/archiver/archiver_store.d.ts.map +1 -1
- package/dest/archiver/archiver_store_test_suite.d.ts.map +1 -1
- package/dest/archiver/archiver_store_test_suite.js +64 -36
- package/dest/archiver/config.d.ts +2 -6
- package/dest/archiver/config.d.ts.map +1 -1
- package/dest/archiver/config.js +3 -6
- package/dest/archiver/epoch_helpers.d.ts +10 -10
- package/dest/archiver/epoch_helpers.d.ts.map +1 -1
- package/dest/archiver/epoch_helpers.js +9 -10
- package/dest/archiver/kv_archiver_store/kv_archiver_store.d.ts +10 -5
- package/dest/archiver/kv_archiver_store/kv_archiver_store.d.ts.map +1 -1
- package/dest/archiver/kv_archiver_store/kv_archiver_store.js +17 -5
- package/dest/archiver/kv_archiver_store/log_store.d.ts +8 -2
- package/dest/archiver/kv_archiver_store/log_store.d.ts.map +1 -1
- package/dest/archiver/kv_archiver_store/log_store.js +144 -57
- package/dest/archiver/kv_archiver_store/message_store.d.ts +2 -3
- package/dest/archiver/kv_archiver_store/message_store.d.ts.map +1 -1
- package/dest/archiver/kv_archiver_store/message_store.js +7 -12
- package/dest/archiver/memory_archiver_store/l1_to_l2_message_store.d.ts +2 -3
- package/dest/archiver/memory_archiver_store/l1_to_l2_message_store.d.ts.map +1 -1
- package/dest/archiver/memory_archiver_store/l1_to_l2_message_store.js +4 -9
- package/dest/archiver/memory_archiver_store/memory_archiver_store.d.ts +15 -7
- package/dest/archiver/memory_archiver_store/memory_archiver_store.d.ts.map +1 -1
- package/dest/archiver/memory_archiver_store/memory_archiver_store.js +139 -35
- package/dest/factory.d.ts +5 -2
- package/dest/factory.d.ts.map +1 -1
- package/dest/factory.js +2 -2
- package/dest/rpc/index.d.ts +3 -2
- package/dest/rpc/index.d.ts.map +1 -1
- package/dest/rpc/index.js +10 -3
- 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 -3
- 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 -2
- package/dest/test/mock_l2_block_source.d.ts.map +1 -1
- package/dest/test/mock_l2_block_source.js +6 -4
- package/package.json +10 -10
- package/src/archiver/archiver.ts +60 -31
- package/src/archiver/archiver_store.ts +11 -5
- package/src/archiver/archiver_store_test_suite.ts +85 -40
- package/src/archiver/config.ts +11 -12
- package/src/archiver/epoch_helpers.ts +16 -12
- package/src/archiver/kv_archiver_store/kv_archiver_store.ts +18 -6
- package/src/archiver/kv_archiver_store/log_store.ts +176 -58
- package/src/archiver/kv_archiver_store/message_store.ts +6 -12
- package/src/archiver/memory_archiver_store/l1_to_l2_message_store.ts +3 -8
- package/src/archiver/memory_archiver_store/memory_archiver_store.ts +155 -31
- package/src/factory.ts +6 -3
- package/src/rpc/index.ts +11 -2
- package/src/test/mock_archiver.ts +2 -2
- package/src/test/mock_l1_to_l2_message_source.ts +1 -1
- package/src/test/mock_l2_block_source.ts +5 -3
- package/dest/rpc/archiver_client.d.ts +0 -3
- package/dest/rpc/archiver_client.d.ts.map +0 -1
- package/dest/rpc/archiver_client.js +0 -12
- package/dest/rpc/archiver_server.d.ts +0 -9
- package/dest/rpc/archiver_server.d.ts.map +0 -1
- package/dest/rpc/archiver_server.js +0 -20
- package/src/rpc/archiver_client.ts +0 -29
- package/src/rpc/archiver_server.ts +0 -35
|
@@ -145,13 +145,12 @@ export class KVArchiverDataStore {
|
|
|
145
145
|
return Promise.resolve(__classPrivateFieldGet(this, _KVArchiverDataStore_messageStore, "f").addL1ToL2Messages(messages));
|
|
146
146
|
}
|
|
147
147
|
/**
|
|
148
|
-
* Gets the
|
|
148
|
+
* Gets the L1 to L2 message index in the L1 to L2 message tree.
|
|
149
149
|
* @param l1ToL2Message - The L1 to L2 message.
|
|
150
|
-
* @param startIndex - The index to start searching from.
|
|
151
150
|
* @returns The index of the L1 to L2 message in the L1 to L2 message tree (undefined if not found).
|
|
152
151
|
*/
|
|
153
|
-
getL1ToL2MessageIndex(l1ToL2Message
|
|
154
|
-
return Promise.resolve(__classPrivateFieldGet(this, _KVArchiverDataStore_messageStore, "f").getL1ToL2MessageIndex(l1ToL2Message
|
|
152
|
+
getL1ToL2MessageIndex(l1ToL2Message) {
|
|
153
|
+
return Promise.resolve(__classPrivateFieldGet(this, _KVArchiverDataStore_messageStore, "f").getL1ToL2MessageIndex(l1ToL2Message));
|
|
155
154
|
}
|
|
156
155
|
/**
|
|
157
156
|
* Gets L1 to L2 message (to be) included in a given block.
|
|
@@ -208,6 +207,19 @@ export class KVArchiverDataStore {
|
|
|
208
207
|
return Promise.reject(err);
|
|
209
208
|
}
|
|
210
209
|
}
|
|
210
|
+
/**
|
|
211
|
+
* Gets contract class logs based on the provided filter.
|
|
212
|
+
* @param filter - The filter to apply to the logs.
|
|
213
|
+
* @returns The requested logs.
|
|
214
|
+
*/
|
|
215
|
+
getContractClassLogs(filter) {
|
|
216
|
+
try {
|
|
217
|
+
return Promise.resolve(__classPrivateFieldGet(this, _KVArchiverDataStore_logStore, "f").getContractClassLogs(filter));
|
|
218
|
+
}
|
|
219
|
+
catch (err) {
|
|
220
|
+
return Promise.reject(err);
|
|
221
|
+
}
|
|
222
|
+
}
|
|
211
223
|
/**
|
|
212
224
|
* Gets the number of the latest L2 block processed.
|
|
213
225
|
* @returns The number of the latest L2 block processed.
|
|
@@ -248,4 +260,4 @@ export class KVArchiverDataStore {
|
|
|
248
260
|
}
|
|
249
261
|
}
|
|
250
262
|
_KVArchiverDataStore_blockStore = new WeakMap(), _KVArchiverDataStore_logStore = new WeakMap(), _KVArchiverDataStore_messageStore = new WeakMap(), _KVArchiverDataStore_contractClassStore = new WeakMap(), _KVArchiverDataStore_contractInstanceStore = new WeakMap(), _KVArchiverDataStore_contractArtifactStore = new WeakMap(), _KVArchiverDataStore_log = new WeakMap();
|
|
251
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
263
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"kv_archiver_store.js","sourceRoot":"","sources":["../../../src/archiver/kv_archiver_store/kv_archiver_store.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { type FromLogType, type GetUnencryptedLogsResponse, type L2Block, type L2BlockL2Logs, type LogFilter, LogType, TxScopedL2Log } from '@aztec/circuit-types';
|
|
2
2
|
import { Fr } from '@aztec/circuits.js';
|
|
3
3
|
import { type AztecKVStore } from '@aztec/kv-store';
|
|
4
4
|
import { type BlockStore } from './block_store.js';
|
|
@@ -31,12 +31,18 @@ export declare class LogStore {
|
|
|
31
31
|
* @returns For each received tag, an array of matching logs is returned. An empty array implies no logs match
|
|
32
32
|
* that tag.
|
|
33
33
|
*/
|
|
34
|
-
getLogsByTags(tags: Fr[]): Promise<
|
|
34
|
+
getLogsByTags(tags: Fr[]): Promise<TxScopedL2Log[][]>;
|
|
35
35
|
/**
|
|
36
36
|
* Gets unencrypted logs based on the provided filter.
|
|
37
37
|
* @param filter - The filter to apply to the logs.
|
|
38
38
|
* @returns The requested logs.
|
|
39
39
|
*/
|
|
40
40
|
getUnencryptedLogs(filter: LogFilter): GetUnencryptedLogsResponse;
|
|
41
|
+
/**
|
|
42
|
+
* Gets contract class logs based on the provided filter.
|
|
43
|
+
* @param filter - The filter to apply to the logs.
|
|
44
|
+
* @returns The requested logs.
|
|
45
|
+
*/
|
|
46
|
+
getContractClassLogs(filter: LogFilter): GetUnencryptedLogsResponse;
|
|
41
47
|
}
|
|
42
48
|
//# sourceMappingURL=log_store.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"log_store.d.ts","sourceRoot":"","sources":["../../../src/archiver/kv_archiver_store/log_store.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"log_store.d.ts","sourceRoot":"","sources":["../../../src/archiver/kv_archiver_store/log_store.ts"],"names":[],"mappings":"AAAA,OAAO,EAML,KAAK,WAAW,EAChB,KAAK,0BAA0B,EAC/B,KAAK,OAAO,EACZ,KAAK,aAAa,EAClB,KAAK,SAAS,EAEd,OAAO,EACP,aAAa,EAGd,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAE,EAAE,EAAE,MAAM,oBAAoB,CAAC;AAGxC,OAAO,EAAE,KAAK,YAAY,EAAiB,MAAM,iBAAiB,CAAC;AAEnE,OAAO,EAAE,KAAK,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAEnD;;GAEG;AACH,qBAAa,QAAQ;;IAUP,OAAO,CAAC,EAAE;IAAgB,OAAO,CAAC,UAAU;gBAApC,EAAE,EAAE,YAAY,EAAU,UAAU,EAAE,UAAU,EAAE,eAAe,GAAE,MAAa;IAmEpG;;;;OAIG;IACG,OAAO,CAAC,MAAM,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,OAAO,CAAC;IA2C5C,UAAU,CAAC,MAAM,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,OAAO,CAAC;IAoBrD;;;;;;OAMG;IACF,OAAO,CAAC,QAAQ,SAAS,OAAO,EAC/B,KAAK,EAAE,MAAM,EACb,KAAK,EAAE,MAAM,EACb,OAAO,EAAE,QAAQ,GAChB,gBAAgB,CAAC,aAAa,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC,CAAC;IA6BzD;;;;;OAKG;IACH,aAAa,CAAC,IAAI,EAAE,EAAE,EAAE,GAAG,OAAO,CAAC,aAAa,EAAE,EAAE,CAAC;IAQrD;;;;OAIG;IACH,kBAAkB,CAAC,MAAM,EAAE,SAAS,GAAG,0BAA0B;IA2DjE;;;;OAIG;IACH,oBAAoB,CAAC,MAAM,EAAE,SAAS,GAAG,0BAA0B;CAuHpE"}
|
|
@@ -1,8 +1,8 @@
|
|
|
1
|
-
var _LogStore_instances, _LogStore_noteEncryptedLogsByBlock,
|
|
1
|
+
var _LogStore_instances, _LogStore_noteEncryptedLogsByBlock, _LogStore_logsByTag, _LogStore_logTagsByBlock, _LogStore_encryptedLogsByBlock, _LogStore_unencryptedLogsByBlock, _LogStore_contractClassLogsByBlock, _LogStore_logsMaxPageSize, _LogStore_log, _LogStore_extractTaggedLogs, _LogStore_filterUnencryptedLogsOfTx, _LogStore_filterUnencryptedLogsBetweenBlocks, _LogStore_filterContractClassLogsOfTx, _LogStore_filterContractClassLogsBetweenBlocks, _LogStore_accumulateLogs, _LogStore_getBlockLogs;
|
|
2
2
|
import { __classPrivateFieldGet, __classPrivateFieldSet } from "tslib";
|
|
3
|
-
import {
|
|
3
|
+
import { ContractClass2BlockL2Logs, EncryptedL2BlockL2Logs, EncryptedNoteL2BlockL2Logs, ExtendedUnencryptedL2Log, LogId, LogType, TxScopedL2Log, UnencryptedL2BlockL2Logs, } from '@aztec/circuit-types';
|
|
4
4
|
import { Fr } from '@aztec/circuits.js';
|
|
5
|
-
import { INITIAL_L2_BLOCK_NUM } from '@aztec/circuits.js/constants';
|
|
5
|
+
import { INITIAL_L2_BLOCK_NUM, MAX_NOTE_HASHES_PER_TX } from '@aztec/circuits.js/constants';
|
|
6
6
|
import { createDebugLogger } from '@aztec/foundation/log';
|
|
7
7
|
/**
|
|
8
8
|
* A store for logs
|
|
@@ -13,19 +13,19 @@ export class LogStore {
|
|
|
13
13
|
this.db = db;
|
|
14
14
|
this.blockStore = blockStore;
|
|
15
15
|
_LogStore_noteEncryptedLogsByBlock.set(this, void 0);
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
_LogStore_noteEncryptedLogTagsByBlock.set(this, void 0);
|
|
16
|
+
_LogStore_logsByTag.set(this, void 0);
|
|
17
|
+
_LogStore_logTagsByBlock.set(this, void 0);
|
|
19
18
|
_LogStore_encryptedLogsByBlock.set(this, void 0);
|
|
20
19
|
_LogStore_unencryptedLogsByBlock.set(this, void 0);
|
|
20
|
+
_LogStore_contractClassLogsByBlock.set(this, void 0);
|
|
21
21
|
_LogStore_logsMaxPageSize.set(this, void 0);
|
|
22
22
|
_LogStore_log.set(this, createDebugLogger('aztec:archiver:log_store'));
|
|
23
23
|
__classPrivateFieldSet(this, _LogStore_noteEncryptedLogsByBlock, db.openMap('archiver_note_encrypted_logs_by_block'), "f");
|
|
24
|
-
__classPrivateFieldSet(this,
|
|
25
|
-
__classPrivateFieldSet(this,
|
|
26
|
-
__classPrivateFieldSet(this, _LogStore_noteEncryptedLogTagsByBlock, db.openMultiMap('archiver_note_encrypted_log_tags_by_block'), "f");
|
|
24
|
+
__classPrivateFieldSet(this, _LogStore_logsByTag, db.openMap('archiver_tagged_logs_by_tag'), "f");
|
|
25
|
+
__classPrivateFieldSet(this, _LogStore_logTagsByBlock, db.openMap('archiver_log_tags_by_block'), "f");
|
|
27
26
|
__classPrivateFieldSet(this, _LogStore_encryptedLogsByBlock, db.openMap('archiver_encrypted_logs_by_block'), "f");
|
|
28
27
|
__classPrivateFieldSet(this, _LogStore_unencryptedLogsByBlock, db.openMap('archiver_unencrypted_logs_by_block'), "f");
|
|
28
|
+
__classPrivateFieldSet(this, _LogStore_contractClassLogsByBlock, db.openMap('archiver_contract_class_logs_by_block'), "f");
|
|
29
29
|
__classPrivateFieldSet(this, _LogStore_logsMaxPageSize, logsMaxPageSize, "f");
|
|
30
30
|
}
|
|
31
31
|
/**
|
|
@@ -33,58 +33,55 @@ export class LogStore {
|
|
|
33
33
|
* @param blocks - The blocks for which to add the logs.
|
|
34
34
|
* @returns True if the operation is successful.
|
|
35
35
|
*/
|
|
36
|
-
addLogs(blocks) {
|
|
36
|
+
async addLogs(blocks) {
|
|
37
|
+
const taggedLogsToAdd = blocks
|
|
38
|
+
.flatMap(block => [
|
|
39
|
+
__classPrivateFieldGet(this, _LogStore_instances, "m", _LogStore_extractTaggedLogs).call(this, block, 'noteEncryptedLogs'),
|
|
40
|
+
__classPrivateFieldGet(this, _LogStore_instances, "m", _LogStore_extractTaggedLogs).call(this, block, 'unencryptedLogs'),
|
|
41
|
+
])
|
|
42
|
+
.reduce((acc, val) => {
|
|
43
|
+
for (const [tag, logs] of val.entries()) {
|
|
44
|
+
const currentLogs = acc.get(tag) ?? [];
|
|
45
|
+
acc.set(tag, currentLogs.concat(logs));
|
|
46
|
+
}
|
|
47
|
+
return acc;
|
|
48
|
+
});
|
|
49
|
+
const tagsToUpdate = Array.from(taggedLogsToAdd.keys());
|
|
50
|
+
const currentTaggedLogs = await this.db.transaction(() => tagsToUpdate.map(tag => ({ tag, logBuffers: __classPrivateFieldGet(this, _LogStore_logsByTag, "f").get(tag) })));
|
|
51
|
+
currentTaggedLogs.forEach(taggedLogBuffer => {
|
|
52
|
+
if (taggedLogBuffer.logBuffers && taggedLogBuffer.logBuffers.length > 0) {
|
|
53
|
+
taggedLogsToAdd.set(taggedLogBuffer.tag, taggedLogBuffer.logBuffers.concat(taggedLogsToAdd.get(taggedLogBuffer.tag)));
|
|
54
|
+
}
|
|
55
|
+
});
|
|
37
56
|
return this.db.transaction(() => {
|
|
38
57
|
blocks.forEach(block => {
|
|
58
|
+
const tagsInBlock = [];
|
|
59
|
+
for (const [tag, logs] of taggedLogsToAdd.entries()) {
|
|
60
|
+
void __classPrivateFieldGet(this, _LogStore_logsByTag, "f").set(tag, logs);
|
|
61
|
+
tagsInBlock.push(tag);
|
|
62
|
+
}
|
|
63
|
+
void __classPrivateFieldGet(this, _LogStore_logTagsByBlock, "f").set(block.number, tagsInBlock);
|
|
39
64
|
void __classPrivateFieldGet(this, _LogStore_noteEncryptedLogsByBlock, "f").set(block.number, block.body.noteEncryptedLogs.toBuffer());
|
|
40
|
-
block.body.noteEncryptedLogs.txLogs.forEach(txLogs => {
|
|
41
|
-
const noteLogs = txLogs.unrollLogs();
|
|
42
|
-
noteLogs.forEach(noteLog => {
|
|
43
|
-
if (noteLog.data.length < 32) {
|
|
44
|
-
__classPrivateFieldGet(this, _LogStore_log, "f").warn(`Skipping note log with invalid data length: ${noteLog.data.length}`);
|
|
45
|
-
return;
|
|
46
|
-
}
|
|
47
|
-
try {
|
|
48
|
-
const tag = new Fr(noteLog.data.subarray(0, 32));
|
|
49
|
-
const hexHash = noteLog.hash().toString('hex');
|
|
50
|
-
// Ideally we'd store all of the logs for a matching tag in an AztecMultiMap, but this type doesn't doesn't
|
|
51
|
-
// handle storing buffers well. The 'ordered-binary' encoding returns an error trying to decode buffers
|
|
52
|
-
// ('the number <> cannot be converted to a BigInt because it is not an integer'). We therefore store
|
|
53
|
-
// instead the hashes of the logs.
|
|
54
|
-
void __classPrivateFieldGet(this, _LogStore_noteEncryptedLogHashesByTag, "f").set(tag.toString(), hexHash);
|
|
55
|
-
void __classPrivateFieldGet(this, _LogStore_noteEncryptedLogsByHash, "f").set(hexHash, noteLog.toBuffer());
|
|
56
|
-
void __classPrivateFieldGet(this, _LogStore_noteEncryptedLogTagsByBlock, "f").set(block.number, tag.toString());
|
|
57
|
-
}
|
|
58
|
-
catch (err) {
|
|
59
|
-
__classPrivateFieldGet(this, _LogStore_log, "f").warn(`Failed to add tagged note log to store: ${err}`);
|
|
60
|
-
}
|
|
61
|
-
});
|
|
62
|
-
});
|
|
63
65
|
void __classPrivateFieldGet(this, _LogStore_encryptedLogsByBlock, "f").set(block.number, block.body.encryptedLogs.toBuffer());
|
|
64
66
|
void __classPrivateFieldGet(this, _LogStore_unencryptedLogsByBlock, "f").set(block.number, block.body.unencryptedLogs.toBuffer());
|
|
67
|
+
void __classPrivateFieldGet(this, _LogStore_contractClassLogsByBlock, "f").set(block.number, block.body.contractClassLogs.toBuffer());
|
|
65
68
|
});
|
|
66
69
|
return true;
|
|
67
70
|
});
|
|
68
71
|
}
|
|
69
72
|
async deleteLogs(blocks) {
|
|
70
|
-
const
|
|
71
|
-
return blocks.flatMap(block =>
|
|
72
|
-
});
|
|
73
|
-
const noteLogHashesToDelete = await this.db.transaction(() => {
|
|
74
|
-
return noteTagsToDelete.flatMap(tag => Array.from(__classPrivateFieldGet(this, _LogStore_noteEncryptedLogHashesByTag, "f").getValues(tag)));
|
|
73
|
+
const tagsToDelete = await this.db.transaction(() => {
|
|
74
|
+
return blocks.flatMap(block => __classPrivateFieldGet(this, _LogStore_logTagsByBlock, "f").get(block.number)?.map(tag => tag.toString()) ?? []);
|
|
75
75
|
});
|
|
76
76
|
return this.db.transaction(() => {
|
|
77
77
|
blocks.forEach(block => {
|
|
78
78
|
void __classPrivateFieldGet(this, _LogStore_noteEncryptedLogsByBlock, "f").delete(block.number);
|
|
79
79
|
void __classPrivateFieldGet(this, _LogStore_encryptedLogsByBlock, "f").delete(block.number);
|
|
80
80
|
void __classPrivateFieldGet(this, _LogStore_unencryptedLogsByBlock, "f").delete(block.number);
|
|
81
|
-
void __classPrivateFieldGet(this,
|
|
82
|
-
});
|
|
83
|
-
noteTagsToDelete.forEach(tag => {
|
|
84
|
-
void __classPrivateFieldGet(this, _LogStore_noteEncryptedLogHashesByTag, "f").delete(tag.toString());
|
|
81
|
+
void __classPrivateFieldGet(this, _LogStore_logTagsByBlock, "f").delete(block.number);
|
|
85
82
|
});
|
|
86
|
-
|
|
87
|
-
void __classPrivateFieldGet(this,
|
|
83
|
+
tagsToDelete.forEach(tag => {
|
|
84
|
+
void __classPrivateFieldGet(this, _LogStore_logsByTag, "f").delete(tag.toString());
|
|
88
85
|
});
|
|
89
86
|
return true;
|
|
90
87
|
});
|
|
@@ -131,17 +128,9 @@ export class LogStore {
|
|
|
131
128
|
* that tag.
|
|
132
129
|
*/
|
|
133
130
|
getLogsByTags(tags) {
|
|
134
|
-
return this.db.transaction(() =>
|
|
135
|
-
|
|
136
|
-
|
|
137
|
-
return (logHashes
|
|
138
|
-
.map(hash => __classPrivateFieldGet(this, _LogStore_noteEncryptedLogsByHash, "f").get(hash))
|
|
139
|
-
// addLogs should ensure that we never have undefined logs, but we filter them out regardless to protect
|
|
140
|
-
// ourselves from database corruption
|
|
141
|
-
.filter(noteLogBuffer => noteLogBuffer != undefined)
|
|
142
|
-
.map(noteLogBuffer => EncryptedL2NoteLog.fromBuffer(noteLogBuffer)));
|
|
143
|
-
});
|
|
144
|
-
});
|
|
131
|
+
return this.db.transaction(() => tags
|
|
132
|
+
.map(tag => __classPrivateFieldGet(this, _LogStore_logsByTag, "f").get(tag.toString()))
|
|
133
|
+
.map(noteLogBuffers => noteLogBuffers?.map(noteLogBuffer => TxScopedL2Log.fromBuffer(noteLogBuffer)) ?? []));
|
|
145
134
|
}
|
|
146
135
|
/**
|
|
147
136
|
* Gets unencrypted logs based on the provided filter.
|
|
@@ -159,8 +148,67 @@ export class LogStore {
|
|
|
159
148
|
return __classPrivateFieldGet(this, _LogStore_instances, "m", _LogStore_filterUnencryptedLogsBetweenBlocks).call(this, filter);
|
|
160
149
|
}
|
|
161
150
|
}
|
|
151
|
+
/**
|
|
152
|
+
* Gets contract class logs based on the provided filter.
|
|
153
|
+
* @param filter - The filter to apply to the logs.
|
|
154
|
+
* @returns The requested logs.
|
|
155
|
+
*/
|
|
156
|
+
getContractClassLogs(filter) {
|
|
157
|
+
if (filter.afterLog) {
|
|
158
|
+
return __classPrivateFieldGet(this, _LogStore_instances, "m", _LogStore_filterContractClassLogsBetweenBlocks).call(this, filter);
|
|
159
|
+
}
|
|
160
|
+
else if (filter.txHash) {
|
|
161
|
+
return __classPrivateFieldGet(this, _LogStore_instances, "m", _LogStore_filterContractClassLogsOfTx).call(this, filter);
|
|
162
|
+
}
|
|
163
|
+
else {
|
|
164
|
+
return __classPrivateFieldGet(this, _LogStore_instances, "m", _LogStore_filterContractClassLogsBetweenBlocks).call(this, filter);
|
|
165
|
+
}
|
|
166
|
+
}
|
|
162
167
|
}
|
|
163
|
-
_LogStore_noteEncryptedLogsByBlock = new WeakMap(),
|
|
168
|
+
_LogStore_noteEncryptedLogsByBlock = new WeakMap(), _LogStore_logsByTag = new WeakMap(), _LogStore_logTagsByBlock = new WeakMap(), _LogStore_encryptedLogsByBlock = new WeakMap(), _LogStore_unencryptedLogsByBlock = new WeakMap(), _LogStore_contractClassLogsByBlock = new WeakMap(), _LogStore_logsMaxPageSize = new WeakMap(), _LogStore_log = new WeakMap(), _LogStore_instances = new WeakSet(), _LogStore_extractTaggedLogs = function _LogStore_extractTaggedLogs(block, logType) {
|
|
169
|
+
const taggedLogs = new Map();
|
|
170
|
+
const dataStartIndexForBlock = block.header.state.partial.noteHashTree.nextAvailableLeafIndex -
|
|
171
|
+
block.body.numberOfTxsIncludingPadded * MAX_NOTE_HASHES_PER_TX;
|
|
172
|
+
block.body[logType].txLogs.forEach((txLogs, txIndex) => {
|
|
173
|
+
const txHash = block.body.txEffects[txIndex].txHash;
|
|
174
|
+
const dataStartIndexForTx = dataStartIndexForBlock + txIndex * MAX_NOTE_HASHES_PER_TX;
|
|
175
|
+
const logs = txLogs.unrollLogs();
|
|
176
|
+
logs.forEach(log => {
|
|
177
|
+
if ((logType == 'noteEncryptedLogs' && log.data.length < 32) ||
|
|
178
|
+
// TODO remove when #9835 and #9836 are fixed
|
|
179
|
+
(logType === 'unencryptedLogs' && log.data.length < 32 * 33)) {
|
|
180
|
+
__classPrivateFieldGet(this, _LogStore_log, "f").warn(`Skipping log (${logType}) with invalid data length: ${log.data.length}`);
|
|
181
|
+
return;
|
|
182
|
+
}
|
|
183
|
+
try {
|
|
184
|
+
let tag = Fr.ZERO;
|
|
185
|
+
// TODO remove when #9835 and #9836 are fixed. The partial note logs are emitted as bytes, but encoded as Fields.
|
|
186
|
+
// This means that for every 32 bytes of payload, we only have 1 byte of data.
|
|
187
|
+
// Also, the tag is not stored in the first 32 bytes of the log, (that's the length of public fields now) but in the next 32.
|
|
188
|
+
if (logType === 'unencryptedLogs') {
|
|
189
|
+
const correctedBuffer = Buffer.alloc(32);
|
|
190
|
+
const initialOffset = 32;
|
|
191
|
+
for (let i = 0; i < 32; i++) {
|
|
192
|
+
const byte = Fr.fromBuffer(log.data.subarray(i * 32 + initialOffset, i * 32 + 32 + initialOffset)).toNumber();
|
|
193
|
+
correctedBuffer.writeUInt8(byte, i);
|
|
194
|
+
}
|
|
195
|
+
tag = new Fr(correctedBuffer);
|
|
196
|
+
}
|
|
197
|
+
else {
|
|
198
|
+
tag = new Fr(log.data.subarray(0, 32));
|
|
199
|
+
}
|
|
200
|
+
__classPrivateFieldGet(this, _LogStore_log, "f").verbose(`Found tagged (${logType}) log with tag ${tag.toString()} in block ${block.number}`);
|
|
201
|
+
const currentLogs = taggedLogs.get(tag.toString()) ?? [];
|
|
202
|
+
currentLogs.push(new TxScopedL2Log(txHash, dataStartIndexForTx, block.number, logType === 'unencryptedLogs', log.data).toBuffer());
|
|
203
|
+
taggedLogs.set(tag.toString(), currentLogs);
|
|
204
|
+
}
|
|
205
|
+
catch (err) {
|
|
206
|
+
__classPrivateFieldGet(this, _LogStore_log, "f").warn(`Failed to add tagged log to store: ${err}`);
|
|
207
|
+
}
|
|
208
|
+
});
|
|
209
|
+
});
|
|
210
|
+
return taggedLogs;
|
|
211
|
+
}, _LogStore_filterUnencryptedLogsOfTx = function _LogStore_filterUnencryptedLogsOfTx(filter) {
|
|
164
212
|
if (!filter.txHash) {
|
|
165
213
|
throw new Error('Missing txHash');
|
|
166
214
|
}
|
|
@@ -196,6 +244,45 @@ _LogStore_noteEncryptedLogsByBlock = new WeakMap(), _LogStore_noteEncryptedLogsB
|
|
|
196
244
|
}
|
|
197
245
|
}
|
|
198
246
|
return { logs, maxLogsHit };
|
|
247
|
+
}, _LogStore_filterContractClassLogsOfTx = function _LogStore_filterContractClassLogsOfTx(filter) {
|
|
248
|
+
if (!filter.txHash) {
|
|
249
|
+
throw new Error('Missing txHash');
|
|
250
|
+
}
|
|
251
|
+
const [blockNumber, txIndex] = this.blockStore.getTxLocation(filter.txHash) ?? [];
|
|
252
|
+
if (typeof blockNumber !== 'number' || typeof txIndex !== 'number') {
|
|
253
|
+
return { logs: [], maxLogsHit: false };
|
|
254
|
+
}
|
|
255
|
+
const contractClassLogsBuffer = __classPrivateFieldGet(this, _LogStore_contractClassLogsByBlock, "f").get(blockNumber);
|
|
256
|
+
const contractClassLogsInBlock = contractClassLogsBuffer
|
|
257
|
+
? ContractClass2BlockL2Logs.fromBuffer(contractClassLogsBuffer)
|
|
258
|
+
: new ContractClass2BlockL2Logs([]);
|
|
259
|
+
const txLogs = contractClassLogsInBlock.txLogs[txIndex].unrollLogs();
|
|
260
|
+
const logs = [];
|
|
261
|
+
const maxLogsHit = __classPrivateFieldGet(this, _LogStore_instances, "m", _LogStore_accumulateLogs).call(this, logs, blockNumber, txIndex, txLogs, filter);
|
|
262
|
+
return { logs, maxLogsHit };
|
|
263
|
+
}, _LogStore_filterContractClassLogsBetweenBlocks = function _LogStore_filterContractClassLogsBetweenBlocks(filter) {
|
|
264
|
+
const start = filter.afterLog?.blockNumber ?? Math.max(filter.fromBlock ?? INITIAL_L2_BLOCK_NUM, INITIAL_L2_BLOCK_NUM);
|
|
265
|
+
const end = filter.toBlock;
|
|
266
|
+
if (typeof end === 'number' && end < start) {
|
|
267
|
+
return {
|
|
268
|
+
logs: [],
|
|
269
|
+
maxLogsHit: true,
|
|
270
|
+
};
|
|
271
|
+
}
|
|
272
|
+
const logs = [];
|
|
273
|
+
let maxLogsHit = false;
|
|
274
|
+
loopOverBlocks: for (const [blockNumber, logBuffer] of __classPrivateFieldGet(this, _LogStore_contractClassLogsByBlock, "f").entries({ start, end })) {
|
|
275
|
+
const contractClassLogsInBlock = ContractClass2BlockL2Logs.fromBuffer(logBuffer);
|
|
276
|
+
for (let txIndex = filter.afterLog?.txIndex ?? 0; txIndex < contractClassLogsInBlock.txLogs.length; txIndex++) {
|
|
277
|
+
const txLogs = contractClassLogsInBlock.txLogs[txIndex].unrollLogs();
|
|
278
|
+
maxLogsHit = __classPrivateFieldGet(this, _LogStore_instances, "m", _LogStore_accumulateLogs).call(this, logs, blockNumber, txIndex, txLogs, filter);
|
|
279
|
+
if (maxLogsHit) {
|
|
280
|
+
__classPrivateFieldGet(this, _LogStore_log, "f").debug(`Max logs hit at block ${blockNumber}`);
|
|
281
|
+
break loopOverBlocks;
|
|
282
|
+
}
|
|
283
|
+
}
|
|
284
|
+
}
|
|
285
|
+
return { logs, maxLogsHit };
|
|
199
286
|
}, _LogStore_accumulateLogs = function _LogStore_accumulateLogs(results, blockNumber, txIndex, txLogs, filter) {
|
|
200
287
|
let maxLogsHit = false;
|
|
201
288
|
let logIndex = typeof filter.afterLog?.logIndex === 'number' ? filter.afterLog.logIndex + 1 : 0;
|
|
@@ -240,4 +327,4 @@ _LogStore_noteEncryptedLogsByBlock = new WeakMap(), _LogStore_noteEncryptedLogsB
|
|
|
240
327
|
}
|
|
241
328
|
return L2BlockL2Logs.fromBuffer(buffer);
|
|
242
329
|
};
|
|
243
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"log_store.js","sourceRoot":"","sources":["../../../src/archiver/kv_archiver_store/log_store.ts"],"names":[],"mappings":"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"}
|
|
330
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"log_store.js","sourceRoot":"","sources":["../../../src/archiver/kv_archiver_store/log_store.ts"],"names":[],"mappings":";;AAAA,OAAO,EAEL,yBAAyB,EACzB,sBAAsB,EACtB,0BAA0B,EAC1B,wBAAwB,EAMxB,KAAK,EACL,OAAO,EACP,aAAa,EACb,wBAAwB,GAEzB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAE,EAAE,EAAE,MAAM,oBAAoB,CAAC;AACxC,OAAO,EAAE,oBAAoB,EAAE,sBAAsB,EAAE,MAAM,8BAA8B,CAAC;AAC5F,OAAO,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AAK1D;;GAEG;AACH,MAAM,OAAO,QAAQ;IAUnB,YAAoB,EAAgB,EAAU,UAAsB,EAAE,kBAA0B,IAAI;;QAAhF,OAAE,GAAF,EAAE,CAAc;QAAU,eAAU,GAAV,UAAU,CAAY;QATpE,qDAAoD;QACpD,sCAAuC;QACvC,2CAA4C;QAC5C,iDAAgD;QAChD,mDAAkD;QAClD,qDAAoD;QACpD,4CAAyB;QACzB,wBAAO,iBAAiB,CAAC,0BAA0B,CAAC,EAAC;QAGnD,uBAAA,IAAI,sCAA6B,EAAE,CAAC,OAAO,CAAC,uCAAuC,CAAC,MAAA,CAAC;QACrF,uBAAA,IAAI,uBAAc,EAAE,CAAC,OAAO,CAAC,6BAA6B,CAAC,MAAA,CAAC;QAC5D,uBAAA,IAAI,4BAAmB,EAAE,CAAC,OAAO,CAAC,4BAA4B,CAAC,MAAA,CAAC;QAChE,uBAAA,IAAI,kCAAyB,EAAE,CAAC,OAAO,CAAC,kCAAkC,CAAC,MAAA,CAAC;QAC5E,uBAAA,IAAI,oCAA2B,EAAE,CAAC,OAAO,CAAC,oCAAoC,CAAC,MAAA,CAAC;QAChF,uBAAA,IAAI,sCAA6B,EAAE,CAAC,OAAO,CAAC,uCAAuC,CAAC,MAAA,CAAC;QAErF,uBAAA,IAAI,6BAAoB,eAAe,MAAA,CAAC;IAC1C,CAAC;IA0DD;;;;OAIG;IACH,KAAK,CAAC,OAAO,CAAC,MAAiB;QAC7B,MAAM,eAAe,GAAG,MAAM;aAC3B,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC;YAChB,uBAAA,IAAI,wDAAmB,MAAvB,IAAI,EAAoB,KAAK,EAAE,mBAAmB,CAAC;YACnD,uBAAA,IAAI,wDAAmB,MAAvB,IAAI,EAAoB,KAAK,EAAE,iBAAiB,CAAC;SAClD,CAAC;aACD,MAAM,CAAC,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE;YACnB,KAAK,MAAM,CAAC,GAAG,EAAE,IAAI,CAAC,IAAI,GAAG,CAAC,OAAO,EAAE,EAAE,CAAC;gBACxC,MAAM,WAAW,GAAG,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC;gBACvC,GAAG,CAAC,GAAG,CAAC,GAAG,EAAE,WAAW,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC;YACzC,CAAC;YACD,OAAO,GAAG,CAAC;QACb,CAAC,CAAC,CAAC;QACL,MAAM,YAAY,GAAG,KAAK,CAAC,IAAI,CAAC,eAAe,CAAC,IAAI,EAAE,CAAC,CAAC;QACxD,MAAM,iBAAiB,GAAG,MAAM,IAAI,CAAC,EAAE,CAAC,WAAW,CAAC,GAAG,EAAE,CACvD,YAAY,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,EAAE,GAAG,EAAE,UAAU,EAAE,uBAAA,IAAI,2BAAW,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,CACzE,CAAC;QACF,iBAAiB,CAAC,OAAO,CAAC,eAAe,CAAC,EAAE;YAC1C,IAAI,eAAe,CAAC,UAAU,IAAI,eAAe,CAAC,UAAU,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBACxE,eAAe,CAAC,GAAG,CACjB,eAAe,CAAC,GAAG,EACnB,eAAe,CAAC,UAAW,CAAC,MAAM,CAAC,eAAe,CAAC,GAAG,CAAC,eAAe,CAAC,GAAG,CAAE,CAAC,CAC9E,CAAC;YACJ,CAAC;QACH,CAAC,CAAC,CAAC;QACH,OAAO,IAAI,CAAC,EAAE,CAAC,WAAW,CAAC,GAAG,EAAE;YAC9B,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE;gBACrB,MAAM,WAAW,GAAG,EAAE,CAAC;gBACvB,KAAK,MAAM,CAAC,GAAG,EAAE,IAAI,CAAC,IAAI,eAAe,CAAC,OAAO,EAAE,EAAE,CAAC;oBACpD,KAAK,uBAAA,IAAI,2BAAW,CAAC,GAAG,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;oBACpC,WAAW,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;gBACxB,CAAC;gBACD,KAAK,uBAAA,IAAI,gCAAgB,CAAC,GAAG,CAAC,KAAK,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC;gBACzD,KAAK,uBAAA,IAAI,0CAA0B,CAAC,GAAG,CAAC,KAAK,CAAC,MAAM,EAAE,KAAK,CAAC,IAAI,CAAC,iBAAiB,CAAC,QAAQ,EAAE,CAAC,CAAC;gBAC/F,KAAK,uBAAA,IAAI,sCAAsB,CAAC,GAAG,CAAC,KAAK,CAAC,MAAM,EAAE,KAAK,CAAC,IAAI,CAAC,aAAa,CAAC,QAAQ,EAAE,CAAC,CAAC;gBACvF,KAAK,uBAAA,IAAI,wCAAwB,CAAC,GAAG,CAAC,KAAK,CAAC,MAAM,EAAE,KAAK,CAAC,IAAI,CAAC,eAAe,CAAC,QAAQ,EAAE,CAAC,CAAC;gBAC3F,KAAK,uBAAA,IAAI,0CAA0B,CAAC,GAAG,CAAC,KAAK,CAAC,MAAM,EAAE,KAAK,CAAC,IAAI,CAAC,iBAAiB,CAAC,QAAQ,EAAE,CAAC,CAAC;YACjG,CAAC,CAAC,CAAC;YAEH,OAAO,IAAI,CAAC;QACd,CAAC,CAAC,CAAC;IACL,CAAC;IAED,KAAK,CAAC,UAAU,CAAC,MAAiB;QAChC,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,EAAE,CAAC,WAAW,CAAC,GAAG,EAAE;YAClD,OAAO,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC,uBAAA,IAAI,gCAAgB,CAAC,GAAG,CAAC,KAAK,CAAC,MAAM,CAAC,EAAE,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,QAAQ,EAAE,CAAC,IAAI,EAAE,CAAC,CAAC;QAC3G,CAAC,CAAC,CAAC;QACH,OAAO,IAAI,CAAC,EAAE,CAAC,WAAW,CAAC,GAAG,EAAE;YAC9B,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE;gBACrB,KAAK,uBAAA,IAAI,0CAA0B,CAAC,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;gBACzD,KAAK,uBAAA,IAAI,sCAAsB,CAAC,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;gBACrD,KAAK,uBAAA,IAAI,wCAAwB,CAAC,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;gBACvD,KAAK,uBAAA,IAAI,gCAAgB,CAAC,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;YACjD,CAAC,CAAC,CAAC;YAEH,YAAY,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE;gBACzB,KAAK,uBAAA,IAAI,2BAAW,CAAC,MAAM,CAAC,GAAG,CAAC,QAAQ,EAAE,CAAC,CAAC;YAC9C,CAAC,CAAC,CAAC;YAEH,OAAO,IAAI,CAAC;QACd,CAAC,CAAC,CAAC;IACL,CAAC;IAED;;;;;;OAMG;IACH,CAAC,OAAO,CACN,KAAa,EACb,KAAa,EACb,OAAiB;QAEjB,MAAM,MAAM,GAAG,CAAC,GAAG,EAAE;YACnB,QAAQ,OAAO,EAAE,CAAC;gBAChB,KAAK,OAAO,CAAC,SAAS;oBACpB,OAAO,uBAAA,IAAI,sCAAsB,CAAC;gBACpC,KAAK,OAAO,CAAC,aAAa;oBACxB,OAAO,uBAAA,IAAI,0CAA0B,CAAC;gBACxC,KAAK,OAAO,CAAC,WAAW,CAAC;gBACzB;oBACE,OAAO,uBAAA,IAAI,wCAAwB,CAAC;YACxC,CAAC;QACH,CAAC,CAAC,EAAE,CAAC;QACL,MAAM,UAAU,GAAG,CAAC,GAAG,EAAE;YACvB,QAAQ,OAAO,EAAE,CAAC;gBAChB,KAAK,OAAO,CAAC,SAAS;oBACpB,OAAO,sBAAsB,CAAC;gBAChC,KAAK,OAAO,CAAC,aAAa;oBACxB,OAAO,0BAA0B,CAAC;gBACpC,KAAK,OAAO,CAAC,WAAW,CAAC;gBACzB;oBACE,OAAO,wBAAwB,CAAC;YACpC,CAAC;QACH,CAAC,CAAC,EAAE,CAAC;QACL,MAAM,aAAa,GAAG,UAAU,CAAC;QACjC,KAAK,MAAM,MAAM,IAAI,MAAM,CAAC,MAAM,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC,EAAE,CAAC;YACrD,MAAM,aAAa,CAAC,UAAU,CAAC,MAAM,CAAyC,CAAC;QACjF,CAAC;IACH,CAAC;IAED;;;;;OAKG;IACH,aAAa,CAAC,IAAU;QACtB,OAAO,IAAI,CAAC,EAAE,CAAC,WAAW,CAAC,GAAG,EAAE,CAC9B,IAAI;aACD,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,uBAAA,IAAI,2BAAW,CAAC,GAAG,CAAC,GAAG,CAAC,QAAQ,EAAE,CAAC,CAAC;aAC/C,GAAG,CAAC,cAAc,CAAC,EAAE,CAAC,cAAc,EAAE,GAAG,CAAC,aAAa,CAAC,EAAE,CAAC,aAAa,CAAC,UAAU,CAAC,aAAa,CAAC,CAAC,IAAI,EAAE,CAAC,CAC9G,CAAC;IACJ,CAAC;IAED;;;;OAIG;IACH,kBAAkB,CAAC,MAAiB;QAClC,IAAI,MAAM,CAAC,QAAQ,EAAE,CAAC;YACpB,OAAO,uBAAA,IAAI,yEAAoC,MAAxC,IAAI,EAAqC,MAAM,CAAC,CAAC;QAC1D,CAAC;aAAM,IAAI,MAAM,CAAC,MAAM,EAAE,CAAC;YACzB,OAAO,uBAAA,IAAI,gEAA2B,MAA/B,IAAI,EAA4B,MAAM,CAAC,CAAC;QACjD,CAAC;aAAM,CAAC;YACN,OAAO,uBAAA,IAAI,yEAAoC,MAAxC,IAAI,EAAqC,MAAM,CAAC,CAAC;QAC1D,CAAC;IACH,CAAC;IAmDD;;;;OAIG;IACH,oBAAoB,CAAC,MAAiB;QACpC,IAAI,MAAM,CAAC,QAAQ,EAAE,CAAC;YACpB,OAAO,uBAAA,IAAI,2EAAsC,MAA1C,IAAI,EAAuC,MAAM,CAAC,CAAC;QAC5D,CAAC;aAAM,IAAI,MAAM,CAAC,MAAM,EAAE,CAAC;YACzB,OAAO,uBAAA,IAAI,kEAA6B,MAAjC,IAAI,EAA8B,MAAM,CAAC,CAAC;QACnD,CAAC;aAAM,CAAC;YACN,OAAO,uBAAA,IAAI,2EAAsC,MAA1C,IAAI,EAAuC,MAAM,CAAC,CAAC;QAC5D,CAAC;IACH,CAAC;CA+GF;2cA9WoB,KAAc,EAAE,OAAkE;IACnG,MAAM,UAAU,GAAG,IAAI,GAAG,EAAoB,CAAC;IAC/C,MAAM,sBAAsB,GAC1B,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,YAAY,CAAC,sBAAsB;QAC9D,KAAK,CAAC,IAAI,CAAC,0BAA0B,GAAG,sBAAsB,CAAC;IACjE,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,OAAO,EAAE,EAAE;QACrD,MAAM,MAAM,GAAG,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,MAAM,CAAC;QACpD,MAAM,mBAAmB,GAAG,sBAAsB,GAAG,OAAO,GAAG,sBAAsB,CAAC;QACtF,MAAM,IAAI,GAAG,MAAM,CAAC,UAAU,EAAE,CAAC;QACjC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE;YACjB,IACE,CAAC,OAAO,IAAI,mBAAmB,IAAI,GAAG,CAAC,IAAI,CAAC,MAAM,GAAG,EAAE,CAAC;gBACxD,6CAA6C;gBAC7C,CAAC,OAAO,KAAK,iBAAiB,IAAI,GAAG,CAAC,IAAI,CAAC,MAAM,GAAG,EAAE,GAAG,EAAE,CAAC,EAC5D,CAAC;gBACD,uBAAA,IAAI,qBAAK,CAAC,IAAI,CAAC,iBAAiB,OAAO,+BAA+B,GAAG,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC,CAAC;gBACzF,OAAO;YACT,CAAC;YACD,IAAI,CAAC;gBACH,IAAI,GAAG,GAAG,EAAE,CAAC,IAAI,CAAC;gBAClB,iHAAiH;gBACjH,8EAA8E;gBAC9E,6HAA6H;gBAC7H,IAAI,OAAO,KAAK,iBAAiB,EAAE,CAAC;oBAClC,MAAM,eAAe,GAAG,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;oBACzC,MAAM,aAAa,GAAG,EAAE,CAAC;oBACzB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC;wBAC5B,MAAM,IAAI,GAAG,EAAE,CAAC,UAAU,CACxB,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,GAAG,EAAE,GAAG,aAAa,EAAE,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,aAAa,CAAC,CACvE,CAAC,QAAQ,EAAE,CAAC;wBACb,eAAe,CAAC,UAAU,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC;oBACtC,CAAC;oBACD,GAAG,GAAG,IAAI,EAAE,CAAC,eAAe,CAAC,CAAC;gBAChC,CAAC;qBAAM,CAAC;oBACN,GAAG,GAAG,IAAI,EAAE,CAAC,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC;gBACzC,CAAC;gBACD,uBAAA,IAAI,qBAAK,CAAC,OAAO,CAAC,iBAAiB,OAAO,kBAAkB,GAAG,CAAC,QAAQ,EAAE,aAAa,KAAK,CAAC,MAAM,EAAE,CAAC,CAAC;gBACvG,MAAM,WAAW,GAAG,UAAU,CAAC,GAAG,CAAC,GAAG,CAAC,QAAQ,EAAE,CAAC,IAAI,EAAE,CAAC;gBACzD,WAAW,CAAC,IAAI,CACd,IAAI,aAAa,CACf,MAAM,EACN,mBAAmB,EACnB,KAAK,CAAC,MAAM,EACZ,OAAO,KAAK,iBAAiB,EAC7B,GAAG,CAAC,IAAI,CACT,CAAC,QAAQ,EAAE,CACb,CAAC;gBACF,UAAU,CAAC,GAAG,CAAC,GAAG,CAAC,QAAQ,EAAE,EAAE,WAAW,CAAC,CAAC;YAC9C,CAAC;YAAC,OAAO,GAAG,EAAE,CAAC;gBACb,uBAAA,IAAI,qBAAK,CAAC,IAAI,CAAC,sCAAsC,GAAG,EAAE,CAAC,CAAC;YAC9D,CAAC;QACH,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IACH,OAAO,UAAU,CAAC;AACpB,CAAC,qFA2I0B,MAAiB;IAC1C,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC;QACnB,MAAM,IAAI,KAAK,CAAC,gBAAgB,CAAC,CAAC;IACpC,CAAC;IAED,MAAM,CAAC,WAAW,EAAE,OAAO,CAAC,GAAG,IAAI,CAAC,UAAU,CAAC,aAAa,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC;IAClF,IAAI,OAAO,WAAW,KAAK,QAAQ,IAAI,OAAO,OAAO,KAAK,QAAQ,EAAE,CAAC;QACnE,OAAO,EAAE,IAAI,EAAE,EAAE,EAAE,UAAU,EAAE,KAAK,EAAE,CAAC;IACzC,CAAC;IAED,MAAM,sBAAsB,GAAG,uBAAA,IAAI,mDAAc,MAAlB,IAAI,EAAe,WAAW,EAAE,OAAO,CAAC,WAAW,CAAC,CAAC;IACpF,MAAM,MAAM,GAAG,sBAAsB,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,UAAU,EAAE,CAAC;IAEnE,MAAM,IAAI,GAA+B,EAAE,CAAC;IAC5C,MAAM,UAAU,GAAG,uBAAA,IAAI,qDAAgB,MAApB,IAAI,EAAiB,IAAI,EAAE,WAAW,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;IAEpF,OAAO,EAAE,IAAI,EAAE,UAAU,EAAE,CAAC;AAC9B,CAAC,uGAEmC,MAAiB;IACnD,MAAM,KAAK,GACT,MAAM,CAAC,QAAQ,EAAE,WAAW,IAAI,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,SAAS,IAAI,oBAAoB,EAAE,oBAAoB,CAAC,CAAC;IAC3G,MAAM,GAAG,GAAG,MAAM,CAAC,OAAO,CAAC;IAE3B,IAAI,OAAO,GAAG,KAAK,QAAQ,IAAI,GAAG,GAAG,KAAK,EAAE,CAAC;QAC3C,OAAO;YACL,IAAI,EAAE,EAAE;YACR,UAAU,EAAE,IAAI;SACjB,CAAC;IACJ,CAAC;IAED,MAAM,IAAI,GAA+B,EAAE,CAAC;IAE5C,IAAI,UAAU,GAAG,KAAK,CAAC;IACvB,cAAc,EAAE,KAAK,MAAM,CAAC,WAAW,EAAE,SAAS,CAAC,IAAI,uBAAA,IAAI,wCAAwB,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,GAAG,EAAE,CAAC,EAAE,CAAC;QAC5G,MAAM,sBAAsB,GAAG,wBAAwB,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC;QAC9E,KAAK,IAAI,OAAO,GAAG,MAAM,CAAC,QAAQ,EAAE,OAAO,IAAI,CAAC,EAAE,OAAO,GAAG,sBAAsB,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,EAAE,EAAE,CAAC;YAC5G,MAAM,MAAM,GAAG,sBAAsB,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,UAAU,EAAE,CAAC;YACnE,UAAU,GAAG,uBAAA,IAAI,qDAAgB,MAApB,IAAI,EAAiB,IAAI,EAAE,WAAW,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;YAC9E,IAAI,UAAU,EAAE,CAAC;gBACf,uBAAA,IAAI,qBAAK,CAAC,KAAK,CAAC,yBAAyB,WAAW,EAAE,CAAC,CAAC;gBACxD,MAAM,cAAc,CAAC;YACvB,CAAC;QACH,CAAC;IACH,CAAC;IAED,OAAO,EAAE,IAAI,EAAE,UAAU,EAAE,CAAC;AAC9B,CAAC,yFAiB4B,MAAiB;IAC5C,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC;QACnB,MAAM,IAAI,KAAK,CAAC,gBAAgB,CAAC,CAAC;IACpC,CAAC;IAED,MAAM,CAAC,WAAW,EAAE,OAAO,CAAC,GAAG,IAAI,CAAC,UAAU,CAAC,aAAa,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC;IAClF,IAAI,OAAO,WAAW,KAAK,QAAQ,IAAI,OAAO,OAAO,KAAK,QAAQ,EAAE,CAAC;QACnE,OAAO,EAAE,IAAI,EAAE,EAAE,EAAE,UAAU,EAAE,KAAK,EAAE,CAAC;IACzC,CAAC;IACD,MAAM,uBAAuB,GAAG,uBAAA,IAAI,0CAA0B,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;IAChF,MAAM,wBAAwB,GAAG,uBAAuB;QACtD,CAAC,CAAC,yBAAyB,CAAC,UAAU,CAAC,uBAAuB,CAAC;QAC/D,CAAC,CAAC,IAAI,yBAAyB,CAAC,EAAE,CAAC,CAAC;IACtC,MAAM,MAAM,GAAG,wBAAwB,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,UAAU,EAAE,CAAC;IAErE,MAAM,IAAI,GAA+B,EAAE,CAAC;IAC5C,MAAM,UAAU,GAAG,uBAAA,IAAI,qDAAgB,MAApB,IAAI,EAAiB,IAAI,EAAE,WAAW,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;IAEpF,OAAO,EAAE,IAAI,EAAE,UAAU,EAAE,CAAC;AAC9B,CAAC,2GAEqC,MAAiB;IACrD,MAAM,KAAK,GACT,MAAM,CAAC,QAAQ,EAAE,WAAW,IAAI,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,SAAS,IAAI,oBAAoB,EAAE,oBAAoB,CAAC,CAAC;IAC3G,MAAM,GAAG,GAAG,MAAM,CAAC,OAAO,CAAC;IAE3B,IAAI,OAAO,GAAG,KAAK,QAAQ,IAAI,GAAG,GAAG,KAAK,EAAE,CAAC;QAC3C,OAAO;YACL,IAAI,EAAE,EAAE;YACR,UAAU,EAAE,IAAI;SACjB,CAAC;IACJ,CAAC;IAED,MAAM,IAAI,GAA+B,EAAE,CAAC;IAE5C,IAAI,UAAU,GAAG,KAAK,CAAC;IACvB,cAAc,EAAE,KAAK,MAAM,CAAC,WAAW,EAAE,SAAS,CAAC,IAAI,uBAAA,IAAI,0CAA0B,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,GAAG,EAAE,CAAC,EAAE,CAAC;QAC9G,MAAM,wBAAwB,GAAG,yBAAyB,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC;QACjF,KAAK,IAAI,OAAO,GAAG,MAAM,CAAC,QAAQ,EAAE,OAAO,IAAI,CAAC,EAAE,OAAO,GAAG,wBAAwB,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,EAAE,EAAE,CAAC;YAC9G,MAAM,MAAM,GAAG,wBAAwB,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,UAAU,EAAE,CAAC;YACrE,UAAU,GAAG,uBAAA,IAAI,qDAAgB,MAApB,IAAI,EAAiB,IAAI,EAAE,WAAW,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;YAC9E,IAAI,UAAU,EAAE,CAAC;gBACf,uBAAA,IAAI,qBAAK,CAAC,KAAK,CAAC,yBAAyB,WAAW,EAAE,CAAC,CAAC;gBACxD,MAAM,cAAc,CAAC;YACvB,CAAC;QACH,CAAC;IACH,CAAC;IAED,OAAO,EAAE,IAAI,EAAE,UAAU,EAAE,CAAC;AAC9B,CAAC,+DAGC,OAAmC,EACnC,WAAmB,EACnB,OAAe,EACf,MAA0B,EAC1B,MAAiB;IAEjB,IAAI,UAAU,GAAG,KAAK,CAAC;IACvB,IAAI,QAAQ,GAAG,OAAO,MAAM,CAAC,QAAQ,EAAE,QAAQ,KAAK,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC,QAAQ,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IAChG,OAAO,QAAQ,GAAG,MAAM,CAAC,MAAM,EAAE,QAAQ,EAAE,EAAE,CAAC;QAC5C,MAAM,GAAG,GAAG,MAAM,CAAC,QAAQ,CAAC,CAAC;QAC7B,IAAI,CAAC,MAAM,CAAC,eAAe,IAAI,GAAG,CAAC,eAAe,CAAC,MAAM,CAAC,MAAM,CAAC,eAAe,CAAC,EAAE,CAAC;YAClF,OAAO,CAAC,IAAI,CAAC,IAAI,wBAAwB,CAAC,IAAI,KAAK,CAAC,WAAW,EAAE,OAAO,EAAE,QAAQ,CAAC,EAAE,GAAG,CAAC,CAAC,CAAC;YAC3F,IAAI,OAAO,CAAC,MAAM,IAAI,uBAAA,IAAI,iCAAiB,EAAE,CAAC;gBAC5C,UAAU,GAAG,IAAI,CAAC;gBAClB,MAAM;YACR,CAAC;QACH,CAAC;IACH,CAAC;IAED,OAAO,UAAU,CAAC;AACpB,CAAC,2DAGC,WAAmB,EACnB,OAAiB;IAEjB,MAAM,MAAM,GAAG,CAAC,GAAG,EAAE;QACnB,QAAQ,OAAO,EAAE,CAAC;YAChB,KAAK,OAAO,CAAC,SAAS;gBACpB,OAAO,uBAAA,IAAI,sCAAsB,CAAC;YACpC,KAAK,OAAO,CAAC,aAAa;gBACxB,OAAO,uBAAA,IAAI,0CAA0B,CAAC;YACxC,KAAK,OAAO,CAAC,WAAW,CAAC;YACzB;gBACE,OAAO,uBAAA,IAAI,wCAAwB,CAAC;QACxC,CAAC;IACH,CAAC,CAAC,EAAE,CAAC;IACL,MAAM,UAAU,GAAG,CAAC,GAAG,EAAE;QACvB,QAAQ,OAAO,EAAE,CAAC;YAChB,KAAK,OAAO,CAAC,SAAS;gBACpB,OAAO,sBAAsB,CAAC;YAChC,KAAK,OAAO,CAAC,aAAa;gBACxB,OAAO,0BAA0B,CAAC;YACpC,KAAK,OAAO,CAAC,WAAW,CAAC;YACzB;gBACE,OAAO,wBAAwB,CAAC;QACpC,CAAC;IACH,CAAC,CAAC,EAAE,CAAC;IACL,MAAM,aAAa,GAAG,UAAU,CAAC;IACjC,MAAM,MAAM,GAAG,MAAM,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;IAEvC,IAAI,CAAC,MAAM,EAAE,CAAC;QACZ,OAAO,IAAI,aAAa,CAAC,EAAE,CAAyC,CAAC;IACvE,CAAC;IAED,OAAO,aAAa,CAAC,UAAU,CAAC,MAAM,CAAyC,CAAC;AAClF,CAAC"}
|
|
@@ -23,12 +23,11 @@ export declare class MessageStore {
|
|
|
23
23
|
*/
|
|
24
24
|
addL1ToL2Messages(messages: DataRetrieval<InboxLeaf>): Promise<boolean>;
|
|
25
25
|
/**
|
|
26
|
-
* Gets the
|
|
26
|
+
* Gets the L1 to L2 message index in the L1 to L2 message tree.
|
|
27
27
|
* @param l1ToL2Message - The L1 to L2 message.
|
|
28
|
-
* @param startIndex - The index to start searching from.
|
|
29
28
|
* @returns The index of the L1 to L2 message in the L1 to L2 message tree (undefined if not found).
|
|
30
29
|
*/
|
|
31
|
-
getL1ToL2MessageIndex(l1ToL2Message: Fr
|
|
30
|
+
getL1ToL2MessageIndex(l1ToL2Message: Fr): Promise<bigint | undefined>;
|
|
32
31
|
getL1ToL2Messages(blockNumber: bigint): Fr[];
|
|
33
32
|
}
|
|
34
33
|
//# sourceMappingURL=message_store.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"message_store.d.ts","sourceRoot":"","sources":["../../../src/archiver/kv_archiver_store/message_store.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AACjD,OAAO,EAAE,EAAE,EAA+B,MAAM,oBAAoB,CAAC;AAErE,OAAO,EAAE,KAAK,YAAY,EAAsC,MAAM,iBAAiB,CAAC;AAExF,OAAO,EAAE,KAAK,aAAa,EAAE,MAAM,8BAA8B,CAAC;AAElE;;GAEG;AACH,qBAAa,YAAY;;IAUX,OAAO,CAAC,EAAE;gBAAF,EAAE,EAAE,YAAY;IAOpC,0BAA0B,IAAI,MAAM;IAIpC;;;OAGG;IACH,uBAAuB,IAAI,MAAM,GAAG,SAAS;IAI7C,uBAAuB,CAAC,aAAa,EAAE,MAAM;IAI7C;;;;OAIG;IACH,iBAAiB,CAAC,QAAQ,EAAE,aAAa,CAAC,SAAS,CAAC,GAAG,OAAO,CAAC,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"message_store.d.ts","sourceRoot":"","sources":["../../../src/archiver/kv_archiver_store/message_store.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AACjD,OAAO,EAAE,EAAE,EAA+B,MAAM,oBAAoB,CAAC;AAErE,OAAO,EAAE,KAAK,YAAY,EAAsC,MAAM,iBAAiB,CAAC;AAExF,OAAO,EAAE,KAAK,aAAa,EAAE,MAAM,8BAA8B,CAAC;AAElE;;GAEG;AACH,qBAAa,YAAY;;IAUX,OAAO,CAAC,EAAE;gBAAF,EAAE,EAAE,YAAY;IAOpC,0BAA0B,IAAI,MAAM;IAIpC;;;OAGG;IACH,uBAAuB,IAAI,MAAM,GAAG,SAAS;IAI7C,uBAAuB,CAAC,aAAa,EAAE,MAAM;IAI7C;;;;OAIG;IACH,iBAAiB,CAAC,QAAQ,EAAE,aAAa,CAAC,SAAS,CAAC,GAAG,OAAO,CAAC,OAAO,CAAC;IAsBvE;;;;OAIG;IACH,qBAAqB,CAAC,aAAa,EAAE,EAAE,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC;IAIrE,iBAAiB,CAAC,WAAW,EAAE,MAAM,GAAG,EAAE,EAAE;CAqB7C"}
|
|
@@ -10,7 +10,7 @@ export class MessageStore {
|
|
|
10
10
|
constructor(db) {
|
|
11
11
|
this.db = db;
|
|
12
12
|
_MessageStore_l1ToL2Messages.set(this, void 0);
|
|
13
|
-
_MessageStore_l1ToL2MessageIndices.set(this, void 0);
|
|
13
|
+
_MessageStore_l1ToL2MessageIndices.set(this, void 0);
|
|
14
14
|
_MessageStore_lastSynchedL1Block.set(this, void 0);
|
|
15
15
|
_MessageStore_totalMessageCount.set(this, void 0);
|
|
16
16
|
_MessageStore_log.set(this, createDebugLogger('aztec:archiver:message_store'));
|
|
@@ -47,10 +47,8 @@ export class MessageStore {
|
|
|
47
47
|
void __classPrivateFieldGet(this, _MessageStore_lastSynchedL1Block, "f").set(messages.lastProcessedL1BlockNumber);
|
|
48
48
|
for (const message of messages.retrievedData) {
|
|
49
49
|
const key = `${message.index}`;
|
|
50
|
-
void __classPrivateFieldGet(this, _MessageStore_l1ToL2Messages, "f").
|
|
51
|
-
|
|
52
|
-
indices.push(message.index);
|
|
53
|
-
void __classPrivateFieldGet(this, _MessageStore_l1ToL2MessageIndices, "f").set(message.leaf.toString(), indices);
|
|
50
|
+
void __classPrivateFieldGet(this, _MessageStore_l1ToL2Messages, "f").set(key, message.leaf.toBuffer());
|
|
51
|
+
void __classPrivateFieldGet(this, _MessageStore_l1ToL2MessageIndices, "f").set(message.leaf.toString(), message.index);
|
|
54
52
|
}
|
|
55
53
|
const lastTotalMessageCount = this.getTotalL1ToL2MessageCount();
|
|
56
54
|
void __classPrivateFieldGet(this, _MessageStore_totalMessageCount, "f").set(lastTotalMessageCount + BigInt(messages.retrievedData.length));
|
|
@@ -58,15 +56,12 @@ export class MessageStore {
|
|
|
58
56
|
});
|
|
59
57
|
}
|
|
60
58
|
/**
|
|
61
|
-
* Gets the
|
|
59
|
+
* Gets the L1 to L2 message index in the L1 to L2 message tree.
|
|
62
60
|
* @param l1ToL2Message - The L1 to L2 message.
|
|
63
|
-
* @param startIndex - The index to start searching from.
|
|
64
61
|
* @returns The index of the L1 to L2 message in the L1 to L2 message tree (undefined if not found).
|
|
65
62
|
*/
|
|
66
|
-
getL1ToL2MessageIndex(l1ToL2Message
|
|
67
|
-
|
|
68
|
-
const index = indices.find(i => i >= startIndex);
|
|
69
|
-
return Promise.resolve(index);
|
|
63
|
+
getL1ToL2MessageIndex(l1ToL2Message) {
|
|
64
|
+
return Promise.resolve(__classPrivateFieldGet(this, _MessageStore_l1ToL2MessageIndices, "f").get(l1ToL2Message.toString()));
|
|
70
65
|
}
|
|
71
66
|
getL1ToL2Messages(blockNumber) {
|
|
72
67
|
const messages = [];
|
|
@@ -92,4 +87,4 @@ export class MessageStore {
|
|
|
92
87
|
}
|
|
93
88
|
}
|
|
94
89
|
_MessageStore_l1ToL2Messages = new WeakMap(), _MessageStore_l1ToL2MessageIndices = new WeakMap(), _MessageStore_lastSynchedL1Block = new WeakMap(), _MessageStore_totalMessageCount = new WeakMap(), _MessageStore_log = new WeakMap(), _MessageStore_l1ToL2MessagesSubtreeSize = new WeakMap();
|
|
95
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
90
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibWVzc2FnZV9zdG9yZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9hcmNoaXZlci9rdl9hcmNoaXZlcl9zdG9yZS9tZXNzYWdlX3N0b3JlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7O0FBQUEsT0FBTyxFQUFFLFNBQVMsRUFBRSxNQUFNLHNCQUFzQixDQUFDO0FBQ2pELE9BQU8sRUFBRSxFQUFFLEVBQUUsMkJBQTJCLEVBQUUsTUFBTSxvQkFBb0IsQ0FBQztBQUNyRSxPQUFPLEVBQUUsaUJBQWlCLEVBQUUsTUFBTSx1QkFBdUIsQ0FBQztBQUsxRDs7R0FFRztBQUNILE1BQU0sT0FBTyxZQUFZO0lBVXZCLFlBQW9CLEVBQWdCO1FBQWhCLE9BQUUsR0FBRixFQUFFLENBQWM7UUFUcEMsK0NBQTBDO1FBQzFDLHFEQUFnRDtRQUNoRCxtREFBNEM7UUFDNUMsa0RBQTJDO1FBRTNDLDRCQUFPLGlCQUFpQixDQUFDLDhCQUE4QixDQUFDLEVBQUM7UUFFekQsa0RBQTZCLENBQUMsSUFBSSwyQkFBMkIsRUFBQztRQUc1RCx1QkFBQSxJQUFJLGdDQUFtQixFQUFFLENBQUMsT0FBTyxDQUFDLDRCQUE0QixDQUFDLE1BQUEsQ0FBQztRQUNoRSx1QkFBQSxJQUFJLHNDQUF5QixFQUFFLENBQUMsT0FBTyxDQUFDLG1DQUFtQyxDQUFDLE1BQUEsQ0FBQztRQUM3RSx1QkFBQSxJQUFJLG9DQUF1QixFQUFFLENBQUMsYUFBYSxDQUFDLHFDQUFxQyxDQUFDLE1BQUEsQ0FBQztRQUNuRix1QkFBQSxJQUFJLG1DQUFzQixFQUFFLENBQUMsYUFBYSxDQUFDLGlDQUFpQyxDQUFDLE1BQUEsQ0FBQztJQUNoRixDQUFDO0lBRUQsMEJBQTBCO1FBQ3hCLE9BQU8sdUJBQUEsSUFBSSx1Q0FBbUIsQ0FBQyxHQUFHLEVBQUUsSUFBSSxFQUFFLENBQUM7SUFDN0MsQ0FBQztJQUVEOzs7T0FHRztJQUNILHVCQUF1QjtRQUNyQixPQUFPLHVCQUFBLElBQUks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
|
|
@@ -14,11 +14,10 @@ export declare class L1ToL2MessageStore {
|
|
|
14
14
|
addMessage(message: InboxLeaf): void;
|
|
15
15
|
getMessages(blockNumber: bigint): Fr[];
|
|
16
16
|
/**
|
|
17
|
-
* Gets the
|
|
17
|
+
* Gets the L1 to L2 message index in the L1 to L2 message tree.
|
|
18
18
|
* @param l1ToL2Message - The L1 to L2 message.
|
|
19
|
-
* @param startIndex - The index to start searching from.
|
|
20
19
|
* @returns The index of the L1 to L2 message in the L1 to L2 message tree (undefined if not found).
|
|
21
20
|
*/
|
|
22
|
-
getMessageIndex(l1ToL2Message: Fr
|
|
21
|
+
getMessageIndex(l1ToL2Message: Fr): bigint | undefined;
|
|
23
22
|
}
|
|
24
23
|
//# sourceMappingURL=l1_to_l2_message_store.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"l1_to_l2_message_store.d.ts","sourceRoot":"","sources":["../../../src/archiver/memory_archiver_store/l1_to_l2_message_store.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AAEjD,OAAO,EAAE,KAAK,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAEnD;;GAEG;AACH,qBAAa,kBAAkB;;IAC7B;;OAEG;IACH,SAAS,CAAC,KAAK,EAAE,GAAG,CAAC,MAAM,EAAE,EAAE,CAAC,CAAa;;IAM7C,0BAA0B,IAAI,MAAM;IAIpC,UAAU,CAAC,OAAO,EAAE,SAAS;IAI7B,WAAW,CAAC,WAAW,EAAE,MAAM,GAAG,EAAE,EAAE;IAsBtC
|
|
1
|
+
{"version":3,"file":"l1_to_l2_message_store.d.ts","sourceRoot":"","sources":["../../../src/archiver/memory_archiver_store/l1_to_l2_message_store.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AAEjD,OAAO,EAAE,KAAK,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAEnD;;GAEG;AACH,qBAAa,kBAAkB;;IAC7B;;OAEG;IACH,SAAS,CAAC,KAAK,EAAE,GAAG,CAAC,MAAM,EAAE,EAAE,CAAC,CAAa;;IAM7C,0BAA0B,IAAI,MAAM;IAIpC,UAAU,CAAC,OAAO,EAAE,SAAS;IAI7B,WAAW,CAAC,WAAW,EAAE,MAAM,GAAG,EAAE,EAAE;IAsBtC;;;;OAIG;IACH,eAAe,CAAC,aAAa,EAAE,EAAE,GAAG,MAAM,GAAG,SAAS;CAQvD"}
|
|
@@ -41,23 +41,18 @@ export class L1ToL2MessageStore {
|
|
|
41
41
|
return messages;
|
|
42
42
|
}
|
|
43
43
|
/**
|
|
44
|
-
* Gets the
|
|
44
|
+
* Gets the L1 to L2 message index in the L1 to L2 message tree.
|
|
45
45
|
* @param l1ToL2Message - The L1 to L2 message.
|
|
46
|
-
* @param startIndex - The index to start searching from.
|
|
47
46
|
* @returns The index of the L1 to L2 message in the L1 to L2 message tree (undefined if not found).
|
|
48
47
|
*/
|
|
49
|
-
getMessageIndex(l1ToL2Message
|
|
48
|
+
getMessageIndex(l1ToL2Message) {
|
|
50
49
|
for (const [key, message] of this.store.entries()) {
|
|
51
50
|
if (message.equals(l1ToL2Message)) {
|
|
52
|
-
|
|
53
|
-
if (indexInTheWholeTree < startIndex) {
|
|
54
|
-
continue;
|
|
55
|
-
}
|
|
56
|
-
return indexInTheWholeTree;
|
|
51
|
+
return BigInt(key);
|
|
57
52
|
}
|
|
58
53
|
}
|
|
59
54
|
return undefined;
|
|
60
55
|
}
|
|
61
56
|
}
|
|
62
57
|
_L1ToL2MessageStore_l1ToL2MessagesSubtreeSize = new WeakMap();
|
|
63
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
58
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibDFfdG9fbDJfbWVzc2FnZV9zdG9yZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9hcmNoaXZlci9tZW1vcnlfYXJjaGl2ZXJfc3RvcmUvbDFfdG9fbDJfbWVzc2FnZV9zdG9yZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOztBQUFBLE9BQU8sRUFBRSxTQUFTLEVBQUUsTUFBTSxzQkFBc0IsQ0FBQztBQUNqRCxPQUFPLEVBQUUsMkJBQTJCLEVBQUUsTUFBTSw4QkFBOEIsQ0FBQztBQUczRTs7R0FFRztBQUNILE1BQU0sT0FBTyxrQkFBa0I7SUFRN0I7UUFQQTs7V0FFRztRQUNPLFVBQUssR0FBb0IsSUFBSSxHQUFHLEVBQUUsQ0FBQztRQUU3Qyx3REFBNkIsQ0FBQyxJQUFJLDJCQUEyQixFQUFDO0lBRS9DLENBQUM7SUFFaEIsMEJBQTBCO1FBQ3hCLE9BQU8sTUFBTSxDQUFDLElBQUksQ0FBQyxLQUFLLENBQUMsSUFBSSxDQUFDLENBQUM7SUFDakMsQ0FBQztJQUVELFVBQVUsQ0FBQyxPQUFrQjtRQUMzQixJQUFJLENBQUMsS0FBSyxDQUFDLEdBQUcsQ0FBQyxHQUFHLE9BQU8sQ0FBQyxLQUFLLEVBQUUsRUFBRSxPQUFPLENBQUMsSUFBSSxDQUFDLENBQUM7SUFDbkQsQ0FBQztJQUVELFdBQVcsQ0FBQyxXQUFtQjtRQUM3QixNQUFNLFFBQVEsR0FBUyxFQUFFLENBQUM7UUFDMUIsSUFBSSxxQkFBcUIsR0FBRyxLQUFLLENBQUM7UUFDbEMsTUFBTSxVQUFVLEdBQUcsTUFBTSxDQUFDLFNBQVMsQ0FBQyx3QkFBd0IsQ0FBQyxXQUFXLENBQUMsQ0FBQyxDQUFDO1FBRTNFLEtBQUssSUFBSSxDQUFDLEdBQUcsVUFBVSxFQUFFLENBQUMsR0FBRyxVQUFVLEdBQUcsdUJBQUEsSUFBSSxxREFBMkIsRUFBRSxDQUFDLEVBQUUsRUFBRSxDQUFDO1lBQy9FLGlEQUFpRDtZQUNqRCxNQUFNLE9BQU8sR0FBRyxJQUFJLENBQUMsS0FBSyxDQUFDLEdBQUcsQ0FBQyxHQUFHLENBQUMsRUFBRSxDQUFDLENBQUM7WUFDdkMsSUFBSSxPQUFPLEVBQUUsQ0FBQztnQkFDWixJQUFJLHFCQUFxQixFQUFFLENBQUM7b0JBQzFCLE1BQU0sSUFBSSxLQUFLLENBQUMsdUNBQXVDLFdBQVcsRUFBRSxDQUFDLENBQUM7Z0JBQ3hFLENBQUM7Z0JBQ0QsUUFBUSxDQUFDLElBQUksQ0FBQyxPQUFPLENBQUMsQ0FBQztZQUN6QixDQUFDO2lCQUFNLENBQUM7Z0JBQ04scUJBQXFCLEdBQUcsSUFBSSxDQUFDO2dCQUM3Qiw4R0FBOEc7Z0JBQzlHLG1GQUFtRjtZQUNyRixDQUFDO1FBQ0gsQ0FBQztRQUNELE9BQU8sUUFBUSxDQUFDO0lBQ2xCLENBQUM7SUFFRDs7OztPQUlHO0lBQ0gsZUFBZSxDQUFDLGFBQWlCO1FBQy9CLEtBQUssTUFBTSxDQUFDLEdBQUcsRUFBRSxPQUFPLENBQUMsSUFBSSxJQUFJLENBQUMsS0FBSyxDQUFDLE9BQU8sRUFBRSxFQUFFLENBQUM7WUFDbEQsSUFBSSxPQUFPLENBQUMsTUFBTSxDQUFDLGFBQWEsQ0FBQyxFQUFFLENBQUM7Z0JBQ2xDLE9BQU8sTUFBTSxDQUFDLEdBQUcsQ0FBQyxDQUFDO1lBQ3JCLENBQUM7UUFDSCxDQUFDO1FBQ0QsT0FBTyxTQUFTLENBQUM7SUFDbkIsQ0FBQztDQUNGIn0=
|