@aztec/archiver 0.71.0 → 0.73.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 +6 -6
- package/dest/archiver/archiver.d.ts.map +1 -1
- package/dest/archiver/archiver.js +35 -20
- package/dest/archiver/archiver_store.d.ts +6 -6
- package/dest/archiver/archiver_store.d.ts.map +1 -1
- package/dest/archiver/archiver_store_test_suite.d.ts +1 -1
- package/dest/archiver/archiver_store_test_suite.d.ts.map +1 -1
- package/dest/archiver/archiver_store_test_suite.js +103 -65
- package/dest/archiver/config.d.ts +2 -2
- package/dest/archiver/config.d.ts.map +1 -1
- package/dest/archiver/config.js +5 -5
- package/dest/archiver/data_retrieval.d.ts +3 -2
- package/dest/archiver/data_retrieval.d.ts.map +1 -1
- package/dest/archiver/data_retrieval.js +69 -16
- package/dest/archiver/errors.d.ts +4 -0
- package/dest/archiver/errors.d.ts.map +1 -0
- package/dest/archiver/errors.js +6 -0
- package/dest/archiver/kv_archiver_store/block_store.d.ts +16 -16
- package/dest/archiver/kv_archiver_store/block_store.d.ts.map +1 -1
- package/dest/archiver/kv_archiver_store/block_store.js +53 -53
- package/dest/archiver/kv_archiver_store/contract_class_store.d.ts +5 -5
- package/dest/archiver/kv_archiver_store/contract_class_store.d.ts.map +1 -1
- package/dest/archiver/kv_archiver_store/contract_class_store.js +13 -12
- package/dest/archiver/kv_archiver_store/contract_instance_store.d.ts +3 -3
- package/dest/archiver/kv_archiver_store/contract_instance_store.d.ts.map +1 -1
- package/dest/archiver/kv_archiver_store/contract_instance_store.js +3 -3
- package/dest/archiver/kv_archiver_store/kv_archiver_store.d.ts +7 -11
- package/dest/archiver/kv_archiver_store/kv_archiver_store.d.ts.map +1 -1
- package/dest/archiver/kv_archiver_store/kv_archiver_store.js +41 -63
- package/dest/archiver/kv_archiver_store/log_store.d.ts +8 -8
- package/dest/archiver/kv_archiver_store/log_store.d.ts.map +1 -1
- package/dest/archiver/kv_archiver_store/log_store.js +122 -89
- package/dest/archiver/kv_archiver_store/message_store.d.ts +6 -6
- package/dest/archiver/kv_archiver_store/message_store.d.ts.map +1 -1
- package/dest/archiver/kv_archiver_store/message_store.js +16 -16
- package/dest/archiver/kv_archiver_store/nullifier_store.d.ts +2 -2
- package/dest/archiver/kv_archiver_store/nullifier_store.d.ts.map +1 -1
- package/dest/archiver/kv_archiver_store/nullifier_store.js +31 -22
- package/dest/archiver/memory_archiver_store/memory_archiver_store.d.ts +9 -9
- package/dest/archiver/memory_archiver_store/memory_archiver_store.d.ts.map +1 -1
- package/dest/archiver/memory_archiver_store/memory_archiver_store.js +72 -71
- package/dest/factory.js +8 -8
- package/dest/rpc/index.d.ts +1 -1
- package/dest/rpc/index.d.ts.map +1 -1
- package/dest/rpc/index.js +5 -5
- 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 +2 -1
- package/dest/test/mock_l2_block_source.d.ts +3 -3
- package/dest/test/mock_l2_block_source.d.ts.map +1 -1
- package/dest/test/mock_l2_block_source.js +14 -11
- package/package.json +13 -13
- package/src/archiver/archiver.ts +46 -25
- package/src/archiver/archiver_store.ts +6 -5
- package/src/archiver/archiver_store_test_suite.ts +113 -77
- package/src/archiver/config.ts +6 -6
- package/src/archiver/data_retrieval.ts +94 -12
- package/src/archiver/errors.ts +5 -0
- package/src/archiver/kv_archiver_store/block_store.ts +66 -67
- package/src/archiver/kv_archiver_store/contract_class_store.ts +17 -15
- package/src/archiver/kv_archiver_store/contract_instance_store.ts +5 -5
- package/src/archiver/kv_archiver_store/kv_archiver_store.ts +48 -66
- package/src/archiver/kv_archiver_store/log_store.ts +167 -112
- package/src/archiver/kv_archiver_store/message_store.ts +22 -22
- package/src/archiver/kv_archiver_store/nullifier_store.ts +48 -30
- package/src/archiver/memory_archiver_store/memory_archiver_store.ts +100 -96
- package/src/factory.ts +11 -9
- package/src/rpc/index.ts +4 -4
- package/src/test/mock_archiver.ts +1 -0
- package/src/test/mock_l2_block_source.ts +20 -18
|
@@ -1,10 +1,10 @@
|
|
|
1
|
-
var _LogStore_instances, _LogStore_logsByTag, _LogStore_logTagsByBlock, _LogStore_privateLogsByBlock,
|
|
1
|
+
var _LogStore_instances, _LogStore_logsByTag, _LogStore_logTagsByBlock, _LogStore_privateLogsByBlock, _LogStore_publicLogsByBlock, _LogStore_contractClassLogsByBlock, _LogStore_logsMaxPageSize, _LogStore_log, _LogStore_extractTaggedLogsFromPrivate, _LogStore_extractTaggedLogsFromPublic, _LogStore_filterPublicLogsOfTx, _LogStore_filterPublicLogsBetweenBlocks, _LogStore_filterContractClassLogsOfTx, _LogStore_filterContractClassLogsBetweenBlocks, _LogStore_accumulateLogs;
|
|
2
2
|
import { __classPrivateFieldGet, __classPrivateFieldSet } from "tslib";
|
|
3
|
-
import { ContractClass2BlockL2Logs, ExtendedUnencryptedL2Log, LogId, TxScopedL2Log,
|
|
4
|
-
import {
|
|
5
|
-
import { INITIAL_L2_BLOCK_NUM, MAX_NOTE_HASHES_PER_TX } from '@aztec/circuits.js/constants';
|
|
3
|
+
import { ContractClass2BlockL2Logs, ExtendedPublicLog, ExtendedUnencryptedL2Log, LogId, TxScopedL2Log, UnencryptedL2Log, } from '@aztec/circuit-types';
|
|
4
|
+
import { PrivateLog, PublicLog } from '@aztec/circuits.js';
|
|
5
|
+
import { INITIAL_L2_BLOCK_NUM, MAX_NOTE_HASHES_PER_TX, PUBLIC_LOG_DATA_SIZE_IN_FIELDS, } from '@aztec/circuits.js/constants';
|
|
6
6
|
import { createLogger } from '@aztec/foundation/log';
|
|
7
|
-
import { BufferReader } from '@aztec/foundation/serialize';
|
|
7
|
+
import { BufferReader, numToUInt32BE } from '@aztec/foundation/serialize';
|
|
8
8
|
/**
|
|
9
9
|
* A store for logs
|
|
10
10
|
*/
|
|
@@ -16,14 +16,14 @@ export class LogStore {
|
|
|
16
16
|
_LogStore_logsByTag.set(this, void 0);
|
|
17
17
|
_LogStore_logTagsByBlock.set(this, void 0);
|
|
18
18
|
_LogStore_privateLogsByBlock.set(this, void 0);
|
|
19
|
-
|
|
19
|
+
_LogStore_publicLogsByBlock.set(this, void 0);
|
|
20
20
|
_LogStore_contractClassLogsByBlock.set(this, void 0);
|
|
21
21
|
_LogStore_logsMaxPageSize.set(this, void 0);
|
|
22
22
|
_LogStore_log.set(this, createLogger('archiver:log_store'));
|
|
23
23
|
__classPrivateFieldSet(this, _LogStore_logsByTag, db.openMap('archiver_tagged_logs_by_tag'), "f");
|
|
24
24
|
__classPrivateFieldSet(this, _LogStore_logTagsByBlock, db.openMap('archiver_log_tags_by_block'), "f");
|
|
25
25
|
__classPrivateFieldSet(this, _LogStore_privateLogsByBlock, db.openMap('archiver_private_logs_by_block'), "f");
|
|
26
|
-
__classPrivateFieldSet(this,
|
|
26
|
+
__classPrivateFieldSet(this, _LogStore_publicLogsByBlock, db.openMap('archiver_public_logs_by_block'), "f");
|
|
27
27
|
__classPrivateFieldSet(this, _LogStore_contractClassLogsByBlock, db.openMap('archiver_contract_class_logs_by_block'), "f");
|
|
28
28
|
__classPrivateFieldSet(this, _LogStore_logsMaxPageSize, logsMaxPageSize, "f");
|
|
29
29
|
}
|
|
@@ -32,7 +32,7 @@ export class LogStore {
|
|
|
32
32
|
* @param blocks - The blocks for which to add the logs.
|
|
33
33
|
* @returns True if the operation is successful.
|
|
34
34
|
*/
|
|
35
|
-
|
|
35
|
+
addLogs(blocks) {
|
|
36
36
|
const taggedLogsToAdd = blocks
|
|
37
37
|
.flatMap(block => [__classPrivateFieldGet(this, _LogStore_instances, "m", _LogStore_extractTaggedLogsFromPrivate).call(this, block), __classPrivateFieldGet(this, _LogStore_instances, "m", _LogStore_extractTaggedLogsFromPublic).call(this, block)])
|
|
38
38
|
.reduce((acc, val) => {
|
|
@@ -43,44 +43,50 @@ export class LogStore {
|
|
|
43
43
|
return acc;
|
|
44
44
|
});
|
|
45
45
|
const tagsToUpdate = Array.from(taggedLogsToAdd.keys());
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
46
|
+
return this.db.transactionAsync(async () => {
|
|
47
|
+
const currentTaggedLogs = await Promise.all(tagsToUpdate.map(async (tag) => ({ tag, logBuffers: await __classPrivateFieldGet(this, _LogStore_logsByTag, "f").getAsync(tag) })));
|
|
48
|
+
currentTaggedLogs.forEach(taggedLogBuffer => {
|
|
49
|
+
if (taggedLogBuffer.logBuffers && taggedLogBuffer.logBuffers.length > 0) {
|
|
50
|
+
taggedLogsToAdd.set(taggedLogBuffer.tag, taggedLogBuffer.logBuffers.concat(taggedLogsToAdd.get(taggedLogBuffer.tag)));
|
|
51
|
+
}
|
|
52
|
+
});
|
|
53
|
+
for (const block of blocks) {
|
|
54
54
|
const tagsInBlock = [];
|
|
55
55
|
for (const [tag, logs] of taggedLogsToAdd.entries()) {
|
|
56
|
-
|
|
56
|
+
await __classPrivateFieldGet(this, _LogStore_logsByTag, "f").set(tag, logs);
|
|
57
57
|
tagsInBlock.push(tag);
|
|
58
58
|
}
|
|
59
|
-
|
|
59
|
+
await __classPrivateFieldGet(this, _LogStore_logTagsByBlock, "f").set(block.number, tagsInBlock);
|
|
60
60
|
const privateLogsInBlock = block.body.txEffects
|
|
61
61
|
.map(txEffect => txEffect.privateLogs)
|
|
62
62
|
.flat()
|
|
63
63
|
.map(log => log.toBuffer());
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
64
|
+
await __classPrivateFieldGet(this, _LogStore_privateLogsByBlock, "f").set(block.number, Buffer.concat(privateLogsInBlock));
|
|
65
|
+
const publicLogsInBlock = block.body.txEffects
|
|
66
|
+
.map((txEffect, txIndex) => [
|
|
67
|
+
numToUInt32BE(txIndex),
|
|
68
|
+
numToUInt32BE(txEffect.publicLogs.length),
|
|
69
|
+
txEffect.publicLogs.map(log => log.toBuffer()),
|
|
70
|
+
].flat())
|
|
71
|
+
.flat();
|
|
72
|
+
await __classPrivateFieldGet(this, _LogStore_publicLogsByBlock, "f").set(block.number, Buffer.concat(publicLogsInBlock));
|
|
73
|
+
await __classPrivateFieldGet(this, _LogStore_contractClassLogsByBlock, "f").set(block.number, block.body.contractClassLogs.toBuffer());
|
|
74
|
+
}
|
|
68
75
|
return true;
|
|
69
76
|
});
|
|
70
77
|
}
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
});
|
|
78
|
+
deleteLogs(blocks) {
|
|
79
|
+
return this.db.transactionAsync(async () => {
|
|
80
|
+
const tagsToDelete = (await Promise.all(blocks.map(async (block) => {
|
|
81
|
+
const tags = await __classPrivateFieldGet(this, _LogStore_logTagsByBlock, "f").getAsync(block.number);
|
|
82
|
+
return tags ?? [];
|
|
83
|
+
}))).flat();
|
|
84
|
+
await Promise.all(blocks.map(block => Promise.all([
|
|
85
|
+
__classPrivateFieldGet(this, _LogStore_privateLogsByBlock, "f").delete(block.number),
|
|
86
|
+
__classPrivateFieldGet(this, _LogStore_publicLogsByBlock, "f").delete(block.number),
|
|
87
|
+
__classPrivateFieldGet(this, _LogStore_logTagsByBlock, "f").delete(block.number),
|
|
88
|
+
])));
|
|
89
|
+
await Promise.all(tagsToDelete.map(tag => __classPrivateFieldGet(this, _LogStore_logsByTag, "f").delete(tag.toString())));
|
|
84
90
|
return true;
|
|
85
91
|
});
|
|
86
92
|
}
|
|
@@ -90,9 +96,9 @@ export class LogStore {
|
|
|
90
96
|
* @param limit - The maximum number of blocks to retrieve logs from.
|
|
91
97
|
* @returns An array of private logs from the specified range of blocks.
|
|
92
98
|
*/
|
|
93
|
-
getPrivateLogs(start, limit) {
|
|
99
|
+
async getPrivateLogs(start, limit) {
|
|
94
100
|
const logs = [];
|
|
95
|
-
for (const buffer of __classPrivateFieldGet(this, _LogStore_privateLogsByBlock, "f").
|
|
101
|
+
for await (const buffer of __classPrivateFieldGet(this, _LogStore_privateLogsByBlock, "f").valuesAsync({ start, limit })) {
|
|
96
102
|
const reader = new BufferReader(buffer);
|
|
97
103
|
while (reader.remainingBytes() > 0) {
|
|
98
104
|
logs.push(reader.readObject(PrivateLog));
|
|
@@ -106,25 +112,24 @@ export class LogStore {
|
|
|
106
112
|
* @returns For each received tag, an array of matching logs is returned. An empty array implies no logs match
|
|
107
113
|
* that tag.
|
|
108
114
|
*/
|
|
109
|
-
getLogsByTags(tags) {
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
.map(noteLogBuffers => noteLogBuffers?.map(noteLogBuffer => TxScopedL2Log.fromBuffer(noteLogBuffer)) ?? []));
|
|
115
|
+
async getLogsByTags(tags) {
|
|
116
|
+
const logs = await Promise.all(tags.map(tag => __classPrivateFieldGet(this, _LogStore_logsByTag, "f").getAsync(tag.toString())));
|
|
117
|
+
return logs.map(noteLogBuffers => noteLogBuffers?.map(noteLogBuffer => TxScopedL2Log.fromBuffer(noteLogBuffer)) ?? []);
|
|
113
118
|
}
|
|
114
119
|
/**
|
|
115
|
-
* Gets
|
|
120
|
+
* Gets public logs based on the provided filter.
|
|
116
121
|
* @param filter - The filter to apply to the logs.
|
|
117
122
|
* @returns The requested logs.
|
|
118
123
|
*/
|
|
119
|
-
|
|
124
|
+
getPublicLogs(filter) {
|
|
120
125
|
if (filter.afterLog) {
|
|
121
|
-
return __classPrivateFieldGet(this, _LogStore_instances, "m",
|
|
126
|
+
return __classPrivateFieldGet(this, _LogStore_instances, "m", _LogStore_filterPublicLogsBetweenBlocks).call(this, filter);
|
|
122
127
|
}
|
|
123
128
|
else if (filter.txHash) {
|
|
124
|
-
return __classPrivateFieldGet(this, _LogStore_instances, "m",
|
|
129
|
+
return __classPrivateFieldGet(this, _LogStore_instances, "m", _LogStore_filterPublicLogsOfTx).call(this, filter);
|
|
125
130
|
}
|
|
126
131
|
else {
|
|
127
|
-
return __classPrivateFieldGet(this, _LogStore_instances, "m",
|
|
132
|
+
return __classPrivateFieldGet(this, _LogStore_instances, "m", _LogStore_filterPublicLogsBetweenBlocks).call(this, filter);
|
|
128
133
|
}
|
|
129
134
|
}
|
|
130
135
|
/**
|
|
@@ -144,7 +149,7 @@ export class LogStore {
|
|
|
144
149
|
}
|
|
145
150
|
}
|
|
146
151
|
}
|
|
147
|
-
_LogStore_logsByTag = new WeakMap(), _LogStore_logTagsByBlock = new WeakMap(), _LogStore_privateLogsByBlock = new WeakMap(),
|
|
152
|
+
_LogStore_logsByTag = new WeakMap(), _LogStore_logTagsByBlock = new WeakMap(), _LogStore_privateLogsByBlock = new WeakMap(), _LogStore_publicLogsByBlock = new WeakMap(), _LogStore_contractClassLogsByBlock = new WeakMap(), _LogStore_logsMaxPageSize = new WeakMap(), _LogStore_log = new WeakMap(), _LogStore_instances = new WeakSet(), _LogStore_extractTaggedLogsFromPrivate = function _LogStore_extractTaggedLogsFromPrivate(block) {
|
|
148
153
|
const taggedLogs = new Map();
|
|
149
154
|
const dataStartIndexForBlock = block.header.state.partial.noteHashTree.nextAvailableLeafIndex -
|
|
150
155
|
block.body.txEffects.length * MAX_NOTE_HASHES_PER_TX;
|
|
@@ -164,53 +169,64 @@ _LogStore_logsByTag = new WeakMap(), _LogStore_logTagsByBlock = new WeakMap(), _
|
|
|
164
169
|
const taggedLogs = new Map();
|
|
165
170
|
const dataStartIndexForBlock = block.header.state.partial.noteHashTree.nextAvailableLeafIndex -
|
|
166
171
|
block.body.txEffects.length * MAX_NOTE_HASHES_PER_TX;
|
|
167
|
-
block.body.
|
|
168
|
-
const txHash =
|
|
172
|
+
block.body.txEffects.forEach((txEffect, txIndex) => {
|
|
173
|
+
const txHash = txEffect.txHash;
|
|
169
174
|
const dataStartIndexForTx = dataStartIndexForBlock + txIndex * MAX_NOTE_HASHES_PER_TX;
|
|
170
|
-
|
|
171
|
-
|
|
172
|
-
|
|
173
|
-
|
|
174
|
-
|
|
175
|
+
txEffect.publicLogs.forEach(log => {
|
|
176
|
+
// Check that each log stores 2 lengths in its first field. If not, it's not a tagged log:
|
|
177
|
+
const firstFieldBuf = log.log[0].toBuffer();
|
|
178
|
+
// See macros/note/mod/ and see how finalization_log[0] is constructed, to understand this monstrosity. (It wasn't me).
|
|
179
|
+
// Search the codebase for "disgusting encoding" to see other hardcoded instances of this encoding, that you might need to change if you ever find yourself here.
|
|
180
|
+
if (!firstFieldBuf.subarray(0, 27).equals(Buffer.alloc(27)) || firstFieldBuf[29] !== 0) {
|
|
181
|
+
// See parseLogFromPublic - the first field of a tagged log is 5 bytes structured:
|
|
182
|
+
// [ publicLen[0], publicLen[1], 0, privateLen[0], privateLen[1]]
|
|
183
|
+
__classPrivateFieldGet(this, _LogStore_log, "f").warn(`Skipping public log with invalid first field: ${log.log[0]}`);
|
|
175
184
|
return;
|
|
176
185
|
}
|
|
177
|
-
|
|
178
|
-
|
|
179
|
-
|
|
180
|
-
|
|
181
|
-
|
|
182
|
-
|
|
183
|
-
|
|
184
|
-
|
|
185
|
-
|
|
186
|
-
}
|
|
187
|
-
const tag = new Fr(correctedBuffer);
|
|
188
|
-
__classPrivateFieldGet(this, _LogStore_log, "f").debug(`Found tagged unencrypted log with tag ${tag.toString()} in block ${block.number}`);
|
|
189
|
-
const currentLogs = taggedLogs.get(tag.toString()) ?? [];
|
|
190
|
-
currentLogs.push(new TxScopedL2Log(txHash, dataStartIndexForTx, block.number, /* isFromPublic */ true, log.data).toBuffer());
|
|
191
|
-
taggedLogs.set(tag.toString(), currentLogs);
|
|
192
|
-
}
|
|
193
|
-
catch (err) {
|
|
194
|
-
__classPrivateFieldGet(this, _LogStore_log, "f").warn(`Failed to add tagged log to store: ${err}`);
|
|
186
|
+
// Check that the length values line up with the log contents
|
|
187
|
+
const publicValuesLength = firstFieldBuf.subarray(-5).readUint16BE();
|
|
188
|
+
const privateValuesLength = firstFieldBuf.subarray(-5).readUint16BE(3);
|
|
189
|
+
// Add 1 for the first field holding lengths
|
|
190
|
+
const totalLogLength = 1 + publicValuesLength + privateValuesLength;
|
|
191
|
+
// Note that zeroes can be valid log values, so we can only assert that we do not go over the given length
|
|
192
|
+
if (totalLogLength > PUBLIC_LOG_DATA_SIZE_IN_FIELDS || log.log.slice(totalLogLength).find(f => !f.isZero())) {
|
|
193
|
+
__classPrivateFieldGet(this, _LogStore_log, "f").warn(`Skipping invalid tagged public log with first field: ${log.log[0]}`);
|
|
194
|
+
return;
|
|
195
195
|
}
|
|
196
|
+
// The first elt stores lengths as above => tag is in fields[1]
|
|
197
|
+
const tag = log.log[1];
|
|
198
|
+
__classPrivateFieldGet(this, _LogStore_log, "f").debug(`Found tagged public log with tag ${tag.toString()} in block ${block.number}`);
|
|
199
|
+
const currentLogs = taggedLogs.get(tag.toString()) ?? [];
|
|
200
|
+
currentLogs.push(new TxScopedL2Log(txHash, dataStartIndexForTx, block.number,
|
|
201
|
+
/* isFromPublic */ true, log.toBuffer()).toBuffer());
|
|
202
|
+
taggedLogs.set(tag.toString(), currentLogs);
|
|
196
203
|
});
|
|
197
204
|
});
|
|
198
205
|
return taggedLogs;
|
|
199
|
-
},
|
|
206
|
+
}, _LogStore_filterPublicLogsOfTx = async function _LogStore_filterPublicLogsOfTx(filter) {
|
|
200
207
|
if (!filter.txHash) {
|
|
201
208
|
throw new Error('Missing txHash');
|
|
202
209
|
}
|
|
203
|
-
const [blockNumber, txIndex] = this.blockStore.getTxLocation(filter.txHash) ?? [];
|
|
210
|
+
const [blockNumber, txIndex] = (await this.blockStore.getTxLocation(filter.txHash)) ?? [];
|
|
204
211
|
if (typeof blockNumber !== 'number' || typeof txIndex !== 'number') {
|
|
205
212
|
return { logs: [], maxLogsHit: false };
|
|
206
213
|
}
|
|
207
|
-
const buffer = __classPrivateFieldGet(this,
|
|
208
|
-
const
|
|
209
|
-
const
|
|
214
|
+
const buffer = (await __classPrivateFieldGet(this, _LogStore_publicLogsByBlock, "f").getAsync(blockNumber)) ?? Buffer.alloc(0);
|
|
215
|
+
const publicLogsInBlock = [[]];
|
|
216
|
+
const reader = new BufferReader(buffer);
|
|
217
|
+
while (reader.remainingBytes() > 0) {
|
|
218
|
+
const indexOfTx = reader.readNumber();
|
|
219
|
+
const numLogsInTx = reader.readNumber();
|
|
220
|
+
publicLogsInBlock[indexOfTx] = [];
|
|
221
|
+
for (let i = 0; i < numLogsInTx; i++) {
|
|
222
|
+
publicLogsInBlock[indexOfTx].push(reader.readObject(PublicLog));
|
|
223
|
+
}
|
|
224
|
+
}
|
|
225
|
+
const txLogs = publicLogsInBlock[txIndex];
|
|
210
226
|
const logs = [];
|
|
211
227
|
const maxLogsHit = __classPrivateFieldGet(this, _LogStore_instances, "m", _LogStore_accumulateLogs).call(this, logs, blockNumber, txIndex, txLogs, filter);
|
|
212
228
|
return { logs, maxLogsHit };
|
|
213
|
-
},
|
|
229
|
+
}, _LogStore_filterPublicLogsBetweenBlocks = async function _LogStore_filterPublicLogsBetweenBlocks(filter) {
|
|
214
230
|
const start = filter.afterLog?.blockNumber ?? Math.max(filter.fromBlock ?? INITIAL_L2_BLOCK_NUM, INITIAL_L2_BLOCK_NUM);
|
|
215
231
|
const end = filter.toBlock;
|
|
216
232
|
if (typeof end === 'number' && end < start) {
|
|
@@ -221,10 +237,19 @@ _LogStore_logsByTag = new WeakMap(), _LogStore_logTagsByBlock = new WeakMap(), _
|
|
|
221
237
|
}
|
|
222
238
|
const logs = [];
|
|
223
239
|
let maxLogsHit = false;
|
|
224
|
-
loopOverBlocks: for (const [blockNumber, logBuffer] of __classPrivateFieldGet(this,
|
|
225
|
-
const
|
|
226
|
-
|
|
227
|
-
|
|
240
|
+
loopOverBlocks: for await (const [blockNumber, logBuffer] of __classPrivateFieldGet(this, _LogStore_publicLogsByBlock, "f").entriesAsync({ start, end })) {
|
|
241
|
+
const publicLogsInBlock = [[]];
|
|
242
|
+
const reader = new BufferReader(logBuffer);
|
|
243
|
+
while (reader.remainingBytes() > 0) {
|
|
244
|
+
const indexOfTx = reader.readNumber();
|
|
245
|
+
const numLogsInTx = reader.readNumber();
|
|
246
|
+
publicLogsInBlock[indexOfTx] = [];
|
|
247
|
+
for (let i = 0; i < numLogsInTx; i++) {
|
|
248
|
+
publicLogsInBlock[indexOfTx].push(reader.readObject(PublicLog));
|
|
249
|
+
}
|
|
250
|
+
}
|
|
251
|
+
for (let txIndex = filter.afterLog?.txIndex ?? 0; txIndex < publicLogsInBlock.length; txIndex++) {
|
|
252
|
+
const txLogs = publicLogsInBlock[txIndex];
|
|
228
253
|
maxLogsHit = __classPrivateFieldGet(this, _LogStore_instances, "m", _LogStore_accumulateLogs).call(this, logs, blockNumber, txIndex, txLogs, filter);
|
|
229
254
|
if (maxLogsHit) {
|
|
230
255
|
__classPrivateFieldGet(this, _LogStore_log, "f").debug(`Max logs hit at block ${blockNumber}`);
|
|
@@ -233,15 +258,15 @@ _LogStore_logsByTag = new WeakMap(), _LogStore_logTagsByBlock = new WeakMap(), _
|
|
|
233
258
|
}
|
|
234
259
|
}
|
|
235
260
|
return { logs, maxLogsHit };
|
|
236
|
-
}, _LogStore_filterContractClassLogsOfTx = function _LogStore_filterContractClassLogsOfTx(filter) {
|
|
261
|
+
}, _LogStore_filterContractClassLogsOfTx = async function _LogStore_filterContractClassLogsOfTx(filter) {
|
|
237
262
|
if (!filter.txHash) {
|
|
238
263
|
throw new Error('Missing txHash');
|
|
239
264
|
}
|
|
240
|
-
const [blockNumber, txIndex] = this.blockStore.getTxLocation(filter.txHash) ?? [];
|
|
265
|
+
const [blockNumber, txIndex] = (await this.blockStore.getTxLocation(filter.txHash)) ?? [];
|
|
241
266
|
if (typeof blockNumber !== 'number' || typeof txIndex !== 'number') {
|
|
242
267
|
return { logs: [], maxLogsHit: false };
|
|
243
268
|
}
|
|
244
|
-
const contractClassLogsBuffer = __classPrivateFieldGet(this, _LogStore_contractClassLogsByBlock, "f").
|
|
269
|
+
const contractClassLogsBuffer = await __classPrivateFieldGet(this, _LogStore_contractClassLogsByBlock, "f").getAsync(blockNumber);
|
|
245
270
|
const contractClassLogsInBlock = contractClassLogsBuffer
|
|
246
271
|
? ContractClass2BlockL2Logs.fromBuffer(contractClassLogsBuffer)
|
|
247
272
|
: new ContractClass2BlockL2Logs([]);
|
|
@@ -249,7 +274,7 @@ _LogStore_logsByTag = new WeakMap(), _LogStore_logTagsByBlock = new WeakMap(), _
|
|
|
249
274
|
const logs = [];
|
|
250
275
|
const maxLogsHit = __classPrivateFieldGet(this, _LogStore_instances, "m", _LogStore_accumulateLogs).call(this, logs, blockNumber, txIndex, txLogs, filter);
|
|
251
276
|
return { logs, maxLogsHit };
|
|
252
|
-
}, _LogStore_filterContractClassLogsBetweenBlocks = function _LogStore_filterContractClassLogsBetweenBlocks(filter) {
|
|
277
|
+
}, _LogStore_filterContractClassLogsBetweenBlocks = async function _LogStore_filterContractClassLogsBetweenBlocks(filter) {
|
|
253
278
|
const start = filter.afterLog?.blockNumber ?? Math.max(filter.fromBlock ?? INITIAL_L2_BLOCK_NUM, INITIAL_L2_BLOCK_NUM);
|
|
254
279
|
const end = filter.toBlock;
|
|
255
280
|
if (typeof end === 'number' && end < start) {
|
|
@@ -260,7 +285,10 @@ _LogStore_logsByTag = new WeakMap(), _LogStore_logTagsByBlock = new WeakMap(), _
|
|
|
260
285
|
}
|
|
261
286
|
const logs = [];
|
|
262
287
|
let maxLogsHit = false;
|
|
263
|
-
loopOverBlocks: for (const [blockNumber, logBuffer] of __classPrivateFieldGet(this, _LogStore_contractClassLogsByBlock, "f").
|
|
288
|
+
loopOverBlocks: for await (const [blockNumber, logBuffer] of __classPrivateFieldGet(this, _LogStore_contractClassLogsByBlock, "f").entriesAsync({
|
|
289
|
+
start,
|
|
290
|
+
end,
|
|
291
|
+
})) {
|
|
264
292
|
const contractClassLogsInBlock = ContractClass2BlockL2Logs.fromBuffer(logBuffer);
|
|
265
293
|
for (let txIndex = filter.afterLog?.txIndex ?? 0; txIndex < contractClassLogsInBlock.txLogs.length; txIndex++) {
|
|
266
294
|
const txLogs = contractClassLogsInBlock.txLogs[txIndex].unrollLogs();
|
|
@@ -278,7 +306,12 @@ _LogStore_logsByTag = new WeakMap(), _LogStore_logTagsByBlock = new WeakMap(), _
|
|
|
278
306
|
for (; logIndex < txLogs.length; logIndex++) {
|
|
279
307
|
const log = txLogs[logIndex];
|
|
280
308
|
if (!filter.contractAddress || log.contractAddress.equals(filter.contractAddress)) {
|
|
281
|
-
|
|
309
|
+
if (log instanceof UnencryptedL2Log) {
|
|
310
|
+
results.push(new ExtendedUnencryptedL2Log(new LogId(blockNumber, txIndex, logIndex), log));
|
|
311
|
+
}
|
|
312
|
+
else {
|
|
313
|
+
results.push(new ExtendedPublicLog(new LogId(blockNumber, txIndex, logIndex), log));
|
|
314
|
+
}
|
|
282
315
|
if (results.length >= __classPrivateFieldGet(this, _LogStore_logsMaxPageSize, "f")) {
|
|
283
316
|
maxLogsHit = true;
|
|
284
317
|
break;
|
|
@@ -287,4 +320,4 @@ _LogStore_logsByTag = new WeakMap(), _LogStore_logTagsByBlock = new WeakMap(), _
|
|
|
287
320
|
}
|
|
288
321
|
return maxLogsHit;
|
|
289
322
|
};
|
|
290
|
-
//# 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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"}
|
|
323
|
+
//# 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,6 +1,6 @@
|
|
|
1
1
|
import { InboxLeaf } from '@aztec/circuit-types';
|
|
2
2
|
import { Fr } from '@aztec/circuits.js';
|
|
3
|
-
import {
|
|
3
|
+
import type { AztecAsyncKVStore } from '@aztec/kv-store';
|
|
4
4
|
import { type DataRetrieval } from '../structs/data_retrieval.js';
|
|
5
5
|
/**
|
|
6
6
|
* LMDB implementation of the ArchiverDataStore interface.
|
|
@@ -8,14 +8,14 @@ import { type DataRetrieval } from '../structs/data_retrieval.js';
|
|
|
8
8
|
export declare class MessageStore {
|
|
9
9
|
#private;
|
|
10
10
|
private db;
|
|
11
|
-
constructor(db:
|
|
12
|
-
getTotalL1ToL2MessageCount(): bigint
|
|
11
|
+
constructor(db: AztecAsyncKVStore);
|
|
12
|
+
getTotalL1ToL2MessageCount(): Promise<bigint>;
|
|
13
13
|
/**
|
|
14
14
|
* Gets the last L1 block number that emitted new messages.
|
|
15
15
|
* @returns The last L1 block number processed
|
|
16
16
|
*/
|
|
17
|
-
getSynchedL1BlockNumber(): bigint | undefined
|
|
18
|
-
setSynchedL1BlockNumber(l1BlockNumber: bigint): void
|
|
17
|
+
getSynchedL1BlockNumber(): Promise<bigint | undefined>;
|
|
18
|
+
setSynchedL1BlockNumber(l1BlockNumber: bigint): Promise<void>;
|
|
19
19
|
/**
|
|
20
20
|
* Append L1 to L2 messages to the store.
|
|
21
21
|
* @param messages - The L1 to L2 messages to be added to the store and the last processed L1 block.
|
|
@@ -28,6 +28,6 @@ export declare class MessageStore {
|
|
|
28
28
|
* @returns The index of the L1 to L2 message in the L1 to L2 message tree (undefined if not found).
|
|
29
29
|
*/
|
|
30
30
|
getL1ToL2MessageIndex(l1ToL2Message: Fr): Promise<bigint | undefined>;
|
|
31
|
-
getL1ToL2Messages(blockNumber: bigint): Fr[]
|
|
31
|
+
getL1ToL2Messages(blockNumber: bigint): Promise<Fr[]>;
|
|
32
32
|
}
|
|
33
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,
|
|
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,KAAK,EAAE,iBAAiB,EAAsC,MAAM,iBAAiB,CAAC;AAE7F,OAAO,EAAE,KAAK,aAAa,EAAE,MAAM,8BAA8B,CAAC;AAElE;;GAEG;AACH,qBAAa,YAAY;;IAUX,OAAO,CAAC,EAAE;gBAAF,EAAE,EAAE,iBAAiB;IAOnC,0BAA0B,IAAI,OAAO,CAAC,MAAM,CAAC;IAInD;;;OAGG;IACH,uBAAuB,IAAI,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC;IAIhD,uBAAuB,CAAC,aAAa,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAInE;;;;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;IAI/D,iBAAiB,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,EAAE,EAAE,CAAC;CAqB5D"}
|
|
@@ -20,18 +20,18 @@ export class MessageStore {
|
|
|
20
20
|
__classPrivateFieldSet(this, _MessageStore_lastSynchedL1Block, db.openSingleton('archiver_last_l1_block_new_messages'), "f");
|
|
21
21
|
__classPrivateFieldSet(this, _MessageStore_totalMessageCount, db.openSingleton('archiver_l1_to_l2_message_count'), "f");
|
|
22
22
|
}
|
|
23
|
-
getTotalL1ToL2MessageCount() {
|
|
24
|
-
return __classPrivateFieldGet(this, _MessageStore_totalMessageCount, "f").
|
|
23
|
+
async getTotalL1ToL2MessageCount() {
|
|
24
|
+
return (await __classPrivateFieldGet(this, _MessageStore_totalMessageCount, "f").getAsync()) ?? 0n;
|
|
25
25
|
}
|
|
26
26
|
/**
|
|
27
27
|
* Gets the last L1 block number that emitted new messages.
|
|
28
28
|
* @returns The last L1 block number processed
|
|
29
29
|
*/
|
|
30
30
|
getSynchedL1BlockNumber() {
|
|
31
|
-
return __classPrivateFieldGet(this, _MessageStore_lastSynchedL1Block, "f").
|
|
31
|
+
return __classPrivateFieldGet(this, _MessageStore_lastSynchedL1Block, "f").getAsync();
|
|
32
32
|
}
|
|
33
|
-
setSynchedL1BlockNumber(l1BlockNumber) {
|
|
34
|
-
|
|
33
|
+
async setSynchedL1BlockNumber(l1BlockNumber) {
|
|
34
|
+
await __classPrivateFieldGet(this, _MessageStore_lastSynchedL1Block, "f").set(l1BlockNumber);
|
|
35
35
|
}
|
|
36
36
|
/**
|
|
37
37
|
* Append L1 to L2 messages to the store.
|
|
@@ -39,19 +39,19 @@ export class MessageStore {
|
|
|
39
39
|
* @returns True if the operation is successful.
|
|
40
40
|
*/
|
|
41
41
|
addL1ToL2Messages(messages) {
|
|
42
|
-
return this.db.
|
|
43
|
-
const lastL1BlockNumber = __classPrivateFieldGet(this, _MessageStore_lastSynchedL1Block, "f").
|
|
42
|
+
return this.db.transactionAsync(async () => {
|
|
43
|
+
const lastL1BlockNumber = (await __classPrivateFieldGet(this, _MessageStore_lastSynchedL1Block, "f").getAsync()) ?? 0n;
|
|
44
44
|
if (lastL1BlockNumber >= messages.lastProcessedL1BlockNumber) {
|
|
45
45
|
return false;
|
|
46
46
|
}
|
|
47
|
-
|
|
47
|
+
await __classPrivateFieldGet(this, _MessageStore_lastSynchedL1Block, "f").set(messages.lastProcessedL1BlockNumber);
|
|
48
48
|
for (const message of messages.retrievedData) {
|
|
49
49
|
const key = `${message.index}`;
|
|
50
|
-
|
|
51
|
-
|
|
50
|
+
await __classPrivateFieldGet(this, _MessageStore_l1ToL2Messages, "f").set(key, message.leaf.toBuffer());
|
|
51
|
+
await __classPrivateFieldGet(this, _MessageStore_l1ToL2MessageIndices, "f").set(message.leaf.toString(), message.index);
|
|
52
52
|
}
|
|
53
|
-
const lastTotalMessageCount = this.getTotalL1ToL2MessageCount();
|
|
54
|
-
|
|
53
|
+
const lastTotalMessageCount = await this.getTotalL1ToL2MessageCount();
|
|
54
|
+
await __classPrivateFieldGet(this, _MessageStore_totalMessageCount, "f").set(lastTotalMessageCount + BigInt(messages.retrievedData.length));
|
|
55
55
|
return true;
|
|
56
56
|
});
|
|
57
57
|
}
|
|
@@ -61,16 +61,16 @@ export class MessageStore {
|
|
|
61
61
|
* @returns The index of the L1 to L2 message in the L1 to L2 message tree (undefined if not found).
|
|
62
62
|
*/
|
|
63
63
|
getL1ToL2MessageIndex(l1ToL2Message) {
|
|
64
|
-
return
|
|
64
|
+
return __classPrivateFieldGet(this, _MessageStore_l1ToL2MessageIndices, "f").getAsync(l1ToL2Message.toString());
|
|
65
65
|
}
|
|
66
|
-
getL1ToL2Messages(blockNumber) {
|
|
66
|
+
async getL1ToL2Messages(blockNumber) {
|
|
67
67
|
const messages = [];
|
|
68
68
|
let undefinedMessageFound = false;
|
|
69
69
|
const startIndex = Number(InboxLeaf.smallestIndexFromL2Block(blockNumber));
|
|
70
70
|
for (let i = startIndex; i < startIndex + __classPrivateFieldGet(this, _MessageStore_l1ToL2MessagesSubtreeSize, "f"); i++) {
|
|
71
71
|
// This is inefficient but probably fine for now.
|
|
72
72
|
const key = `${i}`;
|
|
73
|
-
const message = __classPrivateFieldGet(this, _MessageStore_l1ToL2Messages, "f").
|
|
73
|
+
const message = await __classPrivateFieldGet(this, _MessageStore_l1ToL2Messages, "f").getAsync(key);
|
|
74
74
|
if (message) {
|
|
75
75
|
if (undefinedMessageFound) {
|
|
76
76
|
throw new Error(`L1 to L2 message gap found in block ${blockNumber}`);
|
|
@@ -87,4 +87,4 @@ export class MessageStore {
|
|
|
87
87
|
}
|
|
88
88
|
}
|
|
89
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();
|
|
90
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
90
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibWVzc2FnZV9zdG9yZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9hcmNoaXZlci9rdl9hcmNoaXZlcl9zdG9yZS9tZXNzYWdlX3N0b3JlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7O0FBQUEsT0FBTyxFQUFFLFNBQVMsRUFBRSxNQUFNLHNCQUFzQixDQUFDO0FBQ2pELE9BQU8sRUFBRSxFQUFFLEVBQUUsMkJBQTJCLEVBQUUsTUFBTSxvQkFBb0IsQ0FBQztBQUNyRSxPQUFPLEVBQUUsWUFBWSxFQUFFLE1BQU0sdUJBQXVCLENBQUM7QUFLckQ7O0dBRUc7QUFDSCxNQUFNLE9BQU8sWUFBWTtJQVV2QixZQUFvQixFQUFxQjtRQUFyQixPQUFFLEdBQUYsRUFBRSxDQUFtQjtRQVR6QywrQ0FBK0M7UUFDL0MscURBQXFEO1FBQ3JELG1EQUFpRDtRQUNqRCxrREFBZ0Q7UUFFaEQsNEJBQU8sWUFBWSxDQUFDLHdCQUF3QixDQUFDLEVBQUM7UUFFOUMsa0RBQTZCLENBQUMsSUFBSSwyQkFBMkIsRUFBQztRQUc1RCx1QkFBQSxJQUFJLGdDQUFtQixFQUFFLENBQUMsT0FBTyxDQUFDLDRCQUE0QixDQUFDLE1BQUEsQ0FBQztRQUNoRSx1QkFBQSxJQUFJLHNDQUF5QixFQUFFLENBQUMsT0FBTyxDQUFDLG1DQUFtQyxDQUFDLE1BQUEsQ0FBQztRQUM3RSx1QkFBQSxJQUFJLG9DQUF1QixFQUFFLENBQUMsYUFBYSxDQUFDLHFDQUFxQyxDQUFDLE1BQUEsQ0FBQztRQUNuRix1QkFBQSxJQUFJLG1DQUFzQixFQUFFLENBQUMsYUFBYSxDQUFDLGlDQUFpQyxDQUFDLE1BQUEsQ0FBQztJQUNoRixDQUFDO0lBRUQsS0FBSyxDQUFDLDBCQUEwQjtRQUM5QixPQUFPLENBQUMsTUFBTSx1QkFBQSxJQUFJLHVDQUFtQixDQUFDLFFBQVEsRUFBRSxDQUFDLElBQUksRUFBRSxDQUFDO0lBQzFELENBQUM7SUFFRDs7O09BR0c7SUFDSCx1QkFBdUI7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
|
|
@@ -1,10 +1,10 @@
|
|
|
1
1
|
import { type InBlock, type L2Block } from '@aztec/circuit-types';
|
|
2
2
|
import { type Fr } from '@aztec/circuits.js';
|
|
3
|
-
import {
|
|
3
|
+
import type { AztecAsyncKVStore } from '@aztec/kv-store';
|
|
4
4
|
export declare class NullifierStore {
|
|
5
5
|
#private;
|
|
6
6
|
private db;
|
|
7
|
-
constructor(db:
|
|
7
|
+
constructor(db: AztecAsyncKVStore);
|
|
8
8
|
addNullifiers(blocks: L2Block[]): Promise<boolean>;
|
|
9
9
|
deleteNullifiers(blocks: L2Block[]): Promise<boolean>;
|
|
10
10
|
findNullifiersIndexesWithBlock(blockNumber: number, nullifiers: Fr[]): Promise<(InBlock<bigint> | undefined)[]>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"nullifier_store.d.ts","sourceRoot":"","sources":["../../../src/archiver/kv_archiver_store/nullifier_store.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,OAAO,EAAE,KAAK,OAAO,EAAE,MAAM,sBAAsB,CAAC;AAClE,OAAO,EAAE,KAAK,EAAE,EAAyB,MAAM,oBAAoB,CAAC;AAEpE,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"nullifier_store.d.ts","sourceRoot":"","sources":["../../../src/archiver/kv_archiver_store/nullifier_store.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,OAAO,EAAE,KAAK,OAAO,EAAE,MAAM,sBAAsB,CAAC;AAClE,OAAO,EAAE,KAAK,EAAE,EAAyB,MAAM,oBAAoB,CAAC;AAEpE,OAAO,KAAK,EAAE,iBAAiB,EAAiB,MAAM,iBAAiB,CAAC;AAExE,qBAAa,cAAc;;IAMb,OAAO,CAAC,EAAE;gBAAF,EAAE,EAAE,iBAAiB;IAMnC,aAAa,CAAC,MAAM,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,OAAO,CAAC;IA0BlD,gBAAgB,CAAC,MAAM,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,OAAO,CAAC;IAerD,8BAA8B,CAClC,WAAW,EAAE,MAAM,EACnB,UAAU,EAAE,EAAE,EAAE,GACf,OAAO,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,GAAG,SAAS,CAAC,EAAE,CAAC;CAkC5C"}
|