@aztec/pxe 0.67.1 → 0.68.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.
Files changed (40) hide show
  1. package/dest/database/kv_pxe_database.d.ts +3 -3
  2. package/dest/database/kv_pxe_database.d.ts.map +1 -1
  3. package/dest/database/kv_pxe_database.js +5 -5
  4. package/dest/database/pxe_database.d.ts +6 -6
  5. package/dest/database/pxe_database.d.ts.map +1 -1
  6. package/dest/kernel_oracle/index.js +2 -2
  7. package/dest/kernel_prover/hints/build_private_kernel_reset_private_inputs.js +2 -2
  8. package/dest/kernel_prover/kernel_prover.d.ts.map +1 -1
  9. package/dest/kernel_prover/kernel_prover.js +5 -2
  10. package/dest/kernel_prover/test/test_circuit_prover.d.ts +1 -2
  11. package/dest/kernel_prover/test/test_circuit_prover.d.ts.map +1 -1
  12. package/dest/kernel_prover/test/test_circuit_prover.js +4 -10
  13. package/dest/pxe_service/error_enriching.d.ts.map +1 -1
  14. package/dest/pxe_service/error_enriching.js +6 -3
  15. package/dest/pxe_service/pxe_service.d.ts +6 -6
  16. package/dest/pxe_service/pxe_service.d.ts.map +1 -1
  17. package/dest/pxe_service/pxe_service.js +34 -30
  18. package/dest/pxe_service/test/pxe_test_suite.d.ts.map +1 -1
  19. package/dest/pxe_service/test/pxe_test_suite.js +1 -4
  20. package/dest/simulator_oracle/index.d.ts +8 -6
  21. package/dest/simulator_oracle/index.d.ts.map +1 -1
  22. package/dest/simulator_oracle/index.js +170 -158
  23. package/dest/simulator_oracle/tagging_utils.d.ts +16 -0
  24. package/dest/simulator_oracle/tagging_utils.d.ts.map +1 -0
  25. package/dest/simulator_oracle/tagging_utils.js +25 -0
  26. package/dest/utils/create_pxe_service.d.ts.map +1 -1
  27. package/dest/utils/create_pxe_service.js +8 -5
  28. package/package.json +17 -17
  29. package/src/database/kv_pxe_database.ts +6 -4
  30. package/src/database/pxe_database.ts +6 -6
  31. package/src/kernel_oracle/index.ts +1 -1
  32. package/src/kernel_prover/hints/build_private_kernel_reset_private_inputs.ts +1 -1
  33. package/src/kernel_prover/kernel_prover.ts +11 -1
  34. package/src/kernel_prover/test/test_circuit_prover.ts +6 -22
  35. package/src/pxe_service/error_enriching.ts +5 -2
  36. package/src/pxe_service/pxe_service.ts +47 -42
  37. package/src/pxe_service/test/pxe_test_suite.ts +0 -4
  38. package/src/simulator_oracle/index.ts +203 -188
  39. package/src/simulator_oracle/tagging_utils.ts +31 -0
  40. package/src/utils/create_pxe_service.ts +7 -4
@@ -1,13 +1,14 @@
1
- var _SimulatorOracle_instances, _SimulatorOracle_calculateTaggingSecret, _SimulatorOracle_getAppTaggingSecretsForContacts, _SimulatorOracle_decryptTaggedLogs;
1
+ var _SimulatorOracle_instances, _SimulatorOracle_calculateAppTaggingSecret, _SimulatorOracle_getIndexedTaggingSecretsForSenders, _SimulatorOracle_decryptTaggedLogs;
2
2
  import { __classPrivateFieldGet } from "tslib";
3
3
  import { L1NotePayload, MerkleTreeId, getNonNullifiedL1ToL2MessageWitness, } from '@aztec/circuit-types';
4
- import { Fr, IndexedTaggingSecret, PrivateLog, computeAddressSecret, computeTaggingSecret, } from '@aztec/circuits.js';
4
+ import { Fr, IndexedTaggingSecret, PrivateLog, computeAddressSecret, computeTaggingSecretPoint, } from '@aztec/circuits.js';
5
5
  import { getFunctionArtifact } from '@aztec/foundation/abi';
6
6
  import { poseidon2Hash } from '@aztec/foundation/crypto';
7
7
  import { createLogger } from '@aztec/foundation/log';
8
8
  import { MessageLoadOracleInputs } from '@aztec/simulator/acvm';
9
9
  import { produceNoteDaos } from '../note_decryption_utils/produce_note_daos.js';
10
10
  import { getAcirSimulator } from '../simulator/index.js';
11
+ import { WINDOW_HALF_SIZE, getIndexedTaggingSecretsForTheWindow, getInitialIndexesMap } from './tagging_utils.js';
11
12
  /**
12
13
  * A data oracle that provides information needed for simulating a transaction.
13
14
  */
