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