@aztec/simulator 0.74.0 → 0.75.0-commit.c03ba01a2a4122e43e90d5133ba017e54b90e9d2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dest/acvm/acvm.js +18 -21
- package/dest/acvm/acvm_types.js +3 -2
- package/dest/acvm/deserialize.js +9 -13
- package/dest/acvm/index.js +0 -1
- package/dest/acvm/oracle/index.js +0 -1
- package/dest/acvm/oracle/oracle.js +42 -23
- package/dest/acvm/oracle/typed_oracle.js +36 -38
- package/dest/acvm/serialize.js +7 -14
- package/dest/avm/avm_context.js +24 -27
- package/dest/avm/avm_contract_call_result.js +12 -7
- package/dest/avm/avm_execution_environment.js +10 -7
- package/dest/avm/avm_gas.js +93 -56
- package/dest/avm/avm_machine_state.js +60 -61
- package/dest/avm/avm_memory_types.js +166 -255
- package/dest/avm/avm_simulator.js +68 -47
- package/dest/avm/avm_tree.js +282 -276
- package/dest/avm/bytecode_utils.js +8 -6
- package/dest/avm/errors.js +46 -63
- package/dest/avm/fixtures/avm_simulation_tester.js +18 -17
- package/dest/avm/fixtures/base_avm_simulation_tester.js +21 -16
- package/dest/avm/fixtures/index.js +27 -26
- package/dest/avm/fixtures/simple_contract_data_source.js +9 -13
- package/dest/avm/index.js +0 -1
- package/dest/avm/journal/index.js +0 -1
- package/dest/avm/journal/journal.js +147 -200
- package/dest/avm/journal/nullifiers.js +43 -46
- package/dest/avm/journal/public_storage.js +73 -87
- package/dest/avm/opcodes/accrued_substate.js +140 -110
- package/dest/avm/opcodes/addressing_mode.js +29 -31
- package/dest/avm/opcodes/arithmetic.js +17 -15
- package/dest/avm/opcodes/bitwise.js +40 -26
- package/dest/avm/opcodes/comparators.js +12 -10
- package/dest/avm/opcodes/contract.js +31 -29
- package/dest/avm/opcodes/control_flow.js +47 -43
- package/dest/avm/opcodes/conversion.js +30 -26
- package/dest/avm/opcodes/ec_add.js +35 -34
- package/dest/avm/opcodes/environment_getters.js +33 -33
- package/dest/avm/opcodes/external_calls.js +83 -74
- package/dest/avm/opcodes/hashing.js +69 -61
- package/dest/avm/opcodes/index.js +0 -1
- package/dest/avm/opcodes/instruction.js +31 -40
- package/dest/avm/opcodes/instruction_impl.js +12 -15
- package/dest/avm/opcodes/memory.js +177 -156
- package/dest/avm/opcodes/misc.js +27 -25
- package/dest/avm/opcodes/multi_scalar_mul.js +43 -41
- package/dest/avm/opcodes/storage.js +28 -25
- package/dest/avm/serialization/buffer_cursor.js +4 -4
- package/dest/avm/serialization/bytecode_serialization.js +292 -89
- package/dest/avm/serialization/instruction_serialization.js +67 -28
- package/dest/avm/test_utils.js +6 -9
- package/dest/client/client_execution_context.js +197 -219
- package/dest/client/db_oracle.js +4 -7
- package/dest/client/execution_note_cache.js +80 -81
- package/dest/client/index.js +0 -1
- package/dest/client/pick_notes.js +27 -30
- package/dest/client/private_execution.js +13 -14
- package/dest/client/simulator.js +44 -48
- package/dest/client/unconstrained_execution.js +8 -11
- package/dest/client/view_data_oracle.js +130 -139
- package/dest/common/debug_fn_name.js +1 -4
- package/dest/common/errors.js +30 -39
- package/dest/common/hashed_values_cache.js +16 -20
- package/dest/common/index.js +0 -1
- package/dest/common/message_load_oracle_inputs.js +7 -7
- package/dest/common/simulation_provider.js +3 -6
- package/dest/common.js +0 -1
- package/dest/providers/acvm_native.js +46 -32
- package/dest/providers/acvm_wasm.js +18 -10
- package/dest/providers/acvm_wasm_with_blobs.js +2 -5
- package/dest/providers/factory.js +5 -5
- package/dest/providers/index.js +0 -1
- package/dest/public/bytecode_errors.js +1 -2
- package/dest/public/db_interfaces.js +1 -2
- package/dest/public/execution.js +2 -4
- package/dest/public/executor_metrics.js +16 -12
- package/dest/public/fee_payment.js +2 -5
- package/dest/public/fixtures/index.js +0 -1
- package/dest/public/fixtures/public_tx_simulation_tester.js +13 -17
- package/dest/public/fixtures/utils.js +11 -14
- package/dest/public/index.js +0 -1
- package/dest/public/public_db_sources.js +79 -87
- package/dest/public/public_processor.js +310 -306
- package/dest/public/public_processor_metrics.js +46 -27
- package/dest/public/public_tx_context.js +97 -118
- package/dest/public/public_tx_simulator.js +299 -314
- package/dest/public/side_effect_errors.js +1 -2
- package/dest/public/side_effect_trace.js +44 -71
- package/dest/public/side_effect_trace_interface.js +1 -2
- package/dest/public/unique_class_ids.js +22 -27
- package/dest/public/utils.js +16 -11
- package/dest/server.js +0 -1
- package/dest/stats/index.js +0 -1
- package/dest/stats/stats.js +1 -2
- package/dest/test/utils.js +5 -4
- package/package.json +11 -11
- package/src/acvm/oracle/typed_oracle.ts +34 -34
- package/src/avm/avm_machine_state.ts +18 -14
- package/src/avm/avm_memory_types.ts +43 -183
- package/src/avm/avm_simulator.ts +37 -11
- package/src/avm/opcodes/accrued_substate.ts +7 -21
- package/src/avm/opcodes/addressing_mode.ts +9 -2
- package/src/avm/opcodes/arithmetic.ts +1 -3
- package/src/avm/opcodes/bitwise.ts +2 -6
- package/src/avm/opcodes/comparators.ts +1 -3
- package/src/avm/opcodes/contract.ts +1 -3
- package/src/avm/opcodes/control_flow.ts +1 -9
- package/src/avm/opcodes/conversion.ts +1 -3
- package/src/avm/opcodes/ec_add.ts +1 -3
- package/src/avm/opcodes/environment_getters.ts +1 -3
- package/src/avm/opcodes/external_calls.ts +3 -6
- package/src/avm/opcodes/hashing.ts +3 -9
- package/src/avm/opcodes/memory.ts +6 -20
- package/src/avm/opcodes/misc.ts +1 -3
- package/src/avm/opcodes/multi_scalar_mul.ts +1 -7
- package/src/avm/opcodes/storage.ts +2 -6
- package/src/client/index.ts +2 -2
- package/dest/acvm/acvm.d.ts +0 -35
- package/dest/acvm/acvm.d.ts.map +0 -1
- package/dest/acvm/acvm_types.d.ts +0 -10
- package/dest/acvm/acvm_types.d.ts.map +0 -1
- package/dest/acvm/deserialize.d.ts +0 -36
- package/dest/acvm/deserialize.d.ts.map +0 -1
- package/dest/acvm/index.d.ts +0 -6
- package/dest/acvm/index.d.ts.map +0 -1
- package/dest/acvm/oracle/index.d.ts +0 -14
- package/dest/acvm/oracle/index.d.ts.map +0 -1
- package/dest/acvm/oracle/oracle.d.ts +0 -49
- package/dest/acvm/oracle/oracle.d.ts.map +0 -1
- package/dest/acvm/oracle/typed_oracle.d.ts +0 -75
- package/dest/acvm/oracle/typed_oracle.d.ts.map +0 -1
- package/dest/acvm/serialize.d.ts +0 -20
- package/dest/acvm/serialize.d.ts.map +0 -1
- package/dest/avm/avm_context.d.ts +0 -39
- package/dest/avm/avm_context.d.ts.map +0 -1
- package/dest/avm/avm_contract_call_result.d.ts +0 -30
- package/dest/avm/avm_contract_call_result.d.ts.map +0 -1
- package/dest/avm/avm_execution_environment.d.ts +0 -21
- package/dest/avm/avm_execution_environment.d.ts.map +0 -1
- package/dest/avm/avm_gas.d.ts +0 -60
- package/dest/avm/avm_gas.d.ts.map +0 -1
- package/dest/avm/avm_machine_state.d.ts +0 -93
- package/dest/avm/avm_machine_state.d.ts.map +0 -1
- package/dest/avm/avm_memory_types.d.ts +0 -310
- package/dest/avm/avm_memory_types.d.ts.map +0 -1
- package/dest/avm/avm_simulator.d.ts +0 -37
- package/dest/avm/avm_simulator.d.ts.map +0 -1
- package/dest/avm/avm_tree.d.ts +0 -281
- package/dest/avm/avm_tree.d.ts.map +0 -1
- package/dest/avm/bytecode_utils.d.ts +0 -5
- package/dest/avm/bytecode_utils.d.ts.map +0 -1
- package/dest/avm/errors.d.ts +0 -121
- package/dest/avm/errors.d.ts.map +0 -1
- package/dest/avm/fixtures/avm_simulation_tester.d.ts +0 -21
- package/dest/avm/fixtures/avm_simulation_tester.d.ts.map +0 -1
- package/dest/avm/fixtures/base_avm_simulation_tester.d.ts +0 -35
- package/dest/avm/fixtures/base_avm_simulation_tester.d.ts.map +0 -1
- package/dest/avm/fixtures/index.d.ts +0 -67
- package/dest/avm/fixtures/index.d.ts.map +0 -1
- package/dest/avm/fixtures/simple_contract_data_source.d.ts +0 -31
- package/dest/avm/fixtures/simple_contract_data_source.d.ts.map +0 -1
- package/dest/avm/index.d.ts +0 -4
- package/dest/avm/index.d.ts.map +0 -1
- package/dest/avm/journal/index.d.ts +0 -2
- package/dest/avm/journal/index.d.ts.map +0 -1
- package/dest/avm/journal/journal.d.ts +0 -176
- package/dest/avm/journal/journal.d.ts.map +0 -1
- package/dest/avm/journal/nullifiers.d.ts +0 -62
- package/dest/avm/journal/nullifiers.d.ts.map +0 -1
- package/dest/avm/journal/public_storage.d.ts +0 -66
- package/dest/avm/journal/public_storage.d.ts.map +0 -1
- package/dest/avm/opcodes/accrued_substate.d.ts +0 -75
- package/dest/avm/opcodes/accrued_substate.d.ts.map +0 -1
- package/dest/avm/opcodes/addressing_mode.d.ts +0 -27
- package/dest/avm/opcodes/addressing_mode.d.ts.map +0 -1
- package/dest/avm/opcodes/arithmetic.d.ts +0 -37
- package/dest/avm/opcodes/arithmetic.d.ts.map +0 -1
- package/dest/avm/opcodes/bitwise.d.ts +0 -50
- package/dest/avm/opcodes/bitwise.d.ts.map +0 -1
- package/dest/avm/opcodes/comparators.d.ts +0 -25
- package/dest/avm/opcodes/comparators.d.ts.map +0 -1
- package/dest/avm/opcodes/contract.d.ts +0 -21
- package/dest/avm/opcodes/contract.d.ts.map +0 -1
- package/dest/avm/opcodes/control_flow.d.ts +0 -41
- package/dest/avm/opcodes/control_flow.d.ts.map +0 -1
- package/dest/avm/opcodes/conversion.d.ts +0 -17
- package/dest/avm/opcodes/conversion.d.ts.map +0 -1
- package/dest/avm/opcodes/ec_add.d.ts +0 -19
- package/dest/avm/opcodes/ec_add.d.ts.map +0 -1
- package/dest/avm/opcodes/environment_getters.d.ts +0 -28
- package/dest/avm/opcodes/environment_getters.d.ts.map +0 -1
- package/dest/avm/opcodes/external_calls.d.ts +0 -50
- package/dest/avm/opcodes/external_calls.d.ts.map +0 -1
- package/dest/avm/opcodes/hashing.d.ts +0 -36
- package/dest/avm/opcodes/hashing.d.ts.map +0 -1
- package/dest/avm/opcodes/index.d.ts +0 -16
- package/dest/avm/opcodes/index.d.ts.map +0 -1
- package/dest/avm/opcodes/instruction.d.ts +0 -70
- package/dest/avm/opcodes/instruction.d.ts.map +0 -1
- package/dest/avm/opcodes/instruction_impl.d.ts +0 -19
- package/dest/avm/opcodes/instruction_impl.d.ts.map +0 -1
- package/dest/avm/opcodes/memory.d.ts +0 -74
- package/dest/avm/opcodes/memory.d.ts.map +0 -1
- package/dest/avm/opcodes/misc.d.ts +0 -17
- package/dest/avm/opcodes/misc.d.ts.map +0 -1
- package/dest/avm/opcodes/multi_scalar_mul.d.ts +0 -16
- package/dest/avm/opcodes/multi_scalar_mul.d.ts.map +0 -1
- package/dest/avm/opcodes/storage.d.ts +0 -24
- package/dest/avm/opcodes/storage.d.ts.map +0 -1
- package/dest/avm/serialization/buffer_cursor.d.ts +0 -28
- package/dest/avm/serialization/buffer_cursor.d.ts.map +0 -1
- package/dest/avm/serialization/bytecode_serialization.d.ts +0 -21
- package/dest/avm/serialization/bytecode_serialization.d.ts.map +0 -1
- package/dest/avm/serialization/instruction_serialization.d.ts +0 -105
- package/dest/avm/serialization/instruction_serialization.d.ts.map +0 -1
- package/dest/avm/test_utils.d.ts +0 -16
- package/dest/avm/test_utils.d.ts.map +0 -1
- package/dest/client/client_execution_context.d.ts +0 -214
- package/dest/client/client_execution_context.d.ts.map +0 -1
- package/dest/client/db_oracle.d.ts +0 -229
- package/dest/client/db_oracle.d.ts.map +0 -1
- package/dest/client/execution_note_cache.d.ts +0 -93
- package/dest/client/execution_note_cache.d.ts.map +0 -1
- package/dest/client/index.d.ts +0 -15
- package/dest/client/index.d.ts.map +0 -1
- package/dest/client/pick_notes.d.ts +0 -85
- package/dest/client/pick_notes.d.ts.map +0 -1
- package/dest/client/private_execution.d.ts +0 -19
- package/dest/client/private_execution.d.ts.map +0 -1
- package/dest/client/simulator.d.ts +0 -60
- package/dest/client/simulator.d.ts.map +0 -1
- package/dest/client/unconstrained_execution.d.ts +0 -10
- package/dest/client/unconstrained_execution.d.ts.map +0 -1
- package/dest/client/view_data_oracle.d.ts +0 -159
- package/dest/client/view_data_oracle.d.ts.map +0 -1
- package/dest/common/debug_fn_name.d.ts +0 -4
- package/dest/common/debug_fn_name.d.ts.map +0 -1
- package/dest/common/errors.d.ts +0 -54
- package/dest/common/errors.d.ts.map +0 -1
- package/dest/common/hashed_values_cache.d.ts +0 -28
- package/dest/common/hashed_values_cache.d.ts.map +0 -1
- package/dest/common/index.d.ts +0 -3
- package/dest/common/index.d.ts.map +0 -1
- 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/simulation_provider.d.ts +0 -19
- package/dest/common/simulation_provider.d.ts.map +0 -1
- package/dest/common.d.ts +0 -2
- package/dest/common.d.ts.map +0 -1
- package/dest/providers/acvm_native.d.ts +0 -40
- package/dest/providers/acvm_native.d.ts.map +0 -1
- package/dest/providers/acvm_wasm.d.ts +0 -15
- package/dest/providers/acvm_wasm.d.ts.map +0 -1
- package/dest/providers/acvm_wasm_with_blobs.d.ts +0 -19
- package/dest/providers/acvm_wasm_with_blobs.d.ts.map +0 -1
- package/dest/providers/factory.d.ts +0 -12
- package/dest/providers/factory.d.ts.map +0 -1
- package/dest/providers/index.d.ts +0 -5
- package/dest/providers/index.d.ts.map +0 -1
- package/dest/public/bytecode_errors.d.ts +0 -4
- package/dest/public/bytecode_errors.d.ts.map +0 -1
- package/dest/public/db_interfaces.d.ts +0 -105
- package/dest/public/db_interfaces.d.ts.map +0 -1
- package/dest/public/execution.d.ts +0 -102
- package/dest/public/execution.d.ts.map +0 -1
- package/dest/public/executor_metrics.d.ts +0 -13
- package/dest/public/executor_metrics.d.ts.map +0 -1
- package/dest/public/fee_payment.d.ts +0 -11
- package/dest/public/fee_payment.d.ts.map +0 -1
- package/dest/public/fixtures/index.d.ts +0 -3
- package/dest/public/fixtures/index.d.ts.map +0 -1
- package/dest/public/fixtures/public_tx_simulation_tester.d.ts +0 -21
- package/dest/public/fixtures/public_tx_simulation_tester.d.ts.map +0 -1
- package/dest/public/fixtures/utils.d.ts +0 -17
- package/dest/public/fixtures/utils.d.ts.map +0 -1
- package/dest/public/index.d.ts +0 -9
- package/dest/public/index.d.ts.map +0 -1
- package/dest/public/public_db_sources.d.ts +0 -81
- package/dest/public/public_db_sources.d.ts.map +0 -1
- package/dest/public/public_processor.d.ts +0 -72
- package/dest/public/public_processor.d.ts.map +0 -1
- package/dest/public/public_processor_metrics.d.ts +0 -27
- package/dest/public/public_processor_metrics.d.ts.map +0 -1
- package/dest/public/public_tx_context.d.ts +0 -131
- package/dest/public/public_tx_context.d.ts.map +0 -1
- package/dest/public/public_tx_simulator.d.ts +0 -99
- package/dest/public/public_tx_simulator.d.ts.map +0 -1
- package/dest/public/side_effect_errors.d.ts +0 -4
- package/dest/public/side_effect_errors.d.ts.map +0 -1
- package/dest/public/side_effect_trace.d.ts +0 -126
- package/dest/public/side_effect_trace.d.ts.map +0 -1
- package/dest/public/side_effect_trace_interface.d.ts +0 -32
- package/dest/public/side_effect_trace_interface.d.ts.map +0 -1
- package/dest/public/unique_class_ids.d.ts +0 -37
- package/dest/public/unique_class_ids.d.ts.map +0 -1
- package/dest/public/utils.d.ts +0 -5
- package/dest/public/utils.d.ts.map +0 -1
- package/dest/server.d.ts +0 -6
- package/dest/server.d.ts.map +0 -1
- package/dest/stats/index.d.ts +0 -2
- package/dest/stats/index.d.ts.map +0 -1
- package/dest/stats/stats.d.ts +0 -4
- package/dest/stats/stats.d.ts.map +0 -1
- package/dest/test/utils.d.ts +0 -12
- package/dest/test/utils.d.ts.map +0 -1
|
@@ -1,7 +1,6 @@
|
|
|
1
1
|
export class SideEffectLimitReachedError extends Error {
|
|
2
|
-
constructor(sideEffectType, limit)
|
|
2
|
+
constructor(sideEffectType, limit){
|
|
3
3
|
super(`Reached the limit (${limit}) on number of '${sideEffectType}' per tx`);
|
|
4
4
|
this.name = 'SideEffectLimitReachedError';
|
|
5
5
|
}
|
|
6
6
|
}
|
|
7
|
-
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2lkZV9lZmZlY3RfZXJyb3JzLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3B1YmxpYy9zaWRlX2VmZmVjdF9lcnJvcnMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsTUFBTSxPQUFPLDJCQUE0QixTQUFRLEtBQUs7SUFDcEQsWUFBWSxjQUFzQixFQUFFLEtBQWE7UUFDL0MsS0FBSyxDQUFDLHNCQUFzQixLQUFLLG1CQUFtQixjQUFjLFVBQVUsQ0FBQyxDQUFDO1FBQzlFLElBQUksQ0FBQyxJQUFJLEdBQUcsNkJBQTZCLENBQUM7SUFDNUMsQ0FBQztDQUNGIn0=
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { AvmAccumulatedData, AvmAppendTreeHint, AvmCircuitPublicInputs, AvmContractBytecodeHints, AvmContractInstanceHint, AvmEnqueuedCallHint, AvmExecutionHints, AvmNullifierReadTreeHint, AvmNullifierWriteTreeHint, AvmPublicDataReadTreeHint, AvmPublicDataWriteTreeHint, EthAddress, L1_TO_L2_MSG_TREE_HEIGHT, L2ToL1Message, MAX_ENQUEUED_CALLS_PER_TX, MAX_L2_TO_L1_MSGS_PER_TX, MAX_NOTE_HASHES_PER_TX, MAX_NULLIFIERS_PER_TX, MAX_PUBLIC_CALLS_TO_UNIQUE_CONTRACT_CLASS_IDS, MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX, MAX_PUBLIC_LOGS_PER_TX, MAX_TOTAL_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX, NOTE_HASH_TREE_HEIGHT, NULLIFIER_TREE_HEIGHT, NoteHash, Nullifier, NullifierLeafPreimage, PROTOCOL_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX, PUBLIC_DATA_TREE_HEIGHT, PUBLIC_LOG_DATA_SIZE_IN_FIELDS, PrivateToAvmAccumulatedData, PrivateToAvmAccumulatedDataArrayLengths, PublicCallRequest, PublicDataTreeLeafPreimage, PublicDataUpdateRequest, PublicDataWrite, PublicLog, ScopedL2ToL1Message, SerializableContractInstance
|
|
1
|
+
import { AvmAccumulatedData, AvmAppendTreeHint, AvmCircuitPublicInputs, AvmContractBytecodeHints, AvmContractInstanceHint, AvmEnqueuedCallHint, AvmExecutionHints, AvmNullifierReadTreeHint, AvmNullifierWriteTreeHint, AvmPublicDataReadTreeHint, AvmPublicDataWriteTreeHint, EthAddress, L1_TO_L2_MSG_TREE_HEIGHT, L2ToL1Message, MAX_ENQUEUED_CALLS_PER_TX, MAX_L2_TO_L1_MSGS_PER_TX, MAX_NOTE_HASHES_PER_TX, MAX_NULLIFIERS_PER_TX, MAX_PUBLIC_CALLS_TO_UNIQUE_CONTRACT_CLASS_IDS, MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX, MAX_PUBLIC_LOGS_PER_TX, MAX_TOTAL_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX, NOTE_HASH_TREE_HEIGHT, NULLIFIER_TREE_HEIGHT, NoteHash, Nullifier, NullifierLeafPreimage, PROTOCOL_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX, PUBLIC_DATA_TREE_HEIGHT, PUBLIC_LOG_DATA_SIZE_IN_FIELDS, PrivateToAvmAccumulatedData, PrivateToAvmAccumulatedDataArrayLengths, PublicCallRequest, PublicDataTreeLeafPreimage, PublicDataUpdateRequest, PublicDataWrite, PublicLog, ScopedL2ToL1Message, SerializableContractInstance } from '@aztec/circuits.js';
|
|
2
2
|
import { computePublicDataTreeLeafSlot } from '@aztec/circuits.js/hash';
|
|
3
3
|
import { padArrayEnd } from '@aztec/foundation/collection';
|
|
4
4
|
import { Fr } from '@aztec/foundation/fields';
|
|
@@ -7,12 +7,18 @@ import { createLogger } from '@aztec/foundation/log';
|
|
|
7
7
|
import { strict as assert } from 'assert';
|
|
8
8
|
import { SideEffectLimitReachedError } from './side_effect_errors.js';
|
|
9
9
|
import { UniqueClassIds } from './unique_class_ids.js';
|
|
10
|
-
const emptyPublicDataPath = ()
|
|
11
|
-
const emptyNoteHashPath = ()
|
|
12
|
-
const emptyNullifierPath = ()
|
|
13
|
-
const emptyL1ToL2MessagePath = ()
|
|
10
|
+
const emptyPublicDataPath = ()=>new Array(PUBLIC_DATA_TREE_HEIGHT).fill(Fr.zero());
|
|
11
|
+
const emptyNoteHashPath = ()=>new Array(NOTE_HASH_TREE_HEIGHT).fill(Fr.zero());
|
|
12
|
+
const emptyNullifierPath = ()=>new Array(NULLIFIER_TREE_HEIGHT).fill(Fr.zero());
|
|
13
|
+
const emptyL1ToL2MessagePath = ()=>new Array(L1_TO_L2_MSG_TREE_HEIGHT).fill(Fr.zero());
|
|
14
14
|
export class SideEffectArrayLengths {
|
|
15
|
-
|
|
15
|
+
publicDataWrites;
|
|
16
|
+
protocolPublicDataWrites;
|
|
17
|
+
noteHashes;
|
|
18
|
+
nullifiers;
|
|
19
|
+
l2ToL1Msgs;
|
|
20
|
+
publicLogs;
|
|
21
|
+
constructor(publicDataWrites, protocolPublicDataWrites, noteHashes, nullifiers, l2ToL1Msgs, publicLogs){
|
|
16
22
|
this.publicDataWrites = publicDataWrites;
|
|
17
23
|
this.protocolPublicDataWrites = protocolPublicDataWrites;
|
|
18
24
|
this.noteHashes = noteHashes;
|
|
@@ -26,17 +32,25 @@ export class SideEffectArrayLengths {
|
|
|
26
32
|
}
|
|
27
33
|
/**
|
|
28
34
|
* Trace side effects for an enqueued public call's execution.
|
|
29
|
-
*/
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
/**
|
|
35
|
+
*/ export class SideEffectTrace {
|
|
36
|
+
startSideEffectCounter;
|
|
37
|
+
previousSideEffectArrayLengths;
|
|
38
|
+
gotBytecodeFromClassIds;
|
|
39
|
+
log;
|
|
40
|
+
/** The side effect counter increments with every call to the trace. */ sideEffectCounter;
|
|
41
|
+
enqueuedCalls;
|
|
42
|
+
publicDataWrites;
|
|
43
|
+
protocolPublicDataWritesLength;
|
|
44
|
+
userPublicDataWritesLength;
|
|
45
|
+
noteHashes;
|
|
46
|
+
nullifiers;
|
|
47
|
+
l2ToL1Messages;
|
|
48
|
+
publicLogs;
|
|
49
|
+
avmCircuitHints;
|
|
50
|
+
/** Make sure a forked trace is never merged twice. */ alreadyMergedIntoParent;
|
|
51
|
+
constructor(/** The counter of this trace's first side effect. */ startSideEffectCounter = 0, /** Track parent's (or previous kernel's) lengths so the AVM can properly enforce TX-wide limits,
|
|
35
52
|
* otherwise the public kernel can fail to prove because TX limits are breached.
|
|
36
|
-
*/
|
|
37
|
-
previousSideEffectArrayLengths = SideEffectArrayLengths.empty(),
|
|
38
|
-
/** We need to track the set of class IDs used for bytecode retrieval to deduplicate and enforce limits. */
|
|
39
|
-
gotBytecodeFromClassIds = new UniqueClassIds()) {
|
|
53
|
+
*/ previousSideEffectArrayLengths = SideEffectArrayLengths.empty(), /** We need to track the set of class IDs used for bytecode retrieval to deduplicate and enforce limits. */ gotBytecodeFromClassIds = new UniqueClassIds()){
|
|
40
54
|
this.startSideEffectCounter = startSideEffectCounter;
|
|
41
55
|
this.previousSideEffectArrayLengths = previousSideEffectArrayLengths;
|
|
42
56
|
this.gotBytecodeFromClassIds = gotBytecodeFromClassIds;
|
|
@@ -49,7 +63,6 @@ export class SideEffectTrace {
|
|
|
49
63
|
this.nullifiers = [];
|
|
50
64
|
this.l2ToL1Messages = [];
|
|
51
65
|
this.publicLogs = [];
|
|
52
|
-
/** Make sure a forked trace is never merged twice. */
|
|
53
66
|
this.alreadyMergedIntoParent = false;
|
|
54
67
|
this.log.debug(`Creating trace instance with startSideEffectCounter: ${startSideEffectCounter}`);
|
|
55
68
|
this.sideEffectCounter = startSideEffectCounter;
|
|
@@ -79,7 +92,7 @@ export class SideEffectTrace {
|
|
|
79
92
|
this.avmCircuitHints.contractInstances.items.push(...forkedTrace.avmCircuitHints.contractInstances.items);
|
|
80
93
|
// merge in contract bytecode hints
|
|
81
94
|
// UniqueClassIds should prevent duplication
|
|
82
|
-
for (const [contractClassId, bytecodeHint] of forkedTrace.avmCircuitHints.contractBytecodeHints)
|
|
95
|
+
for (const [contractClassId, bytecodeHint] of forkedTrace.avmCircuitHints.contractBytecodeHints){
|
|
83
96
|
assert(!this.avmCircuitHints.contractBytecodeHints.has(contractClassId), 'Bug preventing duplication of contract bytecode hints');
|
|
84
97
|
this.avmCircuitHints.contractBytecodeHints.set(contractClassId, bytecodeHint);
|
|
85
98
|
}
|
|
@@ -107,15 +120,12 @@ export class SideEffectTrace {
|
|
|
107
120
|
}
|
|
108
121
|
async tracePublicStorageWrite(contractAddress, slot, value, protocolWrite, lowLeafPreimage = PublicDataTreeLeafPreimage.empty(), lowLeafIndex = Fr.zero(), lowLeafPath = emptyPublicDataPath(), newLeafPreimage = PublicDataTreeLeafPreimage.empty(), insertionPath = emptyPublicDataPath()) {
|
|
109
122
|
if (protocolWrite) {
|
|
110
|
-
if (this.protocolPublicDataWritesLength + this.previousSideEffectArrayLengths.protocolPublicDataWrites >=
|
|
111
|
-
PROTOCOL_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX) {
|
|
123
|
+
if (this.protocolPublicDataWritesLength + this.previousSideEffectArrayLengths.protocolPublicDataWrites >= PROTOCOL_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX) {
|
|
112
124
|
throw new SideEffectLimitReachedError('protocol public data (contract storage) write', PROTOCOL_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX);
|
|
113
125
|
}
|
|
114
126
|
this.protocolPublicDataWritesLength++;
|
|
115
|
-
}
|
|
116
|
-
|
|
117
|
-
if (this.userPublicDataWritesLength + this.previousSideEffectArrayLengths.publicDataWrites >=
|
|
118
|
-
MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX) {
|
|
127
|
+
} else {
|
|
128
|
+
if (this.userPublicDataWritesLength + this.previousSideEffectArrayLengths.publicDataWrites >= MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX) {
|
|
119
129
|
throw new SideEffectLimitReachedError('public data (contract storage) write', MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX);
|
|
120
130
|
}
|
|
121
131
|
this.userPublicDataWritesLength++;
|
|
@@ -132,7 +142,7 @@ export class SideEffectTrace {
|
|
|
132
142
|
traceNoteHashCheck(_contractAddress, noteHash, leafIndex, _exists, path = emptyNoteHashPath()) {
|
|
133
143
|
// New Hinting
|
|
134
144
|
this.avmCircuitHints.noteHashReads.items.push(new AvmAppendTreeHint(leafIndex, noteHash, path));
|
|
135
|
-
|
|
145
|
+
// NOTE: counter does not increment for note hash checks (because it doesn't rely on pending note hashes)
|
|
136
146
|
}
|
|
137
147
|
traceNewNoteHash(noteHash, leafIndex = Fr.zero(), path = emptyNoteHashPath()) {
|
|
138
148
|
if (this.noteHashes.length + this.previousSideEffectArrayLengths.noteHashes >= MAX_NOTE_HASHES_PER_TX) {
|
|
@@ -195,7 +205,7 @@ export class SideEffectTrace {
|
|
|
195
205
|
traceGetBytecode(contractAddress, exists, bytecode = Buffer.alloc(0), contractInstance = SerializableContractInstance.default(), contractClass = {
|
|
196
206
|
artifactHash: Fr.zero(),
|
|
197
207
|
privateFunctionsRoot: Fr.zero(),
|
|
198
|
-
publicBytecodeCommitment: Fr.zero()
|
|
208
|
+
publicBytecodeCommitment: Fr.zero()
|
|
199
209
|
}, lowLeafPreimage = NullifierLeafPreimage.empty(), lowLeafIndex = Fr.zero(), lowLeafPath = emptyNullifierPath()) {
|
|
200
210
|
// FIXME: The way we are hinting contract bytecodes is fundamentally broken.
|
|
201
211
|
// We are mapping contract class ID to a bytecode hint
|
|
@@ -243,16 +253,9 @@ export class SideEffectTrace {
|
|
|
243
253
|
this.gotBytecodeFromClassIds.add(contractInstance.contractClassId.toString());
|
|
244
254
|
}
|
|
245
255
|
/**
|
|
246
|
-
|
|
247
|
-
|
|
248
|
-
|
|
249
|
-
traceEnqueuedCall(
|
|
250
|
-
/** The call request from private that enqueued this call. */
|
|
251
|
-
publicCallRequest,
|
|
252
|
-
/** The call's calldata */
|
|
253
|
-
calldata,
|
|
254
|
-
/** Did the call revert? */
|
|
255
|
-
_reverted) {
|
|
256
|
+
* Trace an enqueued call.
|
|
257
|
+
* Accept some results from a finished call's trace into this one.
|
|
258
|
+
*/ traceEnqueuedCall(/** The call request from private that enqueued this call. */ publicCallRequest, /** The call's calldata */ calldata, /** Did the call revert? */ _reverted) {
|
|
256
259
|
this.log.debug(`Tracing enqueued call`);
|
|
257
260
|
// TODO(4805): check if some threshold is reached for max enqueued or nested calls (to unique contracts?)
|
|
258
261
|
this.enqueuedCalls.push(publicCallRequest);
|
|
@@ -265,43 +268,14 @@ export class SideEffectTrace {
|
|
|
265
268
|
noteHashes: this.noteHashes,
|
|
266
269
|
nullifiers: this.nullifiers,
|
|
267
270
|
l2ToL1Msgs: this.l2ToL1Messages,
|
|
268
|
-
publicLogs: this.publicLogs
|
|
271
|
+
publicLogs: this.publicLogs
|
|
269
272
|
};
|
|
270
273
|
}
|
|
271
|
-
toAvmCircuitPublicInputs(
|
|
272
|
-
/** Globals. */
|
|
273
|
-
globalVariables,
|
|
274
|
-
/** Start tree snapshots. */
|
|
275
|
-
startTreeSnapshots,
|
|
276
|
-
/** Gas used at start of TX. */
|
|
277
|
-
startGasUsed,
|
|
278
|
-
/** How much gas was available for this public execution. */
|
|
279
|
-
gasLimits,
|
|
280
|
-
/** Address of the fee payer. */
|
|
281
|
-
feePayer,
|
|
282
|
-
/** Call requests for setup phase. */
|
|
283
|
-
publicSetupCallRequests,
|
|
284
|
-
/** Call requests for app logic phase. */
|
|
285
|
-
publicAppLogicCallRequests,
|
|
286
|
-
/** Call request for teardown phase. */
|
|
287
|
-
publicTeardownCallRequest,
|
|
288
|
-
/** End tree snapshots. */
|
|
289
|
-
endTreeSnapshots,
|
|
290
|
-
/**
|
|
274
|
+
toAvmCircuitPublicInputs(/** Globals. */ globalVariables, /** Start tree snapshots. */ startTreeSnapshots, /** Gas used at start of TX. */ startGasUsed, /** How much gas was available for this public execution. */ gasLimits, /** Address of the fee payer. */ feePayer, /** Call requests for setup phase. */ publicSetupCallRequests, /** Call requests for app logic phase. */ publicAppLogicCallRequests, /** Call request for teardown phase. */ publicTeardownCallRequest, /** End tree snapshots. */ endTreeSnapshots, /**
|
|
291
275
|
* Gas used by the whole transaction, assuming entire teardown limit is used.
|
|
292
276
|
* This is the gas used when computing transaction fee.
|
|
293
|
-
*/
|
|
294
|
-
|
|
295
|
-
/** Transaction fee. */
|
|
296
|
-
transactionFee,
|
|
297
|
-
/** The call's results */
|
|
298
|
-
reverted) {
|
|
299
|
-
return new AvmCircuitPublicInputs(globalVariables, startTreeSnapshots, startGasUsed, gasLimits, feePayer, padArrayEnd(publicSetupCallRequests, PublicCallRequest.empty(), MAX_ENQUEUED_CALLS_PER_TX), padArrayEnd(publicAppLogicCallRequests, PublicCallRequest.empty(), MAX_ENQUEUED_CALLS_PER_TX), publicTeardownCallRequest,
|
|
300
|
-
/*previousNonRevertibleAccumulatedDataArrayLengths=*/ PrivateToAvmAccumulatedDataArrayLengths.empty(),
|
|
301
|
-
/*previousRevertibleAccumulatedDataArrayLengths=*/ PrivateToAvmAccumulatedDataArrayLengths.empty(),
|
|
302
|
-
/*previousNonRevertibleAccumulatedDataArray=*/ PrivateToAvmAccumulatedData.empty(),
|
|
303
|
-
/*previousRevertibleAccumulatedDataArray=*/ PrivateToAvmAccumulatedData.empty(), endTreeSnapshots, endGasUsed,
|
|
304
|
-
/*accumulatedData=*/ this.getAvmAccumulatedData(), transactionFee, reverted);
|
|
277
|
+
*/ endGasUsed, /** Transaction fee. */ transactionFee, /** The call's results */ reverted) {
|
|
278
|
+
return new AvmCircuitPublicInputs(globalVariables, startTreeSnapshots, startGasUsed, gasLimits, feePayer, padArrayEnd(publicSetupCallRequests, PublicCallRequest.empty(), MAX_ENQUEUED_CALLS_PER_TX), padArrayEnd(publicAppLogicCallRequests, PublicCallRequest.empty(), MAX_ENQUEUED_CALLS_PER_TX), publicTeardownCallRequest, /*previousNonRevertibleAccumulatedDataArrayLengths=*/ PrivateToAvmAccumulatedDataArrayLengths.empty(), /*previousRevertibleAccumulatedDataArrayLengths=*/ PrivateToAvmAccumulatedDataArrayLengths.empty(), /*previousNonRevertibleAccumulatedDataArray=*/ PrivateToAvmAccumulatedData.empty(), /*previousRevertibleAccumulatedDataArray=*/ PrivateToAvmAccumulatedData.empty(), endTreeSnapshots, endGasUsed, /*accumulatedData=*/ this.getAvmAccumulatedData(), transactionFee, reverted);
|
|
305
279
|
}
|
|
306
280
|
getPublicLogs() {
|
|
307
281
|
return this.publicLogs;
|
|
@@ -310,7 +284,6 @@ export class SideEffectTrace {
|
|
|
310
284
|
return this.avmCircuitHints;
|
|
311
285
|
}
|
|
312
286
|
getAvmAccumulatedData() {
|
|
313
|
-
return new AvmAccumulatedData(padArrayEnd(this.noteHashes.map(n
|
|
287
|
+
return new AvmAccumulatedData(padArrayEnd(this.noteHashes.map((n)=>n.value), Fr.zero(), MAX_NOTE_HASHES_PER_TX), padArrayEnd(this.nullifiers.map((n)=>n.value), Fr.zero(), MAX_NULLIFIERS_PER_TX), padArrayEnd(this.l2ToL1Messages, ScopedL2ToL1Message.empty(), MAX_L2_TO_L1_MSGS_PER_TX), padArrayEnd(this.publicLogs, PublicLog.empty(), MAX_PUBLIC_LOGS_PER_TX), padArrayEnd(this.publicDataWrites.map((w)=>new PublicDataWrite(w.leafSlot, w.newValue)), PublicDataWrite.empty(), MAX_TOTAL_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX));
|
|
314
288
|
}
|
|
315
289
|
}
|
|
316
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"side_effect_trace.js","sourceRoot":"","sources":["../../src/public/side_effect_trace.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,kBAAkB,EAClB,iBAAiB,EACjB,sBAAsB,EACtB,wBAAwB,EACxB,uBAAuB,EACvB,mBAAmB,EACnB,iBAAiB,EACjB,wBAAwB,EACxB,yBAAyB,EACzB,yBAAyB,EACzB,0BAA0B,EAG1B,UAAU,EAIV,wBAAwB,EACxB,aAAa,EACb,yBAAyB,EACzB,wBAAwB,EACxB,sBAAsB,EACtB,qBAAqB,EACrB,6CAA6C,EAC7C,sCAAsC,EACtC,sBAAsB,EACtB,4CAA4C,EAC5C,qBAAqB,EACrB,qBAAqB,EACrB,QAAQ,EACR,SAAS,EACT,qBAAqB,EACrB,2CAA2C,EAC3C,uBAAuB,EACvB,8BAA8B,EAC9B,2BAA2B,EAC3B,uCAAuC,EACvC,iBAAiB,EACjB,0BAA0B,EAC1B,uBAAuB,EACvB,eAAe,EACf,SAAS,EACT,mBAAmB,EACnB,4BAA4B,GAE7B,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,6BAA6B,EAAE,MAAM,yBAAyB,CAAC;AACxE,OAAO,EAAE,WAAW,EAAE,MAAM,8BAA8B,CAAC;AAC3D,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAC9C,OAAO,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAC3D,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAErD,OAAO,EAAE,MAAM,IAAI,MAAM,EAAE,MAAM,QAAQ,CAAC;AAE1C,OAAO,EAAE,2BAA2B,EAAE,MAAM,yBAAyB,CAAC;AAEtE,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAEvD,MAAM,mBAAmB,GAAG,GAAG,EAAE,CAAC,IAAI,KAAK,CAAC,uBAAuB,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,EAAE,CAAC,CAAC;AACrF,MAAM,iBAAiB,GAAG,GAAG,EAAE,CAAC,IAAI,KAAK,CAAC,qBAAqB,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,EAAE,CAAC,CAAC;AACjF,MAAM,kBAAkB,GAAG,GAAG,EAAE,CAAC,IAAI,KAAK,CAAC,qBAAqB,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,EAAE,CAAC,CAAC;AAClF,MAAM,sBAAsB,GAAG,GAAG,EAAE,CAAC,IAAI,KAAK,CAAC,wBAAwB,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,EAAE,CAAC,CAAC;AAkBzF,MAAM,OAAO,sBAAsB;IACjC,YACkB,gBAAwB,EACxB,wBAAgC,EAChC,UAAkB,EAClB,UAAkB,EAClB,UAAkB,EAClB,UAAkB;QALlB,qBAAgB,GAAhB,gBAAgB,CAAQ;QACxB,6BAAwB,GAAxB,wBAAwB,CAAQ;QAChC,eAAU,GAAV,UAAU,CAAQ;QAClB,eAAU,GAAV,UAAU,CAAQ;QAClB,eAAU,GAAV,UAAU,CAAQ;QAClB,eAAU,GAAV,UAAU,CAAQ;IACjC,CAAC;IAEJ,MAAM,CAAC,KAAK;QACV,OAAO,IAAI,IAAI,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;IACpC,CAAC;CACF;AAED;;GAEG;AACH,MAAM,OAAO,eAAe;IAqB1B;IACE,qDAAqD;IACrC,yBAAiC,CAAC;IAClD;;OAEG;IACc,iCAAyD,sBAAsB,CAAC,KAAK,EAAE;IACxG,2GAA2G;IACnG,0BAA0C,IAAI,cAAc,EAAE;QANtD,2BAAsB,GAAtB,sBAAsB,CAAY;QAIjC,mCAA8B,GAA9B,8BAA8B,CAAyD;QAEhG,4BAAuB,GAAvB,uBAAuB,CAAuC;QA5BjE,QAAG,GAAG,YAAY,CAAC,6BAA6B,CAAC,CAAC;QAKjD,kBAAa,GAAwB,EAAE,CAAC;QAExC,qBAAgB,GAA8B,EAAE,CAAC;QACjD,mCAA8B,GAAW,CAAC,CAAC;QAC3C,+BAA0B,GAAW,CAAC,CAAC;QACvC,eAAU,GAAe,EAAE,CAAC;QAC5B,eAAU,GAAgB,EAAE,CAAC;QAC7B,mBAAc,GAA0B,EAAE,CAAC;QAC3C,eAAU,GAAgB,EAAE,CAAC;QAIrC,sDAAsD;QAC9C,4BAAuB,GAAG,KAAK,CAAC;QAYtC,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,wDAAwD,sBAAsB,EAAE,CAAC,CAAC;QACjG,IAAI,CAAC,iBAAiB,GAAG,sBAAsB,CAAC;QAChD,IAAI,CAAC,eAAe,GAAG,iBAAiB,CAAC,KAAK,EAAE,CAAC;IACnD,CAAC;IAEM,IAAI;QACT,OAAO,IAAI,eAAe,CACxB,IAAI,CAAC,iBAAiB,EACtB,IAAI,sBAAsB,CACxB,IAAI,CAAC,8BAA8B,CAAC,gBAAgB,GAAG,IAAI,CAAC,0BAA0B,EACtF,IAAI,CAAC,8BAA8B,CAAC,wBAAwB,GAAG,IAAI,CAAC,8BAA8B,EAClG,IAAI,CAAC,8BAA8B,CAAC,UAAU,GAAG,IAAI,CAAC,UAAU,CAAC,MAAM,EACvE,IAAI,CAAC,8BAA8B,CAAC,UAAU,GAAG,IAAI,CAAC,UAAU,CAAC,MAAM,EACvE,IAAI,CAAC,8BAA8B,CAAC,UAAU,GAAG,IAAI,CAAC,cAAc,CAAC,MAAM,EAC3E,IAAI,CAAC,8BAA8B,CAAC,UAAU,GAAG,IAAI,CAAC,UAAU,CAAC,MAAM,CACxE,EACD,IAAI,CAAC,uBAAuB,CAAC,IAAI,EAAE,CACpC,CAAC;IACJ,CAAC;IAEM,KAAK,CAAC,WAAiB,EAAE,WAAoB,KAAK;QACvD,4DAA4D;QAC5D,MAAM,CACJ,CAAC,WAAW,CAAC,uBAAuB,EACpC,gFAAgF,CACjF,CAAC;QACF,WAAW,CAAC,uBAAuB,GAAG,IAAI,CAAC;QAE3C,IAAI,CAAC,iBAAiB,GAAG,WAAW,CAAC,iBAAiB,CAAC;QACvD,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,GAAG,WAAW,CAAC,aAAa,CAAC,CAAC;QAEtD,IAAI,CAAC,QAAQ,EAAE,CAAC;YACd,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,GAAG,WAAW,CAAC,gBAAgB,CAAC,CAAC;YAC5D,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,GAAG,WAAW,CAAC,UAAU,CAAC,CAAC;YAChD,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,GAAG,WAAW,CAAC,UAAU,CAAC,CAAC;YAChD,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,GAAG,WAAW,CAAC,cAAc,CAAC,CAAC;YACxD,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,GAAG,WAAW,CAAC,UAAU,CAAC,CAAC;QAClD,CAAC;QACD,IAAI,CAAC,UAAU,CAAC,WAAW,CAAC,CAAC;IAC/B,CAAC;IAEO,UAAU,CAAC,WAAiB;QAClC,IAAI,CAAC,uBAAuB,CAAC,cAAc,CAAC,WAAW,CAAC,uBAAuB,CAAC,CAAC;QAEjF,IAAI,CAAC,eAAe,CAAC,aAAa,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,WAAW,CAAC,eAAe,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;QAElG,IAAI,CAAC,eAAe,CAAC,iBAAiB,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,WAAW,CAAC,eAAe,CAAC,iBAAiB,CAAC,KAAK,CAAC,CAAC;QAE1G,mCAAmC;QACnC,4CAA4C;QAC5C,KAAK,MAAM,CAAC,eAAe,EAAE,YAAY,CAAC,IAAI,WAAW,CAAC,eAAe,CAAC,qBAAqB,EAAE,CAAC;YAChG,MAAM,CACJ,CAAC,IAAI,CAAC,eAAe,CAAC,qBAAqB,CAAC,GAAG,CAAC,eAAe,CAAC,EAChE,uDAAuD,CACxD,CAAC;YACF,IAAI,CAAC,eAAe,CAAC,qBAAqB,CAAC,GAAG,CAAC,eAAe,EAAE,YAAY,CAAC,CAAC;QAChF,CAAC;QAED,IAAI,CAAC,eAAe,CAAC,eAAe,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,WAAW,CAAC,eAAe,CAAC,eAAe,CAAC,KAAK,CAAC,CAAC;QACtG,IAAI,CAAC,eAAe,CAAC,gBAAgB,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,WAAW,CAAC,eAAe,CAAC,gBAAgB,CAAC,KAAK,CAAC,CAAC;QACxG,IAAI,CAAC,eAAe,CAAC,cAAc,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,WAAW,CAAC,eAAe,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC;QACpG,IAAI,CAAC,eAAe,CAAC,eAAe,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,WAAW,CAAC,eAAe,CAAC,eAAe,CAAC,KAAK,CAAC,CAAC;QACtG,IAAI,CAAC,eAAe,CAAC,aAAa,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,WAAW,CAAC,eAAe,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;QAClG,IAAI,CAAC,eAAe,CAAC,cAAc,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,WAAW,CAAC,eAAe,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC;QACpG,IAAI,CAAC,eAAe,CAAC,kBAAkB,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,WAAW,CAAC,eAAe,CAAC,kBAAkB,CAAC,KAAK,CAAC,CAAC;IAC9G,CAAC;IAEM,UAAU;QACf,OAAO,IAAI,CAAC,iBAAiB,CAAC;IAChC,CAAC;IAEO,0BAA0B;QAChC,IAAI,CAAC,iBAAiB,EAAE,CAAC;IAC3B,CAAC;IAEM,gBAAgB;QACrB,OAAO,IAAI,CAAC,8BAA8B,CAAC,UAAU,GAAG,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC;IACjF,CAAC;IAEM,sBAAsB,CAC3B,eAA6B,EAC7B,IAAQ,EACR,KAAS,EACT,eAA2C,0BAA0B,CAAC,KAAK,EAAE,EAC7E,YAAgB,EAAE,CAAC,IAAI,EAAE,EACzB,OAAa,mBAAmB,EAAE;QAElC,IAAI,CAAC,eAAe,CAAC,eAAe,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,yBAAyB,CAAC,YAAY,EAAE,SAAS,EAAE,IAAI,CAAC,CAAC,CAAC;QAC9G,IAAI,CAAC,GAAG,CAAC,KAAK,CACZ,iCAAiC,eAAe,UAAU,IAAI,YAAY,KAAK,aAAa,IAAI,CAAC,iBAAiB,GAAG,CACtH,CAAC;QACF,IAAI,CAAC,0BAA0B,EAAE,CAAC;IACpC,CAAC;IAEM,KAAK,CAAC,uBAAuB,CAClC,eAA6B,EAC7B,IAAQ,EACR,KAAS,EACT,aAAsB,EACtB,kBAA8C,0BAA0B,CAAC,KAAK,EAAE,EAChF,eAAmB,EAAE,CAAC,IAAI,EAAE,EAC5B,cAAoB,mBAAmB,EAAE,EACzC,kBAA8C,0BAA0B,CAAC,KAAK,EAAE,EAChF,gBAAsB,mBAAmB,EAAE;QAE3C,IAAI,aAAa,EAAE,CAAC;YAClB,IACE,IAAI,CAAC,8BAA8B,GAAG,IAAI,CAAC,8BAA8B,CAAC,wBAAwB;gBAClG,2CAA2C,EAC3C,CAAC;gBACD,MAAM,IAAI,2BAA2B,CACnC,+CAA+C,EAC/C,2CAA2C,CAC5C,CAAC;YACJ,CAAC;YACD,IAAI,CAAC,8BAA8B,EAAE,CAAC;QACxC,CAAC;aAAM,CAAC;YACN,IACE,IAAI,CAAC,0BAA0B,GAAG,IAAI,CAAC,8BAA8B,CAAC,gBAAgB;gBACtF,sCAAsC,EACtC,CAAC;gBACD,MAAM,IAAI,2BAA2B,CACnC,sCAAsC,EACtC,sCAAsC,CACvC,CAAC;YACJ,CAAC;YACD,IAAI,CAAC,0BAA0B,EAAE,CAAC;QACpC,CAAC;QAED,MAAM,QAAQ,GAAG,MAAM,6BAA6B,CAAC,eAAe,EAAE,IAAI,CAAC,CAAC;QAC5E,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,IAAI,uBAAuB,CAAC,QAAQ,EAAE,KAAK,EAAE,IAAI,CAAC,iBAAiB,CAAC,CAAC,CAAC;QAEjG,cAAc;QACd,MAAM,QAAQ,GAAG,IAAI,yBAAyB,CAAC,eAAe,EAAE,YAAY,EAAE,WAAW,CAAC,CAAC;QAC3F,IAAI,CAAC,eAAe,CAAC,gBAAgB,CAAC,KAAK,CAAC,IAAI,CAC9C,IAAI,0BAA0B,CAAC,QAAQ,EAAE,eAAe,EAAE,aAAa,CAAC,CACzE,CAAC;QAEF,IAAI,CAAC,GAAG,CAAC,KAAK,CACZ,qCAAqC,eAAe,UAAU,IAAI,YAAY,KAAK,aAAa,IAAI,CAAC,iBAAiB,gBAAgB,aAAa,GAAG,CACvJ,CAAC;QACF,IAAI,CAAC,0BAA0B,EAAE,CAAC;IACpC,CAAC;IAED,8FAA8F;IACvF,kBAAkB,CACvB,gBAA8B,EAC9B,QAAY,EACZ,SAAa,EACb,OAAgB,EAChB,OAAa,iBAAiB,EAAE;QAEhC,cAAc;QACd,IAAI,CAAC,eAAe,CAAC,aAAa,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,iBAAiB,CAAC,SAAS,EAAE,QAAQ,EAAE,IAAI,CAAC,CAAC,CAAC;QAChG,yGAAyG;IAC3G,CAAC;IAEM,gBAAgB,CAAC,QAAY,EAAE,YAAgB,EAAE,CAAC,IAAI,EAAE,EAAE,OAAa,iBAAiB,EAAE;QAC/F,IAAI,IAAI,CAAC,UAAU,CAAC,MAAM,GAAG,IAAI,CAAC,8BAA8B,CAAC,UAAU,IAAI,sBAAsB,EAAE,CAAC;YACtG,MAAM,IAAI,2BAA2B,CAAC,WAAW,EAAE,sBAAsB,CAAC,CAAC;QAC7E,CAAC;QAED,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,QAAQ,CAAC,QAAQ,EAAE,IAAI,CAAC,iBAAiB,CAAC,CAAC,CAAC;QACrE,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,sBAAsB,IAAI,CAAC,iBAAiB,EAAE,CAAC,CAAC;QAC/D,IAAI,CAAC,eAAe,CAAC,cAAc,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,iBAAiB,CAAC,SAAS,EAAE,QAAQ,EAAE,IAAI,CAAC,CAAC,CAAC;QACjG,IAAI,CAAC,0BAA0B,EAAE,CAAC;IACpC,CAAC;IAEM,mBAAmB,CACxB,gBAAoB,EACpB,OAAgB,EAChB,kBAAyC,qBAAqB,CAAC,KAAK,EAAE,EACtE,eAAmB,EAAE,CAAC,IAAI,EAAE,EAC5B,cAAoB,kBAAkB,EAAE;QAExC,IAAI,CAAC,eAAe,CAAC,cAAc,CAAC,KAAK,CAAC,IAAI,CAC5C,IAAI,wBAAwB,CAAC,eAAe,EAAE,YAAY,EAAE,WAAW,CAAC,CACzE,CAAC;QACF,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,yBAAyB,IAAI,CAAC,iBAAiB,EAAE,CAAC,CAAC;QAClE,IAAI,CAAC,0BAA0B,EAAE,CAAC;IACpC,CAAC;IAEM,iBAAiB,CACtB,eAAmB,EACnB,kBAAyC,qBAAqB,CAAC,KAAK,EAAE,EACtE,eAAmB,EAAE,CAAC,IAAI,EAAE,EAC5B,cAAoB,kBAAkB,EAAE,EACxC,gBAAsB,kBAAkB,EAAE;QAE1C,IAAI,IAAI,CAAC,UAAU,CAAC,MAAM,GAAG,IAAI,CAAC,8BAA8B,CAAC,UAAU,IAAI,qBAAqB,EAAE,CAAC;YACrG,MAAM,IAAI,2BAA2B,CAAC,WAAW,EAAE,qBAAqB,CAAC,CAAC;QAC5E,CAAC;QAED,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,SAAS,CAAC,eAAe,EAAE,IAAI,CAAC,iBAAiB,EAAE,aAAa,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC;QAEpG,MAAM,eAAe,GAAG,IAAI,wBAAwB,CAAC,eAAe,EAAE,YAAY,EAAE,WAAW,CAAC,CAAC;QACjG,IAAI,CAAC,eAAe,CAAC,eAAe,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,yBAAyB,CAAC,eAAe,EAAE,aAAa,CAAC,CAAC,CAAC;QAC/G,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,sBAAsB,IAAI,CAAC,iBAAiB,EAAE,CAAC,CAAC;QAC/D,IAAI,CAAC,0BAA0B,EAAE,CAAC;IACpC,CAAC;IAED,8FAA8F;IACvF,uBAAuB,CAC5B,gBAA8B,EAC9B,OAAW,EACX,YAAgB,EAChB,OAAgB,EAChB,OAAa,sBAAsB,EAAE;QAErC,IAAI,CAAC,eAAe,CAAC,kBAAkB,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,iBAAiB,CAAC,YAAY,EAAE,OAAO,EAAE,IAAI,CAAC,CAAC,CAAC;IACzG,CAAC;IAEM,qBAAqB,CAAC,eAA6B,EAAE,SAAa,EAAE,OAAW;QACpF,IAAI,IAAI,CAAC,cAAc,CAAC,MAAM,GAAG,IAAI,CAAC,8BAA8B,CAAC,UAAU,IAAI,wBAAwB,EAAE,CAAC;YAC5G,MAAM,IAAI,2BAA2B,CAAC,kBAAkB,EAAE,wBAAwB,CAAC,CAAC;QACtF,CAAC;QAED,MAAM,gBAAgB,GAAG,UAAU,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC;QACzD,IAAI,CAAC,cAAc,CAAC,IAAI,CACtB,IAAI,aAAa,CAAC,gBAAgB,EAAE,OAAO,EAAE,IAAI,CAAC,iBAAiB,CAAC,CAAC,KAAK,CAAC,eAAe,CAAC,CAC5F,CAAC;QACF,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,yBAAyB,IAAI,CAAC,iBAAiB,EAAE,CAAC,CAAC;QAClE,IAAI,CAAC,0BAA0B,EAAE,CAAC;IACpC,CAAC;IAEM,cAAc,CAAC,eAA6B,EAAE,GAAS;QAC5D,IAAI,IAAI,CAAC,UAAU,CAAC,MAAM,GAAG,IAAI,CAAC,8BAA8B,CAAC,UAAU,IAAI,sBAAsB,EAAE,CAAC;YACtG,MAAM,IAAI,2BAA2B,CAAC,YAAY,EAAE,sBAAsB,CAAC,CAAC;QAC9E,CAAC;QAED,IAAI,GAAG,CAAC,MAAM,GAAG,8BAA8B,EAAE,CAAC;YAChD,MAAM,IAAI,KAAK,CAAC,yCAAyC,8BAA8B,aAAa,GAAG,CAAC,MAAM,EAAE,CAAC,CAAC;QACpH,CAAC;QACD,MAAM,SAAS,GAAG,IAAI,SAAS,CAAC,eAAe,EAAE,WAAW,CAAC,GAAG,EAAE,EAAE,CAAC,IAAI,EAAE,8BAA8B,CAAC,CAAC,CAAC;QAC5G,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QAChC,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,uBAAuB,IAAI,CAAC,iBAAiB,EAAE,CAAC,CAAC;QAChE,IAAI,CAAC,0BAA0B,EAAE,CAAC;IACpC,CAAC;IAEM,wBAAwB,CAC7B,eAA6B,EAC7B,MAAe,EACf,WAAyC,4BAA4B,CAAC,OAAO,EAAE,EAC/E,kBAAyC,qBAAqB,CAAC,KAAK,EAAE,EACtE,eAAmB,EAAE,CAAC,IAAI,EAAE,EAC5B,cAAoB,kBAAkB,EAAE;QAExC,MAAM,cAAc,GAAG,IAAI,wBAAwB,CAAC,eAAe,EAAE,YAAY,EAAE,WAAW,CAAC,CAAC;QAChG,IAAI,CAAC,eAAe,CAAC,iBAAiB,CAAC,KAAK,CAAC,IAAI,CAC/C,IAAI,uBAAuB,CACzB,eAAe,EACf,MAAM,EACN,QAAQ,CAAC,IAAI,EACb,QAAQ,CAAC,QAAQ,EACjB,QAAQ,CAAC,eAAe,EACxB,QAAQ,CAAC,kBAAkB,EAC3B,QAAQ,CAAC,UAAU,EACnB,cAAc,CACf,CACF,CAAC;QACF,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,0BAA0B,IAAI,CAAC,iBAAiB,EAAE,CAAC,CAAC;QACnE,IAAI,CAAC,0BAA0B,EAAE,CAAC;IACpC,CAAC;IAED,6EAA6E;IAC7E,4FAA4F;IAC5F,sDAAsD;IAC/C,gBAAgB,CACrB,eAA6B,EAC7B,MAAe,EACf,WAAmB,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,EAClC,mBAAiD,4BAA4B,CAAC,OAAO,EAAE,EACvF,gBAAyC;QACvC,YAAY,EAAE,EAAE,CAAC,IAAI,EAAE;QACvB,oBAAoB,EAAE,EAAE,CAAC,IAAI,EAAE;QAC/B,wBAAwB,EAAE,EAAE,CAAC,IAAI,EAAE;KACpC,EACD,kBAAyC,qBAAqB,CAAC,KAAK,EAAE,EACtE,eAAmB,EAAE,CAAC,IAAI,EAAE,EAC5B,cAAoB,kBAAkB,EAAE;QAExC,4EAA4E;QAC5E,sDAAsD;QACtD,sDAAsD;QACtD,0EAA0E;QAC1E,kGAAkG;QAClG,6FAA6F;QAC7F,wCAAwC;QAExC,MAAM,cAAc,GAAG,IAAI,wBAAwB,CAAC,eAAe,EAAE,YAAY,EAAE,WAAW,CAAC,CAAC;QAChG,MAAM,QAAQ,GAAG,IAAI,uBAAuB,CAC1C,eAAe,EACf,MAAM,EACN,gBAAgB,CAAC,IAAI,EACrB,gBAAgB,CAAC,QAAQ,EACzB,gBAAgB,CAAC,eAAe,EAChC,gBAAgB,CAAC,kBAAkB,EACnC,gBAAgB,CAAC,UAAU,EAC3B,cAAc,CACf,CAAC;QAEF,uEAAuE;QACvE,0FAA0F;QAC1F,wEAAwE;QACxE,IAAI,CAAC,eAAe,CAAC,iBAAiB,CAAC,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QAC5D,IAAI,CAAC,GAAG,CAAC,KAAK,CACZ,4DAA4D,MAAM,cAAc,aAAa,CAAC,gBAAgB,CAAC,EAAE,CAClH,CAAC;QAEF,IAAI,CAAC,MAAM,EAAE,CAAC;YACZ,uCAAuC;YACvC,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,oBAAoB,eAAe,mDAAmD,CAAC,CAAC;YACvG,OAAO;QACT,CAAC;QACD,8CAA8C;QAC9C,8DAA8D;QAC9D,mGAAmG;QACnG,0DAA0D;QAC1D,IAAI,IAAI,CAAC,uBAAuB,CAAC,GAAG,CAAC,gBAAgB,CAAC,eAAe,CAAC,QAAQ,EAAE,CAAC,EAAE,CAAC;YAClF,uCAAuC;YACvC,IAAI,CAAC,GAAG,CAAC,KAAK,CACZ,qBAAqB,gBAAgB,CAAC,eAAe,CAAC,QAAQ,EAAE,mCAAmC,CACpG,CAAC;YACF,OAAO;QACT,CAAC;QAED,uGAAuG;QACvG,sFAAsF;QACtF,gFAAgF;QAChF,+GAA+G;QAC/G,+FAA+F;QAC/F,2GAA2G;QAC3G,2GAA2G;QAC3G,IAAI,IAAI,CAAC,uBAAuB,CAAC,IAAI,EAAE,IAAI,6CAA6C,EAAE,CAAC;YACzF,IAAI,CAAC,GAAG,CAAC,KAAK,CACZ,oDAAoD,gBAAgB,CAAC,eAAe,CAAC,QAAQ,EAAE,kBAAkB,CAClH,CAAC;YACF,MAAM,IAAI,2BAA2B,CACnC,oCAAoC,EACpC,6CAA6C,CAC9C,CAAC;QACJ,CAAC;QAED,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,mEAAmE,aAAa,CAAC,aAAa,CAAC,EAAE,CAAC,CAAC;QAClH,IAAI,CAAC,eAAe,CAAC,qBAAqB,CAAC,GAAG,CAC5C,gBAAgB,CAAC,eAAe,CAAC,QAAQ,EAAE,EAC3C,IAAI,wBAAwB,CAAC,QAAQ,EAAE,QAAQ,EAAE,aAAa,CAAC,CAChE,CAAC;QACF,sFAAsF;QACtF,6GAA6G;QAC7G,IAAI,CAAC,uBAAuB,CAAC,GAAG,CAAC,gBAAgB,CAAC,eAAe,CAAC,QAAQ,EAAE,CAAC,CAAC;IAChF,CAAC;IAED;;;OAGG;IACI,iBAAiB;IACtB,6DAA6D;IAC7D,iBAAoC;IACpC,0BAA0B;IAC1B,QAAc;IACd,2BAA2B;IAC3B,SAAkB;QAElB,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,uBAAuB,CAAC,CAAC;QACxC,yGAAyG;QACzG,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC;QAC3C,IAAI,CAAC,eAAe,CAAC,aAAa,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,mBAAmB,CAAC,iBAAiB,CAAC,eAAe,EAAE,QAAQ,CAAC,CAAC,CAAC;IACtH,CAAC;IAEM,cAAc;QACnB,OAAO;YACL,aAAa,EAAE,IAAI,CAAC,aAAa;YACjC,gBAAgB,EAAE,IAAI,CAAC,gBAAgB;YACvC,UAAU,EAAE,IAAI,CAAC,UAAU;YAC3B,UAAU,EAAE,IAAI,CAAC,UAAU;YAC3B,UAAU,EAAE,IAAI,CAAC,cAAc;YAC/B,UAAU,EAAE,IAAI,CAAC,UAAU;SAC5B,CAAC;IACJ,CAAC;IAEM,wBAAwB;IAC7B,eAAe;IACf,eAAgC;IAChC,4BAA4B;IAC5B,kBAAiC;IACjC,+BAA+B;IAC/B,YAAiB;IACjB,4DAA4D;IAC5D,SAAsB;IACtB,gCAAgC;IAChC,QAAsB;IACtB,qCAAqC;IACrC,uBAA4C;IAC5C,yCAAyC;IACzC,0BAA+C;IAC/C,uCAAuC;IACvC,yBAA4C;IAC5C,0BAA0B;IAC1B,gBAA+B;IAC/B;;;OAGG;IACH,UAAe;IACf,uBAAuB;IACvB,cAAkB;IAClB,yBAAyB;IACzB,QAAiB;QAEjB,OAAO,IAAI,sBAAsB,CAC/B,eAAe,EACf,kBAAkB,EAClB,YAAY,EACZ,SAAS,EACT,QAAQ,EACR,WAAW,CAAC,uBAAuB,EAAE,iBAAiB,CAAC,KAAK,EAAE,EAAE,yBAAyB,CAAC,EAC1F,WAAW,CAAC,0BAA0B,EAAE,iBAAiB,CAAC,KAAK,EAAE,EAAE,yBAAyB,CAAC,EAC7F,yBAAyB;QACzB,qDAAqD,CAAC,uCAAuC,CAAC,KAAK,EAAE;QACrG,kDAAkD,CAAC,uCAAuC,CAAC,KAAK,EAAE;QAClG,8CAA8C,CAAC,2BAA2B,CAAC,KAAK,EAAE;QAClF,2CAA2C,CAAC,2BAA2B,CAAC,KAAK,EAAE,EAC/E,gBAAgB,EAChB,UAAU;QACV,oBAAoB,CAAC,IAAI,CAAC,qBAAqB,EAAE,EACjD,cAAc,EACd,QAAQ,CACT,CAAC;IACJ,CAAC;IAEM,aAAa;QAClB,OAAO,IAAI,CAAC,UAAU,CAAC;IACzB,CAAC;IAEM,kBAAkB;QACvB,OAAO,IAAI,CAAC,eAAe,CAAC;IAC9B,CAAC;IAEO,qBAAqB;QAC3B,OAAO,IAAI,kBAAkB,CAC3B,WAAW,CACT,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,EACjC,EAAE,CAAC,IAAI,EAAE,EACT,sBAAsB,CACvB,EACD,WAAW,CACT,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,EACjC,EAAE,CAAC,IAAI,EAAE,EACT,qBAAqB,CACtB,EACD,WAAW,CAAC,IAAI,CAAC,cAAc,EAAE,mBAAmB,CAAC,KAAK,EAAE,EAAE,wBAAwB,CAAC,EACvF,WAAW,CAAC,IAAI,CAAC,UAAU,EAAE,SAAS,CAAC,KAAK,EAAE,EAAE,sBAAsB,CAAC,EACvE,WAAW,CACT,IAAI,CAAC,gBAAgB,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,IAAI,eAAe,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,EAC3E,eAAe,CAAC,KAAK,EAAE,EACvB,4CAA4C,CAC7C,CACF,CAAC;IACJ,CAAC;CACF"}
|
|
@@ -1,2 +1 @@
|
|
|
1
|
-
export {};
|
|
2
|
-
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2lkZV9lZmZlY3RfdHJhY2VfaW50ZXJmYWNlLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3B1YmxpYy9zaWRlX2VmZmVjdF90cmFjZV9pbnRlcmZhY2UudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IiJ9
|
|
1
|
+
export { };
|
|
@@ -3,25 +3,24 @@ import { strict as assert } from 'assert';
|
|
|
3
3
|
/**
|
|
4
4
|
* A class manage a de-duplicated set of class IDs that errors if you try to add a duplicate.
|
|
5
5
|
* Useful for bytecode retrieval hints to avoid duplicates in parent trace & grandparent trace....
|
|
6
|
-
*/
|
|
7
|
-
|
|
8
|
-
|
|
6
|
+
*/ export class UniqueClassIds {
|
|
7
|
+
parent;
|
|
8
|
+
classIds;
|
|
9
|
+
constructor(parent){
|
|
9
10
|
this.parent = parent;
|
|
10
11
|
this.classIds = new Set();
|
|
11
12
|
}
|
|
12
13
|
/**
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
fork() {
|
|
14
|
+
* Create a fork that references this one as its parent
|
|
15
|
+
*/ fork() {
|
|
16
16
|
return new UniqueClassIds(/*parent=*/ this);
|
|
17
17
|
}
|
|
18
18
|
/**
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
has(classId) {
|
|
19
|
+
* Check for a class ID here or in parent's (recursively).
|
|
20
|
+
*
|
|
21
|
+
* @param classId - the contract class ID (as a string) to check
|
|
22
|
+
* @returns boolean: whether the class ID is here
|
|
23
|
+
*/ has(classId) {
|
|
25
24
|
// First try check this' classIds
|
|
26
25
|
let here = this.classIds.has(classId);
|
|
27
26
|
// Then try parent's
|
|
@@ -32,17 +31,15 @@ export class UniqueClassIds {
|
|
|
32
31
|
return here;
|
|
33
32
|
}
|
|
34
33
|
/**
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
size() {
|
|
34
|
+
* Get the total number of classIds
|
|
35
|
+
*/ size() {
|
|
38
36
|
return this.classIds.size + (this.parent ? this.parent.size() : 0);
|
|
39
37
|
}
|
|
40
38
|
/**
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
add(classId) {
|
|
39
|
+
* Add a class ID (if not already present) to the set.
|
|
40
|
+
*
|
|
41
|
+
* @param classId - the contract class ID (as a string)
|
|
42
|
+
*/ add(classId) {
|
|
46
43
|
assert(!this.has(classId), `Bug! Tried to add duplicate classId ${classId} to set of unique classIds.`);
|
|
47
44
|
if (!this.has(classId)) {
|
|
48
45
|
this.classIds.add(classId);
|
|
@@ -50,12 +47,11 @@ export class UniqueClassIds {
|
|
|
50
47
|
}
|
|
51
48
|
}
|
|
52
49
|
/**
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
for (const classId of incoming.classIds.keys()) {
|
|
50
|
+
* Merge in another set of unique class IDs into this one, but fail on duplicates.
|
|
51
|
+
*
|
|
52
|
+
* @param incoming: other unique class IDs
|
|
53
|
+
*/ acceptAndMerge(incoming) {
|
|
54
|
+
for (const classId of incoming.classIds.keys()){
|
|
59
55
|
assert(!this.has(classId), `Bug! Cannot merge classId ${classId} into set of unique classIds as it already exists.`);
|
|
60
56
|
this.classIds.add(classId);
|
|
61
57
|
}
|
|
@@ -63,4 +59,3 @@ export class UniqueClassIds {
|
|
|
63
59
|
assert(this.size() <= MAX_PUBLIC_CALLS_TO_UNIQUE_CONTRACT_CLASS_IDS, `Bug! Merging unique class Ids should never exceed the limit of ${MAX_PUBLIC_CALLS_TO_UNIQUE_CONTRACT_CLASS_IDS}.`);
|
|
64
60
|
}
|
|
65
61
|
}
|
|
66
|
-
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidW5pcXVlX2NsYXNzX2lkcy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9wdWJsaWMvdW5pcXVlX2NsYXNzX2lkcy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsNkNBQTZDLEVBQUUsTUFBTSxvQkFBb0IsQ0FBQztBQUVuRixPQUFPLEVBQUUsTUFBTSxJQUFJLE1BQU0sRUFBRSxNQUFNLFFBQVEsQ0FBQztBQUUxQzs7O0dBR0c7QUFDSCxNQUFNLE9BQU8sY0FBYztJQUd6QixZQUE2QixNQUF1QjtRQUF2QixXQUFNLEdBQU4sTUFBTSxDQUFpQjtRQUZuQyxhQUFRLEdBQWdCLElBQUksR0FBRyxFQUFFLENBQUM7SUFFSSxDQUFDO0lBRXhEOztPQUVHO0lBQ0ksSUFBSTtRQUNULE9BQU8sSUFBSSxjQUFjLENBQUMsV0FBVyxDQUFDLElBQUksQ0FBQyxDQUFDO0lBQzlDLENBQUM7SUFFRDs7Ozs7T0FLRztJQUNJLEdBQUcsQ0FBQyxPQUFlO1FBQ3hCLGlDQUFpQztRQUNqQyxJQUFJLElBQUksR0FBRyxJQUFJLENBQUMsUUFBUSxDQUFDLEdBQUcsQ0FBQyxPQUFPLENBQUMsQ0FBQztRQUN0QyxvQkFBb0I7UUFDcEIsSUFBSSxDQUFDLElBQUksSUFBSSxJQUFJLENBQUMsTUFBTSxFQUFFLENBQUM7WUFDekIsMkVBQTJFO1lBQzNFLElBQUksR0FBRyxJQUFJLENBQUMsTUFBTSxDQUFDLEdBQUcsQ0FBQyxPQUFPLENBQUMsQ0FBQztRQUNsQyxDQUFDO1FBQ0QsT0FBTyxJQUFJLENBQUM7SUFDZCxDQUFDO0lBRUQ7O09BRUc7SUFDSSxJQUFJO1FBQ1QsT0FBTyxJQUFJLENBQUMsUUFBUSxDQUFDLElBQUksR0FBRyxDQUFDLElBQUksQ0FBQyxNQUFNLENBQUMsQ0FBQyxDQUFDLElBQUksQ0FBQyxNQUFNLENBQUMsSUFBSSxFQUFFLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDO0lBQ3JFLENBQUM7SUFFRDs7OztPQUlHO0lBQ0ksR0FBRyxDQUFDLE9BQWU7UUFDeEIsTUFBTSxDQUFDLENBQUMsSUFBSSxDQUFDLEdBQUcsQ0FBQyxPQUFPLENBQUMsRUFBRSx1Q0FBdUMsT0FBTyw2QkFBNkIsQ0FBQyxDQUFDO1FBQ3hHLElBQUksQ0FBQyxJQUFJLENBQUMsR0FBRyxDQUFDLE9BQU8sQ0FBQyxFQUFFLENBQUM7WUFDdkIsSUFBSSxDQUFDLFFBQVEsQ0FBQyxHQUFHLENBQUMsT0FBTyxDQUFDLENBQUM7WUFDM0IsTUFBTSxDQUNKLElBQUksQ0FBQyxJQUFJLEVBQUUsSUFBSSw2Q0FBNkMsRUFDNUQseUJBQXlCLDZDQUE2Qyw4REFBOEQsQ0FDckksQ0FBQztRQUNKLENBQUM7SUFDSCxDQUFDO0lBRUQ7Ozs7T0FJRztJQUNJLGNBQWMsQ0FBQyxRQUF3QjtRQUM1QyxLQUFLLE1BQU0sT0FBTyxJQUFJLFFBQVEsQ0FBQyxRQUFRLENBQUMsSUFBSSxFQUFFLEVBQUUsQ0FBQztZQUMvQyxNQUFNLENBQ0osQ0FBQyxJQUFJLENBQUMsR0FBRyxDQUFDLE9BQU8sQ0FBQyxFQUNsQiw2QkFBNkIsT0FBTyxvREFBb0QsQ0FDekYsQ0FBQztZQUNGLElBQUksQ0FBQyxRQUFRLENBQUMsR0FBRyxDQUFDLE9BQU8sQ0FBQyxDQUFDO1FBQzdCLENBQUM7UUFDRCwyRkFBMkY7UUFDM0YsTUFBTSxDQUNKLElBQUksQ0FBQyxJQUFJLEVBQUUsSUFBSSw2Q0FBNkMsRUFDNUQsa0VBQWtFLDZDQUE2QyxHQUFHLENBQ25ILENBQUM7SUFDSixDQUFDO0NBQ0YifQ==
|
package/dest/public/utils.js
CHANGED
|
@@ -1,30 +1,35 @@
|
|
|
1
1
|
import { TxExecutionPhase } from '@aztec/circuit-types';
|
|
2
2
|
export function getExecutionRequestsByPhase(tx, phase) {
|
|
3
|
-
switch
|
|
3
|
+
switch(phase){
|
|
4
4
|
case TxExecutionPhase.SETUP:
|
|
5
5
|
return tx.getNonRevertiblePublicExecutionRequests();
|
|
6
6
|
case TxExecutionPhase.APP_LOGIC:
|
|
7
7
|
return tx.getRevertiblePublicExecutionRequests();
|
|
8
|
-
case TxExecutionPhase.TEARDOWN:
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
8
|
+
case TxExecutionPhase.TEARDOWN:
|
|
9
|
+
{
|
|
10
|
+
const request = tx.getPublicTeardownExecutionRequest();
|
|
11
|
+
return request ? [
|
|
12
|
+
request
|
|
13
|
+
] : [];
|
|
14
|
+
}
|
|
12
15
|
default:
|
|
13
16
|
throw new Error(`Unknown phase: ${phase}`);
|
|
14
17
|
}
|
|
15
18
|
}
|
|
16
19
|
export function getCallRequestsByPhase(tx, phase) {
|
|
17
|
-
switch
|
|
20
|
+
switch(phase){
|
|
18
21
|
case TxExecutionPhase.SETUP:
|
|
19
22
|
return tx.data.getNonRevertiblePublicCallRequests();
|
|
20
23
|
case TxExecutionPhase.APP_LOGIC:
|
|
21
24
|
return tx.data.getRevertiblePublicCallRequests();
|
|
22
|
-
case TxExecutionPhase.TEARDOWN:
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
25
|
+
case TxExecutionPhase.TEARDOWN:
|
|
26
|
+
{
|
|
27
|
+
const request = tx.data.getTeardownPublicCallRequest();
|
|
28
|
+
return request ? [
|
|
29
|
+
request
|
|
30
|
+
] : [];
|
|
31
|
+
}
|
|
26
32
|
default:
|
|
27
33
|
throw new Error(`Unknown phase: ${phase}`);
|
|
28
34
|
}
|
|
29
35
|
}
|
|
30
|
-
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidXRpbHMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvcHVibGljL3V0aWxzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBd0MsZ0JBQWdCLEVBQUUsTUFBTSxzQkFBc0IsQ0FBQztBQUc5RixNQUFNLFVBQVUsMkJBQTJCLENBQUMsRUFBTSxFQUFFLEtBQXVCO0lBQ3pFLFFBQVEsS0FBSyxFQUFFLENBQUM7UUFDZCxLQUFLLGdCQUFnQixDQUFDLEtBQUs7WUFDekIsT0FBTyxFQUFFLENBQUMsdUNBQXVDLEVBQUUsQ0FBQztRQUN0RCxLQUFLLGdCQUFnQixDQUFDLFNBQVM7WUFDN0IsT0FBTyxFQUFFLENBQUMsb0NBQW9DLEVBQUUsQ0FBQztRQUNuRCxLQUFLLGdCQUFnQixDQUFDLFFBQVEsQ0FBQyxDQUFDLENBQUM7WUFDL0IsTUFBTSxPQUFPLEdBQUcsRUFBRSxDQUFDLGlDQUFpQyxFQUFFLENBQUM7WUFDdkQsT0FBTyxPQUFPLENBQUMsQ0FBQyxDQUFDLENBQUMsT0FBTyxDQUFDLENBQUMsQ0FBQyxDQUFDLEVBQUUsQ0FBQztRQUNsQyxDQUFDO1FBQ0Q7WUFDRSxNQUFNLElBQUksS0FBSyxDQUFDLGtCQUFrQixLQUFLLEVBQUUsQ0FBQyxDQUFDO0lBQy9DLENBQUM7QUFDSCxDQUFDO0FBRUQsTUFBTSxVQUFVLHNCQUFzQixDQUFDLEVBQU0sRUFBRSxLQUF1QjtJQUNwRSxRQUFRLEtBQUssRUFBRSxDQUFDO1FBQ2QsS0FBSyxnQkFBZ0IsQ0FBQyxLQUFLO1lBQ3pCLE9BQU8sRUFBRSxDQUFDLElBQUksQ0FBQyxrQ0FBa0MsRUFBRSxDQUFDO1FBQ3RELEtBQUssZ0JBQWdCLENBQUMsU0FBUztZQUM3QixPQUFPLEVBQUUsQ0FBQyxJQUFJLENBQUMsK0JBQStCLEVBQUUsQ0FBQztRQUNuRCxLQUFLLGdCQUFnQixDQUFDLFFBQVEsQ0FBQyxDQUFDLENBQUM7WUFDL0IsTUFBTSxPQUFPLEdBQUcsRUFBRSxDQUFDLElBQUksQ0FBQyw0QkFBNEIsRUFBRSxDQUFDO1lBQ3ZELE9BQU8sT0FBTyxDQUFDLENBQUMsQ0FBQyxDQUFDLE9BQU8sQ0FBQyxDQUFDLENBQUMsQ0FBQyxFQUFFLENBQUM7UUFDbEMsQ0FBQztRQUNEO1lBQ0UsTUFBTSxJQUFJLEtBQUssQ0FBQyxrQkFBa0IsS0FBSyxFQUFFLENBQUMsQ0FBQztJQUMvQyxDQUFDO0FBQ0gsQ0FBQyJ9
|
package/dest/server.js
CHANGED
|
@@ -3,4 +3,3 @@ export * from './common/index.js';
|
|
|
3
3
|
export * from './public/index.js';
|
|
4
4
|
export * from './providers/index.js';
|
|
5
5
|
export * from './stats/index.js';
|
|
6
|
-
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2VydmVyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vc3JjL3NlcnZlci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxjQUFjLGdCQUFnQixDQUFDO0FBQy9CLGNBQWMsbUJBQW1CLENBQUM7QUFDbEMsY0FBYyxtQkFBbUIsQ0FBQztBQUNsQyxjQUFjLHNCQUFzQixDQUFDO0FBQ3JDLGNBQWMsa0JBQWtCLENBQUMifQ==
|
package/dest/stats/index.js
CHANGED
package/dest/stats/stats.js
CHANGED
|
@@ -4,8 +4,7 @@ export function emitCircuitSimulationStats(circuitName, duration, inputSize, out
|
|
|
4
4
|
circuitName,
|
|
5
5
|
inputSize,
|
|
6
6
|
outputSize,
|
|
7
|
-
duration
|
|
7
|
+
duration
|
|
8
8
|
};
|
|
9
9
|
logger.debug('Circuit simulation stats', stats);
|
|
10
10
|
}
|
|
11
|
-
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic3RhdHMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvc3RhdHMvc3RhdHMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBR0EsTUFBTSxVQUFVLDBCQUEwQixDQUN4QyxXQUF3QixFQUN4QixRQUFnQixFQUNoQixTQUFpQixFQUNqQixVQUFrQixFQUNsQixNQUFjO0lBRWQsTUFBTSxLQUFLLEdBQTJCO1FBQ3BDLFNBQVMsRUFBRSxvQkFBb0I7UUFDL0IsV0FBVztRQUNYLFNBQVM7UUFDVCxVQUFVO1FBQ1YsUUFBUTtLQUNULENBQUM7SUFFRixNQUFNLENBQUMsS0FBSyxDQUFDLDBCQUEwQixFQUFFLEtBQUssQ0FBQyxDQUFDO0FBQ2xELENBQUMifQ==
|
package/dest/test/utils.js
CHANGED
|
@@ -9,12 +9,13 @@ import { sha256ToField } from '@aztec/foundation/crypto';
|
|
|
9
9
|
* @param targetContract - The contract to consume the message.
|
|
10
10
|
* @param secret - The secret to unlock the message.
|
|
11
11
|
* @returns The L1 to L2 message.
|
|
12
|
-
*/
|
|
13
|
-
export const buildL1ToL2Message = async (selector, contentPreimage, targetContract, secret, msgIndex) => {
|
|
12
|
+
*/ export const buildL1ToL2Message = async (selector, contentPreimage, targetContract, secret, msgIndex)=>{
|
|
14
13
|
// Write the selector into a buffer.
|
|
15
14
|
const selectorBuf = Buffer.from(selector, 'hex');
|
|
16
|
-
const content = sha256ToField([
|
|
15
|
+
const content = sha256ToField([
|
|
16
|
+
selectorBuf,
|
|
17
|
+
...contentPreimage
|
|
18
|
+
]);
|
|
17
19
|
const secretHash = await computeSecretHash(secret);
|
|
18
20
|
return new L1ToL2Message(new L1Actor(EthAddress.random(), 1), new L2Actor(targetContract, 1), content, secretHash, new Fr(msgIndex));
|
|
19
21
|
};
|
|
20
|
-
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidXRpbHMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvdGVzdC91dGlscy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsT0FBTyxFQUFFLGFBQWEsRUFBRSxPQUFPLEVBQUUsTUFBTSxzQkFBc0IsQ0FBQztBQUN2RSxPQUFPLEVBQXFCLFVBQVUsRUFBRSxFQUFFLEVBQUUsTUFBTSxvQkFBb0IsQ0FBQztBQUN2RSxPQUFPLEVBQUUsaUJBQWlCLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQztBQUM1RCxPQUFPLEVBQUUsYUFBYSxFQUFFLE1BQU0sMEJBQTBCLENBQUM7QUFFekQ7Ozs7Ozs7R0FPRztBQUNILE1BQU0sQ0FBQyxNQUFNLGtCQUFrQixHQUFHLEtBQUssRUFDckMsUUFBZ0IsRUFDaEIsZUFBcUIsRUFDckIsY0FBNEIsRUFDNUIsTUFBVSxFQUNWLFFBQXFCLEVBQ3JCLEVBQUU7SUFDRixvQ0FBb0M7SUFDcEMsTUFBTSxXQUFXLEdBQUcsTUFBTSxDQUFDLElBQUksQ0FBQyxRQUFRLEVBQUUsS0FBSyxDQUFDLENBQUM7SUFFakQsTUFBTSxPQUFPLEdBQUcsYUFBYSxDQUFDLENBQUMsV0FBVyxFQUFFLEdBQUcsZUFBZSxDQUFDLENBQUMsQ0FBQztJQUNqRSxNQUFNLFVBQVUsR0FBRyxNQUFNLGlCQUFpQixDQUFDLE1BQU0sQ0FBQyxDQUFDO0lBRW5ELE9BQU8sSUFBSSxhQUFhLENBQ3RCLElBQUksT0FBTyxDQUFDLFVBQVUsQ0FBQyxNQUFNLEVBQUUsRUFBRSxDQUFDLENBQUMsRUFDbkMsSUFBSSxPQUFPLENBQUMsY0FBYyxFQUFFLENBQUMsQ0FBQyxFQUM5QixPQUFPLEVBQ1AsVUFBVSxFQUNWLElBQUksRUFBRSxDQUFDLFFBQVEsQ0FBQyxDQUNqQixDQUFDO0FBQ0osQ0FBQyxDQUFDIn0=
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@aztec/simulator",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.75.0-commit.c03ba01a2a4122e43e90d5133ba017e54b90e9d2",
|
|
4
4
|
"type": "module",
|
|
5
5
|
"exports": {
|
|
6
6
|
"./common": "./dest/common.js",
|
|
@@ -21,7 +21,7 @@
|
|
|
21
21
|
"clean": "rm -rf ./dest .tsbuildinfo",
|
|
22
22
|
"formatting": "run -T prettier --check ./src && run -T eslint ./src",
|
|
23
23
|
"formatting:fix": "run -T eslint --fix ./src && run -T prettier -w ./src",
|
|
24
|
-
"test": "
|
|
24
|
+
"test": "NODE_NO_WARNINGS=1 node --experimental-vm-modules ../node_modules/.bin/jest --passWithNoTests --maxWorkers=${JEST_MAX_WORKERS:-8}"
|
|
25
25
|
},
|
|
26
26
|
"inherits": [
|
|
27
27
|
"../package.common.json"
|
|
@@ -60,19 +60,20 @@
|
|
|
60
60
|
]
|
|
61
61
|
},
|
|
62
62
|
"dependencies": {
|
|
63
|
-
"@aztec/circuit-types": "0.
|
|
64
|
-
"@aztec/circuits.js": "0.
|
|
65
|
-
"@aztec/foundation": "0.
|
|
66
|
-
"@aztec/noir-protocol-circuits-types": "0.
|
|
67
|
-
"@aztec/protocol-contracts": "0.
|
|
68
|
-
"@aztec/telemetry-client": "0.
|
|
69
|
-
"@aztec/types": "0.
|
|
70
|
-
"@aztec/world-state": "0.
|
|
63
|
+
"@aztec/circuit-types": "0.75.0-commit.c03ba01a2a4122e43e90d5133ba017e54b90e9d2",
|
|
64
|
+
"@aztec/circuits.js": "0.75.0-commit.c03ba01a2a4122e43e90d5133ba017e54b90e9d2",
|
|
65
|
+
"@aztec/foundation": "0.75.0-commit.c03ba01a2a4122e43e90d5133ba017e54b90e9d2",
|
|
66
|
+
"@aztec/noir-protocol-circuits-types": "0.75.0-commit.c03ba01a2a4122e43e90d5133ba017e54b90e9d2",
|
|
67
|
+
"@aztec/protocol-contracts": "0.75.0-commit.c03ba01a2a4122e43e90d5133ba017e54b90e9d2",
|
|
68
|
+
"@aztec/telemetry-client": "0.75.0-commit.c03ba01a2a4122e43e90d5133ba017e54b90e9d2",
|
|
69
|
+
"@aztec/types": "0.75.0-commit.c03ba01a2a4122e43e90d5133ba017e54b90e9d2",
|
|
70
|
+
"@aztec/world-state": "0.75.0-commit.c03ba01a2a4122e43e90d5133ba017e54b90e9d2",
|
|
71
71
|
"@noir-lang/acvm_js": "portal:../../noir/packages/acvm_js",
|
|
72
72
|
"@noir-lang/noirc_abi": "portal:../../noir/packages/noirc_abi",
|
|
73
73
|
"@noir-lang/types": "portal:../../noir/packages/types",
|
|
74
74
|
"levelup": "^5.1.1",
|
|
75
75
|
"lodash.clonedeep": "^4.5.0",
|
|
76
|
+
"lodash.merge": "^4.6.2",
|
|
76
77
|
"memdown": "^6.1.1",
|
|
77
78
|
"tslib": "^2.4.0"
|
|
78
79
|
},
|
|
@@ -89,7 +90,6 @@
|
|
|
89
90
|
"@types/node": "^18.7.23",
|
|
90
91
|
"jest": "^29.5.0",
|
|
91
92
|
"jest-mock-extended": "^3.0.4",
|
|
92
|
-
"lodash.merge": "^4.6.2",
|
|
93
93
|
"ts-node": "^10.9.1",
|
|
94
94
|
"typescript": "^5.0.4",
|
|
95
95
|
"viem": "2.22.8"
|