@@ -173,31 +174,31 @@ export class SimulatorOracle {
173
174
  * finally the index specified tag. We will then query the node with this tag for each address in the address book.
174
175
  * @returns The full list of the users contact addresses.
175
176
  */
176
- getContacts() {
177
- return this.db.getContactAddresses();
177
+ getSenders() {
178
+ return this.db.getSenderAddresses();
178
179
  }
179
180
  /**
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.
181
+ * Returns the tagging secret for a given sender and recipient pair. For this to work, the ivsk_m of the sender must be known.
181
182
  * Includes the next index to be used used for tagging with this secret.
182
183
  * @param contractAddress - The contract address to silo the secret for
183
184
  * @param sender - The address sending the note
184
185
  * @param recipient - The address receiving the note
185
- * @returns A siloed tagging secret that can be used to tag notes.
186
+ * @returns An indexed tagging secret that can be used to tag notes.
186
187
  */
187
- async getAppTaggingSecretAsSender(contractAddress, sender, recipient) {
188
+ async getIndexedTaggingSecretAsSender(contractAddress, sender, recipient) {
188
189
  await this.syncTaggedLogsAsSender(contractAddress, sender, recipient);
189
- const secret = await __classPrivateFieldGet(this, _SimulatorOracle_instances, "m", _SimulatorOracle_calculateTaggingSecret).call(this, contractAddress, sender, recipient);
190
- const [index] = await this.db.getTaggingSecretsIndexesAsSender([secret]);
191
- return new IndexedTaggingSecret(secret, index);
190
+ const appTaggingSecret = await __classPrivateFieldGet(this, _SimulatorOracle_instances, "m", _SimulatorOracle_calculateAppTaggingSecret).call(this, contractAddress, sender, recipient);
191
+ const [index] = await this.db.getTaggingSecretsIndexesAsSender([appTaggingSecret]);
192
+ return new IndexedTaggingSecret(appTaggingSecret, index);
192
193
  }
193
194
  /**
194
- * Increments the tagging secret for a given sender and recipient pair. For this to work, the ivpsk_m of the sender must be known.
195
+ * Increments the tagging secret for a given sender and recipient pair. For this to work, the ivsk_m of the sender must be known.
195
196
  * @param contractAddress - The contract address to silo the secret for
196
197
  * @param sender - The address sending the note
197
198
  * @param recipient - The address receiving the note
198
199
  */
199
200
  async incrementAppTaggingSecretIndexAsSender(contractAddress, sender, recipient) {
200
- const secret = await __classPrivateFieldGet(this, _SimulatorOracle_instances, "m", _SimulatorOracle_calculateTaggingSecret).call(this, contractAddress, sender, recipient);
201
+ const secret = await __classPrivateFieldGet(this, _SimulatorOracle_instances, "m", _SimulatorOracle_calculateAppTaggingSecret).call(this, contractAddress, sender, recipient);
201
202
  const contractName = await this.contractDataOracle.getDebugContractName(contractAddress);
202
203
  this.log.debug(`Incrementing app tagging secret at ${contractName}(${contractAddress})`, {
203
204
  secret,
@@ -217,148 +218,156 @@ export class SimulatorOracle {
217
218
  * @param recipient - The address of the recipient.
218
219
  */
219
220
  async syncTaggedLogsAsSender(contractAddress, sender, recipient) {
220
- const appTaggingSecret = await __classPrivateFieldGet(this, _SimulatorOracle_instances, "m", _SimulatorOracle_calculateTaggingSecret).call(this, contractAddress, sender, recipient);
221
- let [currentIndex] = await this.db.getTaggingSecretsIndexesAsSender([appTaggingSecret]);
222
- const INDEX_OFFSET = 10;
223
- let previousEmptyBack = 0;
224
- let currentEmptyBack = 0;
225
- let currentEmptyFront;
226
- // The below code is trying to find the index of the start of the first window in which for all elements of window, we do not see logs.
227
- // We take our window size, and fetch the node for these logs. We store both the amount of empty consecutive slots from the front and the back.
228
- // We use our current empty consecutive slots from the front, as well as the previous consecutive empty slots from the back to see if we ever hit a time where there
229
- // is a window in which we see the combination of them to be greater than the window's size. If true, we rewind current index to the start of said window and use it.
230
- // Assuming two windows of 5:
231
- // [0, 1, 0, 1, 0], [0, 0, 0, 0, 0]
232
- // We can see that when processing the second window, the previous amount of empty slots from the back of the window (1), added with the empty elements from the front of the window (5)
233
- // is greater than 5 (6) and therefore we have found a window to use.
234
- // We simply need to take the number of elements (10) - the size of the window (5) - the number of consecutive empty elements from the back of the last window (1) = 4;
235
- // This is the first index of our desired window.
236
- // Note that if we ever see a situation like so:
237
- // [0, 1, 0, 1, 0], [0, 0, 0, 0, 1]
238
- // This also returns the correct index (4), but this is indicative of a problem / desync. i.e. we should never have a window that has a log that exists after the window.
221
+ const appTaggingSecret = await __classPrivateFieldGet(this, _SimulatorOracle_instances, "m", _SimulatorOracle_calculateAppTaggingSecret).call(this, contractAddress, sender, recipient);
222
+ const [oldIndex] = await this.db.getTaggingSecretsIndexesAsSender([appTaggingSecret]);
223
+ // This algorithm works such that:
224
+ // 1. If we find minimum consecutive empty logs in a window of logs we set the index to the index of the last log
225
+ // we found and quit.
226
+ // 2. If we don't find minimum consecutive empty logs in a window of logs we slide the window to latest log index
227
+ // and repeat the process.
228
+ const MIN_CONSECUTIVE_EMPTY_LOGS = 10;
229
+ const WINDOW_SIZE = MIN_CONSECUTIVE_EMPTY_LOGS * 2;
230
+ let [numConsecutiveEmptyLogs, currentIndex] = [0, oldIndex];
239
231
  do {
240
- const currentTags = [...new Array(INDEX_OFFSET)].map((_, i) => {
232
+ // We compute the tags for the current window of indexes
233
+ const currentTags = [...new Array(WINDOW_SIZE)].map((_, i) => {
241
234
  const indexedAppTaggingSecret = new IndexedTaggingSecret(appTaggingSecret, currentIndex + i);
242
235
  return indexedAppTaggingSecret.computeSiloedTag(recipient, contractAddress);
243
236
  });
244
- previousEmptyBack = currentEmptyBack;
237
+ // We fetch the logs for the tags
245
238
  const possibleLogs = await this.aztecNode.getLogsByTags(currentTags);
246
- const indexOfFirstLog = possibleLogs.findIndex(possibleLog => possibleLog.length !== 0);
247
- currentEmptyFront = indexOfFirstLog === -1 ? INDEX_OFFSET : indexOfFirstLog;
239
+ // We find the index of the last log in the window that is not empty
248
240
  const indexOfLastLog = possibleLogs.findLastIndex(possibleLog => possibleLog.length !== 0);
249
- currentEmptyBack = indexOfLastLog === -1 ? INDEX_OFFSET : INDEX_OFFSET - 1 - indexOfLastLog;
250
- currentIndex += INDEX_OFFSET;
251
- } while (currentEmptyFront + previousEmptyBack < INDEX_OFFSET);
252
- // We unwind the entire current window and the amount of consecutive empty slots from the previous window
253
- const newIndex = currentIndex - (INDEX_OFFSET + previousEmptyBack);
254
- await this.db.setTaggingSecretsIndexesAsSender([new IndexedTaggingSecret(appTaggingSecret, newIndex)]);
241
+ if (indexOfLastLog === -1) {
242
+ // We haven't found any logs in the current window so we stop looking
243
+ break;
244
+ }
245
+ // We move the current index to that of the last log we found
246
+ currentIndex += indexOfLastLog + 1;
247
+ // We compute the number of consecutive empty logs we found and repeat the process if we haven't found enough.
248
+ numConsecutiveEmptyLogs = WINDOW_SIZE - indexOfLastLog - 1;
249
+ } while (numConsecutiveEmptyLogs < MIN_CONSECUTIVE_EMPTY_LOGS);
255
250
  const contractName = await this.contractDataOracle.getDebugContractName(contractAddress);
256
- this.log.debug(`Syncing logs for sender ${sender} at contract ${contractName}(${contractAddress})`, {
257
- sender,
258
- secret: appTaggingSecret,
259
- index: currentIndex,
260
- contractName,
261
- contractAddress,
262
- });
251
+ if (currentIndex !== oldIndex) {
252
+ await this.db.setTaggingSecretsIndexesAsSender([new IndexedTaggingSecret(appTaggingSecret, currentIndex)]);
253
+ this.log.debug(`Syncing logs for sender ${sender} at contract ${contractName}(${contractAddress})`, {
254
+ sender,
255
+ secret: appTaggingSecret,
256
+ index: currentIndex,
257
+ contractName,
258
+ contractAddress,
259
+ });
260
+ }
261
+ else {
262
+ this.log.debug(`No new logs found for sender ${sender} at contract ${contractName}(${contractAddress})`);
263
+ }
263
264
  }
264
265
  /**
265
266
  * Synchronizes the logs tagged with scoped addresses and all the senders in the address book.
266
- * Returns the unsynched logs and updates the indexes of the secrets used to tag them until there are no more logs to sync.
267
+ * Returns the unsynched logs and updates the indexes of the secrets used to tag them until there are no more logs
268
+ * to sync.
267
269
  * @param contractAddress - The address of the contract that the logs are tagged for
268
270
  * @param recipient - The address of the recipient
269
271
  * @returns A list of encrypted logs tagged with the recipient's address
270
272
  */
271
273
  async syncTaggedLogs(contractAddress, maxBlockNumber, scopes) {
274
+ // Ideally this algorithm would be implemented in noir, exposing its building blocks as oracles.
275
+ // However it is impossible at the moment due to the language not supporting nested slices.
276
+ // This nesting is necessary because for a given set of tags we don't
277
+ // know how many logs we will get back. Furthermore, these logs are of undetermined
278
+ // length, since we don't really know the note they correspond to until we decrypt them.
272
279
  const recipients = scopes ? scopes : await this.keyStore.getAccounts();
273
- const result = new Map();
280
+ // A map of logs going from recipient address to logs. Note that the logs might have been processed before
281
+ // due to us having a sliding window that "looks back" for logs as well. (We look back as there is no guarantee
282
+ // that a logs will be received ordered by a given tax index and that the tags won't be reused).
283
+ const logsMap = new Map();
274
284
  const contractName = await this.contractDataOracle.getDebugContractName(contractAddress);
275
285
  for (const recipient of recipients) {
276
- const logs = [];
277
- // Ideally this algorithm would be implemented in noir, exposing its building blocks as oracles.
278
- // However it is impossible at the moment due to the language not supporting nested slices.
279
- // This nesting is necessary because for a given set of tags we don't
280
- // know how many logs we will get back. Furthermore, these logs are of undetermined
281
- // length, since we don't really know the note they correspond to until we decrypt them.
282
- // 1. Get all the secrets for the recipient and sender pairs (#9365)
283
- const appTaggingSecrets = await __classPrivateFieldGet(this, _SimulatorOracle_instances, "m", _SimulatorOracle_getAppTaggingSecretsForContacts).call(this, contractAddress, recipient);
284
- // 1.1 Set up a sliding window with an offset. Chances are the sender might have messed up
285
- // and inadvertently incremented their index without use getting any logs (for example, in case
286
- // of a revert). If we stopped looking for logs the first time
287
- // we receive 0 for a tag, we might never receive anything from that sender again.
288
- // Also there's a possibility that we have advanced our index, but the sender has reused it, so
289
- // we might have missed some logs. For these reasons, we have to look both back and ahead of the
290
- // stored index
291
- const INDEX_OFFSET = 10;
292
- const searchState = appTaggingSecrets.reduce((acc, appTaggingSecret) => ({
293
- // Start looking for logs before the stored index
294
- currentTagggingSecrets: acc.currentTagggingSecrets.concat([
295
- new IndexedTaggingSecret(appTaggingSecret.secret, Math.max(0, appTaggingSecret.index - INDEX_OFFSET)),
296
- ]),
297
- // Keep looking for logs beyond the stored index
298
- maxIndexesToCheck: {
299
- ...acc.maxIndexesToCheck,
300
- ...{ [appTaggingSecret.secret.toString()]: appTaggingSecret.index + INDEX_OFFSET },
301
- },
302
- // Keeps track of the secrets we have to increment in the database
303
- secretsToIncrement: {},
304
- // Store the initial set of indexes for the secrets
305
- initialSecretIndexes: {
306
- ...acc.initialSecretIndexes,
307
- ...{ [appTaggingSecret.secret.toString()]: appTaggingSecret.index },
308
- },
309
- }), { currentTagggingSecrets: [], maxIndexesToCheck: {}, secretsToIncrement: {}, initialSecretIndexes: {} });
310
- let { currentTagggingSecrets } = searchState;
311
- const { maxIndexesToCheck, secretsToIncrement, initialSecretIndexes } = searchState;
312
- while (currentTagggingSecrets.length > 0) {
313
- // 2. Compute tags using the secrets, recipient and index. Obtain logs for each tag (#9380)
314
- const currentTags = currentTagggingSecrets.map(taggingSecret => taggingSecret.computeSiloedTag(recipient, contractAddress));
315
- const logsByTags = await this.aztecNode.getLogsByTags(currentTags);
316
- const newTaggingSecrets = [];
286
+ const logsForRecipient = [];
287
+ // Get all the secrets for the recipient and sender pairs (#9365)
288
+ const secrets = await __classPrivateFieldGet(this, _SimulatorOracle_instances, "m", _SimulatorOracle_getIndexedTaggingSecretsForSenders).call(this, contractAddress, recipient);
289
+ // We fetch logs for a window of indexes in a range:
290
+ // <latest_log_index - WINDOW_HALF_SIZE, latest_log_index + WINDOW_HALF_SIZE>.
291
+ //
292
+ // We use this window approach because it could happen that a sender might have messed up and inadvertently
293
+ // incremented their index without us getting any logs (for example, in case of a revert). If we stopped looking
294
+ // for logs the first time we don't receive any logs for a tag, we might never receive anything from that sender again.
295
+ // Also there's a possibility that we have advanced our index, but the sender has reused it, so we might have missed
296
+ // some logs. For these reasons, we have to look both back and ahead of the stored index.
297
+ let secretsAndWindows = secrets.map(secret => {
298
+ return {
299
+ appTaggingSecret: secret.appTaggingSecret,
300
+ leftMostIndex: Math.max(0, secret.index - WINDOW_HALF_SIZE),
301
+ rightMostIndex: secret.index + WINDOW_HALF_SIZE,
302
+ };
303
+ });
304
+ // As we iterate we store the largest index we have seen for a given secret to later on store it in the db.
305
+ const newLargestIndexMapToStore = {};
306
+ // The initial/unmodified indexes of the secrets stored in a key-value map where key is the app tagging secret.
307
+ const initialIndexesMap = getInitialIndexesMap(secrets);
308
+ while (secretsAndWindows.length > 0) {
309
+ const secretsForTheWholeWindow = getIndexedTaggingSecretsForTheWindow(secretsAndWindows);
310
+ const tagsForTheWholeWindow = secretsForTheWholeWindow.map(secret => secret.computeSiloedTag(recipient, contractAddress));
311
+ // We store the new largest indexes we find in the iteration in the following map to later on construct
312
+ // a new set of secrets and windows to fetch logs for.
313
+ const newLargestIndexMapForIteration = {};
314
+ // Fetch the logs for the tags and iterate over them
315
+ const logsByTags = await this.aztecNode.getLogsByTags(tagsForTheWholeWindow);
317
316
  logsByTags.forEach((logsByTag, logIndex) => {
318
- const { secret: currentSecret, index: currentIndex } = currentTagggingSecrets[logIndex];
319
- const currentSecretAsStr = currentSecret.toString();
320
- this.log.debug(`Syncing logs for recipient ${recipient} at contract ${contractName}(${contractAddress})`, {
321
- recipient,
322
- secret: currentSecret,
323
- index: currentIndex,
324
- contractName,
325
- contractAddress,
326
- });
327
- // 3.1. Append logs to the list and increment the index for the tags that have logs (#9380)
328
317
  if (logsByTag.length > 0) {
329
- const newIndex = currentIndex + 1;
330
- this.log.debug(`Found ${logsByTag.length} logs as recipient ${recipient}. Incrementing index to ${newIndex} at contract ${contractName}(${contractAddress})`, {
318
+ // The logs for the given tag exist so we store them for later processing
319
+ logsForRecipient.push(...logsByTag);
320
+ // We retrieve the indexed tagging secret corresponding to the log as I need that to evaluate whether
321
+ // a new largest index have been found.
322
+ const secretCorrespondingToLog = secretsForTheWholeWindow[logIndex];
323
+ const initialIndex = initialIndexesMap[secretCorrespondingToLog.appTaggingSecret.toString()];
324
+ this.log.debug(`Found ${logsByTag.length} logs as recipient ${recipient}`, {
331
325
  recipient,
332
- secret: currentSecret,
333
- newIndex,
326
+ secret: secretCorrespondingToLog.appTaggingSecret,
334
327
  contractName,
335
328
  contractAddress,
336
329
  });
337
- logs.push(...logsByTag);
338
- if (currentIndex >= initialSecretIndexes[currentSecretAsStr]) {
339
- // 3.2. Increment the index for the tags that have logs, provided they're higher than the one
340
- // we have stored in the db (#9380)
341
- secretsToIncrement[currentSecretAsStr] = newIndex;
342
- // 3.3. Slide the window forwards if we have found logs beyond the initial index
343
- maxIndexesToCheck[currentSecretAsStr] = currentIndex + INDEX_OFFSET;
330
+ if (secretCorrespondingToLog.index >= initialIndex &&
331
+ (newLargestIndexMapForIteration[secretCorrespondingToLog.appTaggingSecret.toString()] === undefined ||
332
+ secretCorrespondingToLog.index >=
333
+ newLargestIndexMapForIteration[secretCorrespondingToLog.appTaggingSecret.toString()])) {
334
+ // We have found a new largest index so we store it for later processing (storing it in the db + fetching
335
+ // the difference of the window sets of current and the next iteration)
336
+ newLargestIndexMapForIteration[secretCorrespondingToLog.appTaggingSecret.toString()] =
337
+ secretCorrespondingToLog.index + 1;
338
+ this.log.debug(`Incrementing index to ${secretCorrespondingToLog.index + 1} at contract ${contractName}(${contractAddress})`);
344
339
  }
345
340
  }
346
- // 3.4 Keep increasing the index (inside the window) temporarily for the tags that have no logs
347
- // There's a chance the sender missed some and we want to catch up
348
- if (currentIndex < maxIndexesToCheck[currentSecretAsStr]) {
349
- const newTaggingSecret = new IndexedTaggingSecret(currentSecret, currentIndex + 1);
350
- newTaggingSecrets.push(newTaggingSecret);
351
- }
352
341
  });
353
- await this.db.setTaggingSecretsIndexesAsRecipient(Object.keys(secretsToIncrement).map(secret => new IndexedTaggingSecret(Fr.fromHexString(secret), secretsToIncrement[secret])));
354
- currentTagggingSecrets = newTaggingSecrets;
342
+ // Now based on the new largest indexes we found, we will construct a new secrets and windows set to fetch logs
343
+ // for. Note that it's very unlikely that a new log from the current window would appear between the iterations
344
+ // so we fetch the logs only for the difference of the window sets.
345
+ const newSecretsAndWindows = [];
346
+ for (const [appTaggingSecret, newIndex] of Object.entries(newLargestIndexMapForIteration)) {
347
+ const secret = secrets.find(secret => secret.appTaggingSecret.toString() === appTaggingSecret);
348
+ if (secret) {
349
+ newSecretsAndWindows.push({
350
+ appTaggingSecret: secret.appTaggingSecret,
351
+ // We set the left most index to the new index to avoid fetching the same logs again
352
+ leftMostIndex: newIndex,
353
+ rightMostIndex: newIndex + WINDOW_HALF_SIZE,
354
+ });
355
+ // We store the new largest index in the map to later store it in the db.
356
+ newLargestIndexMapToStore[appTaggingSecret] = newIndex;
357
+ }
358
+ else {
359
+ throw new Error(`Secret not found for appTaggingSecret ${appTaggingSecret}. This is a bug as it should never happen!`);
360
+ }
361
+ }
362
+ // Now we set the new secrets and windows and proceed to the next iteration.
363
+ secretsAndWindows = newSecretsAndWindows;
355
364
  }
356
- result.set(recipient.toString(),
357
- // Remove logs with a block number higher than the max block number
358
- // Duplicates are likely to happen due to the sliding window, so we also filter them out
359
- logs.filter((log, index, self) => log.blockNumber <= maxBlockNumber && index === self.findIndex(otherLog => otherLog.equals(log))));
365
+ // We filter the logs by block number and store them in the map.
366
+ logsMap.set(recipient.toString(), logsForRecipient.filter(log => log.blockNumber <= maxBlockNumber));
367
+ // At this point we have processed all the logs for the recipient so we store the new largest indexes in the db.
368
+ await this.db.setTaggingSecretsIndexesAsRecipient(Object.entries(newLargestIndexMapToStore).map(([appTaggingSecret, index]) => new IndexedTaggingSecret(Fr.fromHexString(appTaggingSecret), index)));
360
369
  }
361
- return result;
370
+ return logsMap;
362
371
  }
363
372
  /**
364
373
  * Processes the tagged logs returned by syncTaggedLogs by decrypting them and storing them in the database.
@@ -377,52 +386,55 @@ export class SimulatorOracle {
377
386
  });
378
387
  });
379
388
  }
380
- const nullifiedNotes = [];
381
- const currentNotesForRecipient = await this.db.getIncomingNotes({ owner: recipient });
382
- const nullifiersToCheck = currentNotesForRecipient.map(note => note.siloedNullifier);
383
- const currentBlockNumber = await this.getBlockNumber();
384
- const nullifierIndexes = await this.aztecNode.findNullifiersIndexesWithBlock(currentBlockNumber, nullifiersToCheck);
385
- const foundNullifiers = nullifiersToCheck
386
- .map((nullifier, i) => {
387
- if (nullifierIndexes[i] !== undefined) {
388
- return { ...nullifierIndexes[i], ...{ data: nullifier } };
389
- }
390
- })
391
- .filter(nullifier => nullifier !== undefined);
392
- await this.db.removeNullifiedNotes(foundNullifiers, recipient.toAddressPoint());
393
- nullifiedNotes.forEach(noteDao => {
394
- this.log.verbose(`Removed note for contract ${noteDao.contractAddress} at slot ${noteDao.storageSlot}`, {
395
- contract: noteDao.contractAddress,
396
- slot: noteDao.storageSlot,
397
- nullifier: noteDao.siloedNullifier.toString(),
389
+ }
390
+ async removeNullifiedNotes(contractAddress) {
391
+ for (const recipient of await this.keyStore.getAccounts()) {
392
+ const currentNotesForRecipient = await this.db.getIncomingNotes({ contractAddress, owner: recipient });
393
+ const nullifiersToCheck = currentNotesForRecipient.map(note => note.siloedNullifier);
394
+ const nullifierIndexes = await this.aztecNode.findNullifiersIndexesWithBlock('latest', nullifiersToCheck);
395
+ const foundNullifiers = nullifiersToCheck
396
+ .map((nullifier, i) => {
397
+ if (nullifierIndexes[i] !== undefined) {
398
+ return { ...nullifierIndexes[i], ...{ data: nullifier } };
399
+ }
400
+ })
401
+ .filter(nullifier => nullifier !== undefined);
402
+ const nullifiedNotes = await this.db.removeNullifiedNotes(foundNullifiers, recipient.toAddressPoint());
403
+ nullifiedNotes.forEach(noteDao => {
404
+ this.log.verbose(`Removed note for contract ${noteDao.contractAddress} at slot ${noteDao.storageSlot}`, {
405
+ contract: noteDao.contractAddress,
406
+ slot: noteDao.storageSlot,
407
+ nullifier: noteDao.siloedNullifier.toString(),
408
+ });
398
409
  });
399
- });
410
+ }
400
411
  }
401
412
  }
402
- _SimulatorOracle_instances = new WeakSet(), _SimulatorOracle_calculateTaggingSecret = async function _SimulatorOracle_calculateTaggingSecret(contractAddress, sender, recipient) {
413
+ _SimulatorOracle_instances = new WeakSet(), _SimulatorOracle_calculateAppTaggingSecret = async function _SimulatorOracle_calculateAppTaggingSecret(contractAddress, sender, recipient) {
403
414
  const senderCompleteAddress = await this.getCompleteAddress(sender);
404
415
  const senderIvsk = await this.keyStore.getMasterIncomingViewingSecretKey(sender);
405
- const sharedSecret = computeTaggingSecret(senderCompleteAddress, senderIvsk, recipient);
406
- // Silo the secret to the app so it can't be used to track other app's notes
407
- const siloedSecret = poseidon2Hash([sharedSecret.x, sharedSecret.y, contractAddress]);
408
- return siloedSecret;
409
- }, _SimulatorOracle_getAppTaggingSecretsForContacts =
416
+ const secretPoint = computeTaggingSecretPoint(senderCompleteAddress, senderIvsk, recipient);
417
+ // Silo the secret so it can't be used to track other app's notes
418
+ const appSecret = poseidon2Hash([secretPoint.x, secretPoint.y, contractAddress]);
419
+ return appSecret;
420
+ }, _SimulatorOracle_getIndexedTaggingSecretsForSenders =
410
421
  /**
411
- * Returns the siloed tagging secrets for a given recipient and all the senders in the address book
422
+ * Returns the indexed tagging secrets for a given recipient and all the senders in the address book
412
423
  * This method should be exposed as an oracle call to allow aztec.nr to perform the orchestration
413
424
  * of the syncTaggedLogs and processTaggedLogs methods. However, it is not possible to do so at the moment,
414
425
  * so we're keeping it private for now.
415
426
  * @param contractAddress - The contract address to silo the secret for
416
427
  * @param recipient - The address receiving the notes
417
- * @returns A list of siloed tagging secrets
428
+ * @returns A list of indexed tagging secrets
418
429
  */
419
- async function _SimulatorOracle_getAppTaggingSecretsForContacts(contractAddress, recipient) {
430
+ async function _SimulatorOracle_getIndexedTaggingSecretsForSenders(contractAddress, recipient) {
420
431
  const recipientCompleteAddress = await this.getCompleteAddress(recipient);
421
432
  const recipientIvsk = await this.keyStore.getMasterIncomingViewingSecretKey(recipient);
422
- // We implicitly add all PXE accounts as contacts, this helps us decrypt tags on notes that we send to ourselves (recipient = us, sender = us)
423
- const contacts = [...(await this.db.getContactAddresses()), ...(await this.keyStore.getAccounts())].filter((address, index, self) => index === self.findIndex(otherAddress => otherAddress.equals(address)));
424
- const appTaggingSecrets = contacts.map(contact => {
425
- const sharedSecret = computeTaggingSecret(recipientCompleteAddress, recipientIvsk, contact);
433
+ // We implicitly add all PXE accounts as senders, this helps us decrypt tags on notes that we send to ourselves
434
+ // (recipient = us, sender = us)
435
+ const senders = [...(await this.db.getSenderAddresses()), ...(await this.keyStore.getAccounts())].filter((address, index, self) => index === self.findIndex(otherAddress => otherAddress.equals(address)));
436
+ const appTaggingSecrets = senders.map(contact => {
437
+ const sharedSecret = computeTaggingSecretPoint(recipientCompleteAddress, recipientIvsk, contact);
426
438
  return poseidon2Hash([sharedSecret.x, sharedSecret.y, contractAddress]);
427
439
  });
428
440
  const indexes = await this.db.getTaggingSecretsIndexesAsRecipient(appTaggingSecrets);
@@ -471,4 +483,4 @@ async function _SimulatorOracle_decryptTaggedLogs(scopedLogs, recipient, simulat
471
483
  }
472
484
  return { incomingNotes };
473
485
  };
474
- //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/simulator_oracle/index.ts"],"names":[],"mappings":"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"}
486
+ //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/simulator_oracle/index.ts"],"names":[],"mappings":"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"}
@@ -0,0 +1,16 @@
1
+ import { type Fr, IndexedTaggingSecret } from '@aztec/circuits.js';
2
+ export declare const WINDOW_HALF_SIZE = 10;
3
+ export declare function getIndexedTaggingSecretsForTheWindow(secretsAndWindows: {
4
+ appTaggingSecret: Fr;
5
+ leftMostIndex: number;
6
+ rightMostIndex: number;
7
+ }[]): IndexedTaggingSecret[];
8
+ /**
9
+ * Creates a map from app tagging secret to initial index.
10
+ * @param indexedTaggingSecrets - The indexed tagging secrets to get the initial indexes from.
11
+ * @returns The map from app tagging secret to initial index.
12
+ */
13
+ export declare function getInitialIndexesMap(indexedTaggingSecrets: IndexedTaggingSecret[]): {
14
+ [k: string]: number;
15
+ };
16
+ //# sourceMappingURL=tagging_utils.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"tagging_utils.d.ts","sourceRoot":"","sources":["../../src/simulator_oracle/tagging_utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,EAAE,oBAAoB,EAAE,MAAM,oBAAoB,CAAC;AAGnE,eAAO,MAAM,gBAAgB,KAAK,CAAC;AAEnC,wBAAgB,oCAAoC,CAClD,iBAAiB,EAAE;IAAE,gBAAgB,EAAE,EAAE,CAAC;IAAC,aAAa,EAAE,MAAM,CAAC;IAAC,cAAc,EAAE,MAAM,CAAA;CAAE,EAAE,GAC3F,oBAAoB,EAAE,CAQxB;AAED;;;;GAIG;AACH,wBAAgB,oBAAoB,CAAC,qBAAqB,EAAE,oBAAoB,EAAE,GAAG;IAAE,CAAC,CAAC,EAAE,MAAM,GAAG,MAAM,CAAA;CAAE,CAQ3G"}
@@ -0,0 +1,25 @@
1
+ import { IndexedTaggingSecret } from '@aztec/circuits.js';
2
+ // Half the size of the window we slide over the tagging secret indexes.
3
+ export const WINDOW_HALF_SIZE = 10;
4
+ export function getIndexedTaggingSecretsForTheWindow(secretsAndWindows) {
5
+ const secrets = [];
6
+ for (const secretAndWindow of secretsAndWindows) {
7
+ for (let i = secretAndWindow.leftMostIndex; i <= secretAndWindow.rightMostIndex; i++) {
8
+ secrets.push(new IndexedTaggingSecret(secretAndWindow.appTaggingSecret, i));
9
+ }
10
+ }
11
+ return secrets;
12
+ }
13
+ /**
14
+ * Creates a map from app tagging secret to initial index.
15
+ * @param indexedTaggingSecrets - The indexed tagging secrets to get the initial indexes from.
16
+ * @returns The map from app tagging secret to initial index.
17
+ */
18
+ export function getInitialIndexesMap(indexedTaggingSecrets) {
19
+ const initialIndexes = {};
20
+ for (const indexedTaggingSecret of indexedTaggingSecrets) {
21
+ initialIndexes[indexedTaggingSecret.appTaggingSecret.toString()] = indexedTaggingSecret.index;
22
+ }
23
+ return initialIndexes;
24
+ }
25
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidGFnZ2luZ191dGlscy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9zaW11bGF0b3Jfb3JhY2xlL3RhZ2dpbmdfdXRpbHMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFXLG9CQUFvQixFQUFFLE1BQU0sb0JBQW9CLENBQUM7QUFFbkUsd0VBQXdFO0FBQ3hFLE1BQU0sQ0FBQyxNQUFNLGdCQUFnQixHQUFHLEVBQUUsQ0FBQztBQUVuQyxNQUFNLFVBQVUsb0NBQW9DLENBQ2xELGlCQUE0RjtJQUU1RixNQUFNLE9BQU8sR0FBMkIsRUFBRSxDQUFDO0lBQzNDLEtBQUssTUFBTSxlQUFlLElBQUksaUJBQWlCLEVBQUUsQ0FBQztRQUNoRCxLQUFLLElBQUksQ0FBQyxHQUFHLGVBQWUsQ0FBQyxhQUFhLEVBQUUsQ0FBQyxJQUFJLGVBQWUsQ0FBQyxjQUFjLEVBQUUsQ0FBQyxFQUFFLEVBQUUsQ0FBQztZQUNyRixPQUFPLENBQUMsSUFBSSxDQUFDLElBQUksb0JBQW9CLENBQUMsZUFBZSxDQUFDLGdCQUFnQixFQUFFLENBQUMsQ0FBQyxDQUFDLENBQUM7UUFDOUUsQ0FBQztJQUNILENBQUM7SUFDRCxPQUFPLE9BQU8sQ0FBQztBQUNqQixDQUFDO0FBRUQ7Ozs7R0FJRztBQUNILE1BQU0sVUFBVSxvQkFBb0IsQ0FBQyxxQkFBNkM7SUFDaEYsTUFBTSxjQUFjLEdBQTRCLEVBQUUsQ0FBQztJQUVuRCxLQUFLLE1BQU0sb0JBQW9CLElBQUkscUJBQXFCLEVBQUUsQ0FBQztRQUN6RCxjQUFjLENBQUMsb0JBQW9CLENBQUMsZ0JBQWdCLENBQUMsUUFBUSxFQUFFLENBQUMsR0FBRyxvQkFBb0IsQ0FBQyxLQUFLLENBQUM7SUFDaEcsQ0FBQztJQUVELE9BQU8sY0FBYyxDQUFDO0FBQ3hCLENBQUMifQ==
@@ -1 +1 @@
1
- {"version":3,"file":"create_pxe_service.d.ts","sourceRoot":"","sources":["../../src/utils/create_pxe_service.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,SAAS,EAAE,KAAK,mBAAmB,EAAE,MAAM,sBAAsB,CAAC;AAOhF,OAAO,EAAE,KAAK,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAG3D,OAAO,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAE3D;;;;;;;;;;GAUG;AACH,wBAAsB,gBAAgB,CACpC,SAAS,EAAE,SAAS,EACpB,MAAM,EAAE,gBAAgB,EACxB,YAAY,GAAE,MAAM,GAAG,OAAO,GAAG,SAAqB,EACtD,YAAY,CAAC,EAAE,mBAAmB,uBAwBnC"}
1
+ {"version":3,"file":"create_pxe_service.d.ts","sourceRoot":"","sources":["../../src/utils/create_pxe_service.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,KAAK,SAAS,EAAE,KAAK,mBAAmB,EAAE,MAAM,sBAAsB,CAAC;AAOhF,OAAO,EAAE,KAAK,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAG3D,OAAO,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAE3D;;;;;;;;;;GAUG;AACH,wBAAsB,gBAAgB,CACpC,SAAS,EAAE,SAAS,EACpB,MAAM,EAAE,gBAAgB,EACxB,YAAY,GAAE,MAAM,GAAG,OAAO,GAAG,SAAqB,EACtD,YAAY,CAAC,EAAE,mBAAmB,uBAwBnC"}