@aztec/simulator 0.0.1-commit.d3ec352c → 0.0.1-commit.e61ad554

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 (281) hide show
  1. package/README.md +2 -0
  2. package/dest/common/errors.d.ts +8 -2
  3. package/dest/common/errors.d.ts.map +1 -1
  4. package/dest/private/acvm/deserialize.d.ts +2 -2
  5. package/dest/private/acvm/deserialize.d.ts.map +1 -1
  6. package/dest/private/acvm/deserialize.js +1 -1
  7. package/dest/private/acvm/serialize.d.ts +2 -2
  8. package/dest/private/acvm/serialize.d.ts.map +1 -1
  9. package/dest/private/acvm/serialize.js +1 -1
  10. package/dest/private/circuit_recording/circuit_recorder.d.ts +1 -1
  11. package/dest/private/circuit_recording/circuit_recorder.d.ts.map +1 -1
  12. package/dest/private/circuit_recording/circuit_recorder.js +16 -15
  13. package/dest/public/avm/avm_context.d.ts +3 -3
  14. package/dest/public/avm/avm_context.d.ts.map +1 -1
  15. package/dest/public/avm/avm_contract_call_result.d.ts +6 -6
  16. package/dest/public/avm/avm_contract_call_result.d.ts.map +1 -1
  17. package/dest/public/avm/avm_contract_call_result.js +3 -3
  18. package/dest/public/avm/avm_execution_environment.d.ts +7 -6
  19. package/dest/public/avm/avm_execution_environment.d.ts.map +1 -1
  20. package/dest/public/avm/avm_execution_environment.js +1 -1
  21. package/dest/public/avm/avm_gas.d.ts +1 -1
  22. package/dest/public/avm/avm_gas.d.ts.map +1 -1
  23. package/dest/public/avm/avm_machine_state.d.ts +7 -6
  24. package/dest/public/avm/avm_machine_state.d.ts.map +1 -1
  25. package/dest/public/avm/avm_machine_state.js +3 -2
  26. package/dest/public/avm/avm_memory_types.d.ts +2 -2
  27. package/dest/public/avm/avm_memory_types.d.ts.map +1 -1
  28. package/dest/public/avm/avm_memory_types.js +4 -1
  29. package/dest/public/avm/avm_simulator.d.ts +4 -3
  30. package/dest/public/avm/avm_simulator.d.ts.map +1 -1
  31. package/dest/public/avm/avm_simulator.js +6 -5
  32. package/dest/public/avm/calldata.d.ts +51 -0
  33. package/dest/public/avm/calldata.d.ts.map +1 -0
  34. package/dest/public/avm/calldata.js +63 -0
  35. package/dest/public/avm/errors.d.ts +2 -2
  36. package/dest/public/avm/errors.d.ts.map +1 -1
  37. package/dest/public/avm/fixtures/avm_simulation_tester.d.ts +1 -1
  38. package/dest/public/avm/fixtures/avm_simulation_tester.d.ts.map +1 -1
  39. package/dest/public/avm/fixtures/avm_simulation_tester.js +4 -3
  40. package/dest/public/avm/fixtures/base_avm_simulation_tester.d.ts +2 -2
  41. package/dest/public/avm/fixtures/base_avm_simulation_tester.d.ts.map +1 -1
  42. package/dest/public/avm/fixtures/base_avm_simulation_tester.js +1 -1
  43. package/dest/public/avm/fixtures/initializers.d.ts +2 -2
  44. package/dest/public/avm/fixtures/initializers.d.ts.map +1 -1
  45. package/dest/public/avm/fixtures/initializers.js +3 -2
  46. package/dest/public/avm/fixtures/utils.d.ts +2 -2
  47. package/dest/public/avm/fixtures/utils.d.ts.map +1 -1
  48. package/dest/public/avm/fixtures/utils.js +1 -1
  49. package/dest/public/avm/opcodes/accrued_substate.d.ts +15 -15
  50. package/dest/public/avm/opcodes/accrued_substate.d.ts.map +1 -1
  51. package/dest/public/avm/opcodes/accrued_substate.js +33 -29
  52. package/dest/public/avm/opcodes/arithmetic.d.ts +10 -8
  53. package/dest/public/avm/opcodes/arithmetic.d.ts.map +1 -1
  54. package/dest/public/avm/opcodes/arithmetic.js +12 -2
  55. package/dest/public/avm/opcodes/bitwise.d.ts +7 -7
  56. package/dest/public/avm/opcodes/bitwise.d.ts.map +1 -1
  57. package/dest/public/avm/opcodes/bitwise.js +5 -5
  58. package/dest/public/avm/opcodes/comparators.d.ts +4 -4
  59. package/dest/public/avm/opcodes/comparators.d.ts.map +1 -1
  60. package/dest/public/avm/opcodes/comparators.js +1 -1
  61. package/dest/public/avm/opcodes/contract.d.ts +3 -3
  62. package/dest/public/avm/opcodes/contract.d.ts.map +1 -1
  63. package/dest/public/avm/opcodes/contract.js +8 -8
  64. package/dest/public/avm/opcodes/control_flow.d.ts +3 -3
  65. package/dest/public/avm/opcodes/control_flow.d.ts.map +1 -1
  66. package/dest/public/avm/opcodes/control_flow.js +4 -4
  67. package/dest/public/avm/opcodes/conversion.d.ts +3 -3
  68. package/dest/public/avm/opcodes/conversion.d.ts.map +1 -1
  69. package/dest/public/avm/opcodes/conversion.js +4 -4
  70. package/dest/public/avm/opcodes/ec_add.d.ts +4 -4
  71. package/dest/public/avm/opcodes/ec_add.d.ts.map +1 -1
  72. package/dest/public/avm/opcodes/ec_add.js +17 -8
  73. package/dest/public/avm/opcodes/environment_getters.d.ts +5 -5
  74. package/dest/public/avm/opcodes/environment_getters.d.ts.map +1 -1
  75. package/dest/public/avm/opcodes/environment_getters.js +6 -6
  76. package/dest/public/avm/opcodes/external_calls.d.ts +9 -9
  77. package/dest/public/avm/opcodes/external_calls.d.ts.map +1 -1
  78. package/dest/public/avm/opcodes/external_calls.js +23 -22
  79. package/dest/public/avm/opcodes/hashing.d.ts +8 -8
  80. package/dest/public/avm/opcodes/hashing.d.ts.map +1 -1
  81. package/dest/public/avm/opcodes/hashing.js +21 -16
  82. package/dest/public/avm/opcodes/instruction_impl.d.ts +4 -4
  83. package/dest/public/avm/opcodes/instruction_impl.d.ts.map +1 -1
  84. package/dest/public/avm/opcodes/instruction_impl.js +4 -4
  85. package/dest/public/avm/opcodes/memory.d.ts +14 -14
  86. package/dest/public/avm/opcodes/memory.d.ts.map +1 -1
  87. package/dest/public/avm/opcodes/memory.js +26 -26
  88. package/dest/public/avm/opcodes/misc.d.ts +3 -3
  89. package/dest/public/avm/opcodes/misc.d.ts.map +1 -1
  90. package/dest/public/avm/opcodes/misc.js +4 -4
  91. package/dest/public/avm/opcodes/storage.d.ts +16 -15
  92. package/dest/public/avm/opcodes/storage.d.ts.map +1 -1
  93. package/dest/public/avm/opcodes/storage.js +34 -24
  94. package/dest/public/avm/revert_reason.d.ts +2 -2
  95. package/dest/public/avm/revert_reason.d.ts.map +1 -1
  96. package/dest/public/avm/serialization/instruction_serialization.js +1 -1
  97. package/dest/public/avm/test_utils.d.ts +2 -2
  98. package/dest/public/avm/test_utils.d.ts.map +1 -1
  99. package/dest/public/avm/test_utils.js +1 -1
  100. package/dest/public/contracts_db_checkpoint.d.ts +2 -2
  101. package/dest/public/contracts_db_checkpoint.d.ts.map +1 -1
  102. package/dest/public/db_interfaces.d.ts +2 -2
  103. package/dest/public/db_interfaces.d.ts.map +1 -1
  104. package/dest/public/debug_fn_name.d.ts +4 -4
  105. package/dest/public/debug_fn_name.d.ts.map +1 -1
  106. package/dest/public/debug_fn_name.js +14 -5
  107. package/dest/public/executor_metrics.d.ts +1 -1
  108. package/dest/public/executor_metrics.d.ts.map +1 -1
  109. package/dest/public/executor_metrics.js +8 -34
  110. package/dest/public/fixtures/amm_test.js +2 -2
  111. package/dest/public/fixtures/bulk_test.d.ts +3 -3
  112. package/dest/public/fixtures/bulk_test.d.ts.map +1 -1
  113. package/dest/public/fixtures/bulk_test.js +5 -69
  114. package/dest/public/fixtures/custom_bytecode_tester.d.ts +28 -6
  115. package/dest/public/fixtures/custom_bytecode_tester.d.ts.map +1 -1
  116. package/dest/public/fixtures/custom_bytecode_tester.js +36 -12
  117. package/dest/public/fixtures/custom_bytecode_tests.d.ts +11 -8
  118. package/dest/public/fixtures/custom_bytecode_tests.d.ts.map +1 -1
  119. package/dest/public/fixtures/custom_bytecode_tests.js +83 -18
  120. package/dest/public/fixtures/index.d.ts +4 -2
  121. package/dest/public/fixtures/index.d.ts.map +1 -1
  122. package/dest/public/fixtures/index.js +3 -1
  123. package/dest/public/fixtures/minimal_public_tx.d.ts +2 -7
  124. package/dest/public/fixtures/minimal_public_tx.d.ts.map +1 -1
  125. package/dest/public/fixtures/minimal_public_tx.js +4 -14
  126. package/dest/public/fixtures/opcode_spammer.d.ts +123 -0
  127. package/dest/public/fixtures/opcode_spammer.d.ts.map +1 -0
  128. package/dest/public/fixtures/opcode_spammer.js +1693 -0
  129. package/dest/public/fixtures/public_tx_simulation_tester.d.ts +15 -2
  130. package/dest/public/fixtures/public_tx_simulation_tester.d.ts.map +1 -1
  131. package/dest/public/fixtures/public_tx_simulation_tester.js +36 -8
  132. package/dest/public/fixtures/simple_contract_data_source.d.ts +2 -2
  133. package/dest/public/fixtures/simple_contract_data_source.d.ts.map +1 -1
  134. package/dest/public/fixtures/token_test.js +1 -1
  135. package/dest/public/fixtures/utils.d.ts +2 -2
  136. package/dest/public/fixtures/utils.d.ts.map +1 -1
  137. package/dest/public/fixtures/utils.js +4 -3
  138. package/dest/public/fuzzing/avm_fuzzer_simulator.d.ts +60 -0
  139. package/dest/public/fuzzing/avm_fuzzer_simulator.d.ts.map +1 -0
  140. package/dest/public/fuzzing/avm_fuzzer_simulator.js +171 -0
  141. package/dest/public/fuzzing/avm_simulator_bin.d.ts +2 -0
  142. package/dest/public/fuzzing/avm_simulator_bin.d.ts.map +1 -0
  143. package/dest/public/fuzzing/avm_simulator_bin.js +118 -0
  144. package/dest/public/hinting_db_sources.d.ts +3 -2
  145. package/dest/public/hinting_db_sources.d.ts.map +1 -1
  146. package/dest/public/hinting_db_sources.js +7 -2
  147. package/dest/public/index.d.ts +2 -2
  148. package/dest/public/index.d.ts.map +1 -1
  149. package/dest/public/index.js +1 -1
  150. package/dest/public/public_db_sources.d.ts +2 -2
  151. package/dest/public/public_db_sources.d.ts.map +1 -1
  152. package/dest/public/public_db_sources.js +1 -1
  153. package/dest/public/public_processor/guarded_merkle_tree.d.ts +2 -1
  154. package/dest/public/public_processor/guarded_merkle_tree.d.ts.map +1 -1
  155. package/dest/public/public_processor/guarded_merkle_tree.js +5 -0
  156. package/dest/public/public_processor/public_processor.d.ts +3 -3
  157. package/dest/public/public_processor/public_processor.d.ts.map +1 -1
  158. package/dest/public/public_processor/public_processor.js +425 -32
  159. package/dest/public/public_processor/public_processor_metrics.d.ts +1 -1
  160. package/dest/public/public_processor/public_processor_metrics.d.ts.map +1 -1
  161. package/dest/public/public_processor/public_processor_metrics.js +12 -45
  162. package/dest/public/public_tx_simulator/contract_provider_for_cpp.d.ts +1 -13
  163. package/dest/public/public_tx_simulator/contract_provider_for_cpp.d.ts.map +1 -1
  164. package/dest/public/public_tx_simulator/contract_provider_for_cpp.js +18 -53
  165. package/dest/public/public_tx_simulator/cpp_public_tx_simulator.d.ts +16 -1
  166. package/dest/public/public_tx_simulator/cpp_public_tx_simulator.d.ts.map +1 -1
  167. package/dest/public/public_tx_simulator/cpp_public_tx_simulator.js +42 -3
  168. package/dest/public/public_tx_simulator/cpp_vs_ts_public_tx_simulator.d.ts +1 -1
  169. package/dest/public/public_tx_simulator/cpp_vs_ts_public_tx_simulator.d.ts.map +1 -1
  170. package/dest/public/public_tx_simulator/cpp_vs_ts_public_tx_simulator.js +7 -6
  171. package/dest/public/public_tx_simulator/dumping_cpp_public_tx_simulator.d.ts +22 -0
  172. package/dest/public/public_tx_simulator/dumping_cpp_public_tx_simulator.d.ts.map +1 -0
  173. package/dest/public/public_tx_simulator/dumping_cpp_public_tx_simulator.js +52 -0
  174. package/dest/public/public_tx_simulator/factories.d.ts +13 -0
  175. package/dest/public/public_tx_simulator/factories.d.ts.map +1 -0
  176. package/dest/public/public_tx_simulator/factories.js +28 -0
  177. package/dest/public/public_tx_simulator/index.d.ts +3 -1
  178. package/dest/public/public_tx_simulator/index.d.ts.map +1 -1
  179. package/dest/public/public_tx_simulator/index.js +2 -0
  180. package/dest/public/public_tx_simulator/measured_public_tx_simulator.d.ts +3 -3
  181. package/dest/public/public_tx_simulator/measured_public_tx_simulator.d.ts.map +1 -1
  182. package/dest/public/public_tx_simulator/public_tx_context.d.ts +2 -2
  183. package/dest/public/public_tx_simulator/public_tx_context.d.ts.map +1 -1
  184. package/dest/public/public_tx_simulator/public_tx_context.js +1 -1
  185. package/dest/public/public_tx_simulator/public_tx_simulator.d.ts +5 -4
  186. package/dest/public/public_tx_simulator/public_tx_simulator.d.ts.map +1 -1
  187. package/dest/public/public_tx_simulator/public_tx_simulator.js +14 -9
  188. package/dest/public/public_tx_simulator/public_tx_simulator_interface.d.ts +24 -1
  189. package/dest/public/public_tx_simulator/public_tx_simulator_interface.d.ts.map +1 -1
  190. package/dest/public/public_tx_simulator/telemetry_public_tx_simulator.d.ts +2 -2
  191. package/dest/public/public_tx_simulator/telemetry_public_tx_simulator.d.ts.map +1 -1
  192. package/dest/public/public_tx_simulator/telemetry_public_tx_simulator.js +395 -19
  193. package/dest/public/side_effect_trace.d.ts +3 -2
  194. package/dest/public/side_effect_trace.d.ts.map +1 -1
  195. package/dest/public/side_effect_trace.js +1 -1
  196. package/dest/public/side_effect_trace_interface.d.ts +2 -2
  197. package/dest/public/side_effect_trace_interface.d.ts.map +1 -1
  198. package/dest/public/state_manager/nullifiers.d.ts +2 -2
  199. package/dest/public/state_manager/nullifiers.d.ts.map +1 -1
  200. package/dest/public/state_manager/public_storage.d.ts +2 -2
  201. package/dest/public/state_manager/public_storage.d.ts.map +1 -1
  202. package/dest/public/state_manager/public_storage.js +1 -1
  203. package/dest/public/state_manager/state_manager.d.ts +2 -2
  204. package/dest/public/state_manager/state_manager.d.ts.map +1 -1
  205. package/dest/public/state_manager/state_manager.js +3 -3
  206. package/package.json +18 -18
  207. package/src/common/errors.ts +1 -1
  208. package/src/private/acvm/deserialize.ts +1 -1
  209. package/src/private/acvm/serialize.ts +1 -1
  210. package/src/private/circuit_recording/circuit_recorder.ts +17 -16
  211. package/src/public/avm/avm_context.ts +2 -2
  212. package/src/public/avm/avm_contract_call_result.ts +8 -6
  213. package/src/public/avm/avm_execution_environment.ts +10 -5
  214. package/src/public/avm/avm_gas.ts +3 -3
  215. package/src/public/avm/avm_machine_state.ts +7 -6
  216. package/src/public/avm/avm_memory_types.ts +5 -1
  217. package/src/public/avm/avm_simulator.ts +9 -6
  218. package/src/public/avm/calldata.ts +100 -0
  219. package/src/public/avm/errors.ts +1 -1
  220. package/src/public/avm/fixtures/avm_simulation_tester.ts +9 -3
  221. package/src/public/avm/fixtures/base_avm_simulation_tester.ts +1 -1
  222. package/src/public/avm/fixtures/initializers.ts +3 -2
  223. package/src/public/avm/fixtures/utils.ts +1 -1
  224. package/src/public/avm/opcodes/accrued_substate.ts +21 -15
  225. package/src/public/avm/opcodes/arithmetic.ts +14 -2
  226. package/src/public/avm/opcodes/bitwise.ts +3 -3
  227. package/src/public/avm/opcodes/comparators.ts +1 -1
  228. package/src/public/avm/opcodes/contract.ts +4 -7
  229. package/src/public/avm/opcodes/control_flow.ts +2 -2
  230. package/src/public/avm/opcodes/conversion.ts +3 -3
  231. package/src/public/avm/opcodes/ec_add.ts +15 -6
  232. package/src/public/avm/opcodes/environment_getters.ts +7 -7
  233. package/src/public/avm/opcodes/external_calls.ts +17 -15
  234. package/src/public/avm/opcodes/hashing.ts +16 -10
  235. package/src/public/avm/opcodes/instruction_impl.ts +2 -2
  236. package/src/public/avm/opcodes/memory.ts +20 -20
  237. package/src/public/avm/opcodes/misc.ts +2 -2
  238. package/src/public/avm/opcodes/storage.ts +30 -22
  239. package/src/public/avm/revert_reason.ts +1 -1
  240. package/src/public/avm/serialization/instruction_serialization.ts +1 -1
  241. package/src/public/avm/test_utils.ts +1 -1
  242. package/src/public/contracts_db_checkpoint.ts +1 -1
  243. package/src/public/db_interfaces.ts +1 -1
  244. package/src/public/debug_fn_name.ts +17 -8
  245. package/src/public/executor_metrics.ts +7 -34
  246. package/src/public/fixtures/amm_test.ts +2 -2
  247. package/src/public/fixtures/bulk_test.ts +9 -9
  248. package/src/public/fixtures/custom_bytecode_tester.ts +53 -19
  249. package/src/public/fixtures/custom_bytecode_tests.ts +111 -18
  250. package/src/public/fixtures/index.ts +7 -1
  251. package/src/public/fixtures/minimal_public_tx.ts +6 -15
  252. package/src/public/fixtures/opcode_spammer.ts +1754 -0
  253. package/src/public/fixtures/public_tx_simulation_tester.ts +40 -6
  254. package/src/public/fixtures/simple_contract_data_source.ts +1 -1
  255. package/src/public/fixtures/token_test.ts +1 -1
  256. package/src/public/fixtures/utils.ts +2 -3
  257. package/src/public/fuzzing/avm_fuzzer_simulator.ts +288 -0
  258. package/src/public/fuzzing/avm_simulator_bin.ts +175 -0
  259. package/src/public/hinting_db_sources.ts +6 -2
  260. package/src/public/index.ts +2 -0
  261. package/src/public/public_db_sources.ts +1 -1
  262. package/src/public/public_processor/guarded_merkle_tree.ts +4 -0
  263. package/src/public/public_processor/public_processor.ts +31 -14
  264. package/src/public/public_processor/public_processor_metrics.ts +11 -45
  265. package/src/public/public_tx_simulator/contract_provider_for_cpp.ts +19 -60
  266. package/src/public/public_tx_simulator/cpp_public_tx_simulator.ts +56 -3
  267. package/src/public/public_tx_simulator/cpp_public_tx_simulator_with_hinted_dbs.ts +1 -1
  268. package/src/public/public_tx_simulator/cpp_vs_ts_public_tx_simulator.ts +7 -10
  269. package/src/public/public_tx_simulator/dumping_cpp_public_tx_simulator.ts +81 -0
  270. package/src/public/public_tx_simulator/factories.ts +41 -0
  271. package/src/public/public_tx_simulator/index.ts +2 -0
  272. package/src/public/public_tx_simulator/measured_public_tx_simulator.ts +1 -1
  273. package/src/public/public_tx_simulator/public_tx_context.ts +1 -1
  274. package/src/public/public_tx_simulator/public_tx_simulator.ts +26 -8
  275. package/src/public/public_tx_simulator/public_tx_simulator_interface.ts +23 -0
  276. package/src/public/public_tx_simulator/telemetry_public_tx_simulator.ts +1 -1
  277. package/src/public/side_effect_trace.ts +1 -1
  278. package/src/public/side_effect_trace_interface.ts +1 -1
  279. package/src/public/state_manager/nullifiers.ts +1 -1
  280. package/src/public/state_manager/public_storage.ts +1 -1
  281. package/src/public/state_manager/state_manager.ts +4 -18
@@ -1,3 +1,4 @@
1
+ import { MAX_ETH_ADDRESS_VALUE } from '@aztec/constants';
1
2
  import { NullifierCollisionError } from '../../side_effect_errors.js';
2
3
  import { TypeTag, Uint1 } from '../avm_memory_types.js';
3
4
  import { InstructionExecutionError, StaticCallAlterationError } from '../errors.js';
@@ -5,7 +6,7 @@ import { Opcode, OperandType } from '../serialization/instruction_serialization.
5
6
  import { Addressing } from './addressing_mode.js';
6
7
  import { Instruction } from './instruction.js';
7
8
  export class NoteHashExists extends Instruction {
8
- indirect;
9
+ addressingMode;
9
10
  noteHashOffset;
10
11
  leafIndexOffset;
11
12
  existsOffset;
@@ -19,12 +20,12 @@ export class NoteHashExists extends Instruction {
19
20
  OperandType.UINT16,
20
21
  OperandType.UINT16
21
22
  ];
22
- constructor(indirect, noteHashOffset, leafIndexOffset, existsOffset){
23
- super(), this.indirect = indirect, this.noteHashOffset = noteHashOffset, this.leafIndexOffset = leafIndexOffset, this.existsOffset = existsOffset;
23
+ constructor(addressingMode, noteHashOffset, leafIndexOffset, existsOffset){
24
+ super(), this.addressingMode = addressingMode, this.noteHashOffset = noteHashOffset, this.leafIndexOffset = leafIndexOffset, this.existsOffset = existsOffset;
24
25
  }
25
26
  async execute(context) {
26
27
  const memory = context.machineState.memory;
27
- const addressing = Addressing.fromWire(this.indirect);
28
+ const addressing = Addressing.fromWire(this.addressingMode);
28
29
  context.machineState.consumeGas(this.baseGasCost(addressing.indirectOperandsCount(), addressing.relativeOperandsCount()));
29
30
  const operands = [
30
31
  this.noteHashOffset,
@@ -42,7 +43,7 @@ export class NoteHashExists extends Instruction {
42
43
  }
43
44
  }
44
45
  export class EmitNoteHash extends Instruction {
45
- indirect;
46
+ addressingMode;
46
47
  noteHashOffset;
47
48
  static type = 'EMITNOTEHASH';
48
49
  static opcode = Opcode.EMITNOTEHASH;
@@ -52,12 +53,12 @@ export class EmitNoteHash extends Instruction {
52
53
  OperandType.UINT8,
53
54
  OperandType.UINT16
54
55
  ];
55
- constructor(indirect, noteHashOffset){
56
- super(), this.indirect = indirect, this.noteHashOffset = noteHashOffset;
56
+ constructor(addressingMode, noteHashOffset){
57
+ super(), this.addressingMode = addressingMode, this.noteHashOffset = noteHashOffset;
57
58
  }
58
59
  async execute(context) {
59
60
  const memory = context.machineState.memory;
60
- const addressing = Addressing.fromWire(this.indirect);
61
+ const addressing = Addressing.fromWire(this.addressingMode);
61
62
  context.machineState.consumeGas(this.baseGasCost(addressing.indirectOperandsCount(), addressing.relativeOperandsCount()));
62
63
  const operands = [
63
64
  this.noteHashOffset
@@ -72,7 +73,7 @@ export class EmitNoteHash extends Instruction {
72
73
  }
73
74
  }
74
75
  export class NullifierExists extends Instruction {
75
- indirect;
76
+ addressingMode;
76
77
  nullifierOffset;
77
78
  addressOffset;
78
79
  existsOffset;
@@ -86,12 +87,12 @@ export class NullifierExists extends Instruction {
86
87
  OperandType.UINT16,
87
88
  OperandType.UINT16
88
89
  ];
89
- constructor(indirect, nullifierOffset, addressOffset, existsOffset){
90
- super(), this.indirect = indirect, this.nullifierOffset = nullifierOffset, this.addressOffset = addressOffset, this.existsOffset = existsOffset;
90
+ constructor(addressingMode, nullifierOffset, addressOffset, existsOffset){
91
+ super(), this.addressingMode = addressingMode, this.nullifierOffset = nullifierOffset, this.addressOffset = addressOffset, this.existsOffset = existsOffset;
91
92
  }
92
93
  async execute(context) {
93
94
  const memory = context.machineState.memory;
94
- const addressing = Addressing.fromWire(this.indirect);
95
+ const addressing = Addressing.fromWire(this.addressingMode);
95
96
  context.machineState.consumeGas(this.baseGasCost(addressing.indirectOperandsCount(), addressing.relativeOperandsCount()));
96
97
  const operands = [
97
98
  this.nullifierOffset,
@@ -107,7 +108,7 @@ export class NullifierExists extends Instruction {
107
108
  }
108
109
  }
109
110
  export class EmitNullifier extends Instruction {
110
- indirect;
111
+ addressingMode;
111
112
  nullifierOffset;
112
113
  static type = 'EMITNULLIFIER';
113
114
  static opcode = Opcode.EMITNULLIFIER;
@@ -117,15 +118,15 @@ export class EmitNullifier extends Instruction {
117
118
  OperandType.UINT8,
118
119
  OperandType.UINT16
119
120
  ];
120
- constructor(indirect, nullifierOffset){
121
- super(), this.indirect = indirect, this.nullifierOffset = nullifierOffset;
121
+ constructor(addressingMode, nullifierOffset){
122
+ super(), this.addressingMode = addressingMode, this.nullifierOffset = nullifierOffset;
122
123
  }
123
124
  async execute(context) {
124
125
  if (context.environment.isStaticCall) {
125
126
  throw new StaticCallAlterationError();
126
127
  }
127
128
  const memory = context.machineState.memory;
128
- const addressing = Addressing.fromWire(this.indirect);
129
+ const addressing = Addressing.fromWire(this.addressingMode);
129
130
  context.machineState.consumeGas(this.baseGasCost(addressing.indirectOperandsCount(), addressing.relativeOperandsCount()));
130
131
  const operands = [
131
132
  this.nullifierOffset
@@ -146,7 +147,7 @@ export class EmitNullifier extends Instruction {
146
147
  }
147
148
  }
148
149
  export class L1ToL2MessageExists extends Instruction {
149
- indirect;
150
+ addressingMode;
150
151
  msgHashOffset;
151
152
  msgLeafIndexOffset;
152
153
  existsOffset;
@@ -160,12 +161,12 @@ export class L1ToL2MessageExists extends Instruction {
160
161
  OperandType.UINT16,
161
162
  OperandType.UINT16
162
163
  ];
163
- constructor(indirect, msgHashOffset, msgLeafIndexOffset, existsOffset){
164
- super(), this.indirect = indirect, this.msgHashOffset = msgHashOffset, this.msgLeafIndexOffset = msgLeafIndexOffset, this.existsOffset = existsOffset;
164
+ constructor(addressingMode, msgHashOffset, msgLeafIndexOffset, existsOffset){
165
+ super(), this.addressingMode = addressingMode, this.msgHashOffset = msgHashOffset, this.msgLeafIndexOffset = msgLeafIndexOffset, this.existsOffset = existsOffset;
165
166
  }
166
167
  async execute(context) {
167
168
  const memory = context.machineState.memory;
168
- const addressing = Addressing.fromWire(this.indirect);
169
+ const addressing = Addressing.fromWire(this.addressingMode);
169
170
  context.machineState.consumeGas(this.baseGasCost(addressing.indirectOperandsCount(), addressing.relativeOperandsCount()));
170
171
  const operands = [
171
172
  this.msgHashOffset,
@@ -182,7 +183,7 @@ export class L1ToL2MessageExists extends Instruction {
182
183
  }
183
184
  }
184
185
  export class EmitUnencryptedLog extends Instruction {
185
- indirect;
186
+ addressingMode;
186
187
  logSizeOffset;
187
188
  logOffset;
188
189
  // TODO(#11124): rename unencrypted -> public
@@ -195,15 +196,15 @@ export class EmitUnencryptedLog extends Instruction {
195
196
  OperandType.UINT16,
196
197
  OperandType.UINT16
197
198
  ];
198
- constructor(indirect, logSizeOffset, logOffset){
199
- super(), this.indirect = indirect, this.logSizeOffset = logSizeOffset, this.logOffset = logOffset;
199
+ constructor(addressingMode, logSizeOffset, logOffset){
200
+ super(), this.addressingMode = addressingMode, this.logSizeOffset = logSizeOffset, this.logOffset = logOffset;
200
201
  }
201
202
  async execute(context) {
202
203
  if (context.environment.isStaticCall) {
203
204
  throw new StaticCallAlterationError();
204
205
  }
205
206
  const memory = context.machineState.memory;
206
- const addressing = Addressing.fromWire(this.indirect);
207
+ const addressing = Addressing.fromWire(this.addressingMode);
207
208
  context.machineState.consumeGas(this.baseGasCost(addressing.indirectOperandsCount(), addressing.relativeOperandsCount()));
208
209
  const operands = [
209
210
  this.logSizeOffset,
@@ -212,15 +213,15 @@ export class EmitUnencryptedLog extends Instruction {
212
213
  const [logSizeOffset, logOffset] = addressing.resolve(operands, memory);
213
214
  memory.checkTag(TypeTag.UINT32, logSizeOffset);
214
215
  const logSize = memory.get(logSizeOffset).toNumber();
215
- memory.checkTagsRange(TypeTag.FIELD, logOffset, logSize);
216
216
  const contractAddress = context.environment.address;
217
217
  context.machineState.consumeGas(this.dynamicGasCost(logSize));
218
+ memory.checkTagsRange(TypeTag.FIELD, logOffset, logSize);
218
219
  const log = memory.getSlice(logOffset, logSize).map((f)=>f.toFr());
219
220
  context.persistableState.writePublicLog(contractAddress, log);
220
221
  }
221
222
  }
222
223
  export class SendL2ToL1Message extends Instruction {
223
- indirect;
224
+ addressingMode;
224
225
  recipientOffset;
225
226
  contentOffset;
226
227
  static type = 'SENDL2TOL1MSG';
@@ -232,15 +233,15 @@ export class SendL2ToL1Message extends Instruction {
232
233
  OperandType.UINT16,
233
234
  OperandType.UINT16
234
235
  ];
235
- constructor(indirect, recipientOffset, contentOffset){
236
- super(), this.indirect = indirect, this.recipientOffset = recipientOffset, this.contentOffset = contentOffset;
236
+ constructor(addressingMode, recipientOffset, contentOffset){
237
+ super(), this.addressingMode = addressingMode, this.recipientOffset = recipientOffset, this.contentOffset = contentOffset;
237
238
  }
238
239
  async execute(context) {
239
240
  if (context.environment.isStaticCall) {
240
241
  throw new StaticCallAlterationError();
241
242
  }
242
243
  const memory = context.machineState.memory;
243
- const addressing = Addressing.fromWire(this.indirect);
244
+ const addressing = Addressing.fromWire(this.addressingMode);
244
245
  context.machineState.consumeGas(this.baseGasCost(addressing.indirectOperandsCount(), addressing.relativeOperandsCount()));
245
246
  const operands = [
246
247
  this.recipientOffset,
@@ -249,6 +250,9 @@ export class SendL2ToL1Message extends Instruction {
249
250
  const [recipientOffset, contentOffset] = addressing.resolve(operands, memory);
250
251
  memory.checkTags(TypeTag.FIELD, recipientOffset, contentOffset);
251
252
  const recipient = memory.get(recipientOffset).toFr();
253
+ if (recipient.toBigInt() > MAX_ETH_ADDRESS_VALUE) {
254
+ throw new InstructionExecutionError(`SENDL2TOL1MSG: Recipient address is too large`);
255
+ }
252
256
  const content = memory.get(contentOffset).toFr();
253
257
  context.persistableState.writeL2ToL1Message(context.environment.address, recipient, content);
254
258
  }
@@ -9,39 +9,41 @@ export declare abstract class ThreeOperandArithmeticInstruction extends ThreeOpe
9
9
  }
10
10
  export declare class Add extends ThreeOperandArithmeticInstruction {
11
11
  static readonly type: string;
12
- static readonly opcode: Opcode;
12
+ static readonly opcode = Opcode.ADD_8;
13
13
  protected compute(a: MemoryValue, b: MemoryValue): MemoryValue;
14
14
  }
15
15
  export declare class Sub extends ThreeOperandArithmeticInstruction {
16
16
  static readonly type: string;
17
- static readonly opcode: Opcode;
17
+ static readonly opcode = Opcode.SUB_8;
18
18
  protected compute(a: MemoryValue, b: MemoryValue): MemoryValue;
19
19
  }
20
20
  export declare class Mul extends ThreeOperandArithmeticInstruction {
21
21
  static type: string;
22
- static readonly opcode: Opcode;
22
+ static readonly opcode = Opcode.MUL_8;
23
23
  protected compute(a: MemoryValue, b: MemoryValue): MemoryValue;
24
24
  }
25
25
  export declare class Div extends ThreeOperandArithmeticInstruction {
26
26
  static type: string;
27
- static readonly opcode: Opcode;
27
+ static readonly opcode = Opcode.DIV_8;
28
28
  protected compute(a: MemoryValue, b: MemoryValue): MemoryValue;
29
29
  protected checkTags(memory: TaggedMemoryInterface, aOffset: number, bOffset: number): void;
30
30
  }
31
31
  export declare class FieldDiv extends ThreeOperandArithmeticInstruction {
32
32
  static type: string;
33
- static readonly opcode: Opcode;
33
+ static readonly opcode = Opcode.FDIV_8;
34
34
  protected compute(a: Field, b: Field): Field;
35
35
  protected checkTags(memory: TaggedMemoryInterface, aOffset: number, bOffset: number): void;
36
36
  }
37
37
  export declare class Shl extends ThreeOperandArithmeticInstruction {
38
38
  static readonly type: string;
39
- static readonly opcode: Opcode;
39
+ static readonly opcode = Opcode.SHL_8;
40
40
  protected compute(a: IntegralValue, b: IntegralValue): IntegralValue;
41
+ protected checkTags(memory: TaggedMemoryInterface, aOffset: number, bOffset: number): void;
41
42
  }
42
43
  export declare class Shr extends ThreeOperandArithmeticInstruction {
43
44
  static readonly type: string;
44
- static readonly opcode: Opcode;
45
+ static readonly opcode = Opcode.SHR_8;
45
46
  protected compute(a: IntegralValue, b: IntegralValue): IntegralValue;
47
+ protected checkTags(memory: TaggedMemoryInterface, aOffset: number, bOffset: number): void;
46
48
  }
47
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYXJpdGhtZXRpYy5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vc3JjL3B1YmxpYy9hdm0vb3Bjb2Rlcy9hcml0aG1ldGljLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sS0FBSyxFQUFFLFVBQVUsRUFBRSxNQUFNLG1CQUFtQixDQUFDO0FBQ3BELE9BQU8sRUFDTCxLQUFLLEtBQUssRUFDVixLQUFLLGFBQWEsRUFDbEIsS0FBSyxXQUFXLEVBRWhCLEtBQUsscUJBQXFCLEVBRTNCLE1BQU0sd0JBQXdCLENBQUM7QUFFaEMsT0FBTyxFQUFFLE1BQU0sRUFBRSxNQUFNLCtDQUErQyxDQUFDO0FBRXZFLE9BQU8sRUFBRSx1QkFBdUIsRUFBRSxNQUFNLHVCQUF1QixDQUFDO0FBRWhFLDhCQUFzQixpQ0FBa0MsU0FBUSx1QkFBdUI7SUFDeEUsT0FBTyxDQUFDLE9BQU8sRUFBRSxVQUFVLEdBQUcsT0FBTyxDQUFDLElBQUksQ0FBQyxDQWlCdkQ7SUFFRCxTQUFTLENBQUMsUUFBUSxDQUFDLE9BQU8sQ0FBQyxDQUFDLEVBQUUsV0FBVyxFQUFFLENBQUMsRUFBRSxXQUFXLEdBQUcsV0FBVyxDQUFDO0lBQ3hFLFNBQVMsQ0FBQyxTQUFTLENBQUMsTUFBTSxFQUFFLHFCQUFxQixFQUFFLE9BQU8sRUFBRSxNQUFNLEVBQUUsT0FBTyxFQUFFLE1BQU0sUUFFbEY7Q0FDRjtBQUVELHFCQUFhLEdBQUksU0FBUSxpQ0FBaUM7SUFDeEQsTUFBTSxDQUFDLFFBQVEsQ0FBQyxJQUFJLEVBQUUsTUFBTSxDQUFTO0lBQ3JDLE1BQU0sQ0FBQyxRQUFRLENBQUMsTUFBTSxTQUFnQjtJQUV0QyxTQUFTLENBQUMsT0FBTyxDQUFDLENBQUMsRUFBRSxXQUFXLEVBQUUsQ0FBQyxFQUFFLFdBQVcsR0FBRyxXQUFXLENBRTdEO0NBQ0Y7QUFFRCxxQkFBYSxHQUFJLFNBQVEsaUNBQWlDO0lBQ3hELE1BQU0sQ0FBQyxRQUFRLENBQUMsSUFBSSxFQUFFLE1BQU0sQ0FBUztJQUNyQyxNQUFNLENBQUMsUUFBUSxDQUFDLE1BQU0sU0FBZ0I7SUFFdEMsU0FBUyxDQUFDLE9BQU8sQ0FBQyxDQUFDLEVBQUUsV0FBVyxFQUFFLENBQUMsRUFBRSxXQUFXLEdBQUcsV0FBVyxDQUU3RDtDQUNGO0FBRUQscUJBQWEsR0FBSSxTQUFRLGlDQUFpQztJQUN4RCxNQUFNLENBQUMsSUFBSSxFQUFFLE1BQU0sQ0FBUztJQUM1QixNQUFNLENBQUMsUUFBUSxDQUFDLE1BQU0sU0FBZ0I7SUFFdEMsU0FBUyxDQUFDLE9BQU8sQ0FBQyxDQUFDLEVBQUUsV0FBVyxFQUFFLENBQUMsRUFBRSxXQUFXLEdBQUcsV0FBVyxDQUU3RDtDQUNGO0FBRUQscUJBQWEsR0FBSSxTQUFRLGlDQUFpQztJQUN4RCxNQUFNLENBQUMsSUFBSSxFQUFFLE1BQU0sQ0FBUztJQUM1QixNQUFNLENBQUMsUUFBUSxDQUFDLE1BQU0sU0FBZ0I7SUFFdEMsU0FBUyxDQUFDLE9BQU8sQ0FBQyxDQUFDLEVBQUUsV0FBVyxFQUFFLENBQUMsRUFBRSxXQUFXLEdBQUcsV0FBVyxDQU03RDtJQUVELFVBQW1CLFNBQVMsQ0FBQyxNQUFNLEVBQUUscUJBQXFCLEVBQUUsT0FBTyxFQUFFLE1BQU0sRUFBRSxPQUFPLEVBQUUsTUFBTSxRQUczRjtDQUNGO0FBRUQscUJBQWEsUUFBUyxTQUFRLGlDQUFpQztJQUM3RCxNQUFNLENBQUMsSUFBSSxFQUFFLE1BQU0sQ0FBVTtJQUM3QixNQUFNLENBQUMsUUFBUSxDQUFDLE1BQU0sU0FBaUI7SUFFdkMsU0FBUyxDQUFDLE9BQU8sQ0FBQyxDQUFDLEVBQUUsS0FBSyxFQUFFLENBQUMsRUFBRSxLQUFLLEdBQUcsS0FBSyxDQUczQztJQUVELFVBQW1CLFNBQVMsQ0FBQyxNQUFNLEVBQUUscUJBQXFCLEVBQUUsT0FBTyxFQUFFLE1BQU0sRUFBRSxPQUFPLEVBQUUsTUFBTSxRQUczRjtDQUNGO0FBRUQscUJBQWEsR0FBSSxTQUFRLGlDQUFpQztJQUN4RCxNQUFNLENBQUMsUUFBUSxDQUFDLElBQUksRUFBRSxNQUFNLENBQVM7SUFDckMsTUFBTSxDQUFDLFFBQVEsQ0FBQyxNQUFNLFNBQWdCO0lBRXRDLFVBQW1CLE9BQU8sQ0FBQyxDQUFDLEVBQUUsYUFBYSxFQUFFLENBQUMsRUFBRSxhQUFhLEdBQUcsYUFBYSxDQUU1RTtDQUNGO0FBRUQscUJBQWEsR0FBSSxTQUFRLGlDQUFpQztJQUN4RCxNQUFNLENBQUMsUUFBUSxDQUFDLElBQUksRUFBRSxNQUFNLENBQVM7SUFDckMsTUFBTSxDQUFDLFFBQVEsQ0FBQyxNQUFNLFNBQWdCO0lBRXRDLFVBQW1CLE9BQU8sQ0FBQyxDQUFDLEVBQUUsYUFBYSxFQUFFLENBQUMsRUFBRSxhQUFhLEdBQUcsYUFBYSxDQUU1RTtDQUNGIn0=
49
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYXJpdGhtZXRpYy5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vc3JjL3B1YmxpYy9hdm0vb3Bjb2Rlcy9hcml0aG1ldGljLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sS0FBSyxFQUFFLFVBQVUsRUFBRSxNQUFNLG1CQUFtQixDQUFDO0FBQ3BELE9BQU8sRUFDTCxLQUFLLEtBQUssRUFDVixLQUFLLGFBQWEsRUFDbEIsS0FBSyxXQUFXLEVBRWhCLEtBQUsscUJBQXFCLEVBRTNCLE1BQU0sd0JBQXdCLENBQUM7QUFFaEMsT0FBTyxFQUFFLE1BQU0sRUFBRSxNQUFNLCtDQUErQyxDQUFDO0FBRXZFLE9BQU8sRUFBRSx1QkFBdUIsRUFBRSxNQUFNLHVCQUF1QixDQUFDO0FBRWhFLDhCQUFzQixpQ0FBa0MsU0FBUSx1QkFBdUI7SUFDeEUsT0FBTyxDQUFDLE9BQU8sRUFBRSxVQUFVLEdBQUcsT0FBTyxDQUFDLElBQUksQ0FBQyxDQWlCdkQ7SUFFRCxTQUFTLENBQUMsUUFBUSxDQUFDLE9BQU8sQ0FBQyxDQUFDLEVBQUUsV0FBVyxFQUFFLENBQUMsRUFBRSxXQUFXLEdBQUcsV0FBVyxDQUFDO0lBQ3hFLFNBQVMsQ0FBQyxTQUFTLENBQUMsTUFBTSxFQUFFLHFCQUFxQixFQUFFLE9BQU8sRUFBRSxNQUFNLEVBQUUsT0FBTyxFQUFFLE1BQU0sUUFFbEY7Q0FDRjtBQUVELHFCQUFhLEdBQUksU0FBUSxpQ0FBaUM7SUFDeEQsTUFBTSxDQUFDLFFBQVEsQ0FBQyxJQUFJLEVBQUUsTUFBTSxDQUFTO0lBQ3JDLE1BQU0sQ0FBQyxRQUFRLENBQUMsTUFBTSxnQkFBZ0I7SUFFdEMsU0FBUyxDQUFDLE9BQU8sQ0FBQyxDQUFDLEVBQUUsV0FBVyxFQUFFLENBQUMsRUFBRSxXQUFXLEdBQUcsV0FBVyxDQUU3RDtDQUNGO0FBRUQscUJBQWEsR0FBSSxTQUFRLGlDQUFpQztJQUN4RCxNQUFNLENBQUMsUUFBUSxDQUFDLElBQUksRUFBRSxNQUFNLENBQVM7SUFDckMsTUFBTSxDQUFDLFFBQVEsQ0FBQyxNQUFNLGdCQUFnQjtJQUV0QyxTQUFTLENBQUMsT0FBTyxDQUFDLENBQUMsRUFBRSxXQUFXLEVBQUUsQ0FBQyxFQUFFLFdBQVcsR0FBRyxXQUFXLENBRTdEO0NBQ0Y7QUFFRCxxQkFBYSxHQUFJLFNBQVEsaUNBQWlDO0lBQ3hELE1BQU0sQ0FBQyxJQUFJLEVBQUUsTUFBTSxDQUFTO0lBQzVCLE1BQU0sQ0FBQyxRQUFRLENBQUMsTUFBTSxnQkFBZ0I7SUFFdEMsU0FBUyxDQUFDLE9BQU8sQ0FBQyxDQUFDLEVBQUUsV0FBVyxFQUFFLENBQUMsRUFBRSxXQUFXLEdBQUcsV0FBVyxDQUU3RDtDQUNGO0FBRUQscUJBQWEsR0FBSSxTQUFRLGlDQUFpQztJQUN4RCxNQUFNLENBQUMsSUFBSSxFQUFFLE1BQU0sQ0FBUztJQUM1QixNQUFNLENBQUMsUUFBUSxDQUFDLE1BQU0sZ0JBQWdCO0lBRXRDLFNBQVMsQ0FBQyxPQUFPLENBQUMsQ0FBQyxFQUFFLFdBQVcsRUFBRSxDQUFDLEVBQUUsV0FBVyxHQUFHLFdBQVcsQ0FNN0Q7SUFFRCxVQUFtQixTQUFTLENBQUMsTUFBTSxFQUFFLHFCQUFxQixFQUFFLE9BQU8sRUFBRSxNQUFNLEVBQUUsT0FBTyxFQUFFLE1BQU0sUUFHM0Y7Q0FDRjtBQUVELHFCQUFhLFFBQVMsU0FBUSxpQ0FBaUM7SUFDN0QsTUFBTSxDQUFDLElBQUksRUFBRSxNQUFNLENBQVU7SUFDN0IsTUFBTSxDQUFDLFFBQVEsQ0FBQyxNQUFNLGlCQUFpQjtJQUV2QyxTQUFTLENBQUMsT0FBTyxDQUFDLENBQUMsRUFBRSxLQUFLLEVBQUUsQ0FBQyxFQUFFLEtBQUssR0FBRyxLQUFLLENBSzNDO0lBRUQsVUFBbUIsU0FBUyxDQUFDLE1BQU0sRUFBRSxxQkFBcUIsRUFBRSxPQUFPLEVBQUUsTUFBTSxFQUFFLE9BQU8sRUFBRSxNQUFNLFFBRzNGO0NBQ0Y7QUFFRCxxQkFBYSxHQUFJLFNBQVEsaUNBQWlDO0lBQ3hELE1BQU0sQ0FBQyxRQUFRLENBQUMsSUFBSSxFQUFFLE1BQU0sQ0FBUztJQUNyQyxNQUFNLENBQUMsUUFBUSxDQUFDLE1BQU0sZ0JBQWdCO0lBRXRDLFVBQW1CLE9BQU8sQ0FBQyxDQUFDLEVBQUUsYUFBYSxFQUFFLENBQUMsRUFBRSxhQUFhLEdBQUcsYUFBYSxDQUU1RTtJQUVELFVBQW1CLFNBQVMsQ0FBQyxNQUFNLEVBQUUscUJBQXFCLEVBQUUsT0FBTyxFQUFFLE1BQU0sRUFBRSxPQUFPLEVBQUUsTUFBTSxRQUczRjtDQUNGO0FBRUQscUJBQWEsR0FBSSxTQUFRLGlDQUFpQztJQUN4RCxNQUFNLENBQUMsUUFBUSxDQUFDLElBQUksRUFBRSxNQUFNLENBQVM7SUFDckMsTUFBTSxDQUFDLFFBQVEsQ0FBQyxNQUFNLGdCQUFnQjtJQUV0QyxVQUFtQixPQUFPLENBQUMsQ0FBQyxFQUFFLGFBQWEsRUFBRSxDQUFDLEVBQUUsYUFBYSxHQUFHLGFBQWEsQ0FFNUU7SUFFRCxVQUFtQixTQUFTLENBQUMsTUFBTSxFQUFFLHFCQUFxQixFQUFFLE9BQU8sRUFBRSxNQUFNLEVBQUUsT0FBTyxFQUFFLE1BQU0sUUFHM0Y7Q0FDRiJ9
@@ -1 +1 @@
1
- {"version":3,"file":"arithmetic.d.ts","sourceRoot":"","sources":["../../../../src/public/avm/opcodes/arithmetic.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,EACL,KAAK,KAAK,EACV,KAAK,aAAa,EAClB,KAAK,WAAW,EAEhB,KAAK,qBAAqB,EAE3B,MAAM,wBAAwB,CAAC;AAEhC,OAAO,EAAE,MAAM,EAAE,MAAM,+CAA+C,CAAC;AAEvE,OAAO,EAAE,uBAAuB,EAAE,MAAM,uBAAuB,CAAC;AAEhE,8BAAsB,iCAAkC,SAAQ,uBAAuB;IACxE,OAAO,CAAC,OAAO,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC,CAiBvD;IAED,SAAS,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,EAAE,WAAW,EAAE,CAAC,EAAE,WAAW,GAAG,WAAW,CAAC;IACxE,SAAS,CAAC,SAAS,CAAC,MAAM,EAAE,qBAAqB,EAAE,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,QAElF;CACF;AAED,qBAAa,GAAI,SAAQ,iCAAiC;IACxD,MAAM,CAAC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAS;IACrC,MAAM,CAAC,QAAQ,CAAC,MAAM,SAAgB;IAEtC,SAAS,CAAC,OAAO,CAAC,CAAC,EAAE,WAAW,EAAE,CAAC,EAAE,WAAW,GAAG,WAAW,CAE7D;CACF;AAED,qBAAa,GAAI,SAAQ,iCAAiC;IACxD,MAAM,CAAC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAS;IACrC,MAAM,CAAC,QAAQ,CAAC,MAAM,SAAgB;IAEtC,SAAS,CAAC,OAAO,CAAC,CAAC,EAAE,WAAW,EAAE,CAAC,EAAE,WAAW,GAAG,WAAW,CAE7D;CACF;AAED,qBAAa,GAAI,SAAQ,iCAAiC;IACxD,MAAM,CAAC,IAAI,EAAE,MAAM,CAAS;IAC5B,MAAM,CAAC,QAAQ,CAAC,MAAM,SAAgB;IAEtC,SAAS,CAAC,OAAO,CAAC,CAAC,EAAE,WAAW,EAAE,CAAC,EAAE,WAAW,GAAG,WAAW,CAE7D;CACF;AAED,qBAAa,GAAI,SAAQ,iCAAiC;IACxD,MAAM,CAAC,IAAI,EAAE,MAAM,CAAS;IAC5B,MAAM,CAAC,QAAQ,CAAC,MAAM,SAAgB;IAEtC,SAAS,CAAC,OAAO,CAAC,CAAC,EAAE,WAAW,EAAE,CAAC,EAAE,WAAW,GAAG,WAAW,CAM7D;IAED,UAAmB,SAAS,CAAC,MAAM,EAAE,qBAAqB,EAAE,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,QAG3F;CACF;AAED,qBAAa,QAAS,SAAQ,iCAAiC;IAC7D,MAAM,CAAC,IAAI,EAAE,MAAM,CAAU;IAC7B,MAAM,CAAC,QAAQ,CAAC,MAAM,SAAiB;IAEvC,SAAS,CAAC,OAAO,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC,EAAE,KAAK,GAAG,KAAK,CAG3C;IAED,UAAmB,SAAS,CAAC,MAAM,EAAE,qBAAqB,EAAE,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,QAG3F;CACF;AAED,qBAAa,GAAI,SAAQ,iCAAiC;IACxD,MAAM,CAAC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAS;IACrC,MAAM,CAAC,QAAQ,CAAC,MAAM,SAAgB;IAEtC,UAAmB,OAAO,CAAC,CAAC,EAAE,aAAa,EAAE,CAAC,EAAE,aAAa,GAAG,aAAa,CAE5E;CACF;AAED,qBAAa,GAAI,SAAQ,iCAAiC;IACxD,MAAM,CAAC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAS;IACrC,MAAM,CAAC,QAAQ,CAAC,MAAM,SAAgB;IAEtC,UAAmB,OAAO,CAAC,CAAC,EAAE,aAAa,EAAE,CAAC,EAAE,aAAa,GAAG,aAAa,CAE5E;CACF"}
1
+ {"version":3,"file":"arithmetic.d.ts","sourceRoot":"","sources":["../../../../src/public/avm/opcodes/arithmetic.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,EACL,KAAK,KAAK,EACV,KAAK,aAAa,EAClB,KAAK,WAAW,EAEhB,KAAK,qBAAqB,EAE3B,MAAM,wBAAwB,CAAC;AAEhC,OAAO,EAAE,MAAM,EAAE,MAAM,+CAA+C,CAAC;AAEvE,OAAO,EAAE,uBAAuB,EAAE,MAAM,uBAAuB,CAAC;AAEhE,8BAAsB,iCAAkC,SAAQ,uBAAuB;IACxE,OAAO,CAAC,OAAO,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC,CAiBvD;IAED,SAAS,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,EAAE,WAAW,EAAE,CAAC,EAAE,WAAW,GAAG,WAAW,CAAC;IACxE,SAAS,CAAC,SAAS,CAAC,MAAM,EAAE,qBAAqB,EAAE,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,QAElF;CACF;AAED,qBAAa,GAAI,SAAQ,iCAAiC;IACxD,MAAM,CAAC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAS;IACrC,MAAM,CAAC,QAAQ,CAAC,MAAM,gBAAgB;IAEtC,SAAS,CAAC,OAAO,CAAC,CAAC,EAAE,WAAW,EAAE,CAAC,EAAE,WAAW,GAAG,WAAW,CAE7D;CACF;AAED,qBAAa,GAAI,SAAQ,iCAAiC;IACxD,MAAM,CAAC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAS;IACrC,MAAM,CAAC,QAAQ,CAAC,MAAM,gBAAgB;IAEtC,SAAS,CAAC,OAAO,CAAC,CAAC,EAAE,WAAW,EAAE,CAAC,EAAE,WAAW,GAAG,WAAW,CAE7D;CACF;AAED,qBAAa,GAAI,SAAQ,iCAAiC;IACxD,MAAM,CAAC,IAAI,EAAE,MAAM,CAAS;IAC5B,MAAM,CAAC,QAAQ,CAAC,MAAM,gBAAgB;IAEtC,SAAS,CAAC,OAAO,CAAC,CAAC,EAAE,WAAW,EAAE,CAAC,EAAE,WAAW,GAAG,WAAW,CAE7D;CACF;AAED,qBAAa,GAAI,SAAQ,iCAAiC;IACxD,MAAM,CAAC,IAAI,EAAE,MAAM,CAAS;IAC5B,MAAM,CAAC,QAAQ,CAAC,MAAM,gBAAgB;IAEtC,SAAS,CAAC,OAAO,CAAC,CAAC,EAAE,WAAW,EAAE,CAAC,EAAE,WAAW,GAAG,WAAW,CAM7D;IAED,UAAmB,SAAS,CAAC,MAAM,EAAE,qBAAqB,EAAE,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,QAG3F;CACF;AAED,qBAAa,QAAS,SAAQ,iCAAiC;IAC7D,MAAM,CAAC,IAAI,EAAE,MAAM,CAAU;IAC7B,MAAM,CAAC,QAAQ,CAAC,MAAM,iBAAiB;IAEvC,SAAS,CAAC,OAAO,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC,EAAE,KAAK,GAAG,KAAK,CAK3C;IAED,UAAmB,SAAS,CAAC,MAAM,EAAE,qBAAqB,EAAE,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,QAG3F;CACF;AAED,qBAAa,GAAI,SAAQ,iCAAiC;IACxD,MAAM,CAAC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAS;IACrC,MAAM,CAAC,QAAQ,CAAC,MAAM,gBAAgB;IAEtC,UAAmB,OAAO,CAAC,CAAC,EAAE,aAAa,EAAE,CAAC,EAAE,aAAa,GAAG,aAAa,CAE5E;IAED,UAAmB,SAAS,CAAC,MAAM,EAAE,qBAAqB,EAAE,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,QAG3F;CACF;AAED,qBAAa,GAAI,SAAQ,iCAAiC;IACxD,MAAM,CAAC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAS;IACrC,MAAM,CAAC,QAAQ,CAAC,MAAM,gBAAgB;IAEtC,UAAmB,OAAO,CAAC,CAAC,EAAE,aAAa,EAAE,CAAC,EAAE,aAAa,GAAG,aAAa,CAE5E;IAED,UAAmB,SAAS,CAAC,MAAM,EAAE,qBAAqB,EAAE,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,QAG3F;CACF"}
@@ -6,7 +6,7 @@ import { ThreeOperandInstruction } from './instruction_impl.js';
6
6
  export class ThreeOperandArithmeticInstruction extends ThreeOperandInstruction {
7
7
  async execute(context) {
8
8
  const memory = context.machineState.memory;
9
- const addressing = Addressing.fromWire(this.indirect);
9
+ const addressing = Addressing.fromWire(this.addressingMode);
10
10
  context.machineState.consumeGas(this.baseGasCost(addressing.indirectOperandsCount(), addressing.relativeOperandsCount()));
11
11
  const operands = [
12
12
  this.aOffset,
@@ -63,7 +63,9 @@ export class FieldDiv extends ThreeOperandArithmeticInstruction {
63
63
  static type = 'FDIV';
64
64
  static opcode = Opcode.FDIV_8;
65
65
  compute(a, b) {
66
- // return (a as Field).fdiv(b as Field);
66
+ if (b.toBigInt() === 0n) {
67
+ throw new ArithmeticError('Division by zero');
68
+ }
67
69
  return a.fdiv(b);
68
70
  }
69
71
  checkTags(memory, aOffset, bOffset) {
@@ -77,6 +79,10 @@ export class Shl extends ThreeOperandArithmeticInstruction {
77
79
  compute(a, b) {
78
80
  return a.shl(b);
79
81
  }
82
+ checkTags(memory, aOffset, bOffset) {
83
+ memory.checkTagsAreSame(aOffset, bOffset);
84
+ TaggedMemory.checkIsIntegralTag(memory.getTag(aOffset)); // Follows that bOffset tag is also of integral type
85
+ }
80
86
  }
81
87
  export class Shr extends ThreeOperandArithmeticInstruction {
82
88
  static type = 'SHR';
@@ -84,4 +90,8 @@ export class Shr extends ThreeOperandArithmeticInstruction {
84
90
  compute(a, b) {
85
91
  return a.shr(b);
86
92
  }
93
+ checkTags(memory, aOffset, bOffset) {
94
+ memory.checkTagsAreSame(aOffset, bOffset);
95
+ TaggedMemory.checkIsIntegralTag(memory.getTag(aOffset)); // Follows that bOffset tag is also of integral type
96
+ }
87
97
  }
@@ -11,32 +11,32 @@ declare abstract class ThreeOperandBitwiseInstruction extends ThreeOperandInstru
11
11
  }
12
12
  export declare class And extends ThreeOperandBitwiseInstruction {
13
13
  static readonly type: string;
14
- static readonly opcode: Opcode;
14
+ static readonly opcode = Opcode.AND_8;
15
15
  protected compute(a: IntegralValue, b: IntegralValue): IntegralValue;
16
16
  protected getDynamicMultiplier(lhsTag: TypeTag): number;
17
17
  }
18
18
  export declare class Or extends ThreeOperandBitwiseInstruction {
19
19
  static readonly type: string;
20
- static readonly opcode: Opcode;
20
+ static readonly opcode = Opcode.OR_8;
21
21
  protected compute(a: IntegralValue, b: IntegralValue): IntegralValue;
22
22
  protected getDynamicMultiplier(lhsTag: TypeTag): number;
23
23
  }
24
24
  export declare class Xor extends ThreeOperandBitwiseInstruction {
25
25
  static readonly type: string;
26
- static readonly opcode: Opcode;
26
+ static readonly opcode = Opcode.XOR_8;
27
27
  protected compute(a: IntegralValue, b: IntegralValue): IntegralValue;
28
28
  protected getDynamicMultiplier(lhsTag: TypeTag): number;
29
29
  }
30
30
  export declare class Not extends Instruction {
31
- private indirect;
31
+ private addressingMode;
32
32
  private srcOffset;
33
33
  private dstOffset;
34
34
  static readonly type: string;
35
- static readonly opcode: Opcode;
35
+ static readonly opcode = Opcode.NOT_8;
36
36
  static readonly wireFormat8: OperandType[];
37
37
  static readonly wireFormat16: OperandType[];
38
- constructor(indirect: number, srcOffset: number, dstOffset: number);
38
+ constructor(addressingMode: number, srcOffset: number, dstOffset: number);
39
39
  execute(context: AvmContext): Promise<void>;
40
40
  }
41
41
  export {};
42
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYml0d2lzZS5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vc3JjL3B1YmxpYy9hdm0vb3Bjb2Rlcy9iaXR3aXNlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sS0FBSyxFQUFFLFVBQVUsRUFBRSxNQUFNLG1CQUFtQixDQUFDO0FBRXBELE9BQU8sRUFBRSxLQUFLLGFBQWEsRUFBZ0IsS0FBSyxxQkFBcUIsRUFBRSxPQUFPLEVBQUUsTUFBTSx3QkFBd0IsQ0FBQztBQUMvRyxPQUFPLEVBQUUsTUFBTSxFQUFFLFdBQVcsRUFBRSxNQUFNLCtDQUErQyxDQUFDO0FBRXBGLE9BQU8sRUFBRSxXQUFXLEVBQUUsTUFBTSxrQkFBa0IsQ0FBQztBQUMvQyxPQUFPLEVBQUUsdUJBQXVCLEVBQUUsTUFBTSx1QkFBdUIsQ0FBQztBQUVoRSx1QkFBZSw4QkFBK0IsU0FBUSx1QkFBdUI7SUFDOUQsT0FBTyxDQUFDLE9BQU8sRUFBRSxVQUFVLEdBQUcsT0FBTyxDQUFDLElBQUksQ0FBQyxDQW9CdkQ7SUFFRCxTQUFTLENBQUMsUUFBUSxDQUFDLE9BQU8sQ0FBQyxDQUFDLEVBQUUsYUFBYSxFQUFFLENBQUMsRUFBRSxhQUFhLEdBQUcsYUFBYSxDQUFDO0lBQzlFLFNBQVMsQ0FBQyxTQUFTLENBQUMsTUFBTSxFQUFFLHFCQUFxQixFQUFFLE9BQU8sRUFBRSxNQUFNLEVBQUUsT0FBTyxFQUFFLE1BQU0sUUFHbEY7SUFFRCxTQUFTLENBQUMsb0JBQW9CLENBQUMsT0FBTyxFQUFFLE9BQU8sR0FBRyxNQUFNLENBRXZEO0NBQ0Y7QUFFRCxxQkFBYSxHQUFJLFNBQVEsOEJBQThCO0lBQ3JELE1BQU0sQ0FBQyxRQUFRLENBQUMsSUFBSSxFQUFFLE1BQU0sQ0FBUztJQUNyQyxNQUFNLENBQUMsUUFBUSxDQUFDLE1BQU0sU0FBZ0I7SUFFdEMsVUFBbUIsT0FBTyxDQUFDLENBQUMsRUFBRSxhQUFhLEVBQUUsQ0FBQyxFQUFFLGFBQWEsR0FBRyxhQUFhLENBRTVFO0lBRUQsVUFBbUIsb0JBQW9CLENBQUMsTUFBTSxFQUFFLE9BQU8sR0FBRyxNQUFNLENBRS9EO0NBQ0Y7QUFFRCxxQkFBYSxFQUFHLFNBQVEsOEJBQThCO0lBQ3BELE1BQU0sQ0FBQyxRQUFRLENBQUMsSUFBSSxFQUFFLE1BQU0sQ0FBUTtJQUNwQyxNQUFNLENBQUMsUUFBUSxDQUFDLE1BQU0sU0FBZTtJQUVyQyxVQUFtQixPQUFPLENBQUMsQ0FBQyxFQUFFLGFBQWEsRUFBRSxDQUFDLEVBQUUsYUFBYSxHQUFHLGFBQWEsQ0FFNUU7SUFFRCxVQUFtQixvQkFBb0IsQ0FBQyxNQUFNLEVBQUUsT0FBTyxHQUFHLE1BQU0sQ0FFL0Q7Q0FDRjtBQUVELHFCQUFhLEdBQUksU0FBUSw4QkFBOEI7SUFDckQsTUFBTSxDQUFDLFFBQVEsQ0FBQyxJQUFJLEVBQUUsTUFBTSxDQUFTO0lBQ3JDLE1BQU0sQ0FBQyxRQUFRLENBQUMsTUFBTSxTQUFnQjtJQUV0QyxVQUFtQixPQUFPLENBQUMsQ0FBQyxFQUFFLGFBQWEsRUFBRSxDQUFDLEVBQUUsYUFBYSxHQUFHLGFBQWEsQ0FFNUU7SUFFRCxVQUFtQixvQkFBb0IsQ0FBQyxNQUFNLEVBQUUsT0FBTyxHQUFHLE1BQU0sQ0FFL0Q7Q0FDRjtBQUVELHFCQUFhLEdBQUksU0FBUSxXQUFXO0lBUWhDLE9BQU8sQ0FBQyxRQUFRO0lBQ2hCLE9BQU8sQ0FBQyxTQUFTO0lBQ2pCLE9BQU8sQ0FBQyxTQUFTO0lBVG5CLE1BQU0sQ0FBQyxRQUFRLENBQUMsSUFBSSxFQUFFLE1BQU0sQ0FBUztJQUNyQyxNQUFNLENBQUMsUUFBUSxDQUFDLE1BQU0sU0FBZ0I7SUFFdEMsTUFBTSxDQUFDLFFBQVEsQ0FBQyxXQUFXLGdCQUFnRjtJQUMzRyxNQUFNLENBQUMsUUFBUSxDQUFDLFlBQVksZ0JBQWtGO0lBRTlHLFlBQ1UsUUFBUSxFQUFFLE1BQU0sRUFDaEIsU0FBUyxFQUFFLE1BQU0sRUFDakIsU0FBUyxFQUFFLE1BQU0sRUFHMUI7SUFFWSxPQUFPLENBQUMsT0FBTyxFQUFFLFVBQVUsR0FBRyxPQUFPLENBQUMsSUFBSSxDQUFDLENBZXZEO0NBQ0YifQ==
42
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYml0d2lzZS5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vc3JjL3B1YmxpYy9hdm0vb3Bjb2Rlcy9iaXR3aXNlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sS0FBSyxFQUFFLFVBQVUsRUFBRSxNQUFNLG1CQUFtQixDQUFDO0FBRXBELE9BQU8sRUFBRSxLQUFLLGFBQWEsRUFBZ0IsS0FBSyxxQkFBcUIsRUFBRSxPQUFPLEVBQUUsTUFBTSx3QkFBd0IsQ0FBQztBQUMvRyxPQUFPLEVBQUUsTUFBTSxFQUFFLFdBQVcsRUFBRSxNQUFNLCtDQUErQyxDQUFDO0FBRXBGLE9BQU8sRUFBRSxXQUFXLEVBQUUsTUFBTSxrQkFBa0IsQ0FBQztBQUMvQyxPQUFPLEVBQUUsdUJBQXVCLEVBQUUsTUFBTSx1QkFBdUIsQ0FBQztBQUVoRSx1QkFBZSw4QkFBK0IsU0FBUSx1QkFBdUI7SUFDOUQsT0FBTyxDQUFDLE9BQU8sRUFBRSxVQUFVLEdBQUcsT0FBTyxDQUFDLElBQUksQ0FBQyxDQW9CdkQ7SUFFRCxTQUFTLENBQUMsUUFBUSxDQUFDLE9BQU8sQ0FBQyxDQUFDLEVBQUUsYUFBYSxFQUFFLENBQUMsRUFBRSxhQUFhLEdBQUcsYUFBYSxDQUFDO0lBQzlFLFNBQVMsQ0FBQyxTQUFTLENBQUMsTUFBTSxFQUFFLHFCQUFxQixFQUFFLE9BQU8sRUFBRSxNQUFNLEVBQUUsT0FBTyxFQUFFLE1BQU0sUUFHbEY7SUFFRCxTQUFTLENBQUMsb0JBQW9CLENBQUMsT0FBTyxFQUFFLE9BQU8sR0FBRyxNQUFNLENBRXZEO0NBQ0Y7QUFFRCxxQkFBYSxHQUFJLFNBQVEsOEJBQThCO0lBQ3JELE1BQU0sQ0FBQyxRQUFRLENBQUMsSUFBSSxFQUFFLE1BQU0sQ0FBUztJQUNyQyxNQUFNLENBQUMsUUFBUSxDQUFDLE1BQU0sZ0JBQWdCO0lBRXRDLFVBQW1CLE9BQU8sQ0FBQyxDQUFDLEVBQUUsYUFBYSxFQUFFLENBQUMsRUFBRSxhQUFhLEdBQUcsYUFBYSxDQUU1RTtJQUVELFVBQW1CLG9CQUFvQixDQUFDLE1BQU0sRUFBRSxPQUFPLEdBQUcsTUFBTSxDQUUvRDtDQUNGO0FBRUQscUJBQWEsRUFBRyxTQUFRLDhCQUE4QjtJQUNwRCxNQUFNLENBQUMsUUFBUSxDQUFDLElBQUksRUFBRSxNQUFNLENBQVE7SUFDcEMsTUFBTSxDQUFDLFFBQVEsQ0FBQyxNQUFNLGVBQWU7SUFFckMsVUFBbUIsT0FBTyxDQUFDLENBQUMsRUFBRSxhQUFhLEVBQUUsQ0FBQyxFQUFFLGFBQWEsR0FBRyxhQUFhLENBRTVFO0lBRUQsVUFBbUIsb0JBQW9CLENBQUMsTUFBTSxFQUFFLE9BQU8sR0FBRyxNQUFNLENBRS9EO0NBQ0Y7QUFFRCxxQkFBYSxHQUFJLFNBQVEsOEJBQThCO0lBQ3JELE1BQU0sQ0FBQyxRQUFRLENBQUMsSUFBSSxFQUFFLE1BQU0sQ0FBUztJQUNyQyxNQUFNLENBQUMsUUFBUSxDQUFDLE1BQU0sZ0JBQWdCO0lBRXRDLFVBQW1CLE9BQU8sQ0FBQyxDQUFDLEVBQUUsYUFBYSxFQUFFLENBQUMsRUFBRSxhQUFhLEdBQUcsYUFBYSxDQUU1RTtJQUVELFVBQW1CLG9CQUFvQixDQUFDLE1BQU0sRUFBRSxPQUFPLEdBQUcsTUFBTSxDQUUvRDtDQUNGO0FBRUQscUJBQWEsR0FBSSxTQUFRLFdBQVc7SUFRaEMsT0FBTyxDQUFDLGNBQWM7SUFDdEIsT0FBTyxDQUFDLFNBQVM7SUFDakIsT0FBTyxDQUFDLFNBQVM7SUFUbkIsTUFBTSxDQUFDLFFBQVEsQ0FBQyxJQUFJLEVBQUUsTUFBTSxDQUFTO0lBQ3JDLE1BQU0sQ0FBQyxRQUFRLENBQUMsTUFBTSxnQkFBZ0I7SUFFdEMsTUFBTSxDQUFDLFFBQVEsQ0FBQyxXQUFXLGdCQUFnRjtJQUMzRyxNQUFNLENBQUMsUUFBUSxDQUFDLFlBQVksZ0JBQWtGO0lBRTlHLFlBQ1UsY0FBYyxFQUFFLE1BQU0sRUFDdEIsU0FBUyxFQUFFLE1BQU0sRUFDakIsU0FBUyxFQUFFLE1BQU0sRUFHMUI7SUFFWSxPQUFPLENBQUMsT0FBTyxFQUFFLFVBQVUsR0FBRyxPQUFPLENBQUMsSUFBSSxDQUFDLENBZXZEO0NBQ0YifQ==
@@ -1 +1 @@
1
- {"version":3,"file":"bitwise.d.ts","sourceRoot":"","sources":["../../../../src/public/avm/opcodes/bitwise.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAEpD,OAAO,EAAE,KAAK,aAAa,EAAgB,KAAK,qBAAqB,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAC;AAC/G,OAAO,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,+CAA+C,CAAC;AAEpF,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAC/C,OAAO,EAAE,uBAAuB,EAAE,MAAM,uBAAuB,CAAC;AAEhE,uBAAe,8BAA+B,SAAQ,uBAAuB;IAC9D,OAAO,CAAC,OAAO,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC,CAoBvD;IAED,SAAS,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,EAAE,aAAa,EAAE,CAAC,EAAE,aAAa,GAAG,aAAa,CAAC;IAC9E,SAAS,CAAC,SAAS,CAAC,MAAM,EAAE,qBAAqB,EAAE,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,QAGlF;IAED,SAAS,CAAC,oBAAoB,CAAC,OAAO,EAAE,OAAO,GAAG,MAAM,CAEvD;CACF;AAED,qBAAa,GAAI,SAAQ,8BAA8B;IACrD,MAAM,CAAC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAS;IACrC,MAAM,CAAC,QAAQ,CAAC,MAAM,SAAgB;IAEtC,UAAmB,OAAO,CAAC,CAAC,EAAE,aAAa,EAAE,CAAC,EAAE,aAAa,GAAG,aAAa,CAE5E;IAED,UAAmB,oBAAoB,CAAC,MAAM,EAAE,OAAO,GAAG,MAAM,CAE/D;CACF;AAED,qBAAa,EAAG,SAAQ,8BAA8B;IACpD,MAAM,CAAC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAQ;IACpC,MAAM,CAAC,QAAQ,CAAC,MAAM,SAAe;IAErC,UAAmB,OAAO,CAAC,CAAC,EAAE,aAAa,EAAE,CAAC,EAAE,aAAa,GAAG,aAAa,CAE5E;IAED,UAAmB,oBAAoB,CAAC,MAAM,EAAE,OAAO,GAAG,MAAM,CAE/D;CACF;AAED,qBAAa,GAAI,SAAQ,8BAA8B;IACrD,MAAM,CAAC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAS;IACrC,MAAM,CAAC,QAAQ,CAAC,MAAM,SAAgB;IAEtC,UAAmB,OAAO,CAAC,CAAC,EAAE,aAAa,EAAE,CAAC,EAAE,aAAa,GAAG,aAAa,CAE5E;IAED,UAAmB,oBAAoB,CAAC,MAAM,EAAE,OAAO,GAAG,MAAM,CAE/D;CACF;AAED,qBAAa,GAAI,SAAQ,WAAW;IAQhC,OAAO,CAAC,QAAQ;IAChB,OAAO,CAAC,SAAS;IACjB,OAAO,CAAC,SAAS;IATnB,MAAM,CAAC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAS;IACrC,MAAM,CAAC,QAAQ,CAAC,MAAM,SAAgB;IAEtC,MAAM,CAAC,QAAQ,CAAC,WAAW,gBAAgF;IAC3G,MAAM,CAAC,QAAQ,CAAC,YAAY,gBAAkF;IAE9G,YACU,QAAQ,EAAE,MAAM,EAChB,SAAS,EAAE,MAAM,EACjB,SAAS,EAAE,MAAM,EAG1B;IAEY,OAAO,CAAC,OAAO,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC,CAevD;CACF"}
1
+ {"version":3,"file":"bitwise.d.ts","sourceRoot":"","sources":["../../../../src/public/avm/opcodes/bitwise.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAEpD,OAAO,EAAE,KAAK,aAAa,EAAgB,KAAK,qBAAqB,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAC;AAC/G,OAAO,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,+CAA+C,CAAC;AAEpF,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAC/C,OAAO,EAAE,uBAAuB,EAAE,MAAM,uBAAuB,CAAC;AAEhE,uBAAe,8BAA+B,SAAQ,uBAAuB;IAC9D,OAAO,CAAC,OAAO,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC,CAoBvD;IAED,SAAS,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,EAAE,aAAa,EAAE,CAAC,EAAE,aAAa,GAAG,aAAa,CAAC;IAC9E,SAAS,CAAC,SAAS,CAAC,MAAM,EAAE,qBAAqB,EAAE,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,QAGlF;IAED,SAAS,CAAC,oBAAoB,CAAC,OAAO,EAAE,OAAO,GAAG,MAAM,CAEvD;CACF;AAED,qBAAa,GAAI,SAAQ,8BAA8B;IACrD,MAAM,CAAC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAS;IACrC,MAAM,CAAC,QAAQ,CAAC,MAAM,gBAAgB;IAEtC,UAAmB,OAAO,CAAC,CAAC,EAAE,aAAa,EAAE,CAAC,EAAE,aAAa,GAAG,aAAa,CAE5E;IAED,UAAmB,oBAAoB,CAAC,MAAM,EAAE,OAAO,GAAG,MAAM,CAE/D;CACF;AAED,qBAAa,EAAG,SAAQ,8BAA8B;IACpD,MAAM,CAAC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAQ;IACpC,MAAM,CAAC,QAAQ,CAAC,MAAM,eAAe;IAErC,UAAmB,OAAO,CAAC,CAAC,EAAE,aAAa,EAAE,CAAC,EAAE,aAAa,GAAG,aAAa,CAE5E;IAED,UAAmB,oBAAoB,CAAC,MAAM,EAAE,OAAO,GAAG,MAAM,CAE/D;CACF;AAED,qBAAa,GAAI,SAAQ,8BAA8B;IACrD,MAAM,CAAC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAS;IACrC,MAAM,CAAC,QAAQ,CAAC,MAAM,gBAAgB;IAEtC,UAAmB,OAAO,CAAC,CAAC,EAAE,aAAa,EAAE,CAAC,EAAE,aAAa,GAAG,aAAa,CAE5E;IAED,UAAmB,oBAAoB,CAAC,MAAM,EAAE,OAAO,GAAG,MAAM,CAE/D;CACF;AAED,qBAAa,GAAI,SAAQ,WAAW;IAQhC,OAAO,CAAC,cAAc;IACtB,OAAO,CAAC,SAAS;IACjB,OAAO,CAAC,SAAS;IATnB,MAAM,CAAC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAS;IACrC,MAAM,CAAC,QAAQ,CAAC,MAAM,gBAAgB;IAEtC,MAAM,CAAC,QAAQ,CAAC,WAAW,gBAAgF;IAC3G,MAAM,CAAC,QAAQ,CAAC,YAAY,gBAAkF;IAE9G,YACU,cAAc,EAAE,MAAM,EACtB,SAAS,EAAE,MAAM,EACjB,SAAS,EAAE,MAAM,EAG1B;IAEY,OAAO,CAAC,OAAO,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC,CAevD;CACF"}
@@ -7,7 +7,7 @@ import { ThreeOperandInstruction } from './instruction_impl.js';
7
7
  class ThreeOperandBitwiseInstruction extends ThreeOperandInstruction {
8
8
  async execute(context) {
9
9
  const memory = context.machineState.memory;
10
- const addressing = Addressing.fromWire(this.indirect);
10
+ const addressing = Addressing.fromWire(this.addressingMode);
11
11
  context.machineState.consumeGas(this.baseGasCost(addressing.indirectOperandsCount(), addressing.relativeOperandsCount()));
12
12
  const operands = [
13
13
  this.aOffset,
@@ -62,7 +62,7 @@ export class Xor extends ThreeOperandBitwiseInstruction {
62
62
  }
63
63
  }
64
64
  export class Not extends Instruction {
65
- indirect;
65
+ addressingMode;
66
66
  srcOffset;
67
67
  dstOffset;
68
68
  static type = 'NOT';
@@ -79,12 +79,12 @@ export class Not extends Instruction {
79
79
  OperandType.UINT16,
80
80
  OperandType.UINT16
81
81
  ];
82
- constructor(indirect, srcOffset, dstOffset){
83
- super(), this.indirect = indirect, this.srcOffset = srcOffset, this.dstOffset = dstOffset;
82
+ constructor(addressingMode, srcOffset, dstOffset){
83
+ super(), this.addressingMode = addressingMode, this.srcOffset = srcOffset, this.dstOffset = dstOffset;
84
84
  }
85
85
  async execute(context) {
86
86
  const memory = context.machineState.memory;
87
- const addressing = Addressing.fromWire(this.indirect);
87
+ const addressing = Addressing.fromWire(this.addressingMode);
88
88
  context.machineState.consumeGas(this.baseGasCost(addressing.indirectOperandsCount(), addressing.relativeOperandsCount()));
89
89
  const operands = [
90
90
  this.srcOffset,
@@ -8,18 +8,18 @@ declare abstract class ComparatorInstruction extends ThreeOperandInstruction {
8
8
  }
9
9
  export declare class Eq extends ComparatorInstruction {
10
10
  static readonly type: string;
11
- static readonly opcode: Opcode;
11
+ static readonly opcode = Opcode.EQ_8;
12
12
  protected compare(a: MemoryValue, b: MemoryValue): boolean;
13
13
  }
14
14
  export declare class Lt extends ComparatorInstruction {
15
15
  static readonly type: string;
16
- static readonly opcode: Opcode;
16
+ static readonly opcode = Opcode.LT_8;
17
17
  protected compare(a: MemoryValue, b: MemoryValue): boolean;
18
18
  }
19
19
  export declare class Lte extends ComparatorInstruction {
20
20
  static readonly type: string;
21
- static readonly opcode: Opcode;
21
+ static readonly opcode = Opcode.LTE_8;
22
22
  protected compare(a: MemoryValue, b: MemoryValue): boolean;
23
23
  }
24
24
  export {};
25
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29tcGFyYXRvcnMuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uL3NyYy9wdWJsaWMvYXZtL29wY29kZXMvY29tcGFyYXRvcnMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxLQUFLLEVBQUUsVUFBVSxFQUFFLE1BQU0sbUJBQW1CLENBQUM7QUFDcEQsT0FBTyxFQUFFLEtBQUssV0FBVyxFQUFTLE1BQU0sd0JBQXdCLENBQUM7QUFDakUsT0FBTyxFQUFFLE1BQU0sRUFBRSxNQUFNLCtDQUErQyxDQUFDO0FBRXZFLE9BQU8sRUFBRSx1QkFBdUIsRUFBRSxNQUFNLHVCQUF1QixDQUFDO0FBRWhFLHVCQUFlLHFCQUFzQixTQUFRLHVCQUF1QjtJQUNyRCxPQUFPLENBQUMsT0FBTyxFQUFFLFVBQVUsR0FBRyxPQUFPLENBQUMsSUFBSSxDQUFDLENBaUJ2RDtJQUVELFNBQVMsQ0FBQyxRQUFRLENBQUMsT0FBTyxDQUFDLENBQUMsRUFBRSxXQUFXLEVBQUUsQ0FBQyxFQUFFLFdBQVcsR0FBRyxPQUFPLENBQUM7Q0FDckU7QUFFRCxxQkFBYSxFQUFHLFNBQVEscUJBQXFCO0lBQzNDLE1BQU0sQ0FBQyxRQUFRLENBQUMsSUFBSSxFQUFFLE1BQU0sQ0FBUTtJQUNwQyxNQUFNLENBQUMsUUFBUSxDQUFDLE1BQU0sU0FBZTtJQUVyQyxTQUFTLENBQUMsT0FBTyxDQUFDLENBQUMsRUFBRSxXQUFXLEVBQUUsQ0FBQyxFQUFFLFdBQVcsR0FBRyxPQUFPLENBRXpEO0NBQ0Y7QUFFRCxxQkFBYSxFQUFHLFNBQVEscUJBQXFCO0lBQzNDLE1BQU0sQ0FBQyxRQUFRLENBQUMsSUFBSSxFQUFFLE1BQU0sQ0FBUTtJQUNwQyxNQUFNLENBQUMsUUFBUSxDQUFDLE1BQU0sU0FBZTtJQUVyQyxTQUFTLENBQUMsT0FBTyxDQUFDLENBQUMsRUFBRSxXQUFXLEVBQUUsQ0FBQyxFQUFFLFdBQVcsR0FBRyxPQUFPLENBRXpEO0NBQ0Y7QUFFRCxxQkFBYSxHQUFJLFNBQVEscUJBQXFCO0lBQzVDLE1BQU0sQ0FBQyxRQUFRLENBQUMsSUFBSSxFQUFFLE1BQU0sQ0FBUztJQUNyQyxNQUFNLENBQUMsUUFBUSxDQUFDLE1BQU0sU0FBZ0I7SUFFdEMsU0FBUyxDQUFDLE9BQU8sQ0FBQyxDQUFDLEVBQUUsV0FBVyxFQUFFLENBQUMsRUFBRSxXQUFXLEdBQUcsT0FBTyxDQUV6RDtDQUNGIn0=
25
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29tcGFyYXRvcnMuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uL3NyYy9wdWJsaWMvYXZtL29wY29kZXMvY29tcGFyYXRvcnMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxLQUFLLEVBQUUsVUFBVSxFQUFFLE1BQU0sbUJBQW1CLENBQUM7QUFDcEQsT0FBTyxFQUFFLEtBQUssV0FBVyxFQUFTLE1BQU0sd0JBQXdCLENBQUM7QUFDakUsT0FBTyxFQUFFLE1BQU0sRUFBRSxNQUFNLCtDQUErQyxDQUFDO0FBRXZFLE9BQU8sRUFBRSx1QkFBdUIsRUFBRSxNQUFNLHVCQUF1QixDQUFDO0FBRWhFLHVCQUFlLHFCQUFzQixTQUFRLHVCQUF1QjtJQUNyRCxPQUFPLENBQUMsT0FBTyxFQUFFLFVBQVUsR0FBRyxPQUFPLENBQUMsSUFBSSxDQUFDLENBaUJ2RDtJQUVELFNBQVMsQ0FBQyxRQUFRLENBQUMsT0FBTyxDQUFDLENBQUMsRUFBRSxXQUFXLEVBQUUsQ0FBQyxFQUFFLFdBQVcsR0FBRyxPQUFPLENBQUM7Q0FDckU7QUFFRCxxQkFBYSxFQUFHLFNBQVEscUJBQXFCO0lBQzNDLE1BQU0sQ0FBQyxRQUFRLENBQUMsSUFBSSxFQUFFLE1BQU0sQ0FBUTtJQUNwQyxNQUFNLENBQUMsUUFBUSxDQUFDLE1BQU0sZUFBZTtJQUVyQyxTQUFTLENBQUMsT0FBTyxDQUFDLENBQUMsRUFBRSxXQUFXLEVBQUUsQ0FBQyxFQUFFLFdBQVcsR0FBRyxPQUFPLENBRXpEO0NBQ0Y7QUFFRCxxQkFBYSxFQUFHLFNBQVEscUJBQXFCO0lBQzNDLE1BQU0sQ0FBQyxRQUFRLENBQUMsSUFBSSxFQUFFLE1BQU0sQ0FBUTtJQUNwQyxNQUFNLENBQUMsUUFBUSxDQUFDLE1BQU0sZUFBZTtJQUVyQyxTQUFTLENBQUMsT0FBTyxDQUFDLENBQUMsRUFBRSxXQUFXLEVBQUUsQ0FBQyxFQUFFLFdBQVcsR0FBRyxPQUFPLENBRXpEO0NBQ0Y7QUFFRCxxQkFBYSxHQUFJLFNBQVEscUJBQXFCO0lBQzVDLE1BQU0sQ0FBQyxRQUFRLENBQUMsSUFBSSxFQUFFLE1BQU0sQ0FBUztJQUNyQyxNQUFNLENBQUMsUUFBUSxDQUFDLE1BQU0sZ0JBQWdCO0lBRXRDLFNBQVMsQ0FBQyxPQUFPLENBQUMsQ0FBQyxFQUFFLFdBQVcsRUFBRSxDQUFDLEVBQUUsV0FBVyxHQUFHLE9BQU8sQ0FFekQ7Q0FDRiJ9
@@ -1 +1 @@
1
- {"version":3,"file":"comparators.d.ts","sourceRoot":"","sources":["../../../../src/public/avm/opcodes/comparators.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,EAAE,KAAK,WAAW,EAAS,MAAM,wBAAwB,CAAC;AACjE,OAAO,EAAE,MAAM,EAAE,MAAM,+CAA+C,CAAC;AAEvE,OAAO,EAAE,uBAAuB,EAAE,MAAM,uBAAuB,CAAC;AAEhE,uBAAe,qBAAsB,SAAQ,uBAAuB;IACrD,OAAO,CAAC,OAAO,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC,CAiBvD;IAED,SAAS,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,EAAE,WAAW,EAAE,CAAC,EAAE,WAAW,GAAG,OAAO,CAAC;CACrE;AAED,qBAAa,EAAG,SAAQ,qBAAqB;IAC3C,MAAM,CAAC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAQ;IACpC,MAAM,CAAC,QAAQ,CAAC,MAAM,SAAe;IAErC,SAAS,CAAC,OAAO,CAAC,CAAC,EAAE,WAAW,EAAE,CAAC,EAAE,WAAW,GAAG,OAAO,CAEzD;CACF;AAED,qBAAa,EAAG,SAAQ,qBAAqB;IAC3C,MAAM,CAAC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAQ;IACpC,MAAM,CAAC,QAAQ,CAAC,MAAM,SAAe;IAErC,SAAS,CAAC,OAAO,CAAC,CAAC,EAAE,WAAW,EAAE,CAAC,EAAE,WAAW,GAAG,OAAO,CAEzD;CACF;AAED,qBAAa,GAAI,SAAQ,qBAAqB;IAC5C,MAAM,CAAC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAS;IACrC,MAAM,CAAC,QAAQ,CAAC,MAAM,SAAgB;IAEtC,SAAS,CAAC,OAAO,CAAC,CAAC,EAAE,WAAW,EAAE,CAAC,EAAE,WAAW,GAAG,OAAO,CAEzD;CACF"}
1
+ {"version":3,"file":"comparators.d.ts","sourceRoot":"","sources":["../../../../src/public/avm/opcodes/comparators.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,EAAE,KAAK,WAAW,EAAS,MAAM,wBAAwB,CAAC;AACjE,OAAO,EAAE,MAAM,EAAE,MAAM,+CAA+C,CAAC;AAEvE,OAAO,EAAE,uBAAuB,EAAE,MAAM,uBAAuB,CAAC;AAEhE,uBAAe,qBAAsB,SAAQ,uBAAuB;IACrD,OAAO,CAAC,OAAO,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC,CAiBvD;IAED,SAAS,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,EAAE,WAAW,EAAE,CAAC,EAAE,WAAW,GAAG,OAAO,CAAC;CACrE;AAED,qBAAa,EAAG,SAAQ,qBAAqB;IAC3C,MAAM,CAAC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAQ;IACpC,MAAM,CAAC,QAAQ,CAAC,MAAM,eAAe;IAErC,SAAS,CAAC,OAAO,CAAC,CAAC,EAAE,WAAW,EAAE,CAAC,EAAE,WAAW,GAAG,OAAO,CAEzD;CACF;AAED,qBAAa,EAAG,SAAQ,qBAAqB;IAC3C,MAAM,CAAC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAQ;IACpC,MAAM,CAAC,QAAQ,CAAC,MAAM,eAAe;IAErC,SAAS,CAAC,OAAO,CAAC,CAAC,EAAE,WAAW,EAAE,CAAC,EAAE,WAAW,GAAG,OAAO,CAEzD;CACF;AAED,qBAAa,GAAI,SAAQ,qBAAqB;IAC5C,MAAM,CAAC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAS;IACrC,MAAM,CAAC,QAAQ,CAAC,MAAM,gBAAgB;IAEtC,SAAS,CAAC,OAAO,CAAC,CAAC,EAAE,WAAW,EAAE,CAAC,EAAE,WAAW,GAAG,OAAO,CAEzD;CACF"}
@@ -5,7 +5,7 @@ import { ThreeOperandInstruction } from './instruction_impl.js';
5
5
  class ComparatorInstruction extends ThreeOperandInstruction {
6
6
  async execute(context) {
7
7
  const memory = context.machineState.memory;
8
- const addressing = Addressing.fromWire(this.indirect);
8
+ const addressing = Addressing.fromWire(this.addressingMode);
9
9
  context.machineState.consumeGas(this.baseGasCost(addressing.indirectOperandsCount(), addressing.relativeOperandsCount()));
10
10
  const operands = [
11
11
  this.aOffset,
@@ -7,14 +7,14 @@ export declare enum ContractInstanceMember {
7
7
  INIT_HASH = 2
8
8
  }
9
9
  export declare class GetContractInstance extends Instruction {
10
- private indirect;
10
+ private addressingMode;
11
11
  private addressOffset;
12
12
  private dstOffset;
13
13
  private memberEnum;
14
14
  static readonly type: string;
15
15
  static readonly opcode: Opcode;
16
16
  static readonly wireFormat: OperandType[];
17
- constructor(indirect: number, addressOffset: number, dstOffset: number, memberEnum: number);
17
+ constructor(addressingMode: number, addressOffset: number, dstOffset: number, memberEnum: number);
18
18
  execute(context: AvmContext): Promise<void>;
19
19
  }
20
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29udHJhY3QuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uL3NyYy9wdWJsaWMvYXZtL29wY29kZXMvY29udHJhY3QudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxLQUFLLEVBQUUsVUFBVSxFQUFFLE1BQU0sbUJBQW1CLENBQUM7QUFHcEQsT0FBTyxFQUFFLE1BQU0sRUFBRSxXQUFXLEVBQUUsTUFBTSwrQ0FBK0MsQ0FBQztBQUVwRixPQUFPLEVBQUUsV0FBVyxFQUFFLE1BQU0sa0JBQWtCLENBQUM7QUFFL0Msb0JBQVksc0JBQXNCO0lBQ2hDLFFBQVEsSUFBQTtJQUNSLFFBQVEsSUFBQTtJQUNSLFNBQVMsSUFBQTtDQUNWO0FBRUQscUJBQWEsbUJBQW9CLFNBQVEsV0FBVztJQWFoRCxPQUFPLENBQUMsUUFBUTtJQUNoQixPQUFPLENBQUMsYUFBYTtJQUNyQixPQUFPLENBQUMsU0FBUztJQUNqQixPQUFPLENBQUMsVUFBVTtJQWZwQixNQUFNLENBQUMsUUFBUSxDQUFDLElBQUksRUFBRSxNQUFNLENBQXlCO0lBQ3JELE1BQU0sQ0FBQyxRQUFRLENBQUMsTUFBTSxFQUFFLE1BQU0sQ0FBOEI7SUFFNUQsTUFBTSxDQUFDLFFBQVEsQ0FBQyxVQUFVLEVBQUUsV0FBVyxFQUFFLENBTXZDO0lBRUYsWUFDVSxRQUFRLEVBQUUsTUFBTSxFQUNoQixhQUFhLEVBQUUsTUFBTSxFQUNyQixTQUFTLEVBQUUsTUFBTSxFQUNqQixVQUFVLEVBQUUsTUFBTSxFQUczQjtJQUVLLE9BQU8sQ0FBQyxPQUFPLEVBQUUsVUFBVSxHQUFHLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0F1Q2hEO0NBQ0YifQ==
20
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29udHJhY3QuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uL3NyYy9wdWJsaWMvYXZtL29wY29kZXMvY29udHJhY3QudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxLQUFLLEVBQUUsVUFBVSxFQUFFLE1BQU0sbUJBQW1CLENBQUM7QUFHcEQsT0FBTyxFQUFFLE1BQU0sRUFBRSxXQUFXLEVBQUUsTUFBTSwrQ0FBK0MsQ0FBQztBQUVwRixPQUFPLEVBQUUsV0FBVyxFQUFFLE1BQU0sa0JBQWtCLENBQUM7QUFFL0Msb0JBQVksc0JBQXNCO0lBQ2hDLFFBQVEsSUFBQTtJQUNSLFFBQVEsSUFBQTtJQUNSLFNBQVMsSUFBQTtDQUNWO0FBRUQscUJBQWEsbUJBQW9CLFNBQVEsV0FBVztJQWFoRCxPQUFPLENBQUMsY0FBYztJQUN0QixPQUFPLENBQUMsYUFBYTtJQUNyQixPQUFPLENBQUMsU0FBUztJQUNqQixPQUFPLENBQUMsVUFBVTtJQWZwQixNQUFNLENBQUMsUUFBUSxDQUFDLElBQUksRUFBRSxNQUFNLENBQXlCO0lBQ3JELE1BQU0sQ0FBQyxRQUFRLENBQUMsTUFBTSxFQUFFLE1BQU0sQ0FBOEI7SUFFNUQsTUFBTSxDQUFDLFFBQVEsQ0FBQyxVQUFVLEVBQUUsV0FBVyxFQUFFLENBTXZDO0lBRUYsWUFDVSxjQUFjLEVBQUUsTUFBTSxFQUN0QixhQUFhLEVBQUUsTUFBTSxFQUNyQixTQUFTLEVBQUUsTUFBTSxFQUNqQixVQUFVLEVBQUUsTUFBTSxFQUczQjtJQUVLLE9BQU8sQ0FBQyxPQUFPLEVBQUUsVUFBVSxHQUFHLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FvQ2hEO0NBQ0YifQ==
@@ -1 +1 @@
1
- {"version":3,"file":"contract.d.ts","sourceRoot":"","sources":["../../../../src/public/avm/opcodes/contract.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAGpD,OAAO,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,+CAA+C,CAAC;AAEpF,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAE/C,oBAAY,sBAAsB;IAChC,QAAQ,IAAA;IACR,QAAQ,IAAA;IACR,SAAS,IAAA;CACV;AAED,qBAAa,mBAAoB,SAAQ,WAAW;IAahD,OAAO,CAAC,QAAQ;IAChB,OAAO,CAAC,aAAa;IACrB,OAAO,CAAC,SAAS;IACjB,OAAO,CAAC,UAAU;IAfpB,MAAM,CAAC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAyB;IACrD,MAAM,CAAC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAA8B;IAE5D,MAAM,CAAC,QAAQ,CAAC,UAAU,EAAE,WAAW,EAAE,CAMvC;IAEF,YACU,QAAQ,EAAE,MAAM,EAChB,aAAa,EAAE,MAAM,EACrB,SAAS,EAAE,MAAM,EACjB,UAAU,EAAE,MAAM,EAG3B;IAEK,OAAO,CAAC,OAAO,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC,CAuChD;CACF"}
1
+ {"version":3,"file":"contract.d.ts","sourceRoot":"","sources":["../../../../src/public/avm/opcodes/contract.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAGpD,OAAO,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,+CAA+C,CAAC;AAEpF,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAE/C,oBAAY,sBAAsB;IAChC,QAAQ,IAAA;IACR,QAAQ,IAAA;IACR,SAAS,IAAA;CACV;AAED,qBAAa,mBAAoB,SAAQ,WAAW;IAahD,OAAO,CAAC,cAAc;IACtB,OAAO,CAAC,aAAa;IACrB,OAAO,CAAC,SAAS;IACjB,OAAO,CAAC,UAAU;IAfpB,MAAM,CAAC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAyB;IACrD,MAAM,CAAC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAA8B;IAE5D,MAAM,CAAC,QAAQ,CAAC,UAAU,EAAE,WAAW,EAAE,CAMvC;IAEF,YACU,cAAc,EAAE,MAAM,EACtB,aAAa,EAAE,MAAM,EACrB,SAAS,EAAE,MAAM,EACjB,UAAU,EAAE,MAAM,EAG3B;IAEK,OAAO,CAAC,OAAO,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC,CAoChD;CACF"}
@@ -10,7 +10,7 @@ export var ContractInstanceMember = /*#__PURE__*/ function(ContractInstanceMembe
10
10
  return ContractInstanceMember;
11
11
  }({});
12
12
  export class GetContractInstance extends Instruction {
13
- indirect;
13
+ addressingMode;
14
14
  addressOffset;
15
15
  dstOffset;
16
16
  memberEnum;
@@ -24,12 +24,12 @@ export class GetContractInstance extends Instruction {
24
24
  OperandType.UINT16,
25
25
  OperandType.UINT8
26
26
  ];
27
- constructor(indirect, addressOffset, dstOffset, memberEnum){
28
- super(), this.indirect = indirect, this.addressOffset = addressOffset, this.dstOffset = dstOffset, this.memberEnum = memberEnum;
27
+ constructor(addressingMode, addressOffset, dstOffset, memberEnum){
28
+ super(), this.addressingMode = addressingMode, this.addressOffset = addressOffset, this.dstOffset = dstOffset, this.memberEnum = memberEnum;
29
29
  }
30
30
  async execute(context) {
31
31
  const memory = context.machineState.memory;
32
- const addressing = Addressing.fromWire(this.indirect);
32
+ const addressing = Addressing.fromWire(this.addressingMode);
33
33
  context.machineState.consumeGas(this.baseGasCost(addressing.indirectOperandsCount(), addressing.relativeOperandsCount()));
34
34
  if (!(this.memberEnum in ContractInstanceMember)) {
35
35
  throw new InstructionExecutionError(`Invalid GETCONSTRACTINSTANCE member enum ${this.memberEnum}`);
@@ -57,9 +57,9 @@ export class GetContractInstance extends Instruction {
57
57
  break;
58
58
  }
59
59
  }
60
- const existsOffset = dstOffset;
61
- const memberValueOffset = dstOffset + 1;
62
- memory.set(existsOffset, new Uint1(exists ? 1 : 0));
63
- memory.set(memberValueOffset, memberValue);
60
+ memory.setSlice(dstOffset, [
61
+ new Uint1(exists ? 1 : 0),
62
+ memberValue
63
+ ]);
64
64
  }
65
65
  }
@@ -11,13 +11,13 @@ export declare class Jump extends Instruction {
11
11
  handlesPC(): boolean;
12
12
  }
13
13
  export declare class JumpI extends Instruction {
14
- private indirect;
14
+ private addressingMode;
15
15
  private condOffset;
16
16
  private loc;
17
17
  static type: string;
18
18
  static readonly opcode: Opcode;
19
19
  static readonly wireFormat: OperandType[];
20
- constructor(indirect: number, condOffset: number, loc: number);
20
+ constructor(addressingMode: number, condOffset: number, loc: number);
21
21
  execute(context: AvmContext): Promise<void>;
22
22
  handlesPC(): boolean;
23
23
  }
@@ -38,4 +38,4 @@ export declare class InternalReturn extends Instruction {
38
38
  execute(context: AvmContext): Promise<void>;
39
39
  handlesPC(): boolean;
40
40
  }
41
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29udHJvbF9mbG93LmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi9zcmMvcHVibGljL2F2bS9vcGNvZGVzL2NvbnRyb2xfZmxvdy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEtBQUssRUFBRSxVQUFVLEVBQUUsTUFBTSxtQkFBbUIsQ0FBQztBQUdwRCxPQUFPLEVBQUUsTUFBTSxFQUFFLFdBQVcsRUFBRSxNQUFNLCtDQUErQyxDQUFDO0FBRXBGLE9BQU8sRUFBRSxXQUFXLEVBQUUsTUFBTSxrQkFBa0IsQ0FBQztBQUUvQyxxQkFBYSxJQUFLLFNBQVEsV0FBVztJQU12QixPQUFPLENBQUMsVUFBVTtJQUw5QixNQUFNLENBQUMsSUFBSSxFQUFFLE1BQU0sQ0FBVTtJQUM3QixNQUFNLENBQUMsUUFBUSxDQUFDLE1BQU0sRUFBRSxNQUFNLENBQWtCO0lBRWhELE1BQU0sQ0FBQyxRQUFRLENBQUMsVUFBVSxFQUFFLFdBQVcsRUFBRSxDQUEyQztJQUVwRixZQUFvQixVQUFVLEVBQUUsTUFBTSxFQUVyQztJQUVZLE9BQU8sQ0FBQyxPQUFPLEVBQUUsVUFBVSxHQUFHLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FJdkQ7SUFFZSxTQUFTLElBQUksT0FBTyxDQUVuQztDQUNGO0FBRUQscUJBQWEsS0FBTSxTQUFRLFdBQVc7SUFhbEMsT0FBTyxDQUFDLFFBQVE7SUFDaEIsT0FBTyxDQUFDLFVBQVU7SUFDbEIsT0FBTyxDQUFDLEdBQUc7SUFkYixNQUFNLENBQUMsSUFBSSxFQUFFLE1BQU0sQ0FBVztJQUM5QixNQUFNLENBQUMsUUFBUSxDQUFDLE1BQU0sRUFBRSxNQUFNLENBQW1CO0lBR2pELE1BQU0sQ0FBQyxRQUFRLENBQUMsVUFBVSxFQUFFLFdBQVcsRUFBRSxDQUt2QztJQUVGLFlBQ1UsUUFBUSxFQUFFLE1BQU0sRUFDaEIsVUFBVSxFQUFFLE1BQU0sRUFDbEIsR0FBRyxFQUFFLE1BQU0sRUFHcEI7SUFFWSxPQUFPLENBQUMsT0FBTyxFQUFFLFVBQVUsR0FBRyxPQUFPLENBQUMsSUFBSSxDQUFDLENBbUJ2RDtJQUVlLFNBQVMsSUFBSSxPQUFPLENBRW5DO0NBQ0Y7QUFFRCxxQkFBYSxZQUFhLFNBQVEsV0FBVztJQU0vQixPQUFPLENBQUMsR0FBRztJQUx2QixNQUFNLENBQUMsUUFBUSxDQUFDLElBQUksRUFBRSxNQUFNLENBQWtCO0lBQzlDLE1BQU0sQ0FBQyxRQUFRLENBQUMsTUFBTSxFQUFFLE1BQU0sQ0FBdUI7SUFFckQsTUFBTSxDQUFDLFFBQVEsQ0FBQyxVQUFVLEVBQUUsV0FBVyxFQUFFLENBQTJDO0lBRXBGLFlBQW9CLEdBQUcsRUFBRSxNQUFNLEVBRTlCO0lBRVksT0FBTyxDQUFDLE9BQU8sRUFBRSxVQUFVLEdBQUcsT0FBTyxDQUFDLElBQUksQ0FBQyxDQVF2RDtJQUVlLFNBQVMsSUFBSSxPQUFPLENBRW5DO0NBQ0Y7QUFFRCxxQkFBYSxjQUFlLFNBQVEsV0FBVztJQUM3QyxNQUFNLENBQUMsUUFBUSxDQUFDLElBQUksRUFBRSxNQUFNLENBQW9CO0lBQ2hELE1BQU0sQ0FBQyxRQUFRLENBQUMsTUFBTSxFQUFFLE1BQU0sQ0FBeUI7SUFFdkQsTUFBTSxDQUFDLFFBQVEsQ0FBQyxVQUFVLEVBQUUsV0FBVyxFQUFFLENBQXVCO0lBRWhFLGNBRUM7SUFFWSxPQUFPLENBQUMsT0FBTyxFQUFFLFVBQVUsR0FBRyxPQUFPLENBQUMsSUFBSSxDQUFDLENBUXZEO0lBRWUsU0FBUyxJQUFJLE9BQU8sQ0FFbkM7Q0FDRiJ9
41
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29udHJvbF9mbG93LmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi9zcmMvcHVibGljL2F2bS9vcGNvZGVzL2NvbnRyb2xfZmxvdy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEtBQUssRUFBRSxVQUFVLEVBQUUsTUFBTSxtQkFBbUIsQ0FBQztBQUdwRCxPQUFPLEVBQUUsTUFBTSxFQUFFLFdBQVcsRUFBRSxNQUFNLCtDQUErQyxDQUFDO0FBRXBGLE9BQU8sRUFBRSxXQUFXLEVBQUUsTUFBTSxrQkFBa0IsQ0FBQztBQUUvQyxxQkFBYSxJQUFLLFNBQVEsV0FBVztJQU12QixPQUFPLENBQUMsVUFBVTtJQUw5QixNQUFNLENBQUMsSUFBSSxFQUFFLE1BQU0sQ0FBVTtJQUM3QixNQUFNLENBQUMsUUFBUSxDQUFDLE1BQU0sRUFBRSxNQUFNLENBQWtCO0lBRWhELE1BQU0sQ0FBQyxRQUFRLENBQUMsVUFBVSxFQUFFLFdBQVcsRUFBRSxDQUEyQztJQUVwRixZQUFvQixVQUFVLEVBQUUsTUFBTSxFQUVyQztJQUVZLE9BQU8sQ0FBQyxPQUFPLEVBQUUsVUFBVSxHQUFHLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FJdkQ7SUFFZSxTQUFTLElBQUksT0FBTyxDQUVuQztDQUNGO0FBRUQscUJBQWEsS0FBTSxTQUFRLFdBQVc7SUFhbEMsT0FBTyxDQUFDLGNBQWM7SUFDdEIsT0FBTyxDQUFDLFVBQVU7SUFDbEIsT0FBTyxDQUFDLEdBQUc7SUFkYixNQUFNLENBQUMsSUFBSSxFQUFFLE1BQU0sQ0FBVztJQUM5QixNQUFNLENBQUMsUUFBUSxDQUFDLE1BQU0sRUFBRSxNQUFNLENBQW1CO0lBR2pELE1BQU0sQ0FBQyxRQUFRLENBQUMsVUFBVSxFQUFFLFdBQVcsRUFBRSxDQUt2QztJQUVGLFlBQ1UsY0FBYyxFQUFFLE1BQU0sRUFDdEIsVUFBVSxFQUFFLE1BQU0sRUFDbEIsR0FBRyxFQUFFLE1BQU0sRUFHcEI7SUFFWSxPQUFPLENBQUMsT0FBTyxFQUFFLFVBQVUsR0FBRyxPQUFPLENBQUMsSUFBSSxDQUFDLENBbUJ2RDtJQUVlLFNBQVMsSUFBSSxPQUFPLENBRW5DO0NBQ0Y7QUFFRCxxQkFBYSxZQUFhLFNBQVEsV0FBVztJQU0vQixPQUFPLENBQUMsR0FBRztJQUx2QixNQUFNLENBQUMsUUFBUSxDQUFDLElBQUksRUFBRSxNQUFNLENBQWtCO0lBQzlDLE1BQU0sQ0FBQyxRQUFRLENBQUMsTUFBTSxFQUFFLE1BQU0sQ0FBdUI7SUFFckQsTUFBTSxDQUFDLFFBQVEsQ0FBQyxVQUFVLEVBQUUsV0FBVyxFQUFFLENBQTJDO0lBRXBGLFlBQW9CLEdBQUcsRUFBRSxNQUFNLEVBRTlCO0lBRVksT0FBTyxDQUFDLE9BQU8sRUFBRSxVQUFVLEdBQUcsT0FBTyxDQUFDLElBQUksQ0FBQyxDQVF2RDtJQUVlLFNBQVMsSUFBSSxPQUFPLENBRW5DO0NBQ0Y7QUFFRCxxQkFBYSxjQUFlLFNBQVEsV0FBVztJQUM3QyxNQUFNLENBQUMsUUFBUSxDQUFDLElBQUksRUFBRSxNQUFNLENBQW9CO0lBQ2hELE1BQU0sQ0FBQyxRQUFRLENBQUMsTUFBTSxFQUFFLE1BQU0sQ0FBeUI7SUFFdkQsTUFBTSxDQUFDLFFBQVEsQ0FBQyxVQUFVLEVBQUUsV0FBVyxFQUFFLENBQXVCO0lBRWhFLGNBRUM7SUFFWSxPQUFPLENBQUMsT0FBTyxFQUFFLFVBQVUsR0FBRyxPQUFPLENBQUMsSUFBSSxDQUFDLENBUXZEO0lBRWUsU0FBUyxJQUFJLE9BQU8sQ0FFbkM7Q0FDRiJ9
@@ -1 +1 @@
1
- {"version":3,"file":"control_flow.d.ts","sourceRoot":"","sources":["../../../../src/public/avm/opcodes/control_flow.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAGpD,OAAO,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,+CAA+C,CAAC;AAEpF,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAE/C,qBAAa,IAAK,SAAQ,WAAW;IAMvB,OAAO,CAAC,UAAU;IAL9B,MAAM,CAAC,IAAI,EAAE,MAAM,CAAU;IAC7B,MAAM,CAAC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAkB;IAEhD,MAAM,CAAC,QAAQ,CAAC,UAAU,EAAE,WAAW,EAAE,CAA2C;IAEpF,YAAoB,UAAU,EAAE,MAAM,EAErC;IAEY,OAAO,CAAC,OAAO,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC,CAIvD;IAEe,SAAS,IAAI,OAAO,CAEnC;CACF;AAED,qBAAa,KAAM,SAAQ,WAAW;IAalC,OAAO,CAAC,QAAQ;IAChB,OAAO,CAAC,UAAU;IAClB,OAAO,CAAC,GAAG;IAdb,MAAM,CAAC,IAAI,EAAE,MAAM,CAAW;IAC9B,MAAM,CAAC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAmB;IAGjD,MAAM,CAAC,QAAQ,CAAC,UAAU,EAAE,WAAW,EAAE,CAKvC;IAEF,YACU,QAAQ,EAAE,MAAM,EAChB,UAAU,EAAE,MAAM,EAClB,GAAG,EAAE,MAAM,EAGpB;IAEY,OAAO,CAAC,OAAO,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC,CAmBvD;IAEe,SAAS,IAAI,OAAO,CAEnC;CACF;AAED,qBAAa,YAAa,SAAQ,WAAW;IAM/B,OAAO,CAAC,GAAG;IALvB,MAAM,CAAC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAkB;IAC9C,MAAM,CAAC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAuB;IAErD,MAAM,CAAC,QAAQ,CAAC,UAAU,EAAE,WAAW,EAAE,CAA2C;IAEpF,YAAoB,GAAG,EAAE,MAAM,EAE9B;IAEY,OAAO,CAAC,OAAO,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC,CAQvD;IAEe,SAAS,IAAI,OAAO,CAEnC;CACF;AAED,qBAAa,cAAe,SAAQ,WAAW;IAC7C,MAAM,CAAC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAoB;IAChD,MAAM,CAAC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAyB;IAEvD,MAAM,CAAC,QAAQ,CAAC,UAAU,EAAE,WAAW,EAAE,CAAuB;IAEhE,cAEC;IAEY,OAAO,CAAC,OAAO,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC,CAQvD;IAEe,SAAS,IAAI,OAAO,CAEnC;CACF"}
1
+ {"version":3,"file":"control_flow.d.ts","sourceRoot":"","sources":["../../../../src/public/avm/opcodes/control_flow.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAGpD,OAAO,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,+CAA+C,CAAC;AAEpF,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAE/C,qBAAa,IAAK,SAAQ,WAAW;IAMvB,OAAO,CAAC,UAAU;IAL9B,MAAM,CAAC,IAAI,EAAE,MAAM,CAAU;IAC7B,MAAM,CAAC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAkB;IAEhD,MAAM,CAAC,QAAQ,CAAC,UAAU,EAAE,WAAW,EAAE,CAA2C;IAEpF,YAAoB,UAAU,EAAE,MAAM,EAErC;IAEY,OAAO,CAAC,OAAO,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC,CAIvD;IAEe,SAAS,IAAI,OAAO,CAEnC;CACF;AAED,qBAAa,KAAM,SAAQ,WAAW;IAalC,OAAO,CAAC,cAAc;IACtB,OAAO,CAAC,UAAU;IAClB,OAAO,CAAC,GAAG;IAdb,MAAM,CAAC,IAAI,EAAE,MAAM,CAAW;IAC9B,MAAM,CAAC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAmB;IAGjD,MAAM,CAAC,QAAQ,CAAC,UAAU,EAAE,WAAW,EAAE,CAKvC;IAEF,YACU,cAAc,EAAE,MAAM,EACtB,UAAU,EAAE,MAAM,EAClB,GAAG,EAAE,MAAM,EAGpB;IAEY,OAAO,CAAC,OAAO,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC,CAmBvD;IAEe,SAAS,IAAI,OAAO,CAEnC;CACF;AAED,qBAAa,YAAa,SAAQ,WAAW;IAM/B,OAAO,CAAC,GAAG;IALvB,MAAM,CAAC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAkB;IAC9C,MAAM,CAAC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAuB;IAErD,MAAM,CAAC,QAAQ,CAAC,UAAU,EAAE,WAAW,EAAE,CAA2C;IAEpF,YAAoB,GAAG,EAAE,MAAM,EAE9B;IAEY,OAAO,CAAC,OAAO,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC,CAQvD;IAEe,SAAS,IAAI,OAAO,CAEnC;CACF;AAED,qBAAa,cAAe,SAAQ,WAAW;IAC7C,MAAM,CAAC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAoB;IAChD,MAAM,CAAC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAyB;IAEvD,MAAM,CAAC,QAAQ,CAAC,UAAU,EAAE,WAAW,EAAE,CAAuB;IAEhE,cAEC;IAEY,OAAO,CAAC,OAAO,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC,CAQvD;IAEe,SAAS,IAAI,OAAO,CAEnC;CACF"}
@@ -24,7 +24,7 @@ export class Jump extends Instruction {
24
24
  }
25
25
  }
26
26
  export class JumpI extends Instruction {
27
- indirect;
27
+ addressingMode;
28
28
  condOffset;
29
29
  loc;
30
30
  static type = 'JUMPI';
@@ -36,12 +36,12 @@ export class JumpI extends Instruction {
36
36
  OperandType.UINT16,
37
37
  OperandType.UINT32
38
38
  ];
39
- constructor(indirect, condOffset, loc){
40
- super(), this.indirect = indirect, this.condOffset = condOffset, this.loc = loc;
39
+ constructor(addressingMode, condOffset, loc){
40
+ super(), this.addressingMode = addressingMode, this.condOffset = condOffset, this.loc = loc;
41
41
  }
42
42
  async execute(context) {
43
43
  const memory = context.machineState.memory;
44
- const addressing = Addressing.fromWire(this.indirect);
44
+ const addressing = Addressing.fromWire(this.addressingMode);
45
45
  context.machineState.consumeGas(this.baseGasCost(addressing.indirectOperandsCount(), addressing.relativeOperandsCount()));
46
46
  const operands = [
47
47
  this.condOffset
@@ -2,7 +2,7 @@ import type { AvmContext } from '../avm_context.js';
2
2
  import { Opcode, OperandType } from '../serialization/instruction_serialization.js';
3
3
  import { Instruction } from './instruction.js';
4
4
  export declare class ToRadixBE extends Instruction {
5
- private indirect;
5
+ private addressingMode;
6
6
  private srcOffset;
7
7
  private radixOffset;
8
8
  private numLimbsOffset;
@@ -11,8 +11,8 @@ export declare class ToRadixBE extends Instruction {
11
11
  static type: string;
12
12
  static readonly opcode: Opcode;
13
13
  static readonly wireFormat: OperandType[];
14
- constructor(indirect: number, srcOffset: number, radixOffset: number, numLimbsOffset: number, outputBitsOffset: number, dstOffset: number);
14
+ constructor(addressingMode: number, srcOffset: number, radixOffset: number, numLimbsOffset: number, outputBitsOffset: number, dstOffset: number);
15
15
  execute(context: AvmContext): Promise<void>;
16
16
  }
17
17
  export declare const MODULUS_LIMBS_PER_RADIX: number[];
18
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29udmVyc2lvbi5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vc3JjL3B1YmxpYy9hdm0vb3Bjb2Rlcy9jb252ZXJzaW9uLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sS0FBSyxFQUFFLFVBQVUsRUFBRSxNQUFNLG1CQUFtQixDQUFDO0FBR3BELE9BQU8sRUFBRSxNQUFNLEVBQUUsV0FBVyxFQUFFLE1BQU0sK0NBQStDLENBQUM7QUFFcEYsT0FBTyxFQUFFLFdBQVcsRUFBRSxNQUFNLGtCQUFrQixDQUFDO0FBRS9DLHFCQUFhLFNBQVUsU0FBUSxXQUFXO0lBZ0J0QyxPQUFPLENBQUMsUUFBUTtJQUNoQixPQUFPLENBQUMsU0FBUztJQUNqQixPQUFPLENBQUMsV0FBVztJQUNuQixPQUFPLENBQUMsY0FBYztJQUN0QixPQUFPLENBQUMsZ0JBQWdCO0lBQ3hCLE9BQU8sQ0FBQyxTQUFTO0lBcEJuQixNQUFNLENBQUMsSUFBSSxFQUFFLE1BQU0sQ0FBZTtJQUNsQyxNQUFNLENBQUMsUUFBUSxDQUFDLE1BQU0sRUFBRSxNQUFNLENBQW9CO0lBR2xELE1BQU0sQ0FBQyxRQUFRLENBQUMsVUFBVSxFQUFFLFdBQVcsRUFBRSxDQVF2QztJQUVGLFlBQ1UsUUFBUSxFQUFFLE1BQU0sRUFDaEIsU0FBUyxFQUFFLE1BQU0sRUFDakIsV0FBVyxFQUFFLE1BQU0sRUFDbkIsY0FBYyxFQUFFLE1BQU0sRUFDdEIsZ0JBQWdCLEVBQUUsTUFBTSxFQUN4QixTQUFTLEVBQUUsTUFBTSxFQUcxQjtJQUVZLE9BQU8sQ0FBQyxPQUFPLEVBQUUsVUFBVSxHQUFHLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0F3RHZEO0NBQ0Y7QUFHRCxlQUFPLE1BQU0sdUJBQXVCLEVBQUUsTUFBTSxFQVUzQyxDQUFDIn0=
18
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29udmVyc2lvbi5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vc3JjL3B1YmxpYy9hdm0vb3Bjb2Rlcy9jb252ZXJzaW9uLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sS0FBSyxFQUFFLFVBQVUsRUFBRSxNQUFNLG1CQUFtQixDQUFDO0FBR3BELE9BQU8sRUFBRSxNQUFNLEVBQUUsV0FBVyxFQUFFLE1BQU0sK0NBQStDLENBQUM7QUFFcEYsT0FBTyxFQUFFLFdBQVcsRUFBRSxNQUFNLGtCQUFrQixDQUFDO0FBRS9DLHFCQUFhLFNBQVUsU0FBUSxXQUFXO0lBZ0J0QyxPQUFPLENBQUMsY0FBYztJQUN0QixPQUFPLENBQUMsU0FBUztJQUNqQixPQUFPLENBQUMsV0FBVztJQUNuQixPQUFPLENBQUMsY0FBYztJQUN0QixPQUFPLENBQUMsZ0JBQWdCO0lBQ3hCLE9BQU8sQ0FBQyxTQUFTO0lBcEJuQixNQUFNLENBQUMsSUFBSSxFQUFFLE1BQU0sQ0FBZTtJQUNsQyxNQUFNLENBQUMsUUFBUSxDQUFDLE1BQU0sRUFBRSxNQUFNLENBQW9CO0lBR2xELE1BQU0sQ0FBQyxRQUFRLENBQUMsVUFBVSxFQUFFLFdBQVcsRUFBRSxDQVF2QztJQUVGLFlBQ1UsY0FBYyxFQUFFLE1BQU0sRUFDdEIsU0FBUyxFQUFFLE1BQU0sRUFDakIsV0FBVyxFQUFFLE1BQU0sRUFDbkIsY0FBYyxFQUFFLE1BQU0sRUFDdEIsZ0JBQWdCLEVBQUUsTUFBTSxFQUN4QixTQUFTLEVBQUUsTUFBTSxFQUcxQjtJQUVZLE9BQU8sQ0FBQyxPQUFPLEVBQUUsVUFBVSxHQUFHLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0F3RHZEO0NBQ0Y7QUFHRCxlQUFPLE1BQU0sdUJBQXVCLEVBQUUsTUFBTSxFQVUzQyxDQUFDIn0=