@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
@@ -1,4 +1,5 @@
1
1
  import type { AvmContext } from '../avm_context.js';
2
+ import { getBitwiseDynamicGasMultiplier } from '../avm_gas.js';
2
3
  import { type IntegralValue, TaggedMemory, type TaggedMemoryInterface, TypeTag } from '../avm_memory_types.js';
3
4
  import { Opcode, OperandType } from '../serialization/instruction_serialization.js';
4
5
  import { Addressing } from './addressing_mode.js';
@@ -8,13 +9,19 @@ import { ThreeOperandInstruction } from './instruction_impl.js';
8
9
  abstract class ThreeOperandBitwiseInstruction extends ThreeOperandInstruction {
9
10
  public async execute(context: AvmContext): Promise<void> {
10
11
  const memory = context.machineState.memory;
11
- context.machineState.consumeGas(this.gasCost());
12
+ const addressing = Addressing.fromWire(this.indirect);
13
+
14
+ context.machineState.consumeGas(
15
+ this.baseGasCost(addressing.indirectOperandsCount(), addressing.relativeOperandsCount()),
16
+ );
12
17
 
13
18
  const operands = [this.aOffset, this.bOffset, this.dstOffset];
14
- const addressing = Addressing.fromWire(this.indirect, operands.length);
15
19
  const [aOffset, bOffset, dstOffset] = addressing.resolve(operands, memory);
16
20
  this.checkTags(memory, aOffset, bOffset);
17
21
 
22
+ const multiplier = this.getDynamicMultiplier(memory.getTag(aOffset));
23
+ context.machineState.consumeGas(this.dynamicGasCost(multiplier));
24
+
18
25
  const a = memory.getAs<IntegralValue>(aOffset);
19
26
  const b = memory.getAs<IntegralValue>(bOffset);
20
27
 
@@ -27,6 +34,10 @@ abstract class ThreeOperandBitwiseInstruction extends ThreeOperandInstruction {
27
34
  TaggedMemory.checkIsIntegralTag(memory.getTag(aOffset));
28
35
  memory.checkTagsAreSame(aOffset, bOffset);
29
36
  }
37
+
38
+ protected getDynamicMultiplier(_lhsTag: TypeTag): number {
39
+ return 0;
40
+ }
30
41
  }
31
42
 
32
43
  export class And extends ThreeOperandBitwiseInstruction {
@@ -36,6 +47,10 @@ export class And extends ThreeOperandBitwiseInstruction {
36
47
  protected override compute(a: IntegralValue, b: IntegralValue): IntegralValue {
37
48
  return a.and(b);
38
49
  }
50
+
51
+ protected override getDynamicMultiplier(lhsTag: TypeTag): number {
52
+ return getBitwiseDynamicGasMultiplier(lhsTag);
53
+ }
39
54
  }
40
55
 
41
56
  export class Or extends ThreeOperandBitwiseInstruction {
@@ -45,6 +60,10 @@ export class Or extends ThreeOperandBitwiseInstruction {
45
60
  protected override compute(a: IntegralValue, b: IntegralValue): IntegralValue {
46
61
  return a.or(b);
47
62
  }
63
+
64
+ protected override getDynamicMultiplier(lhsTag: TypeTag): number {
65
+ return getBitwiseDynamicGasMultiplier(lhsTag);
66
+ }
48
67
  }
49
68
 
50
69
  export class Xor extends ThreeOperandBitwiseInstruction {
@@ -54,31 +73,9 @@ export class Xor extends ThreeOperandBitwiseInstruction {
54
73
  protected override compute(a: IntegralValue, b: IntegralValue): IntegralValue {
55
74
  return a.xor(b);
56
75
  }
57
- }
58
76
 
59
- export class Shl extends ThreeOperandBitwiseInstruction {
60
- static readonly type: string = 'SHL';
61
- static readonly opcode = Opcode.SHL_8; // FIXME: needed for gas.
62
-
63
- protected override compute(a: IntegralValue, b: IntegralValue): IntegralValue {
64
- return a.shl(b);
65
- }
66
- protected override checkTags(memory: TaggedMemoryInterface, aOffset: number, bOffset: number) {
67
- TaggedMemory.checkIsIntegralTag(memory.getTag(aOffset));
68
- memory.checkTag(TypeTag.UINT8, bOffset);
69
- }
70
- }
71
-
72
- export class Shr extends ThreeOperandBitwiseInstruction {
73
- static readonly type: string = 'SHR';
74
- static readonly opcode = Opcode.SHR_8; // FIXME: needed for gas.
75
-
76
- protected override compute(a: IntegralValue, b: IntegralValue): IntegralValue {
77
- return a.shr(b);
78
- }
79
- protected override checkTags(memory: TaggedMemoryInterface, aOffset: number, bOffset: number) {
80
- TaggedMemory.checkIsIntegralTag(memory.getTag(aOffset));
81
- memory.checkTag(TypeTag.UINT8, bOffset);
77
+ protected override getDynamicMultiplier(lhsTag: TypeTag): number {
78
+ return getBitwiseDynamicGasMultiplier(lhsTag);
82
79
  }
83
80
  }
84
81
 
@@ -89,16 +86,23 @@ export class Not extends Instruction {
89
86
  static readonly wireFormat8 = [OperandType.UINT8, OperandType.UINT8, OperandType.UINT8, OperandType.UINT8];
90
87
  static readonly wireFormat16 = [OperandType.UINT8, OperandType.UINT8, OperandType.UINT16, OperandType.UINT16];
91
88
 
92
- constructor(private indirect: number, private srcOffset: number, private dstOffset: number) {
89
+ constructor(
90
+ private indirect: number,
91
+ private srcOffset: number,
92
+ private dstOffset: number,
93
+ ) {
93
94
  super();
94
95
  }
95
96
 
96
97
  public async execute(context: AvmContext): Promise<void> {
97
98
  const memory = context.machineState.memory;
98
- context.machineState.consumeGas(this.gasCost());
99
+ const addressing = Addressing.fromWire(this.indirect);
100
+
101
+ context.machineState.consumeGas(
102
+ this.baseGasCost(addressing.indirectOperandsCount(), addressing.relativeOperandsCount()),
103
+ );
99
104
 
100
105
  const operands = [this.srcOffset, this.dstOffset];
101
- const addressing = Addressing.fromWire(this.indirect, operands.length);
102
106
  const [srcOffset, dstOffset] = addressing.resolve(operands, memory);
103
107
  TaggedMemory.checkIsIntegralTag(memory.getTag(srcOffset));
104
108
  const value = memory.getAs<IntegralValue>(srcOffset);
@@ -7,12 +7,15 @@ import { ThreeOperandInstruction } from './instruction_impl.js';
7
7
  abstract class ComparatorInstruction extends ThreeOperandInstruction {
8
8
  public async execute(context: AvmContext): Promise<void> {
9
9
  const memory = context.machineState.memory;
10
- context.machineState.consumeGas(this.gasCost());
10
+ const addressing = Addressing.fromWire(this.indirect);
11
+
12
+ context.machineState.consumeGas(
13
+ this.baseGasCost(addressing.indirectOperandsCount(), addressing.relativeOperandsCount()),
14
+ );
11
15
 
12
16
  const operands = [this.aOffset, this.bOffset, this.dstOffset];
13
- const addressing = Addressing.fromWire(this.indirect, operands.length);
14
17
  const [aOffset, bOffset, dstOffset] = addressing.resolve(operands, memory);
15
- memory.checkTagsAreSame(aOffset, bOffset);
18
+ memory.checkTagsAreSame(aOffset, bOffset); // Brillig semantic enforces that tags match.
16
19
 
17
20
  const a = memory.get(aOffset);
18
21
  const b = memory.get(bOffset);
@@ -20,7 +20,6 @@ export class GetContractInstance extends Instruction {
20
20
  OperandType.UINT8, // indirect bits
21
21
  OperandType.UINT16, // addressOffset
22
22
  OperandType.UINT16, // dstOffset
23
- OperandType.UINT16, // existsOfsset
24
23
  OperandType.UINT8, // member enum (immediate)
25
24
  ];
26
25
 
@@ -28,7 +27,6 @@ export class GetContractInstance extends Instruction {
28
27
  private indirect: number,
29
28
  private addressOffset: number,
30
29
  private dstOffset: number,
31
- private existsOffset: number,
32
30
  private memberEnum: number,
33
31
  ) {
34
32
  super();
@@ -36,15 +34,18 @@ export class GetContractInstance extends Instruction {
36
34
 
37
35
  async execute(context: AvmContext): Promise<void> {
38
36
  const memory = context.machineState.memory;
39
- context.machineState.consumeGas(this.gasCost());
37
+ const addressing = Addressing.fromWire(this.indirect);
38
+
39
+ context.machineState.consumeGas(
40
+ this.baseGasCost(addressing.indirectOperandsCount(), addressing.relativeOperandsCount()),
41
+ );
40
42
 
41
43
  if (!(this.memberEnum in ContractInstanceMember)) {
42
44
  throw new InstructionExecutionError(`Invalid GETCONSTRACTINSTANCE member enum ${this.memberEnum}`);
43
45
  }
44
46
 
45
- const operands = [this.addressOffset, this.dstOffset, this.existsOffset];
46
- const addressing = Addressing.fromWire(this.indirect, operands.length);
47
- const [addressOffset, dstOffset, existsOffset] = addressing.resolve(operands, memory);
47
+ const operands = [this.addressOffset, this.dstOffset];
48
+ const [addressOffset, dstOffset] = addressing.resolve(operands, memory);
48
49
  memory.checkTag(TypeTag.FIELD, addressOffset);
49
50
 
50
51
  const address = memory.get(addressOffset).toAztecAddress();
@@ -66,7 +67,9 @@ export class GetContractInstance extends Instruction {
66
67
  }
67
68
  }
68
69
 
70
+ const existsOffset = dstOffset;
71
+ const memberValueOffset = dstOffset + 1;
69
72
  memory.set(existsOffset, new Uint1(exists ? 1 : 0));
70
- memory.set(dstOffset, memberValue);
73
+ memory.set(memberValueOffset, memberValue);
71
74
  }
72
75
  }
@@ -1,5 +1,5 @@
1
1
  import type { AvmContext } from '../avm_context.js';
2
- import type { IntegralValue } from '../avm_memory_types.js';
2
+ import { TypeTag, type Uint1 } from '../avm_memory_types.js';
3
3
  import { InstructionExecutionError } from '../errors.js';
4
4
  import { Opcode, OperandType } from '../serialization/instruction_serialization.js';
5
5
  import { Addressing } from './addressing_mode.js';
@@ -16,7 +16,7 @@ export class Jump extends Instruction {
16
16
  }
17
17
 
18
18
  public async execute(context: AvmContext): Promise<void> {
19
- context.machineState.consumeGas(this.gasCost());
19
+ context.machineState.consumeGas(this.baseGasCost(0, 0));
20
20
 
21
21
  context.machineState.pc = this.jumpOffset;
22
22
  }
@@ -38,20 +38,29 @@ export class JumpI extends Instruction {
38
38
  OperandType.UINT32,
39
39
  ];
40
40
 
41
- constructor(private indirect: number, private condOffset: number, private loc: number) {
41
+ constructor(
42
+ private indirect: number,
43
+ private condOffset: number,
44
+ private loc: number,
45
+ ) {
42
46
  super();
43
47
  }
44
48
 
45
49
  public async execute(context: AvmContext): Promise<void> {
46
50
  const memory = context.machineState.memory;
47
- context.machineState.consumeGas(this.gasCost());
51
+ const addressing = Addressing.fromWire(this.indirect);
52
+
53
+ context.machineState.consumeGas(
54
+ this.baseGasCost(addressing.indirectOperandsCount(), addressing.relativeOperandsCount()),
55
+ );
48
56
 
49
57
  const operands = [this.condOffset];
50
- const addressing = Addressing.fromWire(this.indirect, operands.length);
51
- const [condOffset] = addressing.resolve(operands, memory);
52
- const condition = memory.getAs<IntegralValue>(condOffset);
58
+ const [resolvedCondOffset] = addressing.resolve(operands, memory);
59
+
60
+ memory.checkTag(TypeTag.UINT1, resolvedCondOffset);
61
+ const condition = memory.getAs<Uint1>(resolvedCondOffset);
53
62
 
54
- if (condition.toBigInt() == 0n) {
63
+ if (condition.toNumber() == 0) {
55
64
  context.machineState.pc = context.machineState.nextPc;
56
65
  } else {
57
66
  context.machineState.pc = this.loc;
@@ -74,7 +83,7 @@ export class InternalCall extends Instruction {
74
83
  }
75
84
 
76
85
  public async execute(context: AvmContext): Promise<void> {
77
- context.machineState.consumeGas(this.gasCost());
86
+ context.machineState.consumeGas(this.baseGasCost(0, 0));
78
87
 
79
88
  context.machineState.internalCallStack.push({
80
89
  callPc: context.machineState.pc,
@@ -99,7 +108,7 @@ export class InternalReturn extends Instruction {
99
108
  }
100
109
 
101
110
  public async execute(context: AvmContext): Promise<void> {
102
- context.machineState.consumeGas(this.gasCost());
111
+ context.machineState.consumeGas(this.baseGasCost(0, 0));
103
112
 
104
113
  const stackEntry = context.machineState.internalCallStack.pop();
105
114
  if (stackEntry === undefined) {
@@ -33,8 +33,13 @@ export class ToRadixBE extends Instruction {
33
33
 
34
34
  public async execute(context: AvmContext): Promise<void> {
35
35
  const memory = context.machineState.memory;
36
+ const addressing = Addressing.fromWire(this.indirect);
37
+
38
+ context.machineState.consumeGas(
39
+ this.baseGasCost(addressing.indirectOperandsCount(), addressing.relativeOperandsCount()),
40
+ );
41
+
36
42
  const operands = [this.srcOffset, this.radixOffset, this.numLimbsOffset, this.outputBitsOffset, this.dstOffset];
37
- const addressing = Addressing.fromWire(this.indirect, operands.length);
38
43
  const [srcOffset, radixOffset, numLimbsOffset, outputBitsOffset, dstOffset] = addressing.resolve(operands, memory);
39
44
 
40
45
  // The radix gadget only takes in a Field
@@ -44,11 +49,13 @@ export class ToRadixBE extends Instruction {
44
49
  memory.checkTag(TypeTag.UINT1, outputBitsOffset);
45
50
 
46
51
  const numLimbs = memory.get(numLimbsOffset).toNumber();
47
- context.machineState.consumeGas(this.gasCost(numLimbs));
52
+ const radix: bigint = memory.get(radixOffset).toBigInt();
53
+ context.machineState.consumeGas(
54
+ this.dynamicGasCost(Math.max(numLimbs, radix > 256n ? 32 : MODULUS_LIMBS_PER_RADIX[Number(radix)])),
55
+ );
48
56
  const outputBits = memory.get(outputBitsOffset).toNumber();
49
57
 
50
58
  let value: bigint = memory.get(srcOffset).toBigInt();
51
- const radix: bigint = memory.get(radixOffset).toBigInt();
52
59
 
53
60
  if (radix < 2 || radix > 256) {
54
61
  throw new InvalidToRadixInputsError(`ToRadixBE instruction's radix should be in range [2,256] (was ${radix}).`);
@@ -78,3 +85,16 @@ export class ToRadixBE extends Instruction {
78
85
  memory.setSlice(dstOffset, res);
79
86
  }
80
87
  }
88
+
89
+ // First two are for radix = 0 and 1, which are invalid, so we have 0 limbs for those cases.
90
+ export const MODULUS_LIMBS_PER_RADIX: number[] = [
91
+ 0, 0, 254, 161, 127, 110, 99, 91, 85, 81, 77, 74, 71, 69, 67, 65, 64, 63, 61, 60, 59, 58, 57, 57, 56, 55, 54, 54, 53,
92
+ 53, 52, 52, 51, 51, 50, 50, 50, 49, 49, 48, 48, 48, 48, 47, 47, 47, 46, 46, 46, 46, 45, 45, 45, 45, 45, 44, 44, 44,
93
+ 44, 44, 43, 43, 43, 43, 43, 43, 42, 42, 42, 42, 42, 42, 42, 41, 41, 41, 41, 41, 41, 41, 41, 41, 40, 40, 40, 40, 40,
94
+ 40, 40, 40, 40, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 38, 38, 38, 38, 38, 38, 38, 38, 38, 38, 38, 38, 38,
95
+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36,
96
+ 36, 36, 36, 36, 36, 36, 36, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35,
97
+ 35, 35, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
98
+ 34, 34, 34, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33,
99
+ 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
100
+ ];
@@ -39,7 +39,11 @@ export class EcAdd extends Instruction {
39
39
 
40
40
  public async execute(context: AvmContext): Promise<void> {
41
41
  const memory = context.machineState.memory;
42
- context.machineState.consumeGas(this.gasCost());
42
+ const addressing = Addressing.fromWire(this.indirect);
43
+
44
+ context.machineState.consumeGas(
45
+ this.baseGasCost(addressing.indirectOperandsCount(), addressing.relativeOperandsCount()),
46
+ );
43
47
 
44
48
  const operands = [
45
49
  this.p1XOffset,
@@ -50,7 +54,6 @@ export class EcAdd extends Instruction {
50
54
  this.p2IsInfiniteOffset,
51
55
  this.dstOffset,
52
56
  ];
53
- const addressing = Addressing.fromWire(this.indirect, operands.length);
54
57
  const [p1XOffset, p1YOffset, p1IsInfiniteOffset, p2XOffset, p2YOffset, p2IsInfiniteOffset, dstOffset] =
55
58
  addressing.resolve(operands, memory);
56
59
 
@@ -1,5 +1,5 @@
1
1
  import type { AvmContext } from '../avm_context.js';
2
- import { Field, Uint64 } from '../avm_memory_types.js';
2
+ import { Field, Uint1, Uint32, Uint64, Uint128 } from '../avm_memory_types.js';
3
3
  import { InstructionExecutionError } from '../errors.js';
4
4
  import { Opcode, OperandType } from '../serialization/instruction_serialization.js';
5
5
  import { Addressing } from './addressing_mode.js';
@@ -13,8 +13,8 @@ export enum EnvironmentVariable {
13
13
  VERSION,
14
14
  BLOCKNUMBER,
15
15
  TIMESTAMP,
16
- FEEPERL2GAS,
17
- FEEPERDAGAS,
16
+ BASEFEEPERL2GAS,
17
+ BASEFEEPERDAGAS,
18
18
  ISSTATICCALL,
19
19
  L2GASLEFT,
20
20
  DAGASLEFT,
@@ -33,19 +33,19 @@ function getValue(e: EnvironmentVariable, ctx: AvmContext) {
33
33
  case EnvironmentVariable.VERSION:
34
34
  return new Field(ctx.environment.globals.version);
35
35
  case EnvironmentVariable.BLOCKNUMBER:
36
- return new Field(ctx.environment.globals.blockNumber);
36
+ return new Uint32(ctx.environment.globals.blockNumber);
37
37
  case EnvironmentVariable.TIMESTAMP:
38
- return new Uint64(ctx.environment.globals.timestamp.toBigInt());
39
- case EnvironmentVariable.FEEPERL2GAS:
40
- return new Field(ctx.environment.globals.gasFees.feePerL2Gas);
41
- case EnvironmentVariable.FEEPERDAGAS:
42
- return new Field(ctx.environment.globals.gasFees.feePerDaGas);
38
+ return new Uint64(ctx.environment.globals.timestamp);
39
+ case EnvironmentVariable.BASEFEEPERL2GAS:
40
+ return new Uint128(ctx.environment.globals.gasFees.feePerL2Gas);
41
+ case EnvironmentVariable.BASEFEEPERDAGAS:
42
+ return new Uint128(ctx.environment.globals.gasFees.feePerDaGas);
43
43
  case EnvironmentVariable.ISSTATICCALL:
44
- return new Field(ctx.environment.isStaticCall ? 1 : 0);
44
+ return new Uint1(ctx.environment.isStaticCall ? 1 : 0);
45
45
  case EnvironmentVariable.L2GASLEFT:
46
- return new Field(ctx.machineState.l2GasLeft);
46
+ return new Uint32(ctx.machineState.l2GasLeft);
47
47
  case EnvironmentVariable.DAGASLEFT:
48
- return new Field(ctx.machineState.daGasLeft);
48
+ return new Uint32(ctx.machineState.daGasLeft);
49
49
  default:
50
50
  throw new Error(`Unknown environment variable ${e}`);
51
51
  }
@@ -61,20 +61,27 @@ export class GetEnvVar extends Instruction {
61
61
  OperandType.UINT8, // variable enum (immediate)
62
62
  ];
63
63
 
64
- constructor(private indirect: number, private dstOffset: number, private varEnum: number) {
64
+ constructor(
65
+ private indirect: number,
66
+ private dstOffset: number,
67
+ private varEnum: number,
68
+ ) {
65
69
  super();
66
70
  }
67
71
 
68
72
  public async execute(context: AvmContext): Promise<void> {
69
73
  const memory = context.machineState.memory;
70
- context.machineState.consumeGas(this.gasCost());
74
+ const addressing = Addressing.fromWire(this.indirect);
75
+
76
+ context.machineState.consumeGas(
77
+ this.baseGasCost(addressing.indirectOperandsCount(), addressing.relativeOperandsCount()),
78
+ );
71
79
 
72
80
  if (!(this.varEnum in EnvironmentVariable)) {
73
81
  throw new InstructionExecutionError(`Invalid GETENVVAR var enum ${this.varEnum}`);
74
82
  }
75
83
 
76
84
  const operands = [this.dstOffset];
77
- const addressing = Addressing.fromWire(this.indirect, operands.length);
78
85
  const [dstOffset] = addressing.resolve(operands, memory);
79
86
 
80
87
  memory.set(dstOffset, getValue(this.varEnum as EnvironmentVariable, context));
@@ -9,29 +9,38 @@ abstract class ExternalCall extends Instruction {
9
9
  // Informs (de)serialization. See Instruction.deserialize.
10
10
  static readonly wireFormat: OperandType[] = [
11
11
  OperandType.UINT8,
12
- OperandType.UINT8, // Indirect
13
- OperandType.UINT16,
14
- OperandType.UINT16,
15
- OperandType.UINT16,
16
- OperandType.UINT16,
12
+ OperandType.UINT16, // Indirect
13
+ OperandType.UINT16, // L2 gas offset
14
+ OperandType.UINT16, // DA gas offset
15
+ OperandType.UINT16, // Address offset
16
+ OperandType.UINT16, // Args offset
17
+ OperandType.UINT16, // Args size offset
17
18
  ];
18
19
 
19
20
  constructor(
20
21
  private indirect: number,
21
- private gasOffset: number,
22
+ private l2GasOffset: number,
23
+ private daGasOffset: number,
22
24
  private addrOffset: number,
23
- private argsOffset: number,
24
25
  private argsSizeOffset: number,
26
+ private argsOffset: number,
25
27
  ) {
26
28
  super();
27
29
  }
28
30
 
29
31
  public async execute(context: AvmContext) {
30
32
  const memory = context.machineState.memory;
31
- const operands = [this.gasOffset, this.addrOffset, this.argsOffset, this.argsSizeOffset];
32
- const addressing = Addressing.fromWire(this.indirect, operands.length);
33
- const [gasOffset, addrOffset, argsOffset, argsSizeOffset] = addressing.resolve(operands, memory);
34
- memory.checkTags(TypeTag.FIELD, gasOffset, gasOffset + 1);
33
+ const addressing = Addressing.fromWire(this.indirect);
34
+
35
+ context.machineState.consumeGas(
36
+ this.baseGasCost(addressing.indirectOperandsCount(), addressing.relativeOperandsCount()),
37
+ );
38
+
39
+ const operands = [this.l2GasOffset, this.daGasOffset, this.addrOffset, this.argsSizeOffset, this.argsOffset];
40
+ const [l2GasOffset, daGasOffset, addrOffset, argsSizeOffset, argsOffset] = addressing.resolve(operands, memory);
41
+
42
+ memory.checkTags(TypeTag.UINT32, l2GasOffset);
43
+ memory.checkTags(TypeTag.UINT32, daGasOffset);
35
44
  memory.checkTag(TypeTag.FIELD, addrOffset);
36
45
  memory.checkTag(TypeTag.UINT32, argsSizeOffset);
37
46
 
@@ -43,15 +52,15 @@ abstract class ExternalCall extends Instruction {
43
52
  // If we are already in a static call, we propagate the environment.
44
53
  const callType = context.environment.isStaticCall ? 'STATICCALL' : this.type;
45
54
 
46
- // First we consume the gas for this operation.
47
- context.machineState.consumeGas(this.gasCost(calldataSize));
48
- // Then we consume the gas allocated for the nested call. The excess will be refunded later.
55
+ // We consume the gas allocated for the nested call. The excess will be refunded later.
49
56
  // Gas allocation is capped by the amount of gas left in the current context.
50
57
  // We have to do some dancing here because the gas allocation is a field,
51
58
  // but in the machine state we track gas as a number.
52
- const allocatedL2Gas = Number(BigIntMin(memory.get(gasOffset).toBigInt(), BigInt(context.machineState.l2GasLeft)));
59
+ const allocatedL2Gas = Number(
60
+ BigIntMin(memory.get(l2GasOffset).toBigInt(), BigInt(context.machineState.l2GasLeft)),
61
+ );
53
62
  const allocatedDaGas = Number(
54
- BigIntMin(memory.get(gasOffset + 1).toBigInt(), BigInt(context.machineState.daGasLeft)),
63
+ BigIntMin(memory.get(daGasOffset).toBigInt(), BigInt(context.machineState.daGasLeft)),
55
64
  );
56
65
  const allocatedGas = { l2Gas: allocatedL2Gas, daGas: allocatedDaGas };
57
66
  context.machineState.consumeGas(allocatedGas);
@@ -70,6 +79,9 @@ abstract class ExternalCall extends Instruction {
70
79
  // Track the success status directly
71
80
  context.machineState.nestedCallSuccess = success;
72
81
 
82
+ // Account for all instructions executed in the nested call
83
+ context.machineState.instrCounter += nestedCallResults.totalInstructions;
84
+
73
85
  // If the nested call reverted, we try to save the reason and the revert data.
74
86
  // This will be used by the caller to try to reconstruct the call stack.
75
87
  // This is only a heuristic and may not always work. It is intended to work
@@ -124,15 +136,22 @@ export class SuccessCopy extends Instruction {
124
136
  OperandType.UINT16, // dstOffset (16-bit)
125
137
  ];
126
138
 
127
- constructor(private indirect: number, private dstOffset: number) {
139
+ constructor(
140
+ private indirect: number,
141
+ private dstOffset: number,
142
+ ) {
128
143
  super();
129
144
  }
130
145
 
131
146
  public async execute(context: AvmContext): Promise<void> {
132
147
  const memory = context.machineState.memory;
148
+ const addressing = Addressing.fromWire(this.indirect);
149
+
150
+ context.machineState.consumeGas(
151
+ this.baseGasCost(addressing.indirectOperandsCount(), addressing.relativeOperandsCount()),
152
+ );
133
153
 
134
154
  const operands = [this.dstOffset];
135
- const addressing = Addressing.fromWire(this.indirect, operands.length);
136
155
  const [dstOffset] = addressing.resolve(operands, memory);
137
156
 
138
157
  // Use the direct success tracking property
@@ -154,20 +173,27 @@ export class Return extends Instruction {
154
173
  OperandType.UINT16,
155
174
  ];
156
175
 
157
- constructor(private indirect: number, private returnOffset: number, private returnSizeOffset: number) {
176
+ constructor(
177
+ private indirect: number,
178
+ private returnSizeOffset: number,
179
+ private returnOffset: number,
180
+ ) {
158
181
  super();
159
182
  }
160
183
 
161
184
  public async execute(context: AvmContext): Promise<void> {
162
185
  const memory = context.machineState.memory;
186
+ const addressing = Addressing.fromWire(this.indirect);
163
187
 
164
- const operands = [this.returnOffset, this.returnSizeOffset];
165
- const addressing = Addressing.fromWire(this.indirect, operands.length);
166
- const [returnOffset, returnSizeOffset] = addressing.resolve(operands, memory);
188
+ context.machineState.consumeGas(
189
+ this.baseGasCost(addressing.indirectOperandsCount(), addressing.relativeOperandsCount()),
190
+ );
191
+
192
+ const operands = [this.returnSizeOffset, this.returnOffset];
193
+ const [returnSizeOffset, returnOffset] = addressing.resolve(operands, memory);
167
194
 
168
195
  memory.checkTag(TypeTag.UINT32, returnSizeOffset);
169
196
  const returnSize = memory.get(returnSizeOffset).toNumber();
170
- context.machineState.consumeGas(this.gasCost(returnSize));
171
197
 
172
198
  const output = memory.getSlice(returnOffset, returnSize).map(word => word.toFr());
173
199
 
@@ -196,20 +222,27 @@ export class Revert extends Instruction {
196
222
  OperandType.UINT16,
197
223
  ];
198
224
 
199
- constructor(private indirect: number, private returnOffset: number, private retSizeOffset: number) {
225
+ constructor(
226
+ private indirect: number,
227
+ private retSizeOffset: number,
228
+ private returnOffset: number,
229
+ ) {
200
230
  super();
201
231
  }
202
232
 
203
233
  public async execute(context: AvmContext): Promise<void> {
204
234
  const memory = context.machineState.memory;
235
+ const addressing = Addressing.fromWire(this.indirect);
236
+
237
+ context.machineState.consumeGas(
238
+ this.baseGasCost(addressing.indirectOperandsCount(), addressing.relativeOperandsCount()),
239
+ );
205
240
 
206
- const operands = [this.returnOffset, this.retSizeOffset];
207
- const addressing = Addressing.fromWire(this.indirect, operands.length);
208
- const [returnOffset, retSizeOffset] = addressing.resolve(operands, memory);
241
+ const operands = [this.retSizeOffset, this.returnOffset];
242
+ const [retSizeOffset, returnOffset] = addressing.resolve(operands, memory);
209
243
 
210
244
  memory.checkTag(TypeTag.UINT32, retSizeOffset);
211
245
  const retSize = memory.get(retSizeOffset).toNumber();
212
- context.machineState.consumeGas(this.gasCost(retSize));
213
246
  const output = memory.getSlice(returnOffset, retSize).map(word => word.toFr());
214
247
 
215
248
  context.machineState.revert(output);
@@ -19,16 +19,24 @@ export class Poseidon2 extends Instruction {
19
19
  OperandType.UINT16,
20
20
  ];
21
21
 
22
- constructor(private indirect: number, private inputStateOffset: number, private outputStateOffset: number) {
22
+ constructor(
23
+ private indirect: number,
24
+ private inputStateOffset: number,
25
+ private outputStateOffset: number,
26
+ ) {
23
27
  super();
24
28
  }
25
29
 
26
30
  public async execute(context: AvmContext): Promise<void> {
27
31
  const memory = context.machineState.memory;
28
- context.machineState.consumeGas(this.gasCost());
32
+ const addressing = Addressing.fromWire(this.indirect);
33
+
34
+ context.machineState.consumeGas(
35
+ this.baseGasCost(addressing.indirectOperandsCount(), addressing.relativeOperandsCount()),
36
+ );
29
37
 
30
38
  const operands = [this.inputStateOffset, this.outputStateOffset];
31
- const addressing = Addressing.fromWire(this.indirect, operands.length);
39
+
32
40
  const [inputOffset, outputOffset] = addressing.resolve(operands, memory);
33
41
 
34
42
  const inputState = memory.getSlice(inputOffset, Poseidon2.stateSize);
@@ -54,7 +62,11 @@ export class KeccakF1600 extends Instruction {
54
62
  OperandType.UINT16,
55
63
  ];
56
64
 
57
- constructor(private indirect: number, private dstOffset: number, private inputOffset: number) {
65
+ constructor(
66
+ private indirect: number,
67
+ private dstOffset: number,
68
+ private inputOffset: number,
69
+ ) {
58
70
  super();
59
71
  }
60
72
 
@@ -62,10 +74,14 @@ export class KeccakF1600 extends Instruction {
62
74
  public async execute(context: AvmContext): Promise<void> {
63
75
  const inputSize = 25;
64
76
  const memory = context.machineState.memory;
77
+ const addressing = Addressing.fromWire(this.indirect);
78
+
79
+ context.machineState.consumeGas(
80
+ this.baseGasCost(addressing.indirectOperandsCount(), addressing.relativeOperandsCount()),
81
+ );
82
+
65
83
  const operands = [this.dstOffset, this.inputOffset];
66
- const addressing = Addressing.fromWire(this.indirect, operands.length);
67
84
  const [dstOffset, inputOffset] = addressing.resolve(operands, memory);
68
- context.machineState.consumeGas(this.gasCost());
69
85
 
70
86
  const stateData = memory.getSlice(inputOffset, inputSize).map(word => word.toBigInt());
71
87
  memory.checkTagsRange(TypeTag.UINT64, inputOffset, inputSize);
@@ -104,12 +120,16 @@ export class Sha256Compression extends Instruction {
104
120
  const INPUTS_SIZE = 16;
105
121
 
106
122
  const memory = context.machineState.memory;
123
+ const addressing = Addressing.fromWire(this.indirect);
124
+
125
+ context.machineState.consumeGas(
126
+ this.baseGasCost(addressing.indirectOperandsCount(), addressing.relativeOperandsCount()),
127
+ );
128
+
107
129
  const operands = [this.outputOffset, this.stateOffset, this.inputsOffset];
108
- const addressing = Addressing.fromWire(this.indirect, operands.length);
109
130
  const [outputOffset, stateOffset, inputsOffset] = addressing.resolve(operands, memory);
110
131
 
111
132
  // Note: size of output is same as size of state
112
- context.machineState.consumeGas(this.gasCost());
113
133
  const inputs = Uint32Array.from(memory.getSlice(inputsOffset, INPUTS_SIZE).map(word => word.toNumber()));
114
134
  const state = Uint32Array.from(memory.getSlice(stateOffset, STATE_SIZE).map(word => word.toNumber()));
115
135