@aztec/simulator 0.74.0 → 0.75.0-commit.c03ba01a2a4122e43e90d5133ba017e54b90e9d2

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 (304) hide show
  1. package/dest/acvm/acvm.js +18 -21
  2. package/dest/acvm/acvm_types.js +3 -2
  3. package/dest/acvm/deserialize.js +9 -13
  4. package/dest/acvm/index.js +0 -1
  5. package/dest/acvm/oracle/index.js +0 -1
  6. package/dest/acvm/oracle/oracle.js +42 -23
  7. package/dest/acvm/oracle/typed_oracle.js +36 -38
  8. package/dest/acvm/serialize.js +7 -14
  9. package/dest/avm/avm_context.js +24 -27
  10. package/dest/avm/avm_contract_call_result.js +12 -7
  11. package/dest/avm/avm_execution_environment.js +10 -7
  12. package/dest/avm/avm_gas.js +93 -56
  13. package/dest/avm/avm_machine_state.js +60 -61
  14. package/dest/avm/avm_memory_types.js +166 -255
  15. package/dest/avm/avm_simulator.js +68 -47
  16. package/dest/avm/avm_tree.js +282 -276
  17. package/dest/avm/bytecode_utils.js +8 -6
  18. package/dest/avm/errors.js +46 -63
  19. package/dest/avm/fixtures/avm_simulation_tester.js +18 -17
  20. package/dest/avm/fixtures/base_avm_simulation_tester.js +21 -16
  21. package/dest/avm/fixtures/index.js +27 -26
  22. package/dest/avm/fixtures/simple_contract_data_source.js +9 -13
  23. package/dest/avm/index.js +0 -1
  24. package/dest/avm/journal/index.js +0 -1
  25. package/dest/avm/journal/journal.js +147 -200
  26. package/dest/avm/journal/nullifiers.js +43 -46
  27. package/dest/avm/journal/public_storage.js +73 -87
  28. package/dest/avm/opcodes/accrued_substate.js +140 -110
  29. package/dest/avm/opcodes/addressing_mode.js +29 -31
  30. package/dest/avm/opcodes/arithmetic.js +17 -15
  31. package/dest/avm/opcodes/bitwise.js +40 -26
  32. package/dest/avm/opcodes/comparators.js +12 -10
  33. package/dest/avm/opcodes/contract.js +31 -29
  34. package/dest/avm/opcodes/control_flow.js +47 -43
  35. package/dest/avm/opcodes/conversion.js +30 -26
  36. package/dest/avm/opcodes/ec_add.js +35 -34
  37. package/dest/avm/opcodes/environment_getters.js +33 -33
  38. package/dest/avm/opcodes/external_calls.js +83 -74
  39. package/dest/avm/opcodes/hashing.js +69 -61
  40. package/dest/avm/opcodes/index.js +0 -1
  41. package/dest/avm/opcodes/instruction.js +31 -40
  42. package/dest/avm/opcodes/instruction_impl.js +12 -15
  43. package/dest/avm/opcodes/memory.js +177 -156
  44. package/dest/avm/opcodes/misc.js +27 -25
  45. package/dest/avm/opcodes/multi_scalar_mul.js +43 -41
  46. package/dest/avm/opcodes/storage.js +28 -25
  47. package/dest/avm/serialization/buffer_cursor.js +4 -4
  48. package/dest/avm/serialization/bytecode_serialization.js +292 -89
  49. package/dest/avm/serialization/instruction_serialization.js +67 -28
  50. package/dest/avm/test_utils.js +6 -9
  51. package/dest/client/client_execution_context.js +197 -219
  52. package/dest/client/db_oracle.js +4 -7
  53. package/dest/client/execution_note_cache.js +80 -81
  54. package/dest/client/index.js +0 -1
  55. package/dest/client/pick_notes.js +27 -30
  56. package/dest/client/private_execution.js +13 -14
  57. package/dest/client/simulator.js +44 -48
  58. package/dest/client/unconstrained_execution.js +8 -11
  59. package/dest/client/view_data_oracle.js +130 -139
  60. package/dest/common/debug_fn_name.js +1 -4
  61. package/dest/common/errors.js +30 -39
  62. package/dest/common/hashed_values_cache.js +16 -20
  63. package/dest/common/index.js +0 -1
  64. package/dest/common/message_load_oracle_inputs.js +7 -7
  65. package/dest/common/simulation_provider.js +3 -6
  66. package/dest/common.js +0 -1
  67. package/dest/providers/acvm_native.js +46 -32
  68. package/dest/providers/acvm_wasm.js +18 -10
  69. package/dest/providers/acvm_wasm_with_blobs.js +2 -5
  70. package/dest/providers/factory.js +5 -5
  71. package/dest/providers/index.js +0 -1
  72. package/dest/public/bytecode_errors.js +1 -2
  73. package/dest/public/db_interfaces.js +1 -2
  74. package/dest/public/execution.js +2 -4
  75. package/dest/public/executor_metrics.js +16 -12
  76. package/dest/public/fee_payment.js +2 -5
  77. package/dest/public/fixtures/index.js +0 -1
  78. package/dest/public/fixtures/public_tx_simulation_tester.js +13 -17
  79. package/dest/public/fixtures/utils.js +11 -14
  80. package/dest/public/index.js +0 -1
  81. package/dest/public/public_db_sources.js +79 -87
  82. package/dest/public/public_processor.js +310 -306
  83. package/dest/public/public_processor_metrics.js +46 -27
  84. package/dest/public/public_tx_context.js +97 -118
  85. package/dest/public/public_tx_simulator.js +299 -314
  86. package/dest/public/side_effect_errors.js +1 -2
  87. package/dest/public/side_effect_trace.js +44 -71
  88. package/dest/public/side_effect_trace_interface.js +1 -2
  89. package/dest/public/unique_class_ids.js +22 -27
  90. package/dest/public/utils.js +16 -11
  91. package/dest/server.js +0 -1
  92. package/dest/stats/index.js +0 -1
  93. package/dest/stats/stats.js +1 -2
  94. package/dest/test/utils.js +5 -4
  95. package/package.json +11 -11
  96. package/src/acvm/oracle/typed_oracle.ts +34 -34
  97. package/src/avm/avm_machine_state.ts +18 -14
  98. package/src/avm/avm_memory_types.ts +43 -183
  99. package/src/avm/avm_simulator.ts +37 -11
  100. package/src/avm/opcodes/accrued_substate.ts +7 -21
  101. package/src/avm/opcodes/addressing_mode.ts +9 -2
  102. package/src/avm/opcodes/arithmetic.ts +1 -3
  103. package/src/avm/opcodes/bitwise.ts +2 -6
  104. package/src/avm/opcodes/comparators.ts +1 -3
  105. package/src/avm/opcodes/contract.ts +1 -3
  106. package/src/avm/opcodes/control_flow.ts +1 -9
  107. package/src/avm/opcodes/conversion.ts +1 -3
  108. package/src/avm/opcodes/ec_add.ts +1 -3
  109. package/src/avm/opcodes/environment_getters.ts +1 -3
  110. package/src/avm/opcodes/external_calls.ts +3 -6
  111. package/src/avm/opcodes/hashing.ts +3 -9
  112. package/src/avm/opcodes/memory.ts +6 -20
  113. package/src/avm/opcodes/misc.ts +1 -3
  114. package/src/avm/opcodes/multi_scalar_mul.ts +1 -7
  115. package/src/avm/opcodes/storage.ts +2 -6
  116. package/src/client/index.ts +2 -2
  117. package/dest/acvm/acvm.d.ts +0 -35
  118. package/dest/acvm/acvm.d.ts.map +0 -1
  119. package/dest/acvm/acvm_types.d.ts +0 -10
  120. package/dest/acvm/acvm_types.d.ts.map +0 -1
  121. package/dest/acvm/deserialize.d.ts +0 -36
  122. package/dest/acvm/deserialize.d.ts.map +0 -1
  123. package/dest/acvm/index.d.ts +0 -6
  124. package/dest/acvm/index.d.ts.map +0 -1
  125. package/dest/acvm/oracle/index.d.ts +0 -14
  126. package/dest/acvm/oracle/index.d.ts.map +0 -1
  127. package/dest/acvm/oracle/oracle.d.ts +0 -49
  128. package/dest/acvm/oracle/oracle.d.ts.map +0 -1
  129. package/dest/acvm/oracle/typed_oracle.d.ts +0 -75
  130. package/dest/acvm/oracle/typed_oracle.d.ts.map +0 -1
  131. package/dest/acvm/serialize.d.ts +0 -20
  132. package/dest/acvm/serialize.d.ts.map +0 -1
  133. package/dest/avm/avm_context.d.ts +0 -39
  134. package/dest/avm/avm_context.d.ts.map +0 -1
  135. package/dest/avm/avm_contract_call_result.d.ts +0 -30
  136. package/dest/avm/avm_contract_call_result.d.ts.map +0 -1
  137. package/dest/avm/avm_execution_environment.d.ts +0 -21
  138. package/dest/avm/avm_execution_environment.d.ts.map +0 -1
  139. package/dest/avm/avm_gas.d.ts +0 -60
  140. package/dest/avm/avm_gas.d.ts.map +0 -1
  141. package/dest/avm/avm_machine_state.d.ts +0 -93
  142. package/dest/avm/avm_machine_state.d.ts.map +0 -1
  143. package/dest/avm/avm_memory_types.d.ts +0 -310
  144. package/dest/avm/avm_memory_types.d.ts.map +0 -1
  145. package/dest/avm/avm_simulator.d.ts +0 -37
  146. package/dest/avm/avm_simulator.d.ts.map +0 -1
  147. package/dest/avm/avm_tree.d.ts +0 -281
  148. package/dest/avm/avm_tree.d.ts.map +0 -1
  149. package/dest/avm/bytecode_utils.d.ts +0 -5
  150. package/dest/avm/bytecode_utils.d.ts.map +0 -1
  151. package/dest/avm/errors.d.ts +0 -121
  152. package/dest/avm/errors.d.ts.map +0 -1
  153. package/dest/avm/fixtures/avm_simulation_tester.d.ts +0 -21
  154. package/dest/avm/fixtures/avm_simulation_tester.d.ts.map +0 -1
  155. package/dest/avm/fixtures/base_avm_simulation_tester.d.ts +0 -35
  156. package/dest/avm/fixtures/base_avm_simulation_tester.d.ts.map +0 -1
  157. package/dest/avm/fixtures/index.d.ts +0 -67
  158. package/dest/avm/fixtures/index.d.ts.map +0 -1
  159. package/dest/avm/fixtures/simple_contract_data_source.d.ts +0 -31
  160. package/dest/avm/fixtures/simple_contract_data_source.d.ts.map +0 -1
  161. package/dest/avm/index.d.ts +0 -4
  162. package/dest/avm/index.d.ts.map +0 -1
  163. package/dest/avm/journal/index.d.ts +0 -2
  164. package/dest/avm/journal/index.d.ts.map +0 -1
  165. package/dest/avm/journal/journal.d.ts +0 -176
  166. package/dest/avm/journal/journal.d.ts.map +0 -1
  167. package/dest/avm/journal/nullifiers.d.ts +0 -62
  168. package/dest/avm/journal/nullifiers.d.ts.map +0 -1
  169. package/dest/avm/journal/public_storage.d.ts +0 -66
  170. package/dest/avm/journal/public_storage.d.ts.map +0 -1
  171. package/dest/avm/opcodes/accrued_substate.d.ts +0 -75
  172. package/dest/avm/opcodes/accrued_substate.d.ts.map +0 -1
  173. package/dest/avm/opcodes/addressing_mode.d.ts +0 -27
  174. package/dest/avm/opcodes/addressing_mode.d.ts.map +0 -1
  175. package/dest/avm/opcodes/arithmetic.d.ts +0 -37
  176. package/dest/avm/opcodes/arithmetic.d.ts.map +0 -1
  177. package/dest/avm/opcodes/bitwise.d.ts +0 -50
  178. package/dest/avm/opcodes/bitwise.d.ts.map +0 -1
  179. package/dest/avm/opcodes/comparators.d.ts +0 -25
  180. package/dest/avm/opcodes/comparators.d.ts.map +0 -1
  181. package/dest/avm/opcodes/contract.d.ts +0 -21
  182. package/dest/avm/opcodes/contract.d.ts.map +0 -1
  183. package/dest/avm/opcodes/control_flow.d.ts +0 -41
  184. package/dest/avm/opcodes/control_flow.d.ts.map +0 -1
  185. package/dest/avm/opcodes/conversion.d.ts +0 -17
  186. package/dest/avm/opcodes/conversion.d.ts.map +0 -1
  187. package/dest/avm/opcodes/ec_add.d.ts +0 -19
  188. package/dest/avm/opcodes/ec_add.d.ts.map +0 -1
  189. package/dest/avm/opcodes/environment_getters.d.ts +0 -28
  190. package/dest/avm/opcodes/environment_getters.d.ts.map +0 -1
  191. package/dest/avm/opcodes/external_calls.d.ts +0 -50
  192. package/dest/avm/opcodes/external_calls.d.ts.map +0 -1
  193. package/dest/avm/opcodes/hashing.d.ts +0 -36
  194. package/dest/avm/opcodes/hashing.d.ts.map +0 -1
  195. package/dest/avm/opcodes/index.d.ts +0 -16
  196. package/dest/avm/opcodes/index.d.ts.map +0 -1
  197. package/dest/avm/opcodes/instruction.d.ts +0 -70
  198. package/dest/avm/opcodes/instruction.d.ts.map +0 -1
  199. package/dest/avm/opcodes/instruction_impl.d.ts +0 -19
  200. package/dest/avm/opcodes/instruction_impl.d.ts.map +0 -1
  201. package/dest/avm/opcodes/memory.d.ts +0 -74
  202. package/dest/avm/opcodes/memory.d.ts.map +0 -1
  203. package/dest/avm/opcodes/misc.d.ts +0 -17
  204. package/dest/avm/opcodes/misc.d.ts.map +0 -1
  205. package/dest/avm/opcodes/multi_scalar_mul.d.ts +0 -16
  206. package/dest/avm/opcodes/multi_scalar_mul.d.ts.map +0 -1
  207. package/dest/avm/opcodes/storage.d.ts +0 -24
  208. package/dest/avm/opcodes/storage.d.ts.map +0 -1
  209. package/dest/avm/serialization/buffer_cursor.d.ts +0 -28
  210. package/dest/avm/serialization/buffer_cursor.d.ts.map +0 -1
  211. package/dest/avm/serialization/bytecode_serialization.d.ts +0 -21
  212. package/dest/avm/serialization/bytecode_serialization.d.ts.map +0 -1
  213. package/dest/avm/serialization/instruction_serialization.d.ts +0 -105
  214. package/dest/avm/serialization/instruction_serialization.d.ts.map +0 -1
  215. package/dest/avm/test_utils.d.ts +0 -16
  216. package/dest/avm/test_utils.d.ts.map +0 -1
  217. package/dest/client/client_execution_context.d.ts +0 -214
  218. package/dest/client/client_execution_context.d.ts.map +0 -1
  219. package/dest/client/db_oracle.d.ts +0 -229
  220. package/dest/client/db_oracle.d.ts.map +0 -1
  221. package/dest/client/execution_note_cache.d.ts +0 -93
  222. package/dest/client/execution_note_cache.d.ts.map +0 -1
  223. package/dest/client/index.d.ts +0 -15
  224. package/dest/client/index.d.ts.map +0 -1
  225. package/dest/client/pick_notes.d.ts +0 -85
  226. package/dest/client/pick_notes.d.ts.map +0 -1
  227. package/dest/client/private_execution.d.ts +0 -19
  228. package/dest/client/private_execution.d.ts.map +0 -1
  229. package/dest/client/simulator.d.ts +0 -60
  230. package/dest/client/simulator.d.ts.map +0 -1
  231. package/dest/client/unconstrained_execution.d.ts +0 -10
  232. package/dest/client/unconstrained_execution.d.ts.map +0 -1
  233. package/dest/client/view_data_oracle.d.ts +0 -159
  234. package/dest/client/view_data_oracle.d.ts.map +0 -1
  235. package/dest/common/debug_fn_name.d.ts +0 -4
  236. package/dest/common/debug_fn_name.d.ts.map +0 -1
  237. package/dest/common/errors.d.ts +0 -54
  238. package/dest/common/errors.d.ts.map +0 -1
  239. package/dest/common/hashed_values_cache.d.ts +0 -28
  240. package/dest/common/hashed_values_cache.d.ts.map +0 -1
  241. package/dest/common/index.d.ts +0 -3
  242. package/dest/common/index.d.ts.map +0 -1
  243. package/dest/common/message_load_oracle_inputs.d.ts +0 -15
  244. package/dest/common/message_load_oracle_inputs.d.ts.map +0 -1
  245. package/dest/common/simulation_provider.d.ts +0 -19
  246. package/dest/common/simulation_provider.d.ts.map +0 -1
  247. package/dest/common.d.ts +0 -2
  248. package/dest/common.d.ts.map +0 -1
  249. package/dest/providers/acvm_native.d.ts +0 -40
  250. package/dest/providers/acvm_native.d.ts.map +0 -1
  251. package/dest/providers/acvm_wasm.d.ts +0 -15
  252. package/dest/providers/acvm_wasm.d.ts.map +0 -1
  253. package/dest/providers/acvm_wasm_with_blobs.d.ts +0 -19
  254. package/dest/providers/acvm_wasm_with_blobs.d.ts.map +0 -1
  255. package/dest/providers/factory.d.ts +0 -12
  256. package/dest/providers/factory.d.ts.map +0 -1
  257. package/dest/providers/index.d.ts +0 -5
  258. package/dest/providers/index.d.ts.map +0 -1
  259. package/dest/public/bytecode_errors.d.ts +0 -4
  260. package/dest/public/bytecode_errors.d.ts.map +0 -1
  261. package/dest/public/db_interfaces.d.ts +0 -105
  262. package/dest/public/db_interfaces.d.ts.map +0 -1
  263. package/dest/public/execution.d.ts +0 -102
  264. package/dest/public/execution.d.ts.map +0 -1
  265. package/dest/public/executor_metrics.d.ts +0 -13
  266. package/dest/public/executor_metrics.d.ts.map +0 -1
  267. package/dest/public/fee_payment.d.ts +0 -11
  268. package/dest/public/fee_payment.d.ts.map +0 -1
  269. package/dest/public/fixtures/index.d.ts +0 -3
  270. package/dest/public/fixtures/index.d.ts.map +0 -1
  271. package/dest/public/fixtures/public_tx_simulation_tester.d.ts +0 -21
  272. package/dest/public/fixtures/public_tx_simulation_tester.d.ts.map +0 -1
  273. package/dest/public/fixtures/utils.d.ts +0 -17
  274. package/dest/public/fixtures/utils.d.ts.map +0 -1
  275. package/dest/public/index.d.ts +0 -9
  276. package/dest/public/index.d.ts.map +0 -1
  277. package/dest/public/public_db_sources.d.ts +0 -81
  278. package/dest/public/public_db_sources.d.ts.map +0 -1
  279. package/dest/public/public_processor.d.ts +0 -72
  280. package/dest/public/public_processor.d.ts.map +0 -1
  281. package/dest/public/public_processor_metrics.d.ts +0 -27
  282. package/dest/public/public_processor_metrics.d.ts.map +0 -1
  283. package/dest/public/public_tx_context.d.ts +0 -131
  284. package/dest/public/public_tx_context.d.ts.map +0 -1
  285. package/dest/public/public_tx_simulator.d.ts +0 -99
  286. package/dest/public/public_tx_simulator.d.ts.map +0 -1
  287. package/dest/public/side_effect_errors.d.ts +0 -4
  288. package/dest/public/side_effect_errors.d.ts.map +0 -1
  289. package/dest/public/side_effect_trace.d.ts +0 -126
  290. package/dest/public/side_effect_trace.d.ts.map +0 -1
  291. package/dest/public/side_effect_trace_interface.d.ts +0 -32
  292. package/dest/public/side_effect_trace_interface.d.ts.map +0 -1
  293. package/dest/public/unique_class_ids.d.ts +0 -37
  294. package/dest/public/unique_class_ids.d.ts.map +0 -1
  295. package/dest/public/utils.d.ts +0 -5
  296. package/dest/public/utils.d.ts.map +0 -1
  297. package/dest/server.d.ts +0 -6
  298. package/dest/server.d.ts.map +0 -1
  299. package/dest/stats/index.d.ts +0 -2
  300. package/dest/stats/index.d.ts.map +0 -1
  301. package/dest/stats/stats.d.ts +0 -4
  302. package/dest/stats/stats.d.ts.map +0 -1
  303. package/dest/test/utils.d.ts +0 -12
  304. package/dest/test/utils.d.ts.map +0 -1
