@aztec/pxe 0.0.1-commit.d1cd2107c → 0.0.1-commit.d1da697d6

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 (165) hide show
  1. package/dest/block_synchronizer/block_synchronizer.d.ts +1 -1
  2. package/dest/block_synchronizer/block_synchronizer.d.ts.map +1 -1
  3. package/dest/block_synchronizer/block_synchronizer.js +6 -0
  4. package/dest/contract_function_simulator/contract_function_simulator.d.ts +10 -5
  5. package/dest/contract_function_simulator/contract_function_simulator.d.ts.map +1 -1
  6. package/dest/contract_function_simulator/contract_function_simulator.js +29 -6
  7. package/dest/contract_function_simulator/execution_tagging_index_cache.d.ts +5 -5
  8. package/dest/contract_function_simulator/execution_tagging_index_cache.d.ts.map +1 -1
  9. package/dest/contract_function_simulator/execution_tagging_index_cache.js +17 -9
  10. package/dest/contract_function_simulator/index.d.ts +2 -1
  11. package/dest/contract_function_simulator/index.d.ts.map +1 -1
  12. package/dest/contract_function_simulator/index.js +1 -0
  13. package/dest/contract_function_simulator/noir-structs/event_validation_request.d.ts +3 -5
  14. package/dest/contract_function_simulator/noir-structs/event_validation_request.d.ts.map +1 -1
  15. package/dest/contract_function_simulator/noir-structs/event_validation_request.js +7 -9
  16. package/dest/contract_function_simulator/noir-structs/log_retrieval_response.d.ts +1 -1
  17. package/dest/contract_function_simulator/noir-structs/log_retrieval_response.d.ts.map +1 -1
  18. package/dest/contract_function_simulator/noir-structs/log_retrieval_response.js +1 -3
  19. package/dest/contract_function_simulator/noir-structs/note_validation_request.d.ts +3 -6
  20. package/dest/contract_function_simulator/noir-structs/note_validation_request.d.ts.map +1 -1
  21. package/dest/contract_function_simulator/noir-structs/note_validation_request.js +5 -10
  22. package/dest/contract_function_simulator/oracle/interfaces.d.ts +21 -20
  23. package/dest/contract_function_simulator/oracle/interfaces.d.ts.map +1 -1
  24. package/dest/contract_function_simulator/oracle/legacy_oracle_mappings.d.ts +9 -0
  25. package/dest/contract_function_simulator/oracle/legacy_oracle_mappings.d.ts.map +1 -0
  26. package/dest/contract_function_simulator/oracle/legacy_oracle_mappings.js +38 -0
  27. package/dest/contract_function_simulator/oracle/oracle.d.ts +39 -19
  28. package/dest/contract_function_simulator/oracle/oracle.d.ts.map +1 -1
  29. package/dest/contract_function_simulator/oracle/oracle.js +91 -44
  30. package/dest/contract_function_simulator/oracle/private_execution.js +5 -3
  31. package/dest/contract_function_simulator/oracle/private_execution_oracle.d.ts +12 -38
  32. package/dest/contract_function_simulator/oracle/private_execution_oracle.d.ts.map +1 -1
  33. package/dest/contract_function_simulator/oracle/private_execution_oracle.js +21 -44
  34. package/dest/contract_function_simulator/oracle/utility_execution_oracle.d.ts +45 -28
  35. package/dest/contract_function_simulator/oracle/utility_execution_oracle.d.ts.map +1 -1
  36. package/dest/contract_function_simulator/oracle/utility_execution_oracle.js +164 -71
  37. package/dest/contract_function_simulator/pick_notes.d.ts +1 -1
  38. package/dest/contract_function_simulator/pick_notes.d.ts.map +1 -1
  39. package/dest/contract_function_simulator/pick_notes.js +9 -2
  40. package/dest/contract_logging.d.ts +9 -4
  41. package/dest/contract_logging.d.ts.map +1 -1
  42. package/dest/contract_logging.js +21 -6
  43. package/dest/contract_sync/contract_sync_service.d.ts +6 -5
  44. package/dest/contract_sync/contract_sync_service.d.ts.map +1 -1
  45. package/dest/contract_sync/contract_sync_service.js +44 -37
  46. package/dest/contract_sync/helpers.d.ts +2 -3
  47. package/dest/contract_sync/helpers.d.ts.map +1 -1
  48. package/dest/contract_sync/helpers.js +7 -2
  49. package/dest/debug/pxe_debug_utils.d.ts +3 -3
  50. package/dest/debug/pxe_debug_utils.d.ts.map +1 -1
  51. package/dest/entrypoints/client/bundle/index.d.ts +1 -2
  52. package/dest/entrypoints/client/bundle/index.d.ts.map +1 -1
  53. package/dest/entrypoints/client/bundle/index.js +0 -1
  54. package/dest/entrypoints/client/bundle/utils.d.ts +2 -2
  55. package/dest/entrypoints/client/bundle/utils.d.ts.map +1 -1
  56. package/dest/entrypoints/client/bundle/utils.js +2 -2
  57. package/dest/entrypoints/client/lazy/index.d.ts +1 -2
  58. package/dest/entrypoints/client/lazy/index.d.ts.map +1 -1
  59. package/dest/entrypoints/client/lazy/index.js +0 -1
  60. package/dest/entrypoints/client/lazy/utils.d.ts +2 -2
  61. package/dest/entrypoints/client/lazy/utils.d.ts.map +1 -1
  62. package/dest/entrypoints/client/lazy/utils.js +2 -2
  63. package/dest/entrypoints/pxe_creation_options.d.ts +3 -1
  64. package/dest/entrypoints/pxe_creation_options.d.ts.map +1 -1
  65. package/dest/entrypoints/pxe_creation_options.js +3 -1
  66. package/dest/entrypoints/server/index.d.ts +1 -2
  67. package/dest/entrypoints/server/index.d.ts.map +1 -1
  68. package/dest/entrypoints/server/index.js +0 -1
  69. package/dest/entrypoints/server/utils.d.ts +2 -2
  70. package/dest/entrypoints/server/utils.d.ts.map +1 -1
  71. package/dest/entrypoints/server/utils.js +2 -2
  72. package/dest/events/event_service.d.ts +3 -2
  73. package/dest/events/event_service.d.ts.map +1 -1
  74. package/dest/events/event_service.js +16 -4
  75. package/dest/logs/log_service.d.ts +6 -7
  76. package/dest/logs/log_service.d.ts.map +1 -1
  77. package/dest/logs/log_service.js +32 -30
  78. package/dest/messages/message_context_service.d.ts +17 -0
  79. package/dest/messages/message_context_service.d.ts.map +1 -0
  80. package/dest/messages/message_context_service.js +36 -0
  81. package/dest/notes/note_service.d.ts +4 -5
  82. package/dest/notes/note_service.d.ts.map +1 -1
  83. package/dest/notes/note_service.js +14 -5
  84. package/dest/notes_filter.d.ts +2 -3
  85. package/dest/notes_filter.d.ts.map +1 -1
  86. package/dest/oracle_version.d.ts +2 -2
  87. package/dest/oracle_version.js +2 -2
  88. package/dest/pxe.d.ts +9 -7
  89. package/dest/pxe.d.ts.map +1 -1
  90. package/dest/pxe.js +39 -23
  91. package/dest/storage/capsule_store/capsule_service.d.ts +21 -0
  92. package/dest/storage/capsule_store/capsule_service.d.ts.map +1 -0
  93. package/dest/storage/capsule_store/capsule_service.js +50 -0
  94. package/dest/storage/capsule_store/capsule_store.d.ts +9 -9
  95. package/dest/storage/capsule_store/capsule_store.d.ts.map +1 -1
  96. package/dest/storage/capsule_store/capsule_store.js +33 -28
  97. package/dest/storage/capsule_store/index.d.ts +2 -1
  98. package/dest/storage/capsule_store/index.d.ts.map +1 -1
  99. package/dest/storage/capsule_store/index.js +1 -0
  100. package/dest/storage/metadata.d.ts +1 -1
  101. package/dest/storage/metadata.js +1 -1
  102. package/dest/storage/note_store/note_store.d.ts +1 -1
  103. package/dest/storage/note_store/note_store.d.ts.map +1 -1
  104. package/dest/storage/note_store/note_store.js +2 -2
  105. package/dest/storage/tagging_store/sender_tagging_store.d.ts +26 -25
  106. package/dest/storage/tagging_store/sender_tagging_store.d.ts.map +1 -1
  107. package/dest/storage/tagging_store/sender_tagging_store.js +141 -115
  108. package/dest/tagging/index.d.ts +2 -2
  109. package/dest/tagging/index.d.ts.map +1 -1
  110. package/dest/tagging/sender_sync/sync_sender_tagging_indexes.d.ts +1 -1
  111. package/dest/tagging/sender_sync/sync_sender_tagging_indexes.d.ts.map +1 -1
  112. package/dest/tagging/sender_sync/sync_sender_tagging_indexes.js +10 -1
  113. package/dest/tagging/sender_sync/utils/get_status_change_of_pending.d.ts +4 -3
  114. package/dest/tagging/sender_sync/utils/get_status_change_of_pending.d.ts.map +1 -1
  115. package/dest/tagging/sender_sync/utils/get_status_change_of_pending.js +20 -10
  116. package/dest/tagging/sender_sync/utils/load_and_store_new_tagging_indexes.d.ts +2 -1
  117. package/dest/tagging/sender_sync/utils/load_and_store_new_tagging_indexes.d.ts.map +1 -1
  118. package/dest/tagging/sender_sync/utils/load_and_store_new_tagging_indexes.js +24 -11
  119. package/package.json +16 -16
  120. package/src/block_synchronizer/block_synchronizer.ts +6 -0
  121. package/src/contract_function_simulator/contract_function_simulator.ts +42 -10
  122. package/src/contract_function_simulator/execution_tagging_index_cache.ts +16 -11
  123. package/src/contract_function_simulator/index.ts +1 -0
  124. package/src/contract_function_simulator/noir-structs/event_validation_request.ts +8 -8
  125. package/src/contract_function_simulator/noir-structs/log_retrieval_response.ts +1 -4
  126. package/src/contract_function_simulator/noir-structs/note_validation_request.ts +3 -9
  127. package/src/contract_function_simulator/oracle/interfaces.ts +34 -28
  128. package/src/contract_function_simulator/oracle/legacy_oracle_mappings.ts +98 -0
  129. package/src/contract_function_simulator/oracle/oracle.ts +120 -64
  130. package/src/contract_function_simulator/oracle/private_execution.ts +4 -4
  131. package/src/contract_function_simulator/oracle/private_execution_oracle.ts +26 -65
  132. package/src/contract_function_simulator/oracle/utility_execution_oracle.ts +288 -85
  133. package/src/contract_function_simulator/pick_notes.ts +9 -2
  134. package/src/contract_logging.ts +18 -5
  135. package/src/contract_sync/contract_sync_service.ts +77 -59
  136. package/src/contract_sync/helpers.ts +4 -4
  137. package/src/debug/pxe_debug_utils.ts +3 -3
  138. package/src/entrypoints/client/bundle/index.ts +0 -1
  139. package/src/entrypoints/client/bundle/utils.ts +2 -3
  140. package/src/entrypoints/client/lazy/index.ts +0 -1
  141. package/src/entrypoints/client/lazy/utils.ts +2 -3
  142. package/src/entrypoints/pxe_creation_options.ts +7 -0
  143. package/src/entrypoints/server/index.ts +0 -1
  144. package/src/entrypoints/server/utils.ts +2 -3
  145. package/src/events/event_service.ts +17 -4
  146. package/src/logs/log_service.ts +63 -48
  147. package/src/messages/message_context_service.ts +44 -0
  148. package/src/notes/note_service.ts +18 -8
  149. package/src/notes_filter.ts +1 -3
  150. package/src/oracle_version.ts +2 -2
  151. package/src/pxe.ts +62 -28
  152. package/src/storage/capsule_store/capsule_service.ts +90 -0
  153. package/src/storage/capsule_store/capsule_store.ts +34 -26
  154. package/src/storage/capsule_store/index.ts +1 -0
  155. package/src/storage/metadata.ts +1 -1
  156. package/src/storage/note_store/note_store.ts +2 -5
  157. package/src/storage/tagging_store/sender_tagging_store.ts +182 -135
  158. package/src/tagging/index.ts +1 -1
  159. package/src/tagging/sender_sync/sync_sender_tagging_indexes.ts +19 -1
  160. package/src/tagging/sender_sync/utils/get_status_change_of_pending.ts +26 -11
  161. package/src/tagging/sender_sync/utils/load_and_store_new_tagging_indexes.ts +19 -9
  162. package/dest/access_scopes.d.ts +0 -9
  163. package/dest/access_scopes.d.ts.map +0 -1
  164. package/dest/access_scopes.js +0 -6
  165. package/src/access_scopes.ts +0 -9
@@ -12,11 +12,10 @@ import {
12
12
  } from '@aztec/stdlib/logs';
13
13
  import type { BlockHeader } from '@aztec/stdlib/tx';
14
14
 
15
- import type { AccessScopes } from '../access_scopes.js';
16
15
  import type { LogRetrievalRequest } from '../contract_function_simulator/noir-structs/log_retrieval_request.js';
17
16
  import { LogRetrievalResponse } from '../contract_function_simulator/noir-structs/log_retrieval_response.js';
18
17
  import { AddressStore } from '../storage/address_store/address_store.js';
19
- import { CapsuleStore } from '../storage/capsule_store/capsule_store.js';
18
+ import type { CapsuleService } from '../storage/capsule_store/capsule_service.js';
20
19
  import type { RecipientTaggingStore } from '../storage/tagging_store/recipient_tagging_store.js';
21
20
  import type { SenderAddressBookStore } from '../storage/tagging_store/sender_address_book_store.js';
22
21
  import {
@@ -32,7 +31,7 @@ export class LogService {
32
31
  private readonly aztecNode: AztecNode,
33
32
  private readonly anchorBlockHeader: BlockHeader,
34
33
  private readonly keyStore: KeyStore,
35
- private readonly capsuleStore: CapsuleStore,
34
+ private readonly capsuleService: CapsuleService,
36
35
  private readonly recipientTaggingStore: RecipientTaggingStore,
37
36
  private readonly senderAddressBookStore: SenderAddressBookStore,
38
37
  private readonly addressStore: AddressStore,
@@ -42,7 +41,16 @@ export class LogService {
42
41
  this.log = createLogger('pxe:log_service', bindings);
43
42
  }
44
43
 
45
- public async bulkRetrieveLogs(logRetrievalRequests: LogRetrievalRequest[]): Promise<(LogRetrievalResponse | null)[]> {
44
+ public async fetchLogsByTag(
45
+ contractAddress: AztecAddress,
46
+ logRetrievalRequests: LogRetrievalRequest[],
47
+ ): Promise<(LogRetrievalResponse | null)[]> {
48
+ for (const request of logRetrievalRequests) {
49
+ if (!contractAddress.equals(request.contractAddress)) {
50
+ throw new Error(`Got a log retrieval request from ${request.contractAddress}, expected ${contractAddress}`);
51
+ }
52
+ }
53
+
46
54
  return await Promise.all(
47
55
  logRetrievalRequests.map(async request => {
48
56
  const [publicLog, privateLog] = await Promise.all([
@@ -51,8 +59,8 @@ export class LogService {
51
59
  ]);
52
60
 
53
61
  if (publicLog !== null && privateLog !== null) {
54
- throw new Error(
55
- `Found both a public and private log when searching for tag ${request.tag} from contract ${request.contractAddress}`,
62
+ this.log.warn(
63
+ `Found both a public and private log for tag ${request.tag} from contract ${request.contractAddress}. This may indicate a contract bug. Returning the public log.`,
56
64
  );
57
65
  }
58
66
 
@@ -74,9 +82,8 @@ export class LogService {
74
82
  if (logsForTag.length === 0) {
75
83
  return null;
76
84
  } else if (logsForTag.length > 1) {
77
- // TODO(#11627): handle this case
78
- throw new Error(
79
- `Got ${logsForTag.length} logs for tag ${tag} and contract ${contractAddress.toString()}. getPublicLogByTag currently only supports a single log per tag`,
85
+ this.log.warn(
86
+ `Expected at most 1 public log for tag ${tag} and contract ${contractAddress.toString()}, got ${logsForTag.length}. This may indicate a contract bug. Returning the first log.`,
80
87
  );
81
88
  }
82
89
 
@@ -98,9 +105,8 @@ export class LogService {
98
105
  if (logsForTag.length === 0) {
99
106
  return null;
100
107
  } else if (logsForTag.length > 1) {
101
- // TODO(#11627): handle this case
102
- throw new Error(
103
- `Got ${logsForTag.length} logs for tag ${siloedTag}. getPrivateLogByTag currently only supports a single log per tag`,
108
+ this.log.warn(
109
+ `Expected at most 1 private log for tag ${siloedTag}, got ${logsForTag.length}. This may indicate a contract bug. Returning the first log.`,
104
110
  );
105
111
  }
106
112
 
@@ -114,46 +120,40 @@ export class LogService {
114
120
  );
115
121
  }
116
122
 
117
- public async fetchTaggedLogs(contractAddress: AztecAddress, pendingTaggedLogArrayBaseSlot: Fr, scopes: AccessScopes) {
123
+ public async fetchTaggedLogs(
124
+ contractAddress: AztecAddress,
125
+ pendingTaggedLogArrayBaseSlot: Fr,
126
+ recipient: AztecAddress,
127
+ ) {
118
128
  this.log.verbose(`Fetching tagged logs for ${contractAddress.toString()}`);
119
129
 
120
130
  // We only load logs from block up to and including the anchor block number
121
131
  const anchorBlockNumber = this.anchorBlockHeader.getBlockNumber();
122
132
  const anchorBlockHash = await this.anchorBlockHeader.hash();
123
133
 
124
- // Determine recipients: use scopes if provided, otherwise get all accounts
125
- const recipients = scopes !== 'ALL_SCOPES' && scopes.length > 0 ? scopes : await this.keyStore.getAccounts();
126
-
127
- // For each recipient, fetch secrets, load logs, and store them.
128
- // We run these per-recipient tasks in parallel so that logs are loaded for all recipients concurrently.
129
- await Promise.all(
130
- recipients.map(async recipient => {
131
- // Get all secrets for this recipient (one per sender)
132
- const secrets = await this.#getSecretsForSenders(contractAddress, recipient);
133
-
134
- // Load logs for all sender-recipient pairs in parallel
135
- const logArrays = await Promise.all(
136
- secrets.map(secret =>
137
- loadPrivateLogsForSenderRecipientPair(
138
- secret,
139
- this.aztecNode,
140
- this.recipientTaggingStore,
141
- anchorBlockNumber,
142
- anchorBlockHash,
143
- this.jobId,
144
- ),
145
- ),
146
- );
134
+ // Get all secrets for this recipient (one per sender)
135
+ const secrets = await this.#getSecretsForSenders(contractAddress, recipient);
136
+
137
+ // Load logs for all sender-recipient pairs in parallel
138
+ const logArrays = await Promise.all(
139
+ secrets.map(secret =>
140
+ loadPrivateLogsForSenderRecipientPair(
141
+ secret,
142
+ this.aztecNode,
143
+ this.recipientTaggingStore,
144
+ anchorBlockNumber,
145
+ anchorBlockHash,
146
+ this.jobId,
147
+ ),
148
+ ),
149
+ );
147
150
 
148
- // Flatten all logs from all secrets
149
- const allLogs = logArrays.flat();
151
+ // Flatten all logs from all secrets
152
+ const allLogs = logArrays.flat();
150
153
 
151
- // Store the logs for this recipient
152
- if (allLogs.length > 0) {
153
- await this.#storePendingTaggedLogs(contractAddress, pendingTaggedLogArrayBaseSlot, recipient, allLogs);
154
- }
155
- }),
156
- );
154
+ if (allLogs.length > 0) {
155
+ await this.#storePendingTaggedLogs(contractAddress, pendingTaggedLogArrayBaseSlot, recipient, allLogs);
156
+ }
157
157
  }
158
158
 
159
159
  async #getSecretsForSenders(
@@ -176,14 +176,24 @@ export class LogService {
176
176
  );
177
177
 
178
178
  return Promise.all(
179
- deduplicatedSenders.map(sender => {
180
- return ExtendedDirectionalAppTaggingSecret.compute(
179
+ deduplicatedSenders.map(async sender => {
180
+ const secret = await ExtendedDirectionalAppTaggingSecret.compute(
181
181
  recipientCompleteAddress,
182
182
  recipientIvsk,
183
183
  sender,
184
184
  contractAddress,
185
185
  recipient,
186
186
  );
187
+
188
+ if (!secret) {
189
+ // Note that all senders originate from either the SenderAddressBookStore or the KeyStore.
190
+ // TODO(F-512): make sure we actually prevent registering invalid senders.
191
+ throw new Error(
192
+ `Failed to compute a tagging secret for sender ${sender} - this implies this is an invalid address, which should not happen as they have been previously registered in PXE.`,
193
+ );
194
+ }
195
+
196
+ return secret;
187
197
  }),
188
198
  );
189
199
  }
@@ -201,13 +211,18 @@ export class LogService {
201
211
  scopedLog.txHash,
202
212
  scopedLog.noteHashes,
203
213
  scopedLog.firstNullifier,
204
- recipient,
205
214
  );
206
215
 
207
216
  return pendingTaggedLog.toFields();
208
217
  });
209
218
 
210
219
  // TODO: This looks like it could belong more at the oracle interface level
211
- return this.capsuleStore.appendToCapsuleArray(contractAddress, capsuleArrayBaseSlot, pendingTaggedLogs, this.jobId);
220
+ return this.capsuleService.appendToCapsuleArray(
221
+ contractAddress,
222
+ capsuleArrayBaseSlot,
223
+ pendingTaggedLogs,
224
+ this.jobId,
225
+ recipient,
226
+ );
212
227
  }
213
228
  }
@@ -0,0 +1,44 @@
1
+ import { Fr } from '@aztec/foundation/curves/bn254';
2
+ import type { AztecNode } from '@aztec/stdlib/interfaces/server';
3
+ import { MessageContext } from '@aztec/stdlib/logs';
4
+ import { TxHash } from '@aztec/stdlib/tx';
5
+
6
+ /** Resolves transaction hashes into the context needed to process messages. */
7
+ export class MessageContextService {
8
+ constructor(private readonly aztecNode: AztecNode) {}
9
+
10
+ /**
11
+ * Resolves a list of tx hashes into their message contexts.
12
+ *
13
+ * For each tx hash, looks up the corresponding tx effect and extracts the note hashes and first nullifier needed to
14
+ * process messages that originated from that transaction. Returns `null` for tx hashes that are zero, not yet
15
+ * available, or in blocks beyond the anchor block.
16
+ */
17
+ getMessageContextsByTxHash(txHashes: Fr[], anchorBlockNumber: number): Promise<(MessageContext | null)[]> {
18
+ // TODO: optimize, we might be hitting the node to get the same txHash repeatedly
19
+ return Promise.all(
20
+ txHashes.map(async txHashField => {
21
+ // A zero tx hash indicates a tx-less offchain message (e.g. one not tied to any onchain transaction).
22
+ // These messages don't have a transaction context to resolve, so we return null.
23
+ if (txHashField.isZero()) {
24
+ return null;
25
+ }
26
+
27
+ const txHash = TxHash.fromField(txHashField);
28
+ const txEffect = await this.aztecNode.getTxEffect(txHash);
29
+ if (!txEffect || txEffect.l2BlockNumber > anchorBlockNumber) {
30
+ return null;
31
+ }
32
+
33
+ // Every tx has at least one nullifier (the first nullifier derived from the tx hash). Hitting this condition
34
+ // would mean a buggy node, but since we need to access data.nullifiers[0], the defensive check does no harm.
35
+ const data = txEffect.data;
36
+ if (data.nullifiers.length === 0) {
37
+ throw new Error(`Tx effect for ${txHash} has no nullifiers`);
38
+ }
39
+
40
+ return new MessageContext(data.txHash, data.noteHashes, data.nullifiers[0]);
41
+ }),
42
+ );
43
+ }
44
+ }
@@ -7,7 +7,6 @@ import { Note, NoteDao, NoteStatus } from '@aztec/stdlib/note';
7
7
  import { MerkleTreeId } from '@aztec/stdlib/trees';
8
8
  import type { BlockHeader, TxHash } from '@aztec/stdlib/tx';
9
9
 
10
- import type { AccessScopes } from '../access_scopes.js';
11
10
  import type { NoteStore } from '../storage/note_store/note_store.js';
12
11
 
13
12
  export class NoteService {
@@ -32,7 +31,7 @@ export class NoteService {
32
31
  owner: AztecAddress | undefined,
33
32
  storageSlot: Fr,
34
33
  status: NoteStatus,
35
- scopes: AccessScopes,
34
+ scopes: AztecAddress[],
36
35
  ) {
37
36
  const noteDaos = await this.noteStore.getNotes(
38
37
  {
@@ -71,7 +70,7 @@ export class NoteService {
71
70
  *
72
71
  * @param contractAddress - The contract whose notes should be checked and nullified.
73
72
  */
74
- public async syncNoteNullifiers(contractAddress: AztecAddress, scopes: AccessScopes): Promise<void> {
73
+ public async syncNoteNullifiers(contractAddress: AztecAddress, scopes: AztecAddress[]): Promise<void> {
75
74
  const anchorBlockHash = await this.anchorBlockHeader.hash();
76
75
 
77
76
  const contractNotes = await this.noteStore.getNotes({ contractAddress, scopes }, this.jobId);
@@ -121,7 +120,7 @@ export class NoteService {
121
120
  noteHash: Fr,
122
121
  nullifier: Fr,
123
122
  txHash: TxHash,
124
- recipient: AztecAddress,
123
+ scope: AztecAddress,
125
124
  ): Promise<void> {
126
125
  // We are going to store the new note in the NoteStore, which will let us later return it via `getNotes`.
127
126
  // There's two things we need to check before we do this however:
@@ -155,16 +154,28 @@ export class NoteService {
155
154
  this.aztecNode.findLeavesIndexes(anchorBlockHash, MerkleTreeId.NULLIFIER_TREE, [siloedNullifier]),
156
155
  ]);
157
156
  if (!txEffect) {
158
- throw new Error(`Could not find tx effect for tx hash ${txHash}`);
157
+ // We error out instead of just logging a warning and skipping the note because this would indicate a bug. This
158
+ // is because the node has already served info about this tx either when obtaining the log (TxScopedL2Log contain
159
+ // tx info) or when getting metadata for the offchain message (before the message got passed to `process_log`).
160
+ throw new Error(`Could not find tx effect for tx hash ${txHash} when processing a note.`);
159
161
  }
160
162
 
161
163
  if (txEffect.l2BlockNumber > anchorBlockNumber) {
162
- throw new Error(`Could not find tx effect for tx hash ${txHash} as of block number ${anchorBlockNumber}`);
164
+ // If the message was delivered onchain, this would indicate a bug: log sync should never load logs from blocks
165
+ // newer than the anchor block. If the note came via an offchain message, it would likely also be a bug, since we
166
+ // sync a new anchor block before calling `process_message`. For this not to be a bug, the message would need to
167
+ // come from a newer block than the anchor served by the node, implying the node isn't properly synced.
168
+ // We therefore error out here rather than assuming the offchain message was constructed by a malicious
169
+ // sender with the intention of bricking recipient's PXE (if we assumed that we would just ignore the message).
170
+ throw new Error(
171
+ `Obtained a newer tx effect for ${txHash} for a note validation request than the anchor block ${anchorBlockNumber}. This is a bug as we should not ever be processing a note from a newer block than the anchor block.`,
172
+ );
163
173
  }
164
174
 
165
175
  // Find the index of the note hash in the noteHashes array to determine note ordering within the tx
166
176
  const noteIndexInTx = txEffect.data.noteHashes.findIndex(nh => nh.equals(uniqueNoteHash));
167
177
  if (noteIndexInTx === -1) {
178
+ // Similar to the comment above - we error out as this would indicate a bug in nonce discovery.
168
179
  throw new Error(`Note hash ${noteHash} (uniqued as ${uniqueNoteHash}) is not present in tx ${txHash}`);
169
180
  }
170
181
 
@@ -184,8 +195,7 @@ export class NoteService {
184
195
  noteIndexInTx,
185
196
  );
186
197
 
187
- // The note was found by `recipient`, so we use that as the scope when storing the note.
188
- await this.noteStore.addNotes([noteDao], recipient, this.jobId);
198
+ await this.noteStore.addNotes([noteDao], scope, this.jobId);
189
199
 
190
200
  if (nullifierIndex !== undefined) {
191
201
  // We found nullifier index which implies that the note has already been nullified.
@@ -2,8 +2,6 @@ import type { Fr } from '@aztec/foundation/curves/bn254';
2
2
  import type { AztecAddress } from '@aztec/stdlib/aztec-address';
3
3
  import type { NoteStatus } from '@aztec/stdlib/note';
4
4
 
5
- import type { AccessScopes } from './access_scopes.js';
6
-
7
5
  /**
8
6
  * A filter used to fetch notes.
9
7
  * @remarks This filter is applied as an intersection of all its params.
@@ -22,5 +20,5 @@ export type NotesFilter = {
22
20
  status?: NoteStatus;
23
21
  /** The siloed nullifier for the note. */
24
22
  siloedNullifier?: Fr;
25
- scopes: AccessScopes;
23
+ scopes: AztecAddress[];
26
24
  };
@@ -4,9 +4,9 @@
4
4
  ///
5
5
  /// @dev Whenever a contract function or Noir test is run, the `aztec_utl_assertCompatibleOracleVersion` oracle is called
6
6
  /// and if the oracle version is incompatible an error is thrown.
7
- export const ORACLE_VERSION = 14;
7
+ export const ORACLE_VERSION = 22;
8
8
 
9
9
  /// This hash is computed as by hashing the Oracle interface and it is used to detect when the Oracle interface changes,
10
10
  /// which in turn implies that you need to update the ORACLE_VERSION constant in this file and in
11
11
  /// `noir-projects/aztec-nr/aztec/src/oracle/version.nr`.
12
- export const ORACLE_INTERFACE_HASH = '9fb918682455c164ce8dd3acb71c751e2b9b2fc48913604069c9ea885fa378ca';
12
+ export const ORACLE_INTERFACE_HASH = '83f1de1a9741a34916fd58cf12b857d0bac90f74bf00751b20304301a3f5c8eb';
package/src/pxe.ts CHANGED
@@ -52,7 +52,6 @@ import {
52
52
 
53
53
  import { inspect } from 'util';
54
54
 
55
- import type { AccessScopes } from './access_scopes.js';
56
55
  import { BlockSynchronizer } from './block_synchronizer/index.js';
57
56
  import type { PXEConfig } from './config/index.js';
58
57
  import { BenchmarkedNodeFactory } from './contract_function_simulator/benchmarked_node.js';
@@ -68,6 +67,7 @@ import { PXEDebugUtils } from './debug/pxe_debug_utils.js';
68
67
  import { enrichPublicSimulationError, enrichSimulationError } from './error_enriching.js';
69
68
  import { PrivateEventFilterValidator } from './events/private_event_filter_validator.js';
70
69
  import { JobCoordinator } from './job_coordinator/job_coordinator.js';
70
+ import { MessageContextService } from './messages/message_context_service.js';
71
71
  import {
72
72
  PrivateKernelExecutionProver,
73
73
  type PrivateKernelExecutionProverConfig,
@@ -95,7 +95,7 @@ export type ProfileTxOpts = {
95
95
  /** If true, proof generation is skipped during profiling. Defaults to true. */
96
96
  skipProofGeneration?: boolean;
97
97
  /** Addresses whose private state and keys are accessible during private execution. */
98
- scopes: AccessScopes;
98
+ scopes: AztecAddress[];
99
99
  };
100
100
 
101
101
  /** Options for PXE.simulateTx. */
@@ -106,10 +106,12 @@ export type SimulateTxOpts = {
106
106
  skipTxValidation?: boolean;
107
107
  /** If false, fees are enforced. */
108
108
  skipFeeEnforcement?: boolean;
109
- /** State overrides for the simulation, such as contract instances and artifacts. */
109
+ /** If true, kernel logic is emulated in TS for simulation */
110
+ skipKernels?: boolean;
111
+ /** State overrides for the simulation, such as contract instances and artifacts. Requires skipKernels: true */
110
112
  overrides?: SimulationOverrides;
111
113
  /** Addresses whose private state and keys are accessible during private execution */
112
- scopes: AccessScopes;
114
+ scopes: AztecAddress[];
113
115
  };
114
116
 
115
117
  /** Options for PXE.executeUtility. */
@@ -117,7 +119,7 @@ export type ExecuteUtilityOpts = {
117
119
  /** The authentication witnesses required for the function call. */
118
120
  authwits?: AuthWitness[];
119
121
  /** The accounts whose notes we can access in this call */
120
- scopes: AccessScopes;
122
+ scopes: AztecAddress[];
121
123
  };
122
124
 
123
125
  /** Args for PXE.create. */
@@ -158,6 +160,7 @@ export class PXE {
158
160
  private addressStore: AddressStore,
159
161
  private privateEventStore: PrivateEventStore,
160
162
  private contractSyncService: ContractSyncService,
163
+ private messageContextService: MessageContextService,
161
164
  private simulator: CircuitSimulator,
162
165
  private proverEnabled: boolean,
163
166
  private proofCreator: PrivateKernelProver,
@@ -213,6 +216,8 @@ export class PXE {
213
216
  noteStore,
214
217
  createLogger('pxe:contract_sync', bindings),
215
218
  );
219
+ const messageContextService = new MessageContextService(node);
220
+
216
221
  const synchronizer = new BlockSynchronizer(
217
222
  node,
218
223
  store,
@@ -254,6 +259,7 @@ export class PXE {
254
259
  addressStore,
255
260
  privateEventStore,
256
261
  contractSyncService,
262
+ messageContextService,
257
263
  simulator,
258
264
  proverEnabled,
259
265
  proofCreator,
@@ -295,6 +301,7 @@ export class PXE {
295
301
  privateEventStore: this.privateEventStore,
296
302
  simulator: this.simulator,
297
303
  contractSyncService: this.contractSyncService,
304
+ messageContextService: this.messageContextService,
298
305
  });
299
306
  }
300
307
 
@@ -360,7 +367,7 @@ export class PXE {
360
367
  async #executePrivate(
361
368
  contractFunctionSimulator: ContractFunctionSimulator,
362
369
  txRequest: TxExecutionRequest,
363
- scopes: AccessScopes,
370
+ scopes: AztecAddress[],
364
371
  jobId: string,
365
372
  ): Promise<PrivateExecutionResult> {
366
373
  const { origin: contractAddress, functionSelector } = txRequest;
@@ -409,12 +416,19 @@ export class PXE {
409
416
  contractFunctionSimulator: ContractFunctionSimulator,
410
417
  call: FunctionCall,
411
418
  authWitnesses: AuthWitness[] | undefined,
412
- scopes: AccessScopes,
419
+ scopes: AztecAddress[],
413
420
  jobId: string,
414
421
  ) {
415
422
  try {
416
423
  const anchorBlockHeader = await this.anchorBlockStore.getBlockHeader();
417
- return contractFunctionSimulator.runUtility(call, authWitnesses ?? [], anchorBlockHeader, scopes, jobId);
424
+ const { result, offchainEffects } = await contractFunctionSimulator.runUtility(
425
+ call,
426
+ authWitnesses ?? [],
427
+ anchorBlockHeader,
428
+ scopes,
429
+ jobId,
430
+ );
431
+ return { result, offchainEffects };
418
432
  } catch (err) {
419
433
  if (err instanceof SimulationError) {
420
434
  await enrichSimulationError(err, this.contractStore, this.log);
@@ -487,7 +501,9 @@ export class PXE {
487
501
  * @returns The synced block header
488
502
  */
489
503
  public getSyncedBlockHeader(): Promise<BlockHeader> {
490
- return this.anchorBlockStore.getBlockHeader();
504
+ return this.#putInJobQueue(() => {
505
+ return this.anchorBlockStore.getBlockHeader();
506
+ });
491
507
  }
492
508
 
493
509
  /**
@@ -554,6 +570,9 @@ export class PXE {
554
570
 
555
571
  if (wasAdded) {
556
572
  this.log.info(`Added sender:\n ${sender.toString()}`);
573
+ // Wipe the entire sync cache: the new sender's tagged logs could contain notes/events for any contract, so
574
+ // all contracts must re-sync to discover them.
575
+ this.contractSyncService.wipe();
557
576
  } else {
558
577
  this.log.info(`Sender:\n "${sender.toString()}"\n already registered.`);
559
578
  }
@@ -766,17 +785,17 @@ export class PXE {
766
785
  // transaction before this one is included in a block from this PXE, and that transaction contains a log with
767
786
  // a tag derived from the same secret, we would reuse the tag and the transactions would be linked. Hence
768
787
  // storing the tags here prevents linkage of txs sent from the same PXE.
769
- const preTagsUsedInTheTx = privateExecutionResult.entrypoint.preTags;
770
- if (preTagsUsedInTheTx.length > 0) {
788
+ const taggingIndexRangesUsedInTheTx = privateExecutionResult.entrypoint.taggingIndexRanges;
789
+ if (taggingIndexRangesUsedInTheTx.length > 0) {
771
790
  // TODO(benesjan): The following is an expensive operation. Figure out a way to avoid it.
772
791
  const txHash = (await txProvingResult.toTx()).txHash;
773
792
 
774
- await this.senderTaggingStore.storePendingIndexes(preTagsUsedInTheTx, txHash, jobId);
775
- this.log.debug(`Stored used pre-tags as sender for the tx`, {
776
- preTagsUsedInTheTx,
793
+ await this.senderTaggingStore.storePendingIndexes(taggingIndexRangesUsedInTheTx, txHash, jobId);
794
+ this.log.debug(`Stored used tagging index ranges as sender for the tx`, {
795
+ taggingIndexRangesUsedInTheTx,
777
796
  });
778
797
  } else {
779
- this.log.debug(`No pre-tags used in the tx`);
798
+ this.log.debug(`No tagging index ranges used in the tx`);
780
799
  }
781
800
 
782
801
  return txProvingResult;
@@ -883,7 +902,14 @@ export class PXE {
883
902
  */
884
903
  public simulateTx(
885
904
  txRequest: TxExecutionRequest,
886
- { simulatePublic, skipTxValidation = false, skipFeeEnforcement = false, overrides, scopes }: SimulateTxOpts,
905
+ {
906
+ simulatePublic,
907
+ skipTxValidation = false,
908
+ skipFeeEnforcement = false,
909
+ skipKernels = true,
910
+ overrides,
911
+ scopes,
912
+ }: SimulateTxOpts,
887
913
  ): Promise<TxSimulationResult> {
888
914
  // We disable concurrent simulations since those might execute oracles which read and write to the PXE stores (e.g.
889
915
  // to the capsules), and we need to prevent concurrent runs from interfering with one another (e.g. attempting to
@@ -907,17 +933,20 @@ export class PXE {
907
933
  await this.blockStateSynchronizer.sync();
908
934
  const syncTime = syncTimer.ms();
909
935
 
910
- const contractFunctionSimulator = this.#getSimulatorForTx(overrides);
911
- // Temporary: in case there are overrides, we have to skip the kernels or validations
912
- // will fail. Consider handing control to the user/wallet on whether they want to run them
913
- // or not.
914
936
  const overriddenContracts = overrides?.contracts ? new Set(Object.keys(overrides.contracts)) : undefined;
915
937
  const hasOverriddenContracts = overriddenContracts !== undefined && overriddenContracts.size > 0;
916
- const skipKernels = hasOverriddenContracts;
917
938
 
918
- // Set overridden contracts on the sync service so it knows to skip syncing them
939
+ if (hasOverriddenContracts && !skipKernels) {
940
+ throw new Error(
941
+ 'Simulating with overridden contracts is not compatible with kernel execution. Please set skipKernels to true when simulating with overridden contracts.',
942
+ );
943
+ }
944
+ const contractFunctionSimulator = this.#getSimulatorForTx(overrides);
945
+
919
946
  if (hasOverriddenContracts) {
920
- this.contractSyncService.setOverriddenContracts(jobId, overriddenContracts);
947
+ // Overridden contracts don't have a sync function, so calling sync on them would fail.
948
+ // We exclude them so the sync service skips them entirely.
949
+ this.contractSyncService.setExcludedFromSync(jobId, overriddenContracts);
921
950
  }
922
951
 
923
952
  // Execution of private functions only; no proving, and no kernel logic.
@@ -1012,7 +1041,7 @@ export class PXE {
1012
1041
  inspect(txRequest),
1013
1042
  `simulatePublic=${simulatePublic}`,
1014
1043
  `skipTxValidation=${skipTxValidation}`,
1015
- `scopes=${scopes === 'ALL_SCOPES' ? scopes : scopes.map(s => s.toString()).join(', ')}`,
1044
+ `scopes=${scopes.map(s => s.toString()).join(', ')}`,
1016
1045
  );
1017
1046
  }
1018
1047
  });
@@ -1024,7 +1053,7 @@ export class PXE {
1024
1053
  */
1025
1054
  public executeUtility(
1026
1055
  call: FunctionCall,
1027
- { authwits, scopes }: ExecuteUtilityOpts = { scopes: 'ALL_SCOPES' },
1056
+ { authwits, scopes }: ExecuteUtilityOpts = { scopes: [] },
1028
1057
  ): Promise<UtilityExecutionResult> {
1029
1058
  // We disable concurrent executions since those might execute oracles which read and write to the PXE stores (e.g.
1030
1059
  // to the capsules), and we need to prevent concurrent runs from interfering with one another (e.g. attempting to
@@ -1049,7 +1078,7 @@ export class PXE {
1049
1078
  scopes,
1050
1079
  );
1051
1080
 
1052
- const executionResult = await this.#executeUtility(
1081
+ const { result: executionResult, offchainEffects } = await this.#executeUtility(
1053
1082
  contractFunctionSimulator,
1054
1083
  call,
1055
1084
  authwits ?? [],
@@ -1070,14 +1099,19 @@ export class PXE {
1070
1099
  };
1071
1100
 
1072
1101
  const simulationStats = contractFunctionSimulator.getStats();
1073
- return { result: executionResult, stats: { timings, nodeRPCCalls: simulationStats.nodeRPCCalls } };
1102
+ return {
1103
+ result: executionResult,
1104
+ offchainEffects,
1105
+ anchorBlockTimestamp: anchorBlockHeader.globalVariables.timestamp,
1106
+ stats: { timings, nodeRPCCalls: simulationStats.nodeRPCCalls },
1107
+ };
1074
1108
  } catch (err: any) {
1075
1109
  const { to, name, args } = call;
1076
1110
  const stringifiedArgs = args.map(arg => arg.toString()).join(', ');
1077
1111
  throw this.#contextualizeError(
1078
1112
  err,
1079
1113
  `executeUtility ${to}:${name}(${stringifiedArgs})`,
1080
- `scopes=${scopes === 'ALL_SCOPES' ? scopes : scopes.map(s => s.toString()).join(', ')}`,
1114
+ `scopes=${scopes.map(s => s.toString()).join(', ')}`,
1081
1115
  );
1082
1116
  }
1083
1117
  });