@aztec/simulator 0.0.1-commit.b655e406 → 0.0.1-commit.c7c42ec
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/dest/client.d.ts +1 -1
- package/dest/common/errors.d.ts +2 -8
- package/dest/common/errors.d.ts.map +1 -1
- package/dest/common/index.d.ts +1 -1
- package/dest/common/stats/index.d.ts +1 -1
- package/dest/common/stats/stats.d.ts +1 -1
- package/dest/private/acvm/acvm.d.ts +1 -1
- package/dest/private/acvm/acvm_types.d.ts +1 -1
- package/dest/private/acvm/deserialize.d.ts +2 -2
- package/dest/private/acvm/deserialize.d.ts.map +1 -1
- package/dest/private/acvm/deserialize.js +1 -1
- package/dest/private/acvm/index.d.ts +1 -1
- package/dest/private/acvm/serialize.d.ts +2 -2
- package/dest/private/acvm/serialize.d.ts.map +1 -1
- package/dest/private/acvm/serialize.js +1 -1
- package/dest/private/acvm_native.d.ts +1 -1
- package/dest/private/acvm_native.d.ts.map +1 -1
- package/dest/private/acvm_wasm.d.ts +1 -1
- package/dest/private/acvm_wasm.d.ts.map +1 -1
- package/dest/private/acvm_wasm_with_blobs.d.ts +1 -1
- package/dest/private/acvm_wasm_with_blobs.d.ts.map +1 -1
- package/dest/private/circuit_recording/circuit_recorder.d.ts +1 -1
- package/dest/private/circuit_recording/circuit_recorder.d.ts.map +1 -1
- package/dest/private/circuit_recording/circuit_recorder.js +1 -1
- package/dest/private/circuit_recording/file_circuit_recorder.d.ts +1 -1
- package/dest/private/circuit_recording/file_circuit_recorder.d.ts.map +1 -1
- package/dest/private/circuit_recording/memory_circuit_recorder.d.ts +1 -1
- package/dest/private/circuit_recording/memory_circuit_recorder.d.ts.map +1 -1
- package/dest/private/circuit_recording/simulator_recorder_wrapper.d.ts +1 -1
- package/dest/private/circuit_recording/simulator_recorder_wrapper.d.ts.map +1 -1
- package/dest/private/circuit_simulator.d.ts +1 -1
- package/dest/private/factory.d.ts +1 -1
- package/dest/public/avm/avm_context.d.ts +2 -2
- package/dest/public/avm/avm_context.d.ts.map +1 -1
- package/dest/public/avm/avm_contract_call_result.d.ts +2 -2
- package/dest/public/avm/avm_contract_call_result.d.ts.map +1 -1
- package/dest/public/avm/avm_execution_environment.d.ts +5 -5
- package/dest/public/avm/avm_execution_environment.d.ts.map +1 -1
- package/dest/public/avm/avm_execution_environment.js +5 -8
- package/dest/public/avm/avm_gas.d.ts +2 -2
- package/dest/public/avm/avm_gas.d.ts.map +1 -1
- package/dest/public/avm/avm_machine_state.d.ts +2 -2
- package/dest/public/avm/avm_machine_state.d.ts.map +1 -1
- package/dest/public/avm/avm_memory_types.d.ts +14 -14
- package/dest/public/avm/avm_memory_types.d.ts.map +1 -1
- package/dest/public/avm/avm_memory_types.js +1 -1
- package/dest/public/avm/avm_simulator.d.ts +4 -3
- package/dest/public/avm/avm_simulator.d.ts.map +1 -1
- package/dest/public/avm/avm_simulator.js +8 -7
- package/dest/public/avm/avm_simulator_interface.d.ts +1 -1
- package/dest/public/avm/errors.d.ts +8 -2
- package/dest/public/avm/errors.d.ts.map +1 -1
- package/dest/public/avm/errors.js +14 -2
- package/dest/public/avm/fixtures/avm_simulation_tester.d.ts +1 -1
- package/dest/public/avm/fixtures/avm_simulation_tester.d.ts.map +1 -1
- package/dest/public/avm/fixtures/avm_simulation_tester.js +12 -3
- package/dest/public/avm/fixtures/base_avm_simulation_tester.d.ts +2 -2
- package/dest/public/avm/fixtures/base_avm_simulation_tester.d.ts.map +1 -1
- package/dest/public/avm/fixtures/base_avm_simulation_tester.js +1 -1
- package/dest/public/avm/fixtures/initializers.d.ts +2 -3
- package/dest/public/avm/fixtures/initializers.d.ts.map +1 -1
- package/dest/public/avm/fixtures/initializers.js +7 -5
- package/dest/public/avm/fixtures/utils.d.ts +4 -3
- package/dest/public/avm/fixtures/utils.d.ts.map +1 -1
- package/dest/public/avm/fixtures/utils.js +3 -2
- package/dest/public/avm/index.d.ts +1 -1
- package/dest/public/avm/opcodes/accrued_substate.d.ts +1 -1
- package/dest/public/avm/opcodes/accrued_substate.d.ts.map +1 -1
- package/dest/public/avm/opcodes/addressing_mode.d.ts +1 -1
- package/dest/public/avm/opcodes/addressing_mode.d.ts.map +1 -1
- package/dest/public/avm/opcodes/addressing_mode.js +2 -2
- package/dest/public/avm/opcodes/arithmetic.d.ts +10 -8
- package/dest/public/avm/opcodes/arithmetic.d.ts.map +1 -1
- package/dest/public/avm/opcodes/arithmetic.js +11 -1
- package/dest/public/avm/opcodes/bitwise.d.ts +5 -5
- package/dest/public/avm/opcodes/bitwise.d.ts.map +1 -1
- package/dest/public/avm/opcodes/comparators.d.ts +4 -4
- package/dest/public/avm/opcodes/comparators.d.ts.map +1 -1
- package/dest/public/avm/opcodes/contract.d.ts +1 -1
- package/dest/public/avm/opcodes/contract.d.ts.map +1 -1
- package/dest/public/avm/opcodes/control_flow.d.ts +1 -1
- package/dest/public/avm/opcodes/control_flow.d.ts.map +1 -1
- package/dest/public/avm/opcodes/conversion.d.ts +1 -1
- package/dest/public/avm/opcodes/conversion.d.ts.map +1 -1
- package/dest/public/avm/opcodes/ec_add.d.ts +2 -2
- 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 +1 -1
- package/dest/public/avm/opcodes/environment_getters.d.ts.map +1 -1
- package/dest/public/avm/opcodes/external_calls.d.ts +1 -1
- package/dest/public/avm/opcodes/external_calls.d.ts.map +1 -1
- package/dest/public/avm/opcodes/hashing.d.ts +2 -2
- package/dest/public/avm/opcodes/hashing.d.ts.map +1 -1
- package/dest/public/avm/opcodes/hashing.js +9 -4
- package/dest/public/avm/opcodes/index.d.ts +1 -1
- package/dest/public/avm/opcodes/instruction.d.ts +2 -2
- package/dest/public/avm/opcodes/instruction.d.ts.map +1 -1
- package/dest/public/avm/opcodes/instruction_impl.d.ts +1 -1
- package/dest/public/avm/opcodes/instruction_impl.d.ts.map +1 -1
- package/dest/public/avm/opcodes/memory.d.ts +2 -2
- package/dest/public/avm/opcodes/memory.d.ts.map +1 -1
- package/dest/public/avm/opcodes/memory.js +1 -1
- package/dest/public/avm/opcodes/misc.d.ts +1 -1
- package/dest/public/avm/opcodes/misc.d.ts.map +1 -1
- package/dest/public/avm/opcodes/misc.js +4 -4
- package/dest/public/avm/opcodes/storage.d.ts +3 -3
- package/dest/public/avm/opcodes/storage.d.ts.map +1 -1
- package/dest/public/avm/revert_reason.d.ts +2 -2
- package/dest/public/avm/revert_reason.d.ts.map +1 -1
- package/dest/public/avm/revert_reason.js +3 -2
- package/dest/public/avm/serialization/buffer_cursor.d.ts +1 -1
- package/dest/public/avm/serialization/buffer_cursor.d.ts.map +1 -1
- package/dest/public/avm/serialization/bytecode_serialization.d.ts +1 -1
- package/dest/public/avm/serialization/bytecode_serialization.d.ts.map +1 -1
- package/dest/public/avm/serialization/bytecode_serialization.js +9 -6
- package/dest/public/avm/serialization/instruction_serialization.d.ts +1 -1
- package/dest/public/avm/serialization/instruction_serialization.js +1 -1
- package/dest/public/avm/test_utils.d.ts +2 -2
- package/dest/public/avm/test_utils.d.ts.map +1 -1
- package/dest/public/avm/test_utils.js +1 -1
- package/dest/public/contracts_db_checkpoint.d.ts +16 -0
- package/dest/public/contracts_db_checkpoint.d.ts.map +1 -0
- package/dest/public/contracts_db_checkpoint.js +30 -0
- package/dest/public/db_interfaces.d.ts +14 -2
- package/dest/public/db_interfaces.d.ts.map +1 -1
- package/dest/public/debug_fn_name.d.ts +15 -2
- package/dest/public/debug_fn_name.d.ts.map +1 -1
- package/dest/public/debug_fn_name.js +28 -2
- package/dest/public/executor_metrics.d.ts +3 -2
- package/dest/public/executor_metrics.d.ts.map +1 -1
- package/dest/public/executor_metrics.js +1 -1
- package/dest/public/executor_metrics_interface.d.ts +3 -2
- package/dest/public/executor_metrics_interface.d.ts.map +1 -1
- package/dest/public/fixtures/amm_test.d.ts +1 -1
- package/dest/public/fixtures/amm_test.js +2 -2
- package/dest/public/fixtures/bulk_test.d.ts +1 -1
- package/dest/public/fixtures/bulk_test.js +4 -52
- package/dest/public/fixtures/custom_bytecode_tester.d.ts +29 -7
- package/dest/public/fixtures/custom_bytecode_tester.d.ts.map +1 -1
- package/dest/public/fixtures/custom_bytecode_tester.js +36 -12
- package/dest/public/fixtures/custom_bytecode_tests.d.ts +4 -1
- package/dest/public/fixtures/custom_bytecode_tests.d.ts.map +1 -1
- package/dest/public/fixtures/custom_bytecode_tests.js +74 -9
- package/dest/public/fixtures/index.d.ts +4 -2
- package/dest/public/fixtures/index.d.ts.map +1 -1
- package/dest/public/fixtures/index.js +3 -1
- package/dest/public/fixtures/minimal_public_tx.d.ts +2 -8
- package/dest/public/fixtures/minimal_public_tx.d.ts.map +1 -1
- package/dest/public/fixtures/minimal_public_tx.js +4 -14
- package/dest/public/fixtures/opcode_spammer.d.ts +123 -0
- package/dest/public/fixtures/opcode_spammer.d.ts.map +1 -0
- package/dest/public/fixtures/opcode_spammer.js +1681 -0
- package/dest/public/fixtures/public_tx_simulation_tester.d.ts +24 -6
- package/dest/public/fixtures/public_tx_simulation_tester.d.ts.map +1 -1
- package/dest/public/fixtures/public_tx_simulation_tester.js +62 -21
- package/dest/public/fixtures/simple_contract_data_source.d.ts +5 -4
- package/dest/public/fixtures/simple_contract_data_source.d.ts.map +1 -1
- package/dest/public/fixtures/simple_contract_data_source.js +4 -4
- package/dest/public/fixtures/token_test.d.ts +6 -2
- package/dest/public/fixtures/token_test.d.ts.map +1 -1
- package/dest/public/fixtures/token_test.js +13 -12
- package/dest/public/fixtures/utils.d.ts +2 -2
- package/dest/public/fixtures/utils.d.ts.map +1 -1
- package/dest/public/fixtures/utils.js +4 -3
- package/dest/public/fuzzing/avm_fuzzer_simulator.d.ts +46 -0
- package/dest/public/fuzzing/avm_fuzzer_simulator.d.ts.map +1 -0
- package/dest/public/fuzzing/avm_fuzzer_simulator.js +139 -0
- package/dest/public/fuzzing/avm_simulator_bin.d.ts +2 -0
- package/dest/public/fuzzing/avm_simulator_bin.d.ts.map +1 -0
- package/dest/public/fuzzing/avm_simulator_bin.js +100 -0
- package/dest/public/hinting_db_sources.d.ts +14 -4
- package/dest/public/hinting_db_sources.d.ts.map +1 -1
- package/dest/public/hinting_db_sources.js +69 -13
- package/dest/public/index.d.ts +3 -2
- package/dest/public/index.d.ts.map +1 -1
- package/dest/public/index.js +1 -1
- package/dest/public/public_db_sources.d.ts +22 -63
- package/dest/public/public_db_sources.d.ts.map +1 -1
- package/dest/public/public_db_sources.js +74 -131
- package/dest/public/public_errors.d.ts +1 -1
- package/dest/public/public_errors.d.ts.map +1 -1
- package/dest/public/public_processor/guarded_merkle_tree.d.ts +6 -4
- package/dest/public/public_processor/guarded_merkle_tree.d.ts.map +1 -1
- package/dest/public/public_processor/guarded_merkle_tree.js +3 -0
- package/dest/public/public_processor/public_processor.d.ts +11 -18
- package/dest/public/public_processor/public_processor.d.ts.map +1 -1
- package/dest/public/public_processor/public_processor.js +54 -43
- package/dest/public/public_processor/public_processor_metrics.d.ts +1 -1
- package/dest/public/public_processor/public_processor_metrics.d.ts.map +1 -1
- package/dest/public/public_tx_simulator/contract_provider_for_cpp.d.ts +18 -0
- package/dest/public/public_tx_simulator/contract_provider_for_cpp.d.ts.map +1 -0
- package/dest/public/public_tx_simulator/contract_provider_for_cpp.js +98 -0
- package/dest/public/public_tx_simulator/cpp_public_tx_simulator.d.ts +34 -22
- package/dest/public/public_tx_simulator/cpp_public_tx_simulator.d.ts.map +1 -1
- package/dest/public/public_tx_simulator/cpp_public_tx_simulator.js +92 -50
- package/dest/public/public_tx_simulator/cpp_public_tx_simulator_with_hinted_dbs.d.ts +42 -0
- package/dest/public/public_tx_simulator/cpp_public_tx_simulator_with_hinted_dbs.d.ts.map +1 -0
- package/dest/public/public_tx_simulator/cpp_public_tx_simulator_with_hinted_dbs.js +86 -0
- package/dest/public/public_tx_simulator/cpp_vs_ts_public_tx_simulator.d.ts +30 -0
- package/dest/public/public_tx_simulator/cpp_vs_ts_public_tx_simulator.d.ts.map +1 -0
- package/dest/public/public_tx_simulator/cpp_vs_ts_public_tx_simulator.js +171 -0
- package/dest/public/public_tx_simulator/dumping_cpp_public_tx_simulator.d.ts +22 -0
- package/dest/public/public_tx_simulator/dumping_cpp_public_tx_simulator.d.ts.map +1 -0
- package/dest/public/public_tx_simulator/dumping_cpp_public_tx_simulator.js +52 -0
- package/dest/public/public_tx_simulator/factories.d.ts +13 -0
- package/dest/public/public_tx_simulator/factories.d.ts.map +1 -0
- package/dest/public/public_tx_simulator/factories.js +28 -0
- package/dest/public/public_tx_simulator/index.d.ts +5 -1
- package/dest/public/public_tx_simulator/index.d.ts.map +1 -1
- package/dest/public/public_tx_simulator/index.js +3 -0
- package/dest/public/public_tx_simulator/measured_public_tx_simulator.d.ts +14 -7
- package/dest/public/public_tx_simulator/measured_public_tx_simulator.d.ts.map +1 -1
- package/dest/public/public_tx_simulator/measured_public_tx_simulator.js +5 -5
- package/dest/public/public_tx_simulator/public_tx_context.d.ts +6 -3
- package/dest/public/public_tx_simulator/public_tx_context.d.ts.map +1 -1
- package/dest/public/public_tx_simulator/public_tx_context.js +13 -5
- package/dest/public/public_tx_simulator/public_tx_simulator.d.ts +11 -31
- package/dest/public/public_tx_simulator/public_tx_simulator.d.ts.map +1 -1
- package/dest/public/public_tx_simulator/public_tx_simulator.js +109 -126
- package/dest/public/public_tx_simulator/public_tx_simulator_interface.d.ts +25 -2
- package/dest/public/public_tx_simulator/public_tx_simulator_interface.d.ts.map +1 -1
- package/dest/public/public_tx_simulator/telemetry_public_tx_simulator.d.ts +4 -4
- package/dest/public/public_tx_simulator/telemetry_public_tx_simulator.d.ts.map +1 -1
- package/dest/public/side_effect_errors.d.ts +1 -1
- package/dest/public/side_effect_errors.d.ts.map +1 -1
- package/dest/public/side_effect_trace.d.ts +2 -3
- package/dest/public/side_effect_trace.d.ts.map +1 -1
- package/dest/public/side_effect_trace.js +1 -1
- package/dest/public/side_effect_trace_interface.d.ts +3 -4
- package/dest/public/side_effect_trace_interface.d.ts.map +1 -1
- package/dest/public/state_manager/index.d.ts +1 -1
- package/dest/public/state_manager/nullifiers.d.ts +2 -2
- package/dest/public/state_manager/nullifiers.d.ts.map +1 -1
- package/dest/public/state_manager/public_storage.d.ts +2 -2
- package/dest/public/state_manager/public_storage.d.ts.map +1 -1
- package/dest/public/state_manager/public_storage.js +1 -1
- package/dest/public/state_manager/state_manager.d.ts +9 -11
- package/dest/public/state_manager/state_manager.d.ts.map +1 -1
- package/dest/public/state_manager/state_manager.js +10 -6
- package/dest/public/test_executor_metrics.d.ts +4 -3
- package/dest/public/test_executor_metrics.d.ts.map +1 -1
- package/dest/public/test_executor_metrics.js +5 -4
- package/dest/public/unique_class_ids.d.ts +1 -1
- package/dest/public/unique_class_ids.d.ts.map +1 -1
- package/dest/public/utils.d.ts +1 -1
- package/dest/server.d.ts +1 -1
- package/dest/testing.d.ts +1 -1
- package/package.json +21 -20
- package/src/common/errors.ts +1 -1
- package/src/private/acvm/deserialize.ts +1 -1
- package/src/private/acvm/serialize.ts +1 -1
- package/src/private/circuit_recording/circuit_recorder.ts +1 -1
- package/src/public/avm/avm_context.ts +1 -1
- package/src/public/avm/avm_contract_call_result.ts +1 -1
- package/src/public/avm/avm_execution_environment.ts +4 -6
- package/src/public/avm/avm_gas.ts +3 -3
- package/src/public/avm/avm_machine_state.ts +1 -1
- package/src/public/avm/avm_memory_types.ts +1 -1
- package/src/public/avm/avm_simulator.ts +11 -9
- package/src/public/avm/errors.ts +17 -3
- package/src/public/avm/fixtures/avm_simulation_tester.ts +10 -2
- package/src/public/avm/fixtures/base_avm_simulation_tester.ts +1 -1
- package/src/public/avm/fixtures/initializers.ts +8 -10
- package/src/public/avm/fixtures/utils.ts +3 -2
- package/src/public/avm/opcodes/addressing_mode.ts +2 -2
- package/src/public/avm/opcodes/arithmetic.ts +13 -1
- package/src/public/avm/opcodes/ec_add.ts +2 -2
- package/src/public/avm/opcodes/hashing.ts +10 -4
- package/src/public/avm/opcodes/memory.ts +1 -1
- package/src/public/avm/opcodes/misc.ts +4 -4
- package/src/public/avm/revert_reason.ts +6 -3
- package/src/public/avm/serialization/bytecode_serialization.ts +17 -6
- package/src/public/avm/serialization/instruction_serialization.ts +1 -1
- package/src/public/avm/test_utils.ts +1 -1
- package/src/public/contracts_db_checkpoint.ts +41 -0
- package/src/public/db_interfaces.ts +16 -1
- package/src/public/debug_fn_name.ts +35 -3
- package/src/public/executor_metrics.ts +2 -1
- package/src/public/executor_metrics_interface.ts +2 -1
- package/src/public/fixtures/amm_test.ts +2 -2
- package/src/public/fixtures/bulk_test.ts +7 -7
- package/src/public/fixtures/custom_bytecode_tester.ts +54 -20
- package/src/public/fixtures/custom_bytecode_tests.ts +93 -9
- package/src/public/fixtures/index.ts +7 -1
- package/src/public/fixtures/minimal_public_tx.ts +5 -15
- package/src/public/fixtures/opcode_spammer.ts +1638 -0
- package/src/public/fixtures/public_tx_simulation_tester.ts +85 -21
- package/src/public/fixtures/simple_contract_data_source.ts +8 -9
- package/src/public/fixtures/token_test.ts +18 -10
- package/src/public/fixtures/utils.ts +2 -3
- package/src/public/fuzzing/avm_fuzzer_simulator.ts +240 -0
- package/src/public/fuzzing/avm_simulator_bin.ts +140 -0
- package/src/public/hinting_db_sources.ts +112 -10
- package/src/public/index.ts +6 -4
- package/src/public/public_db_sources.ts +93 -172
- package/src/public/public_processor/guarded_merkle_tree.ts +8 -3
- package/src/public/public_processor/public_processor.ts +83 -57
- package/src/public/public_tx_simulator/contract_provider_for_cpp.ts +121 -0
- package/src/public/public_tx_simulator/cpp_public_tx_simulator.ts +129 -57
- package/src/public/public_tx_simulator/cpp_public_tx_simulator_with_hinted_dbs.ts +132 -0
- package/src/public/public_tx_simulator/cpp_vs_ts_public_tx_simulator.ts +237 -0
- package/src/public/public_tx_simulator/dumping_cpp_public_tx_simulator.ts +81 -0
- package/src/public/public_tx_simulator/factories.ts +41 -0
- package/src/public/public_tx_simulator/index.ts +4 -0
- package/src/public/public_tx_simulator/measured_public_tx_simulator.ts +10 -14
- package/src/public/public_tx_simulator/public_tx_context.ts +9 -3
- package/src/public/public_tx_simulator/public_tx_simulator.ts +161 -193
- package/src/public/public_tx_simulator/public_tx_simulator_interface.ts +24 -2
- package/src/public/public_tx_simulator/telemetry_public_tx_simulator.ts +3 -3
- package/src/public/side_effect_trace.ts +1 -1
- package/src/public/side_effect_trace_interface.ts +1 -1
- package/src/public/state_manager/nullifiers.ts +1 -1
- package/src/public/state_manager/public_storage.ts +1 -1
- package/src/public/state_manager/state_manager.ts +14 -14
- package/src/public/test_executor_metrics.ts +7 -5
- package/dest/public/tx_contract_cache.d.ts +0 -41
- package/dest/public/tx_contract_cache.d.ts.map +0 -1
- package/dest/public/tx_contract_cache.js +0 -49
- package/src/public/tx_contract_cache.ts +0 -69
|
@@ -6,23 +6,24 @@ function _ts_decorate(decorators, target, key, desc) {
|
|
|
6
6
|
}
|
|
7
7
|
import { MAX_NOTE_HASHES_PER_TX, MAX_NULLIFIERS_PER_TX, NULLIFIER_SUBTREE_HEIGHT } from '@aztec/constants';
|
|
8
8
|
import { padArrayEnd } from '@aztec/foundation/collection';
|
|
9
|
-
import { Fr } from '@aztec/foundation/
|
|
9
|
+
import { Fr } from '@aztec/foundation/curves/bn254';
|
|
10
10
|
import { createLogger } from '@aztec/foundation/log';
|
|
11
11
|
import { sleep } from '@aztec/foundation/sleep';
|
|
12
12
|
import { DateProvider, Timer, elapsed, executeTimeout } from '@aztec/foundation/timer';
|
|
13
13
|
import { ProtocolContractAddress } from '@aztec/protocol-contracts';
|
|
14
14
|
import { ContractClassPublishedEvent } from '@aztec/protocol-contracts/class-registry';
|
|
15
15
|
import { computeFeePayerBalanceLeafSlot, computeFeePayerBalanceStorageSlot } from '@aztec/protocol-contracts/fee-juice';
|
|
16
|
-
import { PublicDataWrite } from '@aztec/stdlib/avm';
|
|
16
|
+
import { AvmCircuitInputs, AvmExecutionHints, PublicDataWrite } from '@aztec/stdlib/avm';
|
|
17
17
|
import { computeTransactionFee } from '@aztec/stdlib/fees';
|
|
18
18
|
import { Gas } from '@aztec/stdlib/gas';
|
|
19
|
+
import { ProvingRequestType } from '@aztec/stdlib/proofs';
|
|
19
20
|
import { MerkleTreeId } from '@aztec/stdlib/trees';
|
|
20
|
-
import { NestedProcessReturnValues,
|
|
21
|
+
import { NestedProcessReturnValues, makeProcessedTxFromPrivateOnlyTx, makeProcessedTxFromTxWithPublicCalls } from '@aztec/stdlib/tx';
|
|
21
22
|
import { Attributes, getTelemetryClient, trackSpan } from '@aztec/telemetry-client';
|
|
22
23
|
import { ForkCheckpoint } from '@aztec/world-state/native';
|
|
23
24
|
import { AssertionError } from 'assert';
|
|
24
25
|
import { PublicContractsDB, PublicTreesDB } from '../public_db_sources.js';
|
|
25
|
-
import {
|
|
26
|
+
import { TelemetryCppPublicTxSimulator } from '../public_tx_simulator/index.js';
|
|
26
27
|
import { GuardedMerkleTreeOperations } from './guarded_merkle_tree.js';
|
|
27
28
|
import { PublicProcessorMetrics } from './public_processor_metrics.js';
|
|
28
29
|
/**
|
|
@@ -44,17 +45,11 @@ import { PublicProcessorMetrics } from './public_processor_metrics.js';
|
|
|
44
45
|
*/ create(merkleTree, globalVariables, config) {
|
|
45
46
|
const contractsDB = new PublicContractsDB(this.contractDataSource);
|
|
46
47
|
const guardedFork = new GuardedMerkleTreeOperations(merkleTree);
|
|
47
|
-
const publicTxSimulator = this.createPublicTxSimulator(guardedFork, contractsDB, globalVariables,
|
|
48
|
-
proverId: config.proverId,
|
|
49
|
-
doMerkleOperations: true,
|
|
50
|
-
skipFeeEnforcement: config.skipFeeEnforcement,
|
|
51
|
-
clientInitiatedSimulation: config.clientInitiatedSimulation,
|
|
52
|
-
maxDebugLogMemoryReads: config.maxDebugLogMemoryReads
|
|
53
|
-
});
|
|
48
|
+
const publicTxSimulator = this.createPublicTxSimulator(guardedFork, contractsDB, globalVariables, config);
|
|
54
49
|
return new PublicProcessor(globalVariables, guardedFork, contractsDB, publicTxSimulator, this.dateProvider, this.telemetryClient);
|
|
55
50
|
}
|
|
56
51
|
createPublicTxSimulator(merkleTree, contractsDB, globalVariables, config) {
|
|
57
|
-
return new
|
|
52
|
+
return new TelemetryCppPublicTxSimulator(merkleTree, contractsDB, globalVariables, this.telemetryClient, config);
|
|
58
53
|
}
|
|
59
54
|
}
|
|
60
55
|
class PublicProcessorTimeoutError extends Error {
|
|
@@ -106,7 +101,7 @@ class PublicProcessorTimeoutError extends Error {
|
|
|
106
101
|
let totalPublicGas = new Gas(0, 0);
|
|
107
102
|
let totalBlockGas = new Gas(0, 0);
|
|
108
103
|
let totalBlobFields = 0;
|
|
109
|
-
for await (const
|
|
104
|
+
for await (const tx of txs){
|
|
110
105
|
// Only process up to the max tx limit
|
|
111
106
|
if (maxTransactions !== undefined && result.length >= maxTransactions) {
|
|
112
107
|
this.log.debug(`Stopping tx processing due to reaching the max tx limit.`);
|
|
@@ -118,8 +113,8 @@ class PublicProcessorTimeoutError extends Error {
|
|
|
118
113
|
break;
|
|
119
114
|
}
|
|
120
115
|
// Skip this tx if it'd exceed max block size
|
|
121
|
-
const txHash =
|
|
122
|
-
const preTxSizeInBytes =
|
|
116
|
+
const txHash = tx.getTxHash().toString();
|
|
117
|
+
const preTxSizeInBytes = tx.getEstimatedPrivateTxEffectsSize();
|
|
123
118
|
if (maxBlockSize !== undefined && totalSizeInBytes + preTxSizeInBytes > maxBlockSize) {
|
|
124
119
|
this.log.warn(`Skipping processing of tx ${txHash} sized ${preTxSizeInBytes} bytes due to block size limit`, {
|
|
125
120
|
txHash,
|
|
@@ -130,7 +125,7 @@ class PublicProcessorTimeoutError extends Error {
|
|
|
130
125
|
continue;
|
|
131
126
|
}
|
|
132
127
|
// Skip this tx if its gas limit would exceed the block gas limit
|
|
133
|
-
const txGasLimit =
|
|
128
|
+
const txGasLimit = tx.data.constants.txContext.gasSettings.gasLimits;
|
|
134
129
|
if (maxBlockGas !== undefined && totalBlockGas.add(txGasLimit).gtAny(maxBlockGas)) {
|
|
135
130
|
this.log.warn(`Skipping processing of tx ${txHash} due to block gas limit`, {
|
|
136
131
|
txHash,
|
|
@@ -140,8 +135,6 @@ class PublicProcessorTimeoutError extends Error {
|
|
|
140
135
|
});
|
|
141
136
|
continue;
|
|
142
137
|
}
|
|
143
|
-
// The processor modifies the tx objects in place, so we need to clone them.
|
|
144
|
-
const tx = Tx.clone(origTx);
|
|
145
138
|
// We validate the tx before processing it, to avoid unnecessary work.
|
|
146
139
|
if (preprocessValidator) {
|
|
147
140
|
const result = await preprocessValidator.validateTx(tx);
|
|
@@ -171,10 +164,17 @@ class PublicProcessorTimeoutError extends Error {
|
|
|
171
164
|
// Note: We use the underlying fork here not the guarded one, this ensures that it's not impacted by stopping the guarded version
|
|
172
165
|
const checkpoint = await ForkCheckpoint.new(this.guardedMerkleTree.getUnderlyingFork());
|
|
173
166
|
const startStateReference = await this.guardedMerkleTree.getUnderlyingFork().getStateReference();
|
|
167
|
+
this.contractsDB.createCheckpoint();
|
|
174
168
|
try {
|
|
175
169
|
const [processedTx, returnValues] = await this.processTx(tx, deadline);
|
|
170
|
+
// Inject a fake processing failure after N txs if requested
|
|
171
|
+
const fakeThrowAfter = this.opts.fakeThrowAfterProcessingTxCount;
|
|
172
|
+
if (fakeThrowAfter !== undefined && result.length + failed.length + 1 >= fakeThrowAfter) {
|
|
173
|
+
throw new Error(`Fake error after processing ${fakeThrowAfter} txs`);
|
|
174
|
+
}
|
|
175
|
+
const txBlobFields = processedTx.txEffect.getNumBlobFields();
|
|
176
176
|
// If the actual size of this tx would exceed block size, skip it
|
|
177
|
-
const txSize =
|
|
177
|
+
const txSize = txBlobFields * Fr.SIZE_IN_BYTES;
|
|
178
178
|
if (maxBlockSize !== undefined && totalSizeInBytes + txSize > maxBlockSize) {
|
|
179
179
|
this.log.debug(`Skipping processed tx ${txHash} sized ${txSize} due to max block size.`, {
|
|
180
180
|
txHash,
|
|
@@ -184,10 +184,10 @@ class PublicProcessorTimeoutError extends Error {
|
|
|
184
184
|
});
|
|
185
185
|
// Need to revert the checkpoint here and don't go any further
|
|
186
186
|
await checkpoint.revert();
|
|
187
|
+
this.contractsDB.revertCheckpoint();
|
|
187
188
|
continue;
|
|
188
189
|
}
|
|
189
190
|
// If the actual blob fields of this tx would exceed the limit, skip it
|
|
190
|
-
const txBlobFields = processedTx.txEffect.toBlobFields().length;
|
|
191
191
|
if (maxBlobFields !== undefined && totalBlobFields + txBlobFields > maxBlobFields) {
|
|
192
192
|
this.log.debug(`Skipping processed tx ${txHash} with ${txBlobFields} blob fields due to max blob fields limit.`, {
|
|
193
193
|
txHash,
|
|
@@ -197,6 +197,7 @@ class PublicProcessorTimeoutError extends Error {
|
|
|
197
197
|
});
|
|
198
198
|
// Need to revert the checkpoint here and don't go any further
|
|
199
199
|
await checkpoint.revert();
|
|
200
|
+
this.contractsDB.revertCheckpoint();
|
|
200
201
|
continue;
|
|
201
202
|
}
|
|
202
203
|
// FIXME(fcarreiro): it's ugly to have to notify the validator of nullifiers.
|
|
@@ -213,7 +214,14 @@ class PublicProcessorTimeoutError extends Error {
|
|
|
213
214
|
if (err?.name === 'PublicProcessorTimeoutError') {
|
|
214
215
|
this.log.warn(`Stopping tx processing due to timeout.`);
|
|
215
216
|
// We hit the transaction execution deadline.
|
|
216
|
-
// There may still be a transaction executing
|
|
217
|
+
// There may still be a transaction executing on a worker thread (C++ via NAPI).
|
|
218
|
+
// Signal cancellation AND WAIT for the simulation to actually stop.
|
|
219
|
+
// This is critical because C++ might be in the middle of a slow operation (e.g., pad_trees)
|
|
220
|
+
// and won't check the cancellation flag until that operation completes.
|
|
221
|
+
// Without waiting, we'd proceed to revert checkpoints while C++ is still writing to state.
|
|
222
|
+
// Wait for C++ to stop gracefully.
|
|
223
|
+
await this.publicTxSimulator.cancel?.();
|
|
224
|
+
// Now stop the guarded fork to prevent any further TS-side access to the world state.
|
|
217
225
|
await this.guardedMerkleTree.stop();
|
|
218
226
|
// We now know there can't be any further access to world state. The fork is in a state where there is:
|
|
219
227
|
// 1. At least one outstanding checkpoint that has not been committed (the one created before we processed the tx).
|
|
@@ -225,6 +233,8 @@ class PublicProcessorTimeoutError extends Error {
|
|
|
225
233
|
// Now we want to revert any/all remaining checkpoints, destroying any outstanding state updates.
|
|
226
234
|
// This needs to be done directly on the underlying fork as the guarded fork has been stopped.
|
|
227
235
|
await this.guardedMerkleTree.getUnderlyingFork().revertAllCheckpoints();
|
|
236
|
+
// Revert any contracts added to the DB for the tx.
|
|
237
|
+
this.contractsDB.revertCheckpoint();
|
|
228
238
|
// Ensure we're at the same state as when we started processing this tx.
|
|
229
239
|
await this.checkWorldStateUnchanged(startStateReference, txHash, err);
|
|
230
240
|
break;
|
|
@@ -232,6 +242,7 @@ class PublicProcessorTimeoutError extends Error {
|
|
|
232
242
|
// Roll back state to start of TX before proceeding to next TX
|
|
233
243
|
await checkpoint.revert();
|
|
234
244
|
await this.guardedMerkleTree.getUnderlyingFork().revertAllCheckpoints();
|
|
245
|
+
this.contractsDB.revertCheckpoint();
|
|
235
246
|
const errorMessage = err instanceof Error || err instanceof AssertionError ? err.message : 'Unknown error';
|
|
236
247
|
this.log.warn(`Failed to process tx ${txHash.toString()}: ${errorMessage} ${err?.stack}`);
|
|
237
248
|
failed.push({
|
|
@@ -244,8 +255,7 @@ class PublicProcessorTimeoutError extends Error {
|
|
|
244
255
|
} finally{
|
|
245
256
|
// Base case is we always commit the checkpoint. Using the ForkCheckpoint means this has no effect if the tx was previously reverted
|
|
246
257
|
await checkpoint.commit();
|
|
247
|
-
|
|
248
|
-
this.contractsDB.clearContractsForTx();
|
|
258
|
+
this.contractsDB.commitCheckpointOkIfNone();
|
|
249
259
|
}
|
|
250
260
|
}
|
|
251
261
|
const duration = timer.s();
|
|
@@ -371,10 +381,7 @@ class PublicProcessorTimeoutError extends Error {
|
|
|
371
381
|
this.metrics.recordClassPublication(...tx.getContractClassLogs().filter((log)=>ContractClassPublishedEvent.isContractClassPublishedEvent(log)).map((log)=>ContractClassPublishedEvent.fromLog(log)));
|
|
372
382
|
// Fee payment insertion has already been done. Do the rest.
|
|
373
383
|
await this.doTreeInsertionsForPrivateOnlyTx(processedTx);
|
|
374
|
-
// Add any contracts registered/deployed in this private-only tx to the block-level cache
|
|
375
|
-
// (add to tx-level cache and then commit to block-level cache)
|
|
376
384
|
await this.contractsDB.addNewContracts(tx);
|
|
377
|
-
this.contractsDB.commitContractsForTx();
|
|
378
385
|
return [
|
|
379
386
|
processedTx,
|
|
380
387
|
undefined
|
|
@@ -382,30 +389,34 @@ class PublicProcessorTimeoutError extends Error {
|
|
|
382
389
|
}
|
|
383
390
|
async processTxWithPublicCalls(tx) {
|
|
384
391
|
const timer = new Timer();
|
|
385
|
-
const
|
|
386
|
-
|
|
387
|
-
|
|
388
|
-
throw new Error('Avm proving result was not generated.');
|
|
389
|
-
}
|
|
390
|
-
processedPhases.forEach((phase)=>{
|
|
391
|
-
if (phase.reverted) {
|
|
392
|
-
this.metrics.recordRevertedPhase(phase.phase);
|
|
393
|
-
} else {
|
|
394
|
-
this.metrics.recordPhaseDuration(phase.phase, phase.durationMs ?? 0);
|
|
395
|
-
}
|
|
396
|
-
});
|
|
392
|
+
const result = await this.publicTxSimulator.simulate(tx);
|
|
393
|
+
// TODO: use the callStackMetadata here to extract more data about public execution
|
|
394
|
+
const { hints, publicInputs, publicTxEffect, gasUsed, revertCode/*callStackMetadata*/ } = result;
|
|
397
395
|
const contractClassLogs = revertCode.isOK() ? tx.getContractClassLogs() : tx.getSplitContractClassLogs(false);
|
|
398
396
|
this.metrics.recordClassPublication(...contractClassLogs.filter((log)=>ContractClassPublishedEvent.isContractClassPublishedEvent(log)).map((log)=>ContractClassPublishedEvent.fromLog(log)));
|
|
399
|
-
|
|
397
|
+
// TODO(fcarreiro): remove phase count metric.
|
|
400
398
|
const durationMs = timer.ms();
|
|
401
|
-
this.metrics.recordTx(phaseCount, durationMs, gasUsed.publicGas);
|
|
402
|
-
|
|
403
|
-
const
|
|
399
|
+
this.metrics.recordTx(/*phaseCount=*/ 1, durationMs, gasUsed.publicGas);
|
|
400
|
+
// Extract the return values from the call stack metadata.
|
|
401
|
+
const appLogicReturnValues = result.getAppLogicReturnValues();
|
|
402
|
+
// Extract the revert reason from the call stack metadata.
|
|
403
|
+
const revertReason = result.findRevertReason();
|
|
404
|
+
// Create proving request if we have hints and public inputs.
|
|
405
|
+
const avmProvingRequest = hints && publicInputs ? PublicProcessor.generateProvingRequest(publicInputs, hints) : undefined;
|
|
406
|
+
const processedTx = makeProcessedTxFromTxWithPublicCalls(tx, this.globalVariables, avmProvingRequest, publicTxEffect, gasUsed, revertCode, revertReason);
|
|
404
407
|
return [
|
|
405
408
|
processedTx,
|
|
406
|
-
|
|
409
|
+
appLogicReturnValues
|
|
407
410
|
];
|
|
408
411
|
}
|
|
412
|
+
/**
|
|
413
|
+
* Generate the proving request for the AVM circuit.
|
|
414
|
+
*/ static generateProvingRequest(publicInputs, hints = AvmExecutionHints.empty()) {
|
|
415
|
+
return {
|
|
416
|
+
type: ProvingRequestType.PUBLIC_VM,
|
|
417
|
+
inputs: new AvmCircuitInputs(hints, publicInputs)
|
|
418
|
+
};
|
|
419
|
+
}
|
|
409
420
|
}
|
|
410
421
|
_ts_decorate([
|
|
411
422
|
trackSpan('PublicProcessor.processTx', (tx)=>({
|
|
@@ -24,4 +24,4 @@ export declare class PublicProcessorMetrics {
|
|
|
24
24
|
recordClassPublication(...events: ContractClassPublishedEvent[]): void;
|
|
25
25
|
recordTreeInsertions(durationUs: number): void;
|
|
26
26
|
}
|
|
27
|
-
//# sourceMappingURL=
|
|
27
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicHVibGljX3Byb2Nlc3Nvcl9tZXRyaWNzLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvcHVibGljL3B1YmxpY19wcm9jZXNzb3IvcHVibGljX3Byb2Nlc3Nvcl9tZXRyaWNzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sS0FBSyxFQUFFLDJCQUEyQixFQUFFLE1BQU0sMENBQTBDLENBQUM7QUFDNUYsT0FBTyxLQUFLLEVBQUUsR0FBRyxFQUFFLE1BQU0sbUJBQW1CLENBQUM7QUFDN0MsT0FBTyxLQUFLLEVBQUUsZ0JBQWdCLEVBQUUsTUFBTSxrQkFBa0IsQ0FBQztBQUN6RCxPQUFPLEVBS0wsS0FBSyxlQUFlLEVBQ3BCLEtBQUssTUFBTSxFQUdaLE1BQU0seUJBQXlCLENBQUM7QUFFakMscUJBQWEsc0JBQXNCO0lBQ2pDLFNBQWdCLE1BQU0sRUFBRSxNQUFNLENBQUM7SUFFL0IsT0FBTyxDQUFDLFVBQVUsQ0FBWTtJQUM5QixPQUFPLENBQUMsT0FBTyxDQUFnQjtJQUMvQixPQUFPLENBQUMsWUFBWSxDQUFnQjtJQUVwQyxPQUFPLENBQUMsYUFBYSxDQUFZO0lBQ2pDLE9BQU8sQ0FBQyxVQUFVLENBQWdCO0lBRWxDLE9BQU8sQ0FBQyxnQkFBZ0IsQ0FBWTtJQUNwQyxPQUFPLENBQUMsUUFBUSxDQUFRO0lBQ3hCLE9BQU8sQ0FBQyxpQkFBaUIsQ0FBWTtJQUNyQyxPQUFPLENBQUMsT0FBTyxDQUFZO0lBQzNCLE9BQU8sQ0FBQyxLQUFLLENBQVk7SUFFekIsT0FBTyxDQUFDLHFCQUFxQixDQUFZO0lBRXpDLFlBQVksTUFBTSxFQUFFLGVBQWUsRUFBRSxJQUFJLFNBQW9CLEVBMEQ1RDtJQUVELG1CQUFtQixDQUFDLFNBQVMsRUFBRSxnQkFBZ0IsRUFBRSxVQUFVLEVBQUUsTUFBTSxRQUdsRTtJQUVELFFBQVEsQ0FBQyxVQUFVLEVBQUUsTUFBTSxFQUFFLFVBQVUsRUFBRSxNQUFNLEVBQUUsT0FBTyxFQUFFLEdBQUcsUUFZNUQ7SUFFRCxZQUFZLENBQUMsUUFBUSxFQUFFLEdBQUcsRUFBRSxPQUFPLEVBQUUsTUFBTSxRQWdCMUM7SUFFRCxjQUFjLFNBSWI7SUFFRCxtQkFBbUIsQ0FBQyxTQUFTLEVBQUUsZ0JBQWdCLFFBRTlDO0lBRUQsc0JBQXNCLENBQUMsR0FBRyxNQUFNLEVBQUUsMkJBQTJCLEVBQUUsUUFTOUQ7SUFFRCxvQkFBb0IsQ0FBQyxVQUFVLEVBQUUsTUFBTSxRQUV0QztDQUNGIn0=
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"public_processor_metrics.d.ts","sourceRoot":"","sources":["../../../src/public/public_processor/public_processor_metrics.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,2BAA2B,EAAE,MAAM,0CAA0C,CAAC;AAC5F,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,mBAAmB,CAAC;AAC7C,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AACzD,OAAO,EAKL,KAAK,eAAe,EACpB,KAAK,MAAM,EAGZ,MAAM,yBAAyB,CAAC;AAEjC,qBAAa,sBAAsB;IACjC,SAAgB,MAAM,EAAE,MAAM,CAAC;IAE/B,OAAO,CAAC,UAAU,CAAY;IAC9B,OAAO,CAAC,OAAO,CAAgB;IAC/B,OAAO,CAAC,YAAY,CAAgB;IAEpC,OAAO,CAAC,aAAa,CAAY;IACjC,OAAO,CAAC,UAAU,CAAgB;IAElC,OAAO,CAAC,gBAAgB,CAAY;IACpC,OAAO,CAAC,QAAQ,CAAQ;IACxB,OAAO,CAAC,iBAAiB,CAAY;IACrC,OAAO,CAAC,OAAO,CAAY;IAC3B,OAAO,CAAC,KAAK,CAAY;IAEzB,OAAO,CAAC,qBAAqB,CAAY;
|
|
1
|
+
{"version":3,"file":"public_processor_metrics.d.ts","sourceRoot":"","sources":["../../../src/public/public_processor/public_processor_metrics.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,2BAA2B,EAAE,MAAM,0CAA0C,CAAC;AAC5F,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,mBAAmB,CAAC;AAC7C,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AACzD,OAAO,EAKL,KAAK,eAAe,EACpB,KAAK,MAAM,EAGZ,MAAM,yBAAyB,CAAC;AAEjC,qBAAa,sBAAsB;IACjC,SAAgB,MAAM,EAAE,MAAM,CAAC;IAE/B,OAAO,CAAC,UAAU,CAAY;IAC9B,OAAO,CAAC,OAAO,CAAgB;IAC/B,OAAO,CAAC,YAAY,CAAgB;IAEpC,OAAO,CAAC,aAAa,CAAY;IACjC,OAAO,CAAC,UAAU,CAAgB;IAElC,OAAO,CAAC,gBAAgB,CAAY;IACpC,OAAO,CAAC,QAAQ,CAAQ;IACxB,OAAO,CAAC,iBAAiB,CAAY;IACrC,OAAO,CAAC,OAAO,CAAY;IAC3B,OAAO,CAAC,KAAK,CAAY;IAEzB,OAAO,CAAC,qBAAqB,CAAY;IAEzC,YAAY,MAAM,EAAE,eAAe,EAAE,IAAI,SAAoB,EA0D5D;IAED,mBAAmB,CAAC,SAAS,EAAE,gBAAgB,EAAE,UAAU,EAAE,MAAM,QAGlE;IAED,QAAQ,CAAC,UAAU,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG,QAY5D;IAED,YAAY,CAAC,QAAQ,EAAE,GAAG,EAAE,OAAO,EAAE,MAAM,QAgB1C;IAED,cAAc,SAIb;IAED,mBAAmB,CAAC,SAAS,EAAE,gBAAgB,QAE9C;IAED,sBAAsB,CAAC,GAAG,MAAM,EAAE,2BAA2B,EAAE,QAS9D;IAED,oBAAoB,CAAC,UAAU,EAAE,MAAM,QAEtC;CACF"}
|
|
@@ -0,0 +1,18 @@
|
|
|
1
|
+
import type { ContractProvider } from '@aztec/native';
|
|
2
|
+
import type { GlobalVariables } from '@aztec/stdlib/tx';
|
|
3
|
+
import type { PublicContractsDB } from '../public_db_sources.js';
|
|
4
|
+
export declare class ContractProviderForCpp implements ContractProvider {
|
|
5
|
+
private contractsDB;
|
|
6
|
+
private globalVariables;
|
|
7
|
+
private log;
|
|
8
|
+
constructor(contractsDB: PublicContractsDB, globalVariables: GlobalVariables);
|
|
9
|
+
getContractInstance: (address: string) => Promise<Buffer<ArrayBufferLike> | undefined>;
|
|
10
|
+
getContractClass: (classId: string) => Promise<Buffer<ArrayBufferLike> | undefined>;
|
|
11
|
+
addContracts: (contractDeploymentDataBuffer: Buffer<ArrayBufferLike>) => Promise<void>;
|
|
12
|
+
getBytecodeCommitment: (classId: string) => Promise<Buffer<ArrayBufferLike> | undefined>;
|
|
13
|
+
getDebugFunctionName: (address: string, selector: string) => Promise<string | undefined>;
|
|
14
|
+
createCheckpoint: () => Promise<void>;
|
|
15
|
+
commitCheckpoint: () => Promise<void>;
|
|
16
|
+
revertCheckpoint: () => Promise<void>;
|
|
17
|
+
}
|
|
18
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29udHJhY3RfcHJvdmlkZXJfZm9yX2NwcC5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL3B1YmxpYy9wdWJsaWNfdHhfc2ltdWxhdG9yL2NvbnRyYWN0X3Byb3ZpZGVyX2Zvcl9jcHAudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBRUEsT0FBTyxLQUFLLEVBQUUsZ0JBQWdCLEVBQUUsTUFBTSxlQUFlLENBQUM7QUFLdEQsT0FBTyxLQUFLLEVBQUUsZUFBZSxFQUFFLE1BQU0sa0JBQWtCLENBQUM7QUFFeEQsT0FBTyxLQUFLLEVBQUUsaUJBQWlCLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQztBQUVqRSxxQkFBYSxzQkFBdUIsWUFBVyxnQkFBZ0I7SUFJM0QsT0FBTyxDQUFDLFdBQVc7SUFDbkIsT0FBTyxDQUFDLGVBQWU7SUFKekIsT0FBTyxDQUFDLEdBQUcsQ0FBK0Q7SUFFMUUsWUFDVSxXQUFXLEVBQUUsaUJBQWlCLEVBQzlCLGVBQWUsRUFBRSxlQUFlLEVBQ3RDO0lBRUcsbUJBQW1CLG9FQWF4QjtJQUVLLGdCQUFnQixvRUFlckI7SUFFSyxZQUFZLDJFQVdqQjtJQUVLLHFCQUFxQixvRUFnQjFCO0lBRUssb0JBQW9CLHFFQXNCekI7SUFFSyxnQkFBZ0Isc0JBR3JCO0lBRUssZ0JBQWdCLHNCQUdyQjtJQUVLLGdCQUFnQixzQkFHckI7Q0FDSCJ9
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"contract_provider_for_cpp.d.ts","sourceRoot":"","sources":["../../../src/public/public_tx_simulator/contract_provider_for_cpp.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAC;AAKtD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AAExD,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AAEjE,qBAAa,sBAAuB,YAAW,gBAAgB;IAI3D,OAAO,CAAC,WAAW;IACnB,OAAO,CAAC,eAAe;IAJzB,OAAO,CAAC,GAAG,CAA+D;IAE1E,YACU,WAAW,EAAE,iBAAiB,EAC9B,eAAe,EAAE,eAAe,EACtC;IAEG,mBAAmB,oEAaxB;IAEK,gBAAgB,oEAerB;IAEK,YAAY,2EAWjB;IAEK,qBAAqB,oEAgB1B;IAEK,oBAAoB,qEAsBzB;IAEK,gBAAgB,sBAGrB;IAEK,gBAAgB,sBAGrB;IAEK,gBAAgB,sBAGrB;CACH"}
|
|
@@ -0,0 +1,98 @@
|
|
|
1
|
+
import { Fr } from '@aztec/foundation/curves/bn254';
|
|
2
|
+
import { createLogger } from '@aztec/foundation/log';
|
|
3
|
+
import { FunctionSelector } from '@aztec/stdlib/abi';
|
|
4
|
+
import { deserializeFromMessagePack, serializeWithMessagePack } from '@aztec/stdlib/avm';
|
|
5
|
+
import { AztecAddress } from '@aztec/stdlib/aztec-address';
|
|
6
|
+
import { ContractDeploymentData } from '@aztec/stdlib/contract';
|
|
7
|
+
export class ContractProviderForCpp {
|
|
8
|
+
contractsDB;
|
|
9
|
+
globalVariables;
|
|
10
|
+
log;
|
|
11
|
+
constructor(contractsDB, globalVariables){
|
|
12
|
+
this.contractsDB = contractsDB;
|
|
13
|
+
this.globalVariables = globalVariables;
|
|
14
|
+
this.log = createLogger('simulator:contract_provider_for_cpp');
|
|
15
|
+
this.getContractInstance = async (address)=>{
|
|
16
|
+
this.log.trace(`Contract provider callback: getContractInstance(${address})`);
|
|
17
|
+
const aztecAddr = AztecAddress.fromString(address);
|
|
18
|
+
const instance = await this.contractsDB.getContractInstance(aztecAddr, this.globalVariables.timestamp);
|
|
19
|
+
if (!instance) {
|
|
20
|
+
this.log.debug(`Contract instance not found: ${address}`);
|
|
21
|
+
return undefined;
|
|
22
|
+
}
|
|
23
|
+
return serializeWithMessagePack(instance);
|
|
24
|
+
};
|
|
25
|
+
this.getContractClass = async (classId)=>{
|
|
26
|
+
this.log.trace(`Contract provider callback: getContractClass(${classId})`);
|
|
27
|
+
// Parse classId string to Fr
|
|
28
|
+
const classIdFr = Fr.fromString(classId);
|
|
29
|
+
// Fetch contract class from the contracts DB
|
|
30
|
+
const contractClass = await this.contractsDB.getContractClass(classIdFr);
|
|
31
|
+
if (!contractClass) {
|
|
32
|
+
this.log.debug(`Contract class not found: ${classId}`);
|
|
33
|
+
return undefined;
|
|
34
|
+
}
|
|
35
|
+
return serializeWithMessagePack(contractClass);
|
|
36
|
+
};
|
|
37
|
+
this.addContracts = async (contractDeploymentDataBuffer)=>{
|
|
38
|
+
this.log.trace(`Contract provider callback: addContracts`);
|
|
39
|
+
const rawData = deserializeFromMessagePack(contractDeploymentDataBuffer);
|
|
40
|
+
// Construct ContractDeploymentData from plain object.
|
|
41
|
+
const contractDeploymentData = ContractDeploymentData.fromPlainObject(rawData);
|
|
42
|
+
// Add contracts to the contracts DB
|
|
43
|
+
this.log.trace(`Calling contractsDB.addContracts`);
|
|
44
|
+
await this.contractsDB.addContracts(contractDeploymentData);
|
|
45
|
+
};
|
|
46
|
+
this.getBytecodeCommitment = async (classId)=>{
|
|
47
|
+
this.log.trace(`Contract provider callback: getBytecodeCommitment(${classId})`);
|
|
48
|
+
// Parse classId string to Fr
|
|
49
|
+
const classIdFr = Fr.fromString(classId);
|
|
50
|
+
// Fetch bytecode commitment from the contracts DB
|
|
51
|
+
const commitment = await this.contractsDB.getBytecodeCommitment(classIdFr);
|
|
52
|
+
if (!commitment) {
|
|
53
|
+
this.log.debug(`Bytecode commitment not found: ${classId}`);
|
|
54
|
+
return undefined;
|
|
55
|
+
}
|
|
56
|
+
// Serialize the Fr to buffer
|
|
57
|
+
return serializeWithMessagePack(commitment);
|
|
58
|
+
};
|
|
59
|
+
this.getDebugFunctionName = async (address, selector)=>{
|
|
60
|
+
this.log.trace(`Contract provider callback: getDebugFunctionName(${address}, ${selector})`);
|
|
61
|
+
// Parse address and selector strings
|
|
62
|
+
const aztecAddr = AztecAddress.fromString(address);
|
|
63
|
+
const selectorFr = Fr.fromString(selector);
|
|
64
|
+
const functionSelector = FunctionSelector.fromFieldOrUndefined(selectorFr);
|
|
65
|
+
if (!functionSelector) {
|
|
66
|
+
this.log.trace(`calldata[0] is not a function selector: ${selector}`);
|
|
67
|
+
return undefined;
|
|
68
|
+
}
|
|
69
|
+
// Fetch debug function name from the contracts DB
|
|
70
|
+
const name = await this.contractsDB.getDebugFunctionName(aztecAddr, functionSelector);
|
|
71
|
+
if (!name) {
|
|
72
|
+
this.log.trace(`Debug function name not found for ${address}:${selector}`);
|
|
73
|
+
return undefined;
|
|
74
|
+
}
|
|
75
|
+
return name;
|
|
76
|
+
};
|
|
77
|
+
this.createCheckpoint = ()=>{
|
|
78
|
+
this.log.trace(`Contract provider callback: createCheckpoint`);
|
|
79
|
+
return Promise.resolve(this.contractsDB.createCheckpoint());
|
|
80
|
+
};
|
|
81
|
+
this.commitCheckpoint = ()=>{
|
|
82
|
+
this.log.trace(`Contract provider callback: commitCheckpoint`);
|
|
83
|
+
return Promise.resolve(this.contractsDB.commitCheckpoint());
|
|
84
|
+
};
|
|
85
|
+
this.revertCheckpoint = ()=>{
|
|
86
|
+
this.log.trace(`Contract provider callback: revertCheckpoint`);
|
|
87
|
+
return Promise.resolve(this.contractsDB.revertCheckpoint());
|
|
88
|
+
};
|
|
89
|
+
}
|
|
90
|
+
getContractInstance;
|
|
91
|
+
getContractClass;
|
|
92
|
+
addContracts;
|
|
93
|
+
getBytecodeCommitment;
|
|
94
|
+
getDebugFunctionName;
|
|
95
|
+
createCheckpoint;
|
|
96
|
+
commitCheckpoint;
|
|
97
|
+
revertCheckpoint;
|
|
98
|
+
}
|
|
@@ -1,41 +1,53 @@
|
|
|
1
1
|
import { type Logger } from '@aztec/foundation/log';
|
|
2
|
+
import { type PublicSimulatorConfig, PublicTxResult } from '@aztec/stdlib/avm';
|
|
2
3
|
import type { MerkleTreeWriteOperations } from '@aztec/stdlib/trees';
|
|
3
4
|
import type { GlobalVariables, Tx } from '@aztec/stdlib/tx';
|
|
5
|
+
import { type TelemetryClient, type Tracer } from '@aztec/telemetry-client';
|
|
4
6
|
import type { ExecutorMetricsInterface } from '../executor_metrics_interface.js';
|
|
5
7
|
import type { PublicContractsDB } from '../public_db_sources.js';
|
|
6
|
-
import {
|
|
8
|
+
import { PublicTxSimulator } from './public_tx_simulator.js';
|
|
7
9
|
import type { MeasuredPublicTxSimulatorInterface, PublicTxSimulatorInterface } from './public_tx_simulator_interface.js';
|
|
8
10
|
/**
|
|
9
|
-
* C++ implementation of PublicTxSimulator using
|
|
10
|
-
*
|
|
11
|
-
*
|
|
12
|
-
* to C++ to run hinted simulation.
|
|
11
|
+
* C++ implementation of PublicTxSimulator using the C++ simulator.
|
|
12
|
+
* The C++ simulator accesses the world state directly/natively within C++.
|
|
13
|
+
* For contract DB accesses, it makes callbacks through NAPI back to the TS PublicContractsDB cache.
|
|
13
14
|
*/
|
|
14
|
-
export declare class
|
|
15
|
+
export declare class CppPublicTxSimulator extends PublicTxSimulator implements PublicTxSimulatorInterface {
|
|
15
16
|
protected log: Logger;
|
|
16
|
-
|
|
17
|
+
/** Current cancellation token for in-flight simulation. */
|
|
18
|
+
private cancellationToken?;
|
|
19
|
+
/** Current simulation promise, used to wait for completion after cancellation. */
|
|
20
|
+
private simulationPromise?;
|
|
21
|
+
constructor(merkleTree: MerkleTreeWriteOperations, contractsDB: PublicContractsDB, globalVariables: GlobalVariables, config?: Partial<PublicSimulatorConfig>);
|
|
17
22
|
/**
|
|
18
|
-
* Simulate a transaction's public portion using the C++
|
|
19
|
-
*
|
|
20
|
-
* This implementation:
|
|
21
|
-
* 1. Runs the full TypeScript simulation to generate AvmCircuitInputs (hints + public inputs)
|
|
22
|
-
* 2. Passes the complete AvmCircuitInputs to C++ to run hinted simulation
|
|
23
|
+
* Simulate a transaction's public portion using the C++ avvm simulator.
|
|
23
24
|
*
|
|
24
25
|
* @param tx - The transaction to simulate.
|
|
25
26
|
* @returns The result of the transaction's public execution.
|
|
26
27
|
*/
|
|
27
28
|
simulate(tx: Tx): Promise<PublicTxResult>;
|
|
29
|
+
/**
|
|
30
|
+
* Cancel the current simulation if one is in progress.
|
|
31
|
+
* This signals the C++ simulator to stop at the next opcode or before the next WorldState write.
|
|
32
|
+
* Safe to call even if no simulation is in progress.
|
|
33
|
+
*
|
|
34
|
+
* @param waitTimeoutMs - If provided, wait up to this many ms for the simulation to actually stop.
|
|
35
|
+
* This is important because C++ might be in the middle of a slow operation
|
|
36
|
+
* (e.g., pad_trees) and won't check the cancellation flag until it completes.
|
|
37
|
+
* Default timeout of 100ms after cancellation.
|
|
38
|
+
*/
|
|
39
|
+
cancel(waitTimeoutMs?: number): Promise<void>;
|
|
28
40
|
}
|
|
29
|
-
|
|
30
|
-
* Class to record metrics for simulation.
|
|
31
|
-
*
|
|
32
|
-
* Note(dbanks12): We might not be able to collect all the same metrics in C++ as we do in TS!
|
|
33
|
-
* Unless we move some of the metrics collection to C++, we don't have inner functions exposed
|
|
34
|
-
* to TS for tracking.
|
|
35
|
-
*/
|
|
36
|
-
export declare class MeasuredCppPublicTxSimulatorHintedDbs extends CppPublicTxSimulatorHintedDbs implements MeasuredPublicTxSimulatorInterface {
|
|
41
|
+
export declare class MeasuredCppPublicTxSimulator extends CppPublicTxSimulator implements MeasuredPublicTxSimulatorInterface {
|
|
37
42
|
protected readonly metrics: ExecutorMetricsInterface;
|
|
38
|
-
constructor(merkleTree: MerkleTreeWriteOperations, contractsDB: PublicContractsDB, globalVariables: GlobalVariables, metrics: ExecutorMetricsInterface, config?: Partial<
|
|
43
|
+
constructor(merkleTree: MerkleTreeWriteOperations, contractsDB: PublicContractsDB, globalVariables: GlobalVariables, metrics: ExecutorMetricsInterface, config?: Partial<PublicSimulatorConfig>);
|
|
39
44
|
simulate(tx: Tx, txLabel?: string): Promise<PublicTxResult>;
|
|
40
45
|
}
|
|
41
|
-
|
|
46
|
+
/**
|
|
47
|
+
* A C++ public tx simulator that tracks runtime/production metrics with telemetry.
|
|
48
|
+
*/
|
|
49
|
+
export declare class TelemetryCppPublicTxSimulator extends MeasuredCppPublicTxSimulator {
|
|
50
|
+
readonly tracer: Tracer;
|
|
51
|
+
constructor(merkleTree: MerkleTreeWriteOperations, contractsDB: PublicContractsDB, globalVariables: GlobalVariables, telemetryClient?: TelemetryClient, config?: Partial<PublicSimulatorConfig>);
|
|
52
|
+
}
|
|
53
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY3BwX3B1YmxpY190eF9zaW11bGF0b3IuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9wdWJsaWMvcHVibGljX3R4X3NpbXVsYXRvci9jcHBfcHVibGljX3R4X3NpbXVsYXRvci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsS0FBSyxNQUFNLEVBQTBCLE1BQU0sdUJBQXVCLENBQUM7QUFJNUUsT0FBTyxFQUdMLEtBQUsscUJBQXFCLEVBQzFCLGNBQWMsRUFFZixNQUFNLG1CQUFtQixDQUFDO0FBRTNCLE9BQU8sS0FBSyxFQUFFLHlCQUF5QixFQUFFLE1BQU0scUJBQXFCLENBQUM7QUFDckUsT0FBTyxLQUFLLEVBQUUsZUFBZSxFQUFFLEVBQUUsRUFBRSxNQUFNLGtCQUFrQixDQUFDO0FBRTVELE9BQU8sRUFBRSxLQUFLLGVBQWUsRUFBRSxLQUFLLE1BQU0sRUFBc0IsTUFBTSx5QkFBeUIsQ0FBQztBQUtoRyxPQUFPLEtBQUssRUFBRSx3QkFBd0IsRUFBRSxNQUFNLGtDQUFrQyxDQUFDO0FBQ2pGLE9BQU8sS0FBSyxFQUFFLGlCQUFpQixFQUFFLE1BQU0seUJBQXlCLENBQUM7QUFFakUsT0FBTyxFQUFFLGlCQUFpQixFQUFFLE1BQU0sMEJBQTBCLENBQUM7QUFDN0QsT0FBTyxLQUFLLEVBQ1Ysa0NBQWtDLEVBQ2xDLDBCQUEwQixFQUMzQixNQUFNLG9DQUFvQyxDQUFDO0FBRTVDOzs7O0dBSUc7QUFDSCxxQkFBYSxvQkFBcUIsU0FBUSxpQkFBa0IsWUFBVywwQkFBMEI7SUFDL0YsVUFBbUIsR0FBRyxFQUFFLE1BQU0sQ0FBQztJQUMvQiwyREFBMkQ7SUFDM0QsT0FBTyxDQUFDLGlCQUFpQixDQUFDLENBQW9CO0lBQzlDLGtGQUFrRjtJQUNsRixPQUFPLENBQUMsaUJBQWlCLENBQUMsQ0FBa0I7SUFFNUMsWUFDRSxVQUFVLEVBQUUseUJBQXlCLEVBQ3JDLFdBQVcsRUFBRSxpQkFBaUIsRUFDOUIsZUFBZSxFQUFFLGVBQWUsRUFDaEMsTUFBTSxDQUFDLEVBQUUsT0FBTyxDQUFDLHFCQUFxQixDQUFDLEVBSXhDO0lBRUQ7Ozs7O09BS0c7SUFDbUIsUUFBUSxDQUFDLEVBQUUsRUFBRSxFQUFFLEdBQUcsT0FBTyxDQUFDLGNBQWMsQ0FBQyxDQXVFOUQ7SUFFRDs7Ozs7Ozs7O09BU0c7SUFDVSxNQUFNLENBQUMsYUFBYSxHQUFFLE1BQVksR0FBRyxPQUFPLENBQUMsSUFBSSxDQUFDLENBZTlEO0NBQ0Y7QUFFRCxxQkFBYSw0QkFBNkIsU0FBUSxvQkFBcUIsWUFBVyxrQ0FBa0M7SUFLaEgsU0FBUyxDQUFDLFFBQVEsQ0FBQyxPQUFPLEVBQUUsd0JBQXdCO0lBSnRELFlBQ0UsVUFBVSxFQUFFLHlCQUF5QixFQUNyQyxXQUFXLEVBQUUsaUJBQWlCLEVBQzlCLGVBQWUsRUFBRSxlQUFlLEVBQ2IsT0FBTyxFQUFFLHdCQUF3QixFQUNwRCxNQUFNLENBQUMsRUFBRSxPQUFPLENBQUMscUJBQXFCLENBQUMsRUFHeEM7SUFFcUIsUUFBUSxDQUFDLEVBQUUsRUFBRSxFQUFFLEVBQUUsT0FBTyxHQUFFLE1BQXNCLEdBQUcsT0FBTyxDQUFDLGNBQWMsQ0FBQyxDQVMvRjtDQUNGO0FBRUQ7O0dBRUc7QUFDSCxxQkFBYSw2QkFBOEIsU0FBUSw0QkFBNEI7SUFFN0UsU0FBZ0IsTUFBTSxFQUFFLE1BQU0sQ0FBQztJQUUvQixZQUNFLFVBQVUsRUFBRSx5QkFBeUIsRUFDckMsV0FBVyxFQUFFLGlCQUFpQixFQUM5QixlQUFlLEVBQUUsZUFBZSxFQUNoQyxlQUFlLEdBQUUsZUFBc0MsRUFDdkQsTUFBTSxDQUFDLEVBQUUsT0FBTyxDQUFDLHFCQUFxQixDQUFDLEVBS3hDO0NBQ0YifQ==
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cpp_public_tx_simulator.d.ts","sourceRoot":"","sources":["../../../src/public/public_tx_simulator/cpp_public_tx_simulator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,MAAM,
|
|
1
|
+
{"version":3,"file":"cpp_public_tx_simulator.d.ts","sourceRoot":"","sources":["../../../src/public/public_tx_simulator/cpp_public_tx_simulator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,MAAM,EAA0B,MAAM,uBAAuB,CAAC;AAI5E,OAAO,EAGL,KAAK,qBAAqB,EAC1B,cAAc,EAEf,MAAM,mBAAmB,CAAC;AAE3B,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,qBAAqB,CAAC;AACrE,OAAO,KAAK,EAAE,eAAe,EAAE,EAAE,EAAE,MAAM,kBAAkB,CAAC;AAE5D,OAAO,EAAE,KAAK,eAAe,EAAE,KAAK,MAAM,EAAsB,MAAM,yBAAyB,CAAC;AAKhG,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,kCAAkC,CAAC;AACjF,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AAEjE,OAAO,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AAC7D,OAAO,KAAK,EACV,kCAAkC,EAClC,0BAA0B,EAC3B,MAAM,oCAAoC,CAAC;AAE5C;;;;GAIG;AACH,qBAAa,oBAAqB,SAAQ,iBAAkB,YAAW,0BAA0B;IAC/F,UAAmB,GAAG,EAAE,MAAM,CAAC;IAC/B,2DAA2D;IAC3D,OAAO,CAAC,iBAAiB,CAAC,CAAoB;IAC9C,kFAAkF;IAClF,OAAO,CAAC,iBAAiB,CAAC,CAAkB;IAE5C,YACE,UAAU,EAAE,yBAAyB,EACrC,WAAW,EAAE,iBAAiB,EAC9B,eAAe,EAAE,eAAe,EAChC,MAAM,CAAC,EAAE,OAAO,CAAC,qBAAqB,CAAC,EAIxC;IAED;;;;;OAKG;IACmB,QAAQ,CAAC,EAAE,EAAE,EAAE,GAAG,OAAO,CAAC,cAAc,CAAC,CAuE9D;IAED;;;;;;;;;OASG;IACU,MAAM,CAAC,aAAa,GAAE,MAAY,GAAG,OAAO,CAAC,IAAI,CAAC,CAe9D;CACF;AAED,qBAAa,4BAA6B,SAAQ,oBAAqB,YAAW,kCAAkC;IAKhH,SAAS,CAAC,QAAQ,CAAC,OAAO,EAAE,wBAAwB;IAJtD,YACE,UAAU,EAAE,yBAAyB,EACrC,WAAW,EAAE,iBAAiB,EAC9B,eAAe,EAAE,eAAe,EACb,OAAO,EAAE,wBAAwB,EACpD,MAAM,CAAC,EAAE,OAAO,CAAC,qBAAqB,CAAC,EAGxC;IAEqB,QAAQ,CAAC,EAAE,EAAE,EAAE,EAAE,OAAO,GAAE,MAAsB,GAAG,OAAO,CAAC,cAAc,CAAC,CAS/F;CACF;AAED;;GAEG;AACH,qBAAa,6BAA8B,SAAQ,4BAA4B;IAE7E,SAAgB,MAAM,EAAE,MAAM,CAAC;IAE/B,YACE,UAAU,EAAE,yBAAyB,EACrC,WAAW,EAAE,iBAAiB,EAC9B,eAAe,EAAE,eAAe,EAChC,eAAe,GAAE,eAAsC,EACvD,MAAM,CAAC,EAAE,OAAO,CAAC,qBAAqB,CAAC,EAKxC;CACF"}
|