@aztec/pxe 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/dest/bin/index.js +4 -6
- package/dest/config/index.d.ts +2 -2
- package/dest/config/index.d.ts.map +1 -1
- package/dest/config/index.js +20 -23
- package/dest/config/package_info.js +4 -2
- package/dest/contract_data_oracle/index.d.ts +10 -10
- package/dest/contract_data_oracle/index.d.ts.map +1 -1
- package/dest/contract_data_oracle/index.js +74 -89
- package/dest/contract_data_oracle/private_functions_tree.d.ts +5 -4
- package/dest/contract_data_oracle/private_functions_tree.d.ts.map +1 -1
- package/dest/contract_data_oracle/private_functions_tree.js +47 -51
- package/dest/database/contracts/contract_artifact_db.d.ts +2 -2
- package/dest/database/contracts/contract_artifact_db.d.ts.map +1 -1
- package/dest/database/contracts/contract_artifact_db.js +3 -2
- package/dest/database/contracts/contract_instance_db.d.ts +2 -1
- package/dest/database/contracts/contract_instance_db.d.ts.map +1 -1
- package/dest/database/contracts/contract_instance_db.js +3 -2
- package/dest/database/index.js +0 -1
- package/dest/database/kv_pxe_database.d.ts +9 -5
- package/dest/database/kv_pxe_database.d.ts.map +1 -1
- package/dest/database/kv_pxe_database.js +244 -257
- package/dest/database/note_dao.d.ts +13 -10
- package/dest/database/note_dao.d.ts.map +1 -1
- package/dest/database/note_dao.js +35 -48
- package/dest/database/outgoing_note_dao.d.ts +6 -3
- package/dest/database/outgoing_note_dao.d.ts.map +1 -1
- package/dest/database/outgoing_note_dao.js +25 -37
- package/dest/database/pxe_database.d.ts +12 -8
- package/dest/database/pxe_database.d.ts.map +1 -1
- package/dest/database/pxe_database.js +4 -2
- package/dest/database/pxe_database_test_suite.d.ts +1 -1
- package/dest/database/pxe_database_test_suite.d.ts.map +1 -1
- package/dest/database/pxe_database_test_suite.js +286 -147
- package/dest/index.d.ts +1 -6
- package/dest/index.d.ts.map +1 -1
- package/dest/index.js +1 -7
- package/dest/kernel_oracle/index.d.ts +20 -10
- package/dest/kernel_oracle/index.d.ts.map +1 -1
- package/dest/kernel_oracle/index.js +32 -9
- package/dest/kernel_prover/hints/build_private_kernel_reset_private_inputs.d.ts +3 -3
- package/dest/kernel_prover/hints/build_private_kernel_reset_private_inputs.d.ts.map +1 -1
- package/dest/kernel_prover/hints/build_private_kernel_reset_private_inputs.js +71 -67
- package/dest/kernel_prover/hints/index.js +0 -1
- package/dest/kernel_prover/index.js +0 -1
- package/dest/kernel_prover/kernel_prover.d.ts +6 -6
- package/dest/kernel_prover/kernel_prover.d.ts.map +1 -1
- package/dest/kernel_prover/kernel_prover.js +98 -81
- package/dest/kernel_prover/proving_data_oracle.d.ts +15 -7
- package/dest/kernel_prover/proving_data_oracle.d.ts.map +1 -1
- package/dest/kernel_prover/proving_data_oracle.js +4 -2
- package/dest/note_decryption_utils/add_public_values_to_payload.d.ts +3 -2
- package/dest/note_decryption_utils/add_public_values_to_payload.d.ts.map +1 -1
- package/dest/note_decryption_utils/add_public_values_to_payload.js +11 -12
- package/dest/pxe_http/index.js +0 -1
- package/dest/pxe_http/pxe_http_server.d.ts +1 -1
- package/dest/pxe_http/pxe_http_server.d.ts.map +1 -1
- package/dest/pxe_http/pxe_http_server.js +9 -7
- package/dest/pxe_service/error_enriching.d.ts +3 -3
- package/dest/pxe_service/error_enriching.d.ts.map +1 -1
- package/dest/pxe_service/error_enriching.js +14 -17
- package/dest/pxe_service/index.d.ts +0 -1
- package/dest/pxe_service/index.d.ts.map +1 -1
- package/dest/pxe_service/index.js +0 -2
- package/dest/pxe_service/pxe_service.d.ts +21 -12
- package/dest/pxe_service/pxe_service.d.ts.map +1 -1
- package/dest/pxe_service/pxe_service.js +279 -333
- package/dest/pxe_service/test/pxe_test_suite.d.ts +1 -1
- package/dest/pxe_service/test/pxe_test_suite.d.ts.map +1 -1
- package/dest/pxe_service/test/pxe_test_suite.js +44 -28
- package/dest/simulator/index.d.ts +3 -3
- package/dest/simulator/index.d.ts.map +1 -1
- package/dest/simulator/index.js +1 -3
- package/dest/simulator_oracle/index.d.ts +18 -6
- package/dest/simulator_oracle/index.d.ts.map +1 -1
- package/dest/simulator_oracle/index.js +307 -235
- package/dest/simulator_oracle/tagging_utils.d.ts +2 -1
- package/dest/simulator_oracle/tagging_utils.d.ts.map +1 -1
- package/dest/simulator_oracle/tagging_utils.js +5 -7
- package/dest/synchronizer/index.js +0 -1
- package/dest/synchronizer/synchronizer.d.ts +7 -4
- package/dest/synchronizer/synchronizer.d.ts.map +1 -1
- package/dest/synchronizer/synchronizer.js +64 -43
- package/dest/utils/create_pxe_service.d.ts +2 -2
- package/dest/utils/create_pxe_service.d.ts.map +1 -1
- package/dest/utils/create_pxe_service.js +13 -11
- package/package.json +18 -19
- package/src/bin/index.ts +1 -1
- package/src/config/index.ts +3 -3
- package/src/contract_data_oracle/index.ts +20 -20
- package/src/contract_data_oracle/private_functions_tree.ts +6 -7
- package/src/database/contracts/contract_artifact_db.ts +2 -2
- package/src/database/contracts/contract_instance_db.ts +2 -1
- package/src/database/kv_pxe_database.ts +33 -32
- package/src/database/note_dao.ts +11 -8
- package/src/database/outgoing_note_dao.ts +7 -4
- package/src/database/pxe_database.ts +13 -15
- package/src/database/pxe_database_test_suite.ts +8 -11
- package/src/index.ts +1 -7
- package/src/kernel_oracle/index.ts +55 -22
- package/src/kernel_prover/hints/build_private_kernel_reset_private_inputs.ts +14 -11
- package/src/kernel_prover/kernel_prover.ts +89 -69
- package/src/kernel_prover/proving_data_oracle.ts +20 -20
- package/src/note_decryption_utils/add_public_values_to_payload.ts +5 -4
- package/src/pxe_http/pxe_http_server.ts +1 -1
- package/src/pxe_service/error_enriching.ts +6 -6
- package/src/pxe_service/index.ts +0 -1
- package/src/pxe_service/pxe_service.ts +121 -224
- package/src/pxe_service/test/pxe_test_suite.ts +6 -3
- package/src/simulator/index.ts +3 -3
- package/src/simulator_oracle/index.ts +77 -47
- package/src/simulator_oracle/tagging_utils.ts +2 -1
- package/src/synchronizer/synchronizer.ts +31 -12
- package/src/utils/create_pxe_service.ts +16 -4
|
@@ -1,170 +1,176 @@
|
|
|
1
|
-
var _KVPxeDatabase_instances, _KVPxeDatabase_synchronizedBlock, _KVPxeDatabase_completeAddresses, _KVPxeDatabase_completeAddressIndex, _KVPxeDatabase_addressBook, _KVPxeDatabase_authWitnesses, _KVPxeDatabase_notes, _KVPxeDatabase_nullifiedNotes, _KVPxeDatabase_nullifierToNoteId, _KVPxeDatabase_nullifiersByBlockNumber, _KVPxeDatabase_nullifiedNotesToScope, _KVPxeDatabase_nullifiedNotesByContract, _KVPxeDatabase_nullifiedNotesByStorageSlot, _KVPxeDatabase_nullifiedNotesByTxHash, _KVPxeDatabase_nullifiedNotesByAddressPoint, _KVPxeDatabase_nullifiedNotesByNullifier, _KVPxeDatabase_contractArtifacts, _KVPxeDatabase_contractInstances, _KVPxeDatabase_db, _KVPxeDatabase_scopes, _KVPxeDatabase_notesToScope, _KVPxeDatabase_notesByContractAndScope, _KVPxeDatabase_notesByStorageSlotAndScope, _KVPxeDatabase_notesByTxHashAndScope, _KVPxeDatabase_notesByAddressPointAndScope, _KVPxeDatabase_taggingSecretIndexesForSenders, _KVPxeDatabase_taggingSecretIndexesForRecipients, _KVPxeDatabase_capsules, _KVPxeDatabase_addScope, _KVPxeDatabase_getCompleteAddress, _KVPxeDatabase_setTaggingSecretsIndexes, _KVPxeDatabase_getTaggingSecretsIndexes;
|
|
2
|
-
import { __classPrivateFieldGet, __classPrivateFieldSet } from "tslib";
|
|
3
|
-
import { MerkleTreeId, NoteStatus } from '@aztec/circuit-types';
|
|
4
|
-
import { AztecAddress, BlockHeader, CompleteAddress, SerializableContractInstance, } from '@aztec/circuits.js';
|
|
5
|
-
import { FunctionSelector, FunctionType } from '@aztec/foundation/abi';
|
|
6
1
|
import { toBufferBE } from '@aztec/foundation/bigint-buffer';
|
|
7
2
|
import { Fr } from '@aztec/foundation/fields';
|
|
8
3
|
import { toArray } from '@aztec/foundation/iterable';
|
|
9
4
|
import { createDebugOnlyLogger } from '@aztec/foundation/log';
|
|
10
|
-
import {
|
|
5
|
+
import { FunctionSelector, FunctionType } from '@aztec/stdlib/abi';
|
|
6
|
+
import { contractArtifactFromBuffer, contractArtifactToBuffer } from '@aztec/stdlib/abi';
|
|
7
|
+
import { AztecAddress } from '@aztec/stdlib/aztec-address';
|
|
8
|
+
import { CompleteAddress, SerializableContractInstance } from '@aztec/stdlib/contract';
|
|
9
|
+
import { NoteStatus } from '@aztec/stdlib/note';
|
|
10
|
+
import { MerkleTreeId } from '@aztec/stdlib/trees';
|
|
11
|
+
import { BlockHeader } from '@aztec/stdlib/tx';
|
|
11
12
|
import { NoteDao } from './note_dao.js';
|
|
12
13
|
/**
|
|
13
14
|
* A PXE database backed by LMDB.
|
|
14
|
-
*/
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
15
|
+
*/ export class KVPxeDatabase {
|
|
16
|
+
db;
|
|
17
|
+
#synchronizedBlock;
|
|
18
|
+
#completeAddresses;
|
|
19
|
+
#completeAddressIndex;
|
|
20
|
+
#addressBook;
|
|
21
|
+
#authWitnesses;
|
|
22
|
+
#notes;
|
|
23
|
+
#nullifiedNotes;
|
|
24
|
+
#nullifierToNoteId;
|
|
25
|
+
#nullifiersByBlockNumber;
|
|
26
|
+
#nullifiedNotesToScope;
|
|
27
|
+
#nullifiedNotesByContract;
|
|
28
|
+
#nullifiedNotesByStorageSlot;
|
|
29
|
+
#nullifiedNotesByTxHash;
|
|
30
|
+
#nullifiedNotesByAddressPoint;
|
|
31
|
+
#nullifiedNotesByNullifier;
|
|
32
|
+
#contractArtifacts;
|
|
33
|
+
#contractInstances;
|
|
34
|
+
#db;
|
|
35
|
+
#scopes;
|
|
36
|
+
#notesToScope;
|
|
37
|
+
#notesByContractAndScope;
|
|
38
|
+
#notesByStorageSlotAndScope;
|
|
39
|
+
#notesByTxHashAndScope;
|
|
40
|
+
#notesByAddressPointAndScope;
|
|
41
|
+
// Stores the last index used for each tagging secret, taking direction into account
|
|
42
|
+
// This is necessary to avoid reusing the same index for the same secret, which happens if
|
|
43
|
+
// sender and recipient are the same
|
|
44
|
+
#taggingSecretIndexesForSenders;
|
|
45
|
+
#taggingSecretIndexesForRecipients;
|
|
46
|
+
// Arbitrary data stored by contracts. Key is computed as `${contractAddress}:${key}`
|
|
47
|
+
#capsules;
|
|
48
|
+
debug;
|
|
49
|
+
constructor(db){
|
|
18
50
|
this.db = db;
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
_KVPxeDatabase_taggingSecretIndexesForSenders.set(this, void 0);
|
|
47
|
-
_KVPxeDatabase_taggingSecretIndexesForRecipients.set(this, void 0);
|
|
48
|
-
// Arbitrary data stored by contracts. Key is computed as `${contractAddress}:${key}`
|
|
49
|
-
_KVPxeDatabase_capsules.set(this, void 0);
|
|
50
|
-
__classPrivateFieldSet(this, _KVPxeDatabase_db, db, "f");
|
|
51
|
-
__classPrivateFieldSet(this, _KVPxeDatabase_completeAddresses, db.openArray('complete_addresses'), "f");
|
|
52
|
-
__classPrivateFieldSet(this, _KVPxeDatabase_completeAddressIndex, db.openMap('complete_address_index'), "f");
|
|
53
|
-
__classPrivateFieldSet(this, _KVPxeDatabase_addressBook, db.openSet('address_book'), "f");
|
|
54
|
-
__classPrivateFieldSet(this, _KVPxeDatabase_authWitnesses, db.openMap('auth_witnesses'), "f");
|
|
55
|
-
__classPrivateFieldSet(this, _KVPxeDatabase_contractArtifacts, db.openMap('contract_artifacts'), "f");
|
|
56
|
-
__classPrivateFieldSet(this, _KVPxeDatabase_contractInstances, db.openMap('contracts_instances'), "f");
|
|
57
|
-
__classPrivateFieldSet(this, _KVPxeDatabase_synchronizedBlock, db.openSingleton('header'), "f");
|
|
58
|
-
__classPrivateFieldSet(this, _KVPxeDatabase_notes, db.openMap('notes'), "f");
|
|
59
|
-
__classPrivateFieldSet(this, _KVPxeDatabase_nullifiedNotes, db.openMap('nullified_notes'), "f");
|
|
60
|
-
__classPrivateFieldSet(this, _KVPxeDatabase_nullifierToNoteId, db.openMap('nullifier_to_note'), "f");
|
|
61
|
-
__classPrivateFieldSet(this, _KVPxeDatabase_nullifiersByBlockNumber, db.openMultiMap('nullifier_to_block_number'), "f");
|
|
62
|
-
__classPrivateFieldSet(this, _KVPxeDatabase_nullifiedNotesToScope, db.openMultiMap('nullified_notes_to_scope'), "f");
|
|
63
|
-
__classPrivateFieldSet(this, _KVPxeDatabase_nullifiedNotesByContract, db.openMultiMap('nullified_notes_by_contract'), "f");
|
|
64
|
-
__classPrivateFieldSet(this, _KVPxeDatabase_nullifiedNotesByStorageSlot, db.openMultiMap('nullified_notes_by_storage_slot'), "f");
|
|
65
|
-
__classPrivateFieldSet(this, _KVPxeDatabase_nullifiedNotesByTxHash, db.openMultiMap('nullified_notes_by_tx_hash'), "f");
|
|
66
|
-
__classPrivateFieldSet(this, _KVPxeDatabase_nullifiedNotesByAddressPoint, db.openMultiMap('nullified_notes_by_address_point'), "f");
|
|
67
|
-
__classPrivateFieldSet(this, _KVPxeDatabase_nullifiedNotesByNullifier, db.openMap('nullified_notes_by_nullifier'), "f");
|
|
68
|
-
__classPrivateFieldSet(this, _KVPxeDatabase_scopes, db.openSet('scopes'), "f");
|
|
69
|
-
__classPrivateFieldSet(this, _KVPxeDatabase_notesToScope, db.openMultiMap('notes_to_scope'), "f");
|
|
70
|
-
__classPrivateFieldSet(this, _KVPxeDatabase_notesByContractAndScope, new Map(), "f");
|
|
71
|
-
__classPrivateFieldSet(this, _KVPxeDatabase_notesByStorageSlotAndScope, new Map(), "f");
|
|
72
|
-
__classPrivateFieldSet(this, _KVPxeDatabase_notesByTxHashAndScope, new Map(), "f");
|
|
73
|
-
__classPrivateFieldSet(this, _KVPxeDatabase_notesByAddressPointAndScope, new Map(), "f");
|
|
74
|
-
__classPrivateFieldSet(this, _KVPxeDatabase_taggingSecretIndexesForSenders, db.openMap('tagging_secret_indexes_for_senders'), "f");
|
|
75
|
-
__classPrivateFieldSet(this, _KVPxeDatabase_taggingSecretIndexesForRecipients, db.openMap('tagging_secret_indexes_for_recipients'), "f");
|
|
76
|
-
__classPrivateFieldSet(this, _KVPxeDatabase_capsules, db.openMap('capsules'), "f");
|
|
51
|
+
this.#db = db;
|
|
52
|
+
this.#completeAddresses = db.openArray('complete_addresses');
|
|
53
|
+
this.#completeAddressIndex = db.openMap('complete_address_index');
|
|
54
|
+
this.#addressBook = db.openMap('address_book');
|
|
55
|
+
this.#authWitnesses = db.openMap('auth_witnesses');
|
|
56
|
+
this.#contractArtifacts = db.openMap('contract_artifacts');
|
|
57
|
+
this.#contractInstances = db.openMap('contracts_instances');
|
|
58
|
+
this.#synchronizedBlock = db.openSingleton('header');
|
|
59
|
+
this.#notes = db.openMap('notes');
|
|
60
|
+
this.#nullifiedNotes = db.openMap('nullified_notes');
|
|
61
|
+
this.#nullifierToNoteId = db.openMap('nullifier_to_note');
|
|
62
|
+
this.#nullifiersByBlockNumber = db.openMultiMap('nullifier_to_block_number');
|
|
63
|
+
this.#nullifiedNotesToScope = db.openMultiMap('nullified_notes_to_scope');
|
|
64
|
+
this.#nullifiedNotesByContract = db.openMultiMap('nullified_notes_by_contract');
|
|
65
|
+
this.#nullifiedNotesByStorageSlot = db.openMultiMap('nullified_notes_by_storage_slot');
|
|
66
|
+
this.#nullifiedNotesByTxHash = db.openMultiMap('nullified_notes_by_tx_hash');
|
|
67
|
+
this.#nullifiedNotesByAddressPoint = db.openMultiMap('nullified_notes_by_address_point');
|
|
68
|
+
this.#nullifiedNotesByNullifier = db.openMap('nullified_notes_by_nullifier');
|
|
69
|
+
this.#scopes = db.openMap('scopes');
|
|
70
|
+
this.#notesToScope = db.openMultiMap('notes_to_scope');
|
|
71
|
+
this.#notesByContractAndScope = new Map();
|
|
72
|
+
this.#notesByStorageSlotAndScope = new Map();
|
|
73
|
+
this.#notesByTxHashAndScope = new Map();
|
|
74
|
+
this.#notesByAddressPointAndScope = new Map();
|
|
75
|
+
this.#taggingSecretIndexesForSenders = db.openMap('tagging_secret_indexes_for_senders');
|
|
76
|
+
this.#taggingSecretIndexesForRecipients = db.openMap('tagging_secret_indexes_for_recipients');
|
|
77
|
+
this.#capsules = db.openMap('capsules');
|
|
77
78
|
this.debug = createDebugOnlyLogger('aztec:kv-pxe-database');
|
|
78
79
|
}
|
|
79
80
|
static async create(db) {
|
|
80
81
|
const pxeDB = new KVPxeDatabase(db);
|
|
81
|
-
for await (const scope of
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
82
|
+
for await (const scope of pxeDB.#scopes.keysAsync()){
|
|
83
|
+
pxeDB.#notesByContractAndScope.set(scope, db.openMultiMap(`${scope}:notes_by_contract`));
|
|
84
|
+
pxeDB.#notesByStorageSlotAndScope.set(scope, db.openMultiMap(`${scope}:notes_by_storage_slot`));
|
|
85
|
+
pxeDB.#notesByTxHashAndScope.set(scope, db.openMultiMap(`${scope}:notes_by_tx_hash`));
|
|
86
|
+
pxeDB.#notesByAddressPointAndScope.set(scope, db.openMultiMap(`${scope}:notes_by_address_point`));
|
|
86
87
|
}
|
|
87
88
|
return pxeDB;
|
|
88
89
|
}
|
|
89
90
|
async getContract(address) {
|
|
90
91
|
const instance = await this.getContractInstance(address);
|
|
91
|
-
const artifact = instance &&
|
|
92
|
+
const artifact = instance && await this.getContractArtifact(instance?.currentContractClassId);
|
|
92
93
|
if (!instance || !artifact) {
|
|
93
94
|
return undefined;
|
|
94
95
|
}
|
|
95
|
-
return {
|
|
96
|
+
return {
|
|
97
|
+
...instance,
|
|
98
|
+
...artifact
|
|
99
|
+
};
|
|
96
100
|
}
|
|
97
101
|
async addContractArtifact(id, contract) {
|
|
98
|
-
const privateFunctions = contract.functions.filter(functionArtifact
|
|
99
|
-
const privateSelectors = await Promise.all(privateFunctions.map(async (privateFunctionArtifact)
|
|
102
|
+
const privateFunctions = contract.functions.filter((functionArtifact)=>functionArtifact.functionType === FunctionType.PRIVATE);
|
|
103
|
+
const privateSelectors = await Promise.all(privateFunctions.map(async (privateFunctionArtifact)=>(await FunctionSelector.fromNameAndParameters(privateFunctionArtifact.name, privateFunctionArtifact.parameters)).toString()));
|
|
100
104
|
if (privateSelectors.length !== new Set(privateSelectors).size) {
|
|
101
105
|
throw new Error('Repeated function selectors of private functions');
|
|
102
106
|
}
|
|
103
|
-
await
|
|
107
|
+
await this.#contractArtifacts.set(id.toString(), contractArtifactToBuffer(contract));
|
|
104
108
|
}
|
|
105
109
|
async getContractArtifact(id) {
|
|
106
|
-
const contract = await
|
|
110
|
+
const contract = await this.#contractArtifacts.getAsync(id.toString());
|
|
107
111
|
// TODO(@spalladino): AztecAsyncMap lies and returns Uint8Arrays instead of Buffers, hence the extra Buffer.from.
|
|
108
112
|
return contract && contractArtifactFromBuffer(Buffer.from(contract));
|
|
109
113
|
}
|
|
110
114
|
async addContractInstance(contract) {
|
|
111
|
-
await
|
|
115
|
+
await this.#contractInstances.set(contract.address.toString(), new SerializableContractInstance(contract).toBuffer());
|
|
112
116
|
}
|
|
113
117
|
async getContractInstance(address) {
|
|
114
|
-
const contract = await
|
|
118
|
+
const contract = await this.#contractInstances.getAsync(address.toString());
|
|
115
119
|
return contract && SerializableContractInstance.fromBuffer(contract).withAddress(address);
|
|
116
120
|
}
|
|
117
121
|
async getContractsAddresses() {
|
|
118
|
-
const keys = await toArray(
|
|
122
|
+
const keys = await toArray(this.#contractInstances.keysAsync());
|
|
119
123
|
return keys.map(AztecAddress.fromString);
|
|
120
124
|
}
|
|
121
125
|
async addAuthWitness(messageHash, witness) {
|
|
122
|
-
await
|
|
126
|
+
await this.#authWitnesses.set(messageHash.toString(), witness.map((w)=>w.toBuffer()));
|
|
123
127
|
}
|
|
124
128
|
async getAuthWitness(messageHash) {
|
|
125
|
-
const witness = await
|
|
126
|
-
return Promise.resolve(witness?.map(w
|
|
129
|
+
const witness = await this.#authWitnesses.getAsync(messageHash.toString());
|
|
130
|
+
return Promise.resolve(witness?.map((w)=>Fr.fromBuffer(w)));
|
|
127
131
|
}
|
|
128
132
|
async addNote(note, scope) {
|
|
129
|
-
await this.addNotes([
|
|
133
|
+
await this.addNotes([
|
|
134
|
+
note
|
|
135
|
+
], scope);
|
|
130
136
|
}
|
|
131
137
|
async addNotes(notes, scope = AztecAddress.ZERO) {
|
|
132
|
-
if (!
|
|
133
|
-
await
|
|
138
|
+
if (!await this.#scopes.hasAsync(scope.toString())) {
|
|
139
|
+
await this.#addScope(scope);
|
|
134
140
|
}
|
|
135
|
-
return this.db.transactionAsync(async ()
|
|
136
|
-
for (const dao of notes)
|
|
141
|
+
return this.db.transactionAsync(async ()=>{
|
|
142
|
+
for (const dao of notes){
|
|
137
143
|
// store notes by their index in the notes hash tree
|
|
138
144
|
// this provides the uniqueness we need to store individual notes
|
|
139
145
|
// and should also return notes in the order that they were created.
|
|
140
146
|
// Had we stored them by their nullifier, they would be returned in random order
|
|
141
147
|
const noteIndex = toBufferBE(dao.index, 32).toString('hex');
|
|
142
|
-
await
|
|
143
|
-
await
|
|
144
|
-
await
|
|
145
|
-
await
|
|
146
|
-
await
|
|
147
|
-
await
|
|
148
|
-
await
|
|
148
|
+
await this.#notes.set(noteIndex, dao.toBuffer());
|
|
149
|
+
await this.#notesToScope.set(noteIndex, scope.toString());
|
|
150
|
+
await this.#nullifierToNoteId.set(dao.siloedNullifier.toString(), noteIndex);
|
|
151
|
+
await this.#notesByContractAndScope.get(scope.toString()).set(dao.contractAddress.toString(), noteIndex);
|
|
152
|
+
await this.#notesByStorageSlotAndScope.get(scope.toString()).set(dao.storageSlot.toString(), noteIndex);
|
|
153
|
+
await this.#notesByTxHashAndScope.get(scope.toString()).set(dao.txHash.toString(), noteIndex);
|
|
154
|
+
await this.#notesByAddressPointAndScope.get(scope.toString()).set(dao.addressPoint.toString(), noteIndex);
|
|
149
155
|
}
|
|
150
156
|
});
|
|
151
157
|
}
|
|
152
158
|
removeNotesAfter(blockNumber) {
|
|
153
|
-
return this.db.transactionAsync(async ()
|
|
154
|
-
const notes = await toArray(
|
|
155
|
-
for (const note of notes)
|
|
159
|
+
return this.db.transactionAsync(async ()=>{
|
|
160
|
+
const notes = await toArray(this.#notes.valuesAsync());
|
|
161
|
+
for (const note of notes){
|
|
156
162
|
const noteDao = NoteDao.fromBuffer(note);
|
|
157
163
|
if (noteDao.l2BlockNumber > blockNumber) {
|
|
158
164
|
const noteIndex = toBufferBE(noteDao.index, 32).toString('hex');
|
|
159
|
-
await
|
|
160
|
-
await
|
|
161
|
-
await
|
|
162
|
-
const scopes = await toArray(
|
|
163
|
-
for (const scope of scopes)
|
|
164
|
-
await
|
|
165
|
-
await
|
|
166
|
-
await
|
|
167
|
-
await
|
|
165
|
+
await this.#notes.delete(noteIndex);
|
|
166
|
+
await this.#notesToScope.delete(noteIndex);
|
|
167
|
+
await this.#nullifierToNoteId.delete(noteDao.siloedNullifier.toString());
|
|
168
|
+
const scopes = await toArray(this.#scopes.keysAsync());
|
|
169
|
+
for (const scope of scopes){
|
|
170
|
+
await this.#notesByAddressPointAndScope.get(scope).deleteValue(noteDao.addressPoint.toString(), noteIndex);
|
|
171
|
+
await this.#notesByTxHashAndScope.get(scope).deleteValue(noteDao.txHash.toString(), noteIndex);
|
|
172
|
+
await this.#notesByContractAndScope.get(scope).deleteValue(noteDao.contractAddress.toString(), noteIndex);
|
|
173
|
+
await this.#notesByStorageSlotAndScope.get(scope).deleteValue(noteDao.storageSlot.toString(), noteIndex);
|
|
168
174
|
}
|
|
169
175
|
}
|
|
170
176
|
}
|
|
@@ -173,40 +179,40 @@ export class KVPxeDatabase {
|
|
|
173
179
|
async unnullifyNotesAfter(blockNumber) {
|
|
174
180
|
const nullifiersToUndo = [];
|
|
175
181
|
const currentBlockNumber = blockNumber + 1;
|
|
176
|
-
const maxBlockNumber =
|
|
177
|
-
for
|
|
178
|
-
nullifiersToUndo.push(...
|
|
182
|
+
const maxBlockNumber = await this.getBlockNumber() ?? currentBlockNumber;
|
|
183
|
+
for(let i = currentBlockNumber; i <= maxBlockNumber; i++){
|
|
184
|
+
nullifiersToUndo.push(...await toArray(this.#nullifiersByBlockNumber.getValuesAsync(i)));
|
|
179
185
|
}
|
|
180
|
-
const notesIndexesToReinsert = await Promise.all(nullifiersToUndo.map(nullifier
|
|
181
|
-
const notNullNoteIndexes = notesIndexesToReinsert.filter(noteIndex
|
|
182
|
-
const nullifiedNoteBuffers = await Promise.all(notNullNoteIndexes.map(noteIndex
|
|
183
|
-
const noteDaos = nullifiedNoteBuffers
|
|
184
|
-
|
|
185
|
-
|
|
186
|
-
await this.db.transactionAsync(async () => {
|
|
187
|
-
for (const dao of noteDaos) {
|
|
186
|
+
const notesIndexesToReinsert = await Promise.all(nullifiersToUndo.map((nullifier)=>this.#nullifiedNotesByNullifier.getAsync(nullifier)));
|
|
187
|
+
const notNullNoteIndexes = notesIndexesToReinsert.filter((noteIndex)=>noteIndex != undefined);
|
|
188
|
+
const nullifiedNoteBuffers = await Promise.all(notNullNoteIndexes.map((noteIndex)=>this.#nullifiedNotes.getAsync(noteIndex)));
|
|
189
|
+
const noteDaos = nullifiedNoteBuffers.filter((buffer)=>buffer != undefined).map((buffer)=>NoteDao.fromBuffer(buffer));
|
|
190
|
+
await this.db.transactionAsync(async ()=>{
|
|
191
|
+
for (const dao of noteDaos){
|
|
188
192
|
const noteIndex = toBufferBE(dao.index, 32).toString('hex');
|
|
189
|
-
await
|
|
190
|
-
await
|
|
191
|
-
let scopes =
|
|
193
|
+
await this.#notes.set(noteIndex, dao.toBuffer());
|
|
194
|
+
await this.#nullifierToNoteId.set(dao.siloedNullifier.toString(), noteIndex);
|
|
195
|
+
let scopes = await toArray(this.#nullifiedNotesToScope.getValuesAsync(noteIndex)) ?? [];
|
|
192
196
|
if (scopes.length === 0) {
|
|
193
|
-
scopes = [
|
|
197
|
+
scopes = [
|
|
198
|
+
new AztecAddress(dao.addressPoint.x).toString()
|
|
199
|
+
];
|
|
194
200
|
}
|
|
195
|
-
for (const scope of scopes)
|
|
196
|
-
await
|
|
197
|
-
await
|
|
198
|
-
await
|
|
199
|
-
await
|
|
200
|
-
await
|
|
201
|
+
for (const scope of scopes){
|
|
202
|
+
await this.#notesByContractAndScope.get(scope.toString()).set(dao.contractAddress.toString(), noteIndex);
|
|
203
|
+
await this.#notesByStorageSlotAndScope.get(scope.toString()).set(dao.storageSlot.toString(), noteIndex);
|
|
204
|
+
await this.#notesByTxHashAndScope.get(scope.toString()).set(dao.txHash.toString(), noteIndex);
|
|
205
|
+
await this.#notesByAddressPointAndScope.get(scope.toString()).set(dao.addressPoint.toString(), noteIndex);
|
|
206
|
+
await this.#notesToScope.set(noteIndex, scope);
|
|
201
207
|
}
|
|
202
|
-
await
|
|
203
|
-
await
|
|
204
|
-
await
|
|
205
|
-
await
|
|
206
|
-
await
|
|
207
|
-
await
|
|
208
|
-
await
|
|
209
|
-
await
|
|
208
|
+
await this.#nullifiedNotes.delete(noteIndex);
|
|
209
|
+
await this.#nullifiedNotesToScope.delete(noteIndex);
|
|
210
|
+
await this.#nullifiersByBlockNumber.deleteValue(dao.l2BlockNumber, dao.siloedNullifier.toString());
|
|
211
|
+
await this.#nullifiedNotesByContract.deleteValue(dao.contractAddress.toString(), noteIndex);
|
|
212
|
+
await this.#nullifiedNotesByStorageSlot.deleteValue(dao.storageSlot.toString(), noteIndex);
|
|
213
|
+
await this.#nullifiedNotesByTxHash.deleteValue(dao.txHash.toString(), noteIndex);
|
|
214
|
+
await this.#nullifiedNotesByAddressPoint.deleteValue(dao.addressPoint.toString(), noteIndex);
|
|
215
|
+
await this.#nullifiedNotesByNullifier.delete(dao.siloedNullifier.toString());
|
|
210
216
|
}
|
|
211
217
|
});
|
|
212
218
|
}
|
|
@@ -214,46 +220,28 @@ export class KVPxeDatabase {
|
|
|
214
220
|
const publicKey = filter.owner ? await filter.owner.toAddressPoint() : undefined;
|
|
215
221
|
filter.status = filter.status ?? NoteStatus.ACTIVE;
|
|
216
222
|
const candidateNoteSources = [];
|
|
217
|
-
filter.scopes
|
|
223
|
+
filter.scopes ??= (await toArray(this.#scopes.keysAsync())).map((addressString)=>AztecAddress.fromString(addressString));
|
|
218
224
|
const activeNoteIdsPerScope = [];
|
|
219
|
-
for (const scope of new Set(filter.scopes))
|
|
225
|
+
for (const scope of new Set(filter.scopes)){
|
|
220
226
|
const formattedScopeString = scope.toString();
|
|
221
|
-
if (!
|
|
227
|
+
if (!await this.#scopes.hasAsync(formattedScopeString)) {
|
|
222
228
|
throw new Error('Trying to get incoming notes of an scope that is not in the PXE database');
|
|
223
229
|
}
|
|
224
|
-
activeNoteIdsPerScope.push(publicKey
|
|
225
|
-
? await toArray(__classPrivateFieldGet(this, _KVPxeDatabase_notesByAddressPointAndScope, "f").get(formattedScopeString).getValuesAsync(publicKey.toString()))
|
|
226
|
-
: filter.txHash
|
|
227
|
-
? await toArray(__classPrivateFieldGet(this, _KVPxeDatabase_notesByTxHashAndScope, "f").get(formattedScopeString).getValuesAsync(filter.txHash.toString()))
|
|
228
|
-
: filter.contractAddress
|
|
229
|
-
? await toArray(__classPrivateFieldGet(this, _KVPxeDatabase_notesByContractAndScope, "f")
|
|
230
|
-
.get(formattedScopeString)
|
|
231
|
-
.getValuesAsync(filter.contractAddress.toString()))
|
|
232
|
-
: filter.storageSlot
|
|
233
|
-
? await toArray(__classPrivateFieldGet(this, _KVPxeDatabase_notesByStorageSlotAndScope, "f").get(formattedScopeString).getValuesAsync(filter.storageSlot.toString()))
|
|
234
|
-
: await toArray(__classPrivateFieldGet(this, _KVPxeDatabase_notesByAddressPointAndScope, "f").get(formattedScopeString).valuesAsync()));
|
|
230
|
+
activeNoteIdsPerScope.push(publicKey ? await toArray(this.#notesByAddressPointAndScope.get(formattedScopeString).getValuesAsync(publicKey.toString())) : filter.txHash ? await toArray(this.#notesByTxHashAndScope.get(formattedScopeString).getValuesAsync(filter.txHash.toString())) : filter.contractAddress ? await toArray(this.#notesByContractAndScope.get(formattedScopeString).getValuesAsync(filter.contractAddress.toString())) : filter.storageSlot ? await toArray(this.#notesByStorageSlotAndScope.get(formattedScopeString).getValuesAsync(filter.storageSlot.toString())) : await toArray(this.#notesByAddressPointAndScope.get(formattedScopeString).valuesAsync()));
|
|
235
231
|
}
|
|
236
232
|
candidateNoteSources.push({
|
|
237
233
|
ids: new Set(activeNoteIdsPerScope.flat()),
|
|
238
|
-
notes:
|
|
234
|
+
notes: this.#notes
|
|
239
235
|
});
|
|
240
236
|
if (filter.status == NoteStatus.ACTIVE_OR_NULLIFIED) {
|
|
241
237
|
candidateNoteSources.push({
|
|
242
|
-
ids: publicKey
|
|
243
|
-
|
|
244
|
-
: filter.txHash
|
|
245
|
-
? await toArray(__classPrivateFieldGet(this, _KVPxeDatabase_nullifiedNotesByTxHash, "f").getValuesAsync(filter.txHash.toString()))
|
|
246
|
-
: filter.contractAddress
|
|
247
|
-
? await toArray(__classPrivateFieldGet(this, _KVPxeDatabase_nullifiedNotesByContract, "f").getValuesAsync(filter.contractAddress.toString()))
|
|
248
|
-
: filter.storageSlot
|
|
249
|
-
? await toArray(__classPrivateFieldGet(this, _KVPxeDatabase_nullifiedNotesByStorageSlot, "f").getValuesAsync(filter.storageSlot.toString()))
|
|
250
|
-
: await toArray(__classPrivateFieldGet(this, _KVPxeDatabase_nullifiedNotes, "f").keysAsync()),
|
|
251
|
-
notes: __classPrivateFieldGet(this, _KVPxeDatabase_nullifiedNotes, "f"),
|
|
238
|
+
ids: publicKey ? await toArray(this.#nullifiedNotesByAddressPoint.getValuesAsync(publicKey.toString())) : filter.txHash ? await toArray(this.#nullifiedNotesByTxHash.getValuesAsync(filter.txHash.toString())) : filter.contractAddress ? await toArray(this.#nullifiedNotesByContract.getValuesAsync(filter.contractAddress.toString())) : filter.storageSlot ? await toArray(this.#nullifiedNotesByStorageSlot.getValuesAsync(filter.storageSlot.toString())) : await toArray(this.#nullifiedNotes.keysAsync()),
|
|
239
|
+
notes: this.#nullifiedNotes
|
|
252
240
|
});
|
|
253
241
|
}
|
|
254
242
|
const result = [];
|
|
255
|
-
for (const { ids, notes } of candidateNoteSources)
|
|
256
|
-
for (const id of ids)
|
|
243
|
+
for (const { ids, notes } of candidateNoteSources){
|
|
244
|
+
for (const id of ids){
|
|
257
245
|
const serializedNote = await notes.getAsync(id);
|
|
258
246
|
if (!serializedNote) {
|
|
259
247
|
continue;
|
|
@@ -283,91 +271,100 @@ export class KVPxeDatabase {
|
|
|
283
271
|
if (nullifiers.length === 0) {
|
|
284
272
|
return Promise.resolve([]);
|
|
285
273
|
}
|
|
286
|
-
return this.db.transactionAsync(async ()
|
|
274
|
+
return this.db.transactionAsync(async ()=>{
|
|
287
275
|
const nullifiedNotes = [];
|
|
288
|
-
for (const blockScopedNullifier of nullifiers)
|
|
276
|
+
for (const blockScopedNullifier of nullifiers){
|
|
289
277
|
const { data: nullifier, l2BlockNumber: blockNumber } = blockScopedNullifier;
|
|
290
|
-
const noteIndex = await
|
|
278
|
+
const noteIndex = await this.#nullifierToNoteId.getAsync(nullifier.toString());
|
|
291
279
|
if (!noteIndex) {
|
|
292
280
|
continue;
|
|
293
281
|
}
|
|
294
|
-
const noteBuffer = noteIndex ? await
|
|
282
|
+
const noteBuffer = noteIndex ? await this.#notes.getAsync(noteIndex) : undefined;
|
|
295
283
|
if (!noteBuffer) {
|
|
296
|
-
// note doesn't exist. Maybe it got nullified already
|
|
297
284
|
continue;
|
|
298
285
|
}
|
|
299
|
-
const noteScopes =
|
|
286
|
+
const noteScopes = await toArray(this.#notesToScope.getValuesAsync(noteIndex)) ?? [];
|
|
300
287
|
const note = NoteDao.fromBuffer(noteBuffer);
|
|
301
288
|
if (!note.addressPoint.equals(accountAddressPoint)) {
|
|
302
|
-
// tried to nullify someone else's note
|
|
303
289
|
continue;
|
|
304
290
|
}
|
|
305
291
|
nullifiedNotes.push(note);
|
|
306
|
-
await
|
|
307
|
-
await
|
|
308
|
-
const scopes = await toArray(
|
|
309
|
-
for (const scope of scopes)
|
|
310
|
-
await
|
|
311
|
-
await
|
|
312
|
-
await
|
|
313
|
-
await
|
|
292
|
+
await this.#notes.delete(noteIndex);
|
|
293
|
+
await this.#notesToScope.delete(noteIndex);
|
|
294
|
+
const scopes = await toArray(this.#scopes.keysAsync());
|
|
295
|
+
for (const scope of scopes){
|
|
296
|
+
await this.#notesByAddressPointAndScope.get(scope).deleteValue(accountAddressPoint.toString(), noteIndex);
|
|
297
|
+
await this.#notesByTxHashAndScope.get(scope).deleteValue(note.txHash.toString(), noteIndex);
|
|
298
|
+
await this.#notesByContractAndScope.get(scope).deleteValue(note.contractAddress.toString(), noteIndex);
|
|
299
|
+
await this.#notesByStorageSlotAndScope.get(scope).deleteValue(note.storageSlot.toString(), noteIndex);
|
|
314
300
|
}
|
|
315
301
|
if (noteScopes !== undefined) {
|
|
316
|
-
for (const scope of noteScopes)
|
|
317
|
-
await
|
|
302
|
+
for (const scope of noteScopes){
|
|
303
|
+
await this.#nullifiedNotesToScope.set(noteIndex, scope);
|
|
318
304
|
}
|
|
319
305
|
}
|
|
320
|
-
await
|
|
321
|
-
await
|
|
322
|
-
await
|
|
323
|
-
await
|
|
324
|
-
await
|
|
325
|
-
await
|
|
326
|
-
await
|
|
327
|
-
await
|
|
306
|
+
await this.#nullifiedNotes.set(noteIndex, note.toBuffer());
|
|
307
|
+
await this.#nullifiersByBlockNumber.set(blockNumber, nullifier.toString());
|
|
308
|
+
await this.#nullifiedNotesByContract.set(note.contractAddress.toString(), noteIndex);
|
|
309
|
+
await this.#nullifiedNotesByStorageSlot.set(note.storageSlot.toString(), noteIndex);
|
|
310
|
+
await this.#nullifiedNotesByTxHash.set(note.txHash.toString(), noteIndex);
|
|
311
|
+
await this.#nullifiedNotesByAddressPoint.set(note.addressPoint.toString(), noteIndex);
|
|
312
|
+
await this.#nullifiedNotesByNullifier.set(nullifier.toString(), noteIndex);
|
|
313
|
+
await this.#nullifierToNoteId.delete(nullifier.toString());
|
|
328
314
|
}
|
|
329
315
|
return nullifiedNotes;
|
|
330
316
|
});
|
|
331
317
|
}
|
|
332
318
|
async addNullifiedNote(note) {
|
|
333
319
|
const noteIndex = toBufferBE(note.index, 32).toString('hex');
|
|
334
|
-
await
|
|
335
|
-
await
|
|
336
|
-
await
|
|
337
|
-
await
|
|
338
|
-
await
|
|
320
|
+
await this.#nullifiedNotes.set(noteIndex, note.toBuffer());
|
|
321
|
+
await this.#nullifiedNotesByContract.set(note.contractAddress.toString(), noteIndex);
|
|
322
|
+
await this.#nullifiedNotesByStorageSlot.set(note.storageSlot.toString(), noteIndex);
|
|
323
|
+
await this.#nullifiedNotesByTxHash.set(note.txHash.toString(), noteIndex);
|
|
324
|
+
await this.#nullifiedNotesByAddressPoint.set(note.addressPoint.toString(), noteIndex);
|
|
339
325
|
}
|
|
340
326
|
async setHeader(header) {
|
|
341
|
-
await
|
|
327
|
+
await this.#synchronizedBlock.set(header.toBuffer());
|
|
342
328
|
}
|
|
343
329
|
async getBlockNumber() {
|
|
344
|
-
const headerBuffer = await
|
|
330
|
+
const headerBuffer = await this.#synchronizedBlock.getAsync();
|
|
345
331
|
if (!headerBuffer) {
|
|
346
332
|
return undefined;
|
|
347
333
|
}
|
|
348
334
|
return Number(BlockHeader.fromBuffer(headerBuffer).globalVariables.blockNumber.toBigInt());
|
|
349
335
|
}
|
|
350
336
|
async getBlockHeader() {
|
|
351
|
-
const headerBuffer = await
|
|
337
|
+
const headerBuffer = await this.#synchronizedBlock.getAsync();
|
|
352
338
|
if (!headerBuffer) {
|
|
353
339
|
throw new Error(`Header not set`);
|
|
354
340
|
}
|
|
355
341
|
return BlockHeader.fromBuffer(headerBuffer);
|
|
356
342
|
}
|
|
343
|
+
async #addScope(scope) {
|
|
344
|
+
const scopeString = scope.toString();
|
|
345
|
+
if (await this.#scopes.hasAsync(scopeString)) {
|
|
346
|
+
return false;
|
|
347
|
+
}
|
|
348
|
+
await this.#scopes.set(scopeString, true);
|
|
349
|
+
this.#notesByContractAndScope.set(scopeString, this.#db.openMultiMap(`${scopeString}:notes_by_contract`));
|
|
350
|
+
this.#notesByStorageSlotAndScope.set(scopeString, this.#db.openMultiMap(`${scopeString}:notes_by_storage_slot`));
|
|
351
|
+
this.#notesByTxHashAndScope.set(scopeString, this.#db.openMultiMap(`${scopeString}:notes_by_tx_hash`));
|
|
352
|
+
this.#notesByAddressPointAndScope.set(scopeString, this.#db.openMultiMap(`${scopeString}:notes_by_address_point`));
|
|
353
|
+
return true;
|
|
354
|
+
}
|
|
357
355
|
addCompleteAddress(completeAddress) {
|
|
358
|
-
return this.db.transactionAsync(async ()
|
|
359
|
-
await
|
|
356
|
+
return this.db.transactionAsync(async ()=>{
|
|
357
|
+
await this.#addScope(completeAddress.address);
|
|
360
358
|
const addressString = completeAddress.address.toString();
|
|
361
359
|
const buffer = completeAddress.toBuffer();
|
|
362
|
-
const existing = await
|
|
360
|
+
const existing = await this.#completeAddressIndex.getAsync(addressString);
|
|
363
361
|
if (existing === undefined) {
|
|
364
|
-
const index = await
|
|
365
|
-
await
|
|
366
|
-
await
|
|
362
|
+
const index = await this.#completeAddresses.lengthAsync();
|
|
363
|
+
await this.#completeAddresses.push(buffer);
|
|
364
|
+
await this.#completeAddressIndex.set(addressString, index);
|
|
367
365
|
return true;
|
|
368
|
-
}
|
|
369
|
-
|
|
370
|
-
const existingBuffer = await __classPrivateFieldGet(this, _KVPxeDatabase_completeAddresses, "f").atAsync(existing);
|
|
366
|
+
} else {
|
|
367
|
+
const existingBuffer = await this.#completeAddresses.atAsync(existing);
|
|
371
368
|
if (existingBuffer && Buffer.from(existingBuffer).equals(buffer)) {
|
|
372
369
|
return false;
|
|
373
370
|
}
|
|
@@ -375,73 +372,87 @@ export class KVPxeDatabase {
|
|
|
375
372
|
}
|
|
376
373
|
});
|
|
377
374
|
}
|
|
375
|
+
async #getCompleteAddress(address) {
|
|
376
|
+
const index = await this.#completeAddressIndex.getAsync(address.toString());
|
|
377
|
+
if (index === undefined) {
|
|
378
|
+
return undefined;
|
|
379
|
+
}
|
|
380
|
+
const value = await this.#completeAddresses.atAsync(index);
|
|
381
|
+
return value ? await CompleteAddress.fromBuffer(value) : undefined;
|
|
382
|
+
}
|
|
378
383
|
getCompleteAddress(account) {
|
|
379
|
-
return
|
|
384
|
+
return this.#getCompleteAddress(account);
|
|
380
385
|
}
|
|
381
386
|
async getCompleteAddresses() {
|
|
382
|
-
return await Promise.all((await toArray(
|
|
387
|
+
return await Promise.all((await toArray(this.#completeAddresses.valuesAsync())).map((v)=>CompleteAddress.fromBuffer(v)));
|
|
383
388
|
}
|
|
384
389
|
async addSenderAddress(address) {
|
|
385
|
-
if (await
|
|
390
|
+
if (await this.#addressBook.hasAsync(address.toString())) {
|
|
386
391
|
return false;
|
|
387
392
|
}
|
|
388
|
-
await
|
|
393
|
+
await this.#addressBook.set(address.toString(), true);
|
|
389
394
|
return true;
|
|
390
395
|
}
|
|
391
396
|
async getSenderAddresses() {
|
|
392
|
-
return (await toArray(
|
|
397
|
+
return (await toArray(this.#addressBook.keysAsync())).map(AztecAddress.fromString);
|
|
393
398
|
}
|
|
394
399
|
async removeSenderAddress(address) {
|
|
395
|
-
if (!
|
|
400
|
+
if (!await this.#addressBook.hasAsync(address.toString())) {
|
|
396
401
|
return false;
|
|
397
402
|
}
|
|
398
|
-
await
|
|
403
|
+
await this.#addressBook.delete(address.toString());
|
|
399
404
|
return true;
|
|
400
405
|
}
|
|
401
406
|
async estimateSize() {
|
|
402
|
-
const noteSize = (await this.getNotes({})).reduce((sum, note)
|
|
403
|
-
const authWitsSize = (await toArray(
|
|
404
|
-
const addressesSize =
|
|
407
|
+
const noteSize = (await this.getNotes({})).reduce((sum, note)=>sum + note.getSize(), 0);
|
|
408
|
+
const authWitsSize = (await toArray(this.#authWitnesses.valuesAsync())).reduce((sum, value)=>sum + value.length * Fr.SIZE_IN_BYTES, 0);
|
|
409
|
+
const addressesSize = await this.#completeAddresses.lengthAsync() * CompleteAddress.SIZE_IN_BYTES;
|
|
405
410
|
const treeRootsSize = Object.keys(MerkleTreeId).length * Fr.SIZE_IN_BYTES;
|
|
406
411
|
return noteSize + treeRootsSize + authWitsSize + addressesSize;
|
|
407
412
|
}
|
|
408
413
|
async setTaggingSecretsIndexesAsSender(indexedSecrets) {
|
|
409
|
-
await
|
|
414
|
+
await this.#setTaggingSecretsIndexes(indexedSecrets, this.#taggingSecretIndexesForSenders);
|
|
410
415
|
}
|
|
411
416
|
async setTaggingSecretsIndexesAsRecipient(indexedSecrets) {
|
|
412
|
-
await
|
|
417
|
+
await this.#setTaggingSecretsIndexes(indexedSecrets, this.#taggingSecretIndexesForRecipients);
|
|
418
|
+
}
|
|
419
|
+
async #setTaggingSecretsIndexes(indexedSecrets, storageMap) {
|
|
420
|
+
await Promise.all(indexedSecrets.map((indexedSecret)=>storageMap.set(indexedSecret.appTaggingSecret.toString(), indexedSecret.index)));
|
|
413
421
|
}
|
|
414
422
|
async getTaggingSecretsIndexesAsRecipient(appTaggingSecrets) {
|
|
415
|
-
return await
|
|
423
|
+
return await this.#getTaggingSecretsIndexes(appTaggingSecrets, this.#taggingSecretIndexesForRecipients);
|
|
416
424
|
}
|
|
417
425
|
async getTaggingSecretsIndexesAsSender(appTaggingSecrets) {
|
|
418
|
-
return await
|
|
426
|
+
return await this.#getTaggingSecretsIndexes(appTaggingSecrets, this.#taggingSecretIndexesForSenders);
|
|
427
|
+
}
|
|
428
|
+
#getTaggingSecretsIndexes(appTaggingSecrets, storageMap) {
|
|
429
|
+
return Promise.all(appTaggingSecrets.map(async (secret)=>await storageMap.getAsync(`${secret.toString()}`) ?? 0));
|
|
419
430
|
}
|
|
420
431
|
resetNoteSyncData() {
|
|
421
|
-
return this.db.transactionAsync(async ()
|
|
422
|
-
const recipients = await toArray(
|
|
423
|
-
await Promise.all(recipients.map(recipient
|
|
424
|
-
const senders = await toArray(
|
|
425
|
-
await Promise.all(senders.map(sender
|
|
432
|
+
return this.db.transactionAsync(async ()=>{
|
|
433
|
+
const recipients = await toArray(this.#taggingSecretIndexesForRecipients.keysAsync());
|
|
434
|
+
await Promise.all(recipients.map((recipient)=>this.#taggingSecretIndexesForRecipients.delete(recipient)));
|
|
435
|
+
const senders = await toArray(this.#taggingSecretIndexesForSenders.keysAsync());
|
|
436
|
+
await Promise.all(senders.map((sender)=>this.#taggingSecretIndexesForSenders.delete(sender)));
|
|
426
437
|
});
|
|
427
438
|
}
|
|
428
439
|
async storeCapsule(contractAddress, slot, capsule) {
|
|
429
|
-
await
|
|
440
|
+
await this.#capsules.set(dbSlotToKey(contractAddress, slot), Buffer.concat(capsule.map((value)=>value.toBuffer())));
|
|
430
441
|
}
|
|
431
442
|
async loadCapsule(contractAddress, slot) {
|
|
432
|
-
const dataBuffer = await
|
|
443
|
+
const dataBuffer = await this.#capsules.getAsync(dbSlotToKey(contractAddress, slot));
|
|
433
444
|
if (!dataBuffer) {
|
|
434
445
|
this.debug(`Data not found for contract ${contractAddress.toString()} and slot ${slot.toString()}`);
|
|
435
446
|
return null;
|
|
436
447
|
}
|
|
437
448
|
const capsule = [];
|
|
438
|
-
for
|
|
449
|
+
for(let i = 0; i < dataBuffer.length; i += Fr.SIZE_IN_BYTES){
|
|
439
450
|
capsule.push(Fr.fromBuffer(dataBuffer.subarray(i, i + Fr.SIZE_IN_BYTES)));
|
|
440
451
|
}
|
|
441
452
|
return capsule;
|
|
442
453
|
}
|
|
443
454
|
async deleteCapsule(contractAddress, slot) {
|
|
444
|
-
await
|
|
455
|
+
await this.#capsules.delete(dbSlotToKey(contractAddress, slot));
|
|
445
456
|
}
|
|
446
457
|
async copyCapsule(contractAddress, srcSlot, dstSlot, numEntries) {
|
|
447
458
|
// In order to support overlapping source and destination regions, we need to check the relative positions of source
|
|
@@ -452,41 +463,17 @@ export class KVPxeDatabase {
|
|
|
452
463
|
if (srcSlot.lt(dstSlot)) {
|
|
453
464
|
indexes.reverse();
|
|
454
465
|
}
|
|
455
|
-
for (const i of indexes)
|
|
466
|
+
for (const i of indexes){
|
|
456
467
|
const currentSrcSlot = dbSlotToKey(contractAddress, srcSlot.add(new Fr(i)));
|
|
457
468
|
const currentDstSlot = dbSlotToKey(contractAddress, dstSlot.add(new Fr(i)));
|
|
458
|
-
const toCopy = await
|
|
469
|
+
const toCopy = await this.#capsules.getAsync(currentSrcSlot);
|
|
459
470
|
if (!toCopy) {
|
|
460
471
|
throw new Error(`Attempted to copy empty slot ${currentSrcSlot} for contract ${contractAddress.toString()}`);
|
|
461
472
|
}
|
|
462
|
-
await
|
|
473
|
+
await this.#capsules.set(currentDstSlot, toCopy);
|
|
463
474
|
}
|
|
464
475
|
}
|
|
465
476
|
}
|
|
466
|
-
_KVPxeDatabase_synchronizedBlock = new WeakMap(), _KVPxeDatabase_completeAddresses = new WeakMap(), _KVPxeDatabase_completeAddressIndex = new WeakMap(), _KVPxeDatabase_addressBook = new WeakMap(), _KVPxeDatabase_authWitnesses = new WeakMap(), _KVPxeDatabase_notes = new WeakMap(), _KVPxeDatabase_nullifiedNotes = new WeakMap(), _KVPxeDatabase_nullifierToNoteId = new WeakMap(), _KVPxeDatabase_nullifiersByBlockNumber = new WeakMap(), _KVPxeDatabase_nullifiedNotesToScope = new WeakMap(), _KVPxeDatabase_nullifiedNotesByContract = new WeakMap(), _KVPxeDatabase_nullifiedNotesByStorageSlot = new WeakMap(), _KVPxeDatabase_nullifiedNotesByTxHash = new WeakMap(), _KVPxeDatabase_nullifiedNotesByAddressPoint = new WeakMap(), _KVPxeDatabase_nullifiedNotesByNullifier = new WeakMap(), _KVPxeDatabase_contractArtifacts = new WeakMap(), _KVPxeDatabase_contractInstances = new WeakMap(), _KVPxeDatabase_db = new WeakMap(), _KVPxeDatabase_scopes = new WeakMap(), _KVPxeDatabase_notesToScope = new WeakMap(), _KVPxeDatabase_notesByContractAndScope = new WeakMap(), _KVPxeDatabase_notesByStorageSlotAndScope = new WeakMap(), _KVPxeDatabase_notesByTxHashAndScope = new WeakMap(), _KVPxeDatabase_notesByAddressPointAndScope = new WeakMap(), _KVPxeDatabase_taggingSecretIndexesForSenders = new WeakMap(), _KVPxeDatabase_taggingSecretIndexesForRecipients = new WeakMap(), _KVPxeDatabase_capsules = new WeakMap(), _KVPxeDatabase_instances = new WeakSet(), _KVPxeDatabase_addScope = async function _KVPxeDatabase_addScope(scope) {
|
|
467
|
-
const scopeString = scope.toString();
|
|
468
|
-
if (await __classPrivateFieldGet(this, _KVPxeDatabase_scopes, "f").hasAsync(scopeString)) {
|
|
469
|
-
return false;
|
|
470
|
-
}
|
|
471
|
-
await __classPrivateFieldGet(this, _KVPxeDatabase_scopes, "f").add(scopeString);
|
|
472
|
-
__classPrivateFieldGet(this, _KVPxeDatabase_notesByContractAndScope, "f").set(scopeString, __classPrivateFieldGet(this, _KVPxeDatabase_db, "f").openMultiMap(`${scopeString}:notes_by_contract`));
|
|
473
|
-
__classPrivateFieldGet(this, _KVPxeDatabase_notesByStorageSlotAndScope, "f").set(scopeString, __classPrivateFieldGet(this, _KVPxeDatabase_db, "f").openMultiMap(`${scopeString}:notes_by_storage_slot`));
|
|
474
|
-
__classPrivateFieldGet(this, _KVPxeDatabase_notesByTxHashAndScope, "f").set(scopeString, __classPrivateFieldGet(this, _KVPxeDatabase_db, "f").openMultiMap(`${scopeString}:notes_by_tx_hash`));
|
|
475
|
-
__classPrivateFieldGet(this, _KVPxeDatabase_notesByAddressPointAndScope, "f").set(scopeString, __classPrivateFieldGet(this, _KVPxeDatabase_db, "f").openMultiMap(`${scopeString}:notes_by_address_point`));
|
|
476
|
-
return true;
|
|
477
|
-
}, _KVPxeDatabase_getCompleteAddress = async function _KVPxeDatabase_getCompleteAddress(address) {
|
|
478
|
-
const index = await __classPrivateFieldGet(this, _KVPxeDatabase_completeAddressIndex, "f").getAsync(address.toString());
|
|
479
|
-
if (index === undefined) {
|
|
480
|
-
return undefined;
|
|
481
|
-
}
|
|
482
|
-
const value = await __classPrivateFieldGet(this, _KVPxeDatabase_completeAddresses, "f").atAsync(index);
|
|
483
|
-
return value ? await CompleteAddress.fromBuffer(value) : undefined;
|
|
484
|
-
}, _KVPxeDatabase_setTaggingSecretsIndexes = async function _KVPxeDatabase_setTaggingSecretsIndexes(indexedSecrets, storageMap) {
|
|
485
|
-
await Promise.all(indexedSecrets.map(indexedSecret => storageMap.set(indexedSecret.appTaggingSecret.toString(), indexedSecret.index)));
|
|
486
|
-
}, _KVPxeDatabase_getTaggingSecretsIndexes = function _KVPxeDatabase_getTaggingSecretsIndexes(appTaggingSecrets, storageMap) {
|
|
487
|
-
return Promise.all(appTaggingSecrets.map(async (secret) => (await storageMap.getAsync(`${secret.toString()}`)) ?? 0));
|
|
488
|
-
};
|
|
489
477
|
function dbSlotToKey(contractAddress, slot) {
|
|
490
478
|
return `${contractAddress.toString()}:${slot.toString()}`;
|
|
491
479
|
}
|
|
492
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"kv_pxe_database.js","sourceRoot":"","sources":["../../src/database/kv_pxe_database.ts"],"names":[],"mappings":"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"}
|