@aztec/simulator 0.0.0-test.1 → 0.0.1-fake-ceab37513c
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +6 -0
- package/dest/client.d.ts +5 -3
- package/dest/client.d.ts.map +1 -1
- package/dest/client.js +4 -2
- package/dest/common/errors.d.ts +4 -7
- package/dest/common/errors.d.ts.map +1 -1
- package/dest/common/errors.js +51 -32
- package/dest/common/index.d.ts +0 -1
- package/dest/common/index.d.ts.map +1 -1
- package/dest/common/index.js +0 -1
- package/dest/private/acvm/acvm.d.ts +11 -5
- package/dest/private/acvm/acvm.d.ts.map +1 -1
- package/dest/private/acvm/acvm.js +10 -16
- package/dest/private/acvm/acvm_types.d.ts +1 -1
- package/dest/private/acvm/acvm_types.d.ts.map +1 -1
- package/dest/private/acvm/deserialize.d.ts +17 -18
- package/dest/private/acvm/deserialize.d.ts.map +1 -1
- package/dest/private/acvm/deserialize.js +31 -23
- package/dest/private/acvm/index.d.ts +0 -1
- package/dest/private/acvm/index.d.ts.map +1 -1
- package/dest/private/acvm/index.js +0 -1
- package/dest/private/acvm/serialize.d.ts +19 -2
- package/dest/private/acvm/serialize.d.ts.map +1 -1
- package/dest/private/acvm/serialize.js +53 -0
- package/dest/private/{providers/acvm_native.d.ts → acvm_native.d.ts} +10 -10
- package/dest/private/acvm_native.d.ts.map +1 -0
- package/dest/private/{providers/acvm_native.js → acvm_native.js} +11 -7
- package/dest/private/acvm_wasm.d.ts +15 -0
- package/dest/private/acvm_wasm.d.ts.map +1 -0
- package/dest/private/{providers/acvm_wasm.js → acvm_wasm.js} +22 -19
- package/dest/private/acvm_wasm_with_blobs.d.ts +20 -0
- package/dest/private/acvm_wasm_with_blobs.d.ts.map +1 -0
- package/dest/private/acvm_wasm_with_blobs.js +35 -0
- package/dest/private/circuit_recording/circuit_recorder.d.ts +108 -0
- package/dest/private/circuit_recording/circuit_recorder.d.ts.map +1 -0
- package/dest/private/circuit_recording/circuit_recorder.js +209 -0
- package/dest/private/circuit_recording/file_circuit_recorder.d.ts +31 -0
- package/dest/private/circuit_recording/file_circuit_recorder.d.ts.map +1 -0
- package/dest/private/circuit_recording/file_circuit_recorder.js +135 -0
- package/dest/private/circuit_recording/memory_circuit_recorder.d.ts +5 -0
- package/dest/private/circuit_recording/memory_circuit_recorder.d.ts.map +1 -0
- package/dest/private/circuit_recording/memory_circuit_recorder.js +9 -0
- package/dest/private/circuit_recording/simulator_recorder_wrapper.d.ts +21 -0
- package/dest/private/circuit_recording/simulator_recorder_wrapper.d.ts.map +1 -0
- package/dest/private/circuit_recording/simulator_recorder_wrapper.js +44 -0
- package/dest/private/circuit_simulator.d.ts +35 -0
- package/dest/private/circuit_simulator.d.ts.map +1 -0
- package/dest/private/circuit_simulator.js +43 -0
- package/dest/private/factory.d.ts +12 -0
- package/dest/private/factory.d.ts.map +1 -0
- package/dest/private/{providers/factory.js → factory.js} +2 -2
- package/dest/public/avm/avm_context.d.ts +5 -5
- package/dest/public/avm/avm_context.d.ts.map +1 -1
- package/dest/public/avm/avm_contract_call_result.d.ts +4 -2
- package/dest/public/avm/avm_contract_call_result.d.ts.map +1 -1
- package/dest/public/avm/avm_contract_call_result.js +11 -7
- package/dest/public/avm/avm_execution_environment.d.ts +2 -1
- package/dest/public/avm/avm_execution_environment.d.ts.map +1 -1
- package/dest/public/avm/avm_execution_environment.js +4 -2
- package/dest/public/avm/avm_gas.d.ts +4 -20
- package/dest/public/avm/avm_gas.d.ts.map +1 -1
- package/dest/public/avm/avm_gas.js +27 -35
- package/dest/public/avm/avm_machine_state.d.ts +2 -0
- package/dest/public/avm/avm_machine_state.d.ts.map +1 -1
- package/dest/public/avm/avm_machine_state.js +2 -0
- package/dest/public/avm/avm_memory_types.d.ts +98 -87
- package/dest/public/avm/avm_memory_types.d.ts.map +1 -1
- package/dest/public/avm/avm_memory_types.js +17 -6
- package/dest/public/avm/avm_simulator.d.ts +4 -5
- package/dest/public/avm/avm_simulator.d.ts.map +1 -1
- package/dest/public/avm/avm_simulator.js +13 -18
- package/dest/public/avm/avm_simulator_interface.d.ts +9 -0
- package/dest/public/avm/avm_simulator_interface.d.ts.map +1 -0
- package/dest/public/avm/avm_simulator_interface.js +3 -0
- package/dest/public/avm/errors.d.ts +1 -16
- package/dest/public/avm/errors.d.ts.map +1 -1
- package/dest/public/avm/errors.js +0 -37
- package/dest/public/avm/fixtures/avm_simulation_tester.d.ts +3 -3
- package/dest/public/avm/fixtures/avm_simulation_tester.d.ts.map +1 -1
- package/dest/public/avm/fixtures/avm_simulation_tester.js +10 -11
- package/dest/public/avm/fixtures/base_avm_simulation_tester.d.ts +4 -4
- package/dest/public/avm/fixtures/base_avm_simulation_tester.d.ts.map +1 -1
- package/dest/public/avm/fixtures/base_avm_simulation_tester.js +16 -15
- package/dest/public/avm/fixtures/initializers.d.ts +43 -0
- package/dest/public/avm/fixtures/initializers.d.ts.map +1 -0
- package/dest/public/avm/fixtures/initializers.js +42 -0
- package/dest/public/avm/fixtures/utils.d.ts +38 -0
- package/dest/public/avm/fixtures/utils.d.ts.map +1 -0
- package/dest/public/avm/fixtures/utils.js +95 -0
- package/dest/public/avm/index.d.ts +0 -2
- package/dest/public/avm/index.d.ts.map +1 -1
- package/dest/public/avm/index.js +0 -2
- package/dest/public/avm/opcodes/accrued_substate.d.ts.map +1 -1
- package/dest/public/avm/opcodes/accrued_substate.js +22 -19
- package/dest/public/avm/opcodes/addressing_mode.d.ts +11 -7
- package/dest/public/avm/opcodes/addressing_mode.d.ts.map +1 -1
- package/dest/public/avm/opcodes/addressing_mode.js +48 -27
- package/dest/public/avm/opcodes/arithmetic.d.ts +11 -1
- package/dest/public/avm/opcodes/arithmetic.d.ts.map +1 -1
- package/dest/public/avm/opcodes/arithmetic.js +16 -2
- package/dest/public/avm/opcodes/bitwise.d.ts +5 -13
- package/dest/public/avm/opcodes/bitwise.d.ts.map +1 -1
- package/dest/public/avm/opcodes/bitwise.js +19 -26
- package/dest/public/avm/opcodes/comparators.d.ts.map +1 -1
- package/dest/public/avm/opcodes/comparators.js +3 -3
- package/dest/public/avm/opcodes/contract.d.ts +1 -2
- package/dest/public/avm/opcodes/contract.d.ts.map +1 -1
- package/dest/public/avm/opcodes/contract.js +9 -10
- package/dest/public/avm/opcodes/control_flow.d.ts.map +1 -1
- package/dest/public/avm/opcodes/control_flow.js +10 -8
- package/dest/public/avm/opcodes/conversion.d.ts +1 -0
- package/dest/public/avm/opcodes/conversion.d.ts.map +1 -1
- package/dest/public/avm/opcodes/conversion.js +264 -3
- package/dest/public/avm/opcodes/ec_add.d.ts.map +1 -1
- package/dest/public/avm/opcodes/ec_add.js +2 -2
- package/dest/public/avm/opcodes/environment_getters.d.ts +2 -2
- package/dest/public/avm/opcodes/environment_getters.d.ts.map +1 -1
- package/dest/public/avm/opcodes/environment_getters.js +12 -12
- package/dest/public/avm/opcodes/external_calls.d.ts +8 -7
- package/dest/public/avm/opcodes/external_calls.d.ts.map +1 -1
- package/dest/public/avm/opcodes/external_calls.js +39 -33
- package/dest/public/avm/opcodes/hashing.d.ts.map +1 -1
- package/dest/public/avm/opcodes/hashing.js +6 -6
- package/dest/public/avm/opcodes/instruction.d.ts +14 -10
- package/dest/public/avm/opcodes/instruction.d.ts.map +1 -1
- package/dest/public/avm/opcodes/instruction.js +18 -13
- package/dest/public/avm/opcodes/memory.d.ts +4 -4
- package/dest/public/avm/opcodes/memory.d.ts.map +1 -1
- package/dest/public/avm/opcodes/memory.js +37 -33
- package/dest/public/avm/opcodes/misc.d.ts.map +1 -1
- package/dest/public/avm/opcodes/misc.js +17 -12
- package/dest/public/avm/opcodes/storage.d.ts.map +1 -1
- package/dest/public/avm/opcodes/storage.js +7 -5
- package/dest/public/avm/revert_reason.d.ts +18 -0
- package/dest/public/avm/revert_reason.d.ts.map +1 -0
- package/dest/public/avm/revert_reason.js +38 -0
- package/dest/public/avm/serialization/buffer_cursor.d.ts +0 -2
- package/dest/public/avm/serialization/buffer_cursor.d.ts.map +1 -1
- package/dest/public/avm/serialization/bytecode_serialization.d.ts +2 -6
- package/dest/public/avm/serialization/bytecode_serialization.d.ts.map +1 -1
- package/dest/public/avm/serialization/bytecode_serialization.js +70 -69
- package/dest/public/avm/serialization/instruction_serialization.d.ts +5 -4
- package/dest/public/avm/serialization/instruction_serialization.d.ts.map +1 -1
- package/dest/public/avm/serialization/instruction_serialization.js +60 -35
- package/dest/public/avm/test_utils.d.ts +10 -13
- package/dest/public/avm/test_utils.d.ts.map +1 -1
- package/dest/public/avm/test_utils.js +12 -17
- package/dest/public/db_interfaces.d.ts +56 -0
- package/dest/public/db_interfaces.d.ts.map +1 -0
- package/dest/public/db_interfaces.js +3 -0
- package/dest/public/debug_fn_name.d.ts +5 -0
- package/dest/public/debug_fn_name.d.ts.map +1 -0
- package/dest/public/debug_fn_name.js +9 -0
- package/dest/public/executor_metrics.d.ts +10 -3
- package/dest/public/executor_metrics.d.ts.map +1 -1
- package/dest/public/executor_metrics.js +37 -6
- package/dest/public/executor_metrics_interface.d.ts +9 -0
- package/dest/public/executor_metrics_interface.d.ts.map +1 -0
- package/dest/public/executor_metrics_interface.js +1 -0
- package/dest/public/fixtures/amm_test.d.ts +10 -0
- package/dest/public/fixtures/amm_test.d.ts.map +1 -0
- package/dest/public/fixtures/amm_test.js +213 -0
- package/dest/public/fixtures/bulk_test.d.ts +6 -0
- package/dest/public/fixtures/bulk_test.d.ts.map +1 -0
- package/dest/public/fixtures/bulk_test.js +393 -0
- package/dest/public/fixtures/index.d.ts +6 -0
- package/dest/public/fixtures/index.d.ts.map +1 -1
- package/dest/public/fixtures/index.js +6 -0
- package/dest/public/fixtures/minimal_public_tx.d.ts +9 -0
- package/dest/public/fixtures/minimal_public_tx.d.ts.map +1 -0
- package/dest/public/fixtures/minimal_public_tx.js +43 -0
- package/dest/public/fixtures/public_tx_simulation_tester.d.ts +33 -13
- package/dest/public/fixtures/public_tx_simulation_tester.d.ts.map +1 -1
- package/dest/public/fixtures/public_tx_simulation_tester.js +90 -70
- package/dest/public/{avm/fixtures → fixtures}/simple_contract_data_source.d.ts +6 -6
- package/dest/public/fixtures/simple_contract_data_source.d.ts.map +1 -0
- package/dest/public/{avm/fixtures → fixtures}/simple_contract_data_source.js +31 -10
- package/dest/public/fixtures/token_test.d.ts +8 -0
- package/dest/public/fixtures/token_test.d.ts.map +1 -0
- package/dest/public/fixtures/token_test.js +95 -0
- package/dest/public/fixtures/utils.d.ts +16 -3
- package/dest/public/fixtures/utils.d.ts.map +1 -1
- package/dest/public/fixtures/utils.js +100 -58
- package/dest/public/hinting_db_sources.d.ts +68 -0
- package/dest/public/hinting_db_sources.d.ts.map +1 -0
- package/dest/public/hinting_db_sources.js +294 -0
- package/dest/public/index.d.ts +4 -8
- package/dest/public/index.d.ts.map +1 -1
- package/dest/public/index.js +4 -7
- package/dest/public/public_db_sources.d.ts +30 -39
- package/dest/public/public_db_sources.d.ts.map +1 -1
- package/dest/public/public_db_sources.js +141 -67
- package/dest/public/public_processor/guarded_merkle_tree.d.ts +47 -0
- package/dest/public/public_processor/guarded_merkle_tree.d.ts.map +1 -0
- package/dest/public/public_processor/guarded_merkle_tree.js +105 -0
- package/dest/public/public_processor/public_processor.d.ts +19 -29
- package/dest/public/public_processor/public_processor.d.ts.map +1 -1
- package/dest/public/public_processor/public_processor.js +133 -94
- package/dest/public/public_processor/public_processor_metrics.d.ts +2 -2
- package/dest/public/public_processor/public_processor_metrics.d.ts.map +1 -1
- package/dest/public/public_processor/public_processor_metrics.js +1 -1
- package/dest/public/public_tx_simulator/index.d.ts +3 -0
- package/dest/public/public_tx_simulator/index.d.ts.map +1 -0
- package/dest/public/public_tx_simulator/index.js +2 -0
- package/dest/public/public_tx_simulator/measured_public_tx_simulator.d.ts +23 -0
- package/dest/public/public_tx_simulator/measured_public_tx_simulator.d.ts.map +1 -0
- package/dest/public/public_tx_simulator/measured_public_tx_simulator.js +52 -0
- package/dest/public/public_tx_simulator/public_tx_context.d.ts +17 -29
- package/dest/public/public_tx_simulator/public_tx_context.d.ts.map +1 -1
- package/dest/public/public_tx_simulator/public_tx_context.js +59 -91
- package/dest/public/public_tx_simulator/public_tx_simulator.d.ts +27 -42
- package/dest/public/public_tx_simulator/public_tx_simulator.d.ts.map +1 -1
- package/dest/public/public_tx_simulator/public_tx_simulator.js +128 -171
- package/dest/public/public_tx_simulator/telemetry_public_tx_simulator.d.ts +20 -0
- package/dest/public/public_tx_simulator/telemetry_public_tx_simulator.d.ts.map +1 -0
- package/dest/public/public_tx_simulator/telemetry_public_tx_simulator.js +39 -0
- package/dest/public/side_effect_trace.d.ts +10 -62
- package/dest/public/side_effect_trace.d.ts.map +1 -1
- package/dest/public/side_effect_trace.js +43 -108
- package/dest/public/side_effect_trace_interface.d.ts +5 -22
- package/dest/public/side_effect_trace_interface.d.ts.map +1 -1
- package/dest/public/state_manager/index.d.ts +2 -0
- package/dest/public/state_manager/index.d.ts.map +1 -0
- package/dest/public/state_manager/index.js +1 -0
- package/dest/public/{avm/journal → state_manager}/nullifiers.d.ts +2 -2
- package/dest/public/state_manager/nullifiers.d.ts.map +1 -0
- package/dest/public/{avm/journal → state_manager}/nullifiers.js +2 -2
- package/dest/public/{avm/journal → state_manager}/public_storage.d.ts +2 -2
- package/dest/public/state_manager/public_storage.d.ts.map +1 -0
- package/dest/public/{avm/journal/journal.d.ts → state_manager/state_manager.d.ts} +37 -85
- package/dest/public/state_manager/state_manager.d.ts.map +1 -0
- package/dest/public/state_manager/state_manager.js +352 -0
- package/dest/public/test_executor_metrics.d.ts +54 -0
- package/dest/public/test_executor_metrics.d.ts.map +1 -0
- package/dest/public/test_executor_metrics.js +306 -0
- package/dest/public/unique_class_ids.d.ts.map +1 -1
- package/dest/public/utils.d.ts +2 -4
- package/dest/public/utils.d.ts.map +1 -1
- package/dest/public/utils.js +4 -21
- package/dest/server.d.ts +6 -3
- package/dest/server.d.ts.map +1 -1
- package/dest/server.js +5 -2
- package/dest/testing.d.ts +2 -0
- package/dest/testing.d.ts.map +1 -0
- package/dest/testing.js +1 -0
- package/package.json +31 -30
- package/src/client.ts +5 -3
- package/src/common/errors.ts +79 -44
- package/src/common/index.ts +0 -1
- package/src/private/acvm/acvm.ts +17 -32
- package/src/private/acvm/acvm_types.ts +1 -1
- package/src/private/acvm/deserialize.ts +35 -29
- package/src/private/acvm/index.ts +0 -1
- package/src/private/acvm/serialize.ts +63 -0
- package/src/private/{providers/acvm_native.ts → acvm_native.ts} +31 -15
- package/src/private/acvm_wasm.ts +72 -0
- package/src/private/acvm_wasm_with_blobs.ts +54 -0
- package/src/private/circuit_recording/circuit_recorder.ts +260 -0
- package/src/private/circuit_recording/file_circuit_recorder.ts +158 -0
- package/src/private/circuit_recording/memory_circuit_recorder.ts +11 -0
- package/src/private/circuit_recording/simulator_recorder_wrapper.ts +91 -0
- package/src/private/circuit_simulator.ts +90 -0
- package/src/private/{providers/factory.ts → factory.ts} +6 -6
- package/src/public/avm/avm_context.ts +4 -4
- package/src/public/avm/avm_contract_call_result.ts +17 -5
- package/src/public/avm/avm_execution_environment.ts +7 -1
- package/src/public/avm/avm_gas.ts +23 -35
- package/src/public/avm/avm_machine_state.ts +5 -0
- package/src/public/avm/avm_memory_types.ts +19 -6
- package/src/public/avm/avm_simulator.ts +30 -29
- package/src/public/avm/avm_simulator_interface.ts +8 -0
- package/src/public/avm/errors.ts +1 -53
- package/src/public/avm/fixtures/avm_simulation_tester.ts +19 -18
- package/src/public/avm/fixtures/base_avm_simulation_tester.ts +15 -14
- package/src/public/avm/fixtures/initializers.ts +103 -0
- package/src/public/avm/fixtures/utils.ts +150 -0
- package/src/public/avm/index.ts +0 -2
- package/src/public/avm/opcodes/accrued_substate.ts +62 -27
- package/src/public/avm/opcodes/addressing_mode.ts +57 -33
- package/src/public/avm/opcodes/arithmetic.ts +24 -2
- package/src/public/avm/opcodes/bitwise.ts +33 -29
- package/src/public/avm/opcodes/comparators.ts +6 -3
- package/src/public/avm/opcodes/contract.ts +10 -7
- package/src/public/avm/opcodes/control_flow.ts +19 -10
- package/src/public/avm/opcodes/conversion.ts +23 -3
- package/src/public/avm/opcodes/ec_add.ts +5 -2
- package/src/public/avm/opcodes/environment_getters.ts +22 -15
- package/src/public/avm/opcodes/external_calls.ts +61 -28
- package/src/public/avm/opcodes/hashing.ts +28 -8
- package/src/public/avm/opcodes/instruction.ts +23 -15
- package/src/public/avm/opcodes/memory.ts +71 -32
- package/src/public/avm/opcodes/misc.ts +24 -16
- package/src/public/avm/opcodes/storage.ts +22 -6
- package/src/public/avm/revert_reason.ts +55 -0
- package/src/public/avm/serialization/buffer_cursor.ts +4 -1
- package/src/public/avm/serialization/bytecode_serialization.ts +72 -74
- package/src/public/avm/serialization/instruction_serialization.ts +63 -34
- package/src/public/avm/test_utils.ts +23 -32
- package/src/public/db_interfaces.ts +61 -0
- package/src/{common → public}/debug_fn_name.ts +7 -7
- package/src/public/executor_metrics.ts +55 -6
- package/src/public/executor_metrics_interface.ts +14 -0
- package/src/public/fixtures/amm_test.ts +331 -0
- package/src/public/fixtures/bulk_test.ts +151 -0
- package/src/public/fixtures/index.ts +6 -0
- package/src/public/fixtures/minimal_public_tx.ts +59 -0
- package/src/public/fixtures/public_tx_simulation_tester.ts +154 -113
- package/src/public/{avm/fixtures → fixtures}/simple_contract_data_source.ts +36 -18
- package/src/public/fixtures/token_test.ts +140 -0
- package/src/public/fixtures/utils.ts +141 -68
- package/src/public/hinting_db_sources.ts +500 -0
- package/src/public/index.ts +4 -8
- package/src/public/public_db_sources.ts +179 -96
- package/src/public/public_processor/guarded_merkle_tree.ts +149 -0
- package/src/public/public_processor/public_processor.ts +179 -139
- package/src/public/public_processor/public_processor_metrics.ts +2 -2
- package/src/public/public_tx_simulator/index.ts +2 -0
- package/src/public/public_tx_simulator/measured_public_tx_simulator.ts +106 -0
- package/src/public/public_tx_simulator/public_tx_context.ts +153 -193
- package/src/public/public_tx_simulator/public_tx_simulator.ts +167 -211
- package/src/public/public_tx_simulator/telemetry_public_tx_simulator.ts +72 -0
- package/src/public/side_effect_trace.ts +52 -303
- package/src/public/side_effect_trace_interface.ts +4 -58
- package/src/public/state_manager/index.ts +1 -0
- package/src/public/{avm/journal → state_manager}/nullifiers.ts +4 -4
- package/src/public/{avm/journal → state_manager}/public_storage.ts +2 -2
- package/src/public/state_manager/state_manager.ts +512 -0
- package/src/public/test_executor_metrics.ts +395 -0
- package/src/public/utils.ts +5 -21
- package/src/server.ts +6 -3
- package/src/testing.ts +1 -0
- package/dest/common/db_interfaces.d.ts +0 -80
- package/dest/common/db_interfaces.d.ts.map +0 -1
- package/dest/common/db_interfaces.js +0 -1
- package/dest/common/debug_fn_name.d.ts +0 -5
- package/dest/common/debug_fn_name.d.ts.map +0 -1
- package/dest/common/debug_fn_name.js +0 -6
- package/dest/common/message_load_oracle_inputs.d.ts +0 -15
- package/dest/common/message_load_oracle_inputs.d.ts.map +0 -1
- package/dest/common/message_load_oracle_inputs.js +0 -15
- package/dest/private/acvm/oracle/index.d.ts +0 -14
- package/dest/private/acvm/oracle/index.d.ts.map +0 -1
- package/dest/private/acvm/oracle/index.js +0 -2
- package/dest/private/acvm/oracle/oracle.d.ts +0 -49
- package/dest/private/acvm/oracle/oracle.d.ts.map +0 -1
- package/dest/private/acvm/oracle/oracle.js +0 -263
- package/dest/private/acvm/oracle/typed_oracle.d.ts +0 -83
- package/dest/private/acvm/oracle/typed_oracle.d.ts.map +0 -1
- package/dest/private/acvm/oracle/typed_oracle.js +0 -132
- package/dest/private/execution_data_provider.d.ts +0 -261
- package/dest/private/execution_data_provider.d.ts.map +0 -1
- package/dest/private/execution_data_provider.js +0 -14
- package/dest/private/execution_note_cache.d.ts +0 -93
- package/dest/private/execution_note_cache.d.ts.map +0 -1
- package/dest/private/execution_note_cache.js +0 -180
- package/dest/private/hashed_values_cache.d.ts +0 -28
- package/dest/private/hashed_values_cache.d.ts.map +0 -1
- package/dest/private/hashed_values_cache.js +0 -46
- package/dest/private/index.d.ts +0 -13
- package/dest/private/index.d.ts.map +0 -1
- package/dest/private/index.js +0 -12
- package/dest/private/pick_notes.d.ts +0 -85
- package/dest/private/pick_notes.d.ts.map +0 -1
- package/dest/private/pick_notes.js +0 -51
- package/dest/private/private_execution.d.ts +0 -25
- package/dest/private/private_execution.d.ts.map +0 -1
- package/dest/private/private_execution.js +0 -92
- package/dest/private/private_execution_oracle.d.ts +0 -215
- package/dest/private/private_execution_oracle.d.ts.map +0 -1
- package/dest/private/private_execution_oracle.js +0 -382
- package/dest/private/providers/acvm_native.d.ts.map +0 -1
- package/dest/private/providers/acvm_wasm.d.ts +0 -15
- package/dest/private/providers/acvm_wasm.d.ts.map +0 -1
- package/dest/private/providers/acvm_wasm_with_blobs.d.ts +0 -19
- package/dest/private/providers/acvm_wasm_with_blobs.d.ts.map +0 -1
- package/dest/private/providers/acvm_wasm_with_blobs.js +0 -32
- package/dest/private/providers/factory.d.ts +0 -12
- package/dest/private/providers/factory.d.ts.map +0 -1
- package/dest/private/providers/simulation_provider.d.ts +0 -19
- package/dest/private/providers/simulation_provider.d.ts.map +0 -1
- package/dest/private/providers/simulation_provider.js +0 -24
- package/dest/private/simulator.d.ts +0 -34
- package/dest/private/simulator.d.ts.map +0 -1
- package/dest/private/simulator.js +0 -76
- package/dest/private/unconstrained_execution.d.ts +0 -10
- package/dest/private/unconstrained_execution.d.ts.map +0 -1
- package/dest/private/unconstrained_execution.js +0 -27
- package/dest/private/unconstrained_execution_oracle.d.ts +0 -161
- package/dest/private/unconstrained_execution_oracle.d.ts.map +0 -1
- package/dest/private/unconstrained_execution_oracle.js +0 -258
- package/dest/public/avm/bytecode_utils.d.ts +0 -5
- package/dest/public/avm/bytecode_utils.d.ts.map +0 -1
- package/dest/public/avm/bytecode_utils.js +0 -17
- package/dest/public/avm/fixtures/index.d.ts +0 -84
- package/dest/public/avm/fixtures/index.d.ts.map +0 -1
- package/dest/public/avm/fixtures/index.js +0 -175
- package/dest/public/avm/fixtures/simple_contract_data_source.d.ts.map +0 -1
- package/dest/public/avm/journal/index.d.ts +0 -2
- package/dest/public/avm/journal/index.d.ts.map +0 -1
- package/dest/public/avm/journal/index.js +0 -1
- package/dest/public/avm/journal/journal.d.ts.map +0 -1
- package/dest/public/avm/journal/journal.js +0 -486
- package/dest/public/avm/journal/nullifiers.d.ts.map +0 -1
- package/dest/public/avm/journal/public_storage.d.ts.map +0 -1
- package/dest/public/execution.d.ts +0 -108
- package/dest/public/execution.d.ts.map +0 -1
- package/dest/public/execution.js +0 -9
- package/dest/test/utils.d.ts +0 -13
- package/dest/test/utils.d.ts.map +0 -1
- package/dest/test/utils.js +0 -22
- package/src/common/db_interfaces.ts +0 -94
- package/src/common/message_load_oracle_inputs.ts +0 -15
- package/src/private/acvm/oracle/index.ts +0 -16
- package/src/private/acvm/oracle/oracle.ts +0 -455
- package/src/private/acvm/oracle/typed_oracle.ts +0 -259
- package/src/private/execution_data_provider.ts +0 -323
- package/src/private/execution_note_cache.ts +0 -217
- package/src/private/hashed_values_cache.ts +0 -55
- package/src/private/index.ts +0 -16
- package/src/private/pick_notes.ts +0 -141
- package/src/private/private_execution.ts +0 -151
- package/src/private/private_execution_oracle.ts +0 -614
- package/src/private/providers/acvm_wasm.ts +0 -63
- package/src/private/providers/acvm_wasm_with_blobs.ts +0 -50
- package/src/private/providers/simulation_provider.ts +0 -45
- package/src/private/simulator.ts +0 -147
- package/src/private/unconstrained_execution.ts +0 -50
- package/src/private/unconstrained_execution_oracle.ts +0 -373
- package/src/public/avm/bytecode_utils.ts +0 -17
- package/src/public/avm/fixtures/index.ts +0 -296
- package/src/public/avm/journal/index.ts +0 -1
- package/src/public/avm/journal/journal.ts +0 -742
- package/src/public/avm/opcodes/.eslintrc.cjs +0 -8
- package/src/public/execution.ts +0 -140
- package/src/test/utils.ts +0 -36
- /package/dest/public/{avm/journal → state_manager}/public_storage.js +0 -0
|
@@ -17,19 +17,28 @@ export class AvmContractCallResult {
|
|
|
17
17
|
public output: Fr[],
|
|
18
18
|
public gasLeft: AvmGas,
|
|
19
19
|
public revertReason?: AvmRevertReason,
|
|
20
|
+
public totalInstructions: number = 0, // including nested calls
|
|
20
21
|
) {}
|
|
21
22
|
|
|
22
23
|
toString(): string {
|
|
23
|
-
let resultsStr = `reverted: ${this.reverted}, output: ${this.output}, gasLeft: ${inspect(
|
|
24
|
+
let resultsStr = `reverted: ${this.reverted}, output: ${this.output}, gasLeft: ${inspect(
|
|
25
|
+
this.gasLeft,
|
|
26
|
+
)}, totalInstructions: ${this.totalInstructions}`;
|
|
24
27
|
if (this.revertReason) {
|
|
25
|
-
resultsStr += `, revertReason: ${this.revertReason}`;
|
|
28
|
+
resultsStr += `, revertReason: ${this.revertReason.message}`;
|
|
26
29
|
}
|
|
27
30
|
return resultsStr;
|
|
28
31
|
}
|
|
29
32
|
|
|
30
33
|
finalize(): AvmFinalizedCallResult {
|
|
31
34
|
const revertReason = this.revertReason ? createSimulationError(this.revertReason, this.output) : undefined;
|
|
32
|
-
return new AvmFinalizedCallResult(
|
|
35
|
+
return new AvmFinalizedCallResult(
|
|
36
|
+
this.reverted,
|
|
37
|
+
this.output,
|
|
38
|
+
Gas.from(this.gasLeft),
|
|
39
|
+
revertReason,
|
|
40
|
+
this.totalInstructions,
|
|
41
|
+
);
|
|
33
42
|
}
|
|
34
43
|
}
|
|
35
44
|
|
|
@@ -43,12 +52,15 @@ export class AvmFinalizedCallResult {
|
|
|
43
52
|
public output: Fr[],
|
|
44
53
|
public gasLeft: Gas,
|
|
45
54
|
public revertReason?: SimulationError,
|
|
55
|
+
public totalInstructions: number = 0, // including nested calls
|
|
46
56
|
) {}
|
|
47
57
|
|
|
48
58
|
toString(): string {
|
|
49
|
-
let resultsStr = `reverted: ${this.reverted}, output: ${this.output}, gasLeft: ${inspect(
|
|
59
|
+
let resultsStr = `reverted: ${this.reverted}, output: ${this.output}, gasLeft: ${inspect(
|
|
60
|
+
this.gasLeft,
|
|
61
|
+
)}, totalInstructions: ${this.totalInstructions}`;
|
|
50
62
|
if (this.revertReason) {
|
|
51
|
-
resultsStr += `, revertReason: ${this.revertReason}`;
|
|
63
|
+
resultsStr += `, revertReason: ${this.revertReason.message}`;
|
|
52
64
|
}
|
|
53
65
|
return resultsStr;
|
|
54
66
|
}
|
|
@@ -15,9 +15,14 @@ export class AvmExecutionEnvironment {
|
|
|
15
15
|
public readonly globals: GlobalVariables,
|
|
16
16
|
public readonly isStaticCall: boolean,
|
|
17
17
|
public readonly calldata: Fr[],
|
|
18
|
+
public readonly clientInitiatedSimulation: boolean = false,
|
|
18
19
|
) {}
|
|
19
20
|
|
|
20
|
-
private deriveEnvironmentForNestedCallInternal(
|
|
21
|
+
private deriveEnvironmentForNestedCallInternal(
|
|
22
|
+
targetAddress: AztecAddress,
|
|
23
|
+
calldata: Fr[],
|
|
24
|
+
isStaticCall: boolean,
|
|
25
|
+
): AvmExecutionEnvironment {
|
|
21
26
|
return new AvmExecutionEnvironment(
|
|
22
27
|
/*address=*/ targetAddress,
|
|
23
28
|
/*sender=*/ this.address,
|
|
@@ -26,6 +31,7 @@ export class AvmExecutionEnvironment {
|
|
|
26
31
|
this.globals,
|
|
27
32
|
isStaticCall,
|
|
28
33
|
calldata,
|
|
34
|
+
/*clientInitiatedSimulation=*/ this.clientInitiatedSimulation,
|
|
29
35
|
);
|
|
30
36
|
}
|
|
31
37
|
|
|
@@ -2,7 +2,6 @@ import * as c from '@aztec/constants';
|
|
|
2
2
|
|
|
3
3
|
import { TypeTag } from './avm_memory_types.js';
|
|
4
4
|
import { InstructionExecutionError } from './errors.js';
|
|
5
|
-
import { Addressing, AddressingMode } from './opcodes/addressing_mode.js';
|
|
6
5
|
import { Opcode } from './serialization/instruction_serialization.js';
|
|
7
6
|
|
|
8
7
|
/** Gas counters in L1, L2, and DA. */
|
|
@@ -105,7 +104,7 @@ const BASE_GAS_COSTS: Record<Opcode, Gas> = {
|
|
|
105
104
|
[Opcode.MOV_8]: makeCost(c.AVM_MOV_BASE_L2_GAS, 0),
|
|
106
105
|
[Opcode.MOV_16]: makeCost(c.AVM_MOV_BASE_L2_GAS, 0),
|
|
107
106
|
[Opcode.SLOAD]: makeCost(c.AVM_SLOAD_BASE_L2_GAS, 0),
|
|
108
|
-
[Opcode.SSTORE]: makeCost(c.AVM_SSTORE_BASE_L2_GAS,
|
|
107
|
+
[Opcode.SSTORE]: makeCost(c.AVM_SSTORE_BASE_L2_GAS, 0), // DA gas is dynamic
|
|
109
108
|
[Opcode.NOTEHASHEXISTS]: makeCost(c.AVM_NOTEHASHEXISTS_BASE_L2_GAS, 0),
|
|
110
109
|
[Opcode.EMITNOTEHASH]: makeCost(c.AVM_EMITNOTEHASH_BASE_L2_GAS, c.AVM_EMITNOTEHASH_BASE_DA_GAS),
|
|
111
110
|
[Opcode.NULLIFIEREXISTS]: makeCost(c.AVM_NULLIFIEREXISTS_BASE_L2_GAS, 0),
|
|
@@ -130,14 +129,16 @@ const BASE_GAS_COSTS: Record<Opcode, Gas> = {
|
|
|
130
129
|
const DYNAMIC_GAS_COSTS = new Map<Opcode, Gas>([
|
|
131
130
|
[Opcode.CALLDATACOPY, makeCost(c.AVM_CALLDATACOPY_DYN_L2_GAS, 0)],
|
|
132
131
|
[Opcode.RETURNDATACOPY, makeCost(c.AVM_RETURNDATACOPY_DYN_L2_GAS, 0)],
|
|
133
|
-
|
|
134
|
-
[Opcode.
|
|
135
|
-
[Opcode.STATICCALL, makeCost(c.AVM_STATICCALL_DYN_L2_GAS, 0)],
|
|
136
|
-
[Opcode.RETURN, makeCost(c.AVM_RETURN_DYN_L2_GAS, 0)],
|
|
137
|
-
[Opcode.REVERT_8, makeCost(c.AVM_REVERT_DYN_L2_GAS, 0)],
|
|
138
|
-
[Opcode.REVERT_16, makeCost(c.AVM_REVERT_DYN_L2_GAS, 0)],
|
|
139
|
-
[Opcode.DEBUGLOG, makeCost(c.AVM_DEBUGLOG_DYN_L2_GAS, 0)],
|
|
132
|
+
// TODO: Call and static call based on bytecode length
|
|
133
|
+
[Opcode.EMITUNENCRYPTEDLOG, makeCost(0, c.AVM_EMITUNENCRYPTEDLOG_DYN_DA_GAS)],
|
|
140
134
|
[Opcode.TORADIXBE, makeCost(c.AVM_TORADIXBE_DYN_L2_GAS, 0)],
|
|
135
|
+
[Opcode.AND_8, makeCost(c.AVM_BITWISE_DYN_L2_GAS, 0)],
|
|
136
|
+
[Opcode.AND_16, makeCost(c.AVM_BITWISE_DYN_L2_GAS, 0)],
|
|
137
|
+
[Opcode.OR_8, makeCost(c.AVM_BITWISE_DYN_L2_GAS, 0)],
|
|
138
|
+
[Opcode.OR_16, makeCost(c.AVM_BITWISE_DYN_L2_GAS, 0)],
|
|
139
|
+
[Opcode.XOR_8, makeCost(c.AVM_BITWISE_DYN_L2_GAS, 0)],
|
|
140
|
+
[Opcode.XOR_16, makeCost(c.AVM_BITWISE_DYN_L2_GAS, 0)],
|
|
141
|
+
[Opcode.SSTORE, makeCost(0, c.AVM_SSTORE_DYN_DA_GAS)],
|
|
141
142
|
]);
|
|
142
143
|
|
|
143
144
|
/** Returns the fixed base gas cost for a given opcode. */
|
|
@@ -145,35 +146,22 @@ export function getBaseGasCost(opcode: Opcode): Gas {
|
|
|
145
146
|
return BASE_GAS_COSTS[opcode];
|
|
146
147
|
}
|
|
147
148
|
|
|
148
|
-
export function
|
|
149
|
-
return
|
|
150
|
-
|
|
151
|
-
|
|
152
|
-
|
|
153
|
-
|
|
154
|
-
|
|
155
|
-
const indirectCount = Addressing.fromWire(indirect ?? 0).count(AddressingMode.INDIRECT);
|
|
156
|
-
const l2MemoryGasCost =
|
|
157
|
-
(reads ?? 0) * GAS_COST_CONSTANTS.MEMORY_READ +
|
|
158
|
-
(writes ?? 0) * GAS_COST_CONSTANTS.MEMORY_WRITE +
|
|
159
|
-
indirectCount * GAS_COST_CONSTANTS.MEMORY_INDIRECT_READ_PENALTY;
|
|
160
|
-
return makeGas({ l2Gas: l2MemoryGasCost });
|
|
149
|
+
export function computeAddressingCost(indirectOperandsCount: number, relativeOperandsCount: number): Gas {
|
|
150
|
+
return makeCost(
|
|
151
|
+
(relativeOperandsCount !== 0 ? c.AVM_ADDRESSING_BASE_RESOLUTION_L2_GAS : 0) +
|
|
152
|
+
indirectOperandsCount * c.AVM_ADDRESSING_INDIRECT_L2_GAS +
|
|
153
|
+
relativeOperandsCount * c.AVM_ADDRESSING_RELATIVE_L2_GAS,
|
|
154
|
+
0,
|
|
155
|
+
);
|
|
161
156
|
}
|
|
162
157
|
|
|
163
|
-
|
|
164
|
-
|
|
165
|
-
MEMORY_READ: 10,
|
|
166
|
-
MEMORY_INDIRECT_READ_PENALTY: 10,
|
|
167
|
-
MEMORY_WRITE: 100,
|
|
168
|
-
};
|
|
169
|
-
|
|
170
|
-
/** Returns gas cost for an operation on a given type tag based on the base cost per byte. */
|
|
171
|
-
export function getGasCostForTypeTag(tag: TypeTag, baseCost: Gas) {
|
|
172
|
-
return mulGas(baseCost, getGasCostMultiplierFromTypeTag(tag));
|
|
158
|
+
export function getDynamicGasCost(opcode: Opcode): Gas {
|
|
159
|
+
return DYNAMIC_GAS_COSTS.has(opcode) ? DYNAMIC_GAS_COSTS.get(opcode)! : makeCost(0, 0);
|
|
173
160
|
}
|
|
174
161
|
|
|
175
|
-
/** Returns a multiplier based on the size of the type represented by the tag.
|
|
176
|
-
|
|
162
|
+
/** Returns a multiplier based on the byte size of the type represented by the integer tag.
|
|
163
|
+
* Used to account for necessary rows in the bitwise trace. Throws on invalid. */
|
|
164
|
+
export function getBitwiseDynamicGasMultiplier(tag: TypeTag) {
|
|
177
165
|
switch (tag) {
|
|
178
166
|
case TypeTag.UINT1: // same as u8
|
|
179
167
|
return 1;
|
|
@@ -188,7 +176,7 @@ function getGasCostMultiplierFromTypeTag(tag: TypeTag) {
|
|
|
188
176
|
case TypeTag.UINT128:
|
|
189
177
|
return 16;
|
|
190
178
|
case TypeTag.FIELD:
|
|
191
|
-
return
|
|
179
|
+
return 0; // Field is not allowed for bitwise operations. However we don't fail in gas, since we'll fail in bitwise.
|
|
192
180
|
case TypeTag.INVALID:
|
|
193
181
|
throw new InstructionExecutionError(`Invalid tag type for gas cost multiplier: ${TypeTag[tag]}`);
|
|
194
182
|
}
|
|
@@ -68,6 +68,11 @@ export class AvmMachineState {
|
|
|
68
68
|
/** Output data must NOT be modified once it is set */
|
|
69
69
|
private output: Fr[] = [];
|
|
70
70
|
|
|
71
|
+
// Metrics only - not needed for execution
|
|
72
|
+
/** instruction counter, including nested calls */
|
|
73
|
+
public instrCounter: number = 0;
|
|
74
|
+
// End metrics only
|
|
75
|
+
|
|
71
76
|
constructor(gasLeft: Gas);
|
|
72
77
|
constructor(l2GasLeft: number, daGasLeft: number);
|
|
73
78
|
constructor(gasLeftOrL2GasLeft: Gas | number, daGasLeft?: number) {
|
|
@@ -32,6 +32,9 @@ export abstract class MemoryValue {
|
|
|
32
32
|
|
|
33
33
|
// Use sparingly.
|
|
34
34
|
public abstract toBigInt(): bigint;
|
|
35
|
+
public getTag(): TypeTag {
|
|
36
|
+
return TaggedMemory.getTag(this);
|
|
37
|
+
}
|
|
35
38
|
|
|
36
39
|
// To Buffer
|
|
37
40
|
public abstract toBuffer(): Buffer;
|
|
@@ -71,6 +74,7 @@ export abstract class IntegralValue extends MemoryValue {
|
|
|
71
74
|
**/
|
|
72
75
|
function UnsignedIntegerClassFactory(bits: number) {
|
|
73
76
|
return class NewUintClass extends IntegralValue {
|
|
77
|
+
static readonly bits: number = bits;
|
|
74
78
|
static readonly mod: bigint = 1n << BigInt(bits);
|
|
75
79
|
static readonly bitmask: bigint = this.mod - 1n;
|
|
76
80
|
public readonly n: bigint; // Cannot be private due to TS limitations.
|
|
@@ -78,6 +82,7 @@ function UnsignedIntegerClassFactory(bits: number) {
|
|
|
78
82
|
public constructor(n: bigint | number) {
|
|
79
83
|
super();
|
|
80
84
|
this.n = BigInt(n);
|
|
85
|
+
assert(n >= 0n, `${this.constructor.name} cannot handle negative values: ${n}.`);
|
|
81
86
|
assert(n < NewUintClass.mod, `Value ${n} is too large for ${this.constructor.name}.`);
|
|
82
87
|
}
|
|
83
88
|
|
|
@@ -104,12 +109,20 @@ function UnsignedIntegerClassFactory(bits: number) {
|
|
|
104
109
|
|
|
105
110
|
// No sign extension.
|
|
106
111
|
public shr(rhs: NewUintClass): NewUintClass {
|
|
107
|
-
// Note that this.n is
|
|
112
|
+
// Note that this.n is >= 0 by class invariant.
|
|
108
113
|
return this.build(this.n >> rhs.n);
|
|
109
114
|
}
|
|
110
115
|
|
|
111
116
|
public shl(rhs: NewUintClass): NewUintClass {
|
|
112
|
-
|
|
117
|
+
const shiftAmount = rhs.n;
|
|
118
|
+
const bitSize = BigInt(NewUintClass.bits);
|
|
119
|
+
|
|
120
|
+
// Shifting by more than the bit size always results in 0
|
|
121
|
+
if (shiftAmount >= bitSize) {
|
|
122
|
+
return this.build(0n);
|
|
123
|
+
}
|
|
124
|
+
|
|
125
|
+
return this.build((this.n << shiftAmount) & NewUintClass.bitmask);
|
|
113
126
|
}
|
|
114
127
|
|
|
115
128
|
public and(rhs: NewUintClass): NewUintClass {
|
|
@@ -252,7 +265,7 @@ export class TaggedMemory implements TaggedMemoryInterface {
|
|
|
252
265
|
public getAs<T>(offset: number): T {
|
|
253
266
|
assert(Number.isInteger(offset) && offset < TaggedMemory.MAX_MEMORY_SIZE);
|
|
254
267
|
const word = this._mem.get(offset);
|
|
255
|
-
//TaggedMemory.log.trace(`
|
|
268
|
+
//TaggedMemory.log.trace(`Memory read: ${offset} -> ${word}`);
|
|
256
269
|
if (word === undefined) {
|
|
257
270
|
TaggedMemory.log.debug(`WARNING: Memory at offset ${offset} is undefined!`);
|
|
258
271
|
return new Field(0) as T;
|
|
@@ -288,7 +301,7 @@ export class TaggedMemory implements TaggedMemoryInterface {
|
|
|
288
301
|
public set(offset: number, v: MemoryValue) {
|
|
289
302
|
assert(Number.isInteger(offset) && offset < TaggedMemory.MAX_MEMORY_SIZE);
|
|
290
303
|
this._mem.set(offset, v);
|
|
291
|
-
//TaggedMemory.log.trace(`
|
|
304
|
+
//TaggedMemory.log.trace(`Memory write: ${offset} <- ${v}`);
|
|
292
305
|
}
|
|
293
306
|
|
|
294
307
|
public setSlice(offset: number, slice: MemoryValue[]) {
|
|
@@ -319,8 +332,8 @@ export class TaggedMemory implements TaggedMemoryInterface {
|
|
|
319
332
|
}
|
|
320
333
|
}
|
|
321
334
|
|
|
322
|
-
public
|
|
323
|
-
|
|
335
|
+
public static isValidMemoryAddressTag(tag: TypeTag) {
|
|
336
|
+
return tag === TypeTag.UINT32;
|
|
324
337
|
}
|
|
325
338
|
|
|
326
339
|
public static checkIsIntegralTag(tag: TypeTag) {
|
|
@@ -1,27 +1,22 @@
|
|
|
1
|
-
import { MAX_L2_GAS_PER_TX_PUBLIC_PORTION } from '@aztec/constants';
|
|
2
1
|
import { Fr } from '@aztec/foundation/fields';
|
|
3
2
|
import { type Logger, createLogger } from '@aztec/foundation/log';
|
|
3
|
+
import { Timer } from '@aztec/foundation/timer';
|
|
4
4
|
import type { AztecAddress } from '@aztec/stdlib/aztec-address';
|
|
5
5
|
import type { GlobalVariables } from '@aztec/stdlib/tx';
|
|
6
6
|
|
|
7
7
|
import { strict as assert } from 'assert';
|
|
8
8
|
|
|
9
9
|
import { SideEffectLimitReachedError } from '../side_effect_errors.js';
|
|
10
|
+
import type { PublicPersistableStateManager } from '../state_manager/state_manager.js';
|
|
10
11
|
import { AvmContext } from './avm_context.js';
|
|
11
12
|
import { AvmContractCallResult } from './avm_contract_call_result.js';
|
|
12
13
|
import { AvmExecutionEnvironment } from './avm_execution_environment.js';
|
|
13
14
|
import type { Gas } from './avm_gas.js';
|
|
14
15
|
import { AvmMachineState } from './avm_machine_state.js';
|
|
15
|
-
import {
|
|
16
|
-
import {
|
|
17
|
-
AvmExecutionError,
|
|
18
|
-
AvmRevertReason,
|
|
19
|
-
InvalidProgramCounterError,
|
|
20
|
-
revertReasonFromExceptionalHalt,
|
|
21
|
-
revertReasonFromExplicitRevert,
|
|
22
|
-
} from './errors.js';
|
|
23
|
-
import type { AvmPersistableStateManager } from './journal/journal.js';
|
|
16
|
+
import type { AvmSimulatorInterface } from './avm_simulator_interface.js';
|
|
17
|
+
import { AvmExecutionError, AvmRevertReason, InvalidProgramCounterError } from './errors.js';
|
|
24
18
|
import type { Instruction } from './opcodes/instruction.js';
|
|
19
|
+
import { revertReasonFromExceptionalHalt, revertReasonFromExplicitRevert } from './revert_reason.js';
|
|
25
20
|
import {
|
|
26
21
|
INSTRUCTION_SET,
|
|
27
22
|
type InstructionSet,
|
|
@@ -33,7 +28,7 @@ type OpcodeTally = {
|
|
|
33
28
|
gas: Gas;
|
|
34
29
|
};
|
|
35
30
|
|
|
36
|
-
export class AvmSimulator {
|
|
31
|
+
export class AvmSimulator implements AvmSimulatorInterface {
|
|
37
32
|
private log: Logger;
|
|
38
33
|
private bytecode: Buffer | undefined;
|
|
39
34
|
private opcodeTallies: Map<string, OpcodeTally> = new Map();
|
|
@@ -53,10 +48,6 @@ export class AvmSimulator {
|
|
|
53
48
|
// This will be used by the CALL opcode to create a new simulator. It is required to
|
|
54
49
|
// avoid a dependency cycle.
|
|
55
50
|
context.provideSimulator = AvmSimulator.build;
|
|
56
|
-
assert(
|
|
57
|
-
context.machineState.gasLeft.l2Gas <= MAX_L2_GAS_PER_TX_PUBLIC_PORTION,
|
|
58
|
-
`Cannot allocate more than ${MAX_L2_GAS_PER_TX_PUBLIC_PORTION} to the AVM for execution.`,
|
|
59
|
-
);
|
|
60
51
|
this.log = createLogger(`simulator:avm(calldata[0]: ${context.environment.calldata[0]})`);
|
|
61
52
|
// Turn on tallying if explicitly enabled or if trace logging
|
|
62
53
|
if (enableTallying || this.log.isLevelEnabled('trace')) {
|
|
@@ -76,7 +67,7 @@ export class AvmSimulator {
|
|
|
76
67
|
}
|
|
77
68
|
|
|
78
69
|
public static async create(
|
|
79
|
-
stateManager:
|
|
70
|
+
stateManager: PublicPersistableStateManager,
|
|
80
71
|
address: AztecAddress,
|
|
81
72
|
sender: AztecAddress,
|
|
82
73
|
transactionFee: Fr,
|
|
@@ -84,6 +75,7 @@ export class AvmSimulator {
|
|
|
84
75
|
isStaticCall: boolean,
|
|
85
76
|
calldata: Fr[],
|
|
86
77
|
allocatedGas: Gas,
|
|
78
|
+
clientInitiatedSimulation: boolean = false,
|
|
87
79
|
) {
|
|
88
80
|
const avmExecutionEnv = new AvmExecutionEnvironment(
|
|
89
81
|
address,
|
|
@@ -93,6 +85,7 @@ export class AvmSimulator {
|
|
|
93
85
|
globals,
|
|
94
86
|
isStaticCall,
|
|
95
87
|
calldata,
|
|
88
|
+
clientInitiatedSimulation,
|
|
96
89
|
);
|
|
97
90
|
|
|
98
91
|
const avmMachineState = new AvmMachineState(allocatedGas);
|
|
@@ -113,7 +106,7 @@ export class AvmSimulator {
|
|
|
113
106
|
throw err;
|
|
114
107
|
}
|
|
115
108
|
return await this.handleFailureToRetrieveBytecode(
|
|
116
|
-
`Bytecode retrieval for contract '${this.context.environment.address}' failed with ${err}. Reverting...`,
|
|
109
|
+
`Bytecode retrieval for contract '${this.context.environment.address}' failed with ${err.message}. Reverting...`,
|
|
117
110
|
);
|
|
118
111
|
}
|
|
119
112
|
|
|
@@ -138,8 +131,7 @@ export class AvmSimulator {
|
|
|
138
131
|
* This method is useful for testing and debugging.
|
|
139
132
|
*/
|
|
140
133
|
public async executeBytecode(bytecode: Buffer): Promise<AvmContractCallResult> {
|
|
141
|
-
const
|
|
142
|
-
assert(isAvmBytecode(bytecode), "AVM simulator can't execute non-AVM bytecode");
|
|
134
|
+
const timer = new Timer();
|
|
143
135
|
assert(bytecode.length > 0, "AVM simulator can't execute empty bytecode");
|
|
144
136
|
|
|
145
137
|
this.bytecode = bytecode;
|
|
@@ -149,7 +141,6 @@ export class AvmSimulator {
|
|
|
149
141
|
try {
|
|
150
142
|
// Execute instruction pointed to by the current program counter
|
|
151
143
|
// continuing until the machine state signifies a halt
|
|
152
|
-
let instrCounter = 0;
|
|
153
144
|
while (!machineState.getHalted()) {
|
|
154
145
|
// Get the instruction from cache, or deserialize for the first time
|
|
155
146
|
let cachedInstruction = this.deserializedInstructionsCache.get(machineState.pc);
|
|
@@ -165,13 +156,11 @@ export class AvmSimulator {
|
|
|
165
156
|
if (this.log.isLevelEnabled('trace')) {
|
|
166
157
|
// Skip this entirely to avoid toStringing etc if trace is not enabled
|
|
167
158
|
this.log.trace(
|
|
168
|
-
`[PC:${machineState.pc}] [IC:${instrCounter}] ${instruction.toString()} (gasLeft l2=${
|
|
159
|
+
`[PC:${machineState.pc}] [IC:${machineState.instrCounter}] ${instruction.toString()} (gasLeft l2=${
|
|
169
160
|
machineState.l2GasLeft
|
|
170
161
|
} da=${machineState.daGasLeft})`,
|
|
171
162
|
);
|
|
172
163
|
}
|
|
173
|
-
instrCounter++;
|
|
174
|
-
|
|
175
164
|
machineState.nextPc = machineState.pc + bytesRead;
|
|
176
165
|
|
|
177
166
|
// Execute the instruction.
|
|
@@ -183,6 +172,8 @@ export class AvmSimulator {
|
|
|
183
172
|
machineState.pc += bytesRead;
|
|
184
173
|
}
|
|
185
174
|
|
|
175
|
+
machineState.instrCounter++;
|
|
176
|
+
|
|
186
177
|
// gas used by this instruction - used for profiling/tallying
|
|
187
178
|
const gasUsed: Gas = {
|
|
188
179
|
l2Gas: instrStartGas.l2Gas - machineState.l2GasLeft,
|
|
@@ -199,19 +190,23 @@ export class AvmSimulator {
|
|
|
199
190
|
const output = machineState.getOutput();
|
|
200
191
|
const reverted = machineState.getReverted();
|
|
201
192
|
const revertReason = reverted ? await revertReasonFromExplicitRevert(output, this.context) : undefined;
|
|
202
|
-
const results = new AvmContractCallResult(
|
|
193
|
+
const results = new AvmContractCallResult(
|
|
194
|
+
reverted,
|
|
195
|
+
output,
|
|
196
|
+
machineState.gasLeft,
|
|
197
|
+
revertReason,
|
|
198
|
+
machineState.instrCounter,
|
|
199
|
+
);
|
|
203
200
|
this.log.debug(`Context execution results: ${results.toString()}`);
|
|
204
201
|
const totalGasUsed: Gas = {
|
|
205
202
|
l2Gas: callStartGas.l2Gas - machineState.l2GasLeft,
|
|
206
203
|
daGas: callStartGas.daGas - machineState.daGasLeft,
|
|
207
204
|
};
|
|
208
|
-
this.log.debug(`Executed ${instrCounter} instructions and consumed ${totalGasUsed.l2Gas} L2 Gas`);
|
|
205
|
+
this.log.debug(`Executed ${machineState.instrCounter} instructions and consumed ${totalGasUsed.l2Gas} L2 Gas`);
|
|
209
206
|
|
|
210
207
|
this.tallyPrintFunction();
|
|
211
208
|
|
|
212
|
-
|
|
213
|
-
const totalTime = endTotalTime - startTotalTime;
|
|
214
|
-
this.log.debug(`Core AVM simulation took ${totalTime}ms`);
|
|
209
|
+
this.log.debug(`Core AVM simulation took ${timer.ms()}ms`);
|
|
215
210
|
|
|
216
211
|
// Return results for processing by calling context
|
|
217
212
|
return results;
|
|
@@ -235,7 +230,13 @@ export class AvmSimulator {
|
|
|
235
230
|
// Exceptional halts consume all allocated gas
|
|
236
231
|
const noGasLeft = { l2Gas: 0, daGas: 0 };
|
|
237
232
|
// Note: "exceptional halts" cannot return data, hence [].
|
|
238
|
-
const results = new AvmContractCallResult(
|
|
233
|
+
const results = new AvmContractCallResult(
|
|
234
|
+
/*reverted=*/ true,
|
|
235
|
+
/*output=*/ [],
|
|
236
|
+
noGasLeft,
|
|
237
|
+
revertReason,
|
|
238
|
+
machineState.instrCounter,
|
|
239
|
+
);
|
|
239
240
|
this.log.debug(`Context execution results: ${results.toString()}`);
|
|
240
241
|
|
|
241
242
|
this.tallyPrintFunction();
|
|
@@ -0,0 +1,8 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Interface for AvmSimulator to break the circular dependency between avm_context.ts and avm_simulator.ts
|
|
3
|
+
*/
|
|
4
|
+
export interface AvmSimulatorInterface {
|
|
5
|
+
execute(): Promise<any>; // Using any here to avoid importing AvmContractCallResult
|
|
6
|
+
executeBytecode(bytecode: Buffer): Promise<any>;
|
|
7
|
+
getBytecode(): Buffer | undefined;
|
|
8
|
+
}
|
package/src/public/avm/errors.ts
CHANGED
|
@@ -1,9 +1,8 @@
|
|
|
1
|
-
import type {
|
|
1
|
+
import type { Point } from '@aztec/foundation/fields';
|
|
2
2
|
import type { AztecAddress } from '@aztec/stdlib/aztec-address';
|
|
3
3
|
import type { FailingFunction, NoirCallStack } from '@aztec/stdlib/errors';
|
|
4
4
|
|
|
5
5
|
import { ExecutionError } from '../../common/errors.js';
|
|
6
|
-
import type { AvmContext } from './avm_context.js';
|
|
7
6
|
|
|
8
7
|
/**
|
|
9
8
|
* Avm-specific errors should derive from this
|
|
@@ -179,54 +178,3 @@ export class AvmRevertReason extends ExecutionError {
|
|
|
179
178
|
super(message, failingFunction, noirCallStack, options);
|
|
180
179
|
}
|
|
181
180
|
}
|
|
182
|
-
|
|
183
|
-
async function createRevertReason(message: string, revertData: Fr[], context: AvmContext): Promise<AvmRevertReason> {
|
|
184
|
-
// We drop the returnPc information.
|
|
185
|
-
const internalCallStack = context.machineState.internalCallStack.map(entry => entry.callPc);
|
|
186
|
-
|
|
187
|
-
// If we are reverting due to the same error that we have been tracking, we use the nested error as the cause.
|
|
188
|
-
let nestedError = undefined;
|
|
189
|
-
const revertDataEquals = (a: Fr[], b: Fr[]) => a.length === b.length && a.every((v, i) => v.equals(b[i]));
|
|
190
|
-
if (
|
|
191
|
-
context.machineState.collectedRevertInfo &&
|
|
192
|
-
revertDataEquals(context.machineState.collectedRevertInfo.revertDataRepresentative, revertData)
|
|
193
|
-
) {
|
|
194
|
-
nestedError = context.machineState.collectedRevertInfo.recursiveRevertReason;
|
|
195
|
-
message = context.machineState.collectedRevertInfo.recursiveRevertReason.message;
|
|
196
|
-
}
|
|
197
|
-
|
|
198
|
-
const fnName = await context.persistableState.getPublicFunctionDebugName(context.environment);
|
|
199
|
-
|
|
200
|
-
return new AvmRevertReason(
|
|
201
|
-
message,
|
|
202
|
-
/*failingFunction=*/ {
|
|
203
|
-
contractAddress: context.environment.address,
|
|
204
|
-
functionName: fnName,
|
|
205
|
-
},
|
|
206
|
-
/*noirCallStack=*/ [...internalCallStack, context.machineState.pc].map(pc => `0.${pc}`),
|
|
207
|
-
/*options=*/ { cause: nestedError },
|
|
208
|
-
);
|
|
209
|
-
}
|
|
210
|
-
|
|
211
|
-
/**
|
|
212
|
-
* Create a "revert reason" error for an exceptional halt.
|
|
213
|
-
*
|
|
214
|
-
* @param haltingError - the lower-level error causing the exceptional halt
|
|
215
|
-
* @param context - the context of the AVM execution used to extract the failingFunction and noirCallStack
|
|
216
|
-
*/
|
|
217
|
-
export async function revertReasonFromExceptionalHalt(
|
|
218
|
-
haltingError: AvmExecutionError,
|
|
219
|
-
context: AvmContext,
|
|
220
|
-
): Promise<AvmRevertReason> {
|
|
221
|
-
return await createRevertReason(haltingError.message, [], context);
|
|
222
|
-
}
|
|
223
|
-
|
|
224
|
-
/**
|
|
225
|
-
* Create a "revert reason" error for an explicit revert (a root cause).
|
|
226
|
-
*
|
|
227
|
-
* @param revertData - output data of the explicit REVERT instruction
|
|
228
|
-
* @param context - the context of the AVM execution used to extract the failingFunction and noirCallStack
|
|
229
|
-
*/
|
|
230
|
-
export async function revertReasonFromExplicitRevert(revertData: Fr[], context: AvmContext): Promise<AvmRevertReason> {
|
|
231
|
-
return await createRevertReason('Assertion failed: ', revertData, context);
|
|
232
|
-
}
|
|
@@ -8,20 +8,19 @@ import { NativeWorldStateService } from '@aztec/world-state';
|
|
|
8
8
|
|
|
9
9
|
import { SideEffectTrace } from '../../../public/side_effect_trace.js';
|
|
10
10
|
import type { AvmContractCallResult } from '../../avm/avm_contract_call_result.js';
|
|
11
|
+
import { SimpleContractDataSource } from '../../fixtures/simple_contract_data_source.js';
|
|
12
|
+
import { PublicContractsDB, PublicTreesDB } from '../../public_db_sources.js';
|
|
13
|
+
import { PublicPersistableStateManager } from '../../state_manager/state_manager.js';
|
|
14
|
+
import { AvmSimulator } from '../avm_simulator.js';
|
|
15
|
+
import { BaseAvmSimulationTester } from './base_avm_simulation_tester.js';
|
|
16
|
+
import { initContext, initExecutionEnvironment } from './initializers.js';
|
|
11
17
|
import {
|
|
12
|
-
|
|
18
|
+
DEFAULT_TIMESTAMP,
|
|
19
|
+
getContractFunctionAbi,
|
|
13
20
|
getFunctionSelector,
|
|
14
|
-
initContext,
|
|
15
|
-
initExecutionEnvironment,
|
|
16
21
|
resolveContractAssertionMessage,
|
|
17
|
-
} from '
|
|
18
|
-
import { AvmPersistableStateManager } from '../../avm/journal/journal.js';
|
|
19
|
-
import { WorldStateDB } from '../../public_db_sources.js';
|
|
20
|
-
import { AvmSimulator } from '../avm_simulator.js';
|
|
21
|
-
import { BaseAvmSimulationTester } from './base_avm_simulation_tester.js';
|
|
22
|
-
import { SimpleContractDataSource } from './simple_contract_data_source.js';
|
|
22
|
+
} from './utils.js';
|
|
23
23
|
|
|
24
|
-
const TIMESTAMP = new Fr(99833);
|
|
25
24
|
const DEFAULT_GAS_FEES = new GasFees(2, 3);
|
|
26
25
|
|
|
27
26
|
/**
|
|
@@ -33,7 +32,7 @@ export class AvmSimulationTester extends BaseAvmSimulationTester {
|
|
|
33
32
|
constructor(
|
|
34
33
|
contractDataSource: SimpleContractDataSource,
|
|
35
34
|
merkleTrees: MerkleTreeWriteOperations,
|
|
36
|
-
private stateManager:
|
|
35
|
+
private stateManager: PublicPersistableStateManager,
|
|
37
36
|
) {
|
|
38
37
|
super(contractDataSource, merkleTrees);
|
|
39
38
|
}
|
|
@@ -41,16 +40,18 @@ export class AvmSimulationTester extends BaseAvmSimulationTester {
|
|
|
41
40
|
static async create(): Promise<AvmSimulationTester> {
|
|
42
41
|
const contractDataSource = new SimpleContractDataSource();
|
|
43
42
|
const merkleTrees = await (await NativeWorldStateService.tmp()).fork();
|
|
44
|
-
const
|
|
43
|
+
const treesDB = new PublicTreesDB(merkleTrees);
|
|
44
|
+
const contractsDB = new PublicContractsDB(contractDataSource);
|
|
45
45
|
const trace = new SideEffectTrace();
|
|
46
46
|
const firstNullifier = new Fr(420000);
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
47
|
+
|
|
48
|
+
const stateManager = PublicPersistableStateManager.create(
|
|
49
|
+
treesDB,
|
|
50
|
+
contractsDB,
|
|
51
51
|
trace,
|
|
52
52
|
/*doMerkleOperations=*/ false,
|
|
53
53
|
firstNullifier,
|
|
54
|
+
DEFAULT_TIMESTAMP,
|
|
54
55
|
);
|
|
55
56
|
return new AvmSimulationTester(contractDataSource, merkleTrees, stateManager);
|
|
56
57
|
}
|
|
@@ -70,12 +71,12 @@ export class AvmSimulationTester extends BaseAvmSimulationTester {
|
|
|
70
71
|
throw new Error(`Contract not found at address: ${address}`);
|
|
71
72
|
}
|
|
72
73
|
const fnSelector = await getFunctionSelector(fnName, contractArtifact);
|
|
73
|
-
const fnAbi =
|
|
74
|
+
const fnAbi = getContractFunctionAbi(fnName, contractArtifact);
|
|
74
75
|
const encodedArgs = encodeArguments(fnAbi!, args);
|
|
75
76
|
const calldata = [fnSelector.toField(), ...encodedArgs];
|
|
76
77
|
|
|
77
78
|
const globals = GlobalVariables.empty();
|
|
78
|
-
globals.timestamp =
|
|
79
|
+
globals.timestamp = DEFAULT_TIMESTAMP;
|
|
79
80
|
globals.gasFees = DEFAULT_GAS_FEES;
|
|
80
81
|
|
|
81
82
|
const environment = initExecutionEnvironment({
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { CONTRACT_INSTANCE_REGISTRY_CONTRACT_ADDRESS } from '@aztec/constants';
|
|
2
2
|
import { Fr } from '@aztec/foundation/fields';
|
|
3
3
|
import { createLogger } from '@aztec/foundation/log';
|
|
4
4
|
import { ProtocolContractAddress } from '@aztec/protocol-contracts';
|
|
@@ -6,13 +6,13 @@ import { computeFeePayerBalanceStorageSlot, getCanonicalFeeJuice } from '@aztec/
|
|
|
6
6
|
import type { ContractArtifact } from '@aztec/stdlib/abi';
|
|
7
7
|
import { PublicDataWrite } from '@aztec/stdlib/avm';
|
|
8
8
|
import { AztecAddress } from '@aztec/stdlib/aztec-address';
|
|
9
|
-
import type {
|
|
9
|
+
import type { ContractInstanceWithAddress } from '@aztec/stdlib/contract';
|
|
10
10
|
import { computePublicDataTreeLeafSlot, siloNullifier } from '@aztec/stdlib/hash';
|
|
11
11
|
import type { MerkleTreeWriteOperations } from '@aztec/stdlib/interfaces/server';
|
|
12
12
|
import { MerkleTreeId } from '@aztec/stdlib/trees';
|
|
13
13
|
|
|
14
|
-
import {
|
|
15
|
-
import
|
|
14
|
+
import type { SimpleContractDataSource } from '../../fixtures/simple_contract_data_source.js';
|
|
15
|
+
import { createContractClassAndInstance } from './utils.js';
|
|
16
16
|
|
|
17
17
|
/**
|
|
18
18
|
* An abstract test class that enables tests of real apps in the AVM without requiring e2e tests.
|
|
@@ -44,7 +44,7 @@ export abstract class BaseAvmSimulationTester {
|
|
|
44
44
|
const leafSlot = await computePublicDataTreeLeafSlot(address, slot);
|
|
45
45
|
// get existing preimage
|
|
46
46
|
const publicDataWrite = new PublicDataWrite(leafSlot, value);
|
|
47
|
-
await this.merkleTrees.
|
|
47
|
+
await this.merkleTrees.sequentialInsert(MerkleTreeId.PUBLIC_DATA_TREE, [publicDataWrite.toBuffer()]);
|
|
48
48
|
}
|
|
49
49
|
|
|
50
50
|
/**
|
|
@@ -57,6 +57,7 @@ export abstract class BaseAvmSimulationTester {
|
|
|
57
57
|
contractArtifact: ContractArtifact,
|
|
58
58
|
skipNullifierInsertion = false,
|
|
59
59
|
seed = 0,
|
|
60
|
+
contractClassSeed = seed,
|
|
60
61
|
originalContractClassId?: Fr, // if previously upgraded
|
|
61
62
|
): Promise<ContractInstanceWithAddress> {
|
|
62
63
|
const { contractClass, contractInstance } = await createContractClassAndInstance(
|
|
@@ -64,6 +65,7 @@ export abstract class BaseAvmSimulationTester {
|
|
|
64
65
|
deployer,
|
|
65
66
|
contractArtifact,
|
|
66
67
|
seed,
|
|
68
|
+
contractClassSeed,
|
|
67
69
|
originalContractClassId,
|
|
68
70
|
);
|
|
69
71
|
|
|
@@ -80,18 +82,12 @@ export abstract class BaseAvmSimulationTester {
|
|
|
80
82
|
const feeJuiceContractClassPublic = {
|
|
81
83
|
...feeJuice.contractClass,
|
|
82
84
|
privateFunctions: [],
|
|
83
|
-
|
|
85
|
+
utilityFunctions: [],
|
|
84
86
|
};
|
|
85
87
|
await this.contractDataSource.addNewContract(feeJuice.artifact, feeJuiceContractClassPublic, feeJuice.instance);
|
|
86
88
|
return feeJuice.instance;
|
|
87
89
|
}
|
|
88
90
|
|
|
89
|
-
addContractClass(contractClass: ContractClassPublic, contractArtifact: ContractArtifact): Promise<void> {
|
|
90
|
-
this.logger.debug(`Adding contract class with Id ${contractClass.id}`);
|
|
91
|
-
this.contractDataSource.addContractArtifact(contractClass.id, contractArtifact);
|
|
92
|
-
return this.contractDataSource.addContractClass(contractClass);
|
|
93
|
-
}
|
|
94
|
-
|
|
95
91
|
async addContractInstance(contractInstance: ContractInstanceWithAddress, skipNullifierInsertion = false) {
|
|
96
92
|
if (!skipNullifierInsertion) {
|
|
97
93
|
await this.insertContractAddressNullifier(contractInstance.address);
|
|
@@ -101,9 +97,14 @@ export abstract class BaseAvmSimulationTester {
|
|
|
101
97
|
|
|
102
98
|
private async insertContractAddressNullifier(contractAddress: AztecAddress) {
|
|
103
99
|
const contractAddressNullifier = await siloNullifier(
|
|
104
|
-
AztecAddress.fromNumber(
|
|
100
|
+
AztecAddress.fromNumber(CONTRACT_INSTANCE_REGISTRY_CONTRACT_ADDRESS),
|
|
105
101
|
contractAddress.toField(),
|
|
106
102
|
);
|
|
107
|
-
await this.merkleTrees.
|
|
103
|
+
await this.merkleTrees.sequentialInsert(MerkleTreeId.NULLIFIER_TREE, [contractAddressNullifier.toBuffer()]);
|
|
104
|
+
}
|
|
105
|
+
|
|
106
|
+
async insertNullifier(contractThatEmitted: AztecAddress, nullifier: Fr) {
|
|
107
|
+
const siloedNullifier = await siloNullifier(contractThatEmitted, nullifier);
|
|
108
|
+
await this.merkleTrees.sequentialInsert(MerkleTreeId.NULLIFIER_TREE, [siloedNullifier.toBuffer()]);
|
|
108
109
|
}
|
|
109
110
|
}
|