@aztec/archiver 0.75.0-commit.c03ba01a2a4122e43e90d5133ba017e54b90e9d2 → 0.76.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 +186 -0
- package/dest/archiver/archiver.d.ts.map +1 -0
- package/dest/archiver/archiver.js +711 -729
- package/dest/archiver/archiver_store.d.ts +217 -0
- package/dest/archiver/archiver_store.d.ts.map +1 -0
- package/dest/archiver/archiver_store.js +2 -4
- package/dest/archiver/archiver_store_test_suite.d.ts +8 -0
- package/dest/archiver/archiver_store_test_suite.d.ts.map +1 -0
- package/dest/archiver/archiver_store_test_suite.js +224 -385
- package/dest/archiver/config.d.ts +37 -0
- package/dest/archiver/config.d.ts.map +1 -0
- package/dest/archiver/config.js +15 -9
- package/dest/archiver/data_retrieval.d.ts +71 -0
- package/dest/archiver/data_retrieval.d.ts.map +1 -0
- package/dest/archiver/data_retrieval.js +67 -77
- package/dest/archiver/errors.d.ts +4 -0
- package/dest/archiver/errors.d.ts.map +1 -0
- package/dest/archiver/errors.js +2 -1
- package/dest/archiver/index.d.ts +8 -0
- package/dest/archiver/index.d.ts.map +1 -0
- package/dest/archiver/index.js +1 -0
- package/dest/archiver/instrumentation.d.ts +27 -0
- package/dest/archiver/instrumentation.d.ts.map +1 -0
- package/dest/archiver/instrumentation.js +17 -29
- package/dest/archiver/kv_archiver_store/block_store.d.ts +87 -0
- package/dest/archiver/kv_archiver_store/block_store.d.ts.map +1 -0
- package/dest/archiver/kv_archiver_store/block_store.js +127 -118
- package/dest/archiver/kv_archiver_store/contract_class_store.d.ts +17 -0
- package/dest/archiver/kv_archiver_store/contract_class_store.d.ts.map +1 -0
- package/dest/archiver/kv_archiver_store/contract_class_store.js +37 -43
- package/dest/archiver/kv_archiver_store/contract_instance_store.d.ts +13 -0
- package/dest/archiver/kv_archiver_store/contract_instance_store.d.ts.map +1 -0
- package/dest/archiver/kv_archiver_store/contract_instance_store.js +12 -7
- package/dest/archiver/kv_archiver_store/kv_archiver_store.d.ts +147 -0
- package/dest/archiver/kv_archiver_store/kv_archiver_store.d.ts.map +1 -0
- package/dest/archiver/kv_archiver_store/kv_archiver_store.js +158 -135
- package/dest/archiver/kv_archiver_store/log_store.d.ts +47 -0
- package/dest/archiver/kv_archiver_store/log_store.d.ts.map +1 -0
- package/dest/archiver/kv_archiver_store/log_store.js +256 -271
- package/dest/archiver/kv_archiver_store/message_store.d.ts +33 -0
- package/dest/archiver/kv_archiver_store/message_store.d.ts.map +1 -0
- package/dest/archiver/kv_archiver_store/message_store.js +48 -42
- package/dest/archiver/kv_archiver_store/nullifier_store.d.ts +12 -0
- package/dest/archiver/kv_archiver_store/nullifier_store.d.ts.map +1 -0
- package/dest/archiver/kv_archiver_store/nullifier_store.js +42 -35
- package/dest/archiver/memory_archiver_store/l1_to_l2_message_store.d.ts +23 -0
- package/dest/archiver/memory_archiver_store/l1_to_l2_message_store.d.ts.map +1 -0
- package/dest/archiver/memory_archiver_store/l1_to_l2_message_store.js +24 -15
- package/dest/archiver/memory_archiver_store/memory_archiver_store.d.ts +168 -0
- package/dest/archiver/memory_archiver_store/memory_archiver_store.d.ts.map +1 -0
- package/dest/archiver/memory_archiver_store/memory_archiver_store.js +231 -227
- package/dest/archiver/structs/data_retrieval.d.ts +27 -0
- package/dest/archiver/structs/data_retrieval.d.ts.map +1 -0
- package/dest/archiver/structs/data_retrieval.js +2 -5
- package/dest/archiver/structs/published.d.ts +11 -0
- package/dest/archiver/structs/published.d.ts.map +1 -0
- package/dest/archiver/structs/published.js +2 -1
- package/dest/factory.d.ts +10 -0
- package/dest/factory.d.ts.map +1 -0
- package/dest/factory.js +24 -32
- package/dest/index.d.ts +5 -0
- package/dest/index.d.ts.map +1 -0
- package/dest/index.js +1 -0
- package/dest/rpc/index.d.ts +9 -0
- package/dest/rpc/index.d.ts.map +1 -0
- package/dest/rpc/index.js +8 -7
- package/dest/test/index.d.ts +4 -0
- package/dest/test/index.d.ts.map +1 -0
- package/dest/test/index.js +1 -0
- package/dest/test/mock_archiver.d.ts +22 -0
- package/dest/test/mock_archiver.d.ts.map +1 -0
- package/dest/test/mock_archiver.js +13 -8
- package/dest/test/mock_l1_to_l2_message_source.d.ts +16 -0
- package/dest/test/mock_l1_to_l2_message_source.d.ts.map +1 -0
- package/dest/test/mock_l1_to_l2_message_source.js +4 -4
- package/dest/test/mock_l2_block_source.d.ts +80 -0
- package/dest/test/mock_l2_block_source.d.ts.map +1 -0
- package/dest/test/mock_l2_block_source.js +67 -68
- package/package.json +15 -14
- package/src/archiver/config.ts +7 -1
- package/src/archiver/index.ts +1 -1
- package/src/factory.ts +7 -3
- package/src/rpc/index.ts +16 -3
|
@@ -1,41 +1,26 @@
|
|
|
1
|
-
|
|
2
|
-
import {
|
|
1
|
+
var _MemoryArchiverStore_instances, _MemoryArchiverStore_log, _MemoryArchiverStore_storeTaggedLogsFromPrivate, _MemoryArchiverStore_storeTaggedLogsFromPublic;
|
|
2
|
+
import { __classPrivateFieldGet } from "tslib";
|
|
3
|
+
import { ExtendedPublicLog, ExtendedUnencryptedL2Log, L2BlockHash, LogId, TxReceipt, TxScopedL2Log, wrapInBlock, } from '@aztec/circuit-types';
|
|
4
|
+
import { Fr, INITIAL_L2_BLOCK_NUM, MAX_NOTE_HASHES_PER_TX, MAX_NULLIFIERS_PER_TX, PUBLIC_LOG_DATA_SIZE_IN_FIELDS, } from '@aztec/circuits.js';
|
|
3
5
|
import { FunctionSelector } from '@aztec/foundation/abi';
|
|
4
6
|
import { createLogger } from '@aztec/foundation/log';
|
|
5
7
|
import { L1ToL2MessageStore } from './l1_to_l2_message_store.js';
|
|
6
8
|
/**
|
|
7
9
|
* Simple, in-memory implementation of an archiver data store.
|
|
8
|
-
*/
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
* An array containing all the tx effects in the L2 blocks that have been fetched so far.
|
|
15
|
-
*/ txEffects;
|
|
16
|
-
taggedLogs;
|
|
17
|
-
logTagsPerBlock;
|
|
18
|
-
privateLogsPerBlock;
|
|
19
|
-
publicLogsPerBlock;
|
|
20
|
-
contractClassLogsPerBlock;
|
|
21
|
-
blockScopedNullifiers;
|
|
22
|
-
/**
|
|
23
|
-
* Contains all L1 to L2 messages.
|
|
24
|
-
*/ l1ToL2Messages;
|
|
25
|
-
contractClasses;
|
|
26
|
-
bytecodeCommitments;
|
|
27
|
-
privateFunctions;
|
|
28
|
-
unconstrainedFunctions;
|
|
29
|
-
contractInstances;
|
|
30
|
-
lastL1BlockNewBlocks;
|
|
31
|
-
lastL1BlockNewMessages;
|
|
32
|
-
lastProvenL2BlockNumber;
|
|
33
|
-
lastProvenL2EpochNumber;
|
|
34
|
-
functionNames;
|
|
35
|
-
#log;
|
|
36
|
-
constructor(/** The max number of logs that can be obtained in 1 "getPublicLogs" call. */ maxLogs){
|
|
10
|
+
*/
|
|
11
|
+
export class MemoryArchiverStore {
|
|
12
|
+
constructor(
|
|
13
|
+
/** The max number of logs that can be obtained in 1 "getPublicLogs" call. */
|
|
14
|
+
maxLogs) {
|
|
15
|
+
_MemoryArchiverStore_instances.add(this);
|
|
37
16
|
this.maxLogs = maxLogs;
|
|
17
|
+
/**
|
|
18
|
+
* An array containing all the L2 blocks that have been fetched so far.
|
|
19
|
+
*/
|
|
38
20
|
this.l2Blocks = [];
|
|
21
|
+
/**
|
|
22
|
+
* An array containing all the tx effects in the L2 blocks that have been fetched so far.
|
|
23
|
+
*/
|
|
39
24
|
this.txEffects = [];
|
|
40
25
|
this.taggedLogs = new Map();
|
|
41
26
|
this.logTagsPerBlock = new Map();
|
|
@@ -43,6 +28,9 @@ import { L1ToL2MessageStore } from './l1_to_l2_message_store.js';
|
|
|
43
28
|
this.publicLogsPerBlock = new Map();
|
|
44
29
|
this.contractClassLogsPerBlock = new Map();
|
|
45
30
|
this.blockScopedNullifiers = new Map();
|
|
31
|
+
/**
|
|
32
|
+
* Contains all L1 to L2 messages.
|
|
33
|
+
*/
|
|
46
34
|
this.l1ToL2Messages = new L1ToL2MessageStore();
|
|
47
35
|
this.contractClasses = new Map();
|
|
48
36
|
this.bytecodeCommitments = new Map();
|
|
@@ -54,18 +42,18 @@ import { L1ToL2MessageStore } from './l1_to_l2_message_store.js';
|
|
|
54
42
|
this.lastProvenL2BlockNumber = 0;
|
|
55
43
|
this.lastProvenL2EpochNumber = 0;
|
|
56
44
|
this.functionNames = new Map();
|
|
57
|
-
this
|
|
45
|
+
_MemoryArchiverStore_log.set(this, createLogger('archiver:data-store'));
|
|
58
46
|
}
|
|
59
47
|
getContractClass(id) {
|
|
60
48
|
const contractClass = this.contractClasses.get(id.toString());
|
|
61
49
|
return Promise.resolve(contractClass && {
|
|
62
50
|
...contractClass,
|
|
63
51
|
privateFunctions: this.privateFunctions.get(id.toString()) ?? [],
|
|
64
|
-
unconstrainedFunctions: this.unconstrainedFunctions.get(id.toString()) ?? []
|
|
52
|
+
unconstrainedFunctions: this.unconstrainedFunctions.get(id.toString()) ?? [],
|
|
65
53
|
});
|
|
66
54
|
}
|
|
67
55
|
getContractClassIds() {
|
|
68
|
-
return Promise.resolve(Array.from(this.contractClasses.keys()).map(
|
|
56
|
+
return Promise.resolve(Array.from(this.contractClasses.keys()).map(key => Fr.fromHexString(key)));
|
|
69
57
|
}
|
|
70
58
|
getContractInstance(address) {
|
|
71
59
|
return Promise.resolve(this.contractInstances.get(address.toString()));
|
|
@@ -78,23 +66,23 @@ import { L1ToL2MessageStore } from './l1_to_l2_message_store.js';
|
|
|
78
66
|
const unconstrainedFunctions = this.unconstrainedFunctions.get(contractClassId.toString()) ?? [];
|
|
79
67
|
const updatedPrivateFunctions = [
|
|
80
68
|
...privateFunctions,
|
|
81
|
-
...newPrivateFunctions.filter(
|
|
69
|
+
...newPrivateFunctions.filter(newFn => !privateFunctions.find(f => f.selector.equals(newFn.selector))),
|
|
82
70
|
];
|
|
83
71
|
const updatedUnconstrainedFunctions = [
|
|
84
72
|
...unconstrainedFunctions,
|
|
85
|
-
...newUnconstrainedFunctions.filter(
|
|
73
|
+
...newUnconstrainedFunctions.filter(newFn => !unconstrainedFunctions.find(f => f.selector.equals(newFn.selector))),
|
|
86
74
|
];
|
|
87
75
|
this.privateFunctions.set(contractClassId.toString(), updatedPrivateFunctions);
|
|
88
76
|
this.unconstrainedFunctions.set(contractClassId.toString(), updatedUnconstrainedFunctions);
|
|
89
77
|
return Promise.resolve(true);
|
|
90
78
|
}
|
|
91
79
|
addContractClasses(data, bytecodeCommitments, blockNumber) {
|
|
92
|
-
for(let i = 0; i < data.length; i++){
|
|
80
|
+
for (let i = 0; i < data.length; i++) {
|
|
93
81
|
const contractClass = data[i];
|
|
94
82
|
if (!this.contractClasses.has(contractClass.id.toString())) {
|
|
95
83
|
this.contractClasses.set(contractClass.id.toString(), {
|
|
96
84
|
...contractClass,
|
|
97
|
-
l2BlockNumber: blockNumber
|
|
85
|
+
l2BlockNumber: blockNumber,
|
|
98
86
|
});
|
|
99
87
|
}
|
|
100
88
|
if (!this.bytecodeCommitments.has(contractClass.id.toString())) {
|
|
@@ -104,7 +92,7 @@ import { L1ToL2MessageStore } from './l1_to_l2_message_store.js';
|
|
|
104
92
|
return Promise.resolve(true);
|
|
105
93
|
}
|
|
106
94
|
deleteContractClasses(data, blockNumber) {
|
|
107
|
-
for (const contractClass of data){
|
|
95
|
+
for (const contractClass of data) {
|
|
108
96
|
const restored = this.contractClasses.get(contractClass.id.toString());
|
|
109
97
|
if (restored && restored.l2BlockNumber >= blockNumber) {
|
|
110
98
|
this.contractClasses.delete(contractClass.id.toString());
|
|
@@ -114,138 +102,78 @@ import { L1ToL2MessageStore } from './l1_to_l2_message_store.js';
|
|
|
114
102
|
return Promise.resolve(true);
|
|
115
103
|
}
|
|
116
104
|
addContractInstances(data, _blockNumber) {
|
|
117
|
-
for (const contractInstance of data){
|
|
105
|
+
for (const contractInstance of data) {
|
|
118
106
|
this.contractInstances.set(contractInstance.address.toString(), contractInstance);
|
|
119
107
|
}
|
|
120
108
|
return Promise.resolve(true);
|
|
121
109
|
}
|
|
122
110
|
deleteContractInstances(data, _blockNumber) {
|
|
123
|
-
for (const contractInstance of data){
|
|
111
|
+
for (const contractInstance of data) {
|
|
124
112
|
this.contractInstances.delete(contractInstance.address.toString());
|
|
125
113
|
}
|
|
126
114
|
return Promise.resolve(true);
|
|
127
115
|
}
|
|
128
116
|
/**
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
|
|
117
|
+
* Append new blocks to the store's list.
|
|
118
|
+
* @param blocks - The L2 blocks to be added to the store and the last processed L1 block.
|
|
119
|
+
* @returns True if the operation is successful.
|
|
120
|
+
*/
|
|
121
|
+
async addBlocks(blocks) {
|
|
133
122
|
if (blocks.length === 0) {
|
|
134
123
|
return Promise.resolve(true);
|
|
135
124
|
}
|
|
136
125
|
this.lastL1BlockNewBlocks = blocks[blocks.length - 1].l1.blockNumber;
|
|
137
126
|
this.l2Blocks.push(...blocks);
|
|
138
|
-
const flatTxEffects = blocks.flatMap(
|
|
139
|
-
|
|
140
|
-
txEffect
|
|
141
|
-
})));
|
|
142
|
-
const wrappedTxEffects = await Promise.all(flatTxEffects.map((flatTxEffect)=>wrapInBlock(flatTxEffect.txEffect, flatTxEffect.block.data)));
|
|
127
|
+
const flatTxEffects = blocks.flatMap(b => b.data.body.txEffects.map(txEffect => ({ block: b, txEffect })));
|
|
128
|
+
const wrappedTxEffects = await Promise.all(flatTxEffects.map(flatTxEffect => wrapInBlock(flatTxEffect.txEffect, flatTxEffect.block.data)));
|
|
143
129
|
this.txEffects.push(...wrappedTxEffects);
|
|
144
130
|
return Promise.resolve(true);
|
|
145
131
|
}
|
|
146
132
|
/**
|
|
147
|
-
|
|
148
|
-
|
|
149
|
-
|
|
150
|
-
|
|
151
|
-
|
|
152
|
-
|
|
133
|
+
* Unwinds blocks from the database
|
|
134
|
+
* @param from - The tip of the chain, passed for verification purposes,
|
|
135
|
+
* ensuring that we don't end up deleting something we did not intend
|
|
136
|
+
* @param blocksToUnwind - The number of blocks we are to unwind
|
|
137
|
+
* @returns True if the operation is successful
|
|
138
|
+
*/
|
|
139
|
+
async unwindBlocks(from, blocksToUnwind) {
|
|
153
140
|
const last = await this.getSynchedL2BlockNumber();
|
|
154
141
|
if (from != last) {
|
|
155
142
|
throw new Error(`Can only unwind blocks from the tip (requested ${from} but current tip is ${last})`);
|
|
156
143
|
}
|
|
157
144
|
const stopAt = from - blocksToUnwind;
|
|
158
|
-
while(await this.getSynchedL2BlockNumber() > stopAt){
|
|
145
|
+
while ((await this.getSynchedL2BlockNumber()) > stopAt) {
|
|
159
146
|
const block = this.l2Blocks.pop();
|
|
160
147
|
if (block == undefined) {
|
|
161
148
|
break;
|
|
162
149
|
}
|
|
163
|
-
block.data.body.txEffects.forEach(()=>this.txEffects.pop());
|
|
150
|
+
block.data.body.txEffects.forEach(() => this.txEffects.pop());
|
|
164
151
|
}
|
|
165
152
|
return Promise.resolve(true);
|
|
166
153
|
}
|
|
167
|
-
#storeTaggedLogsFromPrivate(block) {
|
|
168
|
-
const dataStartIndexForBlock = block.header.state.partial.noteHashTree.nextAvailableLeafIndex - block.body.txEffects.length * MAX_NOTE_HASHES_PER_TX;
|
|
169
|
-
block.body.txEffects.forEach((txEffect, txIndex)=>{
|
|
170
|
-
const txHash = txEffect.txHash;
|
|
171
|
-
const dataStartIndexForTx = dataStartIndexForBlock + txIndex * MAX_NOTE_HASHES_PER_TX;
|
|
172
|
-
txEffect.privateLogs.forEach((log)=>{
|
|
173
|
-
const tag = log.fields[0];
|
|
174
|
-
const currentLogs = this.taggedLogs.get(tag.toString()) || [];
|
|
175
|
-
this.taggedLogs.set(tag.toString(), [
|
|
176
|
-
...currentLogs,
|
|
177
|
-
new TxScopedL2Log(txHash, dataStartIndexForTx, block.number, /* isFromPublic */ false, log.toBuffer())
|
|
178
|
-
]);
|
|
179
|
-
const currentTagsInBlock = this.logTagsPerBlock.get(block.number) || [];
|
|
180
|
-
this.logTagsPerBlock.set(block.number, [
|
|
181
|
-
...currentTagsInBlock,
|
|
182
|
-
tag
|
|
183
|
-
]);
|
|
184
|
-
});
|
|
185
|
-
});
|
|
186
|
-
}
|
|
187
|
-
#storeTaggedLogsFromPublic(block) {
|
|
188
|
-
const dataStartIndexForBlock = block.header.state.partial.noteHashTree.nextAvailableLeafIndex - block.body.txEffects.length * MAX_NOTE_HASHES_PER_TX;
|
|
189
|
-
block.body.txEffects.forEach((txEffect, txIndex)=>{
|
|
190
|
-
const txHash = txEffect.txHash;
|
|
191
|
-
const dataStartIndexForTx = dataStartIndexForBlock + txIndex * MAX_NOTE_HASHES_PER_TX;
|
|
192
|
-
txEffect.publicLogs.forEach((log)=>{
|
|
193
|
-
// Check that each log stores 3 lengths in its first field. If not, it's not a tagged log:
|
|
194
|
-
// See macros/note/mod/ and see how finalization_log[0] is constructed, to understand this monstrosity. (It wasn't me).
|
|
195
|
-
// 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.
|
|
196
|
-
const firstFieldBuf = log.log[0].toBuffer();
|
|
197
|
-
if (!firstFieldBuf.subarray(0, 27).equals(Buffer.alloc(27)) || firstFieldBuf[29] !== 0) {
|
|
198
|
-
// See parseLogFromPublic - the first field of a tagged log is 8 bytes structured:
|
|
199
|
-
// [ publicLen[0], publicLen[1], 0, privateLen[0], privateLen[1]]
|
|
200
|
-
this.#log.warn(`Skipping public log with invalid first field: ${log.log[0]}`);
|
|
201
|
-
return;
|
|
202
|
-
}
|
|
203
|
-
// Check that the length values line up with the log contents
|
|
204
|
-
const publicValuesLength = firstFieldBuf.subarray(-5).readUint16BE();
|
|
205
|
-
const privateValuesLength = firstFieldBuf.subarray(-5).readUint16BE(3);
|
|
206
|
-
// Add 1 for the first field holding lengths
|
|
207
|
-
const totalLogLength = 1 + publicValuesLength + privateValuesLength;
|
|
208
|
-
// Note that zeroes can be valid log values, so we can only assert that we do not go over the given length
|
|
209
|
-
if (totalLogLength > PUBLIC_LOG_DATA_SIZE_IN_FIELDS || log.log.slice(totalLogLength).find((f)=>!f.isZero())) {
|
|
210
|
-
this.#log.warn(`Skipping invalid tagged public log with first field: ${log.log[0]}`);
|
|
211
|
-
return;
|
|
212
|
-
}
|
|
213
|
-
// The first elt stores lengths => tag is in fields[1]
|
|
214
|
-
const tag = log.log[1];
|
|
215
|
-
this.#log.verbose(`Storing public tagged log with tag ${tag.toString()} in block ${block.number}`);
|
|
216
|
-
const currentLogs = this.taggedLogs.get(tag.toString()) || [];
|
|
217
|
-
this.taggedLogs.set(tag.toString(), [
|
|
218
|
-
...currentLogs,
|
|
219
|
-
new TxScopedL2Log(txHash, dataStartIndexForTx, block.number, /* isFromPublic */ true, log.toBuffer())
|
|
220
|
-
]);
|
|
221
|
-
const currentTagsInBlock = this.logTagsPerBlock.get(block.number) || [];
|
|
222
|
-
this.logTagsPerBlock.set(block.number, [
|
|
223
|
-
...currentTagsInBlock,
|
|
224
|
-
tag
|
|
225
|
-
]);
|
|
226
|
-
});
|
|
227
|
-
});
|
|
228
|
-
}
|
|
229
154
|
/**
|
|
230
|
-
|
|
231
|
-
|
|
232
|
-
|
|
233
|
-
|
|
234
|
-
|
|
235
|
-
|
|
236
|
-
this
|
|
237
|
-
this.
|
|
238
|
-
this.
|
|
155
|
+
* Append new logs to the store's list.
|
|
156
|
+
* @param block - The block for which to add the logs.
|
|
157
|
+
* @returns True if the operation is successful.
|
|
158
|
+
*/
|
|
159
|
+
addLogs(blocks) {
|
|
160
|
+
blocks.forEach(block => {
|
|
161
|
+
__classPrivateFieldGet(this, _MemoryArchiverStore_instances, "m", _MemoryArchiverStore_storeTaggedLogsFromPrivate).call(this, block);
|
|
162
|
+
__classPrivateFieldGet(this, _MemoryArchiverStore_instances, "m", _MemoryArchiverStore_storeTaggedLogsFromPublic).call(this, block);
|
|
163
|
+
this.privateLogsPerBlock.set(block.number, block.body.txEffects.map(txEffect => txEffect.privateLogs).flat());
|
|
164
|
+
this.publicLogsPerBlock.set(block.number, block.body.txEffects.map(txEffect => txEffect.publicLogs).flat());
|
|
239
165
|
this.contractClassLogsPerBlock.set(block.number, block.body.contractClassLogs);
|
|
240
166
|
});
|
|
241
167
|
return Promise.resolve(true);
|
|
242
168
|
}
|
|
243
169
|
deleteLogs(blocks) {
|
|
244
|
-
const tagsToDelete = blocks.flatMap(
|
|
245
|
-
tagsToDelete
|
|
170
|
+
const tagsToDelete = blocks.flatMap(block => this.logTagsPerBlock.get(block.number));
|
|
171
|
+
tagsToDelete
|
|
172
|
+
.filter(tag => tag != undefined)
|
|
173
|
+
.forEach(tag => {
|
|
246
174
|
this.taggedLogs.delete(tag.toString());
|
|
247
175
|
});
|
|
248
|
-
blocks.forEach(
|
|
176
|
+
blocks.forEach(block => {
|
|
249
177
|
this.privateLogsPerBlock.delete(block.number);
|
|
250
178
|
this.publicLogsPerBlock.delete(block.number);
|
|
251
179
|
this.logTagsPerBlock.delete(block.number);
|
|
@@ -254,16 +182,17 @@ import { L1ToL2MessageStore } from './l1_to_l2_message_store.js';
|
|
|
254
182
|
return Promise.resolve(true);
|
|
255
183
|
}
|
|
256
184
|
async addNullifiers(blocks) {
|
|
257
|
-
await Promise.all(blocks.map(async (block)=>{
|
|
258
|
-
const dataStartIndexForBlock = block.header.state.partial.nullifierTree.nextAvailableLeafIndex -
|
|
185
|
+
await Promise.all(blocks.map(async (block) => {
|
|
186
|
+
const dataStartIndexForBlock = block.header.state.partial.nullifierTree.nextAvailableLeafIndex -
|
|
187
|
+
block.body.txEffects.length * MAX_NULLIFIERS_PER_TX;
|
|
259
188
|
const blockHash = await block.hash();
|
|
260
|
-
block.body.txEffects.forEach((txEffects, txIndex)=>{
|
|
189
|
+
block.body.txEffects.forEach((txEffects, txIndex) => {
|
|
261
190
|
const dataStartIndexForTx = dataStartIndexForBlock + txIndex * MAX_NULLIFIERS_PER_TX;
|
|
262
|
-
txEffects.nullifiers.forEach((nullifier, nullifierIndex)=>{
|
|
191
|
+
txEffects.nullifiers.forEach((nullifier, nullifierIndex) => {
|
|
263
192
|
this.blockScopedNullifiers.set(nullifier.toString(), {
|
|
264
193
|
index: BigInt(dataStartIndexForTx + nullifierIndex),
|
|
265
194
|
blockNumber: block.number,
|
|
266
|
-
blockHash: blockHash.toString()
|
|
195
|
+
blockHash: blockHash.toString(),
|
|
267
196
|
});
|
|
268
197
|
});
|
|
269
198
|
});
|
|
@@ -271,9 +200,9 @@ import { L1ToL2MessageStore } from './l1_to_l2_message_store.js';
|
|
|
271
200
|
return Promise.resolve(true);
|
|
272
201
|
}
|
|
273
202
|
deleteNullifiers(blocks) {
|
|
274
|
-
blocks.forEach(
|
|
275
|
-
block.body.txEffects.forEach(
|
|
276
|
-
txEffect.nullifiers.forEach(
|
|
203
|
+
blocks.forEach(block => {
|
|
204
|
+
block.body.txEffects.forEach(txEffect => {
|
|
205
|
+
txEffect.nullifiers.forEach(nullifier => {
|
|
277
206
|
this.blockScopedNullifiers.delete(nullifier.toString());
|
|
278
207
|
});
|
|
279
208
|
});
|
|
@@ -281,13 +210,13 @@ import { L1ToL2MessageStore } from './l1_to_l2_message_store.js';
|
|
|
281
210
|
return Promise.resolve(true);
|
|
282
211
|
}
|
|
283
212
|
findNullifiersIndexesWithBlock(blockNumber, nullifiers) {
|
|
284
|
-
const blockScopedNullifiers = nullifiers.map(
|
|
213
|
+
const blockScopedNullifiers = nullifiers.map(nullifier => {
|
|
285
214
|
const nullifierData = this.blockScopedNullifiers.get(nullifier.toString());
|
|
286
215
|
if (nullifierData !== undefined && nullifierData.blockNumber <= blockNumber) {
|
|
287
216
|
return {
|
|
288
217
|
data: nullifierData.index,
|
|
289
218
|
l2BlockHash: nullifierData.blockHash,
|
|
290
|
-
l2BlockNumber: nullifierData.blockNumber
|
|
219
|
+
l2BlockNumber: nullifierData.blockNumber,
|
|
291
220
|
};
|
|
292
221
|
}
|
|
293
222
|
return undefined;
|
|
@@ -298,33 +227,37 @@ import { L1ToL2MessageStore } from './l1_to_l2_message_store.js';
|
|
|
298
227
|
return Promise.resolve(this.l1ToL2Messages.getTotalL1ToL2MessageCount());
|
|
299
228
|
}
|
|
300
229
|
/**
|
|
301
|
-
|
|
302
|
-
|
|
303
|
-
|
|
304
|
-
|
|
305
|
-
|
|
230
|
+
* Append L1 to L2 messages to the store.
|
|
231
|
+
* @param messages - The L1 to L2 messages to be added to the store and the last processed L1 block.
|
|
232
|
+
* @returns True if the operation is successful.
|
|
233
|
+
*/
|
|
234
|
+
addL1ToL2Messages(messages) {
|
|
235
|
+
if (typeof this.lastL1BlockNewMessages === 'bigint' &&
|
|
236
|
+
messages.lastProcessedL1BlockNumber <= this.lastL1BlockNewMessages) {
|
|
306
237
|
return Promise.resolve(false);
|
|
307
238
|
}
|
|
308
239
|
this.lastL1BlockNewMessages = messages.lastProcessedL1BlockNumber;
|
|
309
|
-
for (const message of messages.retrievedData){
|
|
240
|
+
for (const message of messages.retrievedData) {
|
|
310
241
|
this.l1ToL2Messages.addMessage(message);
|
|
311
242
|
}
|
|
312
243
|
return Promise.resolve(true);
|
|
313
244
|
}
|
|
314
245
|
/**
|
|
315
|
-
|
|
316
|
-
|
|
317
|
-
|
|
318
|
-
|
|
246
|
+
* Gets the L1 to L2 message index in the L1 to L2 message tree.
|
|
247
|
+
* @param l1ToL2Message - The L1 to L2 message.
|
|
248
|
+
* @returns The index of the L1 to L2 message in the L1 to L2 message tree (undefined if not found).
|
|
249
|
+
*/
|
|
250
|
+
getL1ToL2MessageIndex(l1ToL2Message) {
|
|
319
251
|
return Promise.resolve(this.l1ToL2Messages.getMessageIndex(l1ToL2Message));
|
|
320
252
|
}
|
|
321
253
|
/**
|
|
322
|
-
|
|
323
|
-
|
|
324
|
-
|
|
325
|
-
|
|
326
|
-
|
|
327
|
-
|
|
254
|
+
* Gets up to `limit` amount of L2 blocks starting from `from`.
|
|
255
|
+
* @param from - Number of the first block to return (inclusive).
|
|
256
|
+
* @param limit - The number of blocks to return.
|
|
257
|
+
* @returns The requested L2 blocks.
|
|
258
|
+
* @remarks When "from" is smaller than genesis block number, blocks from the beginning are returned.
|
|
259
|
+
*/
|
|
260
|
+
getBlocks(from, limit) {
|
|
328
261
|
if (limit < 1) {
|
|
329
262
|
return Promise.reject(new Error(`Invalid limit: ${limit}`));
|
|
330
263
|
}
|
|
@@ -340,23 +273,25 @@ import { L1ToL2MessageStore } from './l1_to_l2_message_store.js';
|
|
|
340
273
|
}
|
|
341
274
|
async getBlockHeaders(from, limit) {
|
|
342
275
|
const blocks = await this.getBlocks(from, limit);
|
|
343
|
-
return blocks.map(
|
|
276
|
+
return blocks.map(block => block.data.header);
|
|
344
277
|
}
|
|
345
278
|
/**
|
|
346
|
-
|
|
347
|
-
|
|
348
|
-
|
|
349
|
-
|
|
350
|
-
|
|
279
|
+
* Gets a tx effect.
|
|
280
|
+
* @param txHash - The txHash of the tx effect.
|
|
281
|
+
* @returns The requested tx effect.
|
|
282
|
+
*/
|
|
283
|
+
getTxEffect(txHash) {
|
|
284
|
+
const txEffect = this.txEffects.find(tx => tx.data.txHash.equals(txHash));
|
|
351
285
|
return Promise.resolve(txEffect);
|
|
352
286
|
}
|
|
353
287
|
/**
|
|
354
|
-
|
|
355
|
-
|
|
356
|
-
|
|
357
|
-
|
|
358
|
-
|
|
359
|
-
|
|
288
|
+
* Gets a receipt of a settled tx.
|
|
289
|
+
* @param txHash - The hash of a tx we try to get the receipt for.
|
|
290
|
+
* @returns The requested tx receipt (or undefined if not found).
|
|
291
|
+
*/
|
|
292
|
+
async getSettledTxReceipt(txHash) {
|
|
293
|
+
for (const block of this.l2Blocks) {
|
|
294
|
+
for (const txEffect of block.data.body.txEffects) {
|
|
360
295
|
if (txEffect.txHash.equals(txHash)) {
|
|
361
296
|
return new TxReceipt(txHash, TxReceipt.statusFromRevertCode(txEffect.revertCode), '', txEffect.transactionFee.toBigInt(), L2BlockHash.fromField(await block.data.hash()), block.data.number);
|
|
362
297
|
}
|
|
@@ -365,18 +300,20 @@ import { L1ToL2MessageStore } from './l1_to_l2_message_store.js';
|
|
|
365
300
|
return undefined;
|
|
366
301
|
}
|
|
367
302
|
/**
|
|
368
|
-
|
|
369
|
-
|
|
370
|
-
|
|
371
|
-
|
|
303
|
+
* Gets L1 to L2 message (to be) included in a given block.
|
|
304
|
+
* @param blockNumber - L2 block number to get messages for.
|
|
305
|
+
* @returns The L1 to L2 messages/leaves of the messages subtree (throws if not found).
|
|
306
|
+
*/
|
|
307
|
+
getL1ToL2Messages(blockNumber) {
|
|
372
308
|
return Promise.resolve(this.l1ToL2Messages.getMessages(blockNumber));
|
|
373
309
|
}
|
|
374
310
|
/**
|
|
375
|
-
|
|
376
|
-
|
|
377
|
-
|
|
378
|
-
|
|
379
|
-
|
|
311
|
+
* Retrieves all private logs from up to `limit` blocks, starting from the block number `from`.
|
|
312
|
+
* @param from - The block number from which to begin retrieving logs.
|
|
313
|
+
* @param limit - The maximum number of blocks to retrieve logs from.
|
|
314
|
+
* @returns An array of private logs from the specified range of blocks.
|
|
315
|
+
*/
|
|
316
|
+
getPrivateLogs(from, limit) {
|
|
380
317
|
if (from < INITIAL_L2_BLOCK_NUM || limit < 1) {
|
|
381
318
|
return Promise.resolve([]);
|
|
382
319
|
}
|
|
@@ -387,7 +324,7 @@ import { L1ToL2MessageStore } from './l1_to_l2_message_store.js';
|
|
|
387
324
|
const endIndex = startIndex + limit;
|
|
388
325
|
const upper = Math.min(endIndex, this.l2Blocks.length + INITIAL_L2_BLOCK_NUM);
|
|
389
326
|
const logsInBlocks = [];
|
|
390
|
-
for(let i = startIndex; i < upper; i++){
|
|
327
|
+
for (let i = startIndex; i < upper; i++) {
|
|
391
328
|
const logs = this.privateLogsPerBlock.get(i);
|
|
392
329
|
if (logs) {
|
|
393
330
|
logsInBlocks.push(logs);
|
|
@@ -396,20 +333,22 @@ import { L1ToL2MessageStore } from './l1_to_l2_message_store.js';
|
|
|
396
333
|
return Promise.resolve(logsInBlocks.flat());
|
|
397
334
|
}
|
|
398
335
|
/**
|
|
399
|
-
|
|
400
|
-
|
|
401
|
-
|
|
402
|
-
|
|
403
|
-
|
|
404
|
-
|
|
336
|
+
* Gets all logs that match any of the received tags (i.e. logs with their first field equal to a tag).
|
|
337
|
+
* @param tags - The tags to filter the logs by.
|
|
338
|
+
* @returns For each received tag, an array of matching logs is returned. An empty array implies no logs match
|
|
339
|
+
* that tag.
|
|
340
|
+
*/
|
|
341
|
+
getLogsByTags(tags) {
|
|
342
|
+
const noteLogs = tags.map(tag => this.taggedLogs.get(tag.toString()) || []);
|
|
405
343
|
return Promise.resolve(noteLogs);
|
|
406
344
|
}
|
|
407
345
|
/**
|
|
408
|
-
|
|
409
|
-
|
|
410
|
-
|
|
411
|
-
|
|
412
|
-
|
|
346
|
+
* Gets public logs based on the provided filter.
|
|
347
|
+
* @param filter - The filter to apply to the logs.
|
|
348
|
+
* @returns The requested logs.
|
|
349
|
+
* @remarks Works by doing an intersection of all params in the filter.
|
|
350
|
+
*/
|
|
351
|
+
getPublicLogs(filter) {
|
|
413
352
|
let txHash;
|
|
414
353
|
let fromBlock = 0;
|
|
415
354
|
let toBlock = this.l2Blocks.length + INITIAL_L2_BLOCK_NUM;
|
|
@@ -421,10 +360,12 @@ import { L1ToL2MessageStore } from './l1_to_l2_message_store.js';
|
|
|
421
360
|
fromBlock = filter.afterLog.blockNumber;
|
|
422
361
|
txIndexInBlock = filter.afterLog.txIndex;
|
|
423
362
|
logIndexInTx = filter.afterLog.logIndex + 1; // We want to start from the next log
|
|
424
|
-
}
|
|
363
|
+
}
|
|
364
|
+
else {
|
|
425
365
|
fromBlock = filter.fromBlock;
|
|
426
366
|
}
|
|
427
|
-
}
|
|
367
|
+
}
|
|
368
|
+
else {
|
|
428
369
|
txHash = filter.txHash;
|
|
429
370
|
if (filter.fromBlock !== undefined) {
|
|
430
371
|
fromBlock = filter.fromBlock;
|
|
@@ -439,26 +380,29 @@ import { L1ToL2MessageStore } from './l1_to_l2_message_store.js';
|
|
|
439
380
|
if (fromBlock > this.l2Blocks.length || toBlock < fromBlock || toBlock <= 0) {
|
|
440
381
|
return Promise.resolve({
|
|
441
382
|
logs: [],
|
|
442
|
-
maxLogsHit: false
|
|
383
|
+
maxLogsHit: false,
|
|
443
384
|
});
|
|
444
385
|
}
|
|
445
386
|
const contractAddress = filter.contractAddress;
|
|
446
387
|
const logs = [];
|
|
447
|
-
for(; fromBlock < toBlock; fromBlock++){
|
|
388
|
+
for (; fromBlock < toBlock; fromBlock++) {
|
|
448
389
|
const block = this.l2Blocks[fromBlock - INITIAL_L2_BLOCK_NUM];
|
|
449
390
|
const blockLogs = this.publicLogsPerBlock.get(fromBlock);
|
|
450
391
|
if (blockLogs) {
|
|
451
|
-
for(let logIndex = 0; logIndex < blockLogs.length; logIndex++){
|
|
392
|
+
for (let logIndex = 0; logIndex < blockLogs.length; logIndex++) {
|
|
452
393
|
const log = blockLogs[logIndex];
|
|
453
|
-
const thisTxEffect = block.data.body.txEffects.filter(
|
|
394
|
+
const thisTxEffect = block.data.body.txEffects.filter(effect => effect.publicLogs.includes(log))[0];
|
|
454
395
|
const thisTxIndexInBlock = block.data.body.txEffects.indexOf(thisTxEffect);
|
|
455
396
|
const thisLogIndexInTx = thisTxEffect.publicLogs.indexOf(log);
|
|
456
|
-
if ((!txHash || thisTxEffect.txHash.equals(txHash)) &&
|
|
397
|
+
if ((!txHash || thisTxEffect.txHash.equals(txHash)) &&
|
|
398
|
+
(!contractAddress || log.contractAddress.equals(contractAddress)) &&
|
|
399
|
+
thisTxIndexInBlock >= txIndexInBlock &&
|
|
400
|
+
thisLogIndexInTx >= logIndexInTx) {
|
|
457
401
|
logs.push(new ExtendedPublicLog(new LogId(block.data.number, thisTxIndexInBlock, thisLogIndexInTx), log));
|
|
458
402
|
if (logs.length === this.maxLogs) {
|
|
459
403
|
return Promise.resolve({
|
|
460
404
|
logs,
|
|
461
|
-
maxLogsHit: true
|
|
405
|
+
maxLogsHit: true,
|
|
462
406
|
});
|
|
463
407
|
}
|
|
464
408
|
}
|
|
@@ -467,16 +411,17 @@ import { L1ToL2MessageStore } from './l1_to_l2_message_store.js';
|
|
|
467
411
|
}
|
|
468
412
|
return Promise.resolve({
|
|
469
413
|
logs,
|
|
470
|
-
maxLogsHit: false
|
|
414
|
+
maxLogsHit: false,
|
|
471
415
|
});
|
|
472
416
|
}
|
|
473
417
|
/**
|
|
474
|
-
|
|
475
|
-
|
|
476
|
-
|
|
477
|
-
|
|
478
|
-
|
|
479
|
-
|
|
418
|
+
* Gets contract class logs based on the provided filter.
|
|
419
|
+
* NB: clone of the above fn, but for contract class logs
|
|
420
|
+
* @param filter - The filter to apply to the logs.
|
|
421
|
+
* @returns The requested logs.
|
|
422
|
+
* @remarks Works by doing an intersection of all params in the filter.
|
|
423
|
+
*/
|
|
424
|
+
getContractClassLogs(filter) {
|
|
480
425
|
let txHash;
|
|
481
426
|
let fromBlock = 0;
|
|
482
427
|
let toBlock = this.l2Blocks.length + INITIAL_L2_BLOCK_NUM;
|
|
@@ -488,10 +433,12 @@ import { L1ToL2MessageStore } from './l1_to_l2_message_store.js';
|
|
|
488
433
|
fromBlock = filter.afterLog.blockNumber;
|
|
489
434
|
txIndexInBlock = filter.afterLog.txIndex;
|
|
490
435
|
logIndexInTx = filter.afterLog.logIndex + 1; // We want to start from the next log
|
|
491
|
-
}
|
|
436
|
+
}
|
|
437
|
+
else {
|
|
492
438
|
fromBlock = filter.fromBlock;
|
|
493
439
|
}
|
|
494
|
-
}
|
|
440
|
+
}
|
|
441
|
+
else {
|
|
495
442
|
txHash = filter.txHash;
|
|
496
443
|
if (filter.fromBlock !== undefined) {
|
|
497
444
|
fromBlock = filter.fromBlock;
|
|
@@ -506,25 +453,26 @@ import { L1ToL2MessageStore } from './l1_to_l2_message_store.js';
|
|
|
506
453
|
if (fromBlock > this.l2Blocks.length || toBlock < fromBlock || toBlock <= 0) {
|
|
507
454
|
return Promise.resolve({
|
|
508
455
|
logs: [],
|
|
509
|
-
maxLogsHit: false
|
|
456
|
+
maxLogsHit: false,
|
|
510
457
|
});
|
|
511
458
|
}
|
|
512
459
|
const contractAddress = filter.contractAddress;
|
|
513
460
|
const logs = [];
|
|
514
|
-
for(; fromBlock < toBlock; fromBlock++){
|
|
461
|
+
for (; fromBlock < toBlock; fromBlock++) {
|
|
515
462
|
const block = this.l2Blocks[fromBlock - INITIAL_L2_BLOCK_NUM];
|
|
516
463
|
const blockLogs = this.contractClassLogsPerBlock.get(fromBlock);
|
|
517
464
|
if (blockLogs) {
|
|
518
|
-
for(; txIndexInBlock < blockLogs.txLogs.length; txIndexInBlock++){
|
|
465
|
+
for (; txIndexInBlock < blockLogs.txLogs.length; txIndexInBlock++) {
|
|
519
466
|
const txLogs = blockLogs.txLogs[txIndexInBlock].unrollLogs();
|
|
520
|
-
for(; logIndexInTx < txLogs.length; logIndexInTx++){
|
|
467
|
+
for (; logIndexInTx < txLogs.length; logIndexInTx++) {
|
|
521
468
|
const log = txLogs[logIndexInTx];
|
|
522
|
-
if ((!txHash || block.data.body.txEffects[txIndexInBlock].txHash.equals(txHash)) &&
|
|
469
|
+
if ((!txHash || block.data.body.txEffects[txIndexInBlock].txHash.equals(txHash)) &&
|
|
470
|
+
(!contractAddress || log.contractAddress.equals(contractAddress))) {
|
|
523
471
|
logs.push(new ExtendedUnencryptedL2Log(new LogId(block.data.number, txIndexInBlock, logIndexInTx), log));
|
|
524
472
|
if (logs.length === this.maxLogs) {
|
|
525
473
|
return Promise.resolve({
|
|
526
474
|
logs,
|
|
527
|
-
maxLogsHit: true
|
|
475
|
+
maxLogsHit: true,
|
|
528
476
|
});
|
|
529
477
|
}
|
|
530
478
|
}
|
|
@@ -536,13 +484,14 @@ import { L1ToL2MessageStore } from './l1_to_l2_message_store.js';
|
|
|
536
484
|
}
|
|
537
485
|
return Promise.resolve({
|
|
538
486
|
logs,
|
|
539
|
-
maxLogsHit: false
|
|
487
|
+
maxLogsHit: false,
|
|
540
488
|
});
|
|
541
489
|
}
|
|
542
490
|
/**
|
|
543
|
-
|
|
544
|
-
|
|
545
|
-
|
|
491
|
+
* Gets the number of the latest L2 block processed.
|
|
492
|
+
* @returns The number of the latest L2 block processed.
|
|
493
|
+
*/
|
|
494
|
+
getSynchedL2BlockNumber() {
|
|
546
495
|
if (this.l2Blocks.length === 0) {
|
|
547
496
|
return Promise.resolve(INITIAL_L2_BLOCK_NUM - 1);
|
|
548
497
|
}
|
|
@@ -573,27 +522,82 @@ import { L1ToL2MessageStore } from './l1_to_l2_message_store.js';
|
|
|
573
522
|
getSynchPoint() {
|
|
574
523
|
return Promise.resolve({
|
|
575
524
|
blocksSynchedTo: this.lastL1BlockNewBlocks,
|
|
576
|
-
messagesSynchedTo: this.lastL1BlockNewMessages
|
|
525
|
+
messagesSynchedTo: this.lastL1BlockNewMessages,
|
|
577
526
|
});
|
|
578
527
|
}
|
|
579
528
|
getContractFunctionName(_address, selector) {
|
|
580
529
|
return Promise.resolve(this.functionNames.get(selector.toString()));
|
|
581
530
|
}
|
|
582
531
|
async registerContractFunctionSignatures(_address, signatures) {
|
|
583
|
-
for (const sig of signatures){
|
|
532
|
+
for (const sig of signatures) {
|
|
584
533
|
try {
|
|
585
534
|
const selector = await FunctionSelector.fromSignature(sig);
|
|
586
535
|
this.functionNames.set(selector.toString(), sig.slice(0, sig.indexOf('(')));
|
|
587
|
-
}
|
|
588
|
-
|
|
536
|
+
}
|
|
537
|
+
catch {
|
|
538
|
+
__classPrivateFieldGet(this, _MemoryArchiverStore_log, "f").warn(`Failed to parse signature: ${sig}. Ignoring`);
|
|
589
539
|
}
|
|
590
540
|
}
|
|
591
541
|
}
|
|
592
542
|
estimateSize() {
|
|
593
|
-
return Promise.resolve({
|
|
594
|
-
mappingSize: 0,
|
|
595
|
-
actualSize: 0,
|
|
596
|
-
numItems: 0
|
|
597
|
-
});
|
|
543
|
+
return Promise.resolve({ mappingSize: 0, actualSize: 0, numItems: 0 });
|
|
598
544
|
}
|
|
599
545
|
}
|
|
546
|
+
_MemoryArchiverStore_log = new WeakMap(), _MemoryArchiverStore_instances = new WeakSet(), _MemoryArchiverStore_storeTaggedLogsFromPrivate = function _MemoryArchiverStore_storeTaggedLogsFromPrivate(block) {
|
|
547
|
+
const dataStartIndexForBlock = block.header.state.partial.noteHashTree.nextAvailableLeafIndex -
|
|
548
|
+
block.body.txEffects.length * MAX_NOTE_HASHES_PER_TX;
|
|
549
|
+
block.body.txEffects.forEach((txEffect, txIndex) => {
|
|
550
|
+
const txHash = txEffect.txHash;
|
|
551
|
+
const dataStartIndexForTx = dataStartIndexForBlock + txIndex * MAX_NOTE_HASHES_PER_TX;
|
|
552
|
+
txEffect.privateLogs.forEach(log => {
|
|
553
|
+
const tag = log.fields[0];
|
|
554
|
+
const currentLogs = this.taggedLogs.get(tag.toString()) || [];
|
|
555
|
+
this.taggedLogs.set(tag.toString(), [
|
|
556
|
+
...currentLogs,
|
|
557
|
+
new TxScopedL2Log(txHash, dataStartIndexForTx, block.number, /* isFromPublic */ false, log.toBuffer()),
|
|
558
|
+
]);
|
|
559
|
+
const currentTagsInBlock = this.logTagsPerBlock.get(block.number) || [];
|
|
560
|
+
this.logTagsPerBlock.set(block.number, [...currentTagsInBlock, tag]);
|
|
561
|
+
});
|
|
562
|
+
});
|
|
563
|
+
}, _MemoryArchiverStore_storeTaggedLogsFromPublic = function _MemoryArchiverStore_storeTaggedLogsFromPublic(block) {
|
|
564
|
+
const dataStartIndexForBlock = block.header.state.partial.noteHashTree.nextAvailableLeafIndex -
|
|
565
|
+
block.body.txEffects.length * MAX_NOTE_HASHES_PER_TX;
|
|
566
|
+
block.body.txEffects.forEach((txEffect, txIndex) => {
|
|
567
|
+
const txHash = txEffect.txHash;
|
|
568
|
+
const dataStartIndexForTx = dataStartIndexForBlock + txIndex * MAX_NOTE_HASHES_PER_TX;
|
|
569
|
+
txEffect.publicLogs.forEach(log => {
|
|
570
|
+
// Check that each log stores 3 lengths in its first field. If not, it's not a tagged log:
|
|
571
|
+
// See macros/note/mod/ and see how finalization_log[0] is constructed, to understand this monstrosity. (It wasn't me).
|
|
572
|
+
// 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.
|
|
573
|
+
const firstFieldBuf = log.log[0].toBuffer();
|
|
574
|
+
if (!firstFieldBuf.subarray(0, 27).equals(Buffer.alloc(27)) || firstFieldBuf[29] !== 0) {
|
|
575
|
+
// See parseLogFromPublic - the first field of a tagged log is 8 bytes structured:
|
|
576
|
+
// [ publicLen[0], publicLen[1], 0, privateLen[0], privateLen[1]]
|
|
577
|
+
__classPrivateFieldGet(this, _MemoryArchiverStore_log, "f").warn(`Skipping public log with invalid first field: ${log.log[0]}`);
|
|
578
|
+
return;
|
|
579
|
+
}
|
|
580
|
+
// Check that the length values line up with the log contents
|
|
581
|
+
const publicValuesLength = firstFieldBuf.subarray(-5).readUint16BE();
|
|
582
|
+
const privateValuesLength = firstFieldBuf.subarray(-5).readUint16BE(3);
|
|
583
|
+
// Add 1 for the first field holding lengths
|
|
584
|
+
const totalLogLength = 1 + publicValuesLength + privateValuesLength;
|
|
585
|
+
// Note that zeroes can be valid log values, so we can only assert that we do not go over the given length
|
|
586
|
+
if (totalLogLength > PUBLIC_LOG_DATA_SIZE_IN_FIELDS || log.log.slice(totalLogLength).find(f => !f.isZero())) {
|
|
587
|
+
__classPrivateFieldGet(this, _MemoryArchiverStore_log, "f").warn(`Skipping invalid tagged public log with first field: ${log.log[0]}`);
|
|
588
|
+
return;
|
|
589
|
+
}
|
|
590
|
+
// The first elt stores lengths => tag is in fields[1]
|
|
591
|
+
const tag = log.log[1];
|
|
592
|
+
__classPrivateFieldGet(this, _MemoryArchiverStore_log, "f").verbose(`Storing public tagged log with tag ${tag.toString()} in block ${block.number}`);
|
|
593
|
+
const currentLogs = this.taggedLogs.get(tag.toString()) || [];
|
|
594
|
+
this.taggedLogs.set(tag.toString(), [
|
|
595
|
+
...currentLogs,
|
|
596
|
+
new TxScopedL2Log(txHash, dataStartIndexForTx, block.number, /* isFromPublic */ true, log.toBuffer()),
|
|
597
|
+
]);
|
|
598
|
+
const currentTagsInBlock = this.logTagsPerBlock.get(block.number) || [];
|
|
599
|
+
this.logTagsPerBlock.set(block.number, [...currentTagsInBlock, tag]);
|
|
600
|
+
});
|
|
601
|
+
});
|
|
602
|
+
};
|
|
603
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"memory_archiver_store.js","sourceRoot":"","sources":["../../../src/archiver/memory_archiver_store/memory_archiver_store.ts"],"names":[],"mappings":"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"}
|