@aztec/pxe 0.42.0 → 0.43.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/database/deferred_note_dao.d.ts +2 -2
- package/dest/database/deferred_note_dao.d.ts.map +1 -1
- package/dest/database/deferred_note_dao.js +2 -2
- package/dest/database/incoming_note_dao.d.ts +73 -0
- package/dest/database/incoming_note_dao.d.ts.map +1 -0
- package/dest/database/incoming_note_dao.js +92 -0
- package/dest/database/kv_pxe_database.d.ts +10 -7
- package/dest/database/kv_pxe_database.d.ts.map +1 -1
- package/dest/database/kv_pxe_database.js +149 -78
- package/dest/database/{note_dao.d.ts → outgoing_note_dao.d.ts} +7 -12
- package/dest/database/outgoing_note_dao.d.ts.map +1 -0
- package/dest/database/outgoing_note_dao.js +83 -0
- package/dest/database/pxe_database.d.ts +21 -9
- package/dest/database/pxe_database.d.ts.map +1 -1
- package/dest/database/pxe_database_test_suite.d.ts.map +1 -1
- package/dest/database/pxe_database_test_suite.js +71 -24
- package/dest/kernel_oracle/index.d.ts +1 -1
- package/dest/note_processor/note_processor.d.ts +23 -20
- package/dest/note_processor/note_processor.d.ts.map +1 -1
- package/dest/note_processor/note_processor.js +123 -76
- package/dest/note_processor/produce_note_dao.d.ts +13 -4
- package/dest/note_processor/produce_note_dao.d.ts.map +1 -1
- package/dest/note_processor/produce_note_dao.js +88 -31
- package/dest/pxe_service/create_pxe_service.d.ts.map +1 -1
- package/dest/pxe_service/create_pxe_service.js +3 -1
- package/dest/pxe_service/pxe_service.d.ts +9 -4
- package/dest/pxe_service/pxe_service.d.ts.map +1 -1
- package/dest/pxe_service/pxe_service.js +106 -28
- package/dest/simulator_oracle/index.js +2 -2
- package/dest/synchronizer/synchronizer.d.ts +2 -2
- package/dest/synchronizer/synchronizer.d.ts.map +1 -1
- package/dest/synchronizer/synchronizer.js +37 -36
- package/package.json +14 -14
- package/src/database/deferred_note_dao.ts +1 -1
- package/src/database/{note_dao.ts → incoming_note_dao.ts} +10 -7
- package/src/database/kv_pxe_database.ts +127 -29
- package/src/database/outgoing_note_dao.ts +90 -0
- package/src/database/pxe_database.ts +23 -9
- package/src/database/pxe_database_test_suite.ts +93 -29
- package/src/note_processor/note_processor.ts +191 -121
- package/src/note_processor/produce_note_dao.ts +164 -50
- package/src/pxe_service/create_pxe_service.ts +2 -0
- package/src/pxe_service/pxe_service.ts +170 -42
- package/src/simulator_oracle/index.ts +1 -1
- package/src/synchronizer/synchronizer.ts +48 -52
- package/dest/database/note_dao.d.ts.map +0 -1
- package/dest/database/note_dao.js +0 -89
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
var _Synchronizer_instances, _Synchronizer_reprocessDeferredNotesForContract;
|
|
1
|
+
var _Synchronizer_instances, _Synchronizer_reprocessDeferredNotesForContract, _Synchronizer_removeNullifiedNotes;
|
|
2
2
|
import { __classPrivateFieldGet } from "tslib";
|
|
3
|
-
import {
|
|
3
|
+
import { MerkleTreeId } from '@aztec/circuit-types';
|
|
4
4
|
import { INITIAL_L2_BLOCK_NUM } from '@aztec/circuits.js';
|
|
5
5
|
import { createDebugLogger } from '@aztec/foundation/log';
|
|
6
6
|
import { RunningPromise } from '@aztec/foundation/running-promise';
|
|
@@ -89,15 +89,12 @@ export class Synchronizer {
|
|
|
89
89
|
if (blocks.length === 0) {
|
|
90
90
|
return false;
|
|
91
91
|
}
|
|
92
|
-
const noteEncryptedLogs = blocks.flatMap(block => block.body.noteEncryptedLogs);
|
|
93
92
|
// Update latest tree roots from the most recent block
|
|
94
93
|
const latestBlock = blocks[blocks.length - 1];
|
|
95
94
|
await this.setHeaderFromBlock(latestBlock);
|
|
96
|
-
|
|
97
|
-
this.log.debug(`Forwarding ${logCount} encrypted logs and blocks to ${this.noteProcessors.length} note processors`);
|
|
95
|
+
this.log.debug(`Forwarding ${blocks.length} blocks to ${this.noteProcessors.length} note processors`);
|
|
98
96
|
for (const noteProcessor of this.noteProcessors) {
|
|
99
|
-
|
|
100
|
-
await noteProcessor.process(blocks, noteEncryptedLogs);
|
|
97
|
+
await noteProcessor.process(blocks);
|
|
101
98
|
}
|
|
102
99
|
return true;
|
|
103
100
|
}
|
|
@@ -155,9 +152,6 @@ export class Synchronizer {
|
|
|
155
152
|
// behind main sync.
|
|
156
153
|
throw new Error('No blocks in processor catch up mode');
|
|
157
154
|
}
|
|
158
|
-
const noteEncryptedLogs = blocks.flatMap(block => block.body.noteEncryptedLogs);
|
|
159
|
-
const logCount = L2BlockL2Logs.getTotalLogCount(noteEncryptedLogs);
|
|
160
|
-
this.log.debug(`Forwarding ${logCount} encrypted logs and blocks to note processors in catch up mode`);
|
|
161
155
|
for (const noteProcessor of catchUpGroup) {
|
|
162
156
|
// find the index of the first block that the note processor is not yet synced to
|
|
163
157
|
const index = blocks.findIndex(block => block.number > noteProcessor.status.syncedToBlock);
|
|
@@ -167,18 +161,18 @@ export class Synchronizer {
|
|
|
167
161
|
// that needs blocks newer than the newest block we fetched.
|
|
168
162
|
break;
|
|
169
163
|
}
|
|
170
|
-
this.log.debug(`Catching up note processor ${noteProcessor.
|
|
171
|
-
await noteProcessor.process(blocks.slice(index)
|
|
164
|
+
this.log.debug(`Catching up note processor ${noteProcessor.account.toString()} by processing ${blocks.length - index} blocks`);
|
|
165
|
+
await noteProcessor.process(blocks.slice(index));
|
|
172
166
|
if (noteProcessor.status.syncedToBlock === toBlockNumber) {
|
|
173
167
|
// Note processor caught up, move it to `noteProcessors` from `noteProcessorsToCatchUp`.
|
|
174
|
-
this.log.debug(`Note processor for ${noteProcessor.
|
|
168
|
+
this.log.debug(`Note processor for ${noteProcessor.account.toString()} has caught up`, {
|
|
175
169
|
eventName: 'note-processor-caught-up',
|
|
176
|
-
|
|
170
|
+
account: noteProcessor.account.toString(),
|
|
177
171
|
duration: noteProcessor.timer.ms(),
|
|
178
|
-
dbSize: this.db.estimateSize(),
|
|
172
|
+
dbSize: await this.db.estimateSize(),
|
|
179
173
|
...noteProcessor.stats,
|
|
180
174
|
});
|
|
181
|
-
this.noteProcessorsToCatchUp = this.noteProcessorsToCatchUp.filter(np => !np.
|
|
175
|
+
this.noteProcessorsToCatchUp = this.noteProcessorsToCatchUp.filter(np => !np.account.equals(noteProcessor.account));
|
|
182
176
|
this.noteProcessors.push(noteProcessor);
|
|
183
177
|
}
|
|
184
178
|
}
|
|
@@ -217,13 +211,13 @@ export class Synchronizer {
|
|
|
217
211
|
* @param startingBlock - The block where to start scanning for notes for this accounts.
|
|
218
212
|
* @returns A promise that resolves once the account is added to the Synchronizer.
|
|
219
213
|
*/
|
|
220
|
-
addAccount(
|
|
221
|
-
const predicate = (x) => x.
|
|
214
|
+
async addAccount(account, keyStore, startingBlock) {
|
|
215
|
+
const predicate = (x) => x.account.equals(account);
|
|
222
216
|
const processor = this.noteProcessors.find(predicate) ?? this.noteProcessorsToCatchUp.find(predicate);
|
|
223
217
|
if (processor) {
|
|
224
218
|
return;
|
|
225
219
|
}
|
|
226
|
-
this.noteProcessorsToCatchUp.push(
|
|
220
|
+
this.noteProcessorsToCatchUp.push(await NoteProcessor.create(account, keyStore, this.db, this.node, startingBlock));
|
|
227
221
|
}
|
|
228
222
|
/**
|
|
229
223
|
* Checks if the specified account is synchronized.
|
|
@@ -238,8 +232,8 @@ export class Synchronizer {
|
|
|
238
232
|
if (!completeAddress) {
|
|
239
233
|
throw new Error(`Checking if account is synched is not possible for ${account} because it is not registered.`);
|
|
240
234
|
}
|
|
241
|
-
const
|
|
242
|
-
const processor = this.noteProcessors.find(
|
|
235
|
+
const findByAccountAddress = (x) => x.account.equals(completeAddress.address);
|
|
236
|
+
const processor = this.noteProcessors.find(findByAccountAddress) ?? this.noteProcessorsToCatchUp.find(findByAccountAddress);
|
|
243
237
|
if (!processor) {
|
|
244
238
|
throw new Error(`Checking if account is synched is not possible for ${account} because it is only registered as a recipient.`);
|
|
245
239
|
}
|
|
@@ -266,7 +260,7 @@ export class Synchronizer {
|
|
|
266
260
|
const lastBlockNumber = this.getSynchedBlockNumber();
|
|
267
261
|
return {
|
|
268
262
|
blocks: lastBlockNumber,
|
|
269
|
-
notes: Object.fromEntries(this.noteProcessors.map(n => [n.
|
|
263
|
+
notes: Object.fromEntries(this.noteProcessors.map(n => [n.account.toString(), n.status.syncedToBlock])),
|
|
270
264
|
};
|
|
271
265
|
}
|
|
272
266
|
/**
|
|
@@ -274,7 +268,7 @@ export class Synchronizer {
|
|
|
274
268
|
* @returns The note processor stats for notes for each public key being tracked.
|
|
275
269
|
*/
|
|
276
270
|
getSyncStats() {
|
|
277
|
-
return Object.fromEntries(this.noteProcessors.map(n => [n.
|
|
271
|
+
return Object.fromEntries(this.noteProcessors.map(n => [n.account.toString(), n.stats]));
|
|
278
272
|
}
|
|
279
273
|
/**
|
|
280
274
|
* Retry decoding any deferred notes for the specified contract address.
|
|
@@ -294,30 +288,37 @@ _Synchronizer_instances = new WeakSet(), _Synchronizer_reprocessDeferredNotesFor
|
|
|
294
288
|
txHashToDeferredNotes.set(note.txHash, notesForTx);
|
|
295
289
|
}
|
|
296
290
|
// keep track of decoded notes
|
|
297
|
-
const
|
|
291
|
+
const incomingNotes = [];
|
|
292
|
+
const outgoingNotes = [];
|
|
298
293
|
// now process each txHash
|
|
299
294
|
for (const deferredNotes of txHashToDeferredNotes.values()) {
|
|
300
295
|
// to be safe, try each note processor in case the deferred notes are for different accounts.
|
|
301
296
|
for (const processor of this.noteProcessors) {
|
|
302
|
-
const
|
|
303
|
-
|
|
297
|
+
const { incomingNotes: inNotes, outgoingNotes: outNotes } = await processor.decodeDeferredNotes(deferredNotes);
|
|
298
|
+
incomingNotes.push(...inNotes);
|
|
299
|
+
outgoingNotes.push(...outNotes);
|
|
304
300
|
}
|
|
305
301
|
}
|
|
306
302
|
// now drop the deferred notes, and add the decoded notes
|
|
307
303
|
await this.db.removeDeferredNotesByContract(contractAddress);
|
|
308
|
-
await this.db.addNotes(
|
|
309
|
-
|
|
310
|
-
this.log.debug(`Decoded deferred note for contract ${noteDao.contractAddress} at slot ${noteDao.storageSlot} with nullifier ${noteDao.siloedNullifier.toString()}`);
|
|
304
|
+
await this.db.addNotes(incomingNotes, outgoingNotes);
|
|
305
|
+
incomingNotes.forEach(noteDao => {
|
|
306
|
+
this.log.debug(`Decoded deferred incoming note for contract ${noteDao.contractAddress} at slot ${noteDao.storageSlot} with nullifier ${noteDao.siloedNullifier.toString()}`);
|
|
311
307
|
});
|
|
312
|
-
|
|
313
|
-
|
|
314
|
-
|
|
315
|
-
|
|
308
|
+
outgoingNotes.forEach(noteDao => {
|
|
309
|
+
this.log.debug(`Decoded deferred outgoing note for contract ${noteDao.contractAddress} at slot ${noteDao.storageSlot}`);
|
|
310
|
+
});
|
|
311
|
+
await __classPrivateFieldGet(this, _Synchronizer_instances, "m", _Synchronizer_removeNullifiedNotes).call(this, incomingNotes);
|
|
312
|
+
}, _Synchronizer_removeNullifiedNotes = async function _Synchronizer_removeNullifiedNotes(notes) {
|
|
313
|
+
// now group the decoded incoming notes by public key
|
|
314
|
+
const publicKeyToIncomingNotes = new Map();
|
|
315
|
+
for (const noteDao of notes) {
|
|
316
|
+
const notesForPublicKey = publicKeyToIncomingNotes.get(noteDao.ivpkM) ?? [];
|
|
316
317
|
notesForPublicKey.push(noteDao);
|
|
317
|
-
|
|
318
|
+
publicKeyToIncomingNotes.set(noteDao.ivpkM, notesForPublicKey);
|
|
318
319
|
}
|
|
319
320
|
// now for each group, look for the nullifiers in the nullifier tree
|
|
320
|
-
for (const [publicKey, notes] of
|
|
321
|
+
for (const [publicKey, notes] of publicKeyToIncomingNotes.entries()) {
|
|
321
322
|
const nullifiers = notes.map(n => n.siloedNullifier);
|
|
322
323
|
const relevantNullifiers = [];
|
|
323
324
|
for (const nullifier of nullifiers) {
|
|
@@ -330,4 +331,4 @@ _Synchronizer_instances = new WeakSet(), _Synchronizer_reprocessDeferredNotesFor
|
|
|
330
331
|
await this.db.removeNullifiedNotes(relevantNullifiers, publicKey);
|
|
331
332
|
}
|
|
332
333
|
};
|
|
333
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"synchronizer.js","sourceRoot":"","sources":["../../src/synchronizer/synchronizer.ts"],"names":[],"mappings":"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"}
|
|
334
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"synchronizer.js","sourceRoot":"","sources":["../../src/synchronizer/synchronizer.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@aztec/pxe",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.43.0",
|
|
4
4
|
"type": "module",
|
|
5
5
|
"exports": "./dest/index.js",
|
|
6
6
|
"bin": "./dest/bin/index.js",
|
|
@@ -48,19 +48,19 @@
|
|
|
48
48
|
]
|
|
49
49
|
},
|
|
50
50
|
"dependencies": {
|
|
51
|
-
"@aztec/bb-prover": "0.
|
|
52
|
-
"@aztec/bb.js": "0.
|
|
53
|
-
"@aztec/builder": "0.
|
|
54
|
-
"@aztec/circuit-types": "0.
|
|
55
|
-
"@aztec/circuits.js": "0.
|
|
56
|
-
"@aztec/ethereum": "0.
|
|
57
|
-
"@aztec/foundation": "0.
|
|
58
|
-
"@aztec/key-store": "0.
|
|
59
|
-
"@aztec/kv-store": "0.
|
|
60
|
-
"@aztec/noir-protocol-circuits-types": "0.
|
|
61
|
-
"@aztec/protocol-contracts": "0.
|
|
62
|
-
"@aztec/simulator": "0.
|
|
63
|
-
"@aztec/types": "0.
|
|
51
|
+
"@aztec/bb-prover": "0.43.0",
|
|
52
|
+
"@aztec/bb.js": "0.43.0",
|
|
53
|
+
"@aztec/builder": "0.43.0",
|
|
54
|
+
"@aztec/circuit-types": "0.43.0",
|
|
55
|
+
"@aztec/circuits.js": "0.43.0",
|
|
56
|
+
"@aztec/ethereum": "0.43.0",
|
|
57
|
+
"@aztec/foundation": "0.43.0",
|
|
58
|
+
"@aztec/key-store": "0.43.0",
|
|
59
|
+
"@aztec/kv-store": "0.43.0",
|
|
60
|
+
"@aztec/noir-protocol-circuits-types": "0.43.0",
|
|
61
|
+
"@aztec/protocol-contracts": "0.43.0",
|
|
62
|
+
"@aztec/simulator": "0.43.0",
|
|
63
|
+
"@aztec/types": "0.43.0",
|
|
64
64
|
"@noir-lang/noirc_abi": "portal:../../noir/packages/noirc_abi",
|
|
65
65
|
"koa": "^2.14.2",
|
|
66
66
|
"koa-router": "^12.0.0",
|
|
@@ -9,7 +9,7 @@ import { BufferReader, serializeToBuffer } from '@aztec/foundation/serialize';
|
|
|
9
9
|
*/
|
|
10
10
|
export class DeferredNoteDao {
|
|
11
11
|
constructor(
|
|
12
|
-
/**
|
|
12
|
+
/** IvpkM or OvpkM (depending on if incoming or outgoing) the note was encrypted with. */
|
|
13
13
|
public publicKey: PublicKey,
|
|
14
14
|
/** The note as emitted from the Noir contract. */
|
|
15
15
|
public note: Note,
|
|
@@ -5,9 +5,9 @@ import { BufferReader, serializeToBuffer } from '@aztec/foundation/serialize';
|
|
|
5
5
|
import { type NoteData } from '@aztec/simulator';
|
|
6
6
|
|
|
7
7
|
/**
|
|
8
|
-
* A note with contextual data.
|
|
8
|
+
* A note with contextual data which was decrypted as incoming.
|
|
9
9
|
*/
|
|
10
|
-
export class
|
|
10
|
+
export class IncomingNoteDao implements NoteData {
|
|
11
11
|
constructor(
|
|
12
12
|
/** The note as emitted from the Noir contract. */
|
|
13
13
|
public note: Note,
|
|
@@ -26,12 +26,15 @@ export class NoteDao implements NoteData {
|
|
|
26
26
|
* We can use this value to compute siloedNoteHash and uniqueSiloedNoteHash.
|
|
27
27
|
*/
|
|
28
28
|
public innerNoteHash: Fr,
|
|
29
|
-
/**
|
|
29
|
+
/**
|
|
30
|
+
* The nullifier of the note (siloed by contract address).
|
|
31
|
+
* Note: Might be set as 0 if the note was added to PXE as nullified.
|
|
32
|
+
*/
|
|
30
33
|
public siloedNullifier: Fr,
|
|
31
34
|
/** The location of the relevant note in the note hash tree. */
|
|
32
35
|
public index: bigint,
|
|
33
36
|
/** The public key with which the note was encrypted. */
|
|
34
|
-
public
|
|
37
|
+
public ivpkM: PublicKey,
|
|
35
38
|
) {}
|
|
36
39
|
|
|
37
40
|
toBuffer(): Buffer {
|
|
@@ -45,7 +48,7 @@ export class NoteDao implements NoteData {
|
|
|
45
48
|
this.innerNoteHash,
|
|
46
49
|
this.siloedNullifier,
|
|
47
50
|
this.index,
|
|
48
|
-
this.
|
|
51
|
+
this.ivpkM,
|
|
49
52
|
]);
|
|
50
53
|
}
|
|
51
54
|
static fromBuffer(buffer: Buffer | BufferReader) {
|
|
@@ -62,7 +65,7 @@ export class NoteDao implements NoteData {
|
|
|
62
65
|
const index = toBigIntBE(reader.readBytes(32));
|
|
63
66
|
const publicKey = Point.fromBuffer(reader);
|
|
64
67
|
|
|
65
|
-
return new
|
|
68
|
+
return new IncomingNoteDao(
|
|
66
69
|
note,
|
|
67
70
|
contractAddress,
|
|
68
71
|
storageSlot,
|
|
@@ -82,7 +85,7 @@ export class NoteDao implements NoteData {
|
|
|
82
85
|
|
|
83
86
|
static fromString(str: string) {
|
|
84
87
|
const hex = str.replace(/^0x/, '');
|
|
85
|
-
return
|
|
88
|
+
return IncomingNoteDao.fromBuffer(Buffer.from(hex, 'hex'));
|
|
86
89
|
}
|
|
87
90
|
|
|
88
91
|
/**
|
|
@@ -1,4 +1,10 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import {
|
|
2
|
+
type IncomingNotesFilter,
|
|
3
|
+
MerkleTreeId,
|
|
4
|
+
NoteStatus,
|
|
5
|
+
type OutgoingNotesFilter,
|
|
6
|
+
type PublicKey,
|
|
7
|
+
} from '@aztec/circuit-types';
|
|
2
8
|
import { AztecAddress, CompleteAddress, Header } from '@aztec/circuits.js';
|
|
3
9
|
import { type ContractArtifact } from '@aztec/foundation/abi';
|
|
4
10
|
import { toBufferBE } from '@aztec/foundation/bigint-buffer';
|
|
@@ -14,7 +20,8 @@ import { contractArtifactFromBuffer, contractArtifactToBuffer } from '@aztec/typ
|
|
|
14
20
|
import { type ContractInstanceWithAddress, SerializableContractInstance } from '@aztec/types/contracts';
|
|
15
21
|
|
|
16
22
|
import { DeferredNoteDao } from './deferred_note_dao.js';
|
|
17
|
-
import {
|
|
23
|
+
import { IncomingNoteDao } from './incoming_note_dao.js';
|
|
24
|
+
import { OutgoingNoteDao } from './outgoing_note_dao.js';
|
|
18
25
|
import { type PxeDatabase } from './pxe_database.js';
|
|
19
26
|
|
|
20
27
|
/**
|
|
@@ -32,11 +39,11 @@ export class KVPxeDatabase implements PxeDatabase {
|
|
|
32
39
|
#notesByContract: AztecMultiMap<string, string>;
|
|
33
40
|
#notesByStorageSlot: AztecMultiMap<string, string>;
|
|
34
41
|
#notesByTxHash: AztecMultiMap<string, string>;
|
|
35
|
-
#
|
|
42
|
+
#notesByIvpkM: AztecMultiMap<string, string>;
|
|
36
43
|
#nullifiedNotesByContract: AztecMultiMap<string, string>;
|
|
37
44
|
#nullifiedNotesByStorageSlot: AztecMultiMap<string, string>;
|
|
38
45
|
#nullifiedNotesByTxHash: AztecMultiMap<string, string>;
|
|
39
|
-
#
|
|
46
|
+
#nullifiedNotesByIvpkM: AztecMultiMap<string, string>;
|
|
40
47
|
#deferredNotes: AztecArray<Buffer | null>;
|
|
41
48
|
#deferredNotesByContract: AztecMultiMap<string, number>;
|
|
42
49
|
#syncedBlockPerPublicKey: AztecMap<string, number>;
|
|
@@ -44,6 +51,12 @@ export class KVPxeDatabase implements PxeDatabase {
|
|
|
44
51
|
#contractInstances: AztecMap<string, Buffer>;
|
|
45
52
|
#db: AztecKVStore;
|
|
46
53
|
|
|
54
|
+
#outgoingNotes: AztecMap<string, Buffer>;
|
|
55
|
+
#outgoingNotesByContract: AztecMultiMap<string, string>;
|
|
56
|
+
#outgoingNotesByStorageSlot: AztecMultiMap<string, string>;
|
|
57
|
+
#outgoingNotesByTxHash: AztecMultiMap<string, string>;
|
|
58
|
+
#outgoingNotesByOvpkM: AztecMultiMap<string, string>;
|
|
59
|
+
|
|
47
60
|
constructor(private db: AztecKVStore) {
|
|
48
61
|
this.#db = db;
|
|
49
62
|
|
|
@@ -66,15 +79,21 @@ export class KVPxeDatabase implements PxeDatabase {
|
|
|
66
79
|
this.#notesByContract = db.openMultiMap('notes_by_contract');
|
|
67
80
|
this.#notesByStorageSlot = db.openMultiMap('notes_by_storage_slot');
|
|
68
81
|
this.#notesByTxHash = db.openMultiMap('notes_by_tx_hash');
|
|
69
|
-
this.#
|
|
82
|
+
this.#notesByIvpkM = db.openMultiMap('notes_by_ivpk_m');
|
|
70
83
|
|
|
71
84
|
this.#nullifiedNotesByContract = db.openMultiMap('nullified_notes_by_contract');
|
|
72
85
|
this.#nullifiedNotesByStorageSlot = db.openMultiMap('nullified_notes_by_storage_slot');
|
|
73
86
|
this.#nullifiedNotesByTxHash = db.openMultiMap('nullified_notes_by_tx_hash');
|
|
74
|
-
this.#
|
|
87
|
+
this.#nullifiedNotesByIvpkM = db.openMultiMap('nullified_notes_by_ivpk_m');
|
|
75
88
|
|
|
76
89
|
this.#deferredNotes = db.openArray('deferred_notes');
|
|
77
90
|
this.#deferredNotesByContract = db.openMultiMap('deferred_notes_by_contract');
|
|
91
|
+
|
|
92
|
+
this.#outgoingNotes = db.openMap('outgoing_notes');
|
|
93
|
+
this.#outgoingNotesByContract = db.openMultiMap('outgoing_notes_by_contract');
|
|
94
|
+
this.#outgoingNotesByStorageSlot = db.openMultiMap('outgoing_notes_by_storage_slot');
|
|
95
|
+
this.#outgoingNotesByTxHash = db.openMultiMap('outgoing_notes_by_tx_hash');
|
|
96
|
+
this.#outgoingNotesByOvpkM = db.openMultiMap('outgoing_notes_by_ovpk_m');
|
|
78
97
|
}
|
|
79
98
|
|
|
80
99
|
public async getContract(
|
|
@@ -135,13 +154,13 @@ export class KVPxeDatabase implements PxeDatabase {
|
|
|
135
154
|
return val?.map(b => Fr.fromBuffer(b));
|
|
136
155
|
}
|
|
137
156
|
|
|
138
|
-
async addNote(note:
|
|
139
|
-
await this.addNotes([note]);
|
|
157
|
+
async addNote(note: IncomingNoteDao): Promise<void> {
|
|
158
|
+
await this.addNotes([note], []);
|
|
140
159
|
}
|
|
141
160
|
|
|
142
|
-
addNotes(
|
|
161
|
+
addNotes(incomingNotes: IncomingNoteDao[], outgoingNotes: OutgoingNoteDao[]): Promise<void> {
|
|
143
162
|
return this.db.transaction(() => {
|
|
144
|
-
for (const dao of
|
|
163
|
+
for (const dao of incomingNotes) {
|
|
145
164
|
// store notes by their index in the notes hash tree
|
|
146
165
|
// this provides the uniqueness we need to store individual notes
|
|
147
166
|
// and should also return notes in the order that they were created.
|
|
@@ -152,7 +171,16 @@ export class KVPxeDatabase implements PxeDatabase {
|
|
|
152
171
|
void this.#notesByContract.set(dao.contractAddress.toString(), noteIndex);
|
|
153
172
|
void this.#notesByStorageSlot.set(dao.storageSlot.toString(), noteIndex);
|
|
154
173
|
void this.#notesByTxHash.set(dao.txHash.toString(), noteIndex);
|
|
155
|
-
void this.#
|
|
174
|
+
void this.#notesByIvpkM.set(dao.ivpkM.toString(), noteIndex);
|
|
175
|
+
}
|
|
176
|
+
|
|
177
|
+
for (const dao of outgoingNotes) {
|
|
178
|
+
const noteIndex = toBufferBE(dao.index, 32).toString('hex');
|
|
179
|
+
void this.#outgoingNotes.set(noteIndex, dao.toBuffer());
|
|
180
|
+
void this.#outgoingNotesByContract.set(dao.contractAddress.toString(), noteIndex);
|
|
181
|
+
void this.#outgoingNotesByStorageSlot.set(dao.storageSlot.toString(), noteIndex);
|
|
182
|
+
void this.#outgoingNotesByTxHash.set(dao.txHash.toString(), noteIndex);
|
|
183
|
+
void this.#outgoingNotesByOvpkM.set(dao.ovpkM.toString(), noteIndex);
|
|
156
184
|
}
|
|
157
185
|
});
|
|
158
186
|
}
|
|
@@ -207,7 +235,7 @@ export class KVPxeDatabase implements PxeDatabase {
|
|
|
207
235
|
});
|
|
208
236
|
}
|
|
209
237
|
|
|
210
|
-
|
|
238
|
+
getIncomingNotes(filter: IncomingNotesFilter): Promise<IncomingNoteDao[]> {
|
|
211
239
|
const publicKey: PublicKey | undefined = filter.owner
|
|
212
240
|
? this.#getCompleteAddress(filter.owner)?.publicKeys.masterIncomingViewingPublicKey
|
|
213
241
|
: undefined;
|
|
@@ -218,7 +246,7 @@ export class KVPxeDatabase implements PxeDatabase {
|
|
|
218
246
|
|
|
219
247
|
candidateNoteSources.push({
|
|
220
248
|
ids: publicKey
|
|
221
|
-
? this.#
|
|
249
|
+
? this.#notesByIvpkM.getValues(publicKey.toString())
|
|
222
250
|
: filter.txHash
|
|
223
251
|
? this.#notesByTxHash.getValues(filter.txHash.toString())
|
|
224
252
|
: filter.contractAddress
|
|
@@ -232,7 +260,7 @@ export class KVPxeDatabase implements PxeDatabase {
|
|
|
232
260
|
if (filter.status == NoteStatus.ACTIVE_OR_NULLIFIED) {
|
|
233
261
|
candidateNoteSources.push({
|
|
234
262
|
ids: publicKey
|
|
235
|
-
? this.#
|
|
263
|
+
? this.#nullifiedNotesByIvpkM.getValues(publicKey.toString())
|
|
236
264
|
: filter.txHash
|
|
237
265
|
? this.#nullifiedNotesByTxHash.getValues(filter.txHash.toString())
|
|
238
266
|
: filter.contractAddress
|
|
@@ -244,7 +272,7 @@ export class KVPxeDatabase implements PxeDatabase {
|
|
|
244
272
|
});
|
|
245
273
|
}
|
|
246
274
|
|
|
247
|
-
const result:
|
|
275
|
+
const result: IncomingNoteDao[] = [];
|
|
248
276
|
for (const { ids, notes } of candidateNoteSources) {
|
|
249
277
|
for (const id of ids) {
|
|
250
278
|
const serializedNote = notes.get(id);
|
|
@@ -252,7 +280,7 @@ export class KVPxeDatabase implements PxeDatabase {
|
|
|
252
280
|
continue;
|
|
253
281
|
}
|
|
254
282
|
|
|
255
|
-
const note =
|
|
283
|
+
const note = IncomingNoteDao.fromBuffer(serializedNote);
|
|
256
284
|
if (filter.contractAddress && !note.contractAddress.equals(filter.contractAddress)) {
|
|
257
285
|
continue;
|
|
258
286
|
}
|
|
@@ -265,7 +293,11 @@ export class KVPxeDatabase implements PxeDatabase {
|
|
|
265
293
|
continue;
|
|
266
294
|
}
|
|
267
295
|
|
|
268
|
-
if (publicKey && !note.
|
|
296
|
+
if (publicKey && !note.ivpkM.equals(publicKey)) {
|
|
297
|
+
continue;
|
|
298
|
+
}
|
|
299
|
+
|
|
300
|
+
if (filter.siloedNullifier && !note.siloedNullifier.equals(filter.siloedNullifier)) {
|
|
269
301
|
continue;
|
|
270
302
|
}
|
|
271
303
|
|
|
@@ -273,20 +305,66 @@ export class KVPxeDatabase implements PxeDatabase {
|
|
|
273
305
|
}
|
|
274
306
|
}
|
|
275
307
|
|
|
276
|
-
return result;
|
|
308
|
+
return Promise.resolve(result);
|
|
277
309
|
}
|
|
278
310
|
|
|
279
|
-
|
|
280
|
-
|
|
311
|
+
getOutgoingNotes(filter: OutgoingNotesFilter): Promise<OutgoingNoteDao[]> {
|
|
312
|
+
const ovpkM: PublicKey | undefined = filter.owner
|
|
313
|
+
? this.#getCompleteAddress(filter.owner)?.publicKeys.masterOutgoingViewingPublicKey
|
|
314
|
+
: undefined;
|
|
315
|
+
|
|
316
|
+
// Check if ovpkM is truthy
|
|
317
|
+
const ids = ovpkM
|
|
318
|
+
? this.#outgoingNotesByOvpkM.getValues(ovpkM.toString())
|
|
319
|
+
: // If ovpkM is falsy, check if filter.txHash is truthy
|
|
320
|
+
filter.txHash
|
|
321
|
+
? this.#outgoingNotesByTxHash.getValues(filter.txHash.toString())
|
|
322
|
+
: // If both ovpkM and filter.txHash are falsy, check if filter.contractAddress is truthy
|
|
323
|
+
filter.contractAddress
|
|
324
|
+
? this.#outgoingNotesByContract.getValues(filter.contractAddress.toString())
|
|
325
|
+
: // If ovpkM, filter.txHash, and filter.contractAddress are all falsy, check if filter.storageSlot is truthy
|
|
326
|
+
filter.storageSlot
|
|
327
|
+
? this.#outgoingNotesByStorageSlot.getValues(filter.storageSlot.toString())
|
|
328
|
+
: // If none of the above conditions are met, retrieve all keys from this.#outgoingNotes
|
|
329
|
+
this.#outgoingNotes.keys();
|
|
330
|
+
|
|
331
|
+
const notes: OutgoingNoteDao[] = [];
|
|
332
|
+
for (const id of ids) {
|
|
333
|
+
const serializedNote = this.#outgoingNotes.get(id);
|
|
334
|
+
if (!serializedNote) {
|
|
335
|
+
continue;
|
|
336
|
+
}
|
|
337
|
+
|
|
338
|
+
const note = OutgoingNoteDao.fromBuffer(serializedNote);
|
|
339
|
+
if (filter.contractAddress && !note.contractAddress.equals(filter.contractAddress)) {
|
|
340
|
+
continue;
|
|
341
|
+
}
|
|
342
|
+
|
|
343
|
+
if (filter.txHash && !note.txHash.equals(filter.txHash)) {
|
|
344
|
+
continue;
|
|
345
|
+
}
|
|
346
|
+
|
|
347
|
+
if (filter.storageSlot && !note.storageSlot.equals(filter.storageSlot!)) {
|
|
348
|
+
continue;
|
|
349
|
+
}
|
|
350
|
+
|
|
351
|
+
if (ovpkM && !note.ovpkM.equals(ovpkM)) {
|
|
352
|
+
continue;
|
|
353
|
+
}
|
|
354
|
+
|
|
355
|
+
notes.push(note);
|
|
356
|
+
}
|
|
357
|
+
|
|
358
|
+
return Promise.resolve(notes);
|
|
281
359
|
}
|
|
282
360
|
|
|
283
|
-
removeNullifiedNotes(nullifiers: Fr[], account: PublicKey): Promise<
|
|
361
|
+
removeNullifiedNotes(nullifiers: Fr[], account: PublicKey): Promise<IncomingNoteDao[]> {
|
|
284
362
|
if (nullifiers.length === 0) {
|
|
285
363
|
return Promise.resolve([]);
|
|
286
364
|
}
|
|
287
365
|
|
|
288
366
|
return this.#db.transaction(() => {
|
|
289
|
-
const nullifiedNotes:
|
|
367
|
+
const nullifiedNotes: IncomingNoteDao[] = [];
|
|
290
368
|
|
|
291
369
|
for (const nullifier of nullifiers) {
|
|
292
370
|
const noteIndex = this.#nullifierToNoteId.get(nullifier.toString());
|
|
@@ -301,8 +379,8 @@ export class KVPxeDatabase implements PxeDatabase {
|
|
|
301
379
|
continue;
|
|
302
380
|
}
|
|
303
381
|
|
|
304
|
-
const note =
|
|
305
|
-
if (!note.
|
|
382
|
+
const note = IncomingNoteDao.fromBuffer(noteBuffer);
|
|
383
|
+
if (!note.ivpkM.equals(account)) {
|
|
306
384
|
// tried to nullify someone else's note
|
|
307
385
|
continue;
|
|
308
386
|
}
|
|
@@ -310,7 +388,7 @@ export class KVPxeDatabase implements PxeDatabase {
|
|
|
310
388
|
nullifiedNotes.push(note);
|
|
311
389
|
|
|
312
390
|
void this.#notes.delete(noteIndex);
|
|
313
|
-
void this.#
|
|
391
|
+
void this.#notesByIvpkM.deleteValue(account.toString(), noteIndex);
|
|
314
392
|
void this.#notesByTxHash.deleteValue(note.txHash.toString(), noteIndex);
|
|
315
393
|
void this.#notesByContract.deleteValue(note.contractAddress.toString(), noteIndex);
|
|
316
394
|
void this.#notesByStorageSlot.deleteValue(note.storageSlot.toString(), noteIndex);
|
|
@@ -319,7 +397,7 @@ export class KVPxeDatabase implements PxeDatabase {
|
|
|
319
397
|
void this.#nullifiedNotesByContract.set(note.contractAddress.toString(), noteIndex);
|
|
320
398
|
void this.#nullifiedNotesByStorageSlot.set(note.storageSlot.toString(), noteIndex);
|
|
321
399
|
void this.#nullifiedNotesByTxHash.set(note.txHash.toString(), noteIndex);
|
|
322
|
-
void this.#
|
|
400
|
+
void this.#nullifiedNotesByIvpkM.set(note.ivpkM.toString(), noteIndex);
|
|
323
401
|
|
|
324
402
|
void this.#nullifierToNoteId.delete(nullifier.toString());
|
|
325
403
|
}
|
|
@@ -328,6 +406,18 @@ export class KVPxeDatabase implements PxeDatabase {
|
|
|
328
406
|
});
|
|
329
407
|
}
|
|
330
408
|
|
|
409
|
+
async addNullifiedNote(note: IncomingNoteDao): Promise<void> {
|
|
410
|
+
const noteIndex = toBufferBE(note.index, 32).toString('hex');
|
|
411
|
+
|
|
412
|
+
await this.#nullifiedNotes.set(noteIndex, note.toBuffer());
|
|
413
|
+
await this.#nullifiedNotesByContract.set(note.contractAddress.toString(), noteIndex);
|
|
414
|
+
await this.#nullifiedNotesByStorageSlot.set(note.storageSlot.toString(), noteIndex);
|
|
415
|
+
await this.#nullifiedNotesByTxHash.set(note.txHash.toString(), noteIndex);
|
|
416
|
+
await this.#nullifiedNotesByIvpkM.set(note.ivpkM.toString(), noteIndex);
|
|
417
|
+
|
|
418
|
+
return Promise.resolve();
|
|
419
|
+
}
|
|
420
|
+
|
|
331
421
|
async setHeader(header: Header): Promise<void> {
|
|
332
422
|
await this.#synchronizedBlock.set(header.toBuffer());
|
|
333
423
|
}
|
|
@@ -401,8 +491,16 @@ export class KVPxeDatabase implements PxeDatabase {
|
|
|
401
491
|
return this.#syncedBlockPerPublicKey.set(publicKey.toString(), blockNumber);
|
|
402
492
|
}
|
|
403
493
|
|
|
404
|
-
estimateSize(): number {
|
|
405
|
-
const
|
|
494
|
+
async estimateSize(): Promise<number> {
|
|
495
|
+
const incomingNotesSize = Array.from(await this.getIncomingNotes({})).reduce(
|
|
496
|
+
(sum, note) => sum + note.getSize(),
|
|
497
|
+
0,
|
|
498
|
+
);
|
|
499
|
+
const outgoingNotesSize = Array.from(await this.getOutgoingNotes({})).reduce(
|
|
500
|
+
(sum, note) => sum + note.getSize(),
|
|
501
|
+
0,
|
|
502
|
+
);
|
|
503
|
+
|
|
406
504
|
const authWitsSize = Array.from(this.#authWitnesses.values()).reduce(
|
|
407
505
|
(sum, value) => sum + value.length * Fr.SIZE_IN_BYTES,
|
|
408
506
|
0,
|
|
@@ -410,6 +508,6 @@ export class KVPxeDatabase implements PxeDatabase {
|
|
|
410
508
|
const addressesSize = this.#addresses.length * CompleteAddress.SIZE_IN_BYTES;
|
|
411
509
|
const treeRootsSize = Object.keys(MerkleTreeId).length * Fr.SIZE_IN_BYTES;
|
|
412
510
|
|
|
413
|
-
return
|
|
511
|
+
return incomingNotesSize + outgoingNotesSize + treeRootsSize + authWitsSize + addressesSize;
|
|
414
512
|
}
|
|
415
513
|
}
|