@aztec/pxe 0.0.1-commit.e6bd8901 → 0.0.1-commit.ec7ac5448

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