@@ -5,17 +5,31 @@ import { Opcode, OperandType } from '../serialization/instruction_serialization.
5
5
  import { Addressing } from './addressing_mode.js';
6
6
  import { Instruction } from './instruction.js';
7
7
  export class NoteHashExists extends Instruction {
8
- constructor(indirect, noteHashOffset, leafIndexOffset, existsOffset) {
9
- super();
10
- this.indirect = indirect;
11
- this.noteHashOffset = noteHashOffset;
12
- this.leafIndexOffset = leafIndexOffset;
13
- this.existsOffset = existsOffset;
8
+ indirect;
9
+ noteHashOffset;
10
+ leafIndexOffset;
11
+ existsOffset;
12
+ static type = 'NOTEHASHEXISTS';
13
+ static opcode = Opcode.NOTEHASHEXISTS;
14
+ // Informs (de)serialization. See Instruction.deserialize.
15
+ static wireFormat = [
16
+ OperandType.UINT8,
17
+ OperandType.UINT8,
18
+ OperandType.UINT16,
19
+ OperandType.UINT16,
20
+ OperandType.UINT16
21
+ ];
22
+ constructor(indirect, noteHashOffset, leafIndexOffset, existsOffset){
23
+ super(), this.indirect = indirect, this.noteHashOffset = noteHashOffset, this.leafIndexOffset = leafIndexOffset, this.existsOffset = existsOffset;
14
24
  }
15
25
  async execute(context) {
16
- const memory = context.machineState.memory.track(this.type);
26
+ const memory = context.machineState.memory;
17
27
  context.machineState.consumeGas(this.gasCost());
18
- const operands = [this.noteHashOffset, this.leafIndexOffset, this.existsOffset];
28
+ const operands = [
29
+ this.noteHashOffset,
30
+ this.leafIndexOffset,
31
+ this.existsOffset
32
+ ];
19
33
  const addressing = Addressing.fromWire(this.indirect, operands.length);
20
34
  const [noteHashOffset, leafIndexOffset, existsOffset] = addressing.resolve(operands, memory);
21
35
  memory.checkTags(TypeTag.FIELD, noteHashOffset, leafIndexOffset);
@@ -24,29 +38,28 @@ export class NoteHashExists extends Instruction {
24
38
  const leafIndex = memory.get(leafIndexOffset).toFr();
25
39
  const exists = await context.persistableState.checkNoteHashExists(context.environment.address, noteHash, leafIndex);
26
40
  memory.set(existsOffset, exists ? new Uint1(1) : new Uint1(0));
27
- memory.assert({ reads: 2, writes: 1, addressing });
28
41
  }
29
42
  }
30
- NoteHashExists.type = 'NOTEHASHEXISTS';
31
- NoteHashExists.opcode = Opcode.NOTEHASHEXISTS;
32
- // Informs (de)serialization. See Instruction.deserialize.
33
- NoteHashExists.wireFormat = [
34
- OperandType.UINT8,
35
- OperandType.UINT8,
36
- OperandType.UINT16,
37
- OperandType.UINT16,
38
- OperandType.UINT16,
39
- ];
40
43
  export class EmitNoteHash extends Instruction {
41
- constructor(indirect, noteHashOffset) {
42
- super();
43
- this.indirect = indirect;
44
- this.noteHashOffset = noteHashOffset;
44
+ indirect;
45
+ noteHashOffset;
46
+ static type = 'EMITNOTEHASH';
47
+ static opcode = Opcode.EMITNOTEHASH;
48
+ // Informs (de)serialization. See Instruction.deserialize.
49
+ static wireFormat = [
50
+ OperandType.UINT8,
51
+ OperandType.UINT8,
52
+ OperandType.UINT16
53
+ ];
54
+ constructor(indirect, noteHashOffset){
55
+ super(), this.indirect = indirect, this.noteHashOffset = noteHashOffset;
45
56
  }
46
57
  async execute(context) {
47
- const memory = context.machineState.memory.track(this.type);
58
+ const memory = context.machineState.memory;
48
59
  context.machineState.consumeGas(this.gasCost());
49
- const operands = [this.noteHashOffset];
60
+ const operands = [
61
+ this.noteHashOffset
62
+ ];
50
63
  const addressing = Addressing.fromWire(this.indirect, operands.length);
51
64
  const [noteHashOffset] = addressing.resolve(operands, memory);
52
65
  memory.checkTag(TypeTag.FIELD, noteHashOffset);
@@ -55,25 +68,34 @@ export class EmitNoteHash extends Instruction {
55
68
  }
56
69
  const noteHash = memory.get(noteHashOffset).toFr();
57
70
  await context.persistableState.writeNoteHash(context.environment.address, noteHash);
58
- memory.assert({ reads: 1, addressing });
59
71
  }
60
72
  }
61
- EmitNoteHash.type = 'EMITNOTEHASH';
62
- EmitNoteHash.opcode = Opcode.EMITNOTEHASH;
63
- // Informs (de)serialization. See Instruction.deserialize.
64
- EmitNoteHash.wireFormat = [OperandType.UINT8, OperandType.UINT8, OperandType.UINT16];
65
73
  export class NullifierExists extends Instruction {
66
- constructor(indirect, nullifierOffset, addressOffset, existsOffset) {
67
- super();
68
- this.indirect = indirect;
69
- this.nullifierOffset = nullifierOffset;
70
- this.addressOffset = addressOffset;
71
- this.existsOffset = existsOffset;
74
+ indirect;
75
+ nullifierOffset;
76
+ addressOffset;
77
+ existsOffset;
78
+ static type = 'NULLIFIEREXISTS';
79
+ static opcode = Opcode.NULLIFIEREXISTS;
80
+ // Informs (de)serialization. See Instruction.deserialize.
81
+ static wireFormat = [
82
+ OperandType.UINT8,
83
+ OperandType.UINT8,
84
+ OperandType.UINT16,
85
+ OperandType.UINT16,
86
+ OperandType.UINT16
87
+ ];
88
+ constructor(indirect, nullifierOffset, addressOffset, existsOffset){
89
+ super(), this.indirect = indirect, this.nullifierOffset = nullifierOffset, this.addressOffset = addressOffset, this.existsOffset = existsOffset;
72
90
  }
73
91
  async execute(context) {
74
- const memory = context.machineState.memory.track(this.type);
92
+ const memory = context.machineState.memory;
75
93
  context.machineState.consumeGas(this.gasCost());
76
- const operands = [this.nullifierOffset, this.addressOffset, this.existsOffset];
94
+ const operands = [
95
+ this.nullifierOffset,
96
+ this.addressOffset,
97
+ this.existsOffset
98
+ ];
77
99
  const addressing = Addressing.fromWire(this.indirect, operands.length);
78
100
  const [nullifierOffset, addressOffset, existsOffset] = addressing.resolve(operands, memory);
79
101
  memory.checkTags(TypeTag.FIELD, nullifierOffset, addressOffset);
@@ -81,67 +103,73 @@ export class NullifierExists extends Instruction {
81
103
  const address = memory.get(addressOffset).toAztecAddress();
82
104
  const exists = await context.persistableState.checkNullifierExists(address, nullifier);
83
105
  memory.set(existsOffset, exists ? new Uint1(1) : new Uint1(0));
84
- memory.assert({ reads: 2, writes: 1, addressing });
85
106
  }
86
107
  }
87
- NullifierExists.type = 'NULLIFIEREXISTS';
88
- NullifierExists.opcode = Opcode.NULLIFIEREXISTS;
89
- // Informs (de)serialization. See Instruction.deserialize.
90
- NullifierExists.wireFormat = [
91
- OperandType.UINT8,
92
- OperandType.UINT8,
93
- OperandType.UINT16,
94
- OperandType.UINT16,
95
- OperandType.UINT16,
96
- ];
97
108
  export class EmitNullifier extends Instruction {
98
- constructor(indirect, nullifierOffset) {
99
- super();
100
- this.indirect = indirect;
101
- this.nullifierOffset = nullifierOffset;
109
+ indirect;
110
+ nullifierOffset;
111
+ static type = 'EMITNULLIFIER';
112
+ static opcode = Opcode.EMITNULLIFIER;
113
+ // Informs (de)serialization. See Instruction.deserialize.
114
+ static wireFormat = [
115
+ OperandType.UINT8,
116
+ OperandType.UINT8,
117
+ OperandType.UINT16
118
+ ];
119
+ constructor(indirect, nullifierOffset){
120
+ super(), this.indirect = indirect, this.nullifierOffset = nullifierOffset;
102
121
  }
103
122
  async execute(context) {
104
123
  if (context.environment.isStaticCall) {
105
124
  throw new StaticCallAlterationError();
106
125
  }
107
- const memory = context.machineState.memory.track(this.type);
126
+ const memory = context.machineState.memory;
108
127
  context.machineState.consumeGas(this.gasCost());
109
- const operands = [this.nullifierOffset];
128
+ const operands = [
129
+ this.nullifierOffset
130
+ ];
110
131
  const addressing = Addressing.fromWire(this.indirect, operands.length);
111
132
  const [nullifierOffset] = addressing.resolve(operands, memory);
112
133
  memory.checkTag(TypeTag.FIELD, nullifierOffset);
113
134
  const nullifier = memory.get(nullifierOffset).toFr();
114
135
  try {
115
136
  await context.persistableState.writeNullifier(context.environment.address, nullifier);
116
- }
117
- catch (e) {
137
+ } catch (e) {
118
138
  if (e instanceof NullifierCollisionError) {
119
139
  // Error is known/expected, raise as InstructionExecutionError that the will lead the simulator to revert this call
120
140
  throw new InstructionExecutionError(`Attempted to emit duplicate nullifier ${nullifier} (contract address: ${context.environment.address}).`);
121
- }
122
- else {
141
+ } else {
123
142
  throw e;
124
143
  }
125
144
  }
126
- memory.assert({ reads: 1, addressing });
127
145
  }
128
146
  }
129
- EmitNullifier.type = 'EMITNULLIFIER';
130
- EmitNullifier.opcode = Opcode.EMITNULLIFIER;
131
- // Informs (de)serialization. See Instruction.deserialize.
132
- EmitNullifier.wireFormat = [OperandType.UINT8, OperandType.UINT8, OperandType.UINT16];
133
147
  export class L1ToL2MessageExists extends Instruction {
134
- constructor(indirect, msgHashOffset, msgLeafIndexOffset, existsOffset) {
135
- super();
136
- this.indirect = indirect;
137
- this.msgHashOffset = msgHashOffset;
138
- this.msgLeafIndexOffset = msgLeafIndexOffset;
139
- this.existsOffset = existsOffset;
148
+ indirect;
149
+ msgHashOffset;
150
+ msgLeafIndexOffset;
151
+ existsOffset;
152
+ static type = 'L1TOL2MSGEXISTS';
153
+ static opcode = Opcode.L1TOL2MSGEXISTS;
154
+ // Informs (de)serialization. See Instruction.deserialize.
155
+ static wireFormat = [
156
+ OperandType.UINT8,
157
+ OperandType.UINT8,
158
+ OperandType.UINT16,
159
+ OperandType.UINT16,
160
+ OperandType.UINT16
161
+ ];
162
+ constructor(indirect, msgHashOffset, msgLeafIndexOffset, existsOffset){
163
+ super(), this.indirect = indirect, this.msgHashOffset = msgHashOffset, this.msgLeafIndexOffset = msgLeafIndexOffset, this.existsOffset = existsOffset;
140
164
  }
141
165
  async execute(context) {
142
- const memory = context.machineState.memory.track(this.type);
166
+ const memory = context.machineState.memory;
143
167
  context.machineState.consumeGas(this.gasCost());
144
- const operands = [this.msgHashOffset, this.msgLeafIndexOffset, this.existsOffset];
168
+ const operands = [
169
+ this.msgHashOffset,
170
+ this.msgLeafIndexOffset,
171
+ this.existsOffset
172
+ ];
145
173
  const addressing = Addressing.fromWire(this.indirect, operands.length);
146
174
  const [msgHashOffset, msgLeafIndexOffset, existsOffset] = addressing.resolve(operands, memory);
147
175
  memory.checkTags(TypeTag.FIELD, msgHashOffset, msgLeafIndexOffset);
@@ -149,32 +177,34 @@ export class L1ToL2MessageExists extends Instruction {
149
177
  const msgLeafIndex = memory.get(msgLeafIndexOffset).toFr();
150
178
  const exists = await context.persistableState.checkL1ToL2MessageExists(context.environment.address, msgHash, msgLeafIndex);
151
179
  memory.set(existsOffset, exists ? new Uint1(1) : new Uint1(0));
152
- memory.assert({ reads: 2, writes: 1, addressing });
153
180
  }
154
181
  }
155
- L1ToL2MessageExists.type = 'L1TOL2MSGEXISTS';
156
- L1ToL2MessageExists.opcode = Opcode.L1TOL2MSGEXISTS;
157
- // Informs (de)serialization. See Instruction.deserialize.
158
- L1ToL2MessageExists.wireFormat = [
159
- OperandType.UINT8,
160
- OperandType.UINT8,
161
- OperandType.UINT16,
162
- OperandType.UINT16,
163
- OperandType.UINT16,
164
- ];
165
182
  export class EmitUnencryptedLog extends Instruction {
166
- constructor(indirect, logOffset, logSizeOffset) {
167
- super();
168
- this.indirect = indirect;
169
- this.logOffset = logOffset;
170
- this.logSizeOffset = logSizeOffset;
183
+ indirect;
184
+ logOffset;
185
+ logSizeOffset;
186
+ // TODO(#11124): rename unencrypted -> public
187
+ static type = 'EMITUNENCRYPTEDLOG';
188
+ static opcode = Opcode.EMITUNENCRYPTEDLOG;
189
+ // Informs (de)serialization. See Instruction.deserialize.
190
+ static wireFormat = [
191
+ OperandType.UINT8,
192
+ OperandType.UINT8,
193
+ OperandType.UINT16,
194
+ OperandType.UINT16
195
+ ];
196
+ constructor(indirect, logOffset, logSizeOffset){
197
+ super(), this.indirect = indirect, this.logOffset = logOffset, this.logSizeOffset = logSizeOffset;
171
198
  }
172
199
  async execute(context) {
173
200
  if (context.environment.isStaticCall) {
174
201
  throw new StaticCallAlterationError();
175
202
  }
176
- const memory = context.machineState.memory.track(this.type);
177
- const operands = [this.logOffset, this.logSizeOffset];
203
+ const memory = context.machineState.memory;
204
+ const operands = [
205
+ this.logOffset,
206
+ this.logSizeOffset
207
+ ];
178
208
  const addressing = Addressing.fromWire(this.indirect, operands.length);
179
209
  const [logOffset, logSizeOffset] = addressing.resolve(operands, memory);
180
210
  memory.checkTag(TypeTag.UINT32, logSizeOffset);
@@ -182,41 +212,41 @@ export class EmitUnencryptedLog extends Instruction {
182
212
  memory.checkTagsRange(TypeTag.FIELD, logOffset, logSize);
183
213
  const contractAddress = context.environment.address;
184
214
  context.machineState.consumeGas(this.gasCost(logSize));
185
- const log = memory.getSlice(logOffset, logSize).map(f => f.toFr());
215
+ const log = memory.getSlice(logOffset, logSize).map((f)=>f.toFr());
186
216
  context.persistableState.writePublicLog(contractAddress, log);
187
- memory.assert({ reads: 1 + logSize, addressing });
188
217
  }
189
218
  }
190
- // TODO(#11124): rename unencrypted -> public
191
- EmitUnencryptedLog.type = 'EMITUNENCRYPTEDLOG';
192
- EmitUnencryptedLog.opcode = Opcode.EMITUNENCRYPTEDLOG;
193
- // Informs (de)serialization. See Instruction.deserialize.
194
- EmitUnencryptedLog.wireFormat = [OperandType.UINT8, OperandType.UINT8, OperandType.UINT16, OperandType.UINT16];
195
219
  export class SendL2ToL1Message extends Instruction {
196
- constructor(indirect, recipientOffset, contentOffset) {
197
- super();
198
- this.indirect = indirect;
199
- this.recipientOffset = recipientOffset;
200
- this.contentOffset = contentOffset;
220
+ indirect;
221
+ recipientOffset;
222
+ contentOffset;
223
+ static type = 'SENDL2TOL1MSG';
224
+ static opcode = Opcode.SENDL2TOL1MSG;
225
+ // Informs (de)serialization. See Instruction.deserialize.
226
+ static wireFormat = [
227
+ OperandType.UINT8,
228
+ OperandType.UINT8,
229
+ OperandType.UINT16,
230
+ OperandType.UINT16
231
+ ];
232
+ constructor(indirect, recipientOffset, contentOffset){
233
+ super(), this.indirect = indirect, this.recipientOffset = recipientOffset, this.contentOffset = contentOffset;
201
234
  }
202
235
  async execute(context) {
203
236
  if (context.environment.isStaticCall) {
204
237
  throw new StaticCallAlterationError();
205
238
  }
206
- const memory = context.machineState.memory.track(this.type);
239
+ const memory = context.machineState.memory;
207
240
  context.machineState.consumeGas(this.gasCost());
208
- const operands = [this.recipientOffset, this.contentOffset];
241
+ const operands = [
242
+ this.recipientOffset,
243
+ this.contentOffset
244
+ ];
209
245
  const addressing = Addressing.fromWire(this.indirect, operands.length);
210
246
  const [recipientOffset, contentOffset] = addressing.resolve(operands, memory);
211
247
  memory.checkTags(TypeTag.FIELD, recipientOffset, contentOffset);
212
248
  const recipient = memory.get(recipientOffset).toFr();
213
249
  const content = memory.get(contentOffset).toFr();
214
250
  context.persistableState.writeL2ToL1Message(context.environment.address, recipient, content);
215
- memory.assert({ reads: 2, addressing });
216
251
  }
217
252
  }
218
- SendL2ToL1Message.type = 'SENDL2TOL1MSG';
219
- SendL2ToL1Message.opcode = Opcode.SENDL2TOL1MSG;
220
- // Informs (de)serialization. See Instruction.deserialize.
221
- SendL2ToL1Message.wireFormat = [OperandType.UINT8, OperandType.UINT8, OperandType.UINT16, OperandType.UINT16];
222
- //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"accrued_substate.js","sourceRoot":"","sources":["../../../src/avm/opcodes/accrued_substate.ts"],"names":[],"mappings":"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"}
@@ -1,18 +1,16 @@
1
1
  import { strict as assert } from 'assert';
2
2
  import { TaggedMemory } from '../avm_memory_types.js';
3
3
  import { RelativeAddressOutOfRangeError } from '../errors.js';
4
- export var AddressingMode;
5
- (function (AddressingMode) {
4
+ export var AddressingMode = /*#__PURE__*/ function(AddressingMode) {
6
5
  AddressingMode[AddressingMode["DIRECT"] = 0] = "DIRECT";
7
6
  AddressingMode[AddressingMode["INDIRECT"] = 1] = "INDIRECT";
8
7
  AddressingMode[AddressingMode["RELATIVE"] = 2] = "RELATIVE";
9
8
  AddressingMode[AddressingMode["INDIRECT_RELATIVE"] = 3] = "INDIRECT_RELATIVE";
10
- })(AddressingMode || (AddressingMode = {}));
11
- /** A class to represent the addressing mode of an instruction. */
12
- export class Addressing {
13
- constructor(
14
- /** The addressing mode for each operand. The length of this array is the number of operands of the instruction. */
15
- modePerOperand) {
9
+ return AddressingMode;
10
+ }({});
11
+ /** A class to represent the addressing mode of an instruction. */ export class Addressing {
12
+ modePerOperand;
13
+ constructor(/** The addressing mode for each operand. The length of this array is the number of operands of the instruction. */ modePerOperand){
16
14
  this.modePerOperand = modePerOperand;
17
15
  }
18
16
  // TODO(facundo): 8 for backwards compatibility.
@@ -20,10 +18,8 @@ export class Addressing {
20
18
  // The modes are stored in the wire format as a byte, with each bit representing the mode for an operand.
21
19
  // The least significant bit represents the zeroth operand, and the most significant bit represents the last operand.
22
20
  const modes = new Array(numOperands);
23
- for (let i = 0; i < numOperands; i++) {
24
- modes[i] =
25
- (((wireModes >> i) & 1) * AddressingMode.INDIRECT) |
26
- (((wireModes >> (i + numOperands)) & 1) * AddressingMode.RELATIVE);
21
+ for(let i = 0; i < numOperands; i++){
22
+ modes[i] = (wireModes >> i & 1) * 1 | (wireModes >> i + numOperands & 1) * 2;
27
23
  }
28
24
  return new Addressing(modes);
29
25
  }
@@ -31,41 +27,44 @@ export class Addressing {
31
27
  // The modes are stored in the wire format as a byte, with each bit representing the mode for an operand.
32
28
  // The least significant bit represents the zeroth operand, and the least significant bit represents the last operand.
33
29
  let wire = 0;
34
- for (let i = 0; i < this.modePerOperand.length; i++) {
35
- if (this.modePerOperand[i] & AddressingMode.INDIRECT) {
30
+ for(let i = 0; i < this.modePerOperand.length; i++){
31
+ if (this.modePerOperand[i] & 1) {
36
32
  wire |= 1 << i;
37
33
  }
38
- if (this.modePerOperand[i] & AddressingMode.RELATIVE) {
39
- wire |= 1 << (this.modePerOperand.length + i);
34
+ if (this.modePerOperand[i] & 2) {
35
+ wire |= 1 << this.modePerOperand.length + i;
40
36
  }
41
37
  }
42
38
  return wire;
43
39
  }
44
- /** Returns how many operands use the given addressing mode. */
45
- count(mode) {
46
- return this.modePerOperand.filter(m => (m & mode) !== 0).length;
40
+ /** Returns how many operands use the given addressing mode. */ count(mode) {
41
+ return this.modePerOperand.filter((m)=>(m & mode) !== 0).length;
47
42
  }
48
43
  /**
49
- * Resolves the offsets using the addressing mode.
50
- * @param offsets The offsets to resolve.
51
- * @param mem The memory to use for resolution.
52
- * @returns The resolved offsets. The length of the returned array is the same as the length of the input array.
53
- */
54
- resolve(offsets, mem) {
44
+ * Resolves the offsets using the addressing mode.
45
+ * @param offsets The offsets to resolve.
46
+ * @param mem The memory to use for resolution.
47
+ * @returns The resolved offsets. The length of the returned array is the same as the length of the input array.
48
+ */ resolve(offsets, mem) {
55
49
  assert(offsets.length <= this.modePerOperand.length);
56
50
  const resolved = new Array(offsets.length);
57
- for (const [i, offset] of offsets.entries()) {
51
+ let didRelativeOnce = false;
52
+ let baseAddr = 0;
53
+ for (const [i, offset] of offsets.entries()){
58
54
  const mode = this.modePerOperand[i];
59
55
  resolved[i] = offset;
60
- if (mode & AddressingMode.RELATIVE) {
61
- mem.checkIsValidMemoryOffsetTag(0);
62
- const baseAddr = Number(mem.get(0).toBigInt());
56
+ if (mode & 2) {
57
+ if (!didRelativeOnce) {
58
+ mem.checkIsValidMemoryOffsetTag(0);
59
+ baseAddr = Number(mem.get(0).toBigInt());
60
+ didRelativeOnce = true;
61
+ }
63
62
  resolved[i] += baseAddr;
64
63
  if (resolved[i] >= TaggedMemory.MAX_MEMORY_SIZE) {
65
64
  throw new RelativeAddressOutOfRangeError(baseAddr, offset);
66
65
  }
67
66
  }
68
- if (mode & AddressingMode.INDIRECT) {
67
+ if (mode & 1) {
69
68
  mem.checkIsValidMemoryOffsetTag(resolved[i]);
70
69
  resolved[i] = Number(mem.get(resolved[i]).toBigInt());
71
70
  }
@@ -73,4 +72,3 @@ export class Addressing {
73
72
  return resolved;
74
73
  }
75
74
  }
76
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYWRkcmVzc2luZ19tb2RlLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL2F2bS9vcGNvZGVzL2FkZHJlc3NpbmdfbW9kZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsTUFBTSxJQUFJLE1BQU0sRUFBRSxNQUFNLFFBQVEsQ0FBQztBQUUxQyxPQUFPLEVBQUUsWUFBWSxFQUE4QixNQUFNLHdCQUF3QixDQUFDO0FBQ2xGLE9BQU8sRUFBRSw4QkFBOEIsRUFBRSxNQUFNLGNBQWMsQ0FBQztBQUU5RCxNQUFNLENBQU4sSUFBWSxjQUtYO0FBTEQsV0FBWSxjQUFjO0lBQ3hCLHVEQUFVLENBQUE7SUFDViwyREFBWSxDQUFBO0lBQ1osMkRBQVksQ0FBQTtJQUNaLDZFQUFxQixDQUFBO0FBQ3ZCLENBQUMsRUFMVyxjQUFjLEtBQWQsY0FBYyxRQUt6QjtBQUVELGtFQUFrRTtBQUNsRSxNQUFNLE9BQU8sVUFBVTtJQUNyQjtJQUNFLG1IQUFtSDtJQUNsRyxjQUFnQztRQUFoQyxtQkFBYyxHQUFkLGNBQWMsQ0FBa0I7SUFDaEQsQ0FBQztJQUVKLGdEQUFnRDtJQUN6QyxNQUFNLENBQUMsUUFBUSxDQUFDLFNBQWlCLEVBQUUsY0FBc0IsQ0FBQztRQUMvRCx5R0FBeUc7UUFDekcscUhBQXFIO1FBQ3JILE1BQU0sS0FBSyxHQUFHLElBQUksS0FBSyxDQUFpQixXQUFXLENBQUMsQ0FBQztRQUNyRCxLQUFLLElBQUksQ0FBQyxHQUFHLENBQUMsRUFBRSxDQUFDLEdBQUcsV0FBVyxFQUFFLENBQUMsRUFBRSxFQUFFLENBQUM7WUFDckMsS0FBSyxDQUFDLENBQUMsQ0FBQztnQkFDTixDQUFDLENBQUMsQ0FBQyxTQUFTLElBQUksQ0FBQyxDQUFDLEdBQUcsQ0FBQyxDQUFDLEdBQUcsY0FBYyxDQUFDLFFBQVEsQ0FBQztvQkFDbEQsQ0FBQyxDQUFDLENBQUMsU0FBUyxJQUFJLENBQUMsQ0FBQyxHQUFHLFdBQVcsQ0FBQyxD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
@@ -1,13 +1,17 @@
1
- import { TaggedMemory, TypeTag, } from '../avm_memory_types.js';
1
+ import { TaggedMemory, TypeTag } from '../avm_memory_types.js';
2
2
  import { ArithmeticError } from '../errors.js';
3
3
  import { Opcode } from '../serialization/instruction_serialization.js';
4
4
  import { Addressing } from './addressing_mode.js';
5
5
  import { ThreeOperandInstruction } from './instruction_impl.js';
6
6
  export class ThreeOperandArithmeticInstruction extends ThreeOperandInstruction {
7
7
  async execute(context) {
8
- const memory = context.machineState.memory.track(this.type);
8
+ const memory = context.machineState.memory;
9
9
  context.machineState.consumeGas(this.gasCost());
10
- const operands = [this.aOffset, this.bOffset, this.dstOffset];
10
+ const operands = [
11
+ this.aOffset,
12
+ this.bOffset,
13
+ this.dstOffset
14
+ ];
11
15
  const addressing = Addressing.fromWire(this.indirect, operands.length);
12
16
  const [aOffset, bOffset, dstOffset] = addressing.resolve(operands, memory);
13
17
  this.checkTags(memory, aOffset, bOffset);
@@ -15,34 +19,35 @@ export class ThreeOperandArithmeticInstruction extends ThreeOperandInstruction {
15
19
  const b = memory.get(bOffset);
16
20
  const dest = this.compute(a, b);
17
21
  memory.set(dstOffset, dest);
18
- memory.assert({ reads: 2, writes: 1, addressing });
19
22
  }
20
23
  checkTags(memory, aOffset, bOffset) {
21
24
  memory.checkTagsAreSame(aOffset, bOffset);
22
25
  }
23
26
  }
24
27
  export class Add extends ThreeOperandArithmeticInstruction {
28
+ static type = 'ADD';
29
+ static opcode = Opcode.ADD_8;
25
30
  compute(a, b) {
26
31
  return a.add(b);
27
32
  }
28
33
  }
29
- Add.type = 'ADD';
30
- Add.opcode = Opcode.ADD_8; // FIXME: needed for gas.
31
34
  export class Sub extends ThreeOperandArithmeticInstruction {
35
+ static type = 'SUB';
36
+ static opcode = Opcode.SUB_8;
32
37
  compute(a, b) {
33
38
  return a.sub(b);
34
39
  }
35
40
  }
36
- Sub.type = 'SUB';
37
- Sub.opcode = Opcode.SUB_8; // FIXME: needed for gas.
38
41
  export class Mul extends ThreeOperandArithmeticInstruction {
42
+ static type = 'MUL';
43
+ static opcode = Opcode.MUL_8;
39
44
  compute(a, b) {
40
45
  return a.mul(b);
41
46
  }
42
47
  }
43
- Mul.type = 'MUL';
44
- Mul.opcode = Opcode.MUL_8; // FIXME: needed for gas.
45
48
  export class Div extends ThreeOperandArithmeticInstruction {
49
+ static type = 'DIV';
50
+ static opcode = Opcode.DIV_8;
46
51
  compute(a, b) {
47
52
  if (b.toBigInt() === 0n) {
48
53
  throw new ArithmeticError('Division by zero');
@@ -54,9 +59,9 @@ export class Div extends ThreeOperandArithmeticInstruction {
54
59
  TaggedMemory.checkIsIntegralTag(memory.getTag(aOffset)); // Follows that bOffset tag is also of integral type
55
60
  }
56
61
  }
57
- Div.type = 'DIV';
58
- Div.opcode = Opcode.DIV_8; // FIXME: needed for gas.
59
62
  export class FieldDiv extends ThreeOperandArithmeticInstruction {
63
+ static type = 'FDIV';
64
+ static opcode = Opcode.FDIV_8;
60
65
  compute(a, b) {
61
66
  // return (a as Field).fdiv(b as Field);
62
67
  return a.fdiv(b);
@@ -66,6 +71,3 @@ export class FieldDiv extends ThreeOperandArithmeticInstruction {
66
71
  memory.checkTag(TypeTag.FIELD, aOffset); // Follows that bOffset has also tag of type Field
67
72
  }
68
73
  }
69
- FieldDiv.type = 'FDIV';
70
- FieldDiv.opcode = Opcode.FDIV_8; // FIXME: needed for gas.
71
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYXJpdGhtZXRpYy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9hdm0vb3Bjb2Rlcy9hcml0aG1ldGljLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUNBLE9BQU8sRUFHTCxZQUFZLEVBRVosT0FBTyxHQUNSLE1BQU0sd0JBQXdCLENBQUM7QUFDaEMsT0FBTyxFQUFFLGVBQWUsRUFBRSxNQUFNLGNBQWMsQ0FBQztBQUMvQyxPQUFPLEVBQUUsTUFBTSxFQUFFLE1BQU0sK0NBQStDLENBQUM7QUFDdkUsT0FBTyxFQUFFLFVBQVUsRUFBRSxNQUFNLHNCQUFzQixDQUFDO0FBQ2xELE9BQU8sRUFBRSx1QkFBdUIsRUFBRSxNQUFNLHVCQUF1QixDQUFDO0FBRWhFLE1BQU0sT0FBZ0IsaUNBQWtDLFNBQVEsdUJBQXVCO0lBQzlFLEtBQUssQ0FBQyxPQUFPLENBQUMsT0FBbUI7UUFDdEMsTUFBTSxNQUFNLEdBQUcsT0FBTyxDQUFDLFlBQVksQ0FBQyxNQUFNLENBQUMsS0FBSyxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsQ0FBQztRQUM1RCxPQUFPLENBQUMsWUFBWSxDQUFDLFVBQVUsQ0FBQyxJQUFJLENBQUMsT0FBTyxFQUFFLENBQUMsQ0FBQztRQUVoRCxNQUFNLFFBQVEsR0FBRyxDQUFDLElBQUksQ0FBQyxPQUFPLEVBQUUsSUFBSSxDQUFDLE9BQU8sRUFBRSxJQUFJLENBQUMsU0FBUyxDQUFDLENBQUM7UUFDOUQsTUFBTSxVQUFVLEdBQUcsVUFBVSxDQUFDLFFBQVEsQ0FBQyxJQUFJLENBQUMsUUFBUSxFQUFFLFFBQVEsQ0FBQyxNQUFNLENBQUMsQ0FBQztRQUN2RSxNQUFNLENBQUMsT0FBTyxFQUFFLE9BQU8sRUFBRSxTQUFTLENBQUMsR0FBRyxVQUFVLENBQUMsT0FBTyxDQUFDLFFBQVEsRUFBRSxNQUFNLENBQUMsQ0FBQztRQUMzRSxJQUFJLENBQUMsU0FBUyxDQUFDLE1BQU0sRUFBRSxPQUFPLEVBQUUsT0FBTyxDQUFD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