@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
|
@@ -2,24 +2,31 @@ import { MAX_NOTE_HASHES_PER_TX, MAX_NULLIFIERS_PER_TX, NULLIFIER_SUBTREE_HEIGHT
|
|
|
2
2
|
import { padArrayEnd } from '@aztec/foundation/collection';
|
|
3
3
|
import { Fr } from '@aztec/foundation/fields';
|
|
4
4
|
import { createLogger } from '@aztec/foundation/log';
|
|
5
|
-
import {
|
|
5
|
+
import { sleep } from '@aztec/foundation/sleep';
|
|
6
|
+
import { DateProvider, Timer, elapsed, executeTimeout } from '@aztec/foundation/timer';
|
|
6
7
|
import { ProtocolContractAddress } from '@aztec/protocol-contracts';
|
|
7
|
-
import {
|
|
8
|
+
import { ContractClassPublishedEvent } from '@aztec/protocol-contracts/class-registry';
|
|
8
9
|
import { computeFeePayerBalanceLeafSlot, computeFeePayerBalanceStorageSlot } from '@aztec/protocol-contracts/fee-juice';
|
|
9
10
|
import { PublicDataWrite } from '@aztec/stdlib/avm';
|
|
10
11
|
import type { AztecAddress } from '@aztec/stdlib/aztec-address';
|
|
11
12
|
import type { ContractDataSource } from '@aztec/stdlib/contract';
|
|
13
|
+
import { computeTransactionFee } from '@aztec/stdlib/fees';
|
|
12
14
|
import { Gas } from '@aztec/stdlib/gas';
|
|
13
|
-
import type {
|
|
15
|
+
import type {
|
|
16
|
+
MerkleTreeWriteOperations,
|
|
17
|
+
PublicProcessorLimits,
|
|
18
|
+
PublicProcessorValidator,
|
|
19
|
+
SequencerConfig,
|
|
20
|
+
} from '@aztec/stdlib/interfaces/server';
|
|
14
21
|
import { MerkleTreeId } from '@aztec/stdlib/trees';
|
|
15
22
|
import {
|
|
16
23
|
type FailedTx,
|
|
17
24
|
GlobalVariables,
|
|
18
25
|
NestedProcessReturnValues,
|
|
19
26
|
type ProcessedTx,
|
|
27
|
+
StateReference,
|
|
20
28
|
Tx,
|
|
21
29
|
TxExecutionPhase,
|
|
22
|
-
type TxValidator,
|
|
23
30
|
makeProcessedTxFromPrivateOnlyTx,
|
|
24
31
|
makeProcessedTxFromTxWithPublicCalls,
|
|
25
32
|
} from '@aztec/stdlib/tx';
|
|
@@ -33,8 +40,9 @@ import {
|
|
|
33
40
|
} from '@aztec/telemetry-client';
|
|
34
41
|
import { ForkCheckpoint } from '@aztec/world-state/native';
|
|
35
42
|
|
|
36
|
-
import {
|
|
37
|
-
import { PublicTxSimulator } from '../public_tx_simulator/
|
|
43
|
+
import { PublicContractsDB, PublicTreesDB } from '../public_db_sources.js';
|
|
44
|
+
import { type PublicTxSimulator, TelemetryPublicTxSimulator } from '../public_tx_simulator/index.js';
|
|
45
|
+
import { GuardedMerkleTreeOperations } from './guarded_merkle_tree.js';
|
|
38
46
|
import { PublicProcessorMetrics } from './public_processor_metrics.js';
|
|
39
47
|
|
|
40
48
|
/**
|
|
@@ -43,8 +51,8 @@ import { PublicProcessorMetrics } from './public_processor_metrics.js';
|
|
|
43
51
|
export class PublicProcessorFactory {
|
|
44
52
|
constructor(
|
|
45
53
|
private contractDataSource: ContractDataSource,
|
|
46
|
-
private dateProvider: DateProvider,
|
|
47
|
-
|
|
54
|
+
private dateProvider: DateProvider = new DateProvider(),
|
|
55
|
+
protected telemetryClient: TelemetryClient = getTelemetryClient(),
|
|
48
56
|
) {}
|
|
49
57
|
|
|
50
58
|
/**
|
|
@@ -58,21 +66,24 @@ export class PublicProcessorFactory {
|
|
|
58
66
|
merkleTree: MerkleTreeWriteOperations,
|
|
59
67
|
globalVariables: GlobalVariables,
|
|
60
68
|
skipFeeEnforcement: boolean,
|
|
69
|
+
clientInitiatedSimulation: boolean = false,
|
|
61
70
|
): PublicProcessor {
|
|
62
|
-
const
|
|
71
|
+
const contractsDB = new PublicContractsDB(this.contractDataSource);
|
|
72
|
+
|
|
73
|
+
const guardedFork = new GuardedMerkleTreeOperations(merkleTree);
|
|
63
74
|
const publicTxSimulator = this.createPublicTxSimulator(
|
|
64
|
-
|
|
65
|
-
|
|
75
|
+
guardedFork,
|
|
76
|
+
contractsDB,
|
|
66
77
|
globalVariables,
|
|
67
78
|
/*doMerkleOperations=*/ true,
|
|
68
79
|
skipFeeEnforcement,
|
|
69
|
-
|
|
80
|
+
clientInitiatedSimulation,
|
|
70
81
|
);
|
|
71
82
|
|
|
72
83
|
return new PublicProcessor(
|
|
73
|
-
merkleTree,
|
|
74
84
|
globalVariables,
|
|
75
|
-
|
|
85
|
+
guardedFork,
|
|
86
|
+
contractsDB,
|
|
76
87
|
publicTxSimulator,
|
|
77
88
|
this.dateProvider,
|
|
78
89
|
this.telemetryClient,
|
|
@@ -80,20 +91,21 @@ export class PublicProcessorFactory {
|
|
|
80
91
|
}
|
|
81
92
|
|
|
82
93
|
protected createPublicTxSimulator(
|
|
83
|
-
|
|
84
|
-
|
|
94
|
+
merkleTree: MerkleTreeWriteOperations,
|
|
95
|
+
contractsDB: PublicContractsDB,
|
|
85
96
|
globalVariables: GlobalVariables,
|
|
86
97
|
doMerkleOperations: boolean,
|
|
87
98
|
skipFeeEnforcement: boolean,
|
|
88
|
-
|
|
89
|
-
) {
|
|
90
|
-
return new
|
|
91
|
-
|
|
92
|
-
|
|
99
|
+
clientInitiatedSimulation: boolean,
|
|
100
|
+
): PublicTxSimulator {
|
|
101
|
+
return new TelemetryPublicTxSimulator(
|
|
102
|
+
merkleTree,
|
|
103
|
+
contractsDB,
|
|
93
104
|
globalVariables,
|
|
94
105
|
doMerkleOperations,
|
|
95
106
|
skipFeeEnforcement,
|
|
96
|
-
|
|
107
|
+
clientInitiatedSimulation,
|
|
108
|
+
this.telemetryClient,
|
|
97
109
|
);
|
|
98
110
|
}
|
|
99
111
|
}
|
|
@@ -111,14 +123,16 @@ class PublicProcessorTimeoutError extends Error {
|
|
|
111
123
|
*/
|
|
112
124
|
export class PublicProcessor implements Traceable {
|
|
113
125
|
private metrics: PublicProcessorMetrics;
|
|
126
|
+
|
|
114
127
|
constructor(
|
|
115
|
-
protected db: MerkleTreeWriteOperations,
|
|
116
128
|
protected globalVariables: GlobalVariables,
|
|
117
|
-
|
|
129
|
+
private guardedMerkleTree: GuardedMerkleTreeOperations,
|
|
130
|
+
protected contractsDB: PublicContractsDB,
|
|
118
131
|
protected publicTxSimulator: PublicTxSimulator,
|
|
119
132
|
private dateProvider: DateProvider,
|
|
120
133
|
telemetryClient: TelemetryClient = getTelemetryClient(),
|
|
121
134
|
private log = createLogger('simulator:public-processor'),
|
|
135
|
+
private opts: Pick<SequencerConfig, 'fakeProcessingDelayPerTxMs'> = {},
|
|
122
136
|
) {
|
|
123
137
|
this.metrics = new PublicProcessorMetrics(telemetryClient, 'PublicProcessor');
|
|
124
138
|
}
|
|
@@ -130,26 +144,19 @@ export class PublicProcessor implements Traceable {
|
|
|
130
144
|
/**
|
|
131
145
|
* Run each tx through the public circuit and the public kernel circuit if needed.
|
|
132
146
|
* @param txs - Txs to process.
|
|
133
|
-
* @param
|
|
147
|
+
* @param limits - Limits for processing the txs.
|
|
148
|
+
* @param validator - Pre-process validator and nullifier cache to use for processing the txs.
|
|
134
149
|
* @returns The list of processed txs with their circuit simulation outputs.
|
|
135
150
|
*/
|
|
136
151
|
public async process(
|
|
137
152
|
txs: Iterable<Tx> | AsyncIterable<Tx>,
|
|
138
|
-
limits: {
|
|
139
|
-
|
|
140
|
-
|
|
141
|
-
|
|
142
|
-
|
|
143
|
-
} = {},
|
|
144
|
-
validators: {
|
|
145
|
-
preprocessValidator?: TxValidator<Tx>;
|
|
146
|
-
postprocessValidator?: TxValidator<ProcessedTx>;
|
|
147
|
-
nullifierCache?: { addNullifiers: (nullifiers: Buffer[]) => void };
|
|
148
|
-
} = {},
|
|
149
|
-
): Promise<[ProcessedTx[], FailedTx[], NestedProcessReturnValues[]]> {
|
|
150
|
-
const { maxTransactions, maxBlockSize, deadline, maxBlockGas } = limits;
|
|
151
|
-
const { preprocessValidator, postprocessValidator, nullifierCache } = validators;
|
|
153
|
+
limits: PublicProcessorLimits = {},
|
|
154
|
+
validator: PublicProcessorValidator = {},
|
|
155
|
+
): Promise<[ProcessedTx[], FailedTx[], Tx[], NestedProcessReturnValues[]]> {
|
|
156
|
+
const { maxTransactions, maxBlockSize, deadline, maxBlockGas, maxBlobFields } = limits;
|
|
157
|
+
const { preprocessValidator, nullifierCache } = validator;
|
|
152
158
|
const result: ProcessedTx[] = [];
|
|
159
|
+
const usedTxs: Tx[] = [];
|
|
153
160
|
const failed: FailedTx[] = [];
|
|
154
161
|
const timer = new Timer();
|
|
155
162
|
|
|
@@ -157,6 +164,7 @@ export class PublicProcessor implements Traceable {
|
|
|
157
164
|
let returns: NestedProcessReturnValues[] = [];
|
|
158
165
|
let totalPublicGas = new Gas(0, 0);
|
|
159
166
|
let totalBlockGas = new Gas(0, 0);
|
|
167
|
+
let totalBlobFields = 0;
|
|
160
168
|
|
|
161
169
|
for await (const origTx of txs) {
|
|
162
170
|
// Only process up to the max tx limit
|
|
@@ -172,7 +180,7 @@ export class PublicProcessor implements Traceable {
|
|
|
172
180
|
}
|
|
173
181
|
|
|
174
182
|
// Skip this tx if it'd exceed max block size
|
|
175
|
-
const txHash =
|
|
183
|
+
const txHash = origTx.getTxHash().toString();
|
|
176
184
|
const preTxSizeInBytes = origTx.getEstimatedPrivateTxEffectsSize();
|
|
177
185
|
if (maxBlockSize !== undefined && totalSizeInBytes + preTxSizeInBytes > maxBlockSize) {
|
|
178
186
|
this.log.warn(`Skipping processing of tx ${txHash} sized ${preTxSizeInBytes} bytes due to block size limit`, {
|
|
@@ -202,16 +210,16 @@ export class PublicProcessor implements Traceable {
|
|
|
202
210
|
// We validate the tx before processing it, to avoid unnecessary work.
|
|
203
211
|
if (preprocessValidator) {
|
|
204
212
|
const result = await preprocessValidator.validateTx(tx);
|
|
205
|
-
const txHash =
|
|
213
|
+
const txHash = tx.getTxHash();
|
|
206
214
|
if (result.result === 'invalid') {
|
|
207
215
|
const reason = result.reason.join(', ');
|
|
208
|
-
this.log.
|
|
216
|
+
this.log.debug(`Rejecting tx ${txHash.toString()} due to pre-process validation fail: ${reason}`);
|
|
209
217
|
failed.push({ tx, error: new Error(`Tx failed preprocess validation: ${reason}`) });
|
|
210
218
|
returns.push(new NestedProcessReturnValues([]));
|
|
211
219
|
continue;
|
|
212
220
|
} else if (result.result === 'skipped') {
|
|
213
221
|
const reason = result.reason.join(', ');
|
|
214
|
-
this.log.
|
|
222
|
+
this.log.debug(`Skipping tx ${txHash.toString()} due to pre-process validation: ${reason}`);
|
|
215
223
|
returns.push(new NestedProcessReturnValues([]));
|
|
216
224
|
continue;
|
|
217
225
|
} else {
|
|
@@ -222,7 +230,10 @@ export class PublicProcessor implements Traceable {
|
|
|
222
230
|
// We checkpoint the transaction here, then within the try/catch we
|
|
223
231
|
// 1. Revert the checkpoint if the tx fails or needs to be discarded for any reason
|
|
224
232
|
// 2. Commit the transaction in the finally block. Note that by using the ForkCheckpoint lifecycle only the first commit/revert takes effect
|
|
225
|
-
|
|
233
|
+
// By doing this, every transaction starts on a fresh checkpoint and it's state updates only make it to the fork if this checkpoint is committed.
|
|
234
|
+
// Note: We use the underlying fork here not the guarded one, this ensures that it's not impacted by stopping the guarded version
|
|
235
|
+
const checkpoint = await ForkCheckpoint.new(this.guardedMerkleTree.getUnderlyingFork());
|
|
236
|
+
const startStateReference = await this.guardedMerkleTree.getUnderlyingFork().getStateReference();
|
|
226
237
|
|
|
227
238
|
try {
|
|
228
239
|
const [processedTx, returnValues] = await this.processTx(tx, deadline);
|
|
@@ -230,7 +241,7 @@ export class PublicProcessor implements Traceable {
|
|
|
230
241
|
// If the actual size of this tx would exceed block size, skip it
|
|
231
242
|
const txSize = processedTx.txEffect.getDASize();
|
|
232
243
|
if (maxBlockSize !== undefined && totalSizeInBytes + txSize > maxBlockSize) {
|
|
233
|
-
this.log.
|
|
244
|
+
this.log.debug(`Skipping processed tx ${txHash} sized ${txSize} due to max block size.`, {
|
|
234
245
|
txHash,
|
|
235
246
|
sizeInBytes: txSize,
|
|
236
247
|
totalSizeInBytes,
|
|
@@ -241,60 +252,76 @@ export class PublicProcessor implements Traceable {
|
|
|
241
252
|
continue;
|
|
242
253
|
}
|
|
243
254
|
|
|
244
|
-
//
|
|
245
|
-
|
|
246
|
-
|
|
247
|
-
|
|
248
|
-
|
|
249
|
-
|
|
250
|
-
|
|
251
|
-
|
|
252
|
-
|
|
253
|
-
|
|
254
|
-
|
|
255
|
-
|
|
256
|
-
|
|
257
|
-
|
|
258
|
-
|
|
259
|
-
} else {
|
|
260
|
-
this.log.trace(`Tx ${txHash.toString()} is valid post processing.`);
|
|
261
|
-
}
|
|
262
|
-
}
|
|
263
|
-
|
|
264
|
-
if (!tx.hasPublicCalls()) {
|
|
265
|
-
// If there are no public calls, perform all tree insertions for side effects from private
|
|
266
|
-
// When there are public calls, the PublicTxSimulator & AVM handle tree insertions.
|
|
267
|
-
await this.doTreeInsertionsForPrivateOnlyTx(processedTx);
|
|
268
|
-
// Add any contracts registered/deployed in this private-only tx to the block-level cache
|
|
269
|
-
// (add to tx-level cache and then commit to block-level cache)
|
|
270
|
-
await this.worldStateDB.addNewContracts(tx);
|
|
271
|
-
this.worldStateDB.commitContractsForTx();
|
|
255
|
+
// If the actual blob fields of this tx would exceed the limit, skip it
|
|
256
|
+
const txBlobFields = processedTx.txEffect.toBlobFields().length;
|
|
257
|
+
if (maxBlobFields !== undefined && totalBlobFields + txBlobFields > maxBlobFields) {
|
|
258
|
+
this.log.debug(
|
|
259
|
+
`Skipping processed tx ${txHash} with ${txBlobFields} blob fields due to max blob fields limit.`,
|
|
260
|
+
{
|
|
261
|
+
txHash,
|
|
262
|
+
txBlobFields,
|
|
263
|
+
totalBlobFields,
|
|
264
|
+
maxBlobFields,
|
|
265
|
+
},
|
|
266
|
+
);
|
|
267
|
+
// Need to revert the checkpoint here and don't go any further
|
|
268
|
+
await checkpoint.revert();
|
|
269
|
+
continue;
|
|
272
270
|
}
|
|
273
271
|
|
|
272
|
+
// FIXME(fcarreiro): it's ugly to have to notify the validator of nullifiers.
|
|
273
|
+
// I'd rather pass the validators the processedTx as well and let them deal with it.
|
|
274
274
|
nullifierCache?.addNullifiers(processedTx.txEffect.nullifiers.map(n => n.toBuffer()));
|
|
275
275
|
result.push(processedTx);
|
|
276
|
+
usedTxs.push(tx);
|
|
276
277
|
returns = returns.concat(returnValues);
|
|
277
278
|
|
|
278
279
|
totalPublicGas = totalPublicGas.add(processedTx.gasUsed.publicGas);
|
|
279
280
|
totalBlockGas = totalBlockGas.add(processedTx.gasUsed.totalGas);
|
|
280
281
|
totalSizeInBytes += txSize;
|
|
282
|
+
totalBlobFields += txBlobFields;
|
|
281
283
|
} catch (err: any) {
|
|
282
|
-
// Roll back state to start of TX before proceeding to next TX
|
|
283
|
-
await checkpoint.revert();
|
|
284
284
|
if (err?.name === 'PublicProcessorTimeoutError') {
|
|
285
285
|
this.log.warn(`Stopping tx processing due to timeout.`);
|
|
286
|
+
// We hit the transaction execution deadline.
|
|
287
|
+
// There may still be a transaction executing. We stop the guarded fork to prevent any further access to the world state.
|
|
288
|
+
await this.guardedMerkleTree.stop();
|
|
289
|
+
|
|
290
|
+
// We now know there can't be any further access to world state. The fork is in a state where there is:
|
|
291
|
+
// 1. At least one outstanding checkpoint that has not been committed (the one created before we processed the tx).
|
|
292
|
+
// 2. Possible state updates on that checkpoint or any others created during execution.
|
|
293
|
+
|
|
294
|
+
// First we revert a checkpoint as managed by the ForkCheckpoint. This will revert whatever is the current checkpoint
|
|
295
|
+
// which may not be the one originally created by this object. But that is ok, we do this to fulfil the ForkCheckpoint
|
|
296
|
+
// lifecycle expectations and ensure it doesn't attempt to commit later on.
|
|
297
|
+
await checkpoint.revert();
|
|
298
|
+
|
|
299
|
+
// Now we want to revert any/all remaining checkpoints, destroying any outstanding state updates.
|
|
300
|
+
// This needs to be done directly on the underlying fork as the guarded fork has been stopped.
|
|
301
|
+
await this.guardedMerkleTree.getUnderlyingFork().revertAllCheckpoints();
|
|
302
|
+
|
|
303
|
+
// Ensure we're at the same state as when we started processing this tx.
|
|
304
|
+
await this.checkWorldStateUnchanged(startStateReference, txHash, err);
|
|
305
|
+
|
|
306
|
+
// We should now be in a position where the fork is in a clean state and no further updates can be made to it.
|
|
286
307
|
break;
|
|
287
308
|
}
|
|
309
|
+
|
|
310
|
+
// Roll back state to start of TX before proceeding to next TX
|
|
311
|
+
await checkpoint.revert();
|
|
312
|
+
await this.guardedMerkleTree.getUnderlyingFork().revertAllCheckpoints();
|
|
288
313
|
const errorMessage = err instanceof Error ? err.message : 'Unknown error';
|
|
289
314
|
this.log.warn(`Failed to process tx ${txHash.toString()}: ${errorMessage} ${err?.stack}`);
|
|
290
|
-
|
|
291
315
|
failed.push({ tx, error: err instanceof Error ? err : new Error(errorMessage) });
|
|
292
316
|
returns.push(new NestedProcessReturnValues([]));
|
|
317
|
+
|
|
318
|
+
// Ensure we're at the same state as when we started processing this tx.
|
|
319
|
+
await this.checkWorldStateUnchanged(startStateReference, txHash, err);
|
|
293
320
|
} finally {
|
|
294
|
-
// Base case is we always commit the checkpoint. Using the ForkCheckpoint means this has no effect if the tx was reverted
|
|
321
|
+
// Base case is we always commit the checkpoint. Using the ForkCheckpoint means this has no effect if the tx was previously reverted
|
|
295
322
|
await checkpoint.commit();
|
|
296
323
|
// The tx-level contracts cache should not live on to the next tx
|
|
297
|
-
this.
|
|
324
|
+
this.contractsDB.clearContractsForTx();
|
|
298
325
|
}
|
|
299
326
|
}
|
|
300
327
|
|
|
@@ -310,17 +337,33 @@ export class PublicProcessor implements Traceable {
|
|
|
310
337
|
totalSizeInBytes,
|
|
311
338
|
});
|
|
312
339
|
|
|
313
|
-
return [result, failed, returns];
|
|
340
|
+
return [result, failed, usedTxs, returns];
|
|
314
341
|
}
|
|
315
342
|
|
|
316
|
-
|
|
317
|
-
|
|
343
|
+
private async checkWorldStateUnchanged(
|
|
344
|
+
startStateReference: StateReference,
|
|
345
|
+
txHash: `0x${string}`,
|
|
346
|
+
cause: Error,
|
|
347
|
+
): Promise<void> {
|
|
348
|
+
const endStateReference = await this.guardedMerkleTree.getUnderlyingFork().getStateReference();
|
|
349
|
+
if (!startStateReference.equals(endStateReference)) {
|
|
350
|
+
this.log.warn(`Fork state reference changed by tx ${txHash} after error in public processor`, {
|
|
351
|
+
expected: startStateReference.toInspect(),
|
|
352
|
+
actual: endStateReference.toInspect(),
|
|
353
|
+
cause,
|
|
354
|
+
});
|
|
355
|
+
throw new Error(`Fork state reference changed by tx ${txHash} after error in public processor`, { cause });
|
|
356
|
+
}
|
|
357
|
+
}
|
|
358
|
+
|
|
359
|
+
@trackSpan('PublicProcessor.processTx', tx => ({ [Attributes.TX_HASH]: tx.getTxHash().toString() }))
|
|
360
|
+
private async processTx(tx: Tx, deadline: Date | undefined): Promise<[ProcessedTx, NestedProcessReturnValues[]]> {
|
|
318
361
|
const [time, [processedTx, returnValues]] = await elapsed(() => this.processTxWithinDeadline(tx, deadline));
|
|
319
362
|
|
|
320
363
|
this.log.verbose(
|
|
321
364
|
!tx.hasPublicCalls()
|
|
322
365
|
? `Processed tx ${processedTx.hash} with no public calls in ${time}ms`
|
|
323
|
-
: `Processed tx ${processedTx.hash} with ${tx.
|
|
366
|
+
: `Processed tx ${processedTx.hash} with ${tx.numberOfPublicCalls()} public calls in ${time}ms`,
|
|
324
367
|
{
|
|
325
368
|
txHash: processedTx.hash,
|
|
326
369
|
txFee: processedTx.txEffect.transactionFee.toBigInt(),
|
|
@@ -341,10 +384,7 @@ export class PublicProcessor implements Traceable {
|
|
|
341
384
|
return [processedTx, returnValues ?? []];
|
|
342
385
|
}
|
|
343
386
|
|
|
344
|
-
private async doTreeInsertionsForPrivateOnlyTx(
|
|
345
|
-
processedTx: ProcessedTx,
|
|
346
|
-
txValidator?: TxValidator<ProcessedTx>,
|
|
347
|
-
): Promise<void> {
|
|
387
|
+
private async doTreeInsertionsForPrivateOnlyTx(processedTx: ProcessedTx): Promise<void> {
|
|
348
388
|
const treeInsertionStart = process.hrtime.bigint();
|
|
349
389
|
|
|
350
390
|
// Update the state so that the next tx in the loop has the correct .startState
|
|
@@ -353,31 +393,20 @@ export class PublicProcessor implements Traceable {
|
|
|
353
393
|
// b) always had a txHandler with the same db passed to it as this.db, which updated the db in buildBaseRollupHints in this loop
|
|
354
394
|
// To see how this ^ happens, move back to one shared db in test_context and run orchestrator_multi_public_functions.test.ts
|
|
355
395
|
// The below is taken from buildBaseRollupHints:
|
|
356
|
-
await this.
|
|
396
|
+
await this.guardedMerkleTree.appendLeaves(
|
|
357
397
|
MerkleTreeId.NOTE_HASH_TREE,
|
|
358
398
|
padArrayEnd(processedTx.txEffect.noteHashes, Fr.ZERO, MAX_NOTE_HASHES_PER_TX),
|
|
359
399
|
);
|
|
360
400
|
try {
|
|
361
|
-
await this.
|
|
401
|
+
await this.guardedMerkleTree.batchInsert(
|
|
362
402
|
MerkleTreeId.NULLIFIER_TREE,
|
|
363
403
|
padArrayEnd(processedTx.txEffect.nullifiers, Fr.ZERO, MAX_NULLIFIERS_PER_TX).map(n => n.toBuffer()),
|
|
364
404
|
NULLIFIER_SUBTREE_HEIGHT,
|
|
365
405
|
);
|
|
366
|
-
} catch (
|
|
367
|
-
|
|
368
|
-
// Ideally the validator has already caught this above, but just in case:
|
|
369
|
-
throw new Error(`Transaction ${processedTx.hash} invalid after processing public functions`);
|
|
370
|
-
} else {
|
|
371
|
-
// We have no validator and assume this call should blindly process txs with duplicates being caught later
|
|
372
|
-
this.log.warn(`Detected duplicate nullifier after public processing for: ${processedTx.hash}.`);
|
|
373
|
-
}
|
|
406
|
+
} catch (cause) {
|
|
407
|
+
throw new Error(`Transaction ${processedTx.hash} failed with duplicate nullifiers`, { cause });
|
|
374
408
|
}
|
|
375
409
|
|
|
376
|
-
// The only public data write should be for fee payment
|
|
377
|
-
await this.db.sequentialInsert(
|
|
378
|
-
MerkleTreeId.PUBLIC_DATA_TREE,
|
|
379
|
-
processedTx.txEffect.publicDataWrites.map(x => x.toBuffer()),
|
|
380
|
-
);
|
|
381
410
|
const treeInsertionEnd = process.hrtime.bigint();
|
|
382
411
|
this.metrics.recordTreeInsertions(Number(treeInsertionEnd - treeInsertionStart) / 1_000);
|
|
383
412
|
}
|
|
@@ -385,17 +414,29 @@ export class PublicProcessor implements Traceable {
|
|
|
385
414
|
/** Processes the given tx within deadline. Returns timeout if deadline is hit. */
|
|
386
415
|
private async processTxWithinDeadline(
|
|
387
416
|
tx: Tx,
|
|
388
|
-
deadline
|
|
417
|
+
deadline: Date | undefined,
|
|
389
418
|
): Promise<[ProcessedTx, NestedProcessReturnValues[] | undefined]> {
|
|
390
|
-
const
|
|
419
|
+
const innerProcessFn: () => Promise<[ProcessedTx, NestedProcessReturnValues[] | undefined]> = tx.hasPublicCalls()
|
|
391
420
|
? () => this.processTxWithPublicCalls(tx)
|
|
392
421
|
: () => this.processPrivateOnlyTx(tx);
|
|
393
422
|
|
|
423
|
+
// Fake a delay per tx if instructed (used for tests)
|
|
424
|
+
const fakeDelayPerTxMs = this.opts.fakeProcessingDelayPerTxMs;
|
|
425
|
+
const processFn =
|
|
426
|
+
fakeDelayPerTxMs && fakeDelayPerTxMs > 0
|
|
427
|
+
? async () => {
|
|
428
|
+
const result = await innerProcessFn();
|
|
429
|
+
this.log.warn(`Sleeping ${fakeDelayPerTxMs}ms after processing tx ${tx.getTxHash().toString()}`);
|
|
430
|
+
await sleep(fakeDelayPerTxMs);
|
|
431
|
+
return result;
|
|
432
|
+
}
|
|
433
|
+
: innerProcessFn;
|
|
434
|
+
|
|
394
435
|
if (!deadline) {
|
|
395
436
|
return await processFn();
|
|
396
437
|
}
|
|
397
438
|
|
|
398
|
-
const txHash =
|
|
439
|
+
const txHash = tx.getTxHash();
|
|
399
440
|
const timeout = +deadline - this.dateProvider.now();
|
|
400
441
|
if (timeout <= 0) {
|
|
401
442
|
throw new PublicProcessorTimeoutError();
|
|
@@ -419,14 +460,16 @@ export class PublicProcessor implements Traceable {
|
|
|
419
460
|
* This is used in private only txs, since for txs with public calls
|
|
420
461
|
* the avm handles the fee payment itself.
|
|
421
462
|
*/
|
|
422
|
-
private async
|
|
463
|
+
private async performFeePaymentPublicDataWrite(txFee: Fr, feePayer: AztecAddress): Promise<PublicDataWrite> {
|
|
423
464
|
const feeJuiceAddress = ProtocolContractAddress.FeeJuice;
|
|
424
465
|
const balanceSlot = await computeFeePayerBalanceStorageSlot(feePayer);
|
|
425
466
|
const leafSlot = await computeFeePayerBalanceLeafSlot(feePayer);
|
|
467
|
+
// This high-level db is used as a convenient helper. It could be done with the merkleTree directly.
|
|
468
|
+
const treesDB = new PublicTreesDB(this.guardedMerkleTree);
|
|
426
469
|
|
|
427
470
|
this.log.debug(`Deducting ${txFee.toBigInt()} balance in Fee Juice for ${feePayer}`);
|
|
428
471
|
|
|
429
|
-
const balance = await
|
|
472
|
+
const balance = await treesDB.storageRead(feeJuiceAddress, balanceSlot);
|
|
430
473
|
|
|
431
474
|
if (balance.lt(txFee)) {
|
|
432
475
|
throw new Error(
|
|
@@ -435,42 +478,47 @@ export class PublicProcessor implements Traceable {
|
|
|
435
478
|
}
|
|
436
479
|
|
|
437
480
|
const updatedBalance = balance.sub(txFee);
|
|
438
|
-
await
|
|
481
|
+
await treesDB.storageWrite(feeJuiceAddress, balanceSlot, updatedBalance);
|
|
439
482
|
|
|
440
483
|
return new PublicDataWrite(leafSlot, updatedBalance);
|
|
441
484
|
}
|
|
442
485
|
|
|
443
|
-
@trackSpan('PublicProcessor.processPrivateOnlyTx',
|
|
444
|
-
[Attributes.TX_HASH]:
|
|
486
|
+
@trackSpan('PublicProcessor.processPrivateOnlyTx', (tx: Tx) => ({
|
|
487
|
+
[Attributes.TX_HASH]: tx.getTxHash().toString(),
|
|
445
488
|
}))
|
|
446
489
|
private async processPrivateOnlyTx(tx: Tx): Promise<[ProcessedTx, undefined]> {
|
|
447
490
|
const gasFees = this.globalVariables.gasFees;
|
|
448
|
-
const transactionFee = tx.data.gasUsed
|
|
491
|
+
const transactionFee = computeTransactionFee(gasFees, tx.data.constants.txContext.gasSettings, tx.data.gasUsed);
|
|
449
492
|
|
|
450
|
-
const feePaymentPublicDataWrite = await this.
|
|
493
|
+
const feePaymentPublicDataWrite = await this.performFeePaymentPublicDataWrite(transactionFee, tx.data.feePayer);
|
|
451
494
|
|
|
452
|
-
const processedTx =
|
|
495
|
+
const processedTx = makeProcessedTxFromPrivateOnlyTx(
|
|
453
496
|
tx,
|
|
454
497
|
transactionFee,
|
|
455
498
|
feePaymentPublicDataWrite,
|
|
456
499
|
this.globalVariables,
|
|
457
500
|
);
|
|
458
501
|
|
|
459
|
-
|
|
460
|
-
tx
|
|
461
|
-
|
|
502
|
+
this.metrics.recordClassPublication(
|
|
503
|
+
...tx
|
|
504
|
+
.getContractClassLogs()
|
|
505
|
+
.filter(log => ContractClassPublishedEvent.isContractClassPublishedEvent(log))
|
|
506
|
+
.map(log => ContractClassPublishedEvent.fromLog(log)),
|
|
462
507
|
);
|
|
463
508
|
|
|
464
|
-
|
|
465
|
-
|
|
466
|
-
|
|
467
|
-
|
|
468
|
-
)
|
|
509
|
+
// Fee payment insertion has already been done. Do the rest.
|
|
510
|
+
await this.doTreeInsertionsForPrivateOnlyTx(processedTx);
|
|
511
|
+
|
|
512
|
+
// Add any contracts registered/deployed in this private-only tx to the block-level cache
|
|
513
|
+
// (add to tx-level cache and then commit to block-level cache)
|
|
514
|
+
await this.contractsDB.addNewContracts(tx);
|
|
515
|
+
this.contractsDB.commitContractsForTx();
|
|
516
|
+
|
|
469
517
|
return [processedTx, undefined];
|
|
470
518
|
}
|
|
471
519
|
|
|
472
|
-
@trackSpan('PublicProcessor.processTxWithPublicCalls',
|
|
473
|
-
[Attributes.TX_HASH]:
|
|
520
|
+
@trackSpan('PublicProcessor.processTxWithPublicCalls', tx => ({
|
|
521
|
+
[Attributes.TX_HASH]: tx.getTxHash().toString(),
|
|
474
522
|
}))
|
|
475
523
|
private async processTxWithPublicCalls(tx: Tx): Promise<[ProcessedTx, NestedProcessReturnValues[]]> {
|
|
476
524
|
const timer = new Timer();
|
|
@@ -487,32 +535,24 @@ export class PublicProcessor implements Traceable {
|
|
|
487
535
|
if (phase.reverted) {
|
|
488
536
|
this.metrics.recordRevertedPhase(phase.phase);
|
|
489
537
|
} else {
|
|
490
|
-
this.metrics.recordPhaseDuration(phase.phase, phase.durationMs);
|
|
538
|
+
this.metrics.recordPhaseDuration(phase.phase, phase.durationMs ?? 0);
|
|
491
539
|
}
|
|
492
540
|
});
|
|
493
541
|
|
|
494
|
-
const
|
|
495
|
-
tx.
|
|
496
|
-
|
|
497
|
-
|
|
498
|
-
|
|
499
|
-
|
|
500
|
-
|
|
501
|
-
.filter(log => ContractClassRegisteredEvent.isContractClassRegisteredEvent(log))
|
|
502
|
-
.map(log => ContractClassRegisteredEvent.fromLog(log)),
|
|
542
|
+
const contractClassLogs = revertCode.isOK()
|
|
543
|
+
? tx.getContractClassLogs()
|
|
544
|
+
: tx.getSplitContractClassLogs(false /* revertible */);
|
|
545
|
+
this.metrics.recordClassPublication(
|
|
546
|
+
...contractClassLogs
|
|
547
|
+
.filter(log => ContractClassPublishedEvent.isContractClassPublishedEvent(log))
|
|
548
|
+
.map(log => ContractClassPublishedEvent.fromLog(log)),
|
|
503
549
|
);
|
|
504
550
|
|
|
505
551
|
const phaseCount = processedPhases.length;
|
|
506
552
|
const durationMs = timer.ms();
|
|
507
553
|
this.metrics.recordTx(phaseCount, durationMs, gasUsed.publicGas);
|
|
508
554
|
|
|
509
|
-
const processedTx =
|
|
510
|
-
tx,
|
|
511
|
-
avmProvingRequest,
|
|
512
|
-
gasUsed,
|
|
513
|
-
revertCode,
|
|
514
|
-
revertReason,
|
|
515
|
-
);
|
|
555
|
+
const processedTx = makeProcessedTxFromTxWithPublicCalls(tx, avmProvingRequest, gasUsed, revertCode, revertReason);
|
|
516
556
|
|
|
517
557
|
const returnValues = processedPhases.find(({ phase }) => phase === TxExecutionPhase.APP_LOGIC)?.returnValues ?? [];
|
|
518
558
|
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import type {
|
|
1
|
+
import type { ContractClassPublishedEvent } from '@aztec/protocol-contracts/class-registry';
|
|
2
2
|
import type { Gas } from '@aztec/stdlib/gas';
|
|
3
3
|
import type { TxExecutionPhase } from '@aztec/stdlib/tx';
|
|
4
4
|
import {
|
|
@@ -137,7 +137,7 @@ export class PublicProcessorMetrics {
|
|
|
137
137
|
this.phaseCount.add(1, { [Attributes.TX_PHASE_NAME]: phaseName, [Attributes.OK]: false });
|
|
138
138
|
}
|
|
139
139
|
|
|
140
|
-
|
|
140
|
+
recordClassPublication(...events: ContractClassPublishedEvent[]) {
|
|
141
141
|
let totalBytecode = 0;
|
|
142
142
|
for (const event of events) {
|
|
143
143
|
totalBytecode += event.packedPublicBytecode.length;
|