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