@aztec/pxe 0.0.1-commit.b655e406 → 0.0.1-commit.b6e433891

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 (434) hide show
  1. package/dest/access_scopes.d.ts +9 -0
  2. package/dest/access_scopes.d.ts.map +1 -0
  3. package/dest/access_scopes.js +6 -0
  4. package/dest/bin/check_oracle_version.d.ts +1 -1
  5. package/dest/bin/check_oracle_version.js +105 -15
  6. package/dest/block_synchronizer/block_synchronizer.d.ts +45 -0
  7. package/dest/block_synchronizer/block_synchronizer.d.ts.map +1 -0
  8. package/dest/block_synchronizer/block_synchronizer.js +153 -0
  9. package/dest/block_synchronizer/index.d.ts +2 -0
  10. package/dest/block_synchronizer/index.d.ts.map +1 -0
  11. package/dest/block_synchronizer/index.js +1 -0
  12. package/dest/config/index.d.ts +7 -13
  13. package/dest/config/index.d.ts.map +1 -1
  14. package/dest/config/index.js +25 -14
  15. package/dest/config/package_info.d.ts +1 -1
  16. package/dest/config/package_info.js +1 -1
  17. package/dest/contract_function_simulator/benchmarked_node.d.ts +9 -0
  18. package/dest/contract_function_simulator/benchmarked_node.d.ts.map +1 -0
  19. package/dest/contract_function_simulator/benchmarked_node.js +77 -0
  20. package/dest/contract_function_simulator/contract_function_simulator.d.ts +84 -26
  21. package/dest/contract_function_simulator/contract_function_simulator.d.ts.map +1 -1
  22. package/dest/contract_function_simulator/contract_function_simulator.js +251 -85
  23. package/dest/contract_function_simulator/execution_note_cache.d.ts +25 -14
  24. package/dest/contract_function_simulator/execution_note_cache.d.ts.map +1 -1
  25. package/dest/contract_function_simulator/execution_note_cache.js +59 -34
  26. package/dest/contract_function_simulator/execution_tagging_index_cache.d.ts +7 -7
  27. package/dest/contract_function_simulator/execution_tagging_index_cache.d.ts.map +1 -1
  28. package/dest/contract_function_simulator/execution_tagging_index_cache.js +19 -11
  29. package/dest/contract_function_simulator/hashed_values_cache.d.ts +2 -2
  30. package/dest/contract_function_simulator/hashed_values_cache.d.ts.map +1 -1
  31. package/dest/contract_function_simulator/index.d.ts +3 -2
  32. package/dest/contract_function_simulator/index.d.ts.map +1 -1
  33. package/dest/contract_function_simulator/index.js +2 -1
  34. package/dest/contract_function_simulator/noir-structs/event_validation_request.d.ts +6 -6
  35. package/dest/contract_function_simulator/noir-structs/event_validation_request.d.ts.map +1 -1
  36. package/dest/contract_function_simulator/noir-structs/event_validation_request.js +11 -7
  37. package/dest/contract_function_simulator/noir-structs/log_retrieval_request.d.ts +5 -4
  38. package/dest/contract_function_simulator/noir-structs/log_retrieval_request.d.ts.map +1 -1
  39. package/dest/contract_function_simulator/noir-structs/log_retrieval_request.js +7 -6
  40. package/dest/contract_function_simulator/noir-structs/log_retrieval_response.d.ts +3 -3
  41. package/dest/contract_function_simulator/noir-structs/log_retrieval_response.d.ts.map +1 -1
  42. package/dest/contract_function_simulator/noir-structs/log_retrieval_response.js +2 -4
  43. package/dest/contract_function_simulator/noir-structs/message_tx_context.d.ts +16 -0
  44. package/dest/contract_function_simulator/noir-structs/message_tx_context.d.ts.map +1 -0
  45. package/dest/contract_function_simulator/noir-structs/message_tx_context.js +57 -0
  46. package/dest/contract_function_simulator/noir-structs/note_validation_request.d.ts +7 -7
  47. package/dest/contract_function_simulator/noir-structs/note_validation_request.d.ts.map +1 -1
  48. package/dest/contract_function_simulator/noir-structs/note_validation_request.js +14 -7
  49. package/dest/contract_function_simulator/noir-structs/utility_context.d.ts +4 -10
  50. package/dest/contract_function_simulator/noir-structs/utility_context.d.ts.map +1 -1
  51. package/dest/contract_function_simulator/noir-structs/utility_context.js +7 -18
  52. package/dest/contract_function_simulator/oracle/index.d.ts +1 -1
  53. package/dest/contract_function_simulator/oracle/interfaces.d.ts +64 -49
  54. package/dest/contract_function_simulator/oracle/interfaces.d.ts.map +1 -1
  55. package/dest/contract_function_simulator/oracle/legacy_oracle_mappings.d.ts +9 -0
  56. package/dest/contract_function_simulator/oracle/legacy_oracle_mappings.d.ts.map +1 -0
  57. package/dest/contract_function_simulator/oracle/legacy_oracle_mappings.js +42 -0
  58. package/dest/contract_function_simulator/oracle/message_load_oracle_inputs.d.ts +2 -2
  59. package/dest/contract_function_simulator/oracle/message_load_oracle_inputs.d.ts.map +1 -1
  60. package/dest/contract_function_simulator/oracle/message_load_oracle_inputs.js +1 -1
  61. package/dest/contract_function_simulator/oracle/note_packing_utils.d.ts +14 -8
  62. package/dest/contract_function_simulator/oracle/note_packing_utils.d.ts.map +1 -1
  63. package/dest/contract_function_simulator/oracle/note_packing_utils.js +16 -11
  64. package/dest/contract_function_simulator/oracle/oracle.d.ts +45 -41
  65. package/dest/contract_function_simulator/oracle/oracle.d.ts.map +1 -1
  66. package/dest/contract_function_simulator/oracle/oracle.js +226 -117
  67. package/dest/contract_function_simulator/oracle/private_execution.d.ts +2 -27
  68. package/dest/contract_function_simulator/oracle/private_execution.d.ts.map +1 -1
  69. package/dest/contract_function_simulator/oracle/private_execution.js +6 -40
  70. package/dest/contract_function_simulator/oracle/private_execution_oracle.d.ts +67 -88
  71. package/dest/contract_function_simulator/oracle/private_execution_oracle.d.ts.map +1 -1
  72. package/dest/contract_function_simulator/oracle/private_execution_oracle.js +140 -118
  73. package/dest/contract_function_simulator/oracle/utility_execution_oracle.d.ts +149 -56
  74. package/dest/contract_function_simulator/oracle/utility_execution_oracle.d.ts.map +1 -1
  75. package/dest/contract_function_simulator/oracle/utility_execution_oracle.js +290 -104
  76. package/dest/contract_function_simulator/pick_notes.d.ts +2 -2
  77. package/dest/contract_function_simulator/pick_notes.d.ts.map +1 -1
  78. package/dest/contract_function_simulator/pick_notes.js +1 -1
  79. package/dest/contract_function_simulator/proxied_contract_data_source.d.ts +4 -4
  80. package/dest/contract_function_simulator/proxied_contract_data_source.d.ts.map +1 -1
  81. package/dest/contract_function_simulator/proxied_contract_data_source.js +23 -5
  82. package/dest/contract_logging.d.ts +22 -0
  83. package/dest/contract_logging.d.ts.map +1 -0
  84. package/dest/contract_logging.js +23 -0
  85. package/dest/contract_sync/contract_sync_service.d.ts +45 -0
  86. package/dest/contract_sync/contract_sync_service.d.ts.map +1 -0
  87. package/dest/contract_sync/contract_sync_service.js +114 -0
  88. package/dest/contract_sync/helpers.d.ts +29 -0
  89. package/dest/contract_sync/helpers.d.ts.map +1 -0
  90. package/dest/contract_sync/helpers.js +55 -0
  91. package/dest/debug/pxe_debug_utils.d.ts +45 -0
  92. package/dest/debug/pxe_debug_utils.d.ts.map +1 -0
  93. package/dest/debug/pxe_debug_utils.js +48 -0
  94. package/dest/entrypoints/client/bundle/index.d.ts +4 -2
  95. package/dest/entrypoints/client/bundle/index.d.ts.map +1 -1
  96. package/dest/entrypoints/client/bundle/index.js +3 -1
  97. package/dest/entrypoints/client/bundle/utils.d.ts +1 -1
  98. package/dest/entrypoints/client/bundle/utils.d.ts.map +1 -1
  99. package/dest/entrypoints/client/bundle/utils.js +33 -10
  100. package/dest/entrypoints/client/lazy/index.d.ts +4 -2
  101. package/dest/entrypoints/client/lazy/index.d.ts.map +1 -1
  102. package/dest/entrypoints/client/lazy/index.js +3 -1
  103. package/dest/entrypoints/client/lazy/utils.d.ts +2 -2
  104. package/dest/entrypoints/client/lazy/utils.d.ts.map +1 -1
  105. package/dest/entrypoints/client/lazy/utils.js +34 -11
  106. package/dest/entrypoints/pxe_creation_options.d.ts +7 -3
  107. package/dest/entrypoints/pxe_creation_options.d.ts.map +1 -1
  108. package/dest/entrypoints/server/index.d.ts +6 -2
  109. package/dest/entrypoints/server/index.d.ts.map +1 -1
  110. package/dest/entrypoints/server/index.js +5 -1
  111. package/dest/entrypoints/server/utils.d.ts +1 -1
  112. package/dest/entrypoints/server/utils.d.ts.map +1 -1
  113. package/dest/entrypoints/server/utils.js +40 -28
  114. package/dest/error_enriching.d.ts +4 -4
  115. package/dest/error_enriching.d.ts.map +1 -1
  116. package/dest/error_enriching.js +6 -6
  117. package/dest/events/event_service.d.ts +15 -0
  118. package/dest/events/event_service.d.ts.map +1 -0
  119. package/dest/events/event_service.js +44 -0
  120. package/dest/events/index.d.ts +2 -0
  121. package/dest/events/index.d.ts.map +1 -0
  122. package/dest/events/index.js +1 -0
  123. package/dest/events/private_event_filter_validator.d.ts +9 -0
  124. package/dest/events/private_event_filter_validator.d.ts.map +1 -0
  125. package/dest/events/private_event_filter_validator.js +38 -0
  126. package/dest/job_coordinator/job_coordinator.d.ts +75 -0
  127. package/dest/job_coordinator/job_coordinator.d.ts.map +1 -0
  128. package/dest/job_coordinator/job_coordinator.js +94 -0
  129. package/dest/logs/log_service.d.ts +29 -0
  130. package/dest/logs/log_service.d.ts.map +1 -0
  131. package/dest/logs/log_service.js +118 -0
  132. package/dest/messages/message_context_service.d.ts +17 -0
  133. package/dest/messages/message_context_service.d.ts.map +1 -0
  134. package/dest/messages/message_context_service.js +36 -0
  135. package/dest/notes/index.d.ts +2 -0
  136. package/dest/notes/index.d.ts.map +1 -0
  137. package/dest/notes/index.js +1 -0
  138. package/dest/notes/note_service.d.ts +49 -0
  139. package/dest/notes/note_service.d.ts.map +1 -0
  140. package/dest/notes/note_service.js +148 -0
  141. package/dest/notes_filter.d.ts +25 -0
  142. package/dest/notes_filter.d.ts.map +1 -0
  143. package/dest/notes_filter.js +4 -0
  144. package/dest/oracle_version.d.ts +3 -3
  145. package/dest/oracle_version.d.ts.map +1 -1
  146. package/dest/oracle_version.js +5 -4
  147. package/dest/private_kernel/hints/compute_tx_expiration_timestamp.d.ts +4 -0
  148. package/dest/private_kernel/hints/compute_tx_expiration_timestamp.d.ts.map +1 -0
  149. package/dest/private_kernel/hints/{compute_tx_include_by_timestamp.js → compute_tx_expiration_timestamp.js} +12 -12
  150. package/dest/private_kernel/hints/index.d.ts +3 -3
  151. package/dest/private_kernel/hints/index.d.ts.map +1 -1
  152. package/dest/private_kernel/hints/index.js +2 -2
  153. package/dest/private_kernel/hints/private_kernel_reset_private_inputs_builder.d.ts +29 -0
  154. package/dest/private_kernel/hints/private_kernel_reset_private_inputs_builder.d.ts.map +1 -0
  155. package/dest/private_kernel/hints/{build_private_kernel_reset_private_inputs.js → private_kernel_reset_private_inputs_builder.js} +144 -77
  156. package/dest/private_kernel/hints/test_utils.d.ts +122 -0
  157. package/dest/private_kernel/hints/test_utils.d.ts.map +1 -0
  158. package/dest/private_kernel/hints/test_utils.js +203 -0
  159. package/dest/private_kernel/index.d.ts +1 -1
  160. package/dest/private_kernel/private_kernel_execution_prover.d.ts +3 -2
  161. package/dest/private_kernel/private_kernel_execution_prover.d.ts.map +1 -1
  162. package/dest/private_kernel/private_kernel_execution_prover.js +33 -25
  163. package/dest/private_kernel/private_kernel_oracle.d.ts +26 -25
  164. package/dest/private_kernel/private_kernel_oracle.d.ts.map +1 -1
  165. package/dest/private_kernel/private_kernel_oracle.js +94 -2
  166. package/dest/pxe.d.ts +124 -103
  167. package/dest/pxe.d.ts.map +1 -1
  168. package/dest/pxe.js +288 -285
  169. package/dest/storage/address_store/address_store.d.ts +11 -0
  170. package/dest/storage/address_store/address_store.d.ts.map +1 -0
  171. package/dest/storage/{address_data_provider/address_data_provider.js → address_store/address_store.js} +13 -12
  172. package/dest/storage/address_store/index.d.ts +2 -0
  173. package/dest/storage/address_store/index.d.ts.map +1 -0
  174. package/dest/storage/address_store/index.js +1 -0
  175. package/dest/storage/anchor_block_store/anchor_block_store.d.ts +17 -0
  176. package/dest/storage/anchor_block_store/anchor_block_store.d.ts.map +1 -0
  177. package/dest/storage/{sync_data_provider/sync_data_provider.js → anchor_block_store/anchor_block_store.js} +10 -10
  178. package/dest/storage/anchor_block_store/index.d.ts +2 -0
  179. package/dest/storage/anchor_block_store/index.d.ts.map +1 -0
  180. package/dest/storage/anchor_block_store/index.js +1 -0
  181. package/dest/storage/capsule_store/capsule_store.d.ts +72 -0
  182. package/dest/storage/capsule_store/capsule_store.d.ts.map +1 -0
  183. package/dest/storage/capsule_store/capsule_store.js +253 -0
  184. package/dest/storage/capsule_store/index.d.ts +2 -0
  185. package/dest/storage/capsule_store/index.d.ts.map +1 -0
  186. package/dest/storage/capsule_store/index.js +1 -0
  187. package/dest/storage/contract_store/contract_store.d.ts +93 -0
  188. package/dest/storage/contract_store/contract_store.d.ts.map +1 -0
  189. package/dest/storage/contract_store/contract_store.js +309 -0
  190. package/dest/storage/contract_store/index.d.ts +2 -0
  191. package/dest/storage/contract_store/index.d.ts.map +1 -0
  192. package/dest/storage/contract_store/index.js +1 -0
  193. package/dest/storage/{contract_data_provider → contract_store}/private_functions_tree.d.ts +1 -1
  194. package/dest/storage/contract_store/private_functions_tree.d.ts.map +1 -0
  195. package/dest/storage/{contract_data_provider → contract_store}/private_functions_tree.js +1 -1
  196. package/dest/storage/index.d.ts +8 -8
  197. package/dest/storage/index.d.ts.map +1 -1
  198. package/dest/storage/index.js +7 -7
  199. package/dest/storage/metadata.d.ts +2 -2
  200. package/dest/storage/metadata.js +1 -1
  201. package/dest/storage/note_store/index.d.ts +3 -0
  202. package/dest/storage/note_store/index.d.ts.map +1 -0
  203. package/dest/storage/note_store/index.js +2 -0
  204. package/dest/storage/note_store/note_store.d.ts +83 -0
  205. package/dest/storage/note_store/note_store.d.ts.map +1 -0
  206. package/dest/storage/note_store/note_store.js +343 -0
  207. package/dest/storage/note_store/stored_note.d.ts +16 -0
  208. package/dest/storage/note_store/stored_note.d.ts.map +1 -0
  209. package/dest/storage/note_store/stored_note.js +43 -0
  210. package/dest/storage/private_event_store/private_event_store.d.ts +91 -0
  211. package/dest/storage/private_event_store/private_event_store.d.ts.map +1 -0
  212. package/dest/storage/private_event_store/private_event_store.js +273 -0
  213. package/dest/storage/private_event_store/stored_private_event.d.ts +23 -0
  214. package/dest/storage/private_event_store/stored_private_event.d.ts.map +1 -0
  215. package/dest/storage/private_event_store/stored_private_event.js +56 -0
  216. package/dest/storage/tagging_store/index.d.ts +4 -0
  217. package/dest/storage/tagging_store/index.d.ts.map +1 -0
  218. package/dest/storage/tagging_store/index.js +3 -0
  219. package/dest/storage/tagging_store/recipient_tagging_store.d.ts +28 -0
  220. package/dest/storage/tagging_store/recipient_tagging_store.d.ts.map +1 -0
  221. package/dest/storage/tagging_store/recipient_tagging_store.js +111 -0
  222. package/dest/storage/tagging_store/sender_address_book_store.d.ts +14 -0
  223. package/dest/storage/tagging_store/sender_address_book_store.d.ts.map +1 -0
  224. package/dest/storage/tagging_store/sender_address_book_store.js +36 -0
  225. package/dest/storage/tagging_store/sender_tagging_store.d.ts +78 -0
  226. package/dest/storage/tagging_store/sender_tagging_store.d.ts.map +1 -0
  227. package/dest/storage/tagging_store/sender_tagging_store.js +374 -0
  228. package/dest/tagging/constants.d.ts +2 -2
  229. package/dest/tagging/constants.d.ts.map +1 -1
  230. package/dest/tagging/constants.js +10 -2
  231. package/dest/tagging/get_all_logs_by_tags.d.ts +24 -0
  232. package/dest/tagging/get_all_logs_by_tags.d.ts.map +1 -0
  233. package/dest/tagging/get_all_logs_by_tags.js +60 -0
  234. package/dest/tagging/index.d.ts +17 -7
  235. package/dest/tagging/index.d.ts.map +1 -1
  236. package/dest/tagging/index.js +15 -5
  237. package/dest/tagging/recipient_sync/load_private_logs_for_sender_recipient_pair.d.ts +14 -0
  238. package/dest/tagging/recipient_sync/load_private_logs_for_sender_recipient_pair.d.ts.map +1 -0
  239. package/dest/tagging/recipient_sync/load_private_logs_for_sender_recipient_pair.js +99 -0
  240. package/dest/tagging/recipient_sync/utils/find_highest_indexes.d.ts +12 -0
  241. package/dest/tagging/recipient_sync/utils/find_highest_indexes.d.ts.map +1 -0
  242. package/dest/tagging/recipient_sync/utils/find_highest_indexes.js +20 -0
  243. package/dest/tagging/recipient_sync/utils/load_logs_for_range.d.ts +14 -0
  244. package/dest/tagging/recipient_sync/utils/load_logs_for_range.d.ts.map +1 -0
  245. package/dest/tagging/recipient_sync/utils/load_logs_for_range.js +33 -0
  246. package/dest/tagging/sender_sync/sync_sender_tagging_indexes.d.ts +17 -0
  247. package/dest/tagging/sender_sync/sync_sender_tagging_indexes.d.ts.map +1 -0
  248. package/dest/tagging/sender_sync/sync_sender_tagging_indexes.js +80 -0
  249. package/dest/tagging/sender_sync/utils/get_status_change_of_pending.d.ts +12 -0
  250. package/dest/tagging/sender_sync/utils/get_status_change_of_pending.d.ts.map +1 -0
  251. package/dest/tagging/sender_sync/utils/get_status_change_of_pending.js +39 -0
  252. package/dest/tagging/sender_sync/utils/load_and_store_new_tagging_indexes.d.ts +19 -0
  253. package/dest/tagging/sender_sync/utils/load_and_store_new_tagging_indexes.d.ts.map +1 -0
  254. package/dest/tagging/sender_sync/utils/load_and_store_new_tagging_indexes.js +72 -0
  255. package/package.json +29 -19
  256. package/src/access_scopes.ts +9 -0
  257. package/src/bin/check_oracle_version.ts +131 -20
  258. package/src/block_synchronizer/block_synchronizer.ts +178 -0
  259. package/src/block_synchronizer/index.ts +1 -0
  260. package/src/config/index.ts +25 -26
  261. package/src/config/package_info.ts +1 -1
  262. package/src/contract_function_simulator/benchmarked_node.ts +103 -0
  263. package/src/contract_function_simulator/contract_function_simulator.ts +431 -119
  264. package/src/contract_function_simulator/execution_note_cache.ts +58 -28
  265. package/src/contract_function_simulator/execution_tagging_index_cache.ts +19 -14
  266. package/src/contract_function_simulator/hashed_values_cache.ts +1 -1
  267. package/src/contract_function_simulator/index.ts +2 -1
  268. package/src/contract_function_simulator/noir-structs/event_validation_request.ts +14 -7
  269. package/src/contract_function_simulator/noir-structs/log_retrieval_request.ts +6 -5
  270. package/src/contract_function_simulator/noir-structs/log_retrieval_response.ts +3 -6
  271. package/src/contract_function_simulator/noir-structs/message_tx_context.ts +55 -0
  272. package/src/contract_function_simulator/noir-structs/note_validation_request.ts +16 -7
  273. package/src/contract_function_simulator/noir-structs/utility_context.ts +6 -25
  274. package/src/contract_function_simulator/oracle/interfaces.ts +86 -61
  275. package/src/contract_function_simulator/oracle/legacy_oracle_mappings.ts +135 -0
  276. package/src/contract_function_simulator/oracle/message_load_oracle_inputs.ts +1 -1
  277. package/src/contract_function_simulator/oracle/note_packing_utils.ts +30 -14
  278. package/src/contract_function_simulator/oracle/oracle.ts +258 -158
  279. package/src/contract_function_simulator/oracle/private_execution.ts +6 -72
  280. package/src/contract_function_simulator/oracle/private_execution_oracle.ts +187 -167
  281. package/src/contract_function_simulator/oracle/utility_execution_oracle.ts +457 -115
  282. package/src/contract_function_simulator/pick_notes.ts +1 -1
  283. package/src/contract_function_simulator/proxied_contract_data_source.ts +24 -7
  284. package/src/contract_logging.ts +39 -0
  285. package/src/contract_sync/contract_sync_service.ts +181 -0
  286. package/src/contract_sync/helpers.ts +98 -0
  287. package/src/debug/pxe_debug_utils.ts +93 -0
  288. package/src/entrypoints/client/bundle/index.ts +3 -1
  289. package/src/entrypoints/client/bundle/utils.ts +25 -18
  290. package/src/entrypoints/client/lazy/index.ts +3 -1
  291. package/src/entrypoints/client/lazy/utils.ts +26 -19
  292. package/src/entrypoints/pxe_creation_options.ts +6 -2
  293. package/src/entrypoints/server/index.ts +5 -1
  294. package/src/entrypoints/server/utils.ts +34 -56
  295. package/src/error_enriching.ts +7 -15
  296. package/src/events/event_service.ts +71 -0
  297. package/src/events/index.ts +1 -0
  298. package/src/events/private_event_filter_validator.ts +46 -0
  299. package/src/job_coordinator/job_coordinator.ts +150 -0
  300. package/src/logs/log_service.ts +213 -0
  301. package/src/messages/message_context_service.ts +45 -0
  302. package/src/notes/index.ts +1 -0
  303. package/src/notes/note_service.ts +196 -0
  304. package/src/notes_filter.ts +26 -0
  305. package/src/oracle_version.ts +5 -4
  306. package/src/private_kernel/hints/{compute_tx_include_by_timestamp.ts → compute_tx_expiration_timestamp.ts} +13 -13
  307. package/src/private_kernel/hints/index.ts +2 -2
  308. package/src/private_kernel/hints/{build_private_kernel_reset_private_inputs.ts → private_kernel_reset_private_inputs_builder.ts} +199 -145
  309. package/src/private_kernel/hints/test_utils.ts +325 -0
  310. package/src/private_kernel/private_kernel_execution_prover.ts +38 -34
  311. package/src/private_kernel/private_kernel_oracle.ts +118 -37
  312. package/src/pxe.ts +450 -389
  313. package/src/storage/{address_data_provider/address_data_provider.ts → address_store/address_store.ts} +16 -16
  314. package/src/storage/address_store/index.ts +1 -0
  315. package/src/storage/{sync_data_provider/sync_data_provider.ts → anchor_block_store/anchor_block_store.ts} +10 -11
  316. package/src/storage/anchor_block_store/index.ts +1 -0
  317. package/src/storage/capsule_store/capsule_store.ts +315 -0
  318. package/src/storage/capsule_store/index.ts +1 -0
  319. package/src/storage/contract_store/contract_store.ts +429 -0
  320. package/src/storage/contract_store/index.ts +1 -0
  321. package/src/storage/{contract_data_provider → contract_store}/private_functions_tree.ts +1 -1
  322. package/src/storage/index.ts +7 -7
  323. package/src/storage/metadata.ts +1 -1
  324. package/src/storage/note_store/index.ts +2 -0
  325. package/src/storage/note_store/note_store.ts +418 -0
  326. package/src/storage/note_store/stored_note.ts +48 -0
  327. package/src/storage/private_event_store/private_event_store.ts +384 -0
  328. package/src/storage/private_event_store/stored_private_event.ts +73 -0
  329. package/src/storage/tagging_store/index.ts +3 -0
  330. package/src/storage/tagging_store/recipient_tagging_store.ts +143 -0
  331. package/src/storage/tagging_store/sender_address_book_store.ts +48 -0
  332. package/src/storage/tagging_store/sender_tagging_store.ts +476 -0
  333. package/src/tagging/constants.ts +10 -2
  334. package/src/tagging/get_all_logs_by_tags.ts +92 -0
  335. package/src/tagging/index.ts +19 -6
  336. package/src/tagging/recipient_sync/load_private_logs_for_sender_recipient_pair.ts +140 -0
  337. package/src/tagging/recipient_sync/utils/find_highest_indexes.ts +34 -0
  338. package/src/tagging/recipient_sync/utils/load_logs_for_range.ts +44 -0
  339. package/src/tagging/sender_sync/sync_sender_tagging_indexes.ts +112 -0
  340. package/src/tagging/sender_sync/utils/get_status_change_of_pending.ts +51 -0
  341. package/src/tagging/sender_sync/utils/load_and_store_new_tagging_indexes.ts +85 -0
  342. package/dest/contract_function_simulator/execution_data_provider.d.ts +0 -274
  343. package/dest/contract_function_simulator/execution_data_provider.d.ts.map +0 -1
  344. package/dest/contract_function_simulator/execution_data_provider.js +0 -14
  345. package/dest/contract_function_simulator/proxied_node.d.ts +0 -9
  346. package/dest/contract_function_simulator/proxied_node.d.ts.map +0 -1
  347. package/dest/contract_function_simulator/proxied_node.js +0 -27
  348. package/dest/contract_function_simulator/pxe_oracle_interface.d.ts +0 -122
  349. package/dest/contract_function_simulator/pxe_oracle_interface.d.ts.map +0 -1
  350. package/dest/contract_function_simulator/pxe_oracle_interface.js +0 -701
  351. package/dest/private_kernel/hints/build_private_kernel_reset_private_inputs.d.ts +0 -28
  352. package/dest/private_kernel/hints/build_private_kernel_reset_private_inputs.d.ts.map +0 -1
  353. package/dest/private_kernel/hints/compute_tx_include_by_timestamp.d.ts +0 -4
  354. package/dest/private_kernel/hints/compute_tx_include_by_timestamp.d.ts.map +0 -1
  355. package/dest/private_kernel/private_kernel_oracle_impl.d.ts +0 -45
  356. package/dest/private_kernel/private_kernel_oracle_impl.d.ts.map +0 -1
  357. package/dest/private_kernel/private_kernel_oracle_impl.js +0 -86
  358. package/dest/storage/address_data_provider/address_data_provider.d.ts +0 -11
  359. package/dest/storage/address_data_provider/address_data_provider.d.ts.map +0 -1
  360. package/dest/storage/address_data_provider/index.d.ts +0 -2
  361. package/dest/storage/address_data_provider/index.d.ts.map +0 -1
  362. package/dest/storage/address_data_provider/index.js +0 -1
  363. package/dest/storage/capsule_data_provider/capsule_data_provider.d.ts +0 -25
  364. package/dest/storage/capsule_data_provider/capsule_data_provider.d.ts.map +0 -1
  365. package/dest/storage/capsule_data_provider/capsule_data_provider.js +0 -118
  366. package/dest/storage/capsule_data_provider/index.d.ts +0 -2
  367. package/dest/storage/capsule_data_provider/index.d.ts.map +0 -1
  368. package/dest/storage/capsule_data_provider/index.js +0 -1
  369. package/dest/storage/contract_data_provider/contract_data_provider.d.ts +0 -74
  370. package/dest/storage/contract_data_provider/contract_data_provider.d.ts.map +0 -1
  371. package/dest/storage/contract_data_provider/contract_data_provider.js +0 -205
  372. package/dest/storage/contract_data_provider/index.d.ts +0 -2
  373. package/dest/storage/contract_data_provider/index.d.ts.map +0 -1
  374. package/dest/storage/contract_data_provider/index.js +0 -1
  375. package/dest/storage/contract_data_provider/private_functions_tree.d.ts.map +0 -1
  376. package/dest/storage/note_data_provider/index.d.ts +0 -3
  377. package/dest/storage/note_data_provider/index.d.ts.map +0 -1
  378. package/dest/storage/note_data_provider/index.js +0 -2
  379. package/dest/storage/note_data_provider/note_dao.d.ts +0 -100
  380. package/dest/storage/note_data_provider/note_dao.d.ts.map +0 -1
  381. package/dest/storage/note_data_provider/note_dao.js +0 -102
  382. package/dest/storage/note_data_provider/note_data_provider.d.ts +0 -83
  383. package/dest/storage/note_data_provider/note_data_provider.d.ts.map +0 -1
  384. package/dest/storage/note_data_provider/note_data_provider.js +0 -308
  385. package/dest/storage/private_event_data_provider/private_event_data_provider.d.ts +0 -43
  386. package/dest/storage/private_event_data_provider/private_event_data_provider.d.ts.map +0 -1
  387. package/dest/storage/private_event_data_provider/private_event_data_provider.js +0 -104
  388. package/dest/storage/sync_data_provider/index.d.ts +0 -2
  389. package/dest/storage/sync_data_provider/index.d.ts.map +0 -1
  390. package/dest/storage/sync_data_provider/index.js +0 -1
  391. package/dest/storage/sync_data_provider/sync_data_provider.d.ts +0 -10
  392. package/dest/storage/sync_data_provider/sync_data_provider.d.ts.map +0 -1
  393. package/dest/storage/tagging_data_provider/index.d.ts +0 -2
  394. package/dest/storage/tagging_data_provider/index.d.ts.map +0 -1
  395. package/dest/storage/tagging_data_provider/index.js +0 -1
  396. package/dest/storage/tagging_data_provider/tagging_data_provider.d.ts +0 -40
  397. package/dest/storage/tagging_data_provider/tagging_data_provider.d.ts.map +0 -1
  398. package/dest/storage/tagging_data_provider/tagging_data_provider.js +0 -89
  399. package/dest/synchronizer/index.d.ts +0 -2
  400. package/dest/synchronizer/index.d.ts.map +0 -1
  401. package/dest/synchronizer/index.js +0 -1
  402. package/dest/synchronizer/synchronizer.d.ts +0 -35
  403. package/dest/synchronizer/synchronizer.d.ts.map +0 -1
  404. package/dest/synchronizer/synchronizer.js +0 -101
  405. package/dest/tagging/siloed_tag.d.ts +0 -14
  406. package/dest/tagging/siloed_tag.d.ts.map +0 -1
  407. package/dest/tagging/siloed_tag.js +0 -20
  408. package/dest/tagging/tag.d.ts +0 -12
  409. package/dest/tagging/tag.d.ts.map +0 -1
  410. package/dest/tagging/tag.js +0 -17
  411. package/dest/tagging/utils.d.ts +0 -18
  412. package/dest/tagging/utils.d.ts.map +0 -1
  413. package/dest/tagging/utils.js +0 -24
  414. package/src/contract_function_simulator/execution_data_provider.ts +0 -343
  415. package/src/contract_function_simulator/proxied_node.ts +0 -33
  416. package/src/contract_function_simulator/pxe_oracle_interface.ts +0 -1019
  417. package/src/private_kernel/private_kernel_oracle_impl.ts +0 -132
  418. package/src/storage/address_data_provider/index.ts +0 -1
  419. package/src/storage/capsule_data_provider/capsule_data_provider.ts +0 -147
  420. package/src/storage/capsule_data_provider/index.ts +0 -1
  421. package/src/storage/contract_data_provider/contract_data_provider.ts +0 -294
  422. package/src/storage/contract_data_provider/index.ts +0 -1
  423. package/src/storage/note_data_provider/index.ts +0 -2
  424. package/src/storage/note_data_provider/note_dao.ts +0 -154
  425. package/src/storage/note_data_provider/note_data_provider.ts +0 -393
  426. package/src/storage/private_event_data_provider/private_event_data_provider.ts +0 -148
  427. package/src/storage/sync_data_provider/index.ts +0 -1
  428. package/src/storage/tagging_data_provider/index.ts +0 -1
  429. package/src/storage/tagging_data_provider/tagging_data_provider.ts +0 -120
  430. package/src/synchronizer/index.ts +0 -1
  431. package/src/synchronizer/synchronizer.ts +0 -120
  432. package/src/tagging/siloed_tag.ts +0 -22
  433. package/src/tagging/tag.ts +0 -16
  434. package/src/tagging/utils.ts +0 -31
