@aztec/pxe 0.0.1-commit.9372f48 → 0.0.1-commit.949a33fd8

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 (248) hide show
  1. package/dest/bin/check_oracle_version.js +4 -4
  2. package/dest/block_synchronizer/block_stream_source.d.ts +10 -0
  3. package/dest/block_synchronizer/block_stream_source.d.ts.map +1 -0
  4. package/dest/block_synchronizer/block_stream_source.js +37 -0
  5. package/dest/block_synchronizer/block_synchronizer.d.ts +9 -3
  6. package/dest/block_synchronizer/block_synchronizer.d.ts.map +1 -1
  7. package/dest/block_synchronizer/block_synchronizer.js +37 -11
  8. package/dest/config/index.d.ts +2 -2
  9. package/dest/config/index.d.ts.map +1 -1
  10. package/dest/config/index.js +8 -15
  11. package/dest/config/package_info.js +1 -1
  12. package/dest/contract_function_simulator/contract_function_simulator.d.ts +63 -29
  13. package/dest/contract_function_simulator/contract_function_simulator.d.ts.map +1 -1
  14. package/dest/contract_function_simulator/contract_function_simulator.js +207 -75
  15. package/dest/contract_function_simulator/ephemeral_array_service.d.ts +28 -0
  16. package/dest/contract_function_simulator/ephemeral_array_service.d.ts.map +1 -0
  17. package/dest/contract_function_simulator/ephemeral_array_service.js +78 -0
  18. package/dest/contract_function_simulator/execution_tagging_index_cache.d.ts +7 -7
  19. package/dest/contract_function_simulator/execution_tagging_index_cache.d.ts.map +1 -1
  20. package/dest/contract_function_simulator/execution_tagging_index_cache.js +19 -11
  21. package/dest/contract_function_simulator/index.d.ts +2 -1
  22. package/dest/contract_function_simulator/index.d.ts.map +1 -1
  23. package/dest/contract_function_simulator/index.js +1 -0
  24. package/dest/contract_function_simulator/noir-structs/event_validation_request.d.ts +4 -6
  25. package/dest/contract_function_simulator/noir-structs/event_validation_request.d.ts.map +1 -1
  26. package/dest/contract_function_simulator/noir-structs/event_validation_request.js +8 -10
  27. package/dest/contract_function_simulator/noir-structs/log_retrieval_request.d.ts +1 -1
  28. package/dest/contract_function_simulator/noir-structs/log_retrieval_request.js +1 -1
  29. package/dest/contract_function_simulator/noir-structs/log_retrieval_response.d.ts +2 -2
  30. package/dest/contract_function_simulator/noir-structs/log_retrieval_response.d.ts.map +1 -1
  31. package/dest/contract_function_simulator/noir-structs/log_retrieval_response.js +2 -4
  32. package/dest/contract_function_simulator/noir-structs/note_validation_request.d.ts +4 -7
  33. package/dest/contract_function_simulator/noir-structs/note_validation_request.d.ts.map +1 -1
  34. package/dest/contract_function_simulator/noir-structs/note_validation_request.js +6 -11
  35. package/dest/contract_function_simulator/oracle/interfaces.d.ts +63 -45
  36. package/dest/contract_function_simulator/oracle/interfaces.d.ts.map +1 -1
  37. package/dest/contract_function_simulator/oracle/legacy_oracle_mappings.d.ts +9 -0
  38. package/dest/contract_function_simulator/oracle/legacy_oracle_mappings.d.ts.map +1 -0
  39. package/dest/contract_function_simulator/oracle/legacy_oracle_mappings.js +47 -0
  40. package/dest/contract_function_simulator/oracle/oracle.d.ts +76 -44
  41. package/dest/contract_function_simulator/oracle/oracle.d.ts.map +1 -1
  42. package/dest/contract_function_simulator/oracle/oracle.js +307 -103
  43. package/dest/contract_function_simulator/oracle/private_execution.js +5 -3
  44. package/dest/contract_function_simulator/oracle/private_execution_oracle.d.ts +58 -84
  45. package/dest/contract_function_simulator/oracle/private_execution_oracle.d.ts.map +1 -1
  46. package/dest/contract_function_simulator/oracle/private_execution_oracle.js +122 -96
  47. package/dest/contract_function_simulator/oracle/utility_execution_oracle.d.ts +126 -66
  48. package/dest/contract_function_simulator/oracle/utility_execution_oracle.d.ts.map +1 -1
  49. package/dest/contract_function_simulator/oracle/utility_execution_oracle.js +366 -134
  50. package/dest/contract_function_simulator/pick_notes.d.ts +1 -1
  51. package/dest/contract_function_simulator/pick_notes.d.ts.map +1 -1
  52. package/dest/contract_function_simulator/pick_notes.js +20 -3
  53. package/dest/contract_function_simulator/proxied_contract_data_source.d.ts +1 -1
  54. package/dest/contract_function_simulator/proxied_contract_data_source.d.ts.map +1 -1
  55. package/dest/contract_function_simulator/proxied_contract_data_source.js +3 -0
  56. package/dest/contract_logging.d.ts +27 -0
  57. package/dest/contract_logging.d.ts.map +1 -0
  58. package/dest/contract_logging.js +38 -0
  59. package/dest/contract_sync/contract_sync_service.d.ts +44 -0
  60. package/dest/contract_sync/contract_sync_service.d.ts.map +1 -0
  61. package/dest/contract_sync/contract_sync_service.js +116 -0
  62. package/dest/contract_sync/helpers.d.ts +28 -0
  63. package/dest/contract_sync/helpers.d.ts.map +1 -0
  64. package/dest/contract_sync/{index.js → helpers.js} +19 -13
  65. package/dest/debug/pxe_debug_utils.d.ts +14 -10
  66. package/dest/debug/pxe_debug_utils.d.ts.map +1 -1
  67. package/dest/debug/pxe_debug_utils.js +16 -15
  68. package/dest/entrypoints/client/bundle/index.d.ts +3 -1
  69. package/dest/entrypoints/client/bundle/index.d.ts.map +1 -1
  70. package/dest/entrypoints/client/bundle/index.js +2 -0
  71. package/dest/entrypoints/client/bundle/utils.d.ts +2 -2
  72. package/dest/entrypoints/client/bundle/utils.d.ts.map +1 -1
  73. package/dest/entrypoints/client/bundle/utils.js +11 -3
  74. package/dest/entrypoints/client/lazy/index.d.ts +3 -1
  75. package/dest/entrypoints/client/lazy/index.d.ts.map +1 -1
  76. package/dest/entrypoints/client/lazy/index.js +2 -0
  77. package/dest/entrypoints/client/lazy/utils.d.ts +2 -2
  78. package/dest/entrypoints/client/lazy/utils.d.ts.map +1 -1
  79. package/dest/entrypoints/client/lazy/utils.js +11 -3
  80. package/dest/entrypoints/pxe_creation_options.d.ts +3 -1
  81. package/dest/entrypoints/pxe_creation_options.d.ts.map +1 -1
  82. package/dest/entrypoints/pxe_creation_options.js +3 -1
  83. package/dest/entrypoints/server/index.d.ts +4 -3
  84. package/dest/entrypoints/server/index.d.ts.map +1 -1
  85. package/dest/entrypoints/server/index.js +3 -2
  86. package/dest/entrypoints/server/utils.d.ts +2 -2
  87. package/dest/entrypoints/server/utils.d.ts.map +1 -1
  88. package/dest/entrypoints/server/utils.js +11 -3
  89. package/dest/events/event_service.d.ts +3 -2
  90. package/dest/events/event_service.d.ts.map +1 -1
  91. package/dest/events/event_service.js +26 -5
  92. package/dest/events/private_event_filter_validator.d.ts +3 -2
  93. package/dest/events/private_event_filter_validator.d.ts.map +1 -1
  94. package/dest/events/private_event_filter_validator.js +15 -0
  95. package/dest/logs/log_service.d.ts +7 -7
  96. package/dest/logs/log_service.d.ts.map +1 -1
  97. package/dest/logs/log_service.js +34 -51
  98. package/dest/messages/message_context_service.d.ts +17 -0
  99. package/dest/messages/message_context_service.d.ts.map +1 -0
  100. package/dest/messages/message_context_service.js +36 -0
  101. package/dest/notes/note_service.d.ts +4 -4
  102. package/dest/notes/note_service.d.ts.map +1 -1
  103. package/dest/notes/note_service.js +17 -7
  104. package/dest/notes_filter.d.ts +24 -0
  105. package/dest/notes_filter.d.ts.map +1 -0
  106. package/dest/notes_filter.js +4 -0
  107. package/dest/oracle_version.d.ts +4 -3
  108. package/dest/oracle_version.d.ts.map +1 -1
  109. package/dest/oracle_version.js +20 -10
  110. package/dest/private_kernel/hints/compute_tx_expiration_timestamp.d.ts +4 -0
  111. package/dest/private_kernel/hints/compute_tx_expiration_timestamp.d.ts.map +1 -0
  112. package/dest/private_kernel/hints/{compute_tx_include_by_timestamp.js → compute_tx_expiration_timestamp.js} +12 -12
  113. package/dest/private_kernel/hints/index.d.ts +1 -1
  114. package/dest/private_kernel/hints/index.js +1 -1
  115. package/dest/private_kernel/hints/private_kernel_reset_private_inputs_builder.d.ts +4 -3
  116. package/dest/private_kernel/hints/private_kernel_reset_private_inputs_builder.d.ts.map +1 -1
  117. package/dest/private_kernel/hints/private_kernel_reset_private_inputs_builder.js +129 -68
  118. package/dest/private_kernel/hints/test_utils.d.ts +122 -0
  119. package/dest/private_kernel/hints/test_utils.d.ts.map +1 -0
  120. package/dest/private_kernel/hints/test_utils.js +203 -0
  121. package/dest/private_kernel/private_kernel_execution_prover.d.ts +1 -1
  122. package/dest/private_kernel/private_kernel_execution_prover.d.ts.map +1 -1
  123. package/dest/private_kernel/private_kernel_execution_prover.js +18 -13
  124. package/dest/private_kernel/private_kernel_oracle.d.ts +10 -6
  125. package/dest/private_kernel/private_kernel_oracle.d.ts.map +1 -1
  126. package/dest/private_kernel/private_kernel_oracle.js +19 -18
  127. package/dest/pxe.d.ts +85 -24
  128. package/dest/pxe.d.ts.map +1 -1
  129. package/dest/pxe.js +165 -84
  130. package/dest/storage/anchor_block_store/anchor_block_store.js +1 -1
  131. package/dest/storage/capsule_store/capsule_service.d.ts +21 -0
  132. package/dest/storage/capsule_store/capsule_service.d.ts.map +1 -0
  133. package/dest/storage/capsule_store/capsule_service.js +50 -0
  134. package/dest/storage/capsule_store/capsule_store.d.ts +9 -9
  135. package/dest/storage/capsule_store/capsule_store.d.ts.map +1 -1
  136. package/dest/storage/capsule_store/capsule_store.js +36 -28
  137. package/dest/storage/capsule_store/index.d.ts +2 -1
  138. package/dest/storage/capsule_store/index.d.ts.map +1 -1
  139. package/dest/storage/capsule_store/index.js +1 -0
  140. package/dest/storage/contract_store/contract_store.d.ts +42 -15
  141. package/dest/storage/contract_store/contract_store.d.ts.map +1 -1
  142. package/dest/storage/contract_store/contract_store.js +148 -70
  143. package/dest/storage/metadata.d.ts +1 -1
  144. package/dest/storage/metadata.js +1 -1
  145. package/dest/storage/note_store/note_store.d.ts +3 -3
  146. package/dest/storage/note_store/note_store.d.ts.map +1 -1
  147. package/dest/storage/note_store/note_store.js +6 -4
  148. package/dest/storage/private_event_store/private_event_store.d.ts +1 -1
  149. package/dest/storage/private_event_store/private_event_store.d.ts.map +1 -1
  150. package/dest/storage/private_event_store/private_event_store.js +3 -0
  151. package/dest/storage/private_event_store/stored_private_event.js +1 -1
  152. package/dest/storage/tagging_store/recipient_tagging_store.d.ts +6 -6
  153. package/dest/storage/tagging_store/recipient_tagging_store.d.ts.map +1 -1
  154. package/dest/storage/tagging_store/sender_tagging_store.d.ts +29 -28
  155. package/dest/storage/tagging_store/sender_tagging_store.d.ts.map +1 -1
  156. package/dest/storage/tagging_store/sender_tagging_store.js +141 -115
  157. package/dest/tagging/get_all_logs_by_tags.d.ts +1 -1
  158. package/dest/tagging/get_all_logs_by_tags.d.ts.map +1 -1
  159. package/dest/tagging/get_all_logs_by_tags.js +17 -3
  160. package/dest/tagging/index.d.ts +3 -3
  161. package/dest/tagging/index.d.ts.map +1 -1
  162. package/dest/tagging/index.js +1 -1
  163. package/dest/tagging/recipient_sync/load_private_logs_for_sender_recipient_pair.d.ts +4 -5
  164. package/dest/tagging/recipient_sync/load_private_logs_for_sender_recipient_pair.d.ts.map +1 -1
  165. package/dest/tagging/recipient_sync/load_private_logs_for_sender_recipient_pair.js +8 -22
  166. package/dest/tagging/recipient_sync/utils/find_highest_indexes.js +2 -2
  167. package/dest/tagging/recipient_sync/utils/load_logs_for_range.d.ts +6 -7
  168. package/dest/tagging/recipient_sync/utils/load_logs_for_range.d.ts.map +1 -1
  169. package/dest/tagging/recipient_sync/utils/load_logs_for_range.js +12 -11
  170. package/dest/tagging/sender_sync/sync_sender_tagging_indexes.d.ts +4 -8
  171. package/dest/tagging/sender_sync/sync_sender_tagging_indexes.d.ts.map +1 -1
  172. package/dest/tagging/sender_sync/sync_sender_tagging_indexes.js +13 -7
  173. package/dest/tagging/sender_sync/utils/get_status_change_of_pending.d.ts +4 -3
  174. package/dest/tagging/sender_sync/utils/get_status_change_of_pending.d.ts.map +1 -1
  175. package/dest/tagging/sender_sync/utils/get_status_change_of_pending.js +20 -10
  176. package/dest/tagging/sender_sync/utils/load_and_store_new_tagging_indexes.d.ts +5 -7
  177. package/dest/tagging/sender_sync/utils/load_and_store_new_tagging_indexes.d.ts.map +1 -1
  178. package/dest/tagging/sender_sync/utils/load_and_store_new_tagging_indexes.js +36 -24
  179. package/package.json +25 -16
  180. package/src/bin/check_oracle_version.ts +4 -4
  181. package/src/block_synchronizer/block_stream_source.ts +52 -0
  182. package/src/block_synchronizer/block_synchronizer.ts +39 -11
  183. package/src/config/index.ts +3 -9
  184. package/src/config/package_info.ts +1 -1
  185. package/src/contract_function_simulator/contract_function_simulator.ts +367 -136
  186. package/src/contract_function_simulator/ephemeral_array_service.ts +110 -0
  187. package/src/contract_function_simulator/execution_tagging_index_cache.ts +19 -14
  188. package/src/contract_function_simulator/index.ts +1 -0
  189. package/src/contract_function_simulator/noir-structs/event_validation_request.ts +9 -9
  190. package/src/contract_function_simulator/noir-structs/log_retrieval_request.ts +1 -1
  191. package/src/contract_function_simulator/noir-structs/log_retrieval_response.ts +2 -5
  192. package/src/contract_function_simulator/noir-structs/note_validation_request.ts +4 -10
  193. package/src/contract_function_simulator/oracle/interfaces.ts +91 -53
  194. package/src/contract_function_simulator/oracle/legacy_oracle_mappings.ts +104 -0
  195. package/src/contract_function_simulator/oracle/oracle.ts +387 -142
  196. package/src/contract_function_simulator/oracle/private_execution.ts +4 -4
  197. package/src/contract_function_simulator/oracle/private_execution_oracle.ts +154 -185
  198. package/src/contract_function_simulator/oracle/utility_execution_oracle.ts +610 -165
  199. package/src/contract_function_simulator/pick_notes.ts +22 -3
  200. package/src/contract_function_simulator/proxied_contract_data_source.ts +8 -1
  201. package/src/contract_logging.ts +52 -0
  202. package/src/contract_sync/contract_sync_service.ts +176 -0
  203. package/src/contract_sync/{index.ts → helpers.ts} +22 -22
  204. package/src/debug/pxe_debug_utils.ts +48 -18
  205. package/src/entrypoints/client/bundle/index.ts +2 -0
  206. package/src/entrypoints/client/bundle/utils.ts +11 -4
  207. package/src/entrypoints/client/lazy/index.ts +2 -0
  208. package/src/entrypoints/client/lazy/utils.ts +11 -4
  209. package/src/entrypoints/pxe_creation_options.ts +7 -0
  210. package/src/entrypoints/server/index.ts +3 -2
  211. package/src/entrypoints/server/utils.ts +9 -10
  212. package/src/events/event_service.ts +30 -5
  213. package/src/events/private_event_filter_validator.ts +21 -1
  214. package/src/logs/log_service.ts +64 -92
  215. package/src/messages/message_context_service.ts +44 -0
  216. package/src/notes/note_service.ts +19 -8
  217. package/src/notes_filter.ts +24 -0
  218. package/src/oracle_version.ts +20 -10
  219. package/src/private_kernel/hints/{compute_tx_include_by_timestamp.ts → compute_tx_expiration_timestamp.ts} +13 -13
  220. package/src/private_kernel/hints/index.ts +1 -1
  221. package/src/private_kernel/hints/private_kernel_reset_private_inputs_builder.ts +164 -117
  222. package/src/private_kernel/hints/test_utils.ts +325 -0
  223. package/src/private_kernel/private_kernel_execution_prover.ts +18 -16
  224. package/src/private_kernel/private_kernel_oracle.ts +21 -21
  225. package/src/pxe.ts +305 -138
  226. package/src/storage/anchor_block_store/anchor_block_store.ts +1 -1
  227. package/src/storage/capsule_store/capsule_service.ts +90 -0
  228. package/src/storage/capsule_store/capsule_store.ts +44 -26
  229. package/src/storage/capsule_store/index.ts +1 -0
  230. package/src/storage/contract_store/contract_store.ts +181 -80
  231. package/src/storage/metadata.ts +1 -1
  232. package/src/storage/note_store/note_store.ts +9 -5
  233. package/src/storage/private_event_store/private_event_store.ts +4 -0
  234. package/src/storage/private_event_store/stored_private_event.ts +1 -1
  235. package/src/storage/tagging_store/recipient_tagging_store.ts +9 -5
  236. package/src/storage/tagging_store/sender_tagging_store.ts +185 -138
  237. package/src/tagging/get_all_logs_by_tags.ts +28 -4
  238. package/src/tagging/index.ts +2 -2
  239. package/src/tagging/recipient_sync/load_private_logs_for_sender_recipient_pair.ts +12 -25
  240. package/src/tagging/recipient_sync/utils/find_highest_indexes.ts +2 -2
  241. package/src/tagging/recipient_sync/utils/load_logs_for_range.ts +10 -15
  242. package/src/tagging/sender_sync/sync_sender_tagging_indexes.ts +23 -10
  243. package/src/tagging/sender_sync/utils/get_status_change_of_pending.ts +26 -11
  244. package/src/tagging/sender_sync/utils/load_and_store_new_tagging_indexes.ts +27 -26
  245. package/dest/contract_sync/index.d.ts +0 -23
  246. package/dest/contract_sync/index.d.ts.map +0 -1
  247. package/dest/private_kernel/hints/compute_tx_include_by_timestamp.d.ts +0 -4
  248. package/dest/private_kernel/hints/compute_tx_include_by_timestamp.d.ts.map +0 -1
