@aztec/simulator 0.76.4 → 0.77.0-testnet-ignition.21

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 (517) hide show
  1. package/README.md +3 -3
  2. package/dest/client.d.ts +5 -0
  3. package/dest/client.d.ts.map +1 -0
  4. package/dest/client.js +3 -0
  5. package/dest/{public → common}/db_interfaces.d.ts +8 -33
  6. package/dest/common/db_interfaces.d.ts.map +1 -0
  7. package/dest/common/db_interfaces.js +1 -0
  8. package/dest/common/debug_fn_name.d.ts +3 -2
  9. package/dest/common/debug_fn_name.d.ts.map +1 -1
  10. package/dest/common/debug_fn_name.js +2 -5
  11. package/dest/common/errors.d.ts +4 -4
  12. package/dest/common/errors.d.ts.map +1 -1
  13. package/dest/common/errors.js +30 -39
  14. package/dest/common/index.d.ts +2 -1
  15. package/dest/common/index.d.ts.map +1 -1
  16. package/dest/common/index.js +2 -2
  17. package/dest/common/message_load_oracle_inputs.d.ts +2 -2
  18. package/dest/common/message_load_oracle_inputs.d.ts.map +1 -1
  19. package/dest/common/message_load_oracle_inputs.js +8 -8
  20. package/dest/common/stats/index.d.ts.map +1 -0
  21. package/dest/{stats → common/stats}/stats.d.ts +2 -2
  22. package/dest/common/stats/stats.d.ts.map +1 -0
  23. package/dest/common/stats/stats.js +10 -0
  24. package/dest/{acvm → private/acvm}/acvm.d.ts +4 -4
  25. package/dest/private/acvm/acvm.d.ts.map +1 -0
  26. package/dest/private/acvm/acvm.js +70 -0
  27. package/dest/{acvm → private/acvm}/acvm_types.d.ts +1 -1
  28. package/dest/private/acvm/acvm_types.d.ts.map +1 -0
  29. package/dest/private/acvm/acvm_types.js +3 -0
  30. package/dest/{acvm → private/acvm}/deserialize.d.ts +2 -2
  31. package/dest/private/acvm/deserialize.d.ts.map +1 -0
  32. package/dest/private/acvm/deserialize.js +42 -0
  33. package/dest/private/acvm/index.d.ts.map +1 -0
  34. package/dest/private/acvm/index.js +5 -0
  35. package/dest/{acvm → private/acvm}/oracle/index.d.ts +1 -1
  36. package/dest/private/acvm/oracle/index.d.ts.map +1 -0
  37. package/dest/private/acvm/oracle/index.js +2 -0
  38. package/dest/{acvm → private/acvm}/oracle/oracle.d.ts +4 -3
  39. package/dest/private/acvm/oracle/oracle.d.ts.map +1 -0
  40. package/dest/private/acvm/oracle/oracle.js +263 -0
  41. package/dest/{acvm → private/acvm}/oracle/typed_oracle.d.ts +12 -6
  42. package/dest/private/acvm/oracle/typed_oracle.d.ts.map +1 -0
  43. package/dest/private/acvm/oracle/typed_oracle.js +132 -0
  44. package/dest/{acvm → private/acvm}/serialize.d.ts +7 -3
  45. package/dest/private/acvm/serialize.d.ts.map +1 -0
  46. package/dest/private/acvm/serialize.js +46 -0
  47. package/dest/{client → private}/client_execution_context.d.ts +20 -17
  48. package/dest/private/client_execution_context.d.ts.map +1 -0
  49. package/dest/private/client_execution_context.js +378 -0
  50. package/dest/{client → private}/db_oracle.d.ts +19 -7
  51. package/dest/private/db_oracle.d.ts.map +1 -0
  52. package/dest/private/db_oracle.js +14 -0
  53. package/dest/{client → private}/execution_note_cache.d.ts +2 -2
  54. package/dest/private/execution_note_cache.d.ts.map +1 -0
  55. package/dest/private/execution_note_cache.js +180 -0
  56. package/dest/{common → private}/hashed_values_cache.d.ts +2 -2
  57. package/dest/private/hashed_values_cache.d.ts.map +1 -0
  58. package/dest/private/hashed_values_cache.js +46 -0
  59. package/dest/private/index.d.ts +13 -0
  60. package/dest/private/index.d.ts.map +1 -0
  61. package/dest/private/index.js +12 -0
  62. package/dest/{client → private}/pick_notes.d.ts +1 -1
  63. package/dest/private/pick_notes.d.ts.map +1 -0
  64. package/dest/private/pick_notes.js +51 -0
  65. package/dest/private/private_execution.d.ts +24 -0
  66. package/dest/private/private_execution.d.ts.map +1 -0
  67. package/dest/private/private_execution.js +90 -0
  68. package/dest/{providers → private/providers}/acvm_native.d.ts +5 -5
  69. package/dest/private/providers/acvm_native.d.ts.map +1 -0
  70. package/dest/private/providers/acvm_native.js +139 -0
  71. package/dest/{providers → private/providers}/acvm_wasm.d.ts +4 -4
  72. package/dest/private/providers/acvm_wasm.d.ts.map +1 -0
  73. package/dest/private/providers/acvm_wasm.js +62 -0
  74. package/dest/{providers → private/providers}/acvm_wasm_with_blobs.d.ts +5 -5
  75. package/dest/private/providers/acvm_wasm_with_blobs.d.ts.map +1 -0
  76. package/dest/{providers → private/providers}/acvm_wasm_with_blobs.js +3 -6
  77. package/dest/{providers → private/providers}/factory.d.ts +1 -1
  78. package/dest/private/providers/factory.d.ts.map +1 -0
  79. package/dest/private/providers/factory.js +27 -0
  80. package/dest/{common → private/providers}/simulation_provider.d.ts +5 -5
  81. package/dest/private/providers/simulation_provider.d.ts.map +1 -0
  82. package/dest/private/providers/simulation_provider.js +24 -0
  83. package/dest/private/simulator.d.ts +36 -0
  84. package/dest/private/simulator.d.ts.map +1 -0
  85. package/dest/private/simulator.js +78 -0
  86. package/dest/{client → private}/unconstrained_execution.d.ts +5 -5
  87. package/dest/private/unconstrained_execution.d.ts.map +1 -0
  88. package/dest/private/unconstrained_execution.js +27 -0
  89. package/dest/{client → private}/view_data_oracle.d.ts +15 -7
  90. package/dest/private/view_data_oracle.d.ts.map +1 -0
  91. package/dest/private/view_data_oracle.js +260 -0
  92. package/dest/{avm → public/avm}/avm_context.d.ts +7 -5
  93. package/dest/public/avm/avm_context.d.ts.map +1 -0
  94. package/dest/public/avm/avm_context.js +44 -0
  95. package/dest/{avm → public/avm}/avm_contract_call_result.d.ts +5 -5
  96. package/dest/public/avm/avm_contract_call_result.d.ts.map +1 -0
  97. package/dest/public/avm/avm_contract_call_result.js +50 -0
  98. package/dest/{avm → public/avm}/avm_execution_environment.d.ts +2 -2
  99. package/dest/public/avm/avm_execution_environment.d.ts.map +1 -0
  100. package/dest/public/avm/avm_execution_environment.js +31 -0
  101. package/dest/public/avm/avm_gas.d.ts.map +1 -0
  102. package/dest/public/avm/avm_gas.js +202 -0
  103. package/dest/{avm → public/avm}/avm_machine_state.d.ts +2 -2
  104. package/dest/public/avm/avm_machine_state.d.ts.map +1 -0
  105. package/dest/public/avm/avm_machine_state.js +106 -0
  106. package/dest/{avm → public/avm}/avm_memory_types.d.ts +2 -2
  107. package/dest/public/avm/avm_memory_types.d.ts.map +1 -0
  108. package/dest/public/avm/avm_memory_types.js +340 -0
  109. package/dest/{avm → public/avm}/avm_simulator.d.ts +5 -3
  110. package/dest/public/avm/avm_simulator.d.ts.map +1 -0
  111. package/dest/public/avm/avm_simulator.js +202 -0
  112. package/dest/public/avm/bytecode_utils.d.ts.map +1 -0
  113. package/dest/public/avm/bytecode_utils.js +17 -0
  114. package/dest/{avm → public/avm}/errors.d.ts +5 -4
  115. package/dest/public/avm/errors.d.ts.map +1 -0
  116. package/dest/public/avm/errors.js +179 -0
  117. package/dest/{avm → public/avm}/fixtures/avm_simulation_tester.d.ts +6 -6
  118. package/dest/public/avm/fixtures/avm_simulation_tester.d.ts.map +1 -0
  119. package/dest/public/avm/fixtures/avm_simulation_tester.js +76 -0
  120. package/dest/{avm → public/avm}/fixtures/base_avm_simulation_tester.d.ts +13 -12
  121. package/dest/public/avm/fixtures/base_avm_simulation_tester.d.ts.map +1 -0
  122. package/dest/public/avm/fixtures/base_avm_simulation_tester.js +83 -0
  123. package/dest/{avm → public/avm}/fixtures/index.d.ts +24 -7
  124. package/dest/public/avm/fixtures/index.d.ts.map +1 -0
  125. package/dest/public/avm/fixtures/index.js +175 -0
  126. package/dest/{avm → public/avm}/fixtures/simple_contract_data_source.d.ts +10 -6
  127. package/dest/public/avm/fixtures/simple_contract_data_source.d.ts.map +1 -0
  128. package/dest/public/avm/fixtures/simple_contract_data_source.js +74 -0
  129. package/dest/public/avm/index.d.ts +4 -0
  130. package/dest/public/avm/index.d.ts.map +1 -0
  131. package/dest/{avm/index.d.ts → public/avm/index.js} +1 -2
  132. package/dest/public/avm/journal/index.d.ts.map +1 -0
  133. package/dest/{avm → public/avm}/journal/journal.d.ts +51 -18
  134. package/dest/public/avm/journal/journal.d.ts.map +1 -0
  135. package/dest/public/avm/journal/journal.js +486 -0
  136. package/dest/{avm → public/avm}/journal/nullifiers.d.ts +8 -6
  137. package/dest/public/avm/journal/nullifiers.d.ts.map +1 -0
  138. package/dest/public/avm/journal/nullifiers.js +97 -0
  139. package/dest/{avm → public/avm}/journal/public_storage.d.ts +2 -2
  140. package/dest/public/avm/journal/public_storage.d.ts.map +1 -0
  141. package/dest/public/avm/journal/public_storage.js +145 -0
  142. package/dest/public/avm/opcodes/accrued_substate.d.ts.map +1 -0
  143. package/dest/public/avm/opcodes/accrued_substate.js +252 -0
  144. package/dest/public/avm/opcodes/addressing_mode.d.ts.map +1 -0
  145. package/dest/public/avm/opcodes/addressing_mode.js +74 -0
  146. package/dest/public/avm/opcodes/arithmetic.d.ts.map +1 -0
  147. package/dest/public/avm/opcodes/arithmetic.js +73 -0
  148. package/dest/public/avm/opcodes/bitwise.d.ts.map +1 -0
  149. package/dest/public/avm/opcodes/bitwise.js +106 -0
  150. package/dest/public/avm/opcodes/comparators.d.ts.map +1 -0
  151. package/dest/public/avm/opcodes/comparators.js +43 -0
  152. package/dest/public/avm/opcodes/contract.d.ts.map +1 -0
  153. package/dest/public/avm/opcodes/contract.js +66 -0
  154. package/dest/public/avm/opcodes/control_flow.d.ts.map +1 -0
  155. package/dest/public/avm/opcodes/control_flow.js +105 -0
  156. package/dest/{avm → public/avm}/opcodes/conversion.d.ts +1 -1
  157. package/dest/public/avm/opcodes/conversion.d.ts.map +1 -0
  158. package/dest/public/avm/opcodes/conversion.js +69 -0
  159. package/dest/{avm → public/avm}/opcodes/ec_add.d.ts +1 -1
  160. package/dest/public/avm/opcodes/ec_add.d.ts.map +1 -0
  161. package/dest/public/avm/opcodes/ec_add.js +84 -0
  162. package/dest/public/avm/opcodes/environment_getters.d.ts.map +1 -0
  163. package/dest/public/avm/opcodes/environment_getters.js +79 -0
  164. package/dest/public/avm/opcodes/external_calls.d.ts.map +1 -0
  165. package/dest/public/avm/opcodes/external_calls.js +180 -0
  166. package/dest/{avm → public/avm}/opcodes/hashing.d.ts +1 -1
  167. package/dest/public/avm/opcodes/hashing.d.ts.map +1 -0
  168. package/dest/public/avm/opcodes/hashing.js +114 -0
  169. package/dest/public/avm/opcodes/index.d.ts.map +1 -0
  170. package/dest/{avm → public/avm}/opcodes/instruction.d.ts +2 -2
  171. package/dest/public/avm/opcodes/instruction.d.ts.map +1 -0
  172. package/dest/public/avm/opcodes/instruction.js +91 -0
  173. package/dest/public/avm/opcodes/instruction_impl.d.ts.map +1 -0
  174. package/dest/public/avm/opcodes/instruction_impl.js +30 -0
  175. package/dest/public/avm/opcodes/memory.d.ts.map +1 -0
  176. package/dest/public/avm/opcodes/memory.js +253 -0
  177. package/dest/{avm → public/avm}/opcodes/misc.d.ts +1 -1
  178. package/dest/public/avm/opcodes/misc.d.ts.map +1 -0
  179. package/dest/public/avm/opcodes/misc.js +48 -0
  180. package/dest/public/avm/opcodes/storage.d.ts.map +1 -0
  181. package/dest/public/avm/opcodes/storage.js +66 -0
  182. package/dest/public/avm/serialization/buffer_cursor.d.ts.map +1 -0
  183. package/dest/public/avm/serialization/buffer_cursor.js +99 -0
  184. package/dest/{avm → public/avm}/serialization/bytecode_serialization.d.ts +1 -1
  185. package/dest/public/avm/serialization/bytecode_serialization.d.ts.map +1 -0
  186. package/dest/public/avm/serialization/bytecode_serialization.js +328 -0
  187. package/dest/{avm → public/avm}/serialization/instruction_serialization.d.ts +1 -2
  188. package/dest/public/avm/serialization/instruction_serialization.d.ts.map +1 -0
  189. package/dest/public/avm/serialization/instruction_serialization.js +225 -0
  190. package/dest/{avm → public/avm}/test_utils.d.ts +6 -4
  191. package/dest/public/avm/test_utils.d.ts.map +1 -0
  192. package/dest/public/avm/test_utils.js +52 -0
  193. package/dest/public/bytecode_errors.js +1 -2
  194. package/dest/public/execution.d.ts +8 -2
  195. package/dest/public/execution.d.ts.map +1 -1
  196. package/dest/public/execution.js +4 -5
  197. package/dest/public/executor_metrics.js +16 -12
  198. package/dest/public/fixtures/index.js +0 -1
  199. package/dest/public/fixtures/public_tx_simulation_tester.d.ts +15 -9
  200. package/dest/public/fixtures/public_tx_simulation_tester.d.ts.map +1 -1
  201. package/dest/public/fixtures/public_tx_simulation_tester.js +54 -53
  202. package/dest/public/fixtures/utils.d.ts +7 -11
  203. package/dest/public/fixtures/utils.d.ts.map +1 -1
  204. package/dest/public/fixtures/utils.js +92 -32
  205. package/dest/public/index.d.ts +5 -4
  206. package/dest/public/index.d.ts.map +1 -1
  207. package/dest/public/index.js +5 -5
  208. package/dest/public/public_db_sources.d.ts +82 -34
  209. package/dest/public/public_db_sources.d.ts.map +1 -1
  210. package/dest/public/public_db_sources.js +171 -196
  211. package/dest/public/{public_processor.d.ts → public_processor/public_processor.d.ts} +10 -8
  212. package/dest/public/public_processor/public_processor.d.ts.map +1 -0
  213. package/dest/public/public_processor/public_processor.js +379 -0
  214. package/dest/public/{public_processor_metrics.d.ts → public_processor/public_processor_metrics.d.ts} +3 -3
  215. package/dest/public/public_processor/public_processor_metrics.d.ts.map +1 -0
  216. package/dest/public/public_processor/public_processor_metrics.js +125 -0
  217. package/dest/public/{public_tx_context.d.ts → public_tx_simulator/public_tx_context.d.ts} +14 -8
  218. package/dest/public/public_tx_simulator/public_tx_context.d.ts.map +1 -0
  219. package/dest/public/public_tx_simulator/public_tx_context.js +320 -0
  220. package/dest/public/{public_tx_simulator.d.ts → public_tx_simulator/public_tx_simulator.d.ts} +10 -7
  221. package/dest/public/public_tx_simulator/public_tx_simulator.d.ts.map +1 -0
  222. package/dest/public/public_tx_simulator/public_tx_simulator.js +325 -0
  223. package/dest/public/side_effect_errors.js +1 -2
  224. package/dest/public/side_effect_trace.d.ts +16 -10
  225. package/dest/public/side_effect_trace.d.ts.map +1 -1
  226. package/dest/public/side_effect_trace.js +82 -149
  227. package/dest/public/side_effect_trace_interface.d.ts +9 -7
  228. package/dest/public/side_effect_trace_interface.d.ts.map +1 -1
  229. package/dest/public/side_effect_trace_interface.js +1 -2
  230. package/dest/public/tx_contract_cache.d.ts +41 -0
  231. package/dest/public/tx_contract_cache.d.ts.map +1 -0
  232. package/dest/public/tx_contract_cache.js +49 -0
  233. package/dest/public/unique_class_ids.js +23 -28
  234. package/dest/public/utils.d.ts +2 -2
  235. package/dest/public/utils.d.ts.map +1 -1
  236. package/dest/public/utils.js +17 -12
  237. package/dest/server.d.ts +4 -4
  238. package/dest/server.d.ts.map +1 -1
  239. package/dest/server.js +3 -5
  240. package/dest/test/utils.d.ts +3 -2
  241. package/dest/test/utils.d.ts.map +1 -1
  242. package/dest/test/utils.js +9 -7
  243. package/package.json +19 -21
  244. package/src/client.ts +4 -0
  245. package/src/{public → common}/db_interfaces.ts +8 -40
  246. package/src/common/debug_fn_name.ts +4 -2
  247. package/src/common/errors.ts +5 -5
  248. package/src/common/index.ts +2 -1
  249. package/src/common/message_load_oracle_inputs.ts +2 -2
  250. package/src/common/stats/index.ts +1 -0
  251. package/src/{stats → common/stats}/stats.ts +2 -2
  252. package/src/{acvm → private/acvm}/acvm.ts +5 -5
  253. package/src/{acvm → private/acvm}/acvm_types.ts +1 -1
  254. package/src/{acvm → private/acvm}/deserialize.ts +2 -2
  255. package/src/{acvm → private/acvm}/oracle/index.ts +1 -1
  256. package/src/{acvm → private/acvm}/oracle/oracle.ts +22 -12
  257. package/src/{acvm → private/acvm}/oracle/typed_oracle.ts +50 -55
  258. package/src/{acvm → private/acvm}/serialize.ts +10 -3
  259. package/src/{client → private}/client_execution_context.ts +54 -37
  260. package/src/{client → private}/db_oracle.ts +20 -20
  261. package/src/{client → private}/execution_note_cache.ts +3 -3
  262. package/src/{common → private}/hashed_values_cache.ts +2 -2
  263. package/src/private/index.ts +12 -0
  264. package/src/{client → private}/pick_notes.ts +1 -1
  265. package/src/{client → private}/private_execution.ts +46 -14
  266. package/src/{providers → private/providers}/acvm_native.ts +6 -6
  267. package/src/{providers → private/providers}/acvm_wasm.ts +4 -4
  268. package/src/{providers → private/providers}/acvm_wasm_with_blobs.ts +5 -5
  269. package/src/{providers → private/providers}/factory.ts +1 -1
  270. package/src/{common → private/providers}/simulation_provider.ts +5 -5
  271. package/src/{client → private}/simulator.ts +31 -123
  272. package/src/{client → private}/unconstrained_execution.ts +7 -7
  273. package/src/{client → private}/view_data_oracle.ts +25 -28
  274. package/src/{avm → public/avm}/avm_context.ts +12 -7
  275. package/src/{avm → public/avm}/avm_contract_call_result.ts +6 -6
  276. package/src/{avm → public/avm}/avm_execution_environment.ts +2 -2
  277. package/src/{avm → public/avm}/avm_gas.ts +1 -3
  278. package/src/{avm → public/avm}/avm_machine_state.ts +2 -2
  279. package/src/{avm → public/avm}/avm_memory_types.ts +4 -4
  280. package/src/{avm → public/avm}/avm_simulator.ts +12 -6
  281. package/src/{avm → public/avm}/errors.ts +5 -4
  282. package/src/{avm → public/avm}/fixtures/avm_simulation_tester.ts +16 -15
  283. package/src/{avm → public/avm}/fixtures/base_avm_simulation_tester.ts +45 -40
  284. package/src/{avm → public/avm}/fixtures/index.ts +77 -12
  285. package/src/{avm → public/avm}/fixtures/simple_contract_data_source.ts +26 -19
  286. package/src/{avm → public/avm}/index.ts +1 -1
  287. package/src/public/avm/journal/index.ts +1 -0
  288. package/src/{avm → public/avm}/journal/journal.ts +330 -305
  289. package/src/{avm → public/avm}/journal/nullifiers.ts +20 -19
  290. package/src/{avm → public/avm}/journal/public_storage.ts +2 -2
  291. package/src/{avm → public/avm}/opcodes/contract.ts +1 -1
  292. package/src/{avm → public/avm}/opcodes/control_flow.ts +1 -1
  293. package/src/{avm → public/avm}/opcodes/conversion.ts +1 -1
  294. package/src/{avm → public/avm}/opcodes/ec_add.ts +2 -2
  295. package/src/{avm → public/avm}/opcodes/external_calls.ts +5 -6
  296. package/src/{avm → public/avm}/opcodes/hashing.ts +1 -1
  297. package/src/public/avm/opcodes/index.ts +15 -0
  298. package/src/{avm → public/avm}/opcodes/instruction.ts +2 -2
  299. package/src/{avm → public/avm}/opcodes/misc.ts +1 -1
  300. package/src/public/avm/serialization/bytecode_serialization.ts +204 -0
  301. package/src/{avm → public/avm}/serialization/instruction_serialization.ts +0 -1
  302. package/src/{avm → public/avm}/test_utils.ts +10 -7
  303. package/src/public/execution.ts +9 -12
  304. package/src/public/fixtures/public_tx_simulation_tester.ts +66 -72
  305. package/src/public/fixtures/utils.ts +122 -33
  306. package/src/public/index.ts +5 -4
  307. package/src/public/public_db_sources.ts +216 -222
  308. package/src/public/{public_processor.ts → public_processor/public_processor.ts} +78 -53
  309. package/src/public/{public_processor_metrics.ts → public_processor/public_processor_metrics.ts} +3 -3
  310. package/src/public/{public_tx_context.ts → public_tx_simulator/public_tx_context.ts} +70 -75
  311. package/src/public/{public_tx_simulator.ts → public_tx_simulator/public_tx_simulator.ts} +104 -91
  312. package/src/public/side_effect_trace.ts +85 -160
  313. package/src/public/side_effect_trace_interface.ts +10 -23
  314. package/src/public/tx_contract_cache.ts +69 -0
  315. package/src/public/unique_class_ids.ts +1 -1
  316. package/src/public/utils.ts +2 -2
  317. package/src/server.ts +4 -4
  318. package/src/test/utils.ts +5 -3
  319. package/dest/acvm/acvm.d.ts.map +0 -1
  320. package/dest/acvm/acvm.js +0 -73
  321. package/dest/acvm/acvm_types.d.ts.map +0 -1
  322. package/dest/acvm/acvm_types.js +0 -2
  323. package/dest/acvm/deserialize.d.ts.map +0 -1
  324. package/dest/acvm/deserialize.js +0 -46
  325. package/dest/acvm/index.d.ts.map +0 -1
  326. package/dest/acvm/index.js +0 -6
  327. package/dest/acvm/oracle/index.d.ts.map +0 -1
  328. package/dest/acvm/oracle/index.js +0 -3
  329. package/dest/acvm/oracle/oracle.d.ts.map +0 -1
  330. package/dest/acvm/oracle/oracle.js +0 -230
  331. package/dest/acvm/oracle/typed_oracle.d.ts.map +0 -1
  332. package/dest/acvm/oracle/typed_oracle.js +0 -131
  333. package/dest/acvm/serialize.d.ts.map +0 -1
  334. package/dest/acvm/serialize.js +0 -48
  335. package/dest/avm/avm_context.d.ts.map +0 -1
  336. package/dest/avm/avm_context.js +0 -44
  337. package/dest/avm/avm_contract_call_result.d.ts.map +0 -1
  338. package/dest/avm/avm_contract_call_result.js +0 -45
  339. package/dest/avm/avm_execution_environment.d.ts.map +0 -1
  340. package/dest/avm/avm_execution_environment.js +0 -28
  341. package/dest/avm/avm_gas.d.ts.map +0 -1
  342. package/dest/avm/avm_gas.js +0 -170
  343. package/dest/avm/avm_machine_state.d.ts.map +0 -1
  344. package/dest/avm/avm_machine_state.js +0 -112
  345. package/dest/avm/avm_memory_types.d.ts.map +0 -1
  346. package/dest/avm/avm_memory_types.js +0 -327
  347. package/dest/avm/avm_simulator.d.ts.map +0 -1
  348. package/dest/avm/avm_simulator.js +0 -193
  349. package/dest/avm/avm_tree.d.ts +0 -282
  350. package/dest/avm/avm_tree.d.ts.map +0 -1
  351. package/dest/avm/avm_tree.js +0 -684
  352. package/dest/avm/bytecode_utils.d.ts.map +0 -1
  353. package/dest/avm/bytecode_utils.js +0 -15
  354. package/dest/avm/errors.d.ts.map +0 -1
  355. package/dest/avm/errors.js +0 -196
  356. package/dest/avm/fixtures/avm_simulation_tester.d.ts.map +0 -1
  357. package/dest/avm/fixtures/avm_simulation_tester.js +0 -73
  358. package/dest/avm/fixtures/base_avm_simulation_tester.d.ts.map +0 -1
  359. package/dest/avm/fixtures/base_avm_simulation_tester.js +0 -76
  360. package/dest/avm/fixtures/index.d.ts.map +0 -1
  361. package/dest/avm/fixtures/index.js +0 -134
  362. package/dest/avm/fixtures/simple_contract_data_source.d.ts.map +0 -1
  363. package/dest/avm/fixtures/simple_contract_data_source.js +0 -75
  364. package/dest/avm/index.d.ts.map +0 -1
  365. package/dest/avm/index.js +0 -4
  366. package/dest/avm/journal/index.d.ts.map +0 -1
  367. package/dest/avm/journal/index.js +0 -2
  368. package/dest/avm/journal/journal.d.ts.map +0 -1
  369. package/dest/avm/journal/journal.js +0 -499
  370. package/dest/avm/journal/nullifiers.d.ts.map +0 -1
  371. package/dest/avm/journal/nullifiers.js +0 -99
  372. package/dest/avm/journal/public_storage.d.ts.map +0 -1
  373. package/dest/avm/journal/public_storage.js +0 -159
  374. package/dest/avm/opcodes/accrued_substate.d.ts.map +0 -1
  375. package/dest/avm/opcodes/accrued_substate.js +0 -215
  376. package/dest/avm/opcodes/addressing_mode.d.ts.map +0 -1
  377. package/dest/avm/opcodes/addressing_mode.js +0 -81
  378. package/dest/avm/opcodes/arithmetic.d.ts.map +0 -1
  379. package/dest/avm/opcodes/arithmetic.js +0 -70
  380. package/dest/avm/opcodes/bitwise.d.ts.map +0 -1
  381. package/dest/avm/opcodes/bitwise.js +0 -90
  382. package/dest/avm/opcodes/comparators.d.ts.map +0 -1
  383. package/dest/avm/opcodes/comparators.js +0 -40
  384. package/dest/avm/opcodes/contract.d.ts.map +0 -1
  385. package/dest/avm/opcodes/contract.js +0 -63
  386. package/dest/avm/opcodes/control_flow.d.ts.map +0 -1
  387. package/dest/avm/opcodes/control_flow.js +0 -97
  388. package/dest/avm/opcodes/conversion.d.ts.map +0 -1
  389. package/dest/avm/opcodes/conversion.js +0 -64
  390. package/dest/avm/opcodes/ec_add.d.ts.map +0 -1
  391. package/dest/avm/opcodes/ec_add.js +0 -82
  392. package/dest/avm/opcodes/environment_getters.d.ts.map +0 -1
  393. package/dest/avm/opcodes/environment_getters.js +0 -78
  394. package/dest/avm/opcodes/external_calls.d.ts.map +0 -1
  395. package/dest/avm/opcodes/external_calls.js +0 -169
  396. package/dest/avm/opcodes/hashing.d.ts.map +0 -1
  397. package/dest/avm/opcodes/hashing.js +0 -103
  398. package/dest/avm/opcodes/index.d.ts.map +0 -1
  399. package/dest/avm/opcodes/index.js +0 -16
  400. package/dest/avm/opcodes/instruction.d.ts.map +0 -1
  401. package/dest/avm/opcodes/instruction.js +0 -100
  402. package/dest/avm/opcodes/instruction_impl.d.ts.map +0 -1
  403. package/dest/avm/opcodes/instruction_impl.js +0 -33
  404. package/dest/avm/opcodes/memory.d.ts.map +0 -1
  405. package/dest/avm/opcodes/memory.js +0 -226
  406. package/dest/avm/opcodes/misc.d.ts.map +0 -1
  407. package/dest/avm/opcodes/misc.js +0 -45
  408. package/dest/avm/opcodes/multi_scalar_mul.d.ts +0 -16
  409. package/dest/avm/opcodes/multi_scalar_mul.d.ts.map +0 -1
  410. package/dest/avm/opcodes/multi_scalar_mul.js +0 -112
  411. package/dest/avm/opcodes/storage.d.ts.map +0 -1
  412. package/dest/avm/opcodes/storage.js +0 -61
  413. package/dest/avm/serialization/buffer_cursor.d.ts.map +0 -1
  414. package/dest/avm/serialization/buffer_cursor.js +0 -99
  415. package/dest/avm/serialization/bytecode_serialization.d.ts.map +0 -1
  416. package/dest/avm/serialization/bytecode_serialization.js +0 -132
  417. package/dest/avm/serialization/instruction_serialization.d.ts.map +0 -1
  418. package/dest/avm/serialization/instruction_serialization.js +0 -187
  419. package/dest/avm/test_utils.d.ts.map +0 -1
  420. package/dest/avm/test_utils.js +0 -52
  421. package/dest/client/client_execution_context.d.ts.map +0 -1
  422. package/dest/client/client_execution_context.js +0 -392
  423. package/dest/client/db_oracle.d.ts.map +0 -1
  424. package/dest/client/db_oracle.js +0 -17
  425. package/dest/client/execution_note_cache.d.ts.map +0 -1
  426. package/dest/client/execution_note_cache.js +0 -181
  427. package/dest/client/index.d.ts +0 -16
  428. package/dest/client/index.d.ts.map +0 -1
  429. package/dest/client/index.js +0 -15
  430. package/dest/client/pick_notes.d.ts.map +0 -1
  431. package/dest/client/pick_notes.js +0 -54
  432. package/dest/client/private_execution.d.ts +0 -19
  433. package/dest/client/private_execution.d.ts.map +0 -1
  434. package/dest/client/private_execution.js +0 -72
  435. package/dest/client/simulator.d.ts +0 -60
  436. package/dest/client/simulator.d.ts.map +0 -1
  437. package/dest/client/simulator.js +0 -136
  438. package/dest/client/unconstrained_execution.d.ts.map +0 -1
  439. package/dest/client/unconstrained_execution.js +0 -30
  440. package/dest/client/view_data_oracle.d.ts.map +0 -1
  441. package/dest/client/view_data_oracle.js +0 -268
  442. package/dest/common/hashed_values_cache.d.ts.map +0 -1
  443. package/dest/common/hashed_values_cache.js +0 -50
  444. package/dest/common/simulation_provider.d.ts.map +0 -1
  445. package/dest/common/simulation_provider.js +0 -27
  446. package/dest/common.d.ts +0 -2
  447. package/dest/common.d.ts.map +0 -1
  448. package/dest/common.js +0 -2
  449. package/dest/providers/acvm_native.d.ts.map +0 -1
  450. package/dest/providers/acvm_native.js +0 -125
  451. package/dest/providers/acvm_wasm.d.ts.map +0 -1
  452. package/dest/providers/acvm_wasm.js +0 -54
  453. package/dest/providers/acvm_wasm_with_blobs.d.ts.map +0 -1
  454. package/dest/providers/factory.d.ts.map +0 -1
  455. package/dest/providers/factory.js +0 -27
  456. package/dest/providers/index.d.ts +0 -5
  457. package/dest/providers/index.d.ts.map +0 -1
  458. package/dest/providers/index.js +0 -5
  459. package/dest/public/db_interfaces.d.ts.map +0 -1
  460. package/dest/public/db_interfaces.js +0 -2
  461. package/dest/public/fee_payment.d.ts +0 -11
  462. package/dest/public/fee_payment.d.ts.map +0 -1
  463. package/dest/public/fee_payment.js +0 -21
  464. package/dest/public/public_processor.d.ts.map +0 -1
  465. package/dest/public/public_processor.js +0 -352
  466. package/dest/public/public_processor_metrics.d.ts.map +0 -1
  467. package/dest/public/public_processor_metrics.js +0 -106
  468. package/dest/public/public_tx_context.d.ts.map +0 -1
  469. package/dest/public/public_tx_context.js +0 -341
  470. package/dest/public/public_tx_simulator.d.ts.map +0 -1
  471. package/dest/public/public_tx_simulator.js +0 -333
  472. package/dest/stats/index.d.ts.map +0 -1
  473. package/dest/stats/index.js +0 -2
  474. package/dest/stats/stats.d.ts.map +0 -1
  475. package/dest/stats/stats.js +0 -11
  476. package/src/avm/avm_tree.ts +0 -887
  477. package/src/avm/opcodes/multi_scalar_mul.ts +0 -121
  478. package/src/avm/serialization/bytecode_serialization.ts +0 -212
  479. package/src/client/index.ts +0 -15
  480. package/src/common.ts +0 -1
  481. package/src/providers/index.ts +0 -4
  482. package/src/public/fee_payment.ts +0 -23
  483. /package/dest/{stats → common/stats}/index.d.ts +0 -0
  484. /package/{src/stats/index.ts → dest/common/stats/index.js} +0 -0
  485. /package/dest/{acvm → private/acvm}/index.d.ts +0 -0
  486. /package/dest/{avm → public/avm}/avm_gas.d.ts +0 -0
  487. /package/dest/{avm → public/avm}/bytecode_utils.d.ts +0 -0
  488. /package/dest/{avm → public/avm}/journal/index.d.ts +0 -0
  489. /package/{src/avm/journal/index.ts → dest/public/avm/journal/index.js} +0 -0
  490. /package/dest/{avm → public/avm}/opcodes/accrued_substate.d.ts +0 -0
  491. /package/dest/{avm → public/avm}/opcodes/addressing_mode.d.ts +0 -0
  492. /package/dest/{avm → public/avm}/opcodes/arithmetic.d.ts +0 -0
  493. /package/dest/{avm → public/avm}/opcodes/bitwise.d.ts +0 -0
  494. /package/dest/{avm → public/avm}/opcodes/comparators.d.ts +0 -0
  495. /package/dest/{avm → public/avm}/opcodes/contract.d.ts +0 -0
  496. /package/dest/{avm → public/avm}/opcodes/control_flow.d.ts +0 -0
  497. /package/dest/{avm → public/avm}/opcodes/environment_getters.d.ts +0 -0
  498. /package/dest/{avm → public/avm}/opcodes/external_calls.d.ts +0 -0
  499. /package/dest/{avm → public/avm}/opcodes/index.d.ts +0 -0
  500. /package/{src/avm/opcodes/index.ts → dest/public/avm/opcodes/index.js} +0 -0
  501. /package/dest/{avm → public/avm}/opcodes/instruction_impl.d.ts +0 -0
  502. /package/dest/{avm → public/avm}/opcodes/memory.d.ts +0 -0
  503. /package/dest/{avm → public/avm}/opcodes/storage.d.ts +0 -0
  504. /package/dest/{avm → public/avm}/serialization/buffer_cursor.d.ts +0 -0
  505. /package/src/{acvm → private/acvm}/index.ts +0 -0
  506. /package/src/{avm → public/avm}/bytecode_utils.ts +0 -0
  507. /package/src/{avm → public/avm}/opcodes/.eslintrc.cjs +0 -0
  508. /package/src/{avm → public/avm}/opcodes/accrued_substate.ts +0 -0
  509. /package/src/{avm → public/avm}/opcodes/addressing_mode.ts +0 -0
  510. /package/src/{avm → public/avm}/opcodes/arithmetic.ts +0 -0
  511. /package/src/{avm → public/avm}/opcodes/bitwise.ts +0 -0
  512. /package/src/{avm → public/avm}/opcodes/comparators.ts +0 -0
  513. /package/src/{avm → public/avm}/opcodes/environment_getters.ts +0 -0
  514. /package/src/{avm → public/avm}/opcodes/instruction_impl.ts +0 -0
  515. /package/src/{avm → public/avm}/opcodes/memory.ts +0 -0
  516. /package/src/{avm → public/avm}/opcodes/storage.ts +0 -0
  517. /package/src/{avm → public/avm}/serialization/buffer_cursor.ts +0 -0