@@ -1,55 +1,66 @@
1
- import { AVM_EMITNOTEHASH_BASE_L2_GAS, AVM_EMITNULLIFIER_BASE_L2_GAS, AVM_SENDL2TOL1MSG_BASE_L2_GAS, DA_BYTES_PER_FIELD, DA_GAS_PER_BYTE, FIXED_AVM_STARTUP_L2_GAS, FIXED_DA_GAS, FIXED_L2_GAS, L2_GAS_PER_CONTRACT_CLASS_LOG, L2_GAS_PER_PRIVATE_LOG, MAX_CONTRACT_CLASS_LOGS_PER_TX, MAX_ENQUEUED_CALLS_PER_TX, MAX_L2_TO_L1_MSGS_PER_TX, MAX_NOTE_HASHES_PER_TX, MAX_NULLIFIERS_PER_TX, MAX_PRIVATE_LOGS_PER_TX } from '@aztec/constants';
1
+ import { AVM_EMITNOTEHASH_BASE_L2_GAS, AVM_EMITNULLIFIER_BASE_L2_GAS, AVM_SENDL2TOL1MSG_BASE_L2_GAS, DA_GAS_PER_FIELD, FIXED_AVM_STARTUP_L2_GAS, L2_GAS_PER_CONTRACT_CLASS_LOG, L2_GAS_PER_L2_TO_L1_MSG, L2_GAS_PER_NOTE_HASH, L2_GAS_PER_NULLIFIER, L2_GAS_PER_PRIVATE_LOG, MAX_CONTRACT_CLASS_LOGS_PER_TX, MAX_ENQUEUED_CALLS_PER_TX, MAX_L2_TO_L1_MSGS_PER_TX, MAX_NOTE_HASHES_PER_TX, MAX_NOTE_HASH_READ_REQUESTS_PER_TX, MAX_NULLIFIERS_PER_TX, MAX_NULLIFIER_READ_REQUESTS_PER_TX, MAX_PRIVATE_LOGS_PER_TX, MAX_TX_LIFETIME, PRIVATE_TX_L2_GAS_OVERHEAD, PUBLIC_TX_L2_GAS_OVERHEAD, TX_DA_GAS_OVERHEAD } from '@aztec/constants';
2
2
  import { arrayNonEmptyLength, padArrayEnd } from '@aztec/foundation/collection';
3
- import { poseidon2Hash } from '@aztec/foundation/crypto';
4
- import { Fr } from '@aztec/foundation/fields';
3
+ import { Fr } from '@aztec/foundation/curves/bn254';
5
4
  import { createLogger } from '@aztec/foundation/log';
6
5
  import { Timer } from '@aztec/foundation/timer';
7
6
  import { getVKTreeRoot } from '@aztec/noir-protocol-circuits-types/vk-tree';
8
7
  import { protocolContractsHash } from '@aztec/protocol-contracts';
9
8
  import { ExecutionError, createSimulationError, extractCallStack, resolveAssertionMessageFromError, toACVMWitness, witnessMapToFields } from '@aztec/simulator/client';
10
- import { FunctionSelector, FunctionType, decodeFromAbi } from '@aztec/stdlib/abi';
9
+ import { FunctionSelector, FunctionType } from '@aztec/stdlib/abi';
11
10
  import { AztecAddress } from '@aztec/stdlib/aztec-address';
12
11
  import { Gas } from '@aztec/stdlib/gas';
13
- import { computeNoteHashNonce, computeUniqueNoteHash, siloNoteHash, siloNullifier } from '@aztec/stdlib/hash';
14
- import { PartialPrivateTailPublicInputsForPublic, PartialPrivateTailPublicInputsForRollup, PrivateKernelTailCircuitPublicInputs, PrivateToPublicAccumulatedData, PrivateToRollupAccumulatedData, PublicCallRequest, ScopedLogHash } from '@aztec/stdlib/kernel';
12
+ import { computeNoteHashNonce, computeProtocolNullifier, computeSiloedPrivateLogFirstField, computeUniqueNoteHash, siloNoteHash, siloNullifier } from '@aztec/stdlib/hash';
13
+ import { ClaimedLengthArray, PartialPrivateTailPublicInputsForPublic, PartialPrivateTailPublicInputsForRollup, PrivateKernelTailCircuitPublicInputs, PrivateToPublicAccumulatedData, PrivateToRollupAccumulatedData, PublicCallRequest, ReadRequestActionEnum, ScopedLogHash, ScopedNoteHash, ScopedNullifier, ScopedReadRequest, buildTransientDataHints, getNoteHashReadRequestResetActions, getNullifierReadRequestResetActions } from '@aztec/stdlib/kernel';
15
14
  import { PrivateLog } from '@aztec/stdlib/logs';
16
15
  import { ScopedL2ToL1Message } from '@aztec/stdlib/messaging';
17
16
  import { ChonkProof } from '@aztec/stdlib/proofs';
18
- import { CallContext, HashedValues, PrivateExecutionResult, TxConstantData, collectNested, getFinalMinRevertibleSideEffectCounter } from '@aztec/stdlib/tx';
17
+ import { CallContext, HashedValues, PrivateExecutionResult, TxConstantData, collectNested, collectNoteHashNullifierCounterMap, getFinalMinRevertibleSideEffectCounter } from '@aztec/stdlib/tx';
19
18
  import { ExecutionNoteCache } from './execution_note_cache.js';
20
19
  import { ExecutionTaggingIndexCache } from './execution_tagging_index_cache.js';
21
20
  import { HashedValuesCache } from './hashed_values_cache.js';
22
21
  import { Oracle } from './oracle/oracle.js';
23
- import { executePrivateFunction, verifyCurrentClassId } from './oracle/private_execution.js';
22
+ import { executePrivateFunction } from './oracle/private_execution.js';
24
23
  import { PrivateExecutionOracle } from './oracle/private_execution_oracle.js';
25
24
  import { UtilityExecutionOracle } from './oracle/utility_execution_oracle.js';
26
25
  /**
27
26
  * The contract function simulator.
28
27
  */ export class ContractFunctionSimulator {
29
- executionDataProvider;
30
- simulator;
31
28
  log;
32
- constructor(executionDataProvider, simulator){
33
- this.executionDataProvider = executionDataProvider;
34
- this.simulator = simulator;
29
+ contractStore;
30
+ noteStore;
31
+ keyStore;
32
+ addressStore;
33
+ aztecNode;
34
+ senderTaggingStore;
35
+ recipientTaggingStore;
36
+ senderAddressBookStore;
37
+ capsuleStore;
38
+ privateEventStore;
39
+ simulator;
40
+ contractSyncService;
41
+ messageContextService;
42
+ constructor(args){
43
+ this.contractStore = args.contractStore;
44
+ this.noteStore = args.noteStore;
45
+ this.keyStore = args.keyStore;
46
+ this.addressStore = args.addressStore;
47
+ this.aztecNode = args.aztecNode;
48
+ this.senderTaggingStore = args.senderTaggingStore;
49
+ this.recipientTaggingStore = args.recipientTaggingStore;
50
+ this.senderAddressBookStore = args.senderAddressBookStore;
51
+ this.capsuleStore = args.capsuleStore;
52
+ this.privateEventStore = args.privateEventStore;
53
+ this.simulator = args.simulator;
54
+ this.contractSyncService = args.contractSyncService;
55
+ this.messageContextService = args.messageContextService;
35
56
  this.log = createLogger('simulator');
36
57
  }
37
58
  /**
38
59
  * Runs a private function.
39
60
  * @param request - The transaction request.
40
- * @param entryPointArtifact - The artifact of the entry point function.
41
- * @param contractAddress - The address of the contract (should match request.origin)
42
- * @param msgSender - The address calling the function. This can be replaced to simulate a call from another contract
43
- * or a specific account.
44
- * @param senderForTags - The address that is used as a tagging sender when emitting private logs. Returned from
45
- * the `privateGetSenderForTags` oracle.
46
- * @param scopes - The accounts whose notes we can access in this call. Currently optional and will default to all.
47
- * @returns The result of the execution.
48
- */ async run(request, contractAddress, selector, msgSender = AztecAddress.fromField(Fr.MAX_FIELD_VALUE), senderForTags, scopes) {
61
+ */ async run(request, { contractAddress, selector, msgSender = AztecAddress.fromField(Fr.MAX_FIELD_VALUE), anchorBlockHeader, senderForTags, scopes, jobId }) {
49
62
  const simulatorSetupTimer = new Timer();
50
- const anchorBlockHeader = await this.executionDataProvider.getAnchorBlockHeader();
51
- await verifyCurrentClassId(contractAddress, this.executionDataProvider);
52
- const entryPointArtifact = await this.executionDataProvider.getFunctionArtifact(contractAddress, selector);
63
+ const entryPointArtifact = await this.contractStore.getFunctionArtifactWithDebugMetadata(contractAddress, selector);
53
64
  if (entryPointArtifact.functionType !== FunctionType.PRIVATE) {
54
65
  throw new Error(`Cannot run ${entryPointArtifact.functionType} function as private`);
55
66
  }
@@ -57,12 +68,43 @@ import { UtilityExecutionOracle } from './oracle/utility_execution_oracle.js';
57
68
  this.log.warn(`Request origin does not match contract address in simulation. Request origin: ${request.origin}, contract address: ${contractAddress}`);
58
69
  }
59
70
  // reserve the first side effect for the tx hash (inserted by the private kernel)
60
- const startSideEffectCounter = 1;
71
+ const startSideEffectCounter = 2;
61
72
  const callContext = new CallContext(msgSender, contractAddress, await FunctionSelector.fromNameAndParameters(entryPointArtifact.name, entryPointArtifact.parameters), entryPointArtifact.isStatic);
62
- const txRequestHash = await request.toTxRequest().hash();
63
- const noteCache = new ExecutionNoteCache(txRequestHash);
73
+ const protocolNullifier = await computeProtocolNullifier(await request.toTxRequest().hash());
74
+ const noteCache = new ExecutionNoteCache(protocolNullifier);
64
75
  const taggingIndexCache = new ExecutionTaggingIndexCache();
65
- const privateExecutionOracle = new PrivateExecutionOracle(request.firstCallArgsHash, request.txContext, callContext, anchorBlockHeader, request.authWitnesses, request.capsules, HashedValuesCache.create(request.argsOfCalls), noteCache, taggingIndexCache, this.executionDataProvider, 0, startSideEffectCounter, undefined, scopes, senderForTags, this.simulator);
76
+ const privateExecutionOracle = new PrivateExecutionOracle({
77
+ argsHash: request.firstCallArgsHash,
78
+ txContext: request.txContext,
79
+ callContext,
80
+ anchorBlockHeader,
81
+ utilityExecutor: async (call, execScopes)=>{
82
+ await this.runUtility(call, [], anchorBlockHeader, execScopes, jobId);
83
+ },
84
+ authWitnesses: request.authWitnesses,
85
+ capsules: request.capsules,
86
+ executionCache: HashedValuesCache.create(request.argsOfCalls),
87
+ noteCache,
88
+ taggingIndexCache,
89
+ contractStore: this.contractStore,
90
+ noteStore: this.noteStore,
91
+ keyStore: this.keyStore,
92
+ addressStore: this.addressStore,
93
+ aztecNode: this.aztecNode,
94
+ senderTaggingStore: this.senderTaggingStore,
95
+ recipientTaggingStore: this.recipientTaggingStore,
96
+ senderAddressBookStore: this.senderAddressBookStore,
97
+ capsuleStore: this.capsuleStore,
98
+ privateEventStore: this.privateEventStore,
99
+ messageContextService: this.messageContextService,
100
+ contractSyncService: this.contractSyncService,
101
+ jobId,
102
+ totalPublicCalldataCount: 0,
103
+ sideEffectCounter: startSideEffectCounter,
104
+ scopes,
105
+ senderForTags,
106
+ simulator: this.simulator
107
+ });
66
108
  const setupTime = simulatorSetupTimer.ms();
67
109
  try {
68
110
  // Note: any nested private function calls are made recursively within this
@@ -71,15 +113,15 @@ import { UtilityExecutionOracle } from './oracle/utility_execution_oracle.js';
71
113
  // within executionResult.nestedExecutionResults).
72
114
  const executionResult = await executePrivateFunction(this.simulator, privateExecutionOracle, entryPointArtifact, contractAddress, request.functionSelector);
73
115
  const simulatorTeardownTimer = new Timer();
74
- const { usedTxRequestHashForNonces } = noteCache.finish();
75
- const firstNullifierHint = usedTxRequestHashForNonces ? Fr.ZERO : noteCache.getAllNullifiers()[0];
116
+ noteCache.finish();
117
+ const firstNullifierHint = noteCache.getNonceGenerator();
76
118
  const publicCallRequests = collectNested([
77
119
  executionResult
78
120
  ], (r)=>r.publicInputs.publicCallRequests.getActiveItems().map((r)=>r.inner).concat(r.publicInputs.publicTeardownCallRequest.isEmpty() ? [] : [
79
121
  r.publicInputs.publicTeardownCallRequest
80
122
  ]));
81
123
  const publicFunctionsCalldata = await Promise.all(publicCallRequests.map(async (r)=>{
82
- const calldata = await privateExecutionOracle.privateLoadFromExecutionCache(r.calldataHash);
124
+ const calldata = await privateExecutionOracle.loadFromExecutionCache(r.calldataHash);
83
125
  return new HashedValues(calldata, r.calldataHash);
84
126
  }));
85
127
  const teardownTime = simulatorTeardownTimer.ms();
@@ -100,16 +142,34 @@ import { UtilityExecutionOracle } from './oracle/utility_execution_oracle.js';
100
142
  * Runs a utility function.
101
143
  * @param call - The function call to execute.
102
144
  * @param authwits - Authentication witnesses required for the function call.
145
+ * @param anchorBlockHeader - The block header to use as base state for this run.
103
146
  * @param scopes - Optional array of account addresses whose notes can be accessed in this call. Defaults to all
104
147
  * accounts if not specified.
105
- * @returns A decoded ABI value containing the function's return data.
106
- */ async runUtility(call, authwits, scopes) {
107
- await verifyCurrentClassId(call.to, this.executionDataProvider);
108
- const entryPointArtifact = await this.executionDataProvider.getFunctionArtifact(call.to, call.selector);
148
+ * @returns A return value of the utility function in a form as returned by the simulator (Noir fields)
149
+ */ async runUtility(call, authwits, anchorBlockHeader, scopes, jobId) {
150
+ const entryPointArtifact = await this.contractStore.getFunctionArtifactWithDebugMetadata(call.to, call.selector);
109
151
  if (entryPointArtifact.functionType !== FunctionType.UTILITY) {
110
152
  throw new Error(`Cannot run ${entryPointArtifact.functionType} function as utility`);
111
153
  }
112
- const oracle = new UtilityExecutionOracle(call.to, authwits, [], this.executionDataProvider, undefined, scopes);
154
+ const oracle = new UtilityExecutionOracle({
155
+ contractAddress: call.to,
156
+ authWitnesses: authwits,
157
+ capsules: [],
158
+ anchorBlockHeader,
159
+ contractStore: this.contractStore,
160
+ noteStore: this.noteStore,
161
+ keyStore: this.keyStore,
162
+ addressStore: this.addressStore,
163
+ aztecNode: this.aztecNode,
164
+ recipientTaggingStore: this.recipientTaggingStore,
165
+ senderAddressBookStore: this.senderAddressBookStore,
166
+ capsuleStore: this.capsuleStore,
167
+ privateEventStore: this.privateEventStore,
168
+ messageContextService: this.messageContextService,
169
+ contractSyncService: this.contractSyncService,
170
+ jobId,
171
+ scopes
172
+ });
113
173
  try {
114
174
  this.log.verbose(`Executing utility function ${entryPointArtifact.name}`, {
115
175
  contract: call.to,
@@ -125,16 +185,32 @@ import { UtilityExecutionOracle } from './oracle/utility_execution_oracle.js';
125
185
  cause: err
126
186
  });
127
187
  });
128
- const returnWitness = witnessMapToFields(acirExecutionResult.returnWitness);
129
- this.log.verbose(`Utility simulation for ${call.to}.${call.selector} completed`);
130
- return decodeFromAbi(entryPointArtifact.returnTypes, returnWitness);
188
+ this.log.verbose(`Utility execution for ${call.to}.${call.selector} completed`);
189
+ return {
190
+ result: witnessMapToFields(acirExecutionResult.returnWitness),
191
+ offchainEffects: oracle.getOffchainEffects()
192
+ };
131
193
  } catch (err) {
132
194
  throw createSimulationError(err instanceof Error ? err : new Error('Unknown error during private execution'));
133
195
  }
134
196
  }
135
197
  // docs:end:execute_utility_function
136
- getStats() {
137
- return this.executionDataProvider.getStats();
198
+ /**
199
+ * Returns the execution statistics collected during the simulator run.
200
+ * @returns The execution statistics.
201
+ */ getStats() {
202
+ const nodeRPCCalls = typeof this.aztecNode.getStats === 'function' ? this.aztecNode.getStats() : {
203
+ perMethod: {},
204
+ roundTrips: {
205
+ roundTrips: 0,
206
+ totalBlockingTime: 0,
207
+ roundTripDurations: [],
208
+ roundTripMethods: []
209
+ }
210
+ };
211
+ return {
212
+ nodeRPCCalls
213
+ };
138
214
  }
139
215
  }
140
216
  class OrderedSideEffect {
@@ -152,38 +228,54 @@ class OrderedSideEffect {
152
228
  * (allowing state overrides) and is much faster, while still generating a valid
153
229
  * output that can be sent to the node for public simulation
154
230
  * @param privateExecutionResult - The result of the private execution.
155
- * @param nonceGenerator - A nonce generator for note hashes. According to the protocol rules,
156
- * it can either be the first nullifier in the tx or the hash of the initial tx request if there are none.
157
- * @param contractDataProvider - A provider for contract data in order to get function names and debug info.
231
+ * @param debugFunctionNameGetter - A provider for contract data in order to get function names and debug info.
232
+ * @param node - AztecNode for verifying settled read requests against the note hash and nullifier trees.
233
+ * @param minRevertibleSideEffectCounterOverride - Optional override for the min revertible side effect counter.
234
+ * Used by TXE to simulate account contract behavior (setting the counter before app execution).
158
235
  * @returns The simulated proving result.
159
- */ export async function generateSimulatedProvingResult(privateExecutionResult, nonceGenerator, contractDataProvider) {
160
- const siloedNoteHashes = [];
161
- const nullifiers = [];
236
+ */ export async function generateSimulatedProvingResult(privateExecutionResult, debugFunctionNameGetter, node, minRevertibleSideEffectCounterOverride) {
162
237
  const taggedPrivateLogs = [];
163
238
  const l2ToL1Messages = [];
164
239
  const contractClassLogsHashes = [];
165
240
  const publicCallRequests = [];
166
241
  const executionSteps = [];
242
+ // Unsiloed scoped arrays — used for squashing, read request verification,
243
+ // and siloed at the end only for the surviving items
244
+ const scopedNoteHashes = [];
245
+ const scopedNullifiers = [];
246
+ // Read requests for verification
247
+ const noteHashReadRequests = [];
248
+ const nullifierReadRequests = [];
167
249
  let publicTeardownCallRequest;
250
+ // We set expiration timestamp to anchor_block_timestamp + MAX_TX_LIFETIME (24h) just like kernels do
251
+ let expirationTimestamp = privateExecutionResult.entrypoint.publicInputs.anchorBlockHeader.globalVariables.timestamp + BigInt(MAX_TX_LIFETIME);
252
+ let feePayer = AztecAddress.zero();
168
253
  const executions = [
169
254
  privateExecutionResult.entrypoint
170
255
  ];
171
256
  while(executions.length !== 0){
172
257
  const execution = executions.shift();
173
258
  executions.unshift(...execution.nestedExecutionResults);
259
+ // Just like kernels we overwrite the default value if the call sets it.
260
+ const callExpirationTimestamp = execution.publicInputs.expirationTimestamp;
261
+ if (callExpirationTimestamp !== 0n && callExpirationTimestamp < expirationTimestamp) {
262
+ expirationTimestamp = callExpirationTimestamp;
263
+ }
174
264
  const { contractAddress } = execution.publicInputs.callContext;
175
- const noteHashesFromExecution = await Promise.all(execution.publicInputs.noteHashes.getActiveItems().filter((noteHash)=>!noteHash.isEmpty()).map(async (noteHash)=>new OrderedSideEffect(await siloNoteHash(contractAddress, noteHash.value), noteHash.counter)));
176
- const nullifiersFromExecution = await Promise.all(execution.publicInputs.nullifiers.getActiveItems().map(async (nullifier)=>new OrderedSideEffect(await siloNullifier(contractAddress, nullifier.value), nullifier.counter)));
177
- const privateLogsFromExecution = await Promise.all(execution.publicInputs.privateLogs.getActiveItems().map(async (metadata)=>{
178
- metadata.log.fields[0] = await poseidon2Hash([
179
- contractAddress,
180
- metadata.log.fields[0]
181
- ]);
182
- return new OrderedSideEffect(metadata.log, metadata.counter);
183
- }));
184
- siloedNoteHashes.push(...noteHashesFromExecution);
185
- taggedPrivateLogs.push(...privateLogsFromExecution);
186
- nullifiers.push(...nullifiersFromExecution);
265
+ if (execution.publicInputs.isFeePayer) {
266
+ if (!feePayer.isZero()) {
267
+ throw new Error('Multiple fee payers found in private execution result');
268
+ }
269
+ feePayer = contractAddress;
270
+ }
271
+ scopedNoteHashes.push(...execution.publicInputs.noteHashes.getActiveItems().filter((nh)=>!nh.isEmpty()).map((nh)=>nh.scope(contractAddress)));
272
+ scopedNullifiers.push(...execution.publicInputs.nullifiers.getActiveItems().map((n)=>n.scope(contractAddress)));
273
+ taggedPrivateLogs.push(...await Promise.all(execution.publicInputs.privateLogs.getActiveItems().map(async (metadata)=>{
274
+ metadata.log.fields[0] = await computeSiloedPrivateLogFirstField(contractAddress, metadata.log.fields[0]);
275
+ return new OrderedSideEffect(metadata, metadata.counter);
276
+ })));
277
+ noteHashReadRequests.push(...execution.publicInputs.noteHashReadRequests.getActiveItems());
278
+ nullifierReadRequests.push(...execution.publicInputs.nullifierReadRequests.getActiveItems());
187
279
  l2ToL1Messages.push(...execution.publicInputs.l2ToL1Msgs.getActiveItems().map((message)=>new OrderedSideEffect(message.message.scope(contractAddress), message.counter)));
188
280
  contractClassLogsHashes.push(...execution.publicInputs.contractClassLogsHashes.getActiveItems().map((contractClassLogHash)=>new OrderedSideEffect(contractClassLogHash.logHash.scope(contractAddress), contractClassLogHash.counter)));
189
281
  publicCallRequests.push(...execution.publicInputs.publicCallRequests.getActiveItems().map((callRequest)=>new OrderedSideEffect(callRequest.inner, callRequest.counter)));
@@ -192,7 +284,7 @@ class OrderedSideEffect {
192
284
  }
193
285
  publicTeardownCallRequest = execution.publicInputs.publicTeardownCallRequest.isEmpty() ? publicTeardownCallRequest : execution.publicInputs.publicTeardownCallRequest;
194
286
  executionSteps.push({
195
- functionName: await contractDataProvider.getDebugFunctionName(execution.publicInputs.callContext.contractAddress, execution.publicInputs.callContext.functionSelector),
287
+ functionName: await debugFunctionNameGetter(execution.publicInputs.callContext.contractAddress, execution.publicInputs.callContext.functionSelector),
196
288
  timings: execution.profileResult?.timings ?? {
197
289
  witgen: 0,
198
290
  oracles: {}
@@ -202,6 +294,14 @@ class OrderedSideEffect {
202
294
  witness: execution.partialWitness
203
295
  });
204
296
  }
297
+ const noteHashNullifierCounterMap = collectNoteHashNullifierCounterMap(privateExecutionResult);
298
+ const minRevertibleSideEffectCounter = minRevertibleSideEffectCounterOverride ?? getFinalMinRevertibleSideEffectCounter(privateExecutionResult);
299
+ const scopedNoteHashesCLA = new ClaimedLengthArray(padArrayEnd(scopedNoteHashes, ScopedNoteHash.empty(), MAX_NOTE_HASHES_PER_TX), scopedNoteHashes.length);
300
+ const scopedNullifiersCLA = new ClaimedLengthArray(padArrayEnd(scopedNullifiers, ScopedNullifier.empty(), MAX_NULLIFIERS_PER_TX), scopedNullifiers.length);
301
+ const { filteredNoteHashes, filteredNullifiers, filteredPrivateLogs } = squashTransientSideEffects(taggedPrivateLogs, scopedNoteHashesCLA, scopedNullifiersCLA, noteHashNullifierCounterMap, minRevertibleSideEffectCounter);
302
+ await verifyReadRequests(node, await privateExecutionResult.entrypoint.publicInputs.anchorBlockHeader.hash(), noteHashReadRequests, nullifierReadRequests, scopedNoteHashesCLA, scopedNullifiersCLA);
303
+ const siloedNoteHashes = await Promise.all(filteredNoteHashes.sort((a, b)=>a.counter - b.counter).map(async (nh)=>new OrderedSideEffect(await siloNoteHash(nh.contractAddress, nh.value), nh.counter)));
304
+ const siloedNullifiers = await Promise.all(filteredNullifiers.sort((a, b)=>a.counter - b.counter).map(async (n)=>new OrderedSideEffect(await siloNullifier(n.contractAddress, n.value), n.counter)));
205
305
  const constantData = new TxConstantData(privateExecutionResult.entrypoint.publicInputs.anchorBlockHeader, privateExecutionResult.entrypoint.publicInputs.txContext, getVKTreeRoot(), protocolContractsHash);
206
306
  const hasPublicCalls = privateExecutionResult.publicFunctionCalldata.length !== 0;
207
307
  let inputsForRollup;
@@ -210,54 +310,117 @@ class OrderedSideEffect {
210
310
  const sortByCounter = (a, b)=>a.counter - b.counter;
211
311
  const getEffect = (orderedSideEffect)=>orderedSideEffect.sideEffect;
212
312
  const isPrivateOnlyTx = privateExecutionResult.publicFunctionCalldata.length === 0;
213
- const minRevertibleSideEffectCounter = getFinalMinRevertibleSideEffectCounter(privateExecutionResult);
214
- const [nonRevertibleNullifiers, revertibleNullifiers] = splitOrderedSideEffects(nullifiers.sort(sortByCounter), minRevertibleSideEffectCounter);
215
- if (nonRevertibleNullifiers.length > 0 && !nonRevertibleNullifiers[0].equals(nonceGenerator)) {
313
+ const [nonRevertibleNullifiers, revertibleNullifiers] = splitOrderedSideEffects(siloedNullifiers, minRevertibleSideEffectCounter);
314
+ const nonceGenerator = privateExecutionResult.firstNullifier;
315
+ if (nonRevertibleNullifiers.length === 0) {
316
+ nonRevertibleNullifiers.push(nonceGenerator);
317
+ } else if (!nonRevertibleNullifiers[0].equals(nonceGenerator)) {
216
318
  throw new Error('The first non revertible nullifier should be equal to the nonce generator. This is a bug!');
217
- } else {
218
- nonRevertibleNullifiers.unshift(nonceGenerator);
219
319
  }
220
320
  if (isPrivateOnlyTx) {
221
321
  // We must make the note hashes unique by using the
222
322
  // nonce generator and their index in the tx.
223
- const uniqueNoteHashes = await Promise.all(siloedNoteHashes.sort(sortByCounter).map(async (orderedSideEffect, i)=>{
323
+ const uniqueNoteHashes = await Promise.all(siloedNoteHashes.map(async (orderedSideEffect, i)=>{
224
324
  const siloedNoteHash = orderedSideEffect.sideEffect;
225
325
  const nonce = await computeNoteHashNonce(nonceGenerator, i);
226
326
  const uniqueNoteHash = await computeUniqueNoteHash(nonce, siloedNoteHash);
227
327
  return uniqueNoteHash;
228
328
  }));
229
- const accumulatedDataForRollup = new PrivateToRollupAccumulatedData(padArrayEnd(uniqueNoteHashes, Fr.ZERO, MAX_NOTE_HASHES_PER_TX), padArrayEnd(nonRevertibleNullifiers.concat(revertibleNullifiers), Fr.ZERO, MAX_NULLIFIERS_PER_TX), padArrayEnd(l2ToL1Messages.sort(sortByCounter).map(getEffect), ScopedL2ToL1Message.empty(), MAX_L2_TO_L1_MSGS_PER_TX), padArrayEnd(taggedPrivateLogs.sort(sortByCounter).map(getEffect), PrivateLog.empty(), MAX_PRIVATE_LOGS_PER_TX), padArrayEnd(contractClassLogsHashes.sort(sortByCounter).map(getEffect), ScopedLogHash.empty(), MAX_CONTRACT_CLASS_LOGS_PER_TX));
230
- gasUsed = meterGasUsed(accumulatedDataForRollup);
329
+ const accumulatedDataForRollup = new PrivateToRollupAccumulatedData(padArrayEnd(uniqueNoteHashes, Fr.ZERO, MAX_NOTE_HASHES_PER_TX), padArrayEnd(nonRevertibleNullifiers.concat(revertibleNullifiers), Fr.ZERO, MAX_NULLIFIERS_PER_TX), padArrayEnd(l2ToL1Messages.sort(sortByCounter).map(getEffect), ScopedL2ToL1Message.empty(), MAX_L2_TO_L1_MSGS_PER_TX), padArrayEnd(filteredPrivateLogs.sort(sortByCounter).map(getEffect), PrivateLog.empty(), MAX_PRIVATE_LOGS_PER_TX), padArrayEnd(contractClassLogsHashes.sort(sortByCounter).map(getEffect), ScopedLogHash.empty(), MAX_CONTRACT_CLASS_LOGS_PER_TX));
330
+ gasUsed = meterGasUsed(accumulatedDataForRollup, isPrivateOnlyTx);
231
331
  inputsForRollup = new PartialPrivateTailPublicInputsForRollup(accumulatedDataForRollup);
232
332
  } else {
233
- const [nonRevertibleNoteHashes, revertibleNoteHashes] = splitOrderedSideEffects(siloedNoteHashes.sort(sortByCounter), minRevertibleSideEffectCounter);
333
+ const [nonRevertibleNoteHashes, revertibleNoteHashes] = splitOrderedSideEffects(siloedNoteHashes, minRevertibleSideEffectCounter);
334
+ const nonRevertibleUniqueNoteHashes = await Promise.all(nonRevertibleNoteHashes.map(async (noteHash, i)=>{
335
+ const nonce = await computeNoteHashNonce(nonceGenerator, i);
336
+ return await computeUniqueNoteHash(nonce, noteHash);
337
+ }));
234
338
  const [nonRevertibleL2ToL1Messages, revertibleL2ToL1Messages] = splitOrderedSideEffects(l2ToL1Messages.sort(sortByCounter), minRevertibleSideEffectCounter);
235
- const [nonRevertibleTaggedPrivateLogs, revertibleTaggedPrivateLogs] = splitOrderedSideEffects(taggedPrivateLogs, minRevertibleSideEffectCounter);
339
+ const [nonRevertibleTaggedPrivateLogs, revertibleTaggedPrivateLogs] = splitOrderedSideEffects(filteredPrivateLogs, minRevertibleSideEffectCounter);
236
340
  const [nonRevertibleContractClassLogHashes, revertibleContractClassLogHashes] = splitOrderedSideEffects(contractClassLogsHashes.sort(sortByCounter), minRevertibleSideEffectCounter);
237
341
  const [nonRevertiblePublicCallRequests, revertiblePublicCallRequests] = splitOrderedSideEffects(publicCallRequests.sort(sortByCounter), minRevertibleSideEffectCounter);
238
- const nonRevertibleData = new PrivateToPublicAccumulatedData(padArrayEnd(nonRevertibleNoteHashes, Fr.ZERO, MAX_NOTE_HASHES_PER_TX), padArrayEnd(nonRevertibleNullifiers, Fr.ZERO, MAX_NULLIFIERS_PER_TX), padArrayEnd(nonRevertibleL2ToL1Messages, ScopedL2ToL1Message.empty(), MAX_L2_TO_L1_MSGS_PER_TX), padArrayEnd(nonRevertibleTaggedPrivateLogs, PrivateLog.empty(), MAX_PRIVATE_LOGS_PER_TX), padArrayEnd(nonRevertibleContractClassLogHashes, ScopedLogHash.empty(), MAX_CONTRACT_CLASS_LOGS_PER_TX), padArrayEnd(nonRevertiblePublicCallRequests, PublicCallRequest.empty(), MAX_ENQUEUED_CALLS_PER_TX));
342
+ const nonRevertibleData = new PrivateToPublicAccumulatedData(padArrayEnd(nonRevertibleUniqueNoteHashes, Fr.ZERO, MAX_NOTE_HASHES_PER_TX), padArrayEnd(nonRevertibleNullifiers, Fr.ZERO, MAX_NULLIFIERS_PER_TX), padArrayEnd(nonRevertibleL2ToL1Messages, ScopedL2ToL1Message.empty(), MAX_L2_TO_L1_MSGS_PER_TX), padArrayEnd(nonRevertibleTaggedPrivateLogs, PrivateLog.empty(), MAX_PRIVATE_LOGS_PER_TX), padArrayEnd(nonRevertibleContractClassLogHashes, ScopedLogHash.empty(), MAX_CONTRACT_CLASS_LOGS_PER_TX), padArrayEnd(nonRevertiblePublicCallRequests, PublicCallRequest.empty(), MAX_ENQUEUED_CALLS_PER_TX));
239
343
  const revertibleData = new PrivateToPublicAccumulatedData(padArrayEnd(revertibleNoteHashes, Fr.ZERO, MAX_NOTE_HASHES_PER_TX), padArrayEnd(revertibleNullifiers, Fr.ZERO, MAX_NULLIFIERS_PER_TX), padArrayEnd(revertibleL2ToL1Messages, ScopedL2ToL1Message.empty(), MAX_L2_TO_L1_MSGS_PER_TX), padArrayEnd(revertibleTaggedPrivateLogs, PrivateLog.empty(), MAX_PRIVATE_LOGS_PER_TX), padArrayEnd(revertibleContractClassLogHashes, ScopedLogHash.empty(), MAX_CONTRACT_CLASS_LOGS_PER_TX), padArrayEnd(revertiblePublicCallRequests, PublicCallRequest.empty(), MAX_ENQUEUED_CALLS_PER_TX));
240
- gasUsed = meterGasUsed(revertibleData).add(meterGasUsed(nonRevertibleData));
344
+ gasUsed = meterGasUsed(revertibleData, isPrivateOnlyTx).add(meterGasUsed(nonRevertibleData, isPrivateOnlyTx));
241
345
  if (publicTeardownCallRequest) {
242
- gasUsed.add(privateExecutionResult.entrypoint.publicInputs.txContext.gasSettings.teardownGasLimits);
346
+ gasUsed = gasUsed.add(privateExecutionResult.entrypoint.publicInputs.txContext.gasSettings.teardownGasLimits);
243
347
  }
244
348
  inputsForPublic = new PartialPrivateTailPublicInputsForPublic(nonRevertibleData, revertibleData, publicTeardownCallRequest ?? PublicCallRequest.empty());
245
349
  }
246
350
  const publicInputs = new PrivateKernelTailCircuitPublicInputs(constantData, /*gasUsed=*/ gasUsed.add(Gas.from({
247
- l2Gas: FIXED_L2_GAS,
248
- daGas: FIXED_DA_GAS
249
- })), /*feePayer=*/ AztecAddress.zero(), /*includeByTimestamp=*/ 0n, hasPublicCalls ? inputsForPublic : undefined, !hasPublicCalls ? inputsForRollup : undefined);
351
+ l2Gas: isPrivateOnlyTx ? PRIVATE_TX_L2_GAS_OVERHEAD : PUBLIC_TX_L2_GAS_OVERHEAD,
352
+ daGas: TX_DA_GAS_OVERHEAD
353
+ })), /*feePayer=*/ feePayer, /*expirationTimestamp=*/ expirationTimestamp, hasPublicCalls ? inputsForPublic : undefined, !hasPublicCalls ? inputsForRollup : undefined);
250
354
  return {
251
355
  publicInputs,
252
356
  chonkProof: ChonkProof.empty(),
253
357
  executionSteps
254
358
  };
255
359
  }
360
+ /**
361
+ * Squashes transient note hashes and nullifiers, mimicking the behavior
362
+ * of the reset kernels. Returns the filtered (surviving) scoped items and private logs.
363
+ */ function squashTransientSideEffects(taggedPrivateLogs, scopedNoteHashesCLA, scopedNullifiersCLA, noteHashNullifierCounterMap, minRevertibleSideEffectCounter) {
364
+ const { numTransientData, hints: transientDataHints } = buildTransientDataHints(scopedNoteHashesCLA, scopedNullifiersCLA, /*futureNoteHashReads=*/ [], /*futureNullifierReads=*/ [], /*futureLogs=*/ [], noteHashNullifierCounterMap, minRevertibleSideEffectCounter);
365
+ const squashedNoteHashCounters = new Set();
366
+ const squashedNullifierCounters = new Set();
367
+ for(let i = 0; i < numTransientData; i++){
368
+ const hint = transientDataHints[i];
369
+ squashedNoteHashCounters.add(scopedNoteHashesCLA.array[hint.noteHashIndex].counter);
370
+ squashedNullifierCounters.add(scopedNullifiersCLA.array[hint.nullifierIndex].counter);
371
+ }
372
+ return {
373
+ filteredNoteHashes: scopedNoteHashesCLA.getActiveItems().filter((nh)=>!squashedNoteHashCounters.has(nh.counter)),
374
+ filteredNullifiers: scopedNullifiersCLA.getActiveItems().filter((n)=>!squashedNullifierCounters.has(n.counter)),
375
+ filteredPrivateLogs: taggedPrivateLogs.filter((item)=>!squashedNoteHashCounters.has(item.sideEffect.noteHashCounter)).map((item)=>new OrderedSideEffect(item.sideEffect.log, item.counter))
376
+ };
377
+ }
378
+ /**
379
+ * Verifies settled read requests by checking membership in the note hash and nullifier trees
380
+ * at the tx's anchor block, mimicking the behavior of the kernels
381
+ */ async function verifyReadRequests(node, anchorBlockHash, noteHashReadRequests, nullifierReadRequests, scopedNoteHashesCLA, scopedNullifiersCLA) {
382
+ const noteHashReadRequestsCLA = new ClaimedLengthArray(padArrayEnd(noteHashReadRequests, ScopedReadRequest.empty(), MAX_NOTE_HASH_READ_REQUESTS_PER_TX), noteHashReadRequests.length);
383
+ const nullifierReadRequestsCLA = new ClaimedLengthArray(padArrayEnd(nullifierReadRequests, ScopedReadRequest.empty(), MAX_NULLIFIER_READ_REQUESTS_PER_TX), nullifierReadRequests.length);
384
+ const noteHashResetActions = getNoteHashReadRequestResetActions(noteHashReadRequestsCLA, scopedNoteHashesCLA);
385
+ const nullifierResetActions = getNullifierReadRequestResetActions(nullifierReadRequestsCLA, scopedNullifiersCLA);
386
+ const settledNoteHashReads = [];
387
+ for(let i = 0; i < noteHashResetActions.actions.length; i++){
388
+ if (noteHashResetActions.actions[i] === ReadRequestActionEnum.READ_AS_SETTLED) {
389
+ settledNoteHashReads.push({
390
+ index: i,
391
+ value: noteHashReadRequests[i].value
392
+ });
393
+ }
394
+ }
395
+ const settledNullifierReads = [];
396
+ for(let i = 0; i < nullifierResetActions.actions.length; i++){
397
+ if (nullifierResetActions.actions[i] === ReadRequestActionEnum.READ_AS_SETTLED) {
398
+ settledNullifierReads.push({
399
+ index: i,
400
+ value: nullifierReadRequests[i].value
401
+ });
402
+ }
403
+ }
404
+ const [noteHashWitnesses, nullifierWitnesses] = await Promise.all([
405
+ Promise.all(settledNoteHashReads.map(({ value })=>node.getNoteHashMembershipWitness(anchorBlockHash, value))),
406
+ Promise.all(settledNullifierReads.map(({ value })=>node.getNullifierMembershipWitness(anchorBlockHash, value)))
407
+ ]);
408
+ for(let i = 0; i < settledNoteHashReads.length; i++){
409
+ if (!noteHashWitnesses[i]) {
410
+ throw new Error(`Note hash read request at index ${settledNoteHashReads[i].index} is reading an unknown note hash: ${settledNoteHashReads[i].value}`);
411
+ }
412
+ }
413
+ for(let i = 0; i < settledNullifierReads.length; i++){
414
+ if (!nullifierWitnesses[i]) {
415
+ throw new Error(`Nullifier read request at index ${settledNullifierReads[i].index} is reading an unknown nullifier: ${settledNullifierReads[i].value}`);
416
+ }
417
+ }
418
+ }
256
419
  function splitOrderedSideEffects(effects, minRevertibleSideEffectCounter) {
257
420
  const revertibleSideEffects = [];
258
421
  const nonRevertibleSideEffects = [];
259
422
  effects.forEach((effect)=>{
260
- if (effect.counter < minRevertibleSideEffectCounter) {
423
+ if (minRevertibleSideEffectCounter === 0 || effect.counter < minRevertibleSideEffectCounter) {
261
424
  nonRevertibleSideEffects.push(effect.sideEffect);
262
425
  } else {
263
426
  revertibleSideEffects.push(effect.sideEffect);
@@ -268,27 +431,30 @@ function splitOrderedSideEffects(effects, minRevertibleSideEffectCounter) {
268
431
  revertibleSideEffects
269
432
  ];
270
433
  }
271
- function meterGasUsed(data) {
434
+ function meterGasUsed(data, isPrivateOnlyTx) {
272
435
  let meteredDAFields = 0;
273
436
  let meteredL2Gas = 0;
274
437
  const numNoteHashes = arrayNonEmptyLength(data.noteHashes, (hash)=>hash.isEmpty());
275
438
  meteredDAFields += numNoteHashes;
276
- meteredL2Gas += numNoteHashes * AVM_EMITNOTEHASH_BASE_L2_GAS;
439
+ const noteHashBaseGas = isPrivateOnlyTx ? L2_GAS_PER_NOTE_HASH : AVM_EMITNOTEHASH_BASE_L2_GAS;
440
+ meteredL2Gas += numNoteHashes * noteHashBaseGas;
277
441
  const numNullifiers = arrayNonEmptyLength(data.nullifiers, (nullifier)=>nullifier.isEmpty());
278
442
  meteredDAFields += numNullifiers;
279
- meteredL2Gas += numNullifiers * AVM_EMITNULLIFIER_BASE_L2_GAS;
443
+ const nullifierBaseGas = isPrivateOnlyTx ? L2_GAS_PER_NULLIFIER : AVM_EMITNULLIFIER_BASE_L2_GAS;
444
+ meteredL2Gas += numNullifiers * nullifierBaseGas;
280
445
  const numL2toL1Messages = arrayNonEmptyLength(data.l2ToL1Msgs, (msg)=>msg.isEmpty());
281
446
  meteredDAFields += numL2toL1Messages;
282
- meteredL2Gas += numL2toL1Messages * AVM_SENDL2TOL1MSG_BASE_L2_GAS;
447
+ const l2ToL1MessageBaseGas = isPrivateOnlyTx ? L2_GAS_PER_L2_TO_L1_MSG : AVM_SENDL2TOL1MSG_BASE_L2_GAS;
448
+ meteredL2Gas += numL2toL1Messages * l2ToL1MessageBaseGas;
283
449
  const numPrivatelogs = arrayNonEmptyLength(data.privateLogs, (log)=>log.isEmpty());
284
450
  // Every private log emits its length as an additional field
285
451
  meteredDAFields += data.privateLogs.reduce((acc, log)=>!log.isEmpty() ? acc + log.emittedLength + 1 : acc, 0);
286
452
  meteredL2Gas += numPrivatelogs * L2_GAS_PER_PRIVATE_LOG;
287
453
  const numContractClassLogs = arrayNonEmptyLength(data.contractClassLogsHashes, (log)=>log.isEmpty());
288
- // Every contract class log emits its length and contract address as additional fields
289
- meteredDAFields += data.contractClassLogsHashes.reduce((acc, log)=>!log.isEmpty() ? acc + log.logHash.length + 2 : acc, 0);
454
+ // Every contract class log emits its contract address as an additional field
455
+ meteredDAFields += data.contractClassLogsHashes.reduce((acc, log)=>!log.isEmpty() ? acc + log.logHash.length + 1 : acc, 0);
290
456
  meteredL2Gas += numContractClassLogs * L2_GAS_PER_CONTRACT_CLASS_LOG;
291
- const meteredDAGas = meteredDAFields * DA_BYTES_PER_FIELD * DA_GAS_PER_BYTE;
457
+ const meteredDAGas = meteredDAFields * DA_GAS_PER_FIELD;
292
458
  if (data.publicCallRequests) {
293
459
  const dataForPublic = data;
294
460
  const numPublicCallRequests = arrayNonEmptyLength(dataForPublic.publicCallRequests, (req)=>req.isEmpty());
@@ -1,4 +1,4 @@
1
- import { Fr } from '@aztec/foundation/fields';
1
+ import { Fr } from '@aztec/foundation/curves/bn254';
2
2
  import type { AztecAddress } from '@aztec/stdlib/aztec-address';
3
3
  import type { NoteData } from './oracle/interfaces.js';
4
4
  interface PendingNote {
@@ -11,7 +11,7 @@ interface PendingNote {
11
11
  */
12
12
  export declare class ExecutionNoteCache {
13
13
  #private;
14
- private readonly txRequestHash;
14
+ private readonly protocolNullifier;
15
15
  /**
16
16
  * New notes created in this transaction.
17
17
  * They are pushed to this array in the same order as they are emitted.
@@ -28,25 +28,27 @@ export declare class ExecutionNoteCache {
28
28
  */
29
29
  private nullifierMap;
30
30
  /**
31
- * All nullifiers emitted in this transaction.
31
+ * Nullifiers emitted by private calls in this transaction.
32
+ */
33
+ private emittedNullifiers;
34
+ /**
35
+ * The counter that separates non-revertible side effects (which persist even if the tx reverts) from revertible ones.
32
36
  */
33
- private allNullifiers;
34
37
  private minRevertibleSideEffectCounter;
35
38
  private inRevertiblePhase;
36
39
  /**
37
- * We don't need to use the tx request hash for nonces if another non revertible nullifier is emitted.
38
- * In that case we disable injecting the tx request hash as a nullifier.
40
+ * Whether the protocol nullifier was used for nonce generation.
41
+ * We don't need to use the protocol nullifier if a non-revertible nullifier is emitted.
39
42
  */
40
- private usedTxRequestHashForNonces;
41
- constructor(txRequestHash: Fr);
43
+ private usedProtocolNullifierForNonces;
44
+ constructor(protocolNullifier: Fr);
42
45
  /**
43
46
  * Enters the revertible phase of the transaction.
44
47
  * @param minRevertibleSideEffectCounter - The counter at which the transaction enters the revertible phase.
45
48
  */
46
49
  setMinRevertibleSideEffectCounter(minRevertibleSideEffectCounter: number): Promise<void>;
47
- finish(): {
48
- usedTxRequestHashForNonces: boolean;
49
- };
50
+ isSideEffectCounterRevertible(sideEffectCounter: number): boolean;
51
+ finish(): void;
50
52
  /**
51
53
  * Add a new note to cache.
52
54
  * @param note - New note created during execution.
@@ -70,9 +72,10 @@ export declare class ExecutionNoteCache {
70
72
  * Return notes created up to current point in execution.
71
73
  * If a nullifier for a note in this list is emitted, the note will be deleted.
72
74
  * @param contractAddress - Contract address of the notes.
75
+ * @param owner - Owner of the notes. If undefined, returns all notes regardless of owner.
73
76
  * @param storageSlot - Storage slot of the notes.
74
77
  **/
75
- getNotes(contractAddress: AztecAddress, storageSlot: Fr): NoteData[];
78
+ getNotes(contractAddress: AztecAddress, owner: AztecAddress | undefined, storageSlot: Fr): NoteData[];
76
79
  /**
77
80
  * Check if a note exists in the newNotes array.
78
81
  * @param contractAddress - Contract address of the note.
@@ -86,8 +89,16 @@ export declare class ExecutionNoteCache {
86
89
  */
87
90
  getNullifiers(contractAddress: AztecAddress): Set<bigint>;
88
91
  getAllNotes(): PendingNote[];
92
+ /**
93
+ * @returns All nullifiers emitted by private calls in this transaction.
94
+ */
95
+ getEmittedNullifiers(): Fr[];
96
+ /**
97
+ * @returns All nullifiers emitted by private calls in this transaction. If the protocol nullifier was used as the
98
+ * nonce generator, it is injected as the first nullifier.
99
+ */
89
100
  getAllNullifiers(): Fr[];
90
- recordNullifier(contractAddress: AztecAddress, siloedNullifier: bigint): void;
101
+ getNonceGenerator(): Fr;
91
102
  }
92
103
  export {};
93
- //# sourceMappingURL=execution_note_cache.d.ts.map
104
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZXhlY3V0aW9uX25vdGVfY2FjaGUuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9jb250cmFjdF9mdW5jdGlvbl9zaW11bGF0b3IvZXhlY3V0aW9uX25vdGVfY2FjaGUudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLEVBQUUsRUFBRSxNQUFNLGdDQUFnQyxDQUFDO0FBQ3BELE9BQU8sS0FBSyxFQUFFLFlBQVksRUFBRSxNQUFNLDZCQUE2QixDQUFDO0FBR2hFLE9BQU8sS0FBSyxFQUFFLFFBQVEsRUFBRSxNQUFNLHdCQUF3QixDQUFDO0FBRXZELFVBQVUsV0FBVztJQUNuQixJQUFJLEVBQUUsUUFBUSxDQUFDO0lBQ2YsT0FBTyxFQUFFLE1BQU0sQ0FBQztJQUNoQixzQkFBc0IsRUFBRSxFQUFFLENBQUM7Q0FDNUI7QUFFRDs7R0FFRztBQUNILHFCQUFhLGtCQUFrQjs7SUFvQ2pCLE9BQU8sQ0FBQyxRQUFRLENBQUMsaUJBQWlCO0lBbkM5Qzs7O09BR0c7SUFDSCxPQUFPLENBQUMsS0FBSyxDQUFxQjtJQUNsQzs7T0FFRztJQUNILE9BQU8sQ0FBQyxPQUFPLENBQXlDO0lBRXhEOzs7O09BSUc7SUFDSCxPQUFPLENBQUMsWUFBWSxDQUF1QztJQUUzRDs7T0FFRztJQUNILE9BQU8sQ0FBQyxpQkFBaUIsQ0FBMEI7SUFFbkQ7O09BRUc7SUFDSCxPQUFPLENBQUMsOEJBQThCLENBQUs7SUFFM0MsT0FBTyxDQUFDLGlCQUFpQixDQUFTO0lBRWxDOzs7T0FHRztJQUNILE9BQU8sQ0FBQyw4QkFBOEIsQ0FBc0I7SUFFNUQsWUFBNkIsaUJBQWlCLEVBQUUsRUFBRSxFQUFJO0lBRXREOzs7T0FHRztJQUNVLGlDQUFpQyxDQUFDLDhCQUE4QixFQUFFLE1BQU0saUJBc0NwRjtJQUVNLDZCQUE2QixDQUFDLGlCQUFpQixFQUFFLE1BQU0sR0FBRyxPQUFPLENBS3ZFO0lBRU0sTUFBTSxTQU1aO0lBRUQ7OztPQUdHO0lBQ0ksVUFBVSxDQUFDLElBQUksRUFBRSxRQUFRLEVBQUUsT0FBTyxFQUFFLE1BQU0sUUFTaEQ7SUFFRDs7Ozs7O09BTUc7SUFDVSxXQUFXLENBQUMsZUFBZSxFQUFFLFlBQVksRUFBRSxjQUFjLEVBQUUsRUFBRSxFQUFFLFFBQVEsRUFBRSxFQUFFLCtCQXlCdkY7SUFFRDs7OztPQUlHO0lBQ1UsZ0JBQWdCLENBQUMsZUFBZSxFQUFFLFlBQVksRUFBRSxjQUFjLEVBQUUsRUFBRSxpQkFHOUU7SUFFRDs7Ozs7O1FBTUk7SUFDRyxRQUFRLENBQUMsZUFBZSxFQUFFLFlBQVksRUFBRSxLQUFLLEVBQUUsWUFBWSxHQUFHLFNBQVMsRUFBRSxXQUFXLEVBQUUsRUFBRSxjQU05RjtJQUVEOzs7OztRQUtJO0lBQ0csZUFBZSxDQUFDLGVBQWUsRUFBRSxZQUFZLEVBQUUsUUFBUSxFQUFFLEVBQUUsV0FHakU7SUFFRDs7O09BR0c7SUFDSSxhQUFhLENBQUMsZUFBZSxFQUFFLFlBQVksR0FBRyxHQUFHLENBQUMsTUFBTSxDQUFDLENBRS9EO0lBVUQsV0FBVyxJQUFJLFdBQVcsRUFBRSxDQUUzQjtJQUVEOztPQUVHO0lBQ0gsb0JBQW9CLElBQUksRUFBRSxFQUFFLENBRTNCO0lBRUQ7OztPQUdHO0lBQ0gsZ0JBQWdCLElBQUksRUFBRSxFQUFFLENBTXZCO0lBRUQsaUJBQWlCLElBQUksRUFBRSxDQUV0QjtDQWFGIn0=
@@ -1 +1 @@
1
- {"version":3,"file":"execution_note_cache.d.ts","sourceRoot":"","sources":["../../src/contract_function_simulator/execution_note_cache.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAC9C,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAGhE,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,wBAAwB,CAAC;AAEvD,UAAU,WAAW;IACnB,IAAI,EAAE,QAAQ,CAAC;IACf,OAAO,EAAE,MAAM,CAAC;IAChB,sBAAsB,EAAE,EAAE,CAAC;CAC5B;AAED;;GAEG;AACH,qBAAa,kBAAkB;;IAiCjB,OAAO,CAAC,QAAQ,CAAC,aAAa;IAhC1C;;;OAGG;IACH,OAAO,CAAC,KAAK,CAAqB;IAClC;;OAEG;IACH,OAAO,CAAC,OAAO,CAAyC;IAExD;;;;OAIG;IACH,OAAO,CAAC,YAAY,CAAuC;IAE3D;;OAEG;IACH,OAAO,CAAC,aAAa,CAA0B;IAE/C,OAAO,CAAC,8BAA8B,CAAK;IAE3C,OAAO,CAAC,iBAAiB,CAAS;IAElC;;;OAGG;IACH,OAAO,CAAC,0BAA0B,CAAQ;gBAEb,aAAa,EAAE,EAAE;IAE9C;;;OAGG;IACU,iCAAiC,CAAC,8BAA8B,EAAE,MAAM;IAwC9E,MAAM;;;IAWb;;;OAGG;IACI,UAAU,CAAC,IAAI,EAAE,QAAQ,EAAE,OAAO,EAAE,MAAM;IAWjD;;;;;;OAMG;IACU,WAAW,CAAC,eAAe,EAAE,YAAY,EAAE,cAAc,EAAE,EAAE,EAAE,QAAQ,EAAE,EAAE;IA2BxF;;;;OAIG;IACU,gBAAgB,CAAC,eAAe,EAAE,YAAY,EAAE,cAAc,EAAE,EAAE;IAK/E;;;;;QAKI;IACG,QAAQ,CAAC,eAAe,EAAE,YAAY,EAAE,WAAW,EAAE,EAAE;IAK9D;;;;;QAKI;IACG,eAAe,CAAC,eAAe,EAAE,YAAY,EAAE,QAAQ,EAAE,EAAE;IAKlE;;;OAGG;IACI,aAAa,CAAC,eAAe,EAAE,YAAY,GAAG,GAAG,CAAC,MAAM,CAAC;IAYhE,WAAW,IAAI,WAAW,EAAE;IAI5B,gBAAgB,IAAI,EAAE,EAAE;IAIxB,eAAe,CAAC,eAAe,EAAE,YAAY,EAAE,eAAe,EAAE,MAAM;CAWvE"}
1
+ {"version":3,"file":"execution_note_cache.d.ts","sourceRoot":"","sources":["../../src/contract_function_simulator/execution_note_cache.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AACpD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAGhE,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,wBAAwB,CAAC;AAEvD,UAAU,WAAW;IACnB,IAAI,EAAE,QAAQ,CAAC;IACf,OAAO,EAAE,MAAM,CAAC;IAChB,sBAAsB,EAAE,EAAE,CAAC;CAC5B;AAED;;GAEG;AACH,qBAAa,kBAAkB;;IAoCjB,OAAO,CAAC,QAAQ,CAAC,iBAAiB;IAnC9C;;;OAGG;IACH,OAAO,CAAC,KAAK,CAAqB;IAClC;;OAEG;IACH,OAAO,CAAC,OAAO,CAAyC;IAExD;;;;OAIG;IACH,OAAO,CAAC,YAAY,CAAuC;IAE3D;;OAEG;IACH,OAAO,CAAC,iBAAiB,CAA0B;IAEnD;;OAEG;IACH,OAAO,CAAC,8BAA8B,CAAK;IAE3C,OAAO,CAAC,iBAAiB,CAAS;IAElC;;;OAGG;IACH,OAAO,CAAC,8BAA8B,CAAsB;IAE5D,YAA6B,iBAAiB,EAAE,EAAE,EAAI;IAEtD;;;OAGG;IACU,iCAAiC,CAAC,8BAA8B,EAAE,MAAM,iBAsCpF;IAEM,6BAA6B,CAAC,iBAAiB,EAAE,MAAM,GAAG,OAAO,CAKvE;IAEM,MAAM,SAMZ;IAED;;;OAGG;IACI,UAAU,CAAC,IAAI,EAAE,QAAQ,EAAE,OAAO,EAAE,MAAM,QAShD;IAED;;;;;;OAMG;IACU,WAAW,CAAC,eAAe,EAAE,YAAY,EAAE,cAAc,EAAE,EAAE,EAAE,QAAQ,EAAE,EAAE,+BAyBvF;IAED;;;;OAIG;IACU,gBAAgB,CAAC,eAAe,EAAE,YAAY,EAAE,cAAc,EAAE,EAAE,iBAG9E;IAED;;;;;;QAMI;IACG,QAAQ,CAAC,eAAe,EAAE,YAAY,EAAE,KAAK,EAAE,YAAY,GAAG,SAAS,EAAE,WAAW,EAAE,EAAE,cAM9F;IAED;;;;;QAKI;IACG,eAAe,CAAC,eAAe,EAAE,YAAY,EAAE,QAAQ,EAAE,EAAE,WAGjE;IAED;;;OAGG;IACI,aAAa,CAAC,eAAe,EAAE,YAAY,GAAG,GAAG,CAAC,MAAM,CAAC,CAE/D;IAUD,WAAW,IAAI,WAAW,EAAE,CAE3B;IAED;;OAEG;IACH,oBAAoB,IAAI,EAAE,EAAE,CAE3B;IAED;;;OAGG;IACH,gBAAgB,IAAI,EAAE,EAAE,CAMvB;IAED,iBAAiB,IAAI,EAAE,CAEtB;CAaF"}