@aztec/simulator 0.0.0-test.1 → 0.0.1-fake-ceab37513c

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 (436) hide show
  1. package/README.md +6 -0
  2. package/dest/client.d.ts +5 -3
  3. package/dest/client.d.ts.map +1 -1
  4. package/dest/client.js +4 -2
  5. package/dest/common/errors.d.ts +4 -7
  6. package/dest/common/errors.d.ts.map +1 -1
  7. package/dest/common/errors.js +51 -32
  8. package/dest/common/index.d.ts +0 -1
  9. package/dest/common/index.d.ts.map +1 -1
  10. package/dest/common/index.js +0 -1
  11. package/dest/private/acvm/acvm.d.ts +11 -5
  12. package/dest/private/acvm/acvm.d.ts.map +1 -1
  13. package/dest/private/acvm/acvm.js +10 -16
  14. package/dest/private/acvm/acvm_types.d.ts +1 -1
  15. package/dest/private/acvm/acvm_types.d.ts.map +1 -1
  16. package/dest/private/acvm/deserialize.d.ts +17 -18
  17. package/dest/private/acvm/deserialize.d.ts.map +1 -1
  18. package/dest/private/acvm/deserialize.js +31 -23
  19. package/dest/private/acvm/index.d.ts +0 -1
  20. package/dest/private/acvm/index.d.ts.map +1 -1
  21. package/dest/private/acvm/index.js +0 -1
  22. package/dest/private/acvm/serialize.d.ts +19 -2
  23. package/dest/private/acvm/serialize.d.ts.map +1 -1
  24. package/dest/private/acvm/serialize.js +53 -0
  25. package/dest/private/{providers/acvm_native.d.ts → acvm_native.d.ts} +10 -10
  26. package/dest/private/acvm_native.d.ts.map +1 -0
  27. package/dest/private/{providers/acvm_native.js → acvm_native.js} +11 -7
  28. package/dest/private/acvm_wasm.d.ts +15 -0
  29. package/dest/private/acvm_wasm.d.ts.map +1 -0
  30. package/dest/private/{providers/acvm_wasm.js → acvm_wasm.js} +22 -19
  31. package/dest/private/acvm_wasm_with_blobs.d.ts +20 -0
  32. package/dest/private/acvm_wasm_with_blobs.d.ts.map +1 -0
  33. package/dest/private/acvm_wasm_with_blobs.js +35 -0
  34. package/dest/private/circuit_recording/circuit_recorder.d.ts +108 -0
  35. package/dest/private/circuit_recording/circuit_recorder.d.ts.map +1 -0
  36. package/dest/private/circuit_recording/circuit_recorder.js +209 -0
  37. package/dest/private/circuit_recording/file_circuit_recorder.d.ts +31 -0
  38. package/dest/private/circuit_recording/file_circuit_recorder.d.ts.map +1 -0
  39. package/dest/private/circuit_recording/file_circuit_recorder.js +135 -0
  40. package/dest/private/circuit_recording/memory_circuit_recorder.d.ts +5 -0
  41. package/dest/private/circuit_recording/memory_circuit_recorder.d.ts.map +1 -0
  42. package/dest/private/circuit_recording/memory_circuit_recorder.js +9 -0
  43. package/dest/private/circuit_recording/simulator_recorder_wrapper.d.ts +21 -0
  44. package/dest/private/circuit_recording/simulator_recorder_wrapper.d.ts.map +1 -0
  45. package/dest/private/circuit_recording/simulator_recorder_wrapper.js +44 -0
  46. package/dest/private/circuit_simulator.d.ts +35 -0
  47. package/dest/private/circuit_simulator.d.ts.map +1 -0
  48. package/dest/private/circuit_simulator.js +43 -0
  49. package/dest/private/factory.d.ts +12 -0
  50. package/dest/private/factory.d.ts.map +1 -0
  51. package/dest/private/{providers/factory.js → factory.js} +2 -2
  52. package/dest/public/avm/avm_context.d.ts +5 -5
  53. package/dest/public/avm/avm_context.d.ts.map +1 -1
  54. package/dest/public/avm/avm_contract_call_result.d.ts +4 -2
  55. package/dest/public/avm/avm_contract_call_result.d.ts.map +1 -1
  56. package/dest/public/avm/avm_contract_call_result.js +11 -7
  57. package/dest/public/avm/avm_execution_environment.d.ts +2 -1
  58. package/dest/public/avm/avm_execution_environment.d.ts.map +1 -1
  59. package/dest/public/avm/avm_execution_environment.js +4 -2
  60. package/dest/public/avm/avm_gas.d.ts +4 -20
  61. package/dest/public/avm/avm_gas.d.ts.map +1 -1
  62. package/dest/public/avm/avm_gas.js +27 -35
  63. package/dest/public/avm/avm_machine_state.d.ts +2 -0
  64. package/dest/public/avm/avm_machine_state.d.ts.map +1 -1
  65. package/dest/public/avm/avm_machine_state.js +2 -0
  66. package/dest/public/avm/avm_memory_types.d.ts +98 -87
  67. package/dest/public/avm/avm_memory_types.d.ts.map +1 -1
  68. package/dest/public/avm/avm_memory_types.js +17 -6
  69. package/dest/public/avm/avm_simulator.d.ts +4 -5
  70. package/dest/public/avm/avm_simulator.d.ts.map +1 -1
  71. package/dest/public/avm/avm_simulator.js +13 -18
  72. package/dest/public/avm/avm_simulator_interface.d.ts +9 -0
  73. package/dest/public/avm/avm_simulator_interface.d.ts.map +1 -0
  74. package/dest/public/avm/avm_simulator_interface.js +3 -0
  75. package/dest/public/avm/errors.d.ts +1 -16
  76. package/dest/public/avm/errors.d.ts.map +1 -1
  77. package/dest/public/avm/errors.js +0 -37
  78. package/dest/public/avm/fixtures/avm_simulation_tester.d.ts +3 -3
  79. package/dest/public/avm/fixtures/avm_simulation_tester.d.ts.map +1 -1
  80. package/dest/public/avm/fixtures/avm_simulation_tester.js +10 -11
  81. package/dest/public/avm/fixtures/base_avm_simulation_tester.d.ts +4 -4
  82. package/dest/public/avm/fixtures/base_avm_simulation_tester.d.ts.map +1 -1
  83. package/dest/public/avm/fixtures/base_avm_simulation_tester.js +16 -15
  84. package/dest/public/avm/fixtures/initializers.d.ts +43 -0
  85. package/dest/public/avm/fixtures/initializers.d.ts.map +1 -0
  86. package/dest/public/avm/fixtures/initializers.js +42 -0
  87. package/dest/public/avm/fixtures/utils.d.ts +38 -0
  88. package/dest/public/avm/fixtures/utils.d.ts.map +1 -0
  89. package/dest/public/avm/fixtures/utils.js +95 -0
  90. package/dest/public/avm/index.d.ts +0 -2
  91. package/dest/public/avm/index.d.ts.map +1 -1
  92. package/dest/public/avm/index.js +0 -2
  93. package/dest/public/avm/opcodes/accrued_substate.d.ts.map +1 -1
  94. package/dest/public/avm/opcodes/accrued_substate.js +22 -19
  95. package/dest/public/avm/opcodes/addressing_mode.d.ts +11 -7
  96. package/dest/public/avm/opcodes/addressing_mode.d.ts.map +1 -1
  97. package/dest/public/avm/opcodes/addressing_mode.js +48 -27
  98. package/dest/public/avm/opcodes/arithmetic.d.ts +11 -1
  99. package/dest/public/avm/opcodes/arithmetic.d.ts.map +1 -1
  100. package/dest/public/avm/opcodes/arithmetic.js +16 -2
  101. package/dest/public/avm/opcodes/bitwise.d.ts +5 -13
  102. package/dest/public/avm/opcodes/bitwise.d.ts.map +1 -1
  103. package/dest/public/avm/opcodes/bitwise.js +19 -26
  104. package/dest/public/avm/opcodes/comparators.d.ts.map +1 -1
  105. package/dest/public/avm/opcodes/comparators.js +3 -3
  106. package/dest/public/avm/opcodes/contract.d.ts +1 -2
  107. package/dest/public/avm/opcodes/contract.d.ts.map +1 -1
  108. package/dest/public/avm/opcodes/contract.js +9 -10
  109. package/dest/public/avm/opcodes/control_flow.d.ts.map +1 -1
  110. package/dest/public/avm/opcodes/control_flow.js +10 -8
  111. package/dest/public/avm/opcodes/conversion.d.ts +1 -0
  112. package/dest/public/avm/opcodes/conversion.d.ts.map +1 -1
  113. package/dest/public/avm/opcodes/conversion.js +264 -3
  114. package/dest/public/avm/opcodes/ec_add.d.ts.map +1 -1
  115. package/dest/public/avm/opcodes/ec_add.js +2 -2
  116. package/dest/public/avm/opcodes/environment_getters.d.ts +2 -2
  117. package/dest/public/avm/opcodes/environment_getters.d.ts.map +1 -1
  118. package/dest/public/avm/opcodes/environment_getters.js +12 -12
  119. package/dest/public/avm/opcodes/external_calls.d.ts +8 -7
  120. package/dest/public/avm/opcodes/external_calls.d.ts.map +1 -1
  121. package/dest/public/avm/opcodes/external_calls.js +39 -33
  122. package/dest/public/avm/opcodes/hashing.d.ts.map +1 -1
  123. package/dest/public/avm/opcodes/hashing.js +6 -6
  124. package/dest/public/avm/opcodes/instruction.d.ts +14 -10
  125. package/dest/public/avm/opcodes/instruction.d.ts.map +1 -1
  126. package/dest/public/avm/opcodes/instruction.js +18 -13
  127. package/dest/public/avm/opcodes/memory.d.ts +4 -4
  128. package/dest/public/avm/opcodes/memory.d.ts.map +1 -1
  129. package/dest/public/avm/opcodes/memory.js +37 -33
  130. package/dest/public/avm/opcodes/misc.d.ts.map +1 -1
  131. package/dest/public/avm/opcodes/misc.js +17 -12
  132. package/dest/public/avm/opcodes/storage.d.ts.map +1 -1
  133. package/dest/public/avm/opcodes/storage.js +7 -5
  134. package/dest/public/avm/revert_reason.d.ts +18 -0
  135. package/dest/public/avm/revert_reason.d.ts.map +1 -0
  136. package/dest/public/avm/revert_reason.js +38 -0
  137. package/dest/public/avm/serialization/buffer_cursor.d.ts +0 -2
  138. package/dest/public/avm/serialization/buffer_cursor.d.ts.map +1 -1
  139. package/dest/public/avm/serialization/bytecode_serialization.d.ts +2 -6
  140. package/dest/public/avm/serialization/bytecode_serialization.d.ts.map +1 -1
  141. package/dest/public/avm/serialization/bytecode_serialization.js +70 -69
  142. package/dest/public/avm/serialization/instruction_serialization.d.ts +5 -4
  143. package/dest/public/avm/serialization/instruction_serialization.d.ts.map +1 -1
  144. package/dest/public/avm/serialization/instruction_serialization.js +60 -35
  145. package/dest/public/avm/test_utils.d.ts +10 -13
  146. package/dest/public/avm/test_utils.d.ts.map +1 -1
  147. package/dest/public/avm/test_utils.js +12 -17
  148. package/dest/public/db_interfaces.d.ts +56 -0
  149. package/dest/public/db_interfaces.d.ts.map +1 -0
  150. package/dest/public/db_interfaces.js +3 -0
  151. package/dest/public/debug_fn_name.d.ts +5 -0
  152. package/dest/public/debug_fn_name.d.ts.map +1 -0
  153. package/dest/public/debug_fn_name.js +9 -0
  154. package/dest/public/executor_metrics.d.ts +10 -3
  155. package/dest/public/executor_metrics.d.ts.map +1 -1
  156. package/dest/public/executor_metrics.js +37 -6
  157. package/dest/public/executor_metrics_interface.d.ts +9 -0
  158. package/dest/public/executor_metrics_interface.d.ts.map +1 -0
  159. package/dest/public/executor_metrics_interface.js +1 -0
  160. package/dest/public/fixtures/amm_test.d.ts +10 -0
  161. package/dest/public/fixtures/amm_test.d.ts.map +1 -0
  162. package/dest/public/fixtures/amm_test.js +213 -0
  163. package/dest/public/fixtures/bulk_test.d.ts +6 -0
  164. package/dest/public/fixtures/bulk_test.d.ts.map +1 -0
  165. package/dest/public/fixtures/bulk_test.js +393 -0
  166. package/dest/public/fixtures/index.d.ts +6 -0
  167. package/dest/public/fixtures/index.d.ts.map +1 -1
  168. package/dest/public/fixtures/index.js +6 -0
  169. package/dest/public/fixtures/minimal_public_tx.d.ts +9 -0
  170. package/dest/public/fixtures/minimal_public_tx.d.ts.map +1 -0
  171. package/dest/public/fixtures/minimal_public_tx.js +43 -0
  172. package/dest/public/fixtures/public_tx_simulation_tester.d.ts +33 -13
  173. package/dest/public/fixtures/public_tx_simulation_tester.d.ts.map +1 -1
  174. package/dest/public/fixtures/public_tx_simulation_tester.js +90 -70
  175. package/dest/public/{avm/fixtures → fixtures}/simple_contract_data_source.d.ts +6 -6
  176. package/dest/public/fixtures/simple_contract_data_source.d.ts.map +1 -0
  177. package/dest/public/{avm/fixtures → fixtures}/simple_contract_data_source.js +31 -10
  178. package/dest/public/fixtures/token_test.d.ts +8 -0
  179. package/dest/public/fixtures/token_test.d.ts.map +1 -0
  180. package/dest/public/fixtures/token_test.js +95 -0
  181. package/dest/public/fixtures/utils.d.ts +16 -3
  182. package/dest/public/fixtures/utils.d.ts.map +1 -1
  183. package/dest/public/fixtures/utils.js +100 -58
  184. package/dest/public/hinting_db_sources.d.ts +68 -0
  185. package/dest/public/hinting_db_sources.d.ts.map +1 -0
  186. package/dest/public/hinting_db_sources.js +294 -0
  187. package/dest/public/index.d.ts +4 -8
  188. package/dest/public/index.d.ts.map +1 -1
  189. package/dest/public/index.js +4 -7
  190. package/dest/public/public_db_sources.d.ts +30 -39
  191. package/dest/public/public_db_sources.d.ts.map +1 -1
  192. package/dest/public/public_db_sources.js +141 -67
  193. package/dest/public/public_processor/guarded_merkle_tree.d.ts +47 -0
  194. package/dest/public/public_processor/guarded_merkle_tree.d.ts.map +1 -0
  195. package/dest/public/public_processor/guarded_merkle_tree.js +105 -0
  196. package/dest/public/public_processor/public_processor.d.ts +19 -29
  197. package/dest/public/public_processor/public_processor.d.ts.map +1 -1
  198. package/dest/public/public_processor/public_processor.js +133 -94
  199. package/dest/public/public_processor/public_processor_metrics.d.ts +2 -2
  200. package/dest/public/public_processor/public_processor_metrics.d.ts.map +1 -1
  201. package/dest/public/public_processor/public_processor_metrics.js +1 -1
  202. package/dest/public/public_tx_simulator/index.d.ts +3 -0
  203. package/dest/public/public_tx_simulator/index.d.ts.map +1 -0
  204. package/dest/public/public_tx_simulator/index.js +2 -0
  205. package/dest/public/public_tx_simulator/measured_public_tx_simulator.d.ts +23 -0
  206. package/dest/public/public_tx_simulator/measured_public_tx_simulator.d.ts.map +1 -0
  207. package/dest/public/public_tx_simulator/measured_public_tx_simulator.js +52 -0
  208. package/dest/public/public_tx_simulator/public_tx_context.d.ts +17 -29
  209. package/dest/public/public_tx_simulator/public_tx_context.d.ts.map +1 -1
  210. package/dest/public/public_tx_simulator/public_tx_context.js +59 -91
  211. package/dest/public/public_tx_simulator/public_tx_simulator.d.ts +27 -42
  212. package/dest/public/public_tx_simulator/public_tx_simulator.d.ts.map +1 -1
  213. package/dest/public/public_tx_simulator/public_tx_simulator.js +128 -171
  214. package/dest/public/public_tx_simulator/telemetry_public_tx_simulator.d.ts +20 -0
  215. package/dest/public/public_tx_simulator/telemetry_public_tx_simulator.d.ts.map +1 -0
  216. package/dest/public/public_tx_simulator/telemetry_public_tx_simulator.js +39 -0
  217. package/dest/public/side_effect_trace.d.ts +10 -62
  218. package/dest/public/side_effect_trace.d.ts.map +1 -1
  219. package/dest/public/side_effect_trace.js +43 -108
  220. package/dest/public/side_effect_trace_interface.d.ts +5 -22
  221. package/dest/public/side_effect_trace_interface.d.ts.map +1 -1
  222. package/dest/public/state_manager/index.d.ts +2 -0
  223. package/dest/public/state_manager/index.d.ts.map +1 -0
  224. package/dest/public/state_manager/index.js +1 -0
  225. package/dest/public/{avm/journal → state_manager}/nullifiers.d.ts +2 -2
  226. package/dest/public/state_manager/nullifiers.d.ts.map +1 -0
  227. package/dest/public/{avm/journal → state_manager}/nullifiers.js +2 -2
  228. package/dest/public/{avm/journal → state_manager}/public_storage.d.ts +2 -2
  229. package/dest/public/state_manager/public_storage.d.ts.map +1 -0
  230. package/dest/public/{avm/journal/journal.d.ts → state_manager/state_manager.d.ts} +37 -85
  231. package/dest/public/state_manager/state_manager.d.ts.map +1 -0
  232. package/dest/public/state_manager/state_manager.js +352 -0
  233. package/dest/public/test_executor_metrics.d.ts +54 -0
  234. package/dest/public/test_executor_metrics.d.ts.map +1 -0
  235. package/dest/public/test_executor_metrics.js +306 -0
  236. package/dest/public/unique_class_ids.d.ts.map +1 -1
  237. package/dest/public/utils.d.ts +2 -4
  238. package/dest/public/utils.d.ts.map +1 -1
  239. package/dest/public/utils.js +4 -21
  240. package/dest/server.d.ts +6 -3
  241. package/dest/server.d.ts.map +1 -1
  242. package/dest/server.js +5 -2
  243. package/dest/testing.d.ts +2 -0
  244. package/dest/testing.d.ts.map +1 -0
  245. package/dest/testing.js +1 -0
  246. package/package.json +31 -30
  247. package/src/client.ts +5 -3
  248. package/src/common/errors.ts +79 -44
  249. package/src/common/index.ts +0 -1
  250. package/src/private/acvm/acvm.ts +17 -32
  251. package/src/private/acvm/acvm_types.ts +1 -1
  252. package/src/private/acvm/deserialize.ts +35 -29
  253. package/src/private/acvm/index.ts +0 -1
  254. package/src/private/acvm/serialize.ts +63 -0
  255. package/src/private/{providers/acvm_native.ts → acvm_native.ts} +31 -15
  256. package/src/private/acvm_wasm.ts +72 -0
  257. package/src/private/acvm_wasm_with_blobs.ts +54 -0
  258. package/src/private/circuit_recording/circuit_recorder.ts +260 -0
  259. package/src/private/circuit_recording/file_circuit_recorder.ts +158 -0
  260. package/src/private/circuit_recording/memory_circuit_recorder.ts +11 -0
  261. package/src/private/circuit_recording/simulator_recorder_wrapper.ts +91 -0
  262. package/src/private/circuit_simulator.ts +90 -0
  263. package/src/private/{providers/factory.ts → factory.ts} +6 -6
  264. package/src/public/avm/avm_context.ts +4 -4
  265. package/src/public/avm/avm_contract_call_result.ts +17 -5
  266. package/src/public/avm/avm_execution_environment.ts +7 -1
  267. package/src/public/avm/avm_gas.ts +23 -35
  268. package/src/public/avm/avm_machine_state.ts +5 -0
  269. package/src/public/avm/avm_memory_types.ts +19 -6
  270. package/src/public/avm/avm_simulator.ts +30 -29
  271. package/src/public/avm/avm_simulator_interface.ts +8 -0
  272. package/src/public/avm/errors.ts +1 -53
  273. package/src/public/avm/fixtures/avm_simulation_tester.ts +19 -18
  274. package/src/public/avm/fixtures/base_avm_simulation_tester.ts +15 -14
  275. package/src/public/avm/fixtures/initializers.ts +103 -0
  276. package/src/public/avm/fixtures/utils.ts +150 -0
  277. package/src/public/avm/index.ts +0 -2
  278. package/src/public/avm/opcodes/accrued_substate.ts +62 -27
  279. package/src/public/avm/opcodes/addressing_mode.ts +57 -33
  280. package/src/public/avm/opcodes/arithmetic.ts +24 -2
  281. package/src/public/avm/opcodes/bitwise.ts +33 -29
  282. package/src/public/avm/opcodes/comparators.ts +6 -3
  283. package/src/public/avm/opcodes/contract.ts +10 -7
  284. package/src/public/avm/opcodes/control_flow.ts +19 -10
  285. package/src/public/avm/opcodes/conversion.ts +23 -3
  286. package/src/public/avm/opcodes/ec_add.ts +5 -2
  287. package/src/public/avm/opcodes/environment_getters.ts +22 -15
  288. package/src/public/avm/opcodes/external_calls.ts +61 -28
  289. package/src/public/avm/opcodes/hashing.ts +28 -8
  290. package/src/public/avm/opcodes/instruction.ts +23 -15
  291. package/src/public/avm/opcodes/memory.ts +71 -32
  292. package/src/public/avm/opcodes/misc.ts +24 -16
  293. package/src/public/avm/opcodes/storage.ts +22 -6
  294. package/src/public/avm/revert_reason.ts +55 -0
  295. package/src/public/avm/serialization/buffer_cursor.ts +4 -1
  296. package/src/public/avm/serialization/bytecode_serialization.ts +72 -74
  297. package/src/public/avm/serialization/instruction_serialization.ts +63 -34
  298. package/src/public/avm/test_utils.ts +23 -32
  299. package/src/public/db_interfaces.ts +61 -0
  300. package/src/{common → public}/debug_fn_name.ts +7 -7
  301. package/src/public/executor_metrics.ts +55 -6
  302. package/src/public/executor_metrics_interface.ts +14 -0
  303. package/src/public/fixtures/amm_test.ts +331 -0
  304. package/src/public/fixtures/bulk_test.ts +151 -0
  305. package/src/public/fixtures/index.ts +6 -0
  306. package/src/public/fixtures/minimal_public_tx.ts +59 -0
  307. package/src/public/fixtures/public_tx_simulation_tester.ts +154 -113
  308. package/src/public/{avm/fixtures → fixtures}/simple_contract_data_source.ts +36 -18
  309. package/src/public/fixtures/token_test.ts +140 -0
  310. package/src/public/fixtures/utils.ts +141 -68
  311. package/src/public/hinting_db_sources.ts +500 -0
  312. package/src/public/index.ts +4 -8
  313. package/src/public/public_db_sources.ts +179 -96
  314. package/src/public/public_processor/guarded_merkle_tree.ts +149 -0
  315. package/src/public/public_processor/public_processor.ts +179 -139
  316. package/src/public/public_processor/public_processor_metrics.ts +2 -2
  317. package/src/public/public_tx_simulator/index.ts +2 -0
  318. package/src/public/public_tx_simulator/measured_public_tx_simulator.ts +106 -0
  319. package/src/public/public_tx_simulator/public_tx_context.ts +153 -193
  320. package/src/public/public_tx_simulator/public_tx_simulator.ts +167 -211
  321. package/src/public/public_tx_simulator/telemetry_public_tx_simulator.ts +72 -0
  322. package/src/public/side_effect_trace.ts +52 -303
  323. package/src/public/side_effect_trace_interface.ts +4 -58
  324. package/src/public/state_manager/index.ts +1 -0
  325. package/src/public/{avm/journal → state_manager}/nullifiers.ts +4 -4
  326. package/src/public/{avm/journal → state_manager}/public_storage.ts +2 -2
  327. package/src/public/state_manager/state_manager.ts +512 -0
  328. package/src/public/test_executor_metrics.ts +395 -0
  329. package/src/public/utils.ts +5 -21
  330. package/src/server.ts +6 -3
  331. package/src/testing.ts +1 -0
  332. package/dest/common/db_interfaces.d.ts +0 -80
  333. package/dest/common/db_interfaces.d.ts.map +0 -1
  334. package/dest/common/db_interfaces.js +0 -1
  335. package/dest/common/debug_fn_name.d.ts +0 -5
  336. package/dest/common/debug_fn_name.d.ts.map +0 -1
  337. package/dest/common/debug_fn_name.js +0 -6
  338. package/dest/common/message_load_oracle_inputs.d.ts +0 -15
  339. package/dest/common/message_load_oracle_inputs.d.ts.map +0 -1
  340. package/dest/common/message_load_oracle_inputs.js +0 -15
  341. package/dest/private/acvm/oracle/index.d.ts +0 -14
  342. package/dest/private/acvm/oracle/index.d.ts.map +0 -1
  343. package/dest/private/acvm/oracle/index.js +0 -2
  344. package/dest/private/acvm/oracle/oracle.d.ts +0 -49
  345. package/dest/private/acvm/oracle/oracle.d.ts.map +0 -1
  346. package/dest/private/acvm/oracle/oracle.js +0 -263
  347. package/dest/private/acvm/oracle/typed_oracle.d.ts +0 -83
  348. package/dest/private/acvm/oracle/typed_oracle.d.ts.map +0 -1
  349. package/dest/private/acvm/oracle/typed_oracle.js +0 -132
  350. package/dest/private/execution_data_provider.d.ts +0 -261
  351. package/dest/private/execution_data_provider.d.ts.map +0 -1
  352. package/dest/private/execution_data_provider.js +0 -14
  353. package/dest/private/execution_note_cache.d.ts +0 -93
  354. package/dest/private/execution_note_cache.d.ts.map +0 -1
  355. package/dest/private/execution_note_cache.js +0 -180
  356. package/dest/private/hashed_values_cache.d.ts +0 -28
  357. package/dest/private/hashed_values_cache.d.ts.map +0 -1
  358. package/dest/private/hashed_values_cache.js +0 -46
  359. package/dest/private/index.d.ts +0 -13
  360. package/dest/private/index.d.ts.map +0 -1
  361. package/dest/private/index.js +0 -12
  362. package/dest/private/pick_notes.d.ts +0 -85
  363. package/dest/private/pick_notes.d.ts.map +0 -1
  364. package/dest/private/pick_notes.js +0 -51
  365. package/dest/private/private_execution.d.ts +0 -25
  366. package/dest/private/private_execution.d.ts.map +0 -1
  367. package/dest/private/private_execution.js +0 -92
  368. package/dest/private/private_execution_oracle.d.ts +0 -215
  369. package/dest/private/private_execution_oracle.d.ts.map +0 -1
  370. package/dest/private/private_execution_oracle.js +0 -382
  371. package/dest/private/providers/acvm_native.d.ts.map +0 -1
  372. package/dest/private/providers/acvm_wasm.d.ts +0 -15
  373. package/dest/private/providers/acvm_wasm.d.ts.map +0 -1
  374. package/dest/private/providers/acvm_wasm_with_blobs.d.ts +0 -19
  375. package/dest/private/providers/acvm_wasm_with_blobs.d.ts.map +0 -1
  376. package/dest/private/providers/acvm_wasm_with_blobs.js +0 -32
  377. package/dest/private/providers/factory.d.ts +0 -12
  378. package/dest/private/providers/factory.d.ts.map +0 -1
  379. package/dest/private/providers/simulation_provider.d.ts +0 -19
  380. package/dest/private/providers/simulation_provider.d.ts.map +0 -1
  381. package/dest/private/providers/simulation_provider.js +0 -24
  382. package/dest/private/simulator.d.ts +0 -34
  383. package/dest/private/simulator.d.ts.map +0 -1
  384. package/dest/private/simulator.js +0 -76
  385. package/dest/private/unconstrained_execution.d.ts +0 -10
  386. package/dest/private/unconstrained_execution.d.ts.map +0 -1
  387. package/dest/private/unconstrained_execution.js +0 -27
  388. package/dest/private/unconstrained_execution_oracle.d.ts +0 -161
  389. package/dest/private/unconstrained_execution_oracle.d.ts.map +0 -1
  390. package/dest/private/unconstrained_execution_oracle.js +0 -258
  391. package/dest/public/avm/bytecode_utils.d.ts +0 -5
  392. package/dest/public/avm/bytecode_utils.d.ts.map +0 -1
  393. package/dest/public/avm/bytecode_utils.js +0 -17
  394. package/dest/public/avm/fixtures/index.d.ts +0 -84
  395. package/dest/public/avm/fixtures/index.d.ts.map +0 -1
  396. package/dest/public/avm/fixtures/index.js +0 -175
  397. package/dest/public/avm/fixtures/simple_contract_data_source.d.ts.map +0 -1
  398. package/dest/public/avm/journal/index.d.ts +0 -2
  399. package/dest/public/avm/journal/index.d.ts.map +0 -1
  400. package/dest/public/avm/journal/index.js +0 -1
  401. package/dest/public/avm/journal/journal.d.ts.map +0 -1
  402. package/dest/public/avm/journal/journal.js +0 -486
  403. package/dest/public/avm/journal/nullifiers.d.ts.map +0 -1
  404. package/dest/public/avm/journal/public_storage.d.ts.map +0 -1
  405. package/dest/public/execution.d.ts +0 -108
  406. package/dest/public/execution.d.ts.map +0 -1
  407. package/dest/public/execution.js +0 -9
  408. package/dest/test/utils.d.ts +0 -13
  409. package/dest/test/utils.d.ts.map +0 -1
  410. package/dest/test/utils.js +0 -22
  411. package/src/common/db_interfaces.ts +0 -94
  412. package/src/common/message_load_oracle_inputs.ts +0 -15
  413. package/src/private/acvm/oracle/index.ts +0 -16
  414. package/src/private/acvm/oracle/oracle.ts +0 -455
  415. package/src/private/acvm/oracle/typed_oracle.ts +0 -259
  416. package/src/private/execution_data_provider.ts +0 -323
  417. package/src/private/execution_note_cache.ts +0 -217
  418. package/src/private/hashed_values_cache.ts +0 -55
  419. package/src/private/index.ts +0 -16
  420. package/src/private/pick_notes.ts +0 -141
  421. package/src/private/private_execution.ts +0 -151
  422. package/src/private/private_execution_oracle.ts +0 -614
  423. package/src/private/providers/acvm_wasm.ts +0 -63
  424. package/src/private/providers/acvm_wasm_with_blobs.ts +0 -50
  425. package/src/private/providers/simulation_provider.ts +0 -45
  426. package/src/private/simulator.ts +0 -147
  427. package/src/private/unconstrained_execution.ts +0 -50
  428. package/src/private/unconstrained_execution_oracle.ts +0 -373
  429. package/src/public/avm/bytecode_utils.ts +0 -17
  430. package/src/public/avm/fixtures/index.ts +0 -296
  431. package/src/public/avm/journal/index.ts +0 -1
  432. package/src/public/avm/journal/journal.ts +0 -742
  433. package/src/public/avm/opcodes/.eslintrc.cjs +0 -8
  434. package/src/public/execution.ts +0 -140
  435. package/src/test/utils.ts +0 -36
  436. /package/dest/public/{avm/journal → state_manager}/public_storage.js +0 -0
@@ -2,24 +2,31 @@ import { MAX_NOTE_HASHES_PER_TX, MAX_NULLIFIERS_PER_TX, NULLIFIER_SUBTREE_HEIGHT
2
2
  import { padArrayEnd } from '@aztec/foundation/collection';
3
3
  import { Fr } from '@aztec/foundation/fields';
4
4
  import { createLogger } from '@aztec/foundation/log';
5
- import { type DateProvider, Timer, elapsed, executeTimeout } from '@aztec/foundation/timer';
5
+ import { sleep } from '@aztec/foundation/sleep';
6
+ import { DateProvider, Timer, elapsed, executeTimeout } from '@aztec/foundation/timer';
6
7
  import { ProtocolContractAddress } from '@aztec/protocol-contracts';
7
- import { ContractClassRegisteredEvent } from '@aztec/protocol-contracts/class-registerer';
8
+ import { ContractClassPublishedEvent } from '@aztec/protocol-contracts/class-registry';
8
9
  import { computeFeePayerBalanceLeafSlot, computeFeePayerBalanceStorageSlot } from '@aztec/protocol-contracts/fee-juice';
9
10
  import { PublicDataWrite } from '@aztec/stdlib/avm';
10
11
  import type { AztecAddress } from '@aztec/stdlib/aztec-address';
11
12
  import type { ContractDataSource } from '@aztec/stdlib/contract';
13
+ import { computeTransactionFee } from '@aztec/stdlib/fees';
12
14
  import { Gas } from '@aztec/stdlib/gas';
13
- import type { MerkleTreeWriteOperations } from '@aztec/stdlib/interfaces/server';
15
+ import type {
16
+ MerkleTreeWriteOperations,
17
+ PublicProcessorLimits,
18
+ PublicProcessorValidator,
19
+ SequencerConfig,
20
+ } from '@aztec/stdlib/interfaces/server';
14
21
  import { MerkleTreeId } from '@aztec/stdlib/trees';
15
22
  import {
16
23
  type FailedTx,
17
24
  GlobalVariables,
18
25
  NestedProcessReturnValues,
19
26
  type ProcessedTx,
27
+ StateReference,
20
28
  Tx,
21
29
  TxExecutionPhase,
22
- type TxValidator,
23
30
  makeProcessedTxFromPrivateOnlyTx,
24
31
  makeProcessedTxFromTxWithPublicCalls,
25
32
  } from '@aztec/stdlib/tx';
@@ -33,8 +40,9 @@ import {
33
40
  } from '@aztec/telemetry-client';
34
41
  import { ForkCheckpoint } from '@aztec/world-state/native';
35
42
 
36
- import { WorldStateDB } from '../public_db_sources.js';
37
- import { PublicTxSimulator } from '../public_tx_simulator/public_tx_simulator.js';
43
+ import { PublicContractsDB, PublicTreesDB } from '../public_db_sources.js';
44
+ import { type PublicTxSimulator, TelemetryPublicTxSimulator } from '../public_tx_simulator/index.js';
45
+ import { GuardedMerkleTreeOperations } from './guarded_merkle_tree.js';
38
46
  import { PublicProcessorMetrics } from './public_processor_metrics.js';
39
47
 
40
48
  /**
@@ -43,8 +51,8 @@ import { PublicProcessorMetrics } from './public_processor_metrics.js';
43
51
  export class PublicProcessorFactory {
44
52
  constructor(
45
53
  private contractDataSource: ContractDataSource,
46
- private dateProvider: DateProvider,
47
- private telemetryClient: TelemetryClient = getTelemetryClient(),
54
+ private dateProvider: DateProvider = new DateProvider(),
55
+ protected telemetryClient: TelemetryClient = getTelemetryClient(),
48
56
  ) {}
49
57
 
50
58
  /**
@@ -58,21 +66,24 @@ export class PublicProcessorFactory {
58
66
  merkleTree: MerkleTreeWriteOperations,
59
67
  globalVariables: GlobalVariables,
60
68
  skipFeeEnforcement: boolean,
69
+ clientInitiatedSimulation: boolean = false,
61
70
  ): PublicProcessor {
62
- const worldStateDB = new WorldStateDB(merkleTree, this.contractDataSource);
71
+ const contractsDB = new PublicContractsDB(this.contractDataSource);
72
+
73
+ const guardedFork = new GuardedMerkleTreeOperations(merkleTree);
63
74
  const publicTxSimulator = this.createPublicTxSimulator(
64
- merkleTree,
65
- worldStateDB,
75
+ guardedFork,
76
+ contractsDB,
66
77
  globalVariables,
67
78
  /*doMerkleOperations=*/ true,
68
79
  skipFeeEnforcement,
69
- this.telemetryClient,
80
+ clientInitiatedSimulation,
70
81
  );
71
82
 
72
83
  return new PublicProcessor(
73
- merkleTree,
74
84
  globalVariables,
75
- worldStateDB,
85
+ guardedFork,
86
+ contractsDB,
76
87
  publicTxSimulator,
77
88
  this.dateProvider,
78
89
  this.telemetryClient,
@@ -80,20 +91,21 @@ export class PublicProcessorFactory {
80
91
  }
81
92
 
82
93
  protected createPublicTxSimulator(
83
- db: MerkleTreeWriteOperations,
84
- worldStateDB: WorldStateDB,
94
+ merkleTree: MerkleTreeWriteOperations,
95
+ contractsDB: PublicContractsDB,
85
96
  globalVariables: GlobalVariables,
86
97
  doMerkleOperations: boolean,
87
98
  skipFeeEnforcement: boolean,
88
- telemetryClient: TelemetryClient,
89
- ) {
90
- return new PublicTxSimulator(
91
- db,
92
- worldStateDB,
99
+ clientInitiatedSimulation: boolean,
100
+ ): PublicTxSimulator {
101
+ return new TelemetryPublicTxSimulator(
102
+ merkleTree,
103
+ contractsDB,
93
104
  globalVariables,
94
105
  doMerkleOperations,
95
106
  skipFeeEnforcement,
96
- telemetryClient,
107
+ clientInitiatedSimulation,
108
+ this.telemetryClient,
97
109
  );
98
110
  }
99
111
  }
@@ -111,14 +123,16 @@ class PublicProcessorTimeoutError extends Error {
111
123
  */
112
124
  export class PublicProcessor implements Traceable {
113
125
  private metrics: PublicProcessorMetrics;
126
+
114
127
  constructor(
115
- protected db: MerkleTreeWriteOperations,
116
128
  protected globalVariables: GlobalVariables,
117
- protected worldStateDB: WorldStateDB,
129
+ private guardedMerkleTree: GuardedMerkleTreeOperations,
130
+ protected contractsDB: PublicContractsDB,
118
131
  protected publicTxSimulator: PublicTxSimulator,
119
132
  private dateProvider: DateProvider,
120
133
  telemetryClient: TelemetryClient = getTelemetryClient(),
121
134
  private log = createLogger('simulator:public-processor'),
135
+ private opts: Pick<SequencerConfig, 'fakeProcessingDelayPerTxMs'> = {},
122
136
  ) {
123
137
  this.metrics = new PublicProcessorMetrics(telemetryClient, 'PublicProcessor');
124
138
  }
@@ -130,26 +144,19 @@ export class PublicProcessor implements Traceable {
130
144
  /**
131
145
  * Run each tx through the public circuit and the public kernel circuit if needed.
132
146
  * @param txs - Txs to process.
133
- * @param processedTxHandler - Handler for processed txs in the context of block building or proving.
147
+ * @param limits - Limits for processing the txs.
148
+ * @param validator - Pre-process validator and nullifier cache to use for processing the txs.
134
149
  * @returns The list of processed txs with their circuit simulation outputs.
135
150
  */
136
151
  public async process(
137
152
  txs: Iterable<Tx> | AsyncIterable<Tx>,
138
- limits: {
139
- maxTransactions?: number;
140
- maxBlockSize?: number;
141
- maxBlockGas?: Gas;
142
- deadline?: Date;
143
- } = {},
144
- validators: {
145
- preprocessValidator?: TxValidator<Tx>;
146
- postprocessValidator?: TxValidator<ProcessedTx>;
147
- nullifierCache?: { addNullifiers: (nullifiers: Buffer[]) => void };
148
- } = {},
149
- ): Promise<[ProcessedTx[], FailedTx[], NestedProcessReturnValues[]]> {
150
- const { maxTransactions, maxBlockSize, deadline, maxBlockGas } = limits;
151
- const { preprocessValidator, postprocessValidator, nullifierCache } = validators;
153
+ limits: PublicProcessorLimits = {},
154
+ validator: PublicProcessorValidator = {},
155
+ ): Promise<[ProcessedTx[], FailedTx[], Tx[], NestedProcessReturnValues[]]> {
156
+ const { maxTransactions, maxBlockSize, deadline, maxBlockGas, maxBlobFields } = limits;
157
+ const { preprocessValidator, nullifierCache } = validator;
152
158
  const result: ProcessedTx[] = [];
159
+ const usedTxs: Tx[] = [];
153
160
  const failed: FailedTx[] = [];
154
161
  const timer = new Timer();
155
162
 
@@ -157,6 +164,7 @@ export class PublicProcessor implements Traceable {
157
164
  let returns: NestedProcessReturnValues[] = [];
158
165
  let totalPublicGas = new Gas(0, 0);
159
166
  let totalBlockGas = new Gas(0, 0);
167
+ let totalBlobFields = 0;
160
168
 
161
169
  for await (const origTx of txs) {
162
170
  // Only process up to the max tx limit
@@ -172,7 +180,7 @@ export class PublicProcessor implements Traceable {
172
180
  }
173
181
 
174
182
  // Skip this tx if it'd exceed max block size
175
- const txHash = (await origTx.getTxHash()).toString();
183
+ const txHash = origTx.getTxHash().toString();
176
184
  const preTxSizeInBytes = origTx.getEstimatedPrivateTxEffectsSize();
177
185
  if (maxBlockSize !== undefined && totalSizeInBytes + preTxSizeInBytes > maxBlockSize) {
178
186
  this.log.warn(`Skipping processing of tx ${txHash} sized ${preTxSizeInBytes} bytes due to block size limit`, {
@@ -202,16 +210,16 @@ export class PublicProcessor implements Traceable {
202
210
  // We validate the tx before processing it, to avoid unnecessary work.
203
211
  if (preprocessValidator) {
204
212
  const result = await preprocessValidator.validateTx(tx);
205
- const txHash = await tx.getTxHash();
213
+ const txHash = tx.getTxHash();
206
214
  if (result.result === 'invalid') {
207
215
  const reason = result.reason.join(', ');
208
- this.log.warn(`Rejecting tx ${txHash.toString()} due to pre-process validation fail: ${reason}`);
216
+ this.log.debug(`Rejecting tx ${txHash.toString()} due to pre-process validation fail: ${reason}`);
209
217
  failed.push({ tx, error: new Error(`Tx failed preprocess validation: ${reason}`) });
210
218
  returns.push(new NestedProcessReturnValues([]));
211
219
  continue;
212
220
  } else if (result.result === 'skipped') {
213
221
  const reason = result.reason.join(', ');
214
- this.log.warn(`Skipping tx ${txHash.toString()} due to pre-process validation: ${reason}`);
222
+ this.log.debug(`Skipping tx ${txHash.toString()} due to pre-process validation: ${reason}`);
215
223
  returns.push(new NestedProcessReturnValues([]));
216
224
  continue;
217
225
  } else {
@@ -222,7 +230,10 @@ export class PublicProcessor implements Traceable {
222
230
  // We checkpoint the transaction here, then within the try/catch we
223
231
  // 1. Revert the checkpoint if the tx fails or needs to be discarded for any reason
224
232
  // 2. Commit the transaction in the finally block. Note that by using the ForkCheckpoint lifecycle only the first commit/revert takes effect
225
- const checkpoint = await ForkCheckpoint.new(this.worldStateDB);
233
+ // By doing this, every transaction starts on a fresh checkpoint and it's state updates only make it to the fork if this checkpoint is committed.
234
+ // Note: We use the underlying fork here not the guarded one, this ensures that it's not impacted by stopping the guarded version
235
+ const checkpoint = await ForkCheckpoint.new(this.guardedMerkleTree.getUnderlyingFork());
236
+ const startStateReference = await this.guardedMerkleTree.getUnderlyingFork().getStateReference();
226
237
 
227
238
  try {
228
239
  const [processedTx, returnValues] = await this.processTx(tx, deadline);
@@ -230,7 +241,7 @@ export class PublicProcessor implements Traceable {
230
241
  // If the actual size of this tx would exceed block size, skip it
231
242
  const txSize = processedTx.txEffect.getDASize();
232
243
  if (maxBlockSize !== undefined && totalSizeInBytes + txSize > maxBlockSize) {
233
- this.log.warn(`Skipping processed tx ${txHash} sized ${txSize} due to max block size.`, {
244
+ this.log.debug(`Skipping processed tx ${txHash} sized ${txSize} due to max block size.`, {
234
245
  txHash,
235
246
  sizeInBytes: txSize,
236
247
  totalSizeInBytes,
@@ -241,60 +252,76 @@ export class PublicProcessor implements Traceable {
241
252
  continue;
242
253
  }
243
254
 
244
- // Re-validate the transaction
245
- if (postprocessValidator) {
246
- // Only accept processed transactions that are not double-spends,
247
- // public functions emitting nullifiers would pass earlier check but fail here.
248
- // Note that we're checking all nullifiers generated in the private execution twice,
249
- // we could store the ones already checked and skip them here as an optimization.
250
- // TODO(palla/txs): Can we get into this case? AVM validates this. We should be able to remove it.
251
- const result = await postprocessValidator.validateTx(processedTx);
252
- if (result.result !== 'valid') {
253
- const reason = result.reason.join(', ');
254
- this.log.error(`Rejecting tx ${processedTx.hash} after processing: ${reason}.`);
255
- failed.push({ tx, error: new Error(`Tx failed post-process validation: ${reason}`) });
256
- // Need to revert the checkpoint here and don't go any further
257
- await checkpoint.revert();
258
- continue;
259
- } else {
260
- this.log.trace(`Tx ${txHash.toString()} is valid post processing.`);
261
- }
262
- }
263
-
264
- if (!tx.hasPublicCalls()) {
265
- // If there are no public calls, perform all tree insertions for side effects from private
266
- // When there are public calls, the PublicTxSimulator & AVM handle tree insertions.
267
- await this.doTreeInsertionsForPrivateOnlyTx(processedTx);
268
- // Add any contracts registered/deployed in this private-only tx to the block-level cache
269
- // (add to tx-level cache and then commit to block-level cache)
270
- await this.worldStateDB.addNewContracts(tx);
271
- this.worldStateDB.commitContractsForTx();
255
+ // If the actual blob fields of this tx would exceed the limit, skip it
256
+ const txBlobFields = processedTx.txEffect.toBlobFields().length;
257
+ if (maxBlobFields !== undefined && totalBlobFields + txBlobFields > maxBlobFields) {
258
+ this.log.debug(
259
+ `Skipping processed tx ${txHash} with ${txBlobFields} blob fields due to max blob fields limit.`,
260
+ {
261
+ txHash,
262
+ txBlobFields,
263
+ totalBlobFields,
264
+ maxBlobFields,
265
+ },
266
+ );
267
+ // Need to revert the checkpoint here and don't go any further
268
+ await checkpoint.revert();
269
+ continue;
272
270
  }
273
271
 
272
+ // FIXME(fcarreiro): it's ugly to have to notify the validator of nullifiers.
273
+ // I'd rather pass the validators the processedTx as well and let them deal with it.
274
274
  nullifierCache?.addNullifiers(processedTx.txEffect.nullifiers.map(n => n.toBuffer()));
275
275
  result.push(processedTx);
276
+ usedTxs.push(tx);
276
277
  returns = returns.concat(returnValues);
277
278
 
278
279
  totalPublicGas = totalPublicGas.add(processedTx.gasUsed.publicGas);
279
280
  totalBlockGas = totalBlockGas.add(processedTx.gasUsed.totalGas);
280
281
  totalSizeInBytes += txSize;
282
+ totalBlobFields += txBlobFields;
281
283
  } catch (err: any) {
282
- // Roll back state to start of TX before proceeding to next TX
283
- await checkpoint.revert();
284
284
  if (err?.name === 'PublicProcessorTimeoutError') {
285
285
  this.log.warn(`Stopping tx processing due to timeout.`);
286
+ // We hit the transaction execution deadline.
287
+ // There may still be a transaction executing. We stop the guarded fork to prevent any further access to the world state.
288
+ await this.guardedMerkleTree.stop();
289
+
290
+ // We now know there can't be any further access to world state. The fork is in a state where there is:
291
+ // 1. At least one outstanding checkpoint that has not been committed (the one created before we processed the tx).
292
+ // 2. Possible state updates on that checkpoint or any others created during execution.
293
+
294
+ // First we revert a checkpoint as managed by the ForkCheckpoint. This will revert whatever is the current checkpoint
295
+ // which may not be the one originally created by this object. But that is ok, we do this to fulfil the ForkCheckpoint
296
+ // lifecycle expectations and ensure it doesn't attempt to commit later on.
297
+ await checkpoint.revert();
298
+
299
+ // Now we want to revert any/all remaining checkpoints, destroying any outstanding state updates.
300
+ // This needs to be done directly on the underlying fork as the guarded fork has been stopped.
301
+ await this.guardedMerkleTree.getUnderlyingFork().revertAllCheckpoints();
302
+
303
+ // Ensure we're at the same state as when we started processing this tx.
304
+ await this.checkWorldStateUnchanged(startStateReference, txHash, err);
305
+
306
+ // We should now be in a position where the fork is in a clean state and no further updates can be made to it.
286
307
  break;
287
308
  }
309
+
310
+ // Roll back state to start of TX before proceeding to next TX
311
+ await checkpoint.revert();
312
+ await this.guardedMerkleTree.getUnderlyingFork().revertAllCheckpoints();
288
313
  const errorMessage = err instanceof Error ? err.message : 'Unknown error';
289
314
  this.log.warn(`Failed to process tx ${txHash.toString()}: ${errorMessage} ${err?.stack}`);
290
-
291
315
  failed.push({ tx, error: err instanceof Error ? err : new Error(errorMessage) });
292
316
  returns.push(new NestedProcessReturnValues([]));
317
+
318
+ // Ensure we're at the same state as when we started processing this tx.
319
+ await this.checkWorldStateUnchanged(startStateReference, txHash, err);
293
320
  } finally {
294
- // Base case is we always commit the checkpoint. Using the ForkCheckpoint means this has no effect if the tx was reverted
321
+ // Base case is we always commit the checkpoint. Using the ForkCheckpoint means this has no effect if the tx was previously reverted
295
322
  await checkpoint.commit();
296
323
  // The tx-level contracts cache should not live on to the next tx
297
- this.worldStateDB.clearContractsForTx();
324
+ this.contractsDB.clearContractsForTx();
298
325
  }
299
326
  }
300
327
 
@@ -310,17 +337,33 @@ export class PublicProcessor implements Traceable {
310
337
  totalSizeInBytes,
311
338
  });
312
339
 
313
- return [result, failed, returns];
340
+ return [result, failed, usedTxs, returns];
314
341
  }
315
342
 
316
- @trackSpan('PublicProcessor.processTx', async tx => ({ [Attributes.TX_HASH]: (await tx.getTxHash()).toString() }))
317
- private async processTx(tx: Tx, deadline?: Date): Promise<[ProcessedTx, NestedProcessReturnValues[]]> {
343
+ private async checkWorldStateUnchanged(
344
+ startStateReference: StateReference,
345
+ txHash: `0x${string}`,
346
+ cause: Error,
347
+ ): Promise<void> {
348
+ const endStateReference = await this.guardedMerkleTree.getUnderlyingFork().getStateReference();
349
+ if (!startStateReference.equals(endStateReference)) {
350
+ this.log.warn(`Fork state reference changed by tx ${txHash} after error in public processor`, {
351
+ expected: startStateReference.toInspect(),
352
+ actual: endStateReference.toInspect(),
353
+ cause,
354
+ });
355
+ throw new Error(`Fork state reference changed by tx ${txHash} after error in public processor`, { cause });
356
+ }
357
+ }
358
+
359
+ @trackSpan('PublicProcessor.processTx', tx => ({ [Attributes.TX_HASH]: tx.getTxHash().toString() }))
360
+ private async processTx(tx: Tx, deadline: Date | undefined): Promise<[ProcessedTx, NestedProcessReturnValues[]]> {
318
361
  const [time, [processedTx, returnValues]] = await elapsed(() => this.processTxWithinDeadline(tx, deadline));
319
362
 
320
363
  this.log.verbose(
321
364
  !tx.hasPublicCalls()
322
365
  ? `Processed tx ${processedTx.hash} with no public calls in ${time}ms`
323
- : `Processed tx ${processedTx.hash} with ${tx.enqueuedPublicFunctionCalls.length} public calls in ${time}ms`,
366
+ : `Processed tx ${processedTx.hash} with ${tx.numberOfPublicCalls()} public calls in ${time}ms`,
324
367
  {
325
368
  txHash: processedTx.hash,
326
369
  txFee: processedTx.txEffect.transactionFee.toBigInt(),
@@ -341,10 +384,7 @@ export class PublicProcessor implements Traceable {
341
384
  return [processedTx, returnValues ?? []];
342
385
  }
343
386
 
344
- private async doTreeInsertionsForPrivateOnlyTx(
345
- processedTx: ProcessedTx,
346
- txValidator?: TxValidator<ProcessedTx>,
347
- ): Promise<void> {
387
+ private async doTreeInsertionsForPrivateOnlyTx(processedTx: ProcessedTx): Promise<void> {
348
388
  const treeInsertionStart = process.hrtime.bigint();
349
389
 
350
390
  // Update the state so that the next tx in the loop has the correct .startState
@@ -353,31 +393,20 @@ export class PublicProcessor implements Traceable {
353
393
  // b) always had a txHandler with the same db passed to it as this.db, which updated the db in buildBaseRollupHints in this loop
354
394
  // To see how this ^ happens, move back to one shared db in test_context and run orchestrator_multi_public_functions.test.ts
355
395
  // The below is taken from buildBaseRollupHints:
356
- await this.db.appendLeaves(
396
+ await this.guardedMerkleTree.appendLeaves(
357
397
  MerkleTreeId.NOTE_HASH_TREE,
358
398
  padArrayEnd(processedTx.txEffect.noteHashes, Fr.ZERO, MAX_NOTE_HASHES_PER_TX),
359
399
  );
360
400
  try {
361
- await this.db.batchInsert(
401
+ await this.guardedMerkleTree.batchInsert(
362
402
  MerkleTreeId.NULLIFIER_TREE,
363
403
  padArrayEnd(processedTx.txEffect.nullifiers, Fr.ZERO, MAX_NULLIFIERS_PER_TX).map(n => n.toBuffer()),
364
404
  NULLIFIER_SUBTREE_HEIGHT,
365
405
  );
366
- } catch (error) {
367
- if (txValidator) {
368
- // Ideally the validator has already caught this above, but just in case:
369
- throw new Error(`Transaction ${processedTx.hash} invalid after processing public functions`);
370
- } else {
371
- // We have no validator and assume this call should blindly process txs with duplicates being caught later
372
- this.log.warn(`Detected duplicate nullifier after public processing for: ${processedTx.hash}.`);
373
- }
406
+ } catch (cause) {
407
+ throw new Error(`Transaction ${processedTx.hash} failed with duplicate nullifiers`, { cause });
374
408
  }
375
409
 
376
- // The only public data write should be for fee payment
377
- await this.db.sequentialInsert(
378
- MerkleTreeId.PUBLIC_DATA_TREE,
379
- processedTx.txEffect.publicDataWrites.map(x => x.toBuffer()),
380
- );
381
410
  const treeInsertionEnd = process.hrtime.bigint();
382
411
  this.metrics.recordTreeInsertions(Number(treeInsertionEnd - treeInsertionStart) / 1_000);
383
412
  }
@@ -385,17 +414,29 @@ export class PublicProcessor implements Traceable {
385
414
  /** Processes the given tx within deadline. Returns timeout if deadline is hit. */
386
415
  private async processTxWithinDeadline(
387
416
  tx: Tx,
388
- deadline?: Date,
417
+ deadline: Date | undefined,
389
418
  ): Promise<[ProcessedTx, NestedProcessReturnValues[] | undefined]> {
390
- const processFn: () => Promise<[ProcessedTx, NestedProcessReturnValues[] | undefined]> = tx.hasPublicCalls()
419
+ const innerProcessFn: () => Promise<[ProcessedTx, NestedProcessReturnValues[] | undefined]> = tx.hasPublicCalls()
391
420
  ? () => this.processTxWithPublicCalls(tx)
392
421
  : () => this.processPrivateOnlyTx(tx);
393
422
 
423
+ // Fake a delay per tx if instructed (used for tests)
424
+ const fakeDelayPerTxMs = this.opts.fakeProcessingDelayPerTxMs;
425
+ const processFn =
426
+ fakeDelayPerTxMs && fakeDelayPerTxMs > 0
427
+ ? async () => {
428
+ const result = await innerProcessFn();
429
+ this.log.warn(`Sleeping ${fakeDelayPerTxMs}ms after processing tx ${tx.getTxHash().toString()}`);
430
+ await sleep(fakeDelayPerTxMs);
431
+ return result;
432
+ }
433
+ : innerProcessFn;
434
+
394
435
  if (!deadline) {
395
436
  return await processFn();
396
437
  }
397
438
 
398
- const txHash = await tx.getTxHash();
439
+ const txHash = tx.getTxHash();
399
440
  const timeout = +deadline - this.dateProvider.now();
400
441
  if (timeout <= 0) {
401
442
  throw new PublicProcessorTimeoutError();
@@ -419,14 +460,16 @@ export class PublicProcessor implements Traceable {
419
460
  * This is used in private only txs, since for txs with public calls
420
461
  * the avm handles the fee payment itself.
421
462
  */
422
- private async getFeePaymentPublicDataWrite(txFee: Fr, feePayer: AztecAddress): Promise<PublicDataWrite> {
463
+ private async performFeePaymentPublicDataWrite(txFee: Fr, feePayer: AztecAddress): Promise<PublicDataWrite> {
423
464
  const feeJuiceAddress = ProtocolContractAddress.FeeJuice;
424
465
  const balanceSlot = await computeFeePayerBalanceStorageSlot(feePayer);
425
466
  const leafSlot = await computeFeePayerBalanceLeafSlot(feePayer);
467
+ // This high-level db is used as a convenient helper. It could be done with the merkleTree directly.
468
+ const treesDB = new PublicTreesDB(this.guardedMerkleTree);
426
469
 
427
470
  this.log.debug(`Deducting ${txFee.toBigInt()} balance in Fee Juice for ${feePayer}`);
428
471
 
429
- const balance = await this.worldStateDB.storageRead(feeJuiceAddress, balanceSlot);
472
+ const balance = await treesDB.storageRead(feeJuiceAddress, balanceSlot);
430
473
 
431
474
  if (balance.lt(txFee)) {
432
475
  throw new Error(
@@ -435,42 +478,47 @@ export class PublicProcessor implements Traceable {
435
478
  }
436
479
 
437
480
  const updatedBalance = balance.sub(txFee);
438
- await this.worldStateDB.storageWrite(feeJuiceAddress, balanceSlot, updatedBalance);
481
+ await treesDB.storageWrite(feeJuiceAddress, balanceSlot, updatedBalance);
439
482
 
440
483
  return new PublicDataWrite(leafSlot, updatedBalance);
441
484
  }
442
485
 
443
- @trackSpan('PublicProcessor.processPrivateOnlyTx', async (tx: Tx) => ({
444
- [Attributes.TX_HASH]: (await tx.getTxHash()).toString(),
486
+ @trackSpan('PublicProcessor.processPrivateOnlyTx', (tx: Tx) => ({
487
+ [Attributes.TX_HASH]: tx.getTxHash().toString(),
445
488
  }))
446
489
  private async processPrivateOnlyTx(tx: Tx): Promise<[ProcessedTx, undefined]> {
447
490
  const gasFees = this.globalVariables.gasFees;
448
- const transactionFee = tx.data.gasUsed.computeFee(gasFees);
491
+ const transactionFee = computeTransactionFee(gasFees, tx.data.constants.txContext.gasSettings, tx.data.gasUsed);
449
492
 
450
- const feePaymentPublicDataWrite = await this.getFeePaymentPublicDataWrite(transactionFee, tx.data.feePayer);
493
+ const feePaymentPublicDataWrite = await this.performFeePaymentPublicDataWrite(transactionFee, tx.data.feePayer);
451
494
 
452
- const processedTx = await makeProcessedTxFromPrivateOnlyTx(
495
+ const processedTx = makeProcessedTxFromPrivateOnlyTx(
453
496
  tx,
454
497
  transactionFee,
455
498
  feePaymentPublicDataWrite,
456
499
  this.globalVariables,
457
500
  );
458
501
 
459
- const siloedContractClassLogs = await tx.filterContractClassLogs(
460
- tx.data.getNonEmptyContractClassLogsHashes(),
461
- true,
502
+ this.metrics.recordClassPublication(
503
+ ...tx
504
+ .getContractClassLogs()
505
+ .filter(log => ContractClassPublishedEvent.isContractClassPublishedEvent(log))
506
+ .map(log => ContractClassPublishedEvent.fromLog(log)),
462
507
  );
463
508
 
464
- this.metrics.recordClassRegistration(
465
- ...siloedContractClassLogs
466
- .filter(log => ContractClassRegisteredEvent.isContractClassRegisteredEvent(log))
467
- .map(log => ContractClassRegisteredEvent.fromLog(log)),
468
- );
509
+ // Fee payment insertion has already been done. Do the rest.
510
+ await this.doTreeInsertionsForPrivateOnlyTx(processedTx);
511
+
512
+ // Add any contracts registered/deployed in this private-only tx to the block-level cache
513
+ // (add to tx-level cache and then commit to block-level cache)
514
+ await this.contractsDB.addNewContracts(tx);
515
+ this.contractsDB.commitContractsForTx();
516
+
469
517
  return [processedTx, undefined];
470
518
  }
471
519
 
472
- @trackSpan('PublicProcessor.processTxWithPublicCalls', async tx => ({
473
- [Attributes.TX_HASH]: (await tx.getTxHash()).toString(),
520
+ @trackSpan('PublicProcessor.processTxWithPublicCalls', tx => ({
521
+ [Attributes.TX_HASH]: tx.getTxHash().toString(),
474
522
  }))
475
523
  private async processTxWithPublicCalls(tx: Tx): Promise<[ProcessedTx, NestedProcessReturnValues[]]> {
476
524
  const timer = new Timer();
@@ -487,32 +535,24 @@ export class PublicProcessor implements Traceable {
487
535
  if (phase.reverted) {
488
536
  this.metrics.recordRevertedPhase(phase.phase);
489
537
  } else {
490
- this.metrics.recordPhaseDuration(phase.phase, phase.durationMs);
538
+ this.metrics.recordPhaseDuration(phase.phase, phase.durationMs ?? 0);
491
539
  }
492
540
  });
493
541
 
494
- const siloedContractClassLogs = await tx.filterContractClassLogs(
495
- tx.data.getNonEmptyContractClassLogsHashes(),
496
- true,
497
- );
498
-
499
- this.metrics.recordClassRegistration(
500
- ...siloedContractClassLogs
501
- .filter(log => ContractClassRegisteredEvent.isContractClassRegisteredEvent(log))
502
- .map(log => ContractClassRegisteredEvent.fromLog(log)),
542
+ const contractClassLogs = revertCode.isOK()
543
+ ? tx.getContractClassLogs()
544
+ : tx.getSplitContractClassLogs(false /* revertible */);
545
+ this.metrics.recordClassPublication(
546
+ ...contractClassLogs
547
+ .filter(log => ContractClassPublishedEvent.isContractClassPublishedEvent(log))
548
+ .map(log => ContractClassPublishedEvent.fromLog(log)),
503
549
  );
504
550
 
505
551
  const phaseCount = processedPhases.length;
506
552
  const durationMs = timer.ms();
507
553
  this.metrics.recordTx(phaseCount, durationMs, gasUsed.publicGas);
508
554
 
509
- const processedTx = await makeProcessedTxFromTxWithPublicCalls(
510
- tx,
511
- avmProvingRequest,
512
- gasUsed,
513
- revertCode,
514
- revertReason,
515
- );
555
+ const processedTx = makeProcessedTxFromTxWithPublicCalls(tx, avmProvingRequest, gasUsed, revertCode, revertReason);
516
556
 
517
557
  const returnValues = processedPhases.find(({ phase }) => phase === TxExecutionPhase.APP_LOGIC)?.returnValues ?? [];
518
558
 
@@ -1,4 +1,4 @@
1
- import type { ContractClassRegisteredEvent } from '@aztec/protocol-contracts/class-registerer';
1
+ import type { ContractClassPublishedEvent } from '@aztec/protocol-contracts/class-registry';
2
2
  import type { Gas } from '@aztec/stdlib/gas';
3
3
  import type { TxExecutionPhase } from '@aztec/stdlib/tx';
4
4
  import {
@@ -137,7 +137,7 @@ export class PublicProcessorMetrics {
137
137
  this.phaseCount.add(1, { [Attributes.TX_PHASE_NAME]: phaseName, [Attributes.OK]: false });
138
138
  }
139
139
 
140
- recordClassRegistration(...events: ContractClassRegisteredEvent[]) {
140
+ recordClassPublication(...events: ContractClassPublishedEvent[]) {
141
141
  let totalBytecode = 0;
142
142
  for (const event of events) {
143
143
  totalBytecode += event.packedPublicBytecode.length;
@@ -0,0 +1,2 @@
1
+ export * from './public_tx_simulator.js';
2
+ export { TelemetryPublicTxSimulator } from './telemetry_public_tx_simulator.js';