@aztec/pxe 0.0.1-commit.d431d1c → 0.0.1-commit.d939eb5aa

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