@@ -1,15 +1,19 @@
1
1
  import { Aes128 } from '@aztec/foundation/crypto/aes128';
2
2
  import { Fr } from '@aztec/foundation/curves/bn254';
3
- import { LogLevels, applyStringFormatting, createLogger } from '@aztec/foundation/log';
3
+ import { LogLevels, createLogger } from '@aztec/foundation/log';
4
+ import { isProtocolContract } from '@aztec/protocol-contracts';
5
+ import { ExecutionError, extractCallStack, resolveAssertionMessageFromError, toACVMWitness, witnessMapToFields } from '@aztec/simulator/client';
4
6
  import { siloNullifier } from '@aztec/stdlib/hash';
5
7
  import { computeAddressSecret } from '@aztec/stdlib/keys';
6
- import { deriveEcdhSharedSecret } from '@aztec/stdlib/logs';
8
+ import { MessageContext, deriveAppSiloedSharedSecret } from '@aztec/stdlib/logs';
7
9
  import { getNonNullifiedL1ToL2MessageWitness } from '@aztec/stdlib/messaging';
8
10
  import { MerkleTreeId } from '@aztec/stdlib/trees';
11
+ import { createContractLogger, logContractMessage, stripAztecnrLogPrefix } from '../../contract_logging.js';
9
12
  import { EventService } from '../../events/event_service.js';
10
13
  import { LogService } from '../../logs/log_service.js';
11
14
  import { NoteService } from '../../notes/note_service.js';
12
- import { ORACLE_VERSION } from '../../oracle_version.js';
15
+ import { ORACLE_VERSION_MAJOR } from '../../oracle_version.js';
16
+ import { EphemeralArrayService } from '../ephemeral_array_service.js';
13
17
  import { EventValidationRequest } from '../noir-structs/event_validation_request.js';
14
18
  import { LogRetrievalRequest } from '../noir-structs/log_retrieval_request.js';
15
19
  import { LogRetrievalResponse } from '../noir-structs/log_retrieval_response.js';
@@ -17,9 +21,18 @@ import { NoteValidationRequest } from '../noir-structs/note_validation_request.j
17
21
  import { UtilityContext } from '../noir-structs/utility_context.js';
18
22
  import { pickNotes } from '../pick_notes.js';
19
23
  import { MessageLoadOracleInputs } from './message_load_oracle_inputs.js';
24
+ import { Oracle } from './oracle.js';
20
25
  /**
21
26
  * The oracle for an execution of utility contract functions.
22
27
  */ export class UtilityExecutionOracle {
28
+ isMisc = true;
29
+ isUtility = true;
30
+ contractLogger;
31
+ aztecnrLogger;
32
+ offchainEffects = [];
33
+ ephemeralArrayService = new EphemeralArrayService();
34
+ // We store oracle version to be able to show a nice error message when an oracle handler is missing.
35
+ contractOracleVersion;
23
36
  contractAddress;
24
37
  authWitnesses;
25
38
  capsules;
@@ -31,44 +44,73 @@ import { MessageLoadOracleInputs } from './message_load_oracle_inputs.js';
31
44
  aztecNode;
32
45
  recipientTaggingStore;
33
46
  senderAddressBookStore;
34
- capsuleStore;
47
+ capsuleService;
35
48
  privateEventStore;
49
+ messageContextService;
50
+ contractSyncService;
51
+ l2TipsStore;
36
52
  jobId;
37
- log;
53
+ logger;
38
54
  scopes;
39
- isMisc;
40
- isUtility;
41
- aztecNrDebugLog;
42
- constructor(contractAddress, /** List of transient auth witnesses to be used during this simulation */ authWitnesses, capsules, anchorBlockHeader, contractStore, noteStore, keyStore, addressStore, aztecNode, recipientTaggingStore, senderAddressBookStore, capsuleStore, privateEventStore, jobId, log = createLogger('simulator:client_view_context'), scopes){
43
- this.contractAddress = contractAddress;
44
- this.authWitnesses = authWitnesses;
45
- this.capsules = capsules;
46
- this.anchorBlockHeader = anchorBlockHeader;
47
- this.contractStore = contractStore;
48
- this.noteStore = noteStore;
49
- this.keyStore = keyStore;
50
- this.addressStore = addressStore;
51
- this.aztecNode = aztecNode;
52
- this.recipientTaggingStore = recipientTaggingStore;
53
- this.senderAddressBookStore = senderAddressBookStore;
54
- this.capsuleStore = capsuleStore;
55
- this.privateEventStore = privateEventStore;
56
- this.jobId = jobId;
57
- this.log = log;
58
- this.scopes = scopes;
59
- this.isMisc = true;
60
- this.isUtility = true;
61
- this.aztecNrDebugLog = createLogger('aztec-nr:debug_log');
62
- }
63
- utilityAssertCompatibleOracleVersion(version) {
64
- if (version !== ORACLE_VERSION) {
65
- throw new Error(`Incompatible oracle version. Expected version ${ORACLE_VERSION}, got ${version}.`);
55
+ simulator;
56
+ constructor(args){
57
+ this.contractAddress = args.contractAddress;
58
+ this.authWitnesses = args.authWitnesses;
59
+ this.capsules = args.capsules;
60
+ this.anchorBlockHeader = args.anchorBlockHeader;
61
+ this.contractStore = args.contractStore;
62
+ this.noteStore = args.noteStore;
63
+ this.keyStore = args.keyStore;
64
+ this.addressStore = args.addressStore;
65
+ this.aztecNode = args.aztecNode;
66
+ this.recipientTaggingStore = args.recipientTaggingStore;
67
+ this.senderAddressBookStore = args.senderAddressBookStore;
68
+ this.capsuleService = args.capsuleService;
69
+ this.privateEventStore = args.privateEventStore;
70
+ this.messageContextService = args.messageContextService;
71
+ this.contractSyncService = args.contractSyncService;
72
+ this.l2TipsStore = args.l2TipsStore;
73
+ this.jobId = args.jobId;
74
+ this.logger = args.log ?? createLogger('simulator:client_view_context');
75
+ this.scopes = args.scopes;
76
+ this.simulator = args.simulator;
77
+ }
78
+ assertCompatibleOracleVersion(major, minor) {
79
+ // TODO(F-416): Remove this hack on v5 when protocol contracts are redeployed.
80
+ // Protocol contracts/canonical contracts shipped with committed bytecode that cannot be changed. Assert they use
81
+ // the expected pinned version or the current one. We want to allow for both the pinned and the current versions
82
+ // because we want this code to work with both the pinned and unpinned version since some branches do not have the
83
+ // pinned contracts (like e.g. next)
84
+ const LEGACY_ORACLE_VERSION = 12;
85
+ if (isProtocolContract(this.contractAddress)) {
86
+ if (major !== LEGACY_ORACLE_VERSION && major !== ORACLE_VERSION_MAJOR) {
87
+ const hint = major > ORACLE_VERSION_MAJOR ? 'The contract was compiled with a newer version of Aztec.nr than your private environment supports. Upgrade your private environment to a compatible version.' : 'The contract was compiled with an older version of Aztec.nr than your private environment supports. Recompile the contract with a compatible version of Aztec.nr.';
88
+ throw new Error(`Incompatible private environment version: ${hint} See https://docs.aztec.network/errors/8 (expected oracle major version ${LEGACY_ORACLE_VERSION} or ${ORACLE_VERSION_MAJOR}, got ${major})`);
89
+ }
90
+ this.contractOracleVersion = {
91
+ major,
92
+ minor
93
+ };
94
+ return;
95
+ }
96
+ if (major !== ORACLE_VERSION_MAJOR) {
97
+ const hint = major > ORACLE_VERSION_MAJOR ? 'The contract was compiled with a newer version of Aztec.nr than your private environment supports. Upgrade your private environment to a compatible version.' : 'The contract was compiled with an older version of Aztec.nr than your private environment supports. Recompile the contract with a compatible version of Aztec.nr.';
98
+ throw new Error(`Incompatible private environment version: ${hint} See https://docs.aztec.network/errors/8 (expected oracle major version ${ORACLE_VERSION_MAJOR}, got ${major})`);
66
99
  }
100
+ // Major matches - store both major and minor for later diagnostics (e.g. when an oracle is not found)
101
+ this.contractOracleVersion = {
102
+ major,
103
+ minor
104
+ };
67
105
  }
68
- utilityGetRandomField() {
106
+ // Prefixed with "nonOracleFunction" as it is not used as an oracle handler.
107
+ nonOracleFunctionGetContractOracleVersion() {
108
+ return this.contractOracleVersion;
109
+ }
110
+ getRandomField() {
69
111
  return Fr.random();
70
112
  }
71
- utilityGetUtilityContext() {
113
+ getUtilityContext() {
72
114
  return new UtilityContext(this.anchorBlockHeader, this.contractAddress);
73
115
  }
74
116
  /**
@@ -76,17 +118,27 @@ import { MessageLoadOracleInputs } from './message_load_oracle_inputs.js';
76
118
  * @param pkMHash - The master public key hash.
77
119
  * @returns A Promise that resolves to nullifier keys.
78
120
  * @throws If the keys are not registered in the key store.
79
- */ utilityGetKeyValidationRequest(pkMHash) {
121
+ * @throws If scopes are defined and the account is not in the scopes.
122
+ */ async getKeyValidationRequest(pkMHash) {
123
+ let hasAccess = false;
124
+ for(let i = 0; i < this.scopes.length && !hasAccess; i++){
125
+ if (await this.keyStore.accountHasKey(this.scopes[i], pkMHash)) {
126
+ hasAccess = true;
127
+ }
128
+ }
129
+ if (!hasAccess) {
130
+ throw new Error(`Key validation request denied: no scoped account has a key with hash ${pkMHash.toString()}.`);
131
+ }
80
132
  return this.keyStore.getKeyValidationRequest(pkMHash, this.contractAddress);
81
133
  }
82
134
  /**
83
135
  * Fetches the index and sibling path of a leaf at a given block from the note hash tree.
84
- * @param anchorBlockHash - The hash of a block that contains the note hash tree root in which to find the membership
85
- * witness.
136
+ * @param blockHash - The hash of a block that contains the note hash tree root in which to find the
137
+ * membership witness.
86
138
  * @param noteHash - The note hash to find in the note hash tree.
87
139
  * @returns The membership witness containing the leaf index and sibling path
88
- */ utilityGetNoteHashMembershipWitness(anchorBlockHash, noteHash) {
89
- return this.aztecNode.getNoteHashMembershipWitness(anchorBlockHash, noteHash);
140
+ */ getNoteHashMembershipWitness(blockHash, noteHash) {
141
+ return this.#queryWithBlockHashNotAfterAnchor(blockHash, ()=>this.aztecNode.getNoteHashMembershipWitness(blockHash, noteHash));
90
142
  }
91
143
  /**
92
144
  * Fetches the index and sibling path of a block hash in the archive tree.
@@ -94,20 +146,23 @@ import { MessageLoadOracleInputs } from './message_load_oracle_inputs.js';
94
146
  * Block hashes are the leaves of the archive tree. Each time a new block is added to the chain,
95
147
  * its block hash is appended as a new leaf to the archive tree.
96
148
  *
97
- * @param anchorBlockHash - The hash of a block that contains the archive tree root in which to find the membership
149
+ * @param referenceBlockHash - The hash of a block that contains the archive tree root in which to find the membership
98
150
  * witness.
99
151
  * @param blockHash - The block hash to find in the archive tree.
100
152
  * @returns The membership witness containing the leaf index and sibling path
101
- */ utilityGetBlockHashMembershipWitness(anchorBlockHash, blockHash) {
102
- return this.aztecNode.getBlockHashMembershipWitness(anchorBlockHash, blockHash);
153
+ */ getBlockHashMembershipWitness(referenceBlockHash, blockHash) {
154
+ // Note that we validate that the reference block hash is at or before the anchor block - we don't test the block
155
+ // hash at all. If the block hash did not exist by the reference block hash, then the node will not return the
156
+ // membership witness as there is none.
157
+ return this.#queryWithBlockHashNotAfterAnchor(referenceBlockHash, ()=>this.aztecNode.getBlockHashMembershipWitness(referenceBlockHash, blockHash));
103
158
  }
104
159
  /**
105
160
  * Returns a nullifier membership witness for a given nullifier at a given block.
106
161
  * @param blockHash - The block hash at which to get the index.
107
162
  * @param nullifier - Nullifier we try to find witness for.
108
163
  * @returns The nullifier membership witness (if found).
109
- */ utilityGetNullifierMembershipWitness(blockHash, nullifier) {
110
- return this.aztecNode.getNullifierMembershipWitness(blockHash, nullifier);
164
+ */ getNullifierMembershipWitness(blockHash, nullifier) {
165
+ return this.#queryWithBlockHashNotAfterAnchor(blockHash, ()=>this.aztecNode.getNullifierMembershipWitness(blockHash, nullifier));
111
166
  }
112
167
  /**
113
168
  * Returns a low nullifier membership witness for a given nullifier at a given block.
@@ -117,22 +172,22 @@ import { MessageLoadOracleInputs } from './message_load_oracle_inputs.js';
117
172
  * @remarks Low nullifier witness can be used to perform a nullifier non-inclusion proof by leveraging the "linked
118
173
  * list structure" of leaves and proving that a lower nullifier is pointing to a bigger next value than the nullifier
119
174
  * we are trying to prove non-inclusion for.
120
- */ utilityGetLowNullifierMembershipWitness(blockHash, nullifier) {
121
- return this.aztecNode.getLowNullifierMembershipWitness(blockHash, nullifier);
175
+ */ getLowNullifierMembershipWitness(blockHash, nullifier) {
176
+ return this.#queryWithBlockHashNotAfterAnchor(blockHash, ()=>this.aztecNode.getLowNullifierMembershipWitness(blockHash, nullifier));
122
177
  }
123
178
  /**
124
179
  * Returns a public data tree witness for a given leaf slot at a given block.
125
180
  * @param blockHash - The block hash at which to get the index.
126
181
  * @param leafSlot - The slot of the public data tree to get the witness for.
127
182
  * @returns - The witness
128
- */ utilityGetPublicDataWitness(blockHash, leafSlot) {
129
- return this.aztecNode.getPublicDataWitness(blockHash, leafSlot);
183
+ */ getPublicDataWitness(blockHash, leafSlot) {
184
+ return this.#queryWithBlockHashNotAfterAnchor(blockHash, ()=>this.aztecNode.getPublicDataWitness(blockHash, leafSlot));
130
185
  }
131
186
  /**
132
187
  * Fetches a block header of a given block.
133
188
  * @param blockNumber - The number of a block of which to get the block header.
134
189
  * @returns Block extracted from a block with block number `blockNumber`.
135
- */ async utilityGetBlockHeader(blockNumber) {
190
+ */ async getBlockHeader(blockNumber) {
136
191
  const anchorBlockNumber = this.anchorBlockHeader.getBlockNumber();
137
192
  if (blockNumber > anchorBlockNumber) {
138
193
  throw new Error(`Block number ${blockNumber} is higher than current block ${anchorBlockNumber}`);
@@ -141,14 +196,20 @@ import { MessageLoadOracleInputs } from './message_load_oracle_inputs.js';
141
196
  return block?.header;
142
197
  }
143
198
  /**
144
- * Retrieve the complete address associated to a given address.
199
+ * Retrieve the public keys and partial address associated to a given address.
145
200
  * @param account - The account address.
146
- * @returns A complete address associated with the input address.
147
- * @throws An error if the account is not registered in the database.
148
- */ utilityGetPublicKeysAndPartialAddress(account) {
149
- return this.getCompleteAddress(account);
201
+ * @returns The public keys and partial address, or `undefined` if the account is not registered.
202
+ */ async getPublicKeysAndPartialAddress(account) {
203
+ const completeAddress = await this.addressStore.getCompleteAddress(account);
204
+ if (!completeAddress) {
205
+ return undefined;
206
+ }
207
+ return {
208
+ publicKeys: completeAddress.publicKeys,
209
+ partialAddress: completeAddress.partialAddress
210
+ };
150
211
  }
151
- async getCompleteAddress(account) {
212
+ async getCompleteAddressOrFail(account) {
152
213
  const completeAddress = await this.addressStore.getCompleteAddress(account);
153
214
  if (!completeAddress) {
154
215
  throw new Error(`No public key registered for address ${account}.
@@ -160,10 +221,7 @@ import { MessageLoadOracleInputs } from './message_load_oracle_inputs.js';
160
221
  * Returns a contract instance associated with an address or throws if not found.
161
222
  * @param address - Address.
162
223
  * @returns A contract instance.
163
- */ utilityGetContractInstance(address) {
164
- return this.getContractInstance(address);
165
- }
166
- async getContractInstance(address) {
224
+ */ async getContractInstance(address) {
167
225
  const instance = await this.contractStore.getContractInstance(address);
168
226
  if (!instance) {
169
227
  throw new Error(`No contract instance found for address ${address.toString()}`);
@@ -171,11 +229,10 @@ import { MessageLoadOracleInputs } from './message_load_oracle_inputs.js';
171
229
  return instance;
172
230
  }
173
231
  /**
174
- * Returns an auth witness for the given message hash. Checks on the list of transient witnesses
175
- * for this transaction first, and falls back to the local database if not found.
232
+ * Returns an auth witness for the given message hash from the list of transient witnesses for this transaction.
176
233
  * @param messageHash - Hash of the message to authenticate.
177
- * @returns Authentication witness for the requested message hash.
178
- */ utilityGetAuthWitness(messageHash) {
234
+ * @returns Authentication witness for the requested message hash, or undefined if not found.
235
+ */ getAuthWitness(messageHash) {
179
236
  return Promise.resolve(this.authWitnesses.find((w)=>w.requestHash.equals(messageHash))?.witness);
180
237
  }
181
238
  /**
@@ -199,7 +256,7 @@ import { MessageLoadOracleInputs } from './message_load_oracle_inputs.js';
199
256
  * @param offset - The starting index for pagination.
200
257
  * @param status - The status of notes to fetch.
201
258
  * @returns Array of note data.
202
- */ async utilityGetNotes(owner, storageSlot, numSelects, selectByIndexes, selectByOffsets, selectByLengths, selectValues, selectComparators, sortByIndexes, sortByOffsets, sortByLengths, sortOrder, limit, offset, status) {
259
+ */ async getNotes(owner, storageSlot, numSelects, selectByIndexes, selectByOffsets, selectByLengths, selectValues, selectComparators, sortByIndexes, sortByOffsets, sortByLengths, sortOrder, limit, offset, status) {
203
260
  const noteService = new NoteService(this.noteStore, this.aztecNode, this.anchorBlockHeader, this.jobId);
204
261
  const dbNotes = await noteService.getNotes(this.contractAddress, owner, storageSlot, status, this.scopes);
205
262
  return pickNotes(dbNotes, {
@@ -228,22 +285,25 @@ import { MessageLoadOracleInputs } from './message_load_oracle_inputs.js';
228
285
  * Check if a nullifier exists in the nullifier tree.
229
286
  * @param innerNullifier - The inner nullifier.
230
287
  * @returns A boolean indicating whether the nullifier exists in the tree or not.
231
- */ async utilityCheckNullifierExists(innerNullifier) {
232
- const nullifier = await siloNullifier(this.contractAddress, innerNullifier);
233
- const [leafIndex] = await this.aztecNode.findLeavesIndexes('latest', MerkleTreeId.NULLIFIER_TREE, [
288
+ */ async doesNullifierExist(innerNullifier) {
289
+ const [nullifier, anchorBlockHash] = await Promise.all([
290
+ siloNullifier(this.contractAddress, innerNullifier),
291
+ this.anchorBlockHeader.hash()
292
+ ]);
293
+ const [leafIndex] = await this.aztecNode.findLeavesIndexes(anchorBlockHash, MerkleTreeId.NULLIFIER_TREE, [
234
294
  nullifier
235
295
  ]);
236
296
  return leafIndex?.data !== undefined;
237
297
  }
238
298
  /**
239
- * Fetches a message from the executionStore, given its key.
299
+ * Returns the membership witness of an un-nullified L1 to L2 message.
240
300
  * @param contractAddress - Address of a contract by which the message was emitted.
241
301
  * @param messageHash - Hash of the message.
242
302
  * @param secret - Secret used to compute a nullifier.
243
303
  * @dev Contract address and secret are only used to compute the nullifier to get non-nullified messages
244
304
  * @returns The l1 to l2 membership witness (index of message in the tree and sibling path).
245
- */ async utilityGetL1ToL2MembershipWitness(contractAddress, messageHash, secret) {
246
- const [messageIndex, siblingPath] = await getNonNullifiedL1ToL2MessageWitness(this.aztecNode, contractAddress, messageHash, secret);
305
+ */ async getL1ToL2MembershipWitness(contractAddress, messageHash, secret) {
306
+ const [messageIndex, siblingPath] = await getNonNullifiedL1ToL2MessageWitness(this.aztecNode, contractAddress, messageHash, secret, await this.anchorBlockHeader.hash());
247
307
  return new MessageLoadOracleInputs(messageIndex, siblingPath);
248
308
  }
249
309
  /**
@@ -252,125 +312,297 @@ import { MessageLoadOracleInputs } from './message_load_oracle_inputs.js';
252
312
  * @param contractAddress - The address to read storage from.
253
313
  * @param startStorageSlot - The starting storage slot.
254
314
  * @param numberOfElements - Number of elements to read from the starting storage slot.
255
- */ async utilityStorageRead(blockHash, contractAddress, startStorageSlot, numberOfElements) {
256
- const slots = Array(numberOfElements).fill(0).map((_, i)=>new Fr(startStorageSlot.value + BigInt(i)));
257
- const values = await Promise.all(slots.map((storageSlot)=>this.aztecNode.getPublicStorageAt(blockHash, contractAddress, storageSlot)));
258
- this.log.debug(`Oracle storage read: slots=[${slots.map((slot)=>slot.toString()).join(', ')}] address=${contractAddress.toString()} values=[${values.join(', ')}]`);
259
- return values;
315
+ */ getFromPublicStorage(blockHash, contractAddress, startStorageSlot, numberOfElements) {
316
+ return this.#queryWithBlockHashNotAfterAnchor(blockHash, async ()=>{
317
+ const slots = Array(numberOfElements).fill(0).map((_, i)=>new Fr(startStorageSlot.value + BigInt(i)));
318
+ const values = await Promise.all(slots.map((storageSlot)=>this.aztecNode.getPublicStorageAt(blockHash, contractAddress, storageSlot)));
319
+ this.logger.debug(`Oracle storage read: slots=[${slots.map((slot)=>slot.toString()).join(', ')}] address=${contractAddress.toString()} values=[${values.join(', ')}]`);
320
+ return values;
321
+ });
322
+ }
323
+ /**
324
+ * Returns a per-contract logger whose output is prefixed with `contract:<name>(<addrAbbrev>)`.
325
+ */ async #getContractLogger() {
326
+ if (!this.contractLogger) {
327
+ // Purpose of instanceId is to distinguish logs from different instances of the same component. It makes sense
328
+ // to re-use jobId as instanceId here as executions of different PXE jobs are isolated.
329
+ this.contractLogger = await createContractLogger(this.contractAddress, (addr)=>this.contractStore.getDebugContractName(addr), 'user', {
330
+ instanceId: this.jobId
331
+ });
332
+ }
333
+ return this.contractLogger;
260
334
  }
261
- utilityDebugLog(level, message, fields) {
335
+ /**
336
+ * Returns a per-contract logger whose output is prefixed with `aztecnr:<name>(<addrAbbrev>)`.
337
+ */ async #getAztecnrLogger() {
338
+ if (!this.aztecnrLogger) {
339
+ // Purpose of instanceId is to distinguish logs from different instances of the same component. It makes sense
340
+ // to re-use jobId as instanceId here as executions of different PXE jobs are isolated.
341
+ this.aztecnrLogger = await createContractLogger(this.contractAddress, (addr)=>this.contractStore.getDebugContractName(addr), 'aztecnr', {
342
+ instanceId: this.jobId
343
+ });
344
+ }
345
+ return this.aztecnrLogger;
346
+ }
347
+ async log(level, message, fields) {
262
348
  if (!LogLevels[level]) {
263
- throw new Error(`Invalid debug log level: ${level}`);
349
+ throw new Error(`Invalid log level: ${level}`);
264
350
  }
265
- const levelName = LogLevels[level];
266
- this.aztecNrDebugLog[levelName](`${applyStringFormatting(message, fields)}`);
351
+ const { kind, message: strippedMessage } = stripAztecnrLogPrefix(message);
352
+ const logger = kind == 'aztecnr' ? await this.#getAztecnrLogger() : await this.#getContractLogger();
353
+ logContractMessage(logger, LogLevels[level], strippedMessage, fields);
267
354
  }
268
- async utilityFetchTaggedLogs(pendingTaggedLogArrayBaseSlot) {
269
- const logService = new LogService(this.aztecNode, this.anchorBlockHeader, this.keyStore, this.capsuleStore, this.recipientTaggingStore, this.senderAddressBookStore, this.addressStore, this.jobId, this.log.getBindings());
270
- const noteService = new NoteService(this.noteStore, this.aztecNode, this.anchorBlockHeader, this.jobId);
271
- // It is acceptable to run the following operations in parallel for several reasons:
272
- // 1. syncTaggedLogs does not write to the note store — it only stores the pending tagged logs in a capsule array,
273
- // which is then processed in Noir after this handler returns.
274
- // 2. Even if syncTaggedLogs did write to the note store, it would not cause inconsistent state.
275
- await Promise.all([
276
- logService.syncTaggedLogs(this.contractAddress, pendingTaggedLogArrayBaseSlot, this.scopes),
277
- noteService.syncNoteNullifiers(this.contractAddress)
278
- ]);
355
+ // Deprecated, only kept for backwards compatibility until Alpha v5 rolls out.
356
+ async getPendingTaggedLogs(pendingTaggedLogArrayBaseSlot, scope) {
357
+ const logService = this.#createLogService();
358
+ const logs = await logService.fetchTaggedLogs(this.contractAddress, scope);
359
+ await this.capsuleService.appendToCapsuleArray(this.contractAddress, pendingTaggedLogArrayBaseSlot, logs.map((log)=>log.toFields()), this.jobId, scope);
360
+ }
361
+ /** Fetches pending tagged logs into a freshly allocated ephemeral array and returns its base slot. */ async getPendingTaggedLogsV2(scope) {
362
+ const logService = this.#createLogService();
363
+ const logs = await logService.fetchTaggedLogs(this.contractAddress, scope);
364
+ return this.ephemeralArrayService.newArray(logs.map((log)=>log.toFields()));
365
+ }
366
+ #createLogService() {
367
+ return new LogService(this.aztecNode, this.anchorBlockHeader, this.l2TipsStore, this.keyStore, this.recipientTaggingStore, this.senderAddressBookStore, this.addressStore, this.jobId, this.logger.getBindings());
279
368
  }
280
369
  /**
281
- * Validates all note and event validation requests enqueued via `enqueue_note_for_validation` and
282
- * `enqueue_event_for_validation`, inserting them into the note database and event store respectively, making them
283
- * queryable via `get_notes` and `getPrivateEvents`.
370
+ * Legacy: validates note/event requests stored in capsule arrays.
284
371
  *
285
- * This automatically clears both validation request queues, so no further work needs to be done by the caller.
286
- * @param contractAddress - The address of the contract that the logs are tagged for.
287
- * @param noteValidationRequestsArrayBaseSlot - The base slot of capsule array containing note validation requests.
288
- * @param eventValidationRequestsArrayBaseSlot - The base slot of capsule array containing event validation requests.
289
- */ async utilityValidateAndStoreEnqueuedNotesAndEvents(contractAddress, noteValidationRequestsArrayBaseSlot, eventValidationRequestsArrayBaseSlot) {
372
+ * Deprecated, only kept for backwards compatibility until Alpha v5 rolls out.
373
+ */ async validateAndStoreEnqueuedNotesAndEvents(contractAddress, noteValidationRequestsArrayBaseSlot, eventValidationRequestsArrayBaseSlot, maxNotePackedLen, maxEventSerializedLen, scope) {
290
374
  // TODO(#10727): allow other contracts to store notes
291
375
  if (!this.contractAddress.equals(contractAddress)) {
292
376
  throw new Error(`Got a note validation request from ${contractAddress}, expected ${this.contractAddress}`);
293
377
  }
294
- // We read all note and event validation requests and process them all concurrently. This makes the process much
295
- // faster as we don't need to wait for the network round-trip.
296
- const noteValidationRequests = (await this.capsuleStore.readCapsuleArray(contractAddress, noteValidationRequestsArrayBaseSlot, this.jobId)).map(NoteValidationRequest.fromFields);
297
- const eventValidationRequests = (await this.capsuleStore.readCapsuleArray(contractAddress, eventValidationRequestsArrayBaseSlot, this.jobId)).map(EventValidationRequest.fromFields);
378
+ const noteValidationRequests = (await this.capsuleService.readCapsuleArray(contractAddress, noteValidationRequestsArrayBaseSlot, this.jobId, scope)).map((fields)=>NoteValidationRequest.fromFields(fields, maxNotePackedLen));
379
+ const eventValidationRequests = (await this.capsuleService.readCapsuleArray(contractAddress, eventValidationRequestsArrayBaseSlot, this.jobId, scope)).map((fields)=>EventValidationRequest.fromFields(fields, maxEventSerializedLen));
380
+ await this.#processValidationRequests(noteValidationRequests, eventValidationRequests, scope);
381
+ await this.capsuleService.setCapsuleArray(contractAddress, noteValidationRequestsArrayBaseSlot, [], this.jobId, scope);
382
+ await this.capsuleService.setCapsuleArray(contractAddress, eventValidationRequestsArrayBaseSlot, [], this.jobId, scope);
383
+ }
384
+ async validateAndStoreEnqueuedNotesAndEventsV2(noteValidationRequestsArrayBaseSlot, eventValidationRequestsArrayBaseSlot, maxNotePackedLen, maxEventSerializedLen, scope) {
385
+ const noteValidationRequests = this.ephemeralArrayService.readArrayAt(noteValidationRequestsArrayBaseSlot).map((fields)=>NoteValidationRequest.fromFields(fields, maxNotePackedLen));
386
+ const eventValidationRequests = this.ephemeralArrayService.readArrayAt(eventValidationRequestsArrayBaseSlot).map((fields)=>EventValidationRequest.fromFields(fields, maxEventSerializedLen));
387
+ await this.#processValidationRequests(noteValidationRequests, eventValidationRequests, scope);
388
+ }
389
+ /**
390
+ * Dispatches note and event validation requests to the service layer.
391
+ *
392
+ * This function is an auxiliary to support legacy (capsule backed) and new (ephemeral array backed) versions of the
393
+ * `validateAndStoreEnqueuedNotesAndEvents` oracle.
394
+ */ async #processValidationRequests(noteValidationRequests, eventValidationRequests, scope) {
298
395
  const noteService = new NoteService(this.noteStore, this.aztecNode, this.anchorBlockHeader, this.jobId);
299
- const noteStorePromises = noteValidationRequests.map((request)=>noteService.validateAndStoreNote(request.contractAddress, request.owner, request.storageSlot, request.randomness, request.noteNonce, request.content, request.noteHash, request.nullifier, request.txHash, request.recipient));
396
+ const noteStorePromises = noteValidationRequests.map((request)=>noteService.validateAndStoreNote(request.contractAddress, request.owner, request.storageSlot, request.randomness, request.noteNonce, request.content, request.noteHash, request.nullifier, request.txHash, scope));
300
397
  const eventService = new EventService(this.anchorBlockHeader, this.aztecNode, this.privateEventStore, this.jobId);
301
- const eventStorePromises = eventValidationRequests.map((request)=>eventService.validateAndStoreEvent(request.contractAddress, request.eventTypeId, request.randomness, request.serializedEvent, request.eventCommitment, request.txHash, request.recipient));
398
+ const eventStorePromises = eventValidationRequests.map((request)=>eventService.validateAndStoreEvent(request.contractAddress, request.eventTypeId, request.randomness, request.serializedEvent, request.eventCommitment, request.txHash, scope));
302
399
  await Promise.all([
303
400
  ...noteStorePromises,
304
401
  ...eventStorePromises
305
402
  ]);
306
- // Requests are cleared once we're done.
307
- await this.capsuleStore.setCapsuleArray(contractAddress, noteValidationRequestsArrayBaseSlot, [], this.jobId);
308
- await this.capsuleStore.setCapsuleArray(contractAddress, eventValidationRequestsArrayBaseSlot, [], this.jobId);
309
403
  }
310
- async utilityBulkRetrieveLogs(contractAddress, logRetrievalRequestsArrayBaseSlot, logRetrievalResponsesArrayBaseSlot) {
404
+ async getLogsByTag(contractAddress, logRetrievalRequestsArrayBaseSlot, logRetrievalResponsesArrayBaseSlot, scope) {
311
405
  // TODO(#10727): allow other contracts to process partial notes
312
406
  if (!this.contractAddress.equals(contractAddress)) {
313
407
  throw new Error(`Got a note validation request from ${contractAddress}, expected ${this.contractAddress}`);
314
408
  }
315
409
  // We read all log retrieval requests and process them all concurrently. This makes the process much faster as we
316
410
  // don't need to wait for the network round-trip.
317
- const logRetrievalRequests = (await this.capsuleStore.readCapsuleArray(contractAddress, logRetrievalRequestsArrayBaseSlot, this.jobId)).map(LogRetrievalRequest.fromFields);
318
- const logService = new LogService(this.aztecNode, this.anchorBlockHeader, this.keyStore, this.capsuleStore, this.recipientTaggingStore, this.senderAddressBookStore, this.addressStore, this.jobId, this.log.getBindings());
319
- const maybeLogRetrievalResponses = await logService.bulkRetrieveLogs(logRetrievalRequests);
411
+ const logRetrievalRequests = (await this.capsuleService.readCapsuleArray(contractAddress, logRetrievalRequestsArrayBaseSlot, this.jobId, scope)).map(LogRetrievalRequest.fromFields);
412
+ const logService = this.#createLogService();
413
+ const maybeLogRetrievalResponses = await logService.fetchLogsByTag(contractAddress, logRetrievalRequests);
320
414
  // Requests are cleared once we're done.
321
- await this.capsuleStore.setCapsuleArray(contractAddress, logRetrievalRequestsArrayBaseSlot, [], this.jobId);
415
+ await this.capsuleService.setCapsuleArray(contractAddress, logRetrievalRequestsArrayBaseSlot, [], this.jobId, scope);
322
416
  // The responses are stored as Option<LogRetrievalResponse> in a second CapsuleArray.
323
- await this.capsuleStore.setCapsuleArray(contractAddress, logRetrievalResponsesArrayBaseSlot, maybeLogRetrievalResponses.map(LogRetrievalResponse.toSerializedOption), this.jobId);
417
+ await this.capsuleService.setCapsuleArray(contractAddress, logRetrievalResponsesArrayBaseSlot, maybeLogRetrievalResponses.map(LogRetrievalResponse.toSerializedOption), this.jobId, scope);
418
+ }
419
+ async getLogsByTagV2(requestArrayBaseSlot) {
420
+ const logRetrievalRequests = this.ephemeralArrayService.readArrayAt(requestArrayBaseSlot).map(LogRetrievalRequest.fromFields);
421
+ const logService = this.#createLogService();
422
+ const maybeLogRetrievalResponses = await logService.fetchLogsByTag(this.contractAddress, logRetrievalRequests);
423
+ return this.ephemeralArrayService.newArray(maybeLogRetrievalResponses.map(LogRetrievalResponse.toSerializedOption));
324
424
  }
325
- utilityStoreCapsule(contractAddress, slot, capsule) {
425
+ // Deprecated, only kept for backwards compatibility until Alpha v5 rolls out.
426
+ async getMessageContextsByTxHash(contractAddress, messageContextRequestsArrayBaseSlot, messageContextResponsesArrayBaseSlot, scope) {
427
+ try {
428
+ if (!this.contractAddress.equals(contractAddress)) {
429
+ throw new Error(`Got a message context request from ${contractAddress}, expected ${this.contractAddress}`);
430
+ }
431
+ // TODO(@mverzilli): this is a prime example of where using an ephemeral array would make much more sense, we don't
432
+ // need scopes here, we just need a bit of shared memory to cross boundaries between Noir and TS.
433
+ // At the same time, we don't want to allow any global scope access other than where backwards compatibility
434
+ // forces us to. Hence we need the scope here to be artificial.
435
+ const requestCapsules = await this.capsuleService.readCapsuleArray(contractAddress, messageContextRequestsArrayBaseSlot, this.jobId, scope);
436
+ const txHashes = requestCapsules.map((fields, i)=>{
437
+ if (fields.length !== 1) {
438
+ throw new Error(`Malformed message context request at index ${i}: expected 1 field (tx hash), got ${fields.length}`);
439
+ }
440
+ return fields[0];
441
+ });
442
+ const maybeMessageContexts = await this.messageContextService.getMessageContextsByTxHash(txHashes, this.anchorBlockHeader.getBlockNumber());
443
+ // Leave response in response capsule array.
444
+ await this.capsuleService.setCapsuleArray(contractAddress, messageContextResponsesArrayBaseSlot, maybeMessageContexts.map(MessageContext.toSerializedOption), this.jobId, scope);
445
+ } finally{
446
+ await this.capsuleService.setCapsuleArray(contractAddress, messageContextRequestsArrayBaseSlot, [], this.jobId, scope);
447
+ }
448
+ }
449
+ /** Reads tx hash requests from an ephemeral array, resolves their contexts, and returns the response slot. */ async getMessageContextsByTxHashV2(requestArrayBaseSlot) {
450
+ const requestFields = this.ephemeralArrayService.readArrayAt(requestArrayBaseSlot);
451
+ const txHashes = requestFields.map((fields, i)=>{
452
+ if (fields.length !== 1) {
453
+ throw new Error(`Malformed message context request at index ${i}: expected 1 field (tx hash), got ${fields.length}`);
454
+ }
455
+ return fields[0];
456
+ });
457
+ const maybeMessageContexts = await this.messageContextService.getMessageContextsByTxHash(txHashes, this.anchorBlockHeader.getBlockNumber());
458
+ return this.ephemeralArrayService.newArray(maybeMessageContexts.map(MessageContext.toSerializedOption));
459
+ }
460
+ setCapsule(contractAddress, slot, capsule, scope) {
326
461
  if (!contractAddress.equals(this.contractAddress)) {
327
462
  // TODO(#10727): instead of this check that this.contractAddress is allowed to access the external DB
328
463
  throw new Error(`Contract ${contractAddress} is not allowed to access ${this.contractAddress}'s PXE DB`);
329
464
  }
330
- this.capsuleStore.storeCapsule(this.contractAddress, slot, capsule, this.jobId);
331
- return Promise.resolve();
465
+ this.capsuleService.setCapsule(contractAddress, slot, capsule, this.jobId, scope);
332
466
  }
333
- async utilityLoadCapsule(contractAddress, slot) {
467
+ getCapsule(contractAddress, slot, scope) {
334
468
  if (!contractAddress.equals(this.contractAddress)) {
335
469
  // TODO(#10727): instead of this check that this.contractAddress is allowed to access the external DB
336
470
  throw new Error(`Contract ${contractAddress} is not allowed to access ${this.contractAddress}'s PXE DB`);
337
471
  }
338
- return(// TODO(#12425): On the following line, the pertinent capsule gets overshadowed by the transient one. Tackle this.
339
- this.capsules.find((c)=>c.contractAddress.equals(contractAddress) && c.storageSlot.equals(slot))?.data ?? await this.capsuleStore.loadCapsule(this.contractAddress, slot, this.jobId));
472
+ return this.capsuleService.getCapsule(contractAddress, slot, this.jobId, scope, this.capsules);
340
473
  }
341
- utilityDeleteCapsule(contractAddress, slot) {
474
+ deleteCapsule(contractAddress, slot, scope) {
342
475
  if (!contractAddress.equals(this.contractAddress)) {
343
476
  // TODO(#10727): instead of this check that this.contractAddress is allowed to access the external DB
344
477
  throw new Error(`Contract ${contractAddress} is not allowed to access ${this.contractAddress}'s PXE DB`);
345
478
  }
346
- this.capsuleStore.deleteCapsule(this.contractAddress, slot, this.jobId);
347
- return Promise.resolve();
479
+ this.capsuleService.deleteCapsule(contractAddress, slot, this.jobId, scope);
348
480
  }
349
- utilityCopyCapsule(contractAddress, srcSlot, dstSlot, numEntries) {
481
+ copyCapsule(contractAddress, srcSlot, dstSlot, numEntries, scope) {
350
482
  if (!contractAddress.equals(this.contractAddress)) {
351
483
  // TODO(#10727): instead of this check that this.contractAddress is allowed to access the external DB
352
484
  throw new Error(`Contract ${contractAddress} is not allowed to access ${this.contractAddress}'s PXE DB`);
353
485
  }
354
- return this.capsuleStore.copyCapsule(this.contractAddress, srcSlot, dstSlot, numEntries, this.jobId);
486
+ return this.capsuleService.copyCapsule(contractAddress, srcSlot, dstSlot, numEntries, this.jobId, scope);
487
+ }
488
+ /**
489
+ * Clears cached sync state for a contract for a set of scopes, forcing re-sync on the next query so that newly
490
+ * stored notes or events are discovered.
491
+ */ setContractSyncCacheInvalid(contractAddress, scopes) {
492
+ if (!contractAddress.equals(this.contractAddress)) {
493
+ throw new Error(`Contract ${this.contractAddress} cannot invalidate sync cache of ${contractAddress}`);
494
+ }
495
+ this.contractSyncService.invalidateContractForScopes(contractAddress, scopes);
355
496
  }
356
497
  // TODO(#11849): consider replacing this oracle with a pure Noir implementation of aes decryption.
357
- utilityAes128Decrypt(ciphertext, iv, symKey) {
498
+ decryptAes128(ciphertext, iv, symKey) {
358
499
  const aes128 = new Aes128();
359
500
  return aes128.decryptBufferCBC(ciphertext, iv, symKey);
360
501
  }
361
502
  /**
362
- * Retrieves the shared secret for a given address and ephemeral public key.
503
+ * Retrieves the app-siloed shared secret for a given address and ephemeral public key.
363
504
  * @param address - The address to get the secret for.
364
505
  * @param ephPk - The ephemeral public key to get the secret for.
365
- * @returns The secret for the given address.
366
- */ utilityGetSharedSecret(address, ephPk) {
367
- return this.getSharedSecret(address, ephPk);
368
- }
369
- async getSharedSecret(address, ephPk) {
370
- // TODO(#12656): return an app-siloed secret
371
- const recipientCompleteAddress = await this.getCompleteAddress(address);
506
+ * @param contractAddress - The contract address for app-siloing (validated against execution context).
507
+ * @returns The app-siloed shared secret as a Field.
508
+ */ async getSharedSecret(address, ephPk, contractAddress) {
509
+ if (!contractAddress.equals(this.contractAddress)) {
510
+ throw new Error(`getSharedSecret called with contract address ${contractAddress}, expected ${this.contractAddress}`);
511
+ }
512
+ const recipientCompleteAddress = await this.getCompleteAddressOrFail(address);
372
513
  const ivskM = await this.keyStore.getMasterSecretKey(recipientCompleteAddress.publicKeys.masterIncomingViewingPublicKey);
373
514
  const addressSecret = await computeAddressSecret(await recipientCompleteAddress.getPreaddress(), ivskM);
374
- return deriveEcdhSharedSecret(addressSecret, ephPk);
515
+ return deriveAppSiloedSharedSecret(addressSecret, ephPk, this.contractAddress);
516
+ }
517
+ pushEphemeral(slot, elements) {
518
+ return this.ephemeralArrayService.push(slot, elements);
519
+ }
520
+ popEphemeral(slot) {
521
+ return this.ephemeralArrayService.pop(slot);
522
+ }
523
+ getEphemeral(slot, index) {
524
+ return this.ephemeralArrayService.get(slot, index);
525
+ }
526
+ setEphemeral(slot, index, elements) {
527
+ this.ephemeralArrayService.set(slot, index, elements);
528
+ }
529
+ getEphemeralLen(slot) {
530
+ return this.ephemeralArrayService.len(slot);
531
+ }
532
+ removeEphemeral(slot, index) {
533
+ this.ephemeralArrayService.remove(slot, index);
534
+ }
535
+ clearEphemeral(slot) {
536
+ this.ephemeralArrayService.clear(slot);
537
+ }
538
+ emitOffchainEffect(data) {
539
+ this.offchainEffects.push({
540
+ data,
541
+ contractAddress: this.contractAddress
542
+ });
543
+ return Promise.resolve();
544
+ }
545
+ /** Executes another utility function from within this one and returns its serialized return values. */ async callUtilityFunction(targetContractAddress, functionSelector, args) {
546
+ // TODO(F-29): We want to support cross-contract utility calls, but doing so safely requires wallets to have
547
+ // a way to authorize which contracts can be called transitively, since those calls may expose private state.
548
+ // Until that is in place, restrict nested utility calls to the same contract only.
549
+ if (!targetContractAddress.equals(this.contractAddress)) {
550
+ throw new Error(`Cross-contract utility calls are not yet supported: cannot call ${targetContractAddress} from utility function on ${this.contractAddress}.`);
551
+ }
552
+ this.logger.debug(`Calling nested utility function ${targetContractAddress}:${functionSelector} from ${this.contractAddress}`);
553
+ const targetArtifact = await this.contractStore.getFunctionArtifactWithDebugMetadata(targetContractAddress, functionSelector);
554
+ const nestedOracle = new UtilityExecutionOracle({
555
+ contractAddress: targetContractAddress,
556
+ authWitnesses: this.authWitnesses,
557
+ capsules: this.capsules,
558
+ anchorBlockHeader: this.anchorBlockHeader,
559
+ contractStore: this.contractStore,
560
+ noteStore: this.noteStore,
561
+ keyStore: this.keyStore,
562
+ addressStore: this.addressStore,
563
+ aztecNode: this.aztecNode,
564
+ recipientTaggingStore: this.recipientTaggingStore,
565
+ senderAddressBookStore: this.senderAddressBookStore,
566
+ capsuleService: this.capsuleService,
567
+ privateEventStore: this.privateEventStore,
568
+ messageContextService: this.messageContextService,
569
+ contractSyncService: this.contractSyncService,
570
+ l2TipsStore: this.l2TipsStore,
571
+ jobId: this.jobId,
572
+ scopes: this.scopes,
573
+ simulator: this.simulator,
574
+ log: this.logger
575
+ });
576
+ const initialWitness = toACVMWitness(0, args);
577
+ const acvmCallback = new Oracle(nestedOracle);
578
+ const acirExecutionResult = await this.simulator.executeUserCircuit(initialWitness, targetArtifact, acvmCallback.toACIRCallback()).catch((err)=>{
579
+ err.message = resolveAssertionMessageFromError(err, targetArtifact);
580
+ throw new ExecutionError(err.message, {
581
+ contractAddress: targetContractAddress,
582
+ functionSelector
583
+ }, extractCallStack(err, targetArtifact.debug), {
584
+ cause: err
585
+ });
586
+ });
587
+ return witnessMapToFields(acirExecutionResult.returnWitness);
588
+ }
589
+ /** Returns offchain effects collected during execution. */ getOffchainEffects() {
590
+ return this.offchainEffects;
591
+ }
592
+ /** Runs a query concurrently with a validation that the block hash is not ahead of the anchor block. */ async #queryWithBlockHashNotAfterAnchor(blockHash, query) {
593
+ const [response] = await Promise.all([
594
+ query(),
595
+ (async ()=>{
596
+ const block = await this.aztecNode.getBlock(blockHash);
597
+ const header = block?.header;
598
+ if (!header) {
599
+ throw new Error(`Could not find block header for block hash ${blockHash}`);
600
+ }
601
+ if (header.getBlockNumber() > this.anchorBlockHeader.getBlockNumber()) {
602
+ throw new Error(`Made a node query with a reference block hash ${blockHash} with block number ${header.getBlockNumber()}, which is ahead of the anchor block number ${this.anchorBlockHeader.getBlockNumber()} (from anchor block hash ${await this.anchorBlockHeader.hash()}).`);
603
+ }
604
+ })()
605
+ ]);
606
+ return response;
375
607
  }
376
608
  }