@aztec/pxe 0.62.0 → 0.63.1
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/config/index.d.ts +2 -3
- package/dest/config/index.d.ts.map +1 -1
- package/dest/config/index.js +4 -5
- package/dest/contract_data_oracle/index.d.ts +1 -0
- package/dest/contract_data_oracle/index.d.ts.map +1 -1
- package/dest/contract_data_oracle/index.js +5 -1
- package/dest/database/incoming_note_dao.d.ts +1 -1
- package/dest/database/incoming_note_dao.d.ts.map +1 -1
- package/dest/database/kv_pxe_database.d.ts +5 -12
- package/dest/database/kv_pxe_database.d.ts.map +1 -1
- package/dest/database/kv_pxe_database.js +31 -62
- package/dest/database/outgoing_note_dao.d.ts +1 -1
- package/dest/database/outgoing_note_dao.d.ts.map +1 -1
- package/dest/database/pxe_database.d.ts +17 -25
- package/dest/database/pxe_database.d.ts.map +1 -1
- package/dest/kernel_oracle/index.d.ts +3 -3
- package/dest/kernel_oracle/index.d.ts.map +1 -1
- 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 +12 -4
- package/dest/kernel_prover/kernel_prover.d.ts +3 -1
- package/dest/kernel_prover/kernel_prover.d.ts.map +1 -1
- package/dest/kernel_prover/kernel_prover.js +39 -7
- package/dest/kernel_prover/test/test_circuit_prover.d.ts +1 -0
- package/dest/kernel_prover/test/test_circuit_prover.d.ts.map +1 -1
- package/dest/kernel_prover/test/test_circuit_prover.js +5 -1
- package/dest/{note_processor/utils → note_decryption_utils}/add_public_values_to_payload.d.ts +1 -1
- package/dest/note_decryption_utils/add_public_values_to_payload.d.ts.map +1 -0
- package/dest/{note_processor/utils → note_decryption_utils}/add_public_values_to_payload.js +1 -1
- package/dest/note_decryption_utils/brute_force_note_info.d.ts.map +1 -0
- package/dest/{note_processor/utils → note_decryption_utils}/brute_force_note_info.js +1 -1
- package/dest/note_decryption_utils/index.d.ts.map +1 -0
- package/dest/{note_processor/utils → note_decryption_utils}/index.js +1 -1
- package/dest/{note_processor/utils → note_decryption_utils}/produce_note_daos.d.ts +5 -8
- package/dest/note_decryption_utils/produce_note_daos.d.ts.map +1 -0
- package/dest/note_decryption_utils/produce_note_daos.js +47 -0
- package/dest/note_decryption_utils/produce_note_daos_for_key.d.ts +8 -0
- package/dest/note_decryption_utils/produce_note_daos_for_key.d.ts.map +1 -0
- package/dest/note_decryption_utils/produce_note_daos_for_key.js +17 -0
- package/dest/pxe_http/pxe_http_server.d.ts +1 -2
- package/dest/pxe_http/pxe_http_server.d.ts.map +1 -1
- package/dest/pxe_http/pxe_http_server.js +5 -51
- package/dest/pxe_service/create_pxe_service.d.ts.map +1 -1
- package/dest/pxe_service/create_pxe_service.js +7 -4
- package/dest/pxe_service/error_enriching.d.ts.map +1 -1
- package/dest/pxe_service/error_enriching.js +7 -6
- package/dest/pxe_service/pxe_service.d.ts +11 -25
- package/dest/pxe_service/pxe_service.d.ts.map +1 -1
- package/dest/pxe_service/pxe_service.js +45 -48
- package/dest/pxe_service/test/pxe_test_suite.d.ts.map +1 -1
- package/dest/pxe_service/test/pxe_test_suite.js +4 -3
- package/dest/simulator_oracle/index.d.ts +15 -16
- package/dest/simulator_oracle/index.d.ts.map +1 -1
- package/dest/simulator_oracle/index.js +195 -65
- package/dest/synchronizer/synchronizer.d.ts +0 -48
- package/dest/synchronizer/synchronizer.d.ts.map +1 -1
- package/dest/synchronizer/synchronizer.js +3 -201
- package/package.json +14 -14
- package/src/config/index.ts +4 -7
- package/src/contract_data_oracle/index.ts +5 -0
- package/src/database/incoming_note_dao.ts +1 -1
- package/src/database/kv_pxe_database.ts +33 -70
- package/src/database/outgoing_note_dao.ts +1 -1
- package/src/database/pxe_database.ts +19 -28
- package/src/kernel_prover/hints/build_private_kernel_reset_private_inputs.ts +13 -3
- package/src/kernel_prover/kernel_prover.ts +49 -5
- package/src/kernel_prover/test/test_circuit_prover.ts +8 -4
- package/src/{note_processor/utils → note_decryption_utils}/add_public_values_to_payload.ts +1 -1
- package/src/{note_processor/utils → note_decryption_utils}/produce_note_daos.ts +6 -16
- package/src/{note_processor/utils → note_decryption_utils}/produce_note_daos_for_key.ts +6 -15
- package/src/pxe_http/pxe_http_server.ts +5 -84
- package/src/pxe_service/create_pxe_service.ts +9 -3
- package/src/pxe_service/error_enriching.ts +12 -5
- package/src/pxe_service/pxe_service.ts +61 -78
- package/src/pxe_service/test/pxe_test_suite.ts +6 -2
- package/src/simulator_oracle/index.ts +280 -60
- package/src/synchronizer/synchronizer.ts +3 -253
- package/dest/database/deferred_note_dao.d.ts +0 -40
- package/dest/database/deferred_note_dao.d.ts.map +0 -1
- package/dest/database/deferred_note_dao.js +0 -38
- package/dest/note_processor/index.d.ts +0 -2
- package/dest/note_processor/index.d.ts.map +0 -1
- package/dest/note_processor/index.js +0 -2
- package/dest/note_processor/note_processor.d.ts +0 -83
- package/dest/note_processor/note_processor.d.ts.map +0 -1
- package/dest/note_processor/note_processor.js +0 -231
- package/dest/note_processor/utils/add_public_values_to_payload.d.ts.map +0 -1
- package/dest/note_processor/utils/brute_force_note_info.d.ts.map +0 -1
- package/dest/note_processor/utils/index.d.ts.map +0 -1
- package/dest/note_processor/utils/produce_note_daos.d.ts.map +0 -1
- package/dest/note_processor/utils/produce_note_daos.js +0 -51
- package/dest/note_processor/utils/produce_note_daos_for_key.d.ts +0 -9
- package/dest/note_processor/utils/produce_note_daos_for_key.d.ts.map +0 -1
- package/dest/note_processor/utils/produce_note_daos_for_key.js +0 -26
- package/src/database/deferred_note_dao.ts +0 -47
- package/src/note_processor/index.ts +0 -1
- package/src/note_processor/note_processor.ts +0 -358
- /package/dest/{note_processor/utils → note_decryption_utils}/brute_force_note_info.d.ts +0 -0
- /package/dest/{note_processor/utils → note_decryption_utils}/index.d.ts +0 -0
- /package/src/{note_processor/utils → note_decryption_utils}/brute_force_note_info.ts +0 -0
- /package/src/{note_processor/utils → note_decryption_utils}/index.ts +0 -0
|
@@ -1,11 +1,13 @@
|
|
|
1
|
-
var _SimulatorOracle_instances,
|
|
1
|
+
var _SimulatorOracle_instances, _SimulatorOracle_calculateTaggingSecret, _SimulatorOracle_getAppTaggingSecretsForContacts, _SimulatorOracle_decryptTaggedLogs;
|
|
2
2
|
import { __classPrivateFieldGet } from "tslib";
|
|
3
|
-
import { MerkleTreeId, getNonNullifiedL1ToL2MessageWitness, } from '@aztec/circuit-types';
|
|
4
|
-
import { IndexedTaggingSecret,
|
|
3
|
+
import { L1NotePayload, MerkleTreeId, getNonNullifiedL1ToL2MessageWitness, } from '@aztec/circuit-types';
|
|
4
|
+
import { Fr, IndexedTaggingSecret, computeAddressSecret, computePoint, computeTaggingSecret, } from '@aztec/circuits.js';
|
|
5
5
|
import { getFunctionArtifact } from '@aztec/foundation/abi';
|
|
6
6
|
import { poseidon2Hash } from '@aztec/foundation/crypto';
|
|
7
7
|
import { createDebugLogger } from '@aztec/foundation/log';
|
|
8
8
|
import { MessageLoadOracleInputs } from '@aztec/simulator';
|
|
9
|
+
import { produceNoteDaos } from '../note_decryption_utils/produce_note_daos.js';
|
|
10
|
+
import { getAcirSimulator } from '../simulator/index.js';
|
|
9
11
|
/**
|
|
10
12
|
* A data oracle that provides information needed for simulating a transaction.
|
|
11
13
|
*/
|
|
@@ -104,17 +106,18 @@ export class SimulatorOracle {
|
|
|
104
106
|
* @returns - The index of the commitment. Undefined if it does not exist in the tree.
|
|
105
107
|
*/
|
|
106
108
|
async getCommitmentIndex(commitment) {
|
|
107
|
-
return await this.
|
|
109
|
+
return await this.findLeafIndex('latest', MerkleTreeId.NOTE_HASH_TREE, commitment);
|
|
108
110
|
}
|
|
109
111
|
// We need this in public as part of the EXISTS calls - but isn't used in private
|
|
110
112
|
getCommitmentValue(_leafIndex) {
|
|
111
113
|
throw new Error('Unimplemented in private!');
|
|
112
114
|
}
|
|
113
115
|
async getNullifierIndex(nullifier) {
|
|
114
|
-
return await this.
|
|
116
|
+
return await this.findLeafIndex('latest', MerkleTreeId.NULLIFIER_TREE, nullifier);
|
|
115
117
|
}
|
|
116
118
|
async findLeafIndex(blockNumber, treeId, leafValue) {
|
|
117
|
-
|
|
119
|
+
const [leafIndex] = await this.aztecNode.findLeavesIndexes(blockNumber, treeId, [leafValue]);
|
|
120
|
+
return leafIndex;
|
|
118
121
|
}
|
|
119
122
|
async getSiblingPath(blockNumber, treeId, leafIndex) {
|
|
120
123
|
switch (treeId) {
|
|
@@ -175,16 +178,16 @@ export class SimulatorOracle {
|
|
|
175
178
|
}
|
|
176
179
|
/**
|
|
177
180
|
* Returns the tagging secret for a given sender and recipient pair. For this to work, the ivpsk_m of the sender must be known.
|
|
178
|
-
* Includes the
|
|
181
|
+
* Includes the next index to be used used for tagging with this secret.
|
|
179
182
|
* @param contractAddress - The contract address to silo the secret for
|
|
180
183
|
* @param sender - The address sending the note
|
|
181
184
|
* @param recipient - The address receiving the note
|
|
182
185
|
* @returns A siloed tagging secret that can be used to tag notes.
|
|
183
186
|
*/
|
|
184
|
-
async
|
|
185
|
-
const
|
|
186
|
-
const [index] = await this.db.
|
|
187
|
-
return IndexedTaggingSecret
|
|
187
|
+
async getAppTaggingSecretAsSender(contractAddress, sender, recipient) {
|
|
188
|
+
const secret = await __classPrivateFieldGet(this, _SimulatorOracle_instances, "m", _SimulatorOracle_calculateTaggingSecret).call(this, contractAddress, sender, recipient);
|
|
189
|
+
const [index] = await this.db.getTaggingSecretsIndexesAsSender([secret]);
|
|
190
|
+
return new IndexedTaggingSecret(secret, index);
|
|
188
191
|
}
|
|
189
192
|
/**
|
|
190
193
|
* Increments the tagging secret for a given sender and recipient pair. For this to work, the ivpsk_m of the sender must be known.
|
|
@@ -192,74 +195,201 @@ export class SimulatorOracle {
|
|
|
192
195
|
* @param sender - The address sending the note
|
|
193
196
|
* @param recipient - The address receiving the note
|
|
194
197
|
*/
|
|
195
|
-
async
|
|
196
|
-
const
|
|
197
|
-
await this.
|
|
198
|
+
async incrementAppTaggingSecretIndexAsSender(contractAddress, sender, recipient) {
|
|
199
|
+
const secret = await __classPrivateFieldGet(this, _SimulatorOracle_instances, "m", _SimulatorOracle_calculateTaggingSecret).call(this, contractAddress, sender, recipient);
|
|
200
|
+
const contractName = await this.contractDataOracle.getDebugContractName(contractAddress);
|
|
201
|
+
this.log.verbose(`Incrementing secret ${secret} as sender ${sender} for recipient: ${recipient} at contract: ${contractName}(${contractAddress})`);
|
|
202
|
+
await this.db.incrementTaggingSecretsIndexesAsSender([secret]);
|
|
198
203
|
}
|
|
199
204
|
/**
|
|
200
|
-
*
|
|
201
|
-
* @param contractAddress - The contract address to silo the secret for
|
|
202
|
-
* @param recipient - The address receiving the notes
|
|
203
|
-
* @returns A list of siloed tagging secrets
|
|
204
|
-
*/
|
|
205
|
-
async getAppTaggingSecretsForSenders(contractAddress, recipient) {
|
|
206
|
-
const recipientCompleteAddress = await this.getCompleteAddress(recipient);
|
|
207
|
-
const recipientIvsk = await this.keyStore.getMasterIncomingViewingSecretKey(recipient);
|
|
208
|
-
// We implicitly add the recipient as a contact, this helps us decrypt tags on notes that we send to ourselves (recipient = us, sender = us)
|
|
209
|
-
const contacts = [...this.db.getContactAddresses(), recipient];
|
|
210
|
-
const appTaggingSecrets = contacts.map(contact => {
|
|
211
|
-
const sharedSecret = computeTaggingSecret(recipientCompleteAddress, recipientIvsk, contact);
|
|
212
|
-
return poseidon2Hash([sharedSecret.x, sharedSecret.y, contractAddress]);
|
|
213
|
-
});
|
|
214
|
-
// Ensure the directionality (sender -> recipient)
|
|
215
|
-
const directionalSecrets = appTaggingSecrets.map(secret => new TaggingSecret(secret, recipient));
|
|
216
|
-
const indexes = await this.db.getTaggingSecretsIndexes(directionalSecrets);
|
|
217
|
-
return directionalSecrets.map((directionalSecret, i) => IndexedTaggingSecret.fromTaggingSecret(directionalSecret, indexes[i]));
|
|
218
|
-
}
|
|
219
|
-
/**
|
|
220
|
-
* Synchronizes the logs tagged with the recipient's address and all the senders in the addressbook.
|
|
205
|
+
* Synchronizes the logs tagged with scoped addresses and all the senders in the addressbook.
|
|
221
206
|
* Returns the unsynched logs and updates the indexes of the secrets used to tag them until there are no more logs to sync.
|
|
222
207
|
* @param contractAddress - The address of the contract that the logs are tagged for
|
|
223
208
|
* @param recipient - The address of the recipient
|
|
224
209
|
* @returns A list of encrypted logs tagged with the recipient's address
|
|
225
210
|
*/
|
|
226
|
-
async syncTaggedLogs(contractAddress,
|
|
227
|
-
|
|
228
|
-
|
|
229
|
-
|
|
230
|
-
|
|
231
|
-
|
|
232
|
-
|
|
233
|
-
|
|
234
|
-
|
|
235
|
-
|
|
236
|
-
//
|
|
237
|
-
|
|
238
|
-
const
|
|
239
|
-
|
|
240
|
-
|
|
241
|
-
|
|
242
|
-
|
|
243
|
-
|
|
244
|
-
|
|
245
|
-
|
|
246
|
-
|
|
211
|
+
async syncTaggedLogs(contractAddress, maxBlockNumber, scopes) {
|
|
212
|
+
const recipients = scopes ? scopes : await this.keyStore.getAccounts();
|
|
213
|
+
const result = new Map();
|
|
214
|
+
const contractName = await this.contractDataOracle.getDebugContractName(contractAddress);
|
|
215
|
+
for (const recipient of recipients) {
|
|
216
|
+
const logs = [];
|
|
217
|
+
// Ideally this algorithm would be implemented in noir, exposing its building blocks as oracles.
|
|
218
|
+
// However it is impossible at the moment due to the language not supporting nested slices.
|
|
219
|
+
// This nesting is necessary because for a given set of tags we don't
|
|
220
|
+
// know how many logs we will get back. Furthermore, these logs are of undetermined
|
|
221
|
+
// length, since we don't really know the note they correspond to until we decrypt them.
|
|
222
|
+
// 1. Get all the secrets for the recipient and sender pairs (#9365)
|
|
223
|
+
const appTaggingSecrets = await __classPrivateFieldGet(this, _SimulatorOracle_instances, "m", _SimulatorOracle_getAppTaggingSecretsForContacts).call(this, contractAddress, recipient);
|
|
224
|
+
// 1.1 Set up a sliding window with an offset. Chances are the sender might have messed up
|
|
225
|
+
// and inadvertedly incremented their index without use getting any logs (for example, in case
|
|
226
|
+
// of a revert). If we stopped looking for logs the first time
|
|
227
|
+
// we receive 0 for a tag, we might never receive anything from that sender again.
|
|
228
|
+
// Also there's a possibility that we have advanced our index, but the sender has reused it, so
|
|
229
|
+
// we might have missed some logs. For these reasons, we have to look both back and ahead of the
|
|
230
|
+
// stored index
|
|
231
|
+
const INDEX_OFFSET = 10;
|
|
232
|
+
const searchState = appTaggingSecrets.reduce((acc, appTaggingSecret) => ({
|
|
233
|
+
// Start looking for logs before the stored index
|
|
234
|
+
currentTagggingSecrets: acc.currentTagggingSecrets.concat([
|
|
235
|
+
new IndexedTaggingSecret(appTaggingSecret.secret, Math.max(0, appTaggingSecret.index - INDEX_OFFSET)),
|
|
236
|
+
]),
|
|
237
|
+
// Keep looking for logs beyond the stored index
|
|
238
|
+
maxIndexesToCheck: {
|
|
239
|
+
...acc.maxIndexesToCheck,
|
|
240
|
+
...{ [appTaggingSecret.secret.toString()]: appTaggingSecret.index + INDEX_OFFSET },
|
|
241
|
+
},
|
|
242
|
+
// Keeps track of the secrets we have to increment in the database
|
|
243
|
+
secretsToIncrement: {},
|
|
244
|
+
// Store the initial set of indexes for the secrets
|
|
245
|
+
initialSecretIndexes: {
|
|
246
|
+
...acc.initialSecretIndexes,
|
|
247
|
+
...{ [appTaggingSecret.secret.toString()]: appTaggingSecret.index },
|
|
248
|
+
},
|
|
249
|
+
}), { currentTagggingSecrets: [], maxIndexesToCheck: {}, secretsToIncrement: {}, initialSecretIndexes: {} });
|
|
250
|
+
let { currentTagggingSecrets } = searchState;
|
|
251
|
+
const { maxIndexesToCheck, secretsToIncrement, initialSecretIndexes } = searchState;
|
|
252
|
+
while (currentTagggingSecrets.length > 0) {
|
|
253
|
+
// 2. Compute tags using the secrets, recipient and index. Obtain logs for each tag (#9380)
|
|
254
|
+
const currentTags = currentTagggingSecrets.map(taggingSecret => taggingSecret.computeTag(recipient));
|
|
255
|
+
const logsByTags = await this.aztecNode.getLogsByTags(currentTags);
|
|
256
|
+
const newTaggingSecrets = [];
|
|
257
|
+
logsByTags.forEach((logsByTag, logIndex) => {
|
|
258
|
+
const { secret: currentSecret, index: currentIndex } = currentTagggingSecrets[logIndex];
|
|
259
|
+
const currentSecretAsStr = currentSecret.toString();
|
|
260
|
+
this.log.debug(`Syncing logs for recipient ${recipient}, secret ${currentSecretAsStr}:${currentIndex} at contract: ${contractName}(${contractAddress})`);
|
|
261
|
+
// 3.1. Append logs to the list and increment the index for the tags that have logs (#9380)
|
|
262
|
+
if (logsByTag.length > 0) {
|
|
263
|
+
this.log.verbose(`Found ${logsByTag.length} logs for secret ${currentSecretAsStr} as recipient ${recipient}. Incrementing index to ${currentIndex + 1} at contract: ${contractName}(${contractAddress})`);
|
|
264
|
+
logs.push(...logsByTag);
|
|
265
|
+
if (currentIndex >= initialSecretIndexes[currentSecretAsStr]) {
|
|
266
|
+
// 3.2. Increment the index for the tags that have logs, provided they're higher than the one
|
|
267
|
+
// we have stored in the db (#9380)
|
|
268
|
+
secretsToIncrement[currentSecretAsStr] = currentIndex + 1;
|
|
269
|
+
// 3.3. Slide the window forwards if we have found logs beyond the initial index
|
|
270
|
+
maxIndexesToCheck[currentSecretAsStr] = currentIndex + INDEX_OFFSET;
|
|
271
|
+
}
|
|
272
|
+
}
|
|
273
|
+
// 3.4 Keep increasing the index (inside the window) temporarily for the tags that have no logs
|
|
274
|
+
// There's a chance the sender missed some and we want to catch up
|
|
275
|
+
if (currentIndex < maxIndexesToCheck[currentSecretAsStr]) {
|
|
276
|
+
const newTaggingSecret = new IndexedTaggingSecret(currentSecret, currentIndex + 1);
|
|
277
|
+
newTaggingSecrets.push(newTaggingSecret);
|
|
278
|
+
}
|
|
279
|
+
});
|
|
280
|
+
await this.db.setTaggingSecretsIndexesAsRecipient(Object.keys(secretsToIncrement).map(secret => new IndexedTaggingSecret(Fr.fromString(secret), secretsToIncrement[secret])));
|
|
281
|
+
currentTagggingSecrets = newTaggingSecrets;
|
|
282
|
+
}
|
|
283
|
+
result.set(recipient.toString(), logs.filter(log => log.blockNumber <= maxBlockNumber));
|
|
284
|
+
}
|
|
285
|
+
return result;
|
|
286
|
+
}
|
|
287
|
+
/**
|
|
288
|
+
* Processes the tagged logs returned by syncTaggedLogs by decrypting them and storing them in the database.
|
|
289
|
+
* @param logs - The logs to process.
|
|
290
|
+
* @param recipient - The recipient of the logs.
|
|
291
|
+
*/
|
|
292
|
+
async processTaggedLogs(logs, recipient, simulator) {
|
|
293
|
+
const { incomingNotes, outgoingNotes } = await __classPrivateFieldGet(this, _SimulatorOracle_instances, "m", _SimulatorOracle_decryptTaggedLogs).call(this, logs, recipient, simulator);
|
|
294
|
+
if (incomingNotes.length || outgoingNotes.length) {
|
|
295
|
+
await this.db.addNotes(incomingNotes, outgoingNotes, recipient);
|
|
296
|
+
incomingNotes.forEach(noteDao => {
|
|
297
|
+
this.log.verbose(`Added incoming note for contract ${noteDao.contractAddress} at slot ${noteDao.storageSlot} with nullifier ${noteDao.siloedNullifier.toString()}`);
|
|
298
|
+
});
|
|
299
|
+
outgoingNotes.forEach(noteDao => {
|
|
300
|
+
this.log.verbose(`Added outgoing note for contract ${noteDao.contractAddress} at slot ${noteDao.storageSlot}`);
|
|
247
301
|
});
|
|
248
|
-
// 4. Consolidate in db and replace initial appTaggingSecrets with the new ones (updated indexes)
|
|
249
|
-
await this.db.incrementTaggingSecretsIndexes(newTaggingSecrets.map(secret => new TaggingSecret(secret.secret, recipient)));
|
|
250
|
-
appTaggingSecrets = newTaggingSecrets;
|
|
251
302
|
}
|
|
252
|
-
|
|
303
|
+
const nullifiedNotes = [];
|
|
304
|
+
const currentNotesForRecipient = await this.db.getIncomingNotes({ owner: recipient });
|
|
305
|
+
const nullifierIndexes = await this.aztecNode.findLeavesIndexes('latest', MerkleTreeId.NULLIFIER_TREE, currentNotesForRecipient.map(note => note.siloedNullifier));
|
|
306
|
+
const foundNullifiers = currentNotesForRecipient
|
|
307
|
+
.filter((_, i) => nullifierIndexes[i] !== undefined)
|
|
308
|
+
.map(note => note.siloedNullifier);
|
|
309
|
+
await this.db.removeNullifiedNotes(foundNullifiers, computePoint(recipient));
|
|
310
|
+
nullifiedNotes.forEach(noteDao => {
|
|
311
|
+
this.log.verbose(`Removed note for contract ${noteDao.contractAddress} at slot ${noteDao.storageSlot} with nullifier ${noteDao.siloedNullifier.toString()}`);
|
|
312
|
+
});
|
|
253
313
|
}
|
|
254
314
|
}
|
|
255
|
-
_SimulatorOracle_instances = new WeakSet(),
|
|
315
|
+
_SimulatorOracle_instances = new WeakSet(), _SimulatorOracle_calculateTaggingSecret = async function _SimulatorOracle_calculateTaggingSecret(contractAddress, sender, recipient) {
|
|
256
316
|
const senderCompleteAddress = await this.getCompleteAddress(sender);
|
|
257
317
|
const senderIvsk = await this.keyStore.getMasterIncomingViewingSecretKey(sender);
|
|
258
318
|
const sharedSecret = computeTaggingSecret(senderCompleteAddress, senderIvsk, recipient);
|
|
259
319
|
// Silo the secret to the app so it can't be used to track other app's notes
|
|
260
320
|
const siloedSecret = poseidon2Hash([sharedSecret.x, sharedSecret.y, contractAddress]);
|
|
261
|
-
|
|
262
|
-
|
|
263
|
-
|
|
321
|
+
return siloedSecret;
|
|
322
|
+
}, _SimulatorOracle_getAppTaggingSecretsForContacts =
|
|
323
|
+
/**
|
|
324
|
+
* Returns the siloed tagging secrets for a given recipient and all the senders in the address book
|
|
325
|
+
* This method should be exposed as an oracle call to allow aztec.nr to perform the orchestration
|
|
326
|
+
* of the syncTaggedLogs and processTaggedLogs methods. However, it is not possible to do so at the moment,
|
|
327
|
+
* so we're keeping it private for now.
|
|
328
|
+
* @param contractAddress - The contract address to silo the secret for
|
|
329
|
+
* @param recipient - The address receiving the notes
|
|
330
|
+
* @returns A list of siloed tagging secrets
|
|
331
|
+
*/
|
|
332
|
+
async function _SimulatorOracle_getAppTaggingSecretsForContacts(contractAddress, recipient) {
|
|
333
|
+
const recipientCompleteAddress = await this.getCompleteAddress(recipient);
|
|
334
|
+
const recipientIvsk = await this.keyStore.getMasterIncomingViewingSecretKey(recipient);
|
|
335
|
+
// We implicitly add all PXE accounts as contacts, this helps us decrypt tags on notes that we send to ourselves (recipient = us, sender = us)
|
|
336
|
+
const contacts = [...this.db.getContactAddresses(), ...(await this.keyStore.getAccounts())].filter((address, index, self) => index === self.findIndex(otherAddress => otherAddress.equals(address)));
|
|
337
|
+
const appTaggingSecrets = contacts.map(contact => {
|
|
338
|
+
const sharedSecret = computeTaggingSecret(recipientCompleteAddress, recipientIvsk, contact);
|
|
339
|
+
return poseidon2Hash([sharedSecret.x, sharedSecret.y, contractAddress]);
|
|
340
|
+
});
|
|
341
|
+
const indexes = await this.db.getTaggingSecretsIndexesAsRecipient(appTaggingSecrets);
|
|
342
|
+
return appTaggingSecrets.map((secret, i) => new IndexedTaggingSecret(secret, indexes[i]));
|
|
343
|
+
}, _SimulatorOracle_decryptTaggedLogs =
|
|
344
|
+
/**
|
|
345
|
+
* Decrypts logs tagged for a recipient and returns them.
|
|
346
|
+
* @param scopedLogs - The logs to decrypt.
|
|
347
|
+
* @param recipient - The recipient of the logs.
|
|
348
|
+
* @param simulator - The simulator to use for decryption.
|
|
349
|
+
* @returns The decrypted notes.
|
|
350
|
+
*/
|
|
351
|
+
async function _SimulatorOracle_decryptTaggedLogs(scopedLogs, recipient, simulator) {
|
|
352
|
+
const recipientCompleteAddress = await this.getCompleteAddress(recipient);
|
|
353
|
+
const ivskM = await this.keyStore.getMasterSecretKey(recipientCompleteAddress.publicKeys.masterIncomingViewingPublicKey);
|
|
354
|
+
const addressSecret = computeAddressSecret(recipientCompleteAddress.getPreaddress(), ivskM);
|
|
355
|
+
const ovskM = await this.keyStore.getMasterSecretKey(recipientCompleteAddress.publicKeys.masterOutgoingViewingPublicKey);
|
|
356
|
+
// Since we could have notes with the same index for different txs, we need
|
|
357
|
+
// to keep track of them scoping by txHash
|
|
358
|
+
const excludedIndices = new Map();
|
|
359
|
+
const incomingNotes = [];
|
|
360
|
+
const outgoingNotes = [];
|
|
361
|
+
const txEffectsCache = new Map();
|
|
362
|
+
for (const scopedLog of scopedLogs) {
|
|
363
|
+
const incomingNotePayload = L1NotePayload.decryptAsIncoming(scopedLog.logData, addressSecret, scopedLog.isFromPublic);
|
|
364
|
+
const outgoingNotePayload = L1NotePayload.decryptAsOutgoing(scopedLog.logData, ovskM, scopedLog.isFromPublic);
|
|
365
|
+
if (incomingNotePayload || outgoingNotePayload) {
|
|
366
|
+
if (incomingNotePayload && outgoingNotePayload && !incomingNotePayload.equals(outgoingNotePayload)) {
|
|
367
|
+
this.log.warn(`Incoming and outgoing note payloads do not match. Incoming: ${JSON.stringify(incomingNotePayload)}, Outgoing: ${JSON.stringify(outgoingNotePayload)}`);
|
|
368
|
+
continue;
|
|
369
|
+
}
|
|
370
|
+
const payload = incomingNotePayload || outgoingNotePayload;
|
|
371
|
+
const txEffect = txEffectsCache.get(scopedLog.txHash.toString()) ?? (await this.aztecNode.getTxEffect(scopedLog.txHash));
|
|
372
|
+
if (!txEffect) {
|
|
373
|
+
this.log.warn(`No tx effect found for ${scopedLog.txHash} while decrypting tagged logs`);
|
|
374
|
+
continue;
|
|
375
|
+
}
|
|
376
|
+
txEffectsCache.set(scopedLog.txHash.toString(), txEffect);
|
|
377
|
+
if (!excludedIndices.has(scopedLog.txHash.toString())) {
|
|
378
|
+
excludedIndices.set(scopedLog.txHash.toString(), new Set());
|
|
379
|
+
}
|
|
380
|
+
const { incomingNote, outgoingNote } = await produceNoteDaos(
|
|
381
|
+
// I don't like this at all, but we need a simulator to run `computeNoteHashAndOptionallyANullifier`. This generates
|
|
382
|
+
// a chicken-and-egg problem due to this oracle requiring a simulator, which in turn requires this oracle. Furthermore, since jest doesn't allow
|
|
383
|
+
// mocking ESM exports, we have to pollute the method even more by providing a simulator parameter so tests can inject a fake one.
|
|
384
|
+
simulator ?? getAcirSimulator(this.db, this.aztecNode, this.keyStore, this.contractDataOracle), this.db, incomingNotePayload ? computePoint(recipient) : undefined, outgoingNotePayload ? recipientCompleteAddress.publicKeys.masterOutgoingViewingPublicKey : undefined, payload, txEffect.txHash, txEffect.noteHashes, scopedLog.dataStartIndexForTx, excludedIndices.get(scopedLog.txHash.toString()), this.log);
|
|
385
|
+
if (incomingNote) {
|
|
386
|
+
incomingNotes.push(incomingNote);
|
|
387
|
+
}
|
|
388
|
+
if (outgoingNote) {
|
|
389
|
+
outgoingNotes.push(outgoingNote);
|
|
390
|
+
}
|
|
391
|
+
}
|
|
392
|
+
}
|
|
393
|
+
return { incomingNotes, outgoingNotes };
|
|
264
394
|
};
|
|
265
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/simulator_oracle/index.ts"],"names":[],"mappings":"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"}
|
|
395
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/simulator_oracle/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,5 @@
|
|
|
1
1
|
import { type AztecNode } from '@aztec/circuit-types';
|
|
2
|
-
import { type AztecAddress, type CompleteAddress } from '@aztec/circuits.js';
|
|
3
2
|
import { type SerialQueue } from '@aztec/foundation/queue';
|
|
4
|
-
import { type KeyStore } from '@aztec/key-store';
|
|
5
3
|
import { type PxeDatabase } from '../database/index.js';
|
|
6
4
|
/**
|
|
7
5
|
* The Synchronizer class manages the synchronization of note processors and interacts with the Aztec node
|
|
@@ -11,16 +9,13 @@ import { type PxeDatabase } from '../database/index.js';
|
|
|
11
9
|
* in sync with the blockchain while handling retries and errors gracefully.
|
|
12
10
|
*/
|
|
13
11
|
export declare class Synchronizer {
|
|
14
|
-
#private;
|
|
15
12
|
private node;
|
|
16
13
|
private db;
|
|
17
14
|
private jobQueue;
|
|
18
15
|
private runningPromise?;
|
|
19
|
-
private noteProcessors;
|
|
20
16
|
private running;
|
|
21
17
|
private initialSyncBlockNumber;
|
|
22
18
|
private log;
|
|
23
|
-
private noteProcessorsToCatchUp;
|
|
24
19
|
constructor(node: AztecNode, db: PxeDatabase, jobQueue: SerialQueue, logSuffix?: string);
|
|
25
20
|
/**
|
|
26
21
|
* Starts the synchronization process by fetching encrypted logs and blocks from a specified position.
|
|
@@ -51,14 +46,6 @@ export declare class Synchronizer {
|
|
|
51
46
|
* @returns true if there could be more work, false if we're caught up or there was an error.
|
|
52
47
|
*/
|
|
53
48
|
protected work(limit?: number): Promise<boolean>;
|
|
54
|
-
/**
|
|
55
|
-
* Catch up note processors that are lagging behind the main sync.
|
|
56
|
-
* e.g. because we just added a new account.
|
|
57
|
-
*
|
|
58
|
-
* @param limit - the maximum number of encrypted, unencrypted logs and blocks to fetch in each iteration.
|
|
59
|
-
* @returns true if there could be more work, false if there was an error which allows a retry with delay.
|
|
60
|
-
*/
|
|
61
|
-
protected workNoteProcessorCatchUp(limit?: number): Promise<boolean>;
|
|
62
49
|
private setHeaderFromBlock;
|
|
63
50
|
/**
|
|
64
51
|
* Stops the synchronizer gracefully, interrupting any ongoing sleep and waiting for the current
|
|
@@ -68,26 +55,6 @@ export declare class Synchronizer {
|
|
|
68
55
|
* @returns A promise that resolves when the synchronizer has successfully stopped.
|
|
69
56
|
*/
|
|
70
57
|
stop(): Promise<void>;
|
|
71
|
-
/**
|
|
72
|
-
* Add a new account to the Synchronizer with the specified private key.
|
|
73
|
-
* Creates a NoteProcessor instance for the account and pushes it into the noteProcessors array.
|
|
74
|
-
* The method resolves immediately after pushing the new note processor.
|
|
75
|
-
*
|
|
76
|
-
* @param publicKey - The public key for the account.
|
|
77
|
-
* @param keyStore - The key store.
|
|
78
|
-
* @param startingBlock - The block where to start scanning for notes for this accounts.
|
|
79
|
-
* @returns A promise that resolves once the account is added to the Synchronizer.
|
|
80
|
-
*/
|
|
81
|
-
addAccount(account: CompleteAddress, keyStore: KeyStore, startingBlock: number): void;
|
|
82
|
-
/**
|
|
83
|
-
* Checks if the specified account is synchronized.
|
|
84
|
-
* @param account - The aztec address for which to query the sync status.
|
|
85
|
-
* @returns True if the account is fully synched, false otherwise.
|
|
86
|
-
* @remarks Checks whether all the notes from all the blocks have been processed. If it is not the case, the
|
|
87
|
-
* retrieved information from contracts might be old/stale (e.g. old token balance).
|
|
88
|
-
* @throws If checking a sync status of account which is not registered.
|
|
89
|
-
*/
|
|
90
|
-
isAccountStateSynchronized(account: AztecAddress): Promise<boolean>;
|
|
91
58
|
private getSynchedBlockNumber;
|
|
92
59
|
/**
|
|
93
60
|
* Checks whether all the blocks were processed (tree roots updated, txs updated with block info, etc.).
|
|
@@ -102,21 +69,6 @@ export declare class Synchronizer {
|
|
|
102
69
|
*/
|
|
103
70
|
getSyncStatus(): {
|
|
104
71
|
blocks: number;
|
|
105
|
-
notes: {
|
|
106
|
-
[k: string]: number;
|
|
107
|
-
};
|
|
108
|
-
};
|
|
109
|
-
/**
|
|
110
|
-
* Returns the note processor stats.
|
|
111
|
-
* @returns The note processor stats for notes for each public key being tracked.
|
|
112
|
-
*/
|
|
113
|
-
getSyncStats(): {
|
|
114
|
-
[k: string]: import("@aztec/circuit-types/stats").NoteProcessorStats;
|
|
115
72
|
};
|
|
116
|
-
/**
|
|
117
|
-
* Retry decoding any deferred notes for the specified contract address.
|
|
118
|
-
* @param contractAddress - the contract address that has just been added
|
|
119
|
-
*/
|
|
120
|
-
reprocessDeferredNotesForContract(contractAddress: AztecAddress): Promise<void>;
|
|
121
73
|
}
|
|
122
74
|
//# sourceMappingURL=synchronizer.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"synchronizer.d.ts","sourceRoot":"","sources":["../../src/synchronizer/synchronizer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,SAAS,
|
|
1
|
+
{"version":3,"file":"synchronizer.d.ts","sourceRoot":"","sources":["../../src/synchronizer/synchronizer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,SAAS,EAAgB,MAAM,sBAAsB,CAAC;AAGpE,OAAO,EAAE,KAAK,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAG3D,OAAO,EAAE,KAAK,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAExD;;;;;;GAMG;AACH,qBAAa,YAAY;IAMX,OAAO,CAAC,IAAI;IAAa,OAAO,CAAC,EAAE;IAAe,OAAO,CAAC,QAAQ;IAL9E,OAAO,CAAC,cAAc,CAAC,CAAiB;IACxC,OAAO,CAAC,OAAO,CAAS;IACxB,OAAO,CAAC,sBAAsB,CAA4B;IAC1D,OAAO,CAAC,GAAG,CAAc;gBAEL,IAAI,EAAE,SAAS,EAAU,EAAE,EAAE,WAAW,EAAU,QAAQ,EAAE,WAAW,EAAE,SAAS,SAAK;IAI3G;;;;;;;OAOG;IACU,KAAK,CAAC,KAAK,SAAI,EAAE,aAAa,SAAO;cAalC,WAAW;IAO3B;;;;;;;;;;OAUG;IACH,SAAS,CAAC,IAAI,CAAC,KAAK,EAAE,MAAM;IAU5B;;;;;OAKG;cACa,IAAI,CAAC,KAAK,SAAI,GAAG,OAAO,CAAC,OAAO,CAAC;YAkBnC,kBAAkB;IAQhC;;;;;;OAMG;IACU,IAAI;IAMjB,OAAO,CAAC,qBAAqB;IAI7B;;;;;OAKG;IACU,yBAAyB;IAKtC;;;OAGG;IACI,aAAa;;;CAMrB"}
|