@aztec/archiver 0.62.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.
Files changed (50) hide show
  1. package/dest/archiver/archiver.d.ts +11 -2
  2. package/dest/archiver/archiver.d.ts.map +1 -1
  3. package/dest/archiver/archiver.js +43 -19
  4. package/dest/archiver/archiver_store.d.ts +8 -2
  5. package/dest/archiver/archiver_store.d.ts.map +1 -1
  6. package/dest/archiver/archiver_store_test_suite.d.ts.map +1 -1
  7. package/dest/archiver/archiver_store_test_suite.js +64 -25
  8. package/dest/archiver/config.d.ts +2 -6
  9. package/dest/archiver/config.d.ts.map +1 -1
  10. package/dest/archiver/config.js +3 -6
  11. package/dest/archiver/epoch_helpers.d.ts +10 -10
  12. package/dest/archiver/epoch_helpers.d.ts.map +1 -1
  13. package/dest/archiver/epoch_helpers.js +9 -10
  14. package/dest/archiver/kv_archiver_store/kv_archiver_store.d.ts +8 -2
  15. package/dest/archiver/kv_archiver_store/kv_archiver_store.d.ts.map +1 -1
  16. package/dest/archiver/kv_archiver_store/kv_archiver_store.js +14 -1
  17. package/dest/archiver/kv_archiver_store/log_store.d.ts +8 -2
  18. package/dest/archiver/kv_archiver_store/log_store.d.ts.map +1 -1
  19. package/dest/archiver/kv_archiver_store/log_store.js +144 -57
  20. package/dest/archiver/memory_archiver_store/memory_archiver_store.d.ts +13 -4
  21. package/dest/archiver/memory_archiver_store/memory_archiver_store.d.ts.map +1 -1
  22. package/dest/archiver/memory_archiver_store/memory_archiver_store.js +136 -31
  23. package/dest/factory.d.ts +5 -2
  24. package/dest/factory.d.ts.map +1 -1
  25. package/dest/factory.js +2 -2
  26. package/dest/rpc/index.d.ts +3 -2
  27. package/dest/rpc/index.d.ts.map +1 -1
  28. package/dest/rpc/index.js +10 -3
  29. package/dest/test/mock_l2_block_source.d.ts.map +1 -1
  30. package/dest/test/mock_l2_block_source.js +4 -2
  31. package/package.json +10 -10
  32. package/src/archiver/archiver.ts +54 -24
  33. package/src/archiver/archiver_store.ts +9 -2
  34. package/src/archiver/archiver_store_test_suite.ts +85 -26
  35. package/src/archiver/config.ts +11 -12
  36. package/src/archiver/epoch_helpers.ts +16 -12
  37. package/src/archiver/kv_archiver_store/kv_archiver_store.ts +15 -2
  38. package/src/archiver/kv_archiver_store/log_store.ts +176 -58
  39. package/src/archiver/memory_archiver_store/memory_archiver_store.ts +152 -27
  40. package/src/factory.ts +6 -3
  41. package/src/rpc/index.ts +11 -2
  42. package/src/test/mock_l2_block_source.ts +3 -1
  43. package/dest/rpc/archiver_client.d.ts +0 -3
  44. package/dest/rpc/archiver_client.d.ts.map +0 -1
  45. package/dest/rpc/archiver_client.js +0 -12
  46. package/dest/rpc/archiver_server.d.ts +0 -9
  47. package/dest/rpc/archiver_server.d.ts.map +0 -1
  48. package/dest/rpc/archiver_server.js +0 -20
  49. package/src/rpc/archiver_client.ts +0 -29
  50. package/src/rpc/archiver_server.ts +0 -35
@@ -1 +1 @@
1
- {"version":3,"file":"log_store.d.ts","sourceRoot":"","sources":["../../../src/archiver/kv_archiver_store/log_store.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,kBAAkB,EAGlB,KAAK,WAAW,EAChB,KAAK,0BAA0B,EAC/B,KAAK,OAAO,EACZ,KAAK,aAAa,EAClB,KAAK,SAAS,EAEd,OAAO,EAGR,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAE,EAAE,EAAE,MAAM,oBAAoB,CAAC;AAGxC,OAAO,EAAE,KAAK,YAAY,EAAqC,MAAM,iBAAiB,CAAC;AAEvF,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;IAWpG;;;;OAIG;IACH,OAAO,CAAC,MAAM,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,OAAO,CAAC;IAkCtC,UAAU,CAAC,MAAM,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,OAAO,CAAC;IA2BrD;;;;;;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,kBAAkB,EAAE,EAAE,CAAC;IAgB1D;;;;OAIG;IACH,kBAAkB,CAAC,MAAM,EAAE,SAAS,GAAG,0BAA0B;CAqHlE"}
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, _LogStore_noteEncryptedLogsByHash, _LogStore_noteEncryptedLogHashesByTag, _LogStore_noteEncryptedLogTagsByBlock, _LogStore_encryptedLogsByBlock, _LogStore_unencryptedLogsByBlock, _LogStore_logsMaxPageSize, _LogStore_log, _LogStore_filterUnencryptedLogsOfTx, _LogStore_filterUnencryptedLogsBetweenBlocks, _LogStore_accumulateLogs, _LogStore_getBlockLogs;
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 { EncryptedL2BlockL2Logs, EncryptedL2NoteLog, EncryptedNoteL2BlockL2Logs, ExtendedUnencryptedL2Log, LogId, LogType, UnencryptedL2BlockL2Logs, } from '@aztec/circuit-types';
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
- _LogStore_noteEncryptedLogsByHash.set(this, void 0);
17
- _LogStore_noteEncryptedLogHashesByTag.set(this, void 0);
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, _LogStore_noteEncryptedLogsByHash, db.openMap('archiver_note_encrypted_logs_by_hash'), "f");
25
- __classPrivateFieldSet(this, _LogStore_noteEncryptedLogHashesByTag, db.openMultiMap('archiver_tagged_note_encrypted_log_hashes_by_tag'), "f");
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 noteTagsToDelete = await this.db.transaction(() => {
71
- return blocks.flatMap(block => Array.from(__classPrivateFieldGet(this, _LogStore_noteEncryptedLogTagsByBlock, "f").getValues(block.number)));
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, _LogStore_noteEncryptedLogTagsByBlock, "f").delete(block.number);
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
- noteLogHashesToDelete.forEach(hash => {
87
- void __classPrivateFieldGet(this, _LogStore_noteEncryptedLogsByHash, "f").delete(hash);
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
- return tags.map(tag => {
136
- const logHashes = Array.from(__classPrivateFieldGet(this, _LogStore_noteEncryptedLogHashesByTag, "f").getValues(tag.toString()));
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(), _LogStore_noteEncryptedLogsByHash = new WeakMap(), _LogStore_noteEncryptedLogHashesByTag = new WeakMap(), _LogStore_noteEncryptedLogTagsByBlock = new WeakMap(), _LogStore_encryptedLogsByBlock = new WeakMap(), _LogStore_unencryptedLogsByBlock = new WeakMap(), _LogStore_logsMaxPageSize = new WeakMap(), _LogStore_log = new WeakMap(), _LogStore_instances = new WeakSet(), _LogStore_filterUnencryptedLogsOfTx = function _LogStore_filterUnencryptedLogsOfTx(filter) {
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":"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"}
@@ -1,4 +1,4 @@
1
- import { type EncryptedL2NoteLog, type FromLogType, type GetUnencryptedLogsResponse, type InboxLeaf, type L2Block, type L2BlockL2Logs, type LogFilter, LogType, type TxEffect, type TxHash, TxReceipt } from '@aztec/circuit-types';
1
+ import { type FromLogType, type GetUnencryptedLogsResponse, type InboxLeaf, type L2Block, type L2BlockL2Logs, type LogFilter, LogType, type TxEffect, type TxHash, TxReceipt, TxScopedL2Log } from '@aztec/circuit-types';
2
2
  import { type ContractClassPublic, type ContractInstanceWithAddress, type ExecutablePrivateFunctionWithMembershipProof, Fr, type Header, type UnconstrainedFunctionWithMembershipProof } from '@aztec/circuits.js';
3
3
  import { type ContractArtifact } from '@aztec/foundation/abi';
4
4
  import { type AztecAddress } from '@aztec/foundation/aztec-address';
@@ -21,10 +21,11 @@ export declare class MemoryArchiverStore implements ArchiverDataStore {
21
21
  */
22
22
  private txEffects;
23
23
  private noteEncryptedLogsPerBlock;
24
- private taggedNoteEncryptedLogs;
25
- private noteEncryptedLogTagsPerBlock;
24
+ private taggedLogs;
25
+ private logTagsPerBlock;
26
26
  private encryptedLogsPerBlock;
27
27
  private unencryptedLogsPerBlock;
28
+ private contractClassLogsPerBlock;
28
29
  /**
29
30
  * Contains all L1 to L2 messages.
30
31
  */
@@ -124,7 +125,7 @@ export declare class MemoryArchiverStore implements ArchiverDataStore {
124
125
  * @returns For each received tag, an array of matching logs is returned. An empty array implies no logs match
125
126
  * that tag.
126
127
  */
127
- getLogsByTags(tags: Fr[]): Promise<EncryptedL2NoteLog[][]>;
128
+ getLogsByTags(tags: Fr[]): Promise<TxScopedL2Log[][]>;
128
129
  /**
129
130
  * Gets unencrypted logs based on the provided filter.
130
131
  * @param filter - The filter to apply to the logs.
@@ -132,6 +133,14 @@ export declare class MemoryArchiverStore implements ArchiverDataStore {
132
133
  * @remarks Works by doing an intersection of all params in the filter.
133
134
  */
134
135
  getUnencryptedLogs(filter: LogFilter): Promise<GetUnencryptedLogsResponse>;
136
+ /**
137
+ * Gets contract class logs based on the provided filter.
138
+ * NB: clone of the above fn, but for contract class logs
139
+ * @param filter - The filter to apply to the logs.
140
+ * @returns The requested logs.
141
+ * @remarks Works by doing an intersection of all params in the filter.
142
+ */
143
+ getContractClassLogs(filter: LogFilter): Promise<GetUnencryptedLogsResponse>;
135
144
  /**
136
145
  * Gets the number of the latest L2 block processed.
137
146
  * @returns The number of the latest L2 block processed.
@@ -1 +1 @@
1
- {"version":3,"file":"memory_archiver_store.d.ts","sourceRoot":"","sources":["../../../src/archiver/memory_archiver_store/memory_archiver_store.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"memory_archiver_store.d.ts","sourceRoot":"","sources":["../../../src/archiver/memory_archiver_store/memory_archiver_store.ts"],"names":[],"mappings":"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"}