@@ -1,684 +0,0 @@
1
- import { MerkleTreeId } from '@aztec/circuit-types';
2
- import { AppendOnlyTreeSnapshot, NullifierLeafPreimage, PublicDataTreeLeafPreimage } from '@aztec/circuits.js';
3
- import { poseidon2Hash } from '@aztec/foundation/crypto';
4
- import { Fr } from '@aztec/foundation/fields';
5
- import { strict as assert } from 'assert';
6
- import cloneDeep from 'lodash.clonedeep';
7
- const MAX_TREE_DEPTH = 128;
8
- /**
9
- * Helper function to precompute zero hashes
10
- */
11
- async function preComputeZeroHashes() {
12
- let currentHash = Fr.zero();
13
- const zeroHashes = [];
14
- for (let i = 0; i < MAX_TREE_DEPTH; i++) {
15
- zeroHashes.push(currentHash);
16
- currentHash = await poseidon2Hash([currentHash, currentHash]);
17
- }
18
- return zeroHashes;
19
- }
20
- /****************************************************/
21
- /****** The AvmEphemeralForest Class ****************/
22
- /****************************************************/
23
- /**
24
- * This provides a forkable abstraction over the EphemeralAvmTree class
25
- * It contains the logic to look up into a read-only MerkleTreeDb to discover
26
- * the sibling paths and low witnesses that weren't inserted as part of this tx
27
- */
28
- export class AvmEphemeralForest {
29
- constructor(treeDb, treeMap,
30
- // This contains the [leaf index,indexed leaf preimages] tuple that were updated or inserted in the ephemeral tree
31
- // This is needed since we have a sparse collection of keys sorted leaves in the ephemeral tree
32
- indexedUpdates, indexedSortedKeys) {
33
- this.treeDb = treeDb;
34
- this.treeMap = treeMap;
35
- this.indexedUpdates = indexedUpdates;
36
- this.indexedSortedKeys = indexedSortedKeys;
37
- }
38
- static async create(treeDb) {
39
- const treeMap = new Map();
40
- for (const treeType of [MerkleTreeId.NULLIFIER_TREE, MerkleTreeId.NOTE_HASH_TREE, MerkleTreeId.PUBLIC_DATA_TREE]) {
41
- const treeInfo = await treeDb.getTreeInfo(treeType);
42
- const tree = await EphemeralAvmTree.create(treeInfo.size, treeInfo.depth, treeDb, treeType);
43
- treeMap.set(treeType, tree);
44
- }
45
- const indexedSortedKeys = new Map();
46
- indexedSortedKeys.set(MerkleTreeId.NULLIFIER_TREE, []);
47
- indexedSortedKeys.set(MerkleTreeId.PUBLIC_DATA_TREE, []);
48
- return new AvmEphemeralForest(treeDb, treeMap, new Map(), indexedSortedKeys);
49
- }
50
- fork() {
51
- return new AvmEphemeralForest(this.treeDb, cloneDeep(this.treeMap), cloneDeep(this.indexedUpdates), cloneDeep(this.indexedSortedKeys));
52
- }
53
- /**
54
- * Gets sibling path for a leaf - if the sibling path is not found in the tree, it is fetched from the DB
55
- * @param treeId - The tree to be queried for a sibling path.
56
- * @param index - The index of the leaf for which a sibling path should be returned.
57
- * @returns The sibling path of the leaf.
58
- */
59
- async getSiblingPath(treeId, index) {
60
- const tree = this.treeMap.get(treeId);
61
- let path = await tree.getSiblingPath(index);
62
- if (path === undefined) {
63
- // We dont have the sibling path in our tree - we have to get it from the DB
64
- path = (await this.treeDb.getSiblingPath(treeId, index)).toFields();
65
- // Since the sibling path could be outdated, we compare it with nodes in our tree
66
- // if we encounter a mismatch, we replace it with the node we found in our tree.
67
- for (let i = 0; i < path.length; i++) {
68
- const siblingIndex = index ^ 1n;
69
- const node = tree.getNode(siblingIndex, tree.depth - i);
70
- if (node !== undefined) {
71
- const nodeHash = await tree.hashTree(node, i + 1);
72
- if (!nodeHash.equals(path[i])) {
73
- path[i] = nodeHash;
74
- }
75
- }
76
- index >>= 1n;
77
- }
78
- }
79
- return path;
80
- }
81
- /**
82
- * This does the work of appending the new leaf and updating the low witness
83
- * @param treeId - The tree to be queried for a sibling path.
84
- * @param lowWitnessIndex - The index of the low leaf in the tree.
85
- * @param lowWitness - The preimage of the low leaf.
86
- * @param newLeafPreimage - The preimage of the new leaf to be inserted.
87
- * @returns The sibling path of the new leaf (i.e. the insertion path)
88
- */
89
- async appendIndexedTree(treeId, lowLeafIndex, lowLeafPreimage, newLeafPreimage) {
90
- const tree = this.treeMap.get(treeId);
91
- const newLeaf = await this.hashPreimage(newLeafPreimage);
92
- const insertIndex = tree.leafCount;
93
- const lowLeaf = await this.hashPreimage(lowLeafPreimage);
94
- // Update the low nullifier hash
95
- this.setIndexedUpdates(treeId, lowLeafIndex, lowLeafPreimage);
96
- tree.updateLeaf(lowLeaf, lowLeafIndex);
97
- // Append the new leaf
98
- tree.appendLeaf(newLeaf);
99
- this.setIndexedUpdates(treeId, insertIndex, newLeafPreimage);
100
- return (await tree.getSiblingPath(insertIndex));
101
- }
102
- /**
103
- * This writes or updates a slot in the public data tree with a value
104
- * @param slot - The slot to be written to.
105
- * @param newValue - The value to be written or updated to
106
- * @returns The insertion result which contains the insertion path, low leaf and the new leaf index
107
- */
108
- async writePublicStorage(slot, newValue) {
109
- // This only works for the public data tree
110
- const treeId = MerkleTreeId.PUBLIC_DATA_TREE;
111
- const tree = this.treeMap.get(treeId);
112
- const [leafOrLowLeafInfo, pathAbsentInEphemeralTree] = await this._getLeafOrLowLeafInfo(treeId, slot);
113
- const { preimage, index: lowLeafIndex, alreadyPresent: update } = leafOrLowLeafInfo;
114
- const siblingPath = await this.getSiblingPath(treeId, lowLeafIndex);
115
- if (pathAbsentInEphemeralTree) {
116
- // Since we have never seen this before - we should insert it into our tree as it is about to be updated.
117
- this.treeMap.get(treeId).insertSiblingPath(lowLeafIndex, siblingPath);
118
- }
119
- if (update) {
120
- const updatedPreimage = cloneDeep(preimage);
121
- const existingPublicDataSiblingPath = siblingPath;
122
- updatedPreimage.value = newValue;
123
- tree.updateLeaf(await this.hashPreimage(updatedPreimage), lowLeafIndex);
124
- this.setIndexedUpdates(treeId, lowLeafIndex, updatedPreimage);
125
- this._updateSortedKeys(treeId, [updatedPreimage.slot], [lowLeafIndex]);
126
- return {
127
- element: updatedPreimage,
128
- lowWitness: {
129
- preimage: preimage,
130
- index: lowLeafIndex,
131
- siblingPath: existingPublicDataSiblingPath,
132
- },
133
- update: true,
134
- };
135
- }
136
- // We are writing to a new slot, so our preimage is a lowNullifier
137
- const insertionIndex = tree.leafCount;
138
- const updatedLowLeaf = cloneDeep(preimage);
139
- updatedLowLeaf.nextSlot = slot;
140
- updatedLowLeaf.nextIndex = insertionIndex;
141
- const newPublicDataLeaf = new PublicDataTreeLeafPreimage(slot, newValue, new Fr(preimage.getNextKey()), preimage.getNextIndex());
142
- const insertionPath = await this.appendIndexedTree(treeId, lowLeafIndex, updatedLowLeaf, newPublicDataLeaf);
143
- // Even though the low leaf key is not updated, we still need to update the sorted keys in case we have
144
- // not seen the low leaf before
145
- this._updateSortedKeys(treeId, [newPublicDataLeaf.slot, updatedLowLeaf.slot], [insertionIndex, lowLeafIndex]);
146
- return {
147
- element: newPublicDataLeaf,
148
- lowWitness: {
149
- preimage,
150
- index: lowLeafIndex,
151
- siblingPath,
152
- },
153
- update: false,
154
- leafIndex: insertionIndex,
155
- insertionPath: insertionPath,
156
- };
157
- }
158
- _updateSortedKeys(treeId, keys, index) {
159
- // This is a reference
160
- const existingKeyVector = this.indexedSortedKeys.get(treeId);
161
- // Should already be sorted so not need to re-sort if we just update or splice
162
- for (let i = 0; i < keys.length; i++) {
163
- const foundIndex = existingKeyVector.findIndex(x => x[1] === index[i]);
164
- if (foundIndex === -1) {
165
- // New element, we splice it into the correct location
166
- const spliceIndex = indexOrNextLowestInArray(keys[i], existingKeyVector.map(x => x[0])) + 1;
167
- existingKeyVector.splice(spliceIndex, 0, [keys[i], index[i]]);
168
- }
169
- else {
170
- // Update the existing element
171
- existingKeyVector[foundIndex][0] = keys[i];
172
- }
173
- }
174
- }
175
- /**
176
- * This appends a nullifier to the nullifier tree, and throws if the nullifier already exists
177
- * @param value - The nullifier to be appended
178
- * @returns The insertion result which contains the insertion path, low leaf and the new leaf index
179
- */
180
- async appendNullifier(nullifier) {
181
- const treeId = MerkleTreeId.NULLIFIER_TREE;
182
- const tree = this.treeMap.get(treeId);
183
- const [leafOrLowLeafInfo, pathAbsentInEphemeralTree] = await this._getLeafOrLowLeafInfo(treeId, nullifier);
184
- const { preimage, index, alreadyPresent } = leafOrLowLeafInfo;
185
- const siblingPath = await this.getSiblingPath(treeId, index);
186
- if (pathAbsentInEphemeralTree) {
187
- // Since we have never seen this before - we should insert it into our tree as it is about to be updated.
188
- this.treeMap.get(treeId).insertSiblingPath(index, siblingPath);
189
- }
190
- assert(!alreadyPresent, 'Nullifier already exists in the tree. Cannot update a nullifier!');
191
- // We are writing a new entry
192
- const insertionIndex = tree.leafCount;
193
- const updatedLowNullifier = cloneDeep(preimage);
194
- updatedLowNullifier.nextNullifier = nullifier;
195
- updatedLowNullifier.nextIndex = insertionIndex;
196
- const newNullifierLeaf = new NullifierLeafPreimage(nullifier, preimage.nextNullifier, preimage.nextIndex);
197
- const insertionPath = await this.appendIndexedTree(treeId, index, updatedLowNullifier, newNullifierLeaf);
198
- // Even though the low nullifier key is not updated, we still need to update the sorted keys in case we have
199
- // not seen the low nullifier before
200
- this._updateSortedKeys(treeId, [newNullifierLeaf.nullifier, updatedLowNullifier.nullifier], [insertionIndex, index]);
201
- return {
202
- element: newNullifierLeaf,
203
- lowWitness: {
204
- preimage,
205
- index,
206
- siblingPath,
207
- },
208
- leafIndex: insertionIndex,
209
- insertionPath: insertionPath,
210
- };
211
- }
212
- /**
213
- * This appends a note hash to the note hash tree
214
- * @param value - The note hash to be appended
215
- * @returns The insertion result which contains the insertion path
216
- */
217
- async appendNoteHash(noteHash) {
218
- const tree = this.treeMap.get(MerkleTreeId.NOTE_HASH_TREE);
219
- tree.appendLeaf(noteHash);
220
- // We use leafCount - 1 here because we would have just appended a leaf
221
- const insertionPath = await tree.getSiblingPath(tree.leafCount - 1n);
222
- return insertionPath;
223
- }
224
- /**
225
- * This is wrapper around treeId to set values in the indexedUpdates map
226
- */
227
- setIndexedUpdates(treeId, index, preimage) {
228
- let updates = this.indexedUpdates.get(treeId);
229
- if (updates === undefined) {
230
- updates = new Map();
231
- this.indexedUpdates.set(treeId, updates);
232
- }
233
- updates.set(index, preimage);
234
- }
235
- /**
236
- * This is wrapper around treeId to get values in the indexedUpdates map.
237
- * Should only be called if we know the value exists.
238
- */
239
- getIndexedUpdate(treeId, index) {
240
- const updates = this.indexedUpdates.get(treeId);
241
- assert(updates !== undefined, `No updates exist in the ephemeral ${MerkleTreeId[treeId]} tree.`);
242
- const preimage = updates.get(index);
243
- assert(updates !== undefined, `No update exists in the ephemeral ${MerkleTreeId[treeId]} tree for leafIndex ${index}.`);
244
- return preimage;
245
- }
246
- /**
247
- * This is wrapper around treeId to check membership (i.e. has()) of index in the indexedUpdates map
248
- */
249
- hasLocalUpdates(treeId, index) {
250
- const updates = this.indexedUpdates.get(treeId);
251
- if (updates === undefined) {
252
- return false;
253
- }
254
- return updates.has(index);
255
- }
256
- /**
257
- * Get the leaf or low leaf preimage and its index in the indexed tree given a key (slot or nullifier value).
258
- * If the key is not found in the tree, it does an external lookup to the underlying merkle DB.
259
- * @param treeId - The tree we are looking up in
260
- * @param key - The key for which we are look up the leaf or low leaf for.
261
- * @param T - The type of the preimage (PublicData or Nullifier)
262
- * @returns The leaf or low leaf info (preimage & leaf index).
263
- */
264
- async getLeafOrLowLeafInfo(treeId, key) {
265
- const [leafOrLowLeafInfo, _] = await this._getLeafOrLowLeafInfo(treeId, key);
266
- return leafOrLowLeafInfo;
267
- }
268
- /**
269
- * Internal helper to get the leaf or low leaf preimage and its index in the indexed tree given a key (slot or nullifier value).
270
- * If the key is not found in the tree, it does an external lookup to the underlying merkle DB.
271
- * Indicates whethe the sibling path is absent in the ephemeral tree.
272
- * @param treeId - The tree we are looking up in
273
- * @param key - The key for which we are look up the leaf or low leaf for.
274
- * @param T - The type of the preimage (PublicData or Nullifier)
275
- * @returns [
276
- * getLeafResult - The leaf or low leaf info (preimage & leaf index),
277
- * pathAbsentInEphemeralTree - whether its sibling path is absent in the ephemeral tree (useful during insertions)
278
- * ]
279
- */
280
- async _getLeafOrLowLeafInfo(treeId, key) {
281
- const bigIntKey = key.toBigInt();
282
- // In this function, "min" refers to the leaf with the
283
- // largest key <= the specified key in the indexedUpdates.
284
- // In other words, the leaf with the "next lowest" key in indexedUpdates.
285
- // First, search the indexed updates (no DB fallback) to find
286
- // the leafIndex of the leaf with the largest key <= the specified key.
287
- const minIndexedLeafIndex = this._getLeafIndexOrNextLowestInIndexedUpdates(treeId, key);
288
- // Then we search on the external DB
289
- const leafOrLowLeafWitnessFromExternalDb = await this._getLeafOrLowLeafWitnessInExternalDb(treeId, bigIntKey);
290
- // If the indexed updates are empty, we can return the leaf from the DB
291
- if (minIndexedLeafIndex === -1n) {
292
- return [leafOrLowLeafWitnessFromExternalDb, /*pathAbsentInEphemeralTree=*/ true];
293
- }
294
- // Otherwise, we return the closest one. First fetch the leaf from the indexed updates.
295
- const minIndexedUpdate = this.getIndexedUpdate(treeId, minIndexedLeafIndex);
296
- // And get both keys
297
- const keyFromIndexed = minIndexedUpdate.getKey();
298
- const keyFromExternal = leafOrLowLeafWitnessFromExternalDb.preimage.getKey();
299
- if (keyFromExternal > keyFromIndexed) {
300
- // this.log.debug(`Using leaf from external DB for ${MerkleTreeId[treeId]}`);
301
- return [leafOrLowLeafWitnessFromExternalDb, /*pathAbsentInEphemeralTree=*/ true];
302
- }
303
- else {
304
- // this.log.debug(`Using leaf from indexed DB for ${MerkleTreeId[treeId]}`);
305
- const leafInfo = {
306
- preimage: minIndexedUpdate,
307
- index: minIndexedLeafIndex,
308
- alreadyPresent: keyFromIndexed === bigIntKey,
309
- };
310
- return [leafInfo, /*pathAbsentInEphemeralTree=*/ false];
311
- }
312
- }
313
- /**
314
- * Helper to search for the leaf with the specified key in the indexedUpdates
315
- * and return its leafIndex.
316
- * If not present, return the leafIndex of the largest leaf <= the specified key
317
- * (the leafIndex of the next lowest key).
318
- *
319
- * If no entry exists in indexedUpdates <= the specified key, return -1.
320
- * @returns - The leafIndex of the leaf with the largest key <= the specified key.
321
- */
322
- _getLeafIndexOrNextLowestInIndexedUpdates(treeId, key) {
323
- const keyOrderedVector = this.indexedSortedKeys.get(treeId);
324
- const indexInVector = indexOrNextLowestInArray(key, keyOrderedVector.map(x => x[0]));
325
- if (indexInVector !== -1) {
326
- const [_, leafIndex] = keyOrderedVector[indexInVector];
327
- return leafIndex;
328
- }
329
- else {
330
- // no leaf <= the specified key was found
331
- return -1n;
332
- }
333
- }
334
- /**
335
- * Query the external DB to get leaf if present, low leaf if absent
336
- */
337
- async _getLeafOrLowLeafWitnessInExternalDb(treeId, key) {
338
- // "key" is siloed slot (leafSlot) or siloed nullifier
339
- const previousValueIndex = await this.treeDb.getPreviousValueIndex(treeId, key);
340
- assert(previousValueIndex !== undefined, `${MerkleTreeId[treeId]} low leaf index should always be found (even if target leaf does not exist)`);
341
- const { index: leafIndex, alreadyPresent } = previousValueIndex;
342
- const leafPreimage = await this.treeDb.getLeafPreimage(treeId, leafIndex);
343
- assert(leafPreimage !== undefined, `${MerkleTreeId[treeId]} low leaf preimage should never be undefined (even if target leaf does not exist)`);
344
- return { preimage: leafPreimage, index: leafIndex, alreadyPresent };
345
- }
346
- /**
347
- * This hashes the preimage to a field element
348
- */
349
- hashPreimage(preimage) {
350
- const input = preimage.toHashInputs().map(x => Fr.fromBuffer(x));
351
- return poseidon2Hash(input);
352
- }
353
- async getTreeSnapshot(id) {
354
- const tree = this.treeMap.get(id);
355
- const root = await tree.getRoot();
356
- return new AppendOnlyTreeSnapshot(root, Number(tree.leafCount));
357
- }
358
- }
359
- /****************************************************/
360
- /****** Some useful Structs and Enums **************/
361
- /****************************************************/
362
- var TreeType;
363
- (function (TreeType) {
364
- TreeType[TreeType["LEAF"] = 0] = "LEAF";
365
- TreeType[TreeType["NODE"] = 1] = "NODE";
366
- })(TreeType || (TreeType = {}));
367
- var SiblingStatus;
368
- (function (SiblingStatus) {
369
- SiblingStatus[SiblingStatus["MEMBER"] = 0] = "MEMBER";
370
- SiblingStatus[SiblingStatus["NONMEMBER"] = 1] = "NONMEMBER";
371
- SiblingStatus[SiblingStatus["ERROR"] = 2] = "ERROR";
372
- })(SiblingStatus || (SiblingStatus = {}));
373
- /****************************************************/
374
- /****** Some Helpful Constructors for Trees ********/
375
- /****************************************************/
376
- const Node = (left, right) => ({
377
- tag: TreeType.NODE,
378
- leftTree: left,
379
- rightTree: right,
380
- });
381
- const Leaf = (value) => ({
382
- tag: TreeType.LEAF,
383
- value,
384
- });
385
- /****************************************************/
386
- /****** The EphemeralAvmTree Class *****************/
387
- /****************************************************/
388
- /**
389
- * This class contains a recursively defined tree that has leaves at different heights
390
- * It is seeded by an existing merkle treeDb for which it derives a frontier
391
- * It is intended to be a lightweight tree that contains only the necessary information to suppport appends or updates
392
- */
393
- export class EphemeralAvmTree {
394
- constructor(root, leafCount, depth, zeroHashes) {
395
- this.root = root;
396
- this.leafCount = leafCount;
397
- this.depth = depth;
398
- this.zeroHashes = zeroHashes;
399
- this.tree = root;
400
- this.frontier = [];
401
- }
402
- static async create(forkedLeafCount, depth, treeDb, merkleId) {
403
- let zeroHashes = EphemeralAvmTree.precomputedZeroHashes;
404
- if (zeroHashes === undefined) {
405
- zeroHashes = await preComputeZeroHashes();
406
- EphemeralAvmTree.precomputedZeroHashes = zeroHashes;
407
- }
408
- const zeroHash = zeroHashes[depth];
409
- const tree = new EphemeralAvmTree(Leaf(zeroHash), forkedLeafCount, depth, zeroHashes);
410
- await tree.initializeFrontier(treeDb, merkleId);
411
- return tree;
412
- }
413
- /**
414
- * This is a recursive function that inserts a leaf into the tree
415
- * @param value - The value of the leaf to be inserted
416
- */
417
- appendLeaf(value) {
418
- const insertPath = this._derivePathLE(this.leafCount);
419
- this.tree = this._insertLeaf(value, insertPath, this.depth, this.tree);
420
- this.leafCount++;
421
- }
422
- /**
423
- * This is a recursive function that upserts a leaf into the tree at a index and depth
424
- * @param value - The value of the leaf to be inserted
425
- * @param index - The index of the leaf to be inserted
426
- * @param depth - The depth of the leaf to be inserted (defaults to the bottom of the tree)
427
- */
428
- updateLeaf(value, index, depth = this.depth) {
429
- const insertPath = this._derivePathLE(index, depth);
430
- this.tree = this._insertLeaf(value, insertPath, depth, this.tree);
431
- }
432
- /**
433
- * Get the sibling path of a leaf in the tree
434
- * @param index - The index of the leaf for which a sibling path should be returned.
435
- * @returns The sibling path of the leaf, can fail if the path is not found
436
- */
437
- async getSiblingPath(index) {
438
- const searchPath = this._derivePathLE(index);
439
- // Handle cases where we error out
440
- const { path, status } = await this._getSiblingPath(searchPath, this.tree, []);
441
- if (status === SiblingStatus.ERROR) {
442
- return undefined;
443
- }
444
- return path;
445
- }
446
- /**
447
- * This upserts the nodes of the sibling path into the tree
448
- * @param index - The index of the leaf that the sibling path is derived from
449
- * @param siblingPath - The sibling path of the index
450
- */
451
- insertSiblingPath(index, siblingPath) {
452
- for (let i = 0; i < siblingPath.length; i++) {
453
- // Flip(XOR) the last bit because we are inserting siblings of the leaf
454
- const sibIndex = index ^ 1n;
455
- const node = this.getNode(sibIndex, this.depth - i);
456
- // If we are inserting a sibling path and we already have a branch at that index in our
457
- // ephemeral tree, we should not overwrite it
458
- if (node === undefined || node.tag === TreeType.LEAF) {
459
- this.updateLeaf(siblingPath[i], sibIndex, this.depth - i);
460
- }
461
- index >>= 1n;
462
- }
463
- }
464
- /**
465
- * This is a helper function that computes the index of the frontier nodes at each depth
466
- * @param leafCount - The number of leaves in the tree
467
- * @returns An array of frontier indices at each depth, sorted from leaf to root
468
- */
469
- // Do we really need LeafCount to be a bigint - log2 is on numbers only
470
- static computeFrontierLeafIndices(leafCount) {
471
- const numFrontierEntries = Math.floor(Math.log2(leafCount)) + 1;
472
- const frontierIndices = [];
473
- for (let i = 0; i < numFrontierEntries; i++) {
474
- if (leafCount === 0) {
475
- frontierIndices.push(0);
476
- }
477
- else if (leafCount % 2 === 0) {
478
- frontierIndices.push(leafCount - 2);
479
- }
480
- else {
481
- frontierIndices.push(leafCount - 1);
482
- }
483
- leafCount >>= 1;
484
- }
485
- return frontierIndices;
486
- }
487
- /**
488
- * This derives the frontier and inserts them into the tree
489
- * @param treeDb - The treeDb to be queried for sibling paths
490
- * @param merkleId - The treeId of the tree to be queried for sibling paths
491
- */
492
- async initializeFrontier(treeDb, merkleId) {
493
- // The frontier indices are sorted from the leaf to root
494
- const frontierIndices = EphemeralAvmTree.computeFrontierLeafIndices(Number(this.leafCount));
495
- // The frontier indices are level-based - i.e. index N at level L.
496
- // Since we can only ask the DB for paths from the root to the leaf, we do the following complicated calculations
497
- // 1) The goal is to insert the frontier node N at level L into the tree.
498
- // 2) We get the path to a leaf that passes through the frontier node we want (there are multiple paths so we just pick one)
499
- // 3) We can only get sibling paths from the root to the leaf, so we get the sibling path of the leaf from (2)
500
- // NOTE: This is terribly inefficient and we should probably change the DB API to allow for getting paths to a node
501
- const frontierValues = [];
502
- // These are leaf indexes that pass through the frontier nodes
503
- for (let i = 0; i < frontierIndices.length; i++) {
504
- // Given the index to a frontier, we first xor it so we can get its sibling index at depth L
505
- // We then extend the path to that sibling index by shifting left the requisite number of times (for simplicity we just go left down the tree - it doesnt matter)
506
- // This provides us the leaf index such that if we ask for this leafIndex's sibling path, it will pass through the frontier node
507
- const index = BigInt(frontierIndices[i] ^ 1) << BigInt(i);
508
- // This path passes through our frontier node at depth - i
509
- const path = await treeDb.getSiblingPath(merkleId, index);
510
- // We derive the path that we can walk and truncate it so that it terminates exactly at the frontier node
511
- const frontierPath = this._derivePathLE(BigInt(frontierIndices[i]), this.depth - i);
512
- // The value of the frontier is the at the i-th index of the sibling path
513
- const frontierValue = path.toFields()[i];
514
- frontierValues.push(frontierValue);
515
- // We insert it at depth - i (the truncated position)
516
- // Note this is a leaf node that wont necessarily be at the bottom of the tree (besides the first frontier)
517
- this.tree = this._insertLeaf(frontierValue, frontierPath, this.depth - i, this.tree);
518
- }
519
- this.frontier = frontierValues;
520
- }
521
- /**
522
- * Computes the root of the tree
523
- */
524
- getRoot() {
525
- return this.hashTree(this.tree, this.depth);
526
- }
527
- /**
528
- * Recursively hashes the subtree
529
- * @param tree - The tree to be hashed
530
- * @param depth - The depth of the tree
531
- */
532
- async hashTree(tree, depth) {
533
- switch (tree.tag) {
534
- case TreeType.NODE: {
535
- return poseidon2Hash([
536
- await this.hashTree(tree.leftTree, depth - 1),
537
- await this.hashTree(tree.rightTree, depth - 1),
538
- ]);
539
- }
540
- case TreeType.LEAF: {
541
- return tree.value;
542
- }
543
- }
544
- }
545
- /**
546
- * Extracts the subtree from a given index and depth
547
- * @param index - The index of the node to be extracted
548
- * @param depth - The depth of the node to be extracted
549
- * @returns The subtree rooted at the index and depth
550
- */
551
- getNode(index, depth) {
552
- const path = this._derivePathBE(index, depth);
553
- const truncatedPath = path.slice(0, depth);
554
- truncatedPath.reverse();
555
- try {
556
- return this._getNode(truncatedPath, this.tree);
557
- }
558
- catch (e) {
559
- return undefined;
560
- }
561
- }
562
- /**
563
- * This is the recursive helper for getNode
564
- */
565
- _getNode(nodePath, tree) {
566
- if (nodePath.length === 0) {
567
- return tree;
568
- }
569
- switch (tree.tag) {
570
- case TreeType.NODE:
571
- return nodePath.pop() === 0 ? this._getNode(nodePath, tree.leftTree) : this._getNode(nodePath, tree.rightTree);
572
- case TreeType.LEAF:
573
- throw new Error('Node not found');
574
- }
575
- }
576
- /** Our tree traversal uses an array of 1s and 0s to represent the path to a leaf and expects them to be in LE order
577
- * This helps with deriving it given an index and (optionally a depth)
578
- * @param index - The index to derive a path to within the tree, does not have to terminate at a leaf
579
- * @param depth - The depth to traverse, if not provided it will traverse to the bottom of the tree
580
- * @returns The path to the leaf in LE order
581
- */
582
- _derivePathLE(index, depth = this.depth) {
583
- return this._derivePathBE(index, depth).reverse();
584
- }
585
- /** Sometimes we want it in BE order, to make truncating easier
586
- * @param index - The index to derive a path to within the tree, does not have to terminate at a leaf
587
- * @param depth - The depth to traverse, if not provided it will traverse to the bottom of the tree
588
- * @returns The path to the leaf in LE order
589
- */
590
- _derivePathBE(index, depth = this.depth) {
591
- return index
592
- .toString(2)
593
- .padStart(depth, '0')
594
- .split('')
595
- .map(x => parseInt(x));
596
- }
597
- /**
598
- * This is a recursive function that upserts a leaf into the tree given a path
599
- * @param value - The value of the leaf to be upserted
600
- * @param insertPath - The path to the leaf, this should be ordered from leaf to root (i.e. LE encoded)
601
- * @param depth - The depth of the tree
602
- * @param tree - The current tree
603
- * @param appendMode - If true we append the relevant zeroHashes to the tree as we traverse
604
- */
605
- _insertLeaf(value, insertPath, depth, tree) {
606
- if (insertPath.length > this.depth || depth > this.depth) {
607
- throw new Error('PATH EXCEEDS DEPTH');
608
- }
609
- if (depth === 0 || insertPath.length === 0) {
610
- return Leaf(value);
611
- }
612
- switch (tree.tag) {
613
- case TreeType.NODE: {
614
- return insertPath.pop() === 0
615
- ? Node(this._insertLeaf(value, insertPath, depth - 1, tree.leftTree), tree.rightTree)
616
- : Node(tree.leftTree, this._insertLeaf(value, insertPath, depth - 1, tree.rightTree));
617
- }
618
- case TreeType.LEAF: {
619
- const zeroLeaf = Leaf(this.zeroHashes[depth - 1]);
620
- return insertPath.pop() === 0
621
- ? Node(this._insertLeaf(value, insertPath, depth - 1, zeroLeaf), zeroLeaf)
622
- : Node(zeroLeaf, this._insertLeaf(value, insertPath, depth - 1, zeroLeaf));
623
- }
624
- }
625
- }
626
- /* Recursive helper for getSiblingPath, this only looks inside the tree and does not resolve using
627
- * a DB. If a path is not found, it returns an error status that is expected to be handled by the caller
628
- * @param searchPath - The path to the leaf for which we would like the sibling pathin LE order
629
- * @param tree - The current tree
630
- * @param acc - The accumulated sibling path
631
- */
632
- async _getSiblingPath(searchPath, tree, acc) {
633
- // If we have reached the end of the path, we should be at a leaf or empty node
634
- // If it is a leaf, we check if the value is equal to the leaf value
635
- // If it is empty we check if the value is equal to zero
636
- if (searchPath.length === 0) {
637
- switch (tree.tag) {
638
- case TreeType.LEAF:
639
- return { path: acc, status: SiblingStatus.MEMBER };
640
- case TreeType.NODE:
641
- return { path: [], status: SiblingStatus.ERROR };
642
- }
643
- }
644
- // Keep exploring here
645
- switch (tree.tag) {
646
- case TreeType.NODE: {
647
- // Look at the next element of the path to decided if we go left or right, note this mutates!
648
- return searchPath.pop() === 0
649
- ? await this._getSiblingPath(searchPath, tree.leftTree, [await this.hashTree(tree.rightTree, searchPath.length)].concat(acc))
650
- : await this._getSiblingPath(searchPath, tree.rightTree, [await this.hashTree(tree.leftTree, searchPath.length)].concat(acc));
651
- }
652
- // In these two situations we are exploring a subtree we dont have information about
653
- // We should return an error and look inside the DB
654
- case TreeType.LEAF:
655
- return { path: [], status: SiblingStatus.ERROR };
656
- }
657
- }
658
- }
659
- /**
660
- * Return the index of the key in the array, or index-1 if they key is not found.
661
- */
662
- function indexOrNextLowestInArray(key, arr) {
663
- // We are looking for the index of the largest element in the array that is less than the key
664
- let start = 0;
665
- let end = arr.length;
666
- // Note that the easiest way is to increment the search key by 1 and then do a binary search
667
- const keyPlus1 = key.add(Fr.ONE);
668
- while (start < end) {
669
- const mid = Math.floor((start + end) / 2);
670
- if (arr[mid].cmp(keyPlus1) < 0) {
671
- // The key + 1 is greater than the midpoint, so we can continue searching the top half
672
- start = mid + 1;
673
- }
674
- else {
675
- // The key + 1 is LT or EQ the arr element, so we can continue searching the bottom half
676
- end = mid;
677
- }
678
- }
679
- // We either found key + 1 or start is now at the index of the largest element that we would have inserted key + 1
680
- // Therefore start - 1 is the index of the element just below - note it can be -1 if the first element in the array is
681
- // greater than the key
682
- return start - 1;
683
- }
684
- //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"avm_tree.js","sourceRoot":"","sources":["../../src/avm/avm_tree.ts"],"names":[],"mappings":"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"}