@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,98 +1,118 @@
|
|
|
1
|
-
import { Attributes, Metrics, ValueType
|
|
1
|
+
import { Attributes, Metrics, ValueType } from '@aztec/telemetry-client';
|
|
2
2
|
export class PublicProcessorMetrics {
|
|
3
|
-
|
|
3
|
+
tracer;
|
|
4
|
+
txDuration;
|
|
5
|
+
txCount;
|
|
6
|
+
txPhaseCount;
|
|
7
|
+
phaseDuration;
|
|
8
|
+
phaseCount;
|
|
9
|
+
bytecodeDeployed;
|
|
10
|
+
totalGas;
|
|
11
|
+
totalGasHistogram;
|
|
12
|
+
gasRate;
|
|
13
|
+
txGas;
|
|
14
|
+
treeInsertionDuration;
|
|
15
|
+
constructor(client, name = 'PublicProcessor'){
|
|
4
16
|
this.tracer = client.getTracer(name);
|
|
5
17
|
const meter = client.getMeter(name);
|
|
6
18
|
this.txDuration = meter.createHistogram(Metrics.PUBLIC_PROCESSOR_TX_DURATION, {
|
|
7
19
|
description: 'How long it takes to process a transaction',
|
|
8
20
|
unit: 'ms',
|
|
9
|
-
valueType: ValueType.INT
|
|
21
|
+
valueType: ValueType.INT
|
|
10
22
|
});
|
|
11
23
|
this.txCount = meter.createUpDownCounter(Metrics.PUBLIC_PROCESSOR_TX_COUNT, {
|
|
12
|
-
description: 'Number of transactions processed'
|
|
24
|
+
description: 'Number of transactions processed'
|
|
13
25
|
});
|
|
14
26
|
this.txPhaseCount = meter.createUpDownCounter(Metrics.PUBLIC_PROCESSOR_TX_PHASE_COUNT, {
|
|
15
|
-
description: 'Number of phases processed'
|
|
27
|
+
description: 'Number of phases processed'
|
|
16
28
|
});
|
|
17
29
|
this.phaseDuration = meter.createHistogram(Metrics.PUBLIC_PROCESSOR_PHASE_DURATION, {
|
|
18
30
|
description: 'How long it takes to process a phase',
|
|
19
31
|
unit: 'ms',
|
|
20
|
-
valueType: ValueType.INT
|
|
32
|
+
valueType: ValueType.INT
|
|
21
33
|
});
|
|
22
34
|
this.phaseCount = meter.createUpDownCounter(Metrics.PUBLIC_PROCESSOR_PHASE_COUNT, {
|
|
23
|
-
description: 'Number of failed phases'
|
|
35
|
+
description: 'Number of failed phases'
|
|
24
36
|
});
|
|
25
37
|
this.bytecodeDeployed = meter.createHistogram(Metrics.PUBLIC_PROCESSOR_DEPLOY_BYTECODE_SIZE, {
|
|
26
38
|
description: 'Size of deployed bytecode',
|
|
27
|
-
unit: 'By'
|
|
39
|
+
unit: 'By'
|
|
28
40
|
});
|
|
29
41
|
this.totalGas = meter.createGauge(Metrics.PUBLIC_PROCESSOR_TOTAL_GAS, {
|
|
30
42
|
description: 'Total gas used in block',
|
|
31
|
-
unit: 'gas'
|
|
43
|
+
unit: 'gas'
|
|
32
44
|
});
|
|
33
45
|
this.totalGasHistogram = meter.createHistogram(Metrics.PUBLIC_PROCESSOR_TOTAL_GAS_HISTOGRAM, {
|
|
34
46
|
description: 'Total gas used in block as histogram',
|
|
35
|
-
unit: 'gas/block'
|
|
47
|
+
unit: 'gas/block'
|
|
36
48
|
});
|
|
37
49
|
this.txGas = meter.createHistogram(Metrics.PUBLIC_PROCESSOR_TX_GAS, {
|
|
38
50
|
description: 'Gas used in transaction',
|
|
39
|
-
unit: 'gas/tx'
|
|
51
|
+
unit: 'gas/tx'
|
|
40
52
|
});
|
|
41
53
|
this.gasRate = meter.createHistogram(Metrics.PUBLIC_PROCESSOR_GAS_RATE, {
|
|
42
54
|
description: 'L2 gas per second for complete block',
|
|
43
|
-
unit: 'gas/s'
|
|
55
|
+
unit: 'gas/s'
|
|
44
56
|
});
|
|
45
57
|
this.treeInsertionDuration = meter.createHistogram(Metrics.PUBLIC_PROCESSOR_TREE_INSERTION, {
|
|
46
58
|
description: 'How long it takes for tree insertion',
|
|
47
59
|
unit: 'us',
|
|
48
|
-
valueType: ValueType.INT
|
|
60
|
+
valueType: ValueType.INT
|
|
49
61
|
});
|
|
50
62
|
}
|
|
51
63
|
recordPhaseDuration(phaseName, durationMs) {
|
|
52
|
-
this.phaseCount.add(1, {
|
|
53
|
-
|
|
64
|
+
this.phaseCount.add(1, {
|
|
65
|
+
[Attributes.TX_PHASE_NAME]: phaseName,
|
|
66
|
+
[Attributes.OK]: true
|
|
67
|
+
});
|
|
68
|
+
this.phaseDuration.record(Math.ceil(durationMs), {
|
|
69
|
+
[Attributes.TX_PHASE_NAME]: phaseName
|
|
70
|
+
});
|
|
54
71
|
}
|
|
55
72
|
recordTx(phaseCount, durationMs, gasUsed) {
|
|
56
73
|
this.txPhaseCount.add(phaseCount);
|
|
57
74
|
this.txDuration.record(Math.ceil(durationMs));
|
|
58
75
|
this.txCount.add(1, {
|
|
59
|
-
[Attributes.OK]: true
|
|
76
|
+
[Attributes.OK]: true
|
|
60
77
|
});
|
|
61
78
|
this.txGas.record(gasUsed.daGas, {
|
|
62
|
-
[Attributes.GAS_DIMENSION]: 'DA'
|
|
79
|
+
[Attributes.GAS_DIMENSION]: 'DA'
|
|
63
80
|
});
|
|
64
81
|
this.txGas.record(gasUsed.l2Gas, {
|
|
65
|
-
[Attributes.GAS_DIMENSION]: 'L2'
|
|
82
|
+
[Attributes.GAS_DIMENSION]: 'L2'
|
|
66
83
|
});
|
|
67
84
|
}
|
|
68
85
|
recordAllTxs(totalGas, gasRate) {
|
|
69
86
|
this.totalGas.record(totalGas.daGas, {
|
|
70
|
-
[Attributes.GAS_DIMENSION]: 'DA'
|
|
87
|
+
[Attributes.GAS_DIMENSION]: 'DA'
|
|
71
88
|
});
|
|
72
89
|
this.totalGas.record(totalGas.l2Gas, {
|
|
73
|
-
[Attributes.GAS_DIMENSION]: 'L2'
|
|
90
|
+
[Attributes.GAS_DIMENSION]: 'L2'
|
|
74
91
|
});
|
|
75
92
|
this.gasRate.record(gasRate, {
|
|
76
|
-
[Attributes.GAS_DIMENSION]: 'L2'
|
|
93
|
+
[Attributes.GAS_DIMENSION]: 'L2'
|
|
77
94
|
});
|
|
78
95
|
this.totalGasHistogram.record(totalGas.daGas, {
|
|
79
|
-
[Attributes.GAS_DIMENSION]: 'DA'
|
|
96
|
+
[Attributes.GAS_DIMENSION]: 'DA'
|
|
80
97
|
});
|
|
81
98
|
this.totalGasHistogram.record(totalGas.l2Gas, {
|
|
82
|
-
[Attributes.GAS_DIMENSION]: 'L2'
|
|
99
|
+
[Attributes.GAS_DIMENSION]: 'L2'
|
|
83
100
|
});
|
|
84
101
|
}
|
|
85
102
|
recordFailedTx() {
|
|
86
103
|
this.txCount.add(1, {
|
|
87
|
-
[Attributes.OK]: false
|
|
104
|
+
[Attributes.OK]: false
|
|
88
105
|
});
|
|
89
106
|
}
|
|
90
107
|
recordRevertedPhase(phaseName) {
|
|
91
|
-
this.phaseCount.add(1, {
|
|
108
|
+
this.phaseCount.add(1, {
|
|
109
|
+
[Attributes.TX_PHASE_NAME]: phaseName,
|
|
110
|
+
[Attributes.OK]: false
|
|
111
|
+
});
|
|
92
112
|
}
|
|
93
113
|
recordClassRegistration(...events) {
|
|
94
114
|
let totalBytecode = 0;
|
|
95
|
-
for (const event of events)
|
|
115
|
+
for (const event of events){
|
|
96
116
|
totalBytecode += event.packedPublicBytecode.length;
|
|
97
117
|
}
|
|
98
118
|
if (totalBytecode > 0) {
|
|
@@ -103,4 +123,3 @@ export class PublicProcessorMetrics {
|
|
|
103
123
|
this.treeInsertionDuration.record(Math.ceil(durationUs));
|
|
104
124
|
}
|
|
105
125
|
}
|
|
106
|
-
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicHVibGljX3Byb2Nlc3Nvcl9tZXRyaWNzLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3B1YmxpYy9wdWJsaWNfcHJvY2Vzc29yX21ldHJpY3MudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBR0EsT0FBTyxFQUNMLFVBQVUsRUFHVixPQUFPLEVBSVAsU0FBUyxHQUNWLE1BQU0seUJBQXlCLENBQUM7QUFFakMsTUFBTSxPQUFPLHNCQUFzQjtJQWtCakMsWUFBWSxNQUF1QixFQUFFLElBQUksR0FBRyxpQkFBaUI7UUFDM0QsSUFBSSxDQUFDLE1BQU0sR0FBRyxNQUFNLENBQUMsU0FBUyxDQUFDLElBQUksQ0FBQyxDQUFDO1FBQ3JDLE1BQU0sS0FBSyxHQUFHLE1BQU0sQ0FBQyxRQUFRLENBQUMsSUFBSSxDQUFDLENBQUM7UUFFcEMsSUFBSSxDQUFDLFVBQVUsR0FBRyxLQUFLLENBQUMsZUFBZSxDQUFDLE9BQU8sQ0FBQyw0QkFBNEIsRUFBRTtZQUM1RSxXQUFXLEVBQUUsNENBQTRDO1lBQ3pELElBQUksRUFBRSxJQUFJO1lBQ1YsU0FBUyxFQUFFLFNBQVMsQ0FBQyxHQUFHO1NBQ3pCLENBQUMsQ0FBQztRQUVILElBQUksQ0FBQyxPQUFPLEdBQUcsS0FBSyxDQUFDLG1CQUFtQixDQUFDLE9BQU8sQ0FBQyx5QkFBeUIsRUFBRTtZQUMxRSxXQUFXLEVBQUUsa0NBQWtDO1NBQ2hELENBQUMsQ0FBQztRQUVILElBQUksQ0FBQyxZQUFZLEdBQUcsS0FBSyxDQUFDLG1CQUFtQixDQUFDLE9BQU8sQ0FBQywrQkFBK0IsRUFBRTtZQUNyRixXQUFXLEVBQUUsNEJBQTRCO1NBQzFDLENBQUMsQ0FBQztRQUVILElBQUksQ0FBQyxhQUFhLEdBQUcsS0FBSyxDQUFDLGVBQWUsQ0FBQyxPQUFPLENBQUMsK0JBQStCLEVBQUU7WUFDbEYsV0FBVyxFQUFFLHNDQUFzQztZQUNuRCxJQUFJLEVBQUUsSUFBSTtZQUNWLFNBQVMsRUFBRSxTQUFTLENBQUMs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
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import { MerkleTreeId, ProvingRequestType, TxExecutionPhase
|
|
2
|
-
import { AvmCircuitInputs, Fr, Gas, MAX_L2_GAS_PER_TX_PUBLIC_PORTION, MAX_L2_TO_L1_MSGS_PER_TX, MAX_NOTE_HASHES_PER_TX, MAX_NULLIFIERS_PER_TX, MAX_TOTAL_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX, PrivateToAvmAccumulatedData, PrivateToAvmAccumulatedDataArrayLengths, PublicCallRequest, PublicDataWrite, RevertCode, TreeSnapshots, computeTransactionFee, countAccumulatedItems, mergeAccumulatedData
|
|
1
|
+
import { MerkleTreeId, ProvingRequestType, TxExecutionPhase } from '@aztec/circuit-types';
|
|
2
|
+
import { AvmCircuitInputs, Fr, Gas, MAX_L2_GAS_PER_TX_PUBLIC_PORTION, MAX_L2_TO_L1_MSGS_PER_TX, MAX_NOTE_HASHES_PER_TX, MAX_NULLIFIERS_PER_TX, MAX_TOTAL_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX, PrivateToAvmAccumulatedData, PrivateToAvmAccumulatedDataArrayLengths, PublicCallRequest, PublicDataWrite, RevertCode, TreeSnapshots, computeTransactionFee, countAccumulatedItems, mergeAccumulatedData } from '@aztec/circuits.js';
|
|
3
3
|
import { padArrayEnd } from '@aztec/foundation/collection';
|
|
4
4
|
import { createLogger } from '@aztec/foundation/log';
|
|
5
5
|
import { assertLength } from '@aztec/foundation/serialize';
|
|
@@ -10,9 +10,32 @@ import { SideEffectArrayLengths, SideEffectTrace } from './side_effect_trace.js'
|
|
|
10
10
|
import { getCallRequestsByPhase, getExecutionRequestsByPhase } from './utils.js';
|
|
11
11
|
/**
|
|
12
12
|
* The transaction-level context for public execution.
|
|
13
|
-
*/
|
|
14
|
-
|
|
15
|
-
|
|
13
|
+
*/ export class PublicTxContext {
|
|
14
|
+
txHash;
|
|
15
|
+
state;
|
|
16
|
+
globalVariables;
|
|
17
|
+
startStateReference;
|
|
18
|
+
gasSettings;
|
|
19
|
+
gasUsedByPrivate;
|
|
20
|
+
gasAllocatedToPublic;
|
|
21
|
+
setupCallRequests;
|
|
22
|
+
appLogicCallRequests;
|
|
23
|
+
teardownCallRequests;
|
|
24
|
+
setupExecutionRequests;
|
|
25
|
+
appLogicExecutionRequests;
|
|
26
|
+
teardownExecutionRequests;
|
|
27
|
+
nonRevertibleAccumulatedDataFromPrivate;
|
|
28
|
+
revertibleAccumulatedDataFromPrivate;
|
|
29
|
+
feePayer;
|
|
30
|
+
trace;
|
|
31
|
+
log;
|
|
32
|
+
/* Gas used including private, teardown gas _limit_, setup and app logic */ gasUsedByPublic;
|
|
33
|
+
/* Gas actually used during teardown (different from limit) */ teardownGasUsed;
|
|
34
|
+
/* Entire transaction execution is done. */ halted;
|
|
35
|
+
/* Where did reverts happen (if at all)? */ revertCode;
|
|
36
|
+
/* What caused a revert (if one occurred)? */ revertReason;
|
|
37
|
+
avmProvingRequest;
|
|
38
|
+
constructor(txHash, state, globalVariables, startStateReference, gasSettings, gasUsedByPrivate, gasAllocatedToPublic, setupCallRequests, appLogicCallRequests, teardownCallRequests, setupExecutionRequests, appLogicExecutionRequests, teardownExecutionRequests, nonRevertibleAccumulatedDataFromPrivate, revertibleAccumulatedDataFromPrivate, feePayer, trace){
|
|
16
39
|
this.txHash = txHash;
|
|
17
40
|
this.state = state;
|
|
18
41
|
this.globalVariables = globalVariables;
|
|
@@ -30,24 +53,15 @@ export class PublicTxContext {
|
|
|
30
53
|
this.revertibleAccumulatedDataFromPrivate = revertibleAccumulatedDataFromPrivate;
|
|
31
54
|
this.feePayer = feePayer;
|
|
32
55
|
this.trace = trace;
|
|
33
|
-
/* Gas used including private, teardown gas _limit_, setup and app logic */
|
|
34
56
|
this.gasUsedByPublic = Gas.empty();
|
|
35
|
-
/* Gas actually used during teardown (different from limit) */
|
|
36
57
|
this.teardownGasUsed = Gas.empty();
|
|
37
|
-
/* Entire transaction execution is done. */
|
|
38
58
|
this.halted = false;
|
|
39
|
-
/* Where did reverts happen (if at all)? */
|
|
40
59
|
this.revertCode = RevertCode.OK;
|
|
41
60
|
this.log = createLogger(`simulator:public_tx_context`);
|
|
42
61
|
}
|
|
43
62
|
static async create(db, worldStateDB, tx, globalVariables, doMerkleOperations) {
|
|
44
63
|
const nonRevertibleAccumulatedDataFromPrivate = tx.data.forPublic.nonRevertibleAccumulatedData;
|
|
45
|
-
const previousAccumulatedDataArrayLengths = new SideEffectArrayLengths(
|
|
46
|
-
/*publicDataWrites*/ 0,
|
|
47
|
-
/*protocolPublicDataWrites*/ 0,
|
|
48
|
-
/*noteHashes*/ 0,
|
|
49
|
-
/*nullifiers=*/ 0, countAccumulatedItems(nonRevertibleAccumulatedDataFromPrivate.l2ToL1Msgs),
|
|
50
|
-
/*publicLogs*/ 0);
|
|
64
|
+
const previousAccumulatedDataArrayLengths = new SideEffectArrayLengths(/*publicDataWrites*/ 0, /*protocolPublicDataWrites*/ 0, /*noteHashes*/ 0, /*nullifiers=*/ 0, countAccumulatedItems(nonRevertibleAccumulatedDataFromPrivate.l2ToL1Msgs), /*publicLogs*/ 0);
|
|
51
65
|
const trace = new SideEffectTrace(/*startSideEffectCounter=*/ 0, previousAccumulatedDataArrayLengths);
|
|
52
66
|
const firstNullifier = nonRevertibleAccumulatedDataFromPrivate.nullifiers[0];
|
|
53
67
|
// Transaction level state manager that will be forked for revertible phases.
|
|
@@ -59,22 +73,20 @@ export class PublicTxContext {
|
|
|
59
73
|
return new PublicTxContext(await tx.getTxHash(), new PhaseStateManager(txStateManager), globalVariables, await db.getStateReference(), gasSettings, gasUsedByPrivate, gasAllocatedToPublic, getCallRequestsByPhase(tx, TxExecutionPhase.SETUP), getCallRequestsByPhase(tx, TxExecutionPhase.APP_LOGIC), getCallRequestsByPhase(tx, TxExecutionPhase.TEARDOWN), getExecutionRequestsByPhase(tx, TxExecutionPhase.SETUP), getExecutionRequestsByPhase(tx, TxExecutionPhase.APP_LOGIC), getExecutionRequestsByPhase(tx, TxExecutionPhase.TEARDOWN), tx.data.forPublic.nonRevertibleAccumulatedData, tx.data.forPublic.revertibleAccumulatedData, tx.data.feePayer, trace);
|
|
60
74
|
}
|
|
61
75
|
/**
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
halt() {
|
|
76
|
+
* Signal that the entire transaction execution is done.
|
|
77
|
+
* All phases have been processed.
|
|
78
|
+
* Actual transaction fee and actual total consumed gas can now be queried.
|
|
79
|
+
*/ halt() {
|
|
67
80
|
if (this.state.isForked()) {
|
|
68
81
|
this.state.mergeForkedState();
|
|
69
82
|
}
|
|
70
83
|
this.halted = true;
|
|
71
84
|
}
|
|
72
85
|
/**
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
revert(phase, revertReason = undefined, culprit = '') {
|
|
86
|
+
* Revert execution a phase. Populate revertReason & revertCode.
|
|
87
|
+
* If in setup, throw an error (transaction will be thrown out).
|
|
88
|
+
* NOTE: this does not "halt" the entire transaction execution.
|
|
89
|
+
*/ revert(phase, revertReason = undefined, culprit = '') {
|
|
78
90
|
this.log.debug(`${TxExecutionPhase[phase]} phase reverted! ${culprit} failed with reason: ${revertReason}`);
|
|
79
91
|
if (revertReason && !this.revertReason) {
|
|
80
92
|
// don't override revertReason
|
|
@@ -85,51 +97,42 @@ export class PublicTxContext {
|
|
|
85
97
|
this.log.debug(`Setup phase reverted! The transaction will be thrown out.`);
|
|
86
98
|
if (revertReason) {
|
|
87
99
|
throw revertReason;
|
|
88
|
-
}
|
|
89
|
-
else {
|
|
100
|
+
} else {
|
|
90
101
|
throw new Error(`Setup phase reverted! The transaction will be thrown out. ${culprit} failed`);
|
|
91
102
|
}
|
|
92
|
-
}
|
|
93
|
-
else if (phase === TxExecutionPhase.APP_LOGIC) {
|
|
103
|
+
} else if (phase === TxExecutionPhase.APP_LOGIC) {
|
|
94
104
|
this.revertCode = RevertCode.APP_LOGIC_REVERTED;
|
|
95
|
-
}
|
|
96
|
-
else if (phase === TxExecutionPhase.TEARDOWN) {
|
|
105
|
+
} else if (phase === TxExecutionPhase.TEARDOWN) {
|
|
97
106
|
if (this.revertCode.equals(RevertCode.APP_LOGIC_REVERTED)) {
|
|
98
107
|
this.revertCode = RevertCode.BOTH_REVERTED;
|
|
99
|
-
}
|
|
100
|
-
else {
|
|
108
|
+
} else {
|
|
101
109
|
this.revertCode = RevertCode.TEARDOWN_REVERTED;
|
|
102
110
|
}
|
|
103
111
|
}
|
|
104
112
|
}
|
|
105
113
|
/**
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
getFinalRevertCode() {
|
|
114
|
+
* Get the revert code.
|
|
115
|
+
* @returns The revert code.
|
|
116
|
+
*/ getFinalRevertCode() {
|
|
110
117
|
assert(this.halted, 'Cannot know the final revert code until tx execution ends');
|
|
111
118
|
return this.revertCode;
|
|
112
119
|
}
|
|
113
120
|
/**
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
hasPhase(phase) {
|
|
121
|
+
* Are there any call requests for the speciiied phase?
|
|
122
|
+
*/ hasPhase(phase) {
|
|
117
123
|
if (phase === TxExecutionPhase.SETUP) {
|
|
118
124
|
return this.setupCallRequests.length > 0;
|
|
119
|
-
}
|
|
120
|
-
else if (phase === TxExecutionPhase.APP_LOGIC) {
|
|
125
|
+
} else if (phase === TxExecutionPhase.APP_LOGIC) {
|
|
121
126
|
return this.appLogicCallRequests.length > 0;
|
|
122
|
-
}
|
|
123
|
-
else {
|
|
127
|
+
} else {
|
|
124
128
|
// phase === TxExecutionPhase.TEARDOWN
|
|
125
129
|
return this.teardownCallRequests.length > 0;
|
|
126
130
|
}
|
|
127
131
|
}
|
|
128
132
|
/**
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
switch (phase) {
|
|
133
|
+
* Get the call requests for the specified phase (including args hashes).
|
|
134
|
+
*/ getCallRequestsForPhase(phase) {
|
|
135
|
+
switch(phase){
|
|
133
136
|
case TxExecutionPhase.SETUP:
|
|
134
137
|
return this.setupCallRequests;
|
|
135
138
|
case TxExecutionPhase.APP_LOGIC:
|
|
@@ -139,10 +142,9 @@ export class PublicTxContext {
|
|
|
139
142
|
}
|
|
140
143
|
}
|
|
141
144
|
/**
|
|
142
|
-
|
|
143
|
-
|
|
144
|
-
|
|
145
|
-
switch (phase) {
|
|
145
|
+
* Get the call requests for the specified phase (including actual args).
|
|
146
|
+
*/ getExecutionRequestsForPhase(phase) {
|
|
147
|
+
switch(phase){
|
|
146
148
|
case TxExecutionPhase.SETUP:
|
|
147
149
|
return this.setupExecutionRequests;
|
|
148
150
|
case TxExecutionPhase.APP_LOGIC:
|
|
@@ -152,85 +154,74 @@ export class PublicTxContext {
|
|
|
152
154
|
}
|
|
153
155
|
}
|
|
154
156
|
/**
|
|
155
|
-
|
|
156
|
-
|
|
157
|
-
getGasLeftAtPhase(phase) {
|
|
157
|
+
* How much gas is left as of the specified phase?
|
|
158
|
+
*/ getGasLeftAtPhase(phase) {
|
|
158
159
|
if (phase === TxExecutionPhase.TEARDOWN) {
|
|
159
160
|
return applyMaxToAvailableGas(this.gasSettings.teardownGasLimits);
|
|
160
|
-
}
|
|
161
|
-
else {
|
|
161
|
+
} else {
|
|
162
162
|
const gasLeftForPublic = this.gasAllocatedToPublic.sub(this.gasUsedByPublic);
|
|
163
163
|
return gasLeftForPublic;
|
|
164
164
|
}
|
|
165
165
|
}
|
|
166
166
|
/**
|
|
167
|
-
|
|
168
|
-
|
|
169
|
-
consumeGas(phase, gas) {
|
|
167
|
+
* Consume gas. Track gas for teardown phase separately.
|
|
168
|
+
*/ consumeGas(phase, gas) {
|
|
170
169
|
if (phase === TxExecutionPhase.TEARDOWN) {
|
|
171
170
|
this.teardownGasUsed = this.teardownGasUsed.add(gas);
|
|
172
|
-
}
|
|
173
|
-
else {
|
|
171
|
+
} else {
|
|
174
172
|
this.gasUsedByPublic = this.gasUsedByPublic.add(gas);
|
|
175
173
|
}
|
|
176
174
|
}
|
|
177
175
|
/**
|
|
178
|
-
|
|
179
|
-
|
|
180
|
-
|
|
181
|
-
getTotalGasUsed() {
|
|
176
|
+
* The gasUsed by public and private,
|
|
177
|
+
* as if the entire teardown gas limit was consumed.
|
|
178
|
+
*/ getTotalGasUsed() {
|
|
182
179
|
return this.gasUsedByPrivate.add(this.gasUsedByPublic);
|
|
183
180
|
}
|
|
184
181
|
/**
|
|
185
|
-
|
|
186
|
-
|
|
187
|
-
|
|
188
|
-
|
|
189
|
-
|
|
190
|
-
getActualGasUsed() {
|
|
182
|
+
* Compute the gas used using the actual gas used during teardown instead
|
|
183
|
+
* of the teardown gas limit.
|
|
184
|
+
* Note that this.gasUsed is initialized from private's gasUsed which includes
|
|
185
|
+
* teardown gas limit.
|
|
186
|
+
*/ getActualGasUsed() {
|
|
191
187
|
assert(this.halted, 'Can only compute actual gas used after tx execution ends');
|
|
192
188
|
const requireTeardown = this.teardownCallRequests.length > 0;
|
|
193
189
|
const teardownGasLimits = requireTeardown ? this.gasSettings.teardownGasLimits : Gas.empty();
|
|
194
190
|
return this.getTotalGasUsed().sub(teardownGasLimits).add(this.teardownGasUsed);
|
|
195
191
|
}
|
|
196
192
|
/**
|
|
197
|
-
|
|
198
|
-
|
|
199
|
-
|
|
200
|
-
getActualPublicGasUsed() {
|
|
193
|
+
* Compute the public gas used using the actual gas used during teardown instead
|
|
194
|
+
* of the teardown gas limit.
|
|
195
|
+
*/ getActualPublicGasUsed() {
|
|
201
196
|
assert(this.halted, 'Can only compute actual gas used after tx execution ends');
|
|
202
197
|
return this.gasUsedByPublic.add(this.teardownGasUsed);
|
|
203
198
|
}
|
|
204
199
|
/**
|
|
205
|
-
|
|
206
|
-
|
|
207
|
-
|
|
208
|
-
getTransactionFee(phase) {
|
|
200
|
+
* Get the transaction fee as is available to the specified phase.
|
|
201
|
+
* Only teardown should have access to the actual transaction fee.
|
|
202
|
+
*/ getTransactionFee(phase) {
|
|
209
203
|
if (phase === TxExecutionPhase.TEARDOWN) {
|
|
210
204
|
return this.getTransactionFeeUnsafe();
|
|
211
|
-
}
|
|
212
|
-
else {
|
|
205
|
+
} else {
|
|
213
206
|
return Fr.zero();
|
|
214
207
|
}
|
|
215
208
|
}
|
|
216
209
|
/**
|
|
217
|
-
|
|
218
|
-
|
|
219
|
-
|
|
220
|
-
getTransactionFeeUnsafe() {
|
|
210
|
+
* Compute the transaction fee.
|
|
211
|
+
* Should only be called during or after teardown.
|
|
212
|
+
*/ getTransactionFeeUnsafe() {
|
|
221
213
|
const gasUsed = this.getTotalGasUsed();
|
|
222
214
|
const txFee = computeTransactionFee(this.globalVariables.gasFees, this.gasSettings, gasUsed);
|
|
223
215
|
this.log.debug(`Computed tx fee`, {
|
|
224
216
|
txFee,
|
|
225
217
|
gasUsed: inspect(gasUsed),
|
|
226
|
-
gasFees: inspect(this.globalVariables.gasFees)
|
|
218
|
+
gasFees: inspect(this.globalVariables.gasFees)
|
|
227
219
|
});
|
|
228
220
|
return txFee;
|
|
229
221
|
}
|
|
230
222
|
/**
|
|
231
|
-
|
|
232
|
-
|
|
233
|
-
async generateAvmCircuitPublicInputs(endStateReference) {
|
|
223
|
+
* Generate the public inputs for the AVM circuit.
|
|
224
|
+
*/ async generateAvmCircuitPublicInputs(endStateReference) {
|
|
234
225
|
assert(this.halted, 'Can only get AvmCircuitPublicInputs after tx execution ends');
|
|
235
226
|
const ephemeralTrees = this.state.getActiveStateManager().merkleTrees;
|
|
236
227
|
const noteHashTree = await ephemeralTrees.getTreeSnapshot(MerkleTreeId.NOTE_HASH_TREE);
|
|
@@ -249,43 +240,33 @@ export class PublicTxContext {
|
|
|
249
240
|
nullifierTree.nextAvailableLeafIndex = paddedNullifierTreeSize;
|
|
250
241
|
const endTreeSnapshots = new TreeSnapshots(endStateReference.l1ToL2MessageTree, noteHashTree, nullifierTree, publicDataTree);
|
|
251
242
|
const startTreeSnapshots = new TreeSnapshots(this.startStateReference.l1ToL2MessageTree, this.startStateReference.partial.noteHashTree, this.startStateReference.partial.nullifierTree, this.startStateReference.partial.publicDataTree);
|
|
252
|
-
const avmCircuitPublicInputs = this.trace.toAvmCircuitPublicInputs(this.globalVariables, startTreeSnapshots,
|
|
253
|
-
|
|
254
|
-
|
|
255
|
-
? this.teardownCallRequests[0]
|
|
256
|
-
: PublicCallRequest.empty(), endTreeSnapshots,
|
|
257
|
-
/*endGasUsed=*/ this.getTotalGasUsed(),
|
|
258
|
-
/*transactionFee=*/ this.getTransactionFeeUnsafe(),
|
|
259
|
-
/*reverted=*/ !this.revertCode.isOK());
|
|
260
|
-
const getArrayLengths = (from) => new PrivateToAvmAccumulatedDataArrayLengths(countAccumulatedItems(from.noteHashes), countAccumulatedItems(from.nullifiers), countAccumulatedItems(from.l2ToL1Msgs));
|
|
261
|
-
const convertAccumulatedData = (from) => new PrivateToAvmAccumulatedData(from.noteHashes, from.nullifiers, from.l2ToL1Msgs);
|
|
243
|
+
const avmCircuitPublicInputs = this.trace.toAvmCircuitPublicInputs(this.globalVariables, startTreeSnapshots, /*startGasUsed=*/ this.gasUsedByPrivate, this.gasSettings, this.feePayer, this.setupCallRequests, this.appLogicCallRequests, /*teardownCallRequest=*/ this.teardownCallRequests.length ? this.teardownCallRequests[0] : PublicCallRequest.empty(), endTreeSnapshots, /*endGasUsed=*/ this.getTotalGasUsed(), /*transactionFee=*/ this.getTransactionFeeUnsafe(), /*reverted=*/ !this.revertCode.isOK());
|
|
244
|
+
const getArrayLengths = (from)=>new PrivateToAvmAccumulatedDataArrayLengths(countAccumulatedItems(from.noteHashes), countAccumulatedItems(from.nullifiers), countAccumulatedItems(from.l2ToL1Msgs));
|
|
245
|
+
const convertAccumulatedData = (from)=>new PrivateToAvmAccumulatedData(from.noteHashes, from.nullifiers, from.l2ToL1Msgs);
|
|
262
246
|
// Temporary overrides as these entries aren't yet populated in trace
|
|
263
247
|
avmCircuitPublicInputs.previousNonRevertibleAccumulatedDataArrayLengths = getArrayLengths(this.nonRevertibleAccumulatedDataFromPrivate);
|
|
264
248
|
avmCircuitPublicInputs.previousRevertibleAccumulatedDataArrayLengths = getArrayLengths(this.revertibleAccumulatedDataFromPrivate);
|
|
265
249
|
avmCircuitPublicInputs.previousNonRevertibleAccumulatedData = convertAccumulatedData(this.nonRevertibleAccumulatedDataFromPrivate);
|
|
266
250
|
avmCircuitPublicInputs.previousRevertibleAccumulatedData = convertAccumulatedData(this.revertibleAccumulatedDataFromPrivate);
|
|
267
|
-
const msgsFromPrivate = this.revertCode.isOK()
|
|
268
|
-
? mergeAccumulatedData(avmCircuitPublicInputs.previousNonRevertibleAccumulatedData.l2ToL1Msgs, avmCircuitPublicInputs.previousRevertibleAccumulatedData.l2ToL1Msgs)
|
|
269
|
-
: avmCircuitPublicInputs.previousNonRevertibleAccumulatedData.l2ToL1Msgs;
|
|
251
|
+
const msgsFromPrivate = this.revertCode.isOK() ? mergeAccumulatedData(avmCircuitPublicInputs.previousNonRevertibleAccumulatedData.l2ToL1Msgs, avmCircuitPublicInputs.previousRevertibleAccumulatedData.l2ToL1Msgs) : avmCircuitPublicInputs.previousNonRevertibleAccumulatedData.l2ToL1Msgs;
|
|
270
252
|
avmCircuitPublicInputs.accumulatedData.l2ToL1Msgs = assertLength(mergeAccumulatedData(msgsFromPrivate, avmCircuitPublicInputs.accumulatedData.l2ToL1Msgs), MAX_L2_TO_L1_MSGS_PER_TX);
|
|
271
253
|
// Maps slot to value. Maps in TS are iterable in insertion order, which is exactly what we want for
|
|
272
254
|
// squashing "to the left", where the first occurrence of a slot uses the value of the last write to it,
|
|
273
255
|
// and the rest occurrences are omitted
|
|
274
256
|
const squashedPublicDataWrites = new Map();
|
|
275
|
-
for (const publicDataWrite of avmCircuitPublicInputs.accumulatedData.publicDataWrites)
|
|
257
|
+
for (const publicDataWrite of avmCircuitPublicInputs.accumulatedData.publicDataWrites){
|
|
276
258
|
squashedPublicDataWrites.set(publicDataWrite.leafSlot.toBigInt(), publicDataWrite.value);
|
|
277
259
|
}
|
|
278
|
-
avmCircuitPublicInputs.accumulatedData.publicDataWrites = padArrayEnd(Array.from(squashedPublicDataWrites.entries()).map(([slot, value])
|
|
260
|
+
avmCircuitPublicInputs.accumulatedData.publicDataWrites = padArrayEnd(Array.from(squashedPublicDataWrites.entries()).map(([slot, value])=>new PublicDataWrite(new Fr(slot), value)), PublicDataWrite.empty(), MAX_TOTAL_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX);
|
|
279
261
|
return avmCircuitPublicInputs;
|
|
280
262
|
}
|
|
281
263
|
/**
|
|
282
|
-
|
|
283
|
-
|
|
284
|
-
async generateProvingRequest(endStateReference) {
|
|
264
|
+
* Generate the proving request for the AVM circuit.
|
|
265
|
+
*/ async generateProvingRequest(endStateReference) {
|
|
285
266
|
const hints = this.trace.getAvmCircuitHints();
|
|
286
267
|
return {
|
|
287
268
|
type: ProvingRequestType.PUBLIC_VM,
|
|
288
|
-
inputs: new AvmCircuitInputs('public_dispatch', [], hints, await this.generateAvmCircuitPublicInputs(endStateReference))
|
|
269
|
+
inputs: new AvmCircuitInputs('public_dispatch', [], hints, await this.generateAvmCircuitPublicInputs(endStateReference))
|
|
289
270
|
};
|
|
290
271
|
}
|
|
291
272
|
}
|
|
@@ -298,9 +279,11 @@ export class PublicTxContext {
|
|
|
298
279
|
* There is a state manager that lives at the level of the entire transaction,
|
|
299
280
|
* but for app logic and teardown the active state manager will be a fork of the
|
|
300
281
|
* transaction level one.
|
|
301
|
-
*/
|
|
302
|
-
|
|
303
|
-
|
|
282
|
+
*/ class PhaseStateManager {
|
|
283
|
+
txStateManager;
|
|
284
|
+
log;
|
|
285
|
+
currentlyActiveStateManager;
|
|
286
|
+
constructor(txStateManager){
|
|
304
287
|
this.txStateManager = txStateManager;
|
|
305
288
|
this.log = createLogger(`simulator:public_phase_state_manager`);
|
|
306
289
|
}
|
|
@@ -332,10 +315,6 @@ class PhaseStateManager {
|
|
|
332
315
|
}
|
|
333
316
|
/**
|
|
334
317
|
* Apply L2 gas maximum.
|
|
335
|
-
*/
|
|
336
|
-
|
|
337
|
-
return new Gas(
|
|
338
|
-
/*daGas=*/ availableGas.daGas,
|
|
339
|
-
/*l2Gas=*/ Math.min(availableGas.l2Gas, MAX_L2_GAS_PER_TX_PUBLIC_PORTION));
|
|
318
|
+
*/ function applyMaxToAvailableGas(availableGas) {
|
|
319
|
+
return new Gas(/*daGas=*/ availableGas.daGas, /*l2Gas=*/ Math.min(availableGas.l2Gas, MAX_L2_GAS_PER_TX_PUBLIC_PORTION));
|
|
340
320
|
}
|
|
341
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"public_tx_context.js","sourceRoot":"","sources":["../../src/public/public_tx_context.ts"],"names":[],"mappings":"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"}
|