@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,36 +1,41 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
1
|
+
function _ts_decorate(decorators, target, key, desc) {
|
|
2
|
+
var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
|
|
3
|
+
if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
|
|
4
|
+
else for(var i = decorators.length - 1; i >= 0; i--)if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
|
|
5
|
+
return c > 3 && r && Object.defineProperty(target, key, r), r;
|
|
6
|
+
}
|
|
7
|
+
import { MerkleTreeId, NestedProcessReturnValues, Tx, TxExecutionPhase, makeProcessedTxFromPrivateOnlyTx, makeProcessedTxFromTxWithPublicCalls } from '@aztec/circuit-types';
|
|
8
|
+
import { Fr, Gas, MAX_NOTE_HASHES_PER_TX, MAX_NULLIFIERS_PER_TX, NULLIFIER_SUBTREE_HEIGHT, PublicDataWrite } from '@aztec/circuits.js';
|
|
4
9
|
import { padArrayEnd } from '@aztec/foundation/collection';
|
|
5
10
|
import { createLogger } from '@aztec/foundation/log';
|
|
6
11
|
import { Timer, elapsed, executeTimeout } from '@aztec/foundation/timer';
|
|
7
12
|
import { ProtocolContractAddress } from '@aztec/protocol-contracts';
|
|
8
13
|
import { ContractClassRegisteredEvent } from '@aztec/protocol-contracts/class-registerer';
|
|
9
|
-
import { Attributes, getTelemetryClient, trackSpan
|
|
14
|
+
import { Attributes, getTelemetryClient, trackSpan } from '@aztec/telemetry-client';
|
|
10
15
|
import { computeFeePayerBalanceLeafSlot, computeFeePayerBalanceStorageSlot } from './fee_payment.js';
|
|
11
16
|
import { WorldStateDB } from './public_db_sources.js';
|
|
12
17
|
import { PublicProcessorMetrics } from './public_processor_metrics.js';
|
|
13
18
|
import { PublicTxSimulator } from './public_tx_simulator.js';
|
|
14
19
|
/**
|
|
15
20
|
* Creates new instances of PublicProcessor given the provided merkle tree db and contract data source.
|
|
16
|
-
*/
|
|
17
|
-
|
|
18
|
-
|
|
21
|
+
*/ export class PublicProcessorFactory {
|
|
22
|
+
contractDataSource;
|
|
23
|
+
dateProvider;
|
|
24
|
+
telemetryClient;
|
|
25
|
+
constructor(contractDataSource, dateProvider, telemetryClient = getTelemetryClient()){
|
|
19
26
|
this.contractDataSource = contractDataSource;
|
|
20
27
|
this.dateProvider = dateProvider;
|
|
21
28
|
this.telemetryClient = telemetryClient;
|
|
22
29
|
}
|
|
23
30
|
/**
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
create(merkleTree, globalVariables, enforceFeePayment) {
|
|
31
|
+
* Creates a new instance of a PublicProcessor.
|
|
32
|
+
* @param historicalHeader - The header of a block previous to the one in which the tx is included.
|
|
33
|
+
* @param globalVariables - The global variables for the block being processed.
|
|
34
|
+
* @param enforceFeePayment - Allows disabling balance checks for fee estimations.
|
|
35
|
+
* @returns A new instance of a PublicProcessor.
|
|
36
|
+
*/ create(merkleTree, globalVariables, enforceFeePayment) {
|
|
31
37
|
const worldStateDB = new WorldStateDB(merkleTree, this.contractDataSource);
|
|
32
|
-
const publicTxSimulator = this.createPublicTxSimulator(merkleTree, worldStateDB, globalVariables,
|
|
33
|
-
/*doMerkleOperations=*/ true, enforceFeePayment, this.telemetryClient);
|
|
38
|
+
const publicTxSimulator = this.createPublicTxSimulator(merkleTree, worldStateDB, globalVariables, /*doMerkleOperations=*/ true, enforceFeePayment, this.telemetryClient);
|
|
34
39
|
return new PublicProcessor(merkleTree, globalVariables, worldStateDB, publicTxSimulator, this.dateProvider, this.telemetryClient);
|
|
35
40
|
}
|
|
36
41
|
createPublicTxSimulator(db, worldStateDB, globalVariables, doMerkleOperations, enforceFeePayment, telemetryClient) {
|
|
@@ -38,7 +43,7 @@ export class PublicProcessorFactory {
|
|
|
38
43
|
}
|
|
39
44
|
}
|
|
40
45
|
class PublicProcessorTimeoutError extends Error {
|
|
41
|
-
constructor(message = 'Timed out while processing tx')
|
|
46
|
+
constructor(message = 'Timed out while processing tx'){
|
|
42
47
|
super(message);
|
|
43
48
|
this.name = 'PublicProcessorTimeoutError';
|
|
44
49
|
}
|
|
@@ -46,307 +51,306 @@ class PublicProcessorTimeoutError extends Error {
|
|
|
46
51
|
/**
|
|
47
52
|
* Converts Txs lifted from the P2P module into ProcessedTx objects by executing
|
|
48
53
|
* any public function calls in them. Txs with private calls only are unaffected.
|
|
49
|
-
*/
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
54
|
+
*/ export class PublicProcessor {
|
|
55
|
+
db;
|
|
56
|
+
globalVariables;
|
|
57
|
+
worldStateDB;
|
|
58
|
+
publicTxSimulator;
|
|
59
|
+
dateProvider;
|
|
60
|
+
log;
|
|
61
|
+
metrics;
|
|
62
|
+
constructor(db, globalVariables, worldStateDB, publicTxSimulator, dateProvider, telemetryClient = getTelemetryClient(), log = createLogger('simulator:public-processor')){
|
|
63
|
+
this.db = db;
|
|
64
|
+
this.globalVariables = globalVariables;
|
|
65
|
+
this.worldStateDB = worldStateDB;
|
|
66
|
+
this.publicTxSimulator = publicTxSimulator;
|
|
67
|
+
this.dateProvider = dateProvider;
|
|
68
|
+
this.log = log;
|
|
69
|
+
this.metrics = new PublicProcessorMetrics(telemetryClient, 'PublicProcessor');
|
|
70
|
+
}
|
|
71
|
+
get tracer() {
|
|
72
|
+
return this.metrics.tracer;
|
|
73
|
+
}
|
|
74
|
+
/**
|
|
75
|
+
* Run each tx through the public circuit and the public kernel circuit if needed.
|
|
76
|
+
* @param txs - Txs to process.
|
|
77
|
+
* @param processedTxHandler - Handler for processed txs in the context of block building or proving.
|
|
78
|
+
* @returns The list of processed txs with their circuit simulation outputs.
|
|
79
|
+
*/ async process(txs, limits = {}, validators = {}) {
|
|
80
|
+
const { maxTransactions, maxBlockSize, deadline, maxBlockGas } = limits;
|
|
81
|
+
const { preprocessValidator, postprocessValidator, nullifierCache } = validators;
|
|
82
|
+
const result = [];
|
|
83
|
+
const failed = [];
|
|
84
|
+
const timer = new Timer();
|
|
85
|
+
let totalSizeInBytes = 0;
|
|
86
|
+
let returns = [];
|
|
87
|
+
let totalPublicGas = new Gas(0, 0);
|
|
88
|
+
let totalBlockGas = new Gas(0, 0);
|
|
89
|
+
for await (const origTx of txs){
|
|
90
|
+
// Only process up to the max tx limit
|
|
91
|
+
if (maxTransactions !== undefined && result.length >= maxTransactions) {
|
|
92
|
+
this.log.debug(`Stopping tx processing due to reaching the max tx limit.`);
|
|
93
|
+
break;
|
|
65
94
|
}
|
|
66
|
-
|
|
67
|
-
|
|
95
|
+
// Bail if we've hit the deadline
|
|
96
|
+
if (deadline && this.dateProvider.now() > +deadline) {
|
|
97
|
+
this.log.warn(`Stopping tx processing due to timeout.`);
|
|
98
|
+
break;
|
|
68
99
|
}
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
const { maxTransactions, maxBlockSize, deadline, maxBlockGas } = limits;
|
|
77
|
-
const { preprocessValidator, postprocessValidator, nullifierCache } = validators;
|
|
78
|
-
const result = [];
|
|
79
|
-
const failed = [];
|
|
80
|
-
const timer = new Timer();
|
|
81
|
-
let totalSizeInBytes = 0;
|
|
82
|
-
let returns = [];
|
|
83
|
-
let totalPublicGas = new Gas(0, 0);
|
|
84
|
-
let totalBlockGas = new Gas(0, 0);
|
|
85
|
-
for await (const origTx of txs) {
|
|
86
|
-
// Only process up to the max tx limit
|
|
87
|
-
if (maxTransactions !== undefined && result.length >= maxTransactions) {
|
|
88
|
-
this.log.debug(`Stopping tx processing due to reaching the max tx limit.`);
|
|
89
|
-
break;
|
|
90
|
-
}
|
|
91
|
-
// Bail if we've hit the deadline
|
|
92
|
-
if (deadline && this.dateProvider.now() > +deadline) {
|
|
93
|
-
this.log.warn(`Stopping tx processing due to timeout.`);
|
|
94
|
-
break;
|
|
95
|
-
}
|
|
96
|
-
// Skip this tx if it'd exceed max block size
|
|
97
|
-
const txHash = (await origTx.getTxHash()).toString();
|
|
98
|
-
const preTxSizeInBytes = origTx.getEstimatedPrivateTxEffectsSize();
|
|
99
|
-
if (maxBlockSize !== undefined && totalSizeInBytes + preTxSizeInBytes > maxBlockSize) {
|
|
100
|
-
this.log.warn(`Skipping processing of tx ${txHash} sized ${preTxSizeInBytes} bytes due to block size limit`, {
|
|
101
|
-
txHash,
|
|
102
|
-
sizeInBytes: preTxSizeInBytes,
|
|
103
|
-
totalSizeInBytes,
|
|
104
|
-
maxBlockSize,
|
|
105
|
-
});
|
|
106
|
-
continue;
|
|
107
|
-
}
|
|
108
|
-
// Skip this tx if its gas limit would exceed the block gas limit
|
|
109
|
-
const txGasLimit = origTx.data.constants.txContext.gasSettings.gasLimits;
|
|
110
|
-
if (maxBlockGas !== undefined && totalBlockGas.add(txGasLimit).gtAny(maxBlockGas)) {
|
|
111
|
-
this.log.warn(`Skipping processing of tx ${txHash} due to block gas limit`, {
|
|
112
|
-
txHash,
|
|
113
|
-
txGasLimit,
|
|
114
|
-
totalBlockGas,
|
|
115
|
-
maxBlockGas,
|
|
116
|
-
});
|
|
117
|
-
continue;
|
|
118
|
-
}
|
|
119
|
-
// The processor modifies the tx objects in place, so we need to clone them.
|
|
120
|
-
const tx = Tx.clone(origTx);
|
|
121
|
-
// We validate the tx before processing it, to avoid unnecessary work.
|
|
122
|
-
if (preprocessValidator) {
|
|
123
|
-
const result = await preprocessValidator.validateTx(tx);
|
|
124
|
-
const txHash = await tx.getTxHash();
|
|
125
|
-
if (result.result === 'invalid') {
|
|
126
|
-
const reason = result.reason.join(', ');
|
|
127
|
-
this.log.warn(`Rejecting tx ${txHash.toString()} due to pre-process validation fail: ${reason}`);
|
|
128
|
-
failed.push({ tx, error: new Error(`Tx failed preprocess validation: ${reason}`) });
|
|
129
|
-
returns.push(new NestedProcessReturnValues([]));
|
|
130
|
-
continue;
|
|
131
|
-
}
|
|
132
|
-
else if (result.result === 'skipped') {
|
|
133
|
-
const reason = result.reason.join(', ');
|
|
134
|
-
this.log.warn(`Skipping tx ${txHash.toString()} due to pre-process validation: ${reason}`);
|
|
135
|
-
returns.push(new NestedProcessReturnValues([]));
|
|
136
|
-
continue;
|
|
137
|
-
}
|
|
138
|
-
else {
|
|
139
|
-
this.log.trace(`Tx ${txHash.toString()} is valid before processing.`);
|
|
140
|
-
}
|
|
141
|
-
}
|
|
142
|
-
try {
|
|
143
|
-
const [processedTx, returnValues] = await this.processTx(tx, deadline);
|
|
144
|
-
// If the actual size of this tx would exceed block size, skip it
|
|
145
|
-
const txSize = processedTx.txEffect.getDASize();
|
|
146
|
-
if (maxBlockSize !== undefined && totalSizeInBytes + txSize > maxBlockSize) {
|
|
147
|
-
this.log.warn(`Skipping processed tx ${txHash} sized ${txSize} due to max block size.`, {
|
|
148
|
-
txHash,
|
|
149
|
-
sizeInBytes: txSize,
|
|
150
|
-
totalSizeInBytes,
|
|
151
|
-
maxBlockSize,
|
|
152
|
-
});
|
|
153
|
-
continue;
|
|
154
|
-
}
|
|
155
|
-
// Re-validate the transaction
|
|
156
|
-
if (postprocessValidator) {
|
|
157
|
-
// Only accept processed transactions that are not double-spends,
|
|
158
|
-
// public functions emitting nullifiers would pass earlier check but fail here.
|
|
159
|
-
// Note that we're checking all nullifiers generated in the private execution twice,
|
|
160
|
-
// we could store the ones already checked and skip them here as an optimization.
|
|
161
|
-
// TODO(palla/txs): Can we get into this case? AVM validates this. We should be able to remove it.
|
|
162
|
-
const result = await postprocessValidator.validateTx(processedTx);
|
|
163
|
-
if (result.result !== 'valid') {
|
|
164
|
-
const reason = result.reason.join(', ');
|
|
165
|
-
this.log.error(`Rejecting tx ${processedTx.hash} after processing: ${reason}.`);
|
|
166
|
-
failed.push({ tx, error: new Error(`Tx failed post-process validation: ${reason}`) });
|
|
167
|
-
continue;
|
|
168
|
-
}
|
|
169
|
-
else {
|
|
170
|
-
this.log.trace(`Tx ${(await tx.getTxHash()).toString()} is valid post processing.`);
|
|
171
|
-
}
|
|
172
|
-
}
|
|
173
|
-
// Otherwise, commit tx state for the next tx to be processed
|
|
174
|
-
await this.commitTxState(processedTx);
|
|
175
|
-
nullifierCache?.addNullifiers(processedTx.txEffect.nullifiers.map(n => n.toBuffer()));
|
|
176
|
-
result.push(processedTx);
|
|
177
|
-
returns = returns.concat(returnValues);
|
|
178
|
-
totalPublicGas = totalPublicGas.add(processedTx.gasUsed.publicGas);
|
|
179
|
-
totalBlockGas = totalBlockGas.add(processedTx.gasUsed.totalGas);
|
|
180
|
-
totalSizeInBytes += txSize;
|
|
181
|
-
}
|
|
182
|
-
catch (err) {
|
|
183
|
-
if (err?.name === 'PublicProcessorTimeoutError') {
|
|
184
|
-
this.log.warn(`Stopping tx processing due to timeout.`);
|
|
185
|
-
break;
|
|
186
|
-
}
|
|
187
|
-
const errorMessage = err instanceof Error ? err.message : 'Unknown error';
|
|
188
|
-
this.log.warn(`Failed to process tx ${tx.getTxHash()}: ${errorMessage} ${err?.stack}`);
|
|
189
|
-
failed.push({ tx, error: err instanceof Error ? err : new Error(errorMessage) });
|
|
190
|
-
returns.push(new NestedProcessReturnValues([]));
|
|
191
|
-
}
|
|
192
|
-
}
|
|
193
|
-
const duration = timer.s();
|
|
194
|
-
const rate = duration > 0 ? totalPublicGas.l2Gas / duration : 0;
|
|
195
|
-
this.metrics.recordAllTxs(totalPublicGas, rate);
|
|
196
|
-
this.log.info(`Processed ${result.length} successful txs and ${failed.length} txs in ${duration}s`, {
|
|
197
|
-
duration,
|
|
198
|
-
rate,
|
|
199
|
-
totalPublicGas,
|
|
200
|
-
totalBlockGas,
|
|
100
|
+
// Skip this tx if it'd exceed max block size
|
|
101
|
+
const txHash = (await origTx.getTxHash()).toString();
|
|
102
|
+
const preTxSizeInBytes = origTx.getEstimatedPrivateTxEffectsSize();
|
|
103
|
+
if (maxBlockSize !== undefined && totalSizeInBytes + preTxSizeInBytes > maxBlockSize) {
|
|
104
|
+
this.log.warn(`Skipping processing of tx ${txHash} sized ${preTxSizeInBytes} bytes due to block size limit`, {
|
|
105
|
+
txHash,
|
|
106
|
+
sizeInBytes: preTxSizeInBytes,
|
|
201
107
|
totalSizeInBytes,
|
|
108
|
+
maxBlockSize
|
|
202
109
|
});
|
|
203
|
-
|
|
110
|
+
continue;
|
|
204
111
|
}
|
|
205
|
-
|
|
206
|
-
|
|
207
|
-
|
|
208
|
-
|
|
209
|
-
|
|
210
|
-
|
|
211
|
-
|
|
212
|
-
|
|
213
|
-
revertReason: processedTx.revertReason,
|
|
214
|
-
gasUsed: processedTx.gasUsed,
|
|
215
|
-
publicDataWriteCount: processedTx.txEffect.publicDataWrites.length,
|
|
216
|
-
nullifierCount: processedTx.txEffect.nullifiers.length,
|
|
217
|
-
noteHashCount: processedTx.txEffect.noteHashes.length,
|
|
218
|
-
contractClassLogCount: processedTx.txEffect.contractClassLogs.getTotalLogCount(),
|
|
219
|
-
publicLogCount: processedTx.txEffect.publicLogs.length,
|
|
220
|
-
privateLogCount: processedTx.txEffect.privateLogs.length,
|
|
221
|
-
l2ToL1MessageCount: processedTx.txEffect.l2ToL1Msgs.length,
|
|
222
|
-
durationMs: time,
|
|
112
|
+
// Skip this tx if its gas limit would exceed the block gas limit
|
|
113
|
+
const txGasLimit = origTx.data.constants.txContext.gasSettings.gasLimits;
|
|
114
|
+
if (maxBlockGas !== undefined && totalBlockGas.add(txGasLimit).gtAny(maxBlockGas)) {
|
|
115
|
+
this.log.warn(`Skipping processing of tx ${txHash} due to block gas limit`, {
|
|
116
|
+
txHash,
|
|
117
|
+
txGasLimit,
|
|
118
|
+
totalBlockGas,
|
|
119
|
+
maxBlockGas
|
|
223
120
|
});
|
|
224
|
-
|
|
121
|
+
continue;
|
|
225
122
|
}
|
|
226
|
-
|
|
227
|
-
|
|
228
|
-
|
|
229
|
-
|
|
230
|
-
|
|
231
|
-
// NB: before this change, all .startStates were actually incorrect, but the issue was never caught because we either:
|
|
232
|
-
// a) had only 1 tx with public calls per block, so this loop had len 1
|
|
233
|
-
// b) always had a txHandler with the same db passed to it as this.db, which updated the db in buildBaseRollupHints in this loop
|
|
234
|
-
// To see how this ^ happens, move back to one shared db in test_context and run orchestrator_multi_public_functions.test.ts
|
|
235
|
-
// The below is taken from buildBaseRollupHints:
|
|
236
|
-
const treeInsertionStart = process.hrtime.bigint();
|
|
237
|
-
await this.db.appendLeaves(MerkleTreeId.NOTE_HASH_TREE, padArrayEnd(processedTx.txEffect.noteHashes, Fr.ZERO, MAX_NOTE_HASHES_PER_TX));
|
|
238
|
-
try {
|
|
239
|
-
await this.db.batchInsert(MerkleTreeId.NULLIFIER_TREE, padArrayEnd(processedTx.txEffect.nullifiers, Fr.ZERO, MAX_NULLIFIERS_PER_TX).map(n => n.toBuffer()), NULLIFIER_SUBTREE_HEIGHT);
|
|
240
|
-
}
|
|
241
|
-
catch (error) {
|
|
242
|
-
if (txValidator) {
|
|
243
|
-
// Ideally the validator has already caught this above, but just in case:
|
|
244
|
-
throw new Error(`Transaction ${processedTx.hash} invalid after processing public functions`);
|
|
245
|
-
}
|
|
246
|
-
else {
|
|
247
|
-
// We have no validator and assume this call should blindly process txs with duplicates being caught later
|
|
248
|
-
this.log.warn(`Detected duplicate nullifier after public processing for: ${processedTx.hash}.`);
|
|
249
|
-
}
|
|
250
|
-
}
|
|
251
|
-
await this.db.sequentialInsert(MerkleTreeId.PUBLIC_DATA_TREE, processedTx.txEffect.publicDataWrites.map(x => x.toBuffer()));
|
|
252
|
-
const treeInsertionEnd = process.hrtime.bigint();
|
|
253
|
-
this.metrics.recordTreeInsertions(Number(treeInsertionEnd - treeInsertionStart) / 1000);
|
|
254
|
-
}
|
|
255
|
-
/** Processes the given tx within deadline. Returns timeout if deadline is hit. */
|
|
256
|
-
async processTxWithinDeadline(tx, deadline) {
|
|
257
|
-
const processFn = tx.hasPublicCalls()
|
|
258
|
-
? () => this.processTxWithPublicCalls(tx)
|
|
259
|
-
: () => this.processPrivateOnlyTx(tx);
|
|
260
|
-
if (!deadline) {
|
|
261
|
-
return await processFn();
|
|
262
|
-
}
|
|
123
|
+
// The processor modifies the tx objects in place, so we need to clone them.
|
|
124
|
+
const tx = Tx.clone(origTx);
|
|
125
|
+
// We validate the tx before processing it, to avoid unnecessary work.
|
|
126
|
+
if (preprocessValidator) {
|
|
127
|
+
const result = await preprocessValidator.validateTx(tx);
|
|
263
128
|
const txHash = await tx.getTxHash();
|
|
264
|
-
|
|
265
|
-
|
|
266
|
-
|
|
129
|
+
if (result.result === 'invalid') {
|
|
130
|
+
const reason = result.reason.join(', ');
|
|
131
|
+
this.log.warn(`Rejecting tx ${txHash.toString()} due to pre-process validation fail: ${reason}`);
|
|
132
|
+
failed.push({
|
|
133
|
+
tx,
|
|
134
|
+
error: new Error(`Tx failed preprocess validation: ${reason}`)
|
|
135
|
+
});
|
|
136
|
+
returns.push(new NestedProcessReturnValues([]));
|
|
137
|
+
continue;
|
|
138
|
+
} else if (result.result === 'skipped') {
|
|
139
|
+
const reason = result.reason.join(', ');
|
|
140
|
+
this.log.warn(`Skipping tx ${txHash.toString()} due to pre-process validation: ${reason}`);
|
|
141
|
+
returns.push(new NestedProcessReturnValues([]));
|
|
142
|
+
continue;
|
|
143
|
+
} else {
|
|
144
|
+
this.log.trace(`Tx ${txHash.toString()} is valid before processing.`);
|
|
267
145
|
}
|
|
268
|
-
this.log.debug(`Processing tx ${txHash.toString()} within ${timeout}ms`, {
|
|
269
|
-
deadline: deadline.toISOString(),
|
|
270
|
-
now: new Date(this.dateProvider.now()).toISOString(),
|
|
271
|
-
txHash,
|
|
272
|
-
});
|
|
273
|
-
return await executeTimeout(() => processFn(), timeout, () => new PublicProcessorTimeoutError());
|
|
274
146
|
}
|
|
275
|
-
|
|
276
|
-
|
|
277
|
-
|
|
278
|
-
|
|
279
|
-
|
|
280
|
-
|
|
281
|
-
|
|
282
|
-
|
|
283
|
-
|
|
147
|
+
try {
|
|
148
|
+
const [processedTx, returnValues] = await this.processTx(tx, deadline);
|
|
149
|
+
// If the actual size of this tx would exceed block size, skip it
|
|
150
|
+
const txSize = processedTx.txEffect.getDASize();
|
|
151
|
+
if (maxBlockSize !== undefined && totalSizeInBytes + txSize > maxBlockSize) {
|
|
152
|
+
this.log.warn(`Skipping processed tx ${txHash} sized ${txSize} due to max block size.`, {
|
|
153
|
+
txHash,
|
|
154
|
+
sizeInBytes: txSize,
|
|
155
|
+
totalSizeInBytes,
|
|
156
|
+
maxBlockSize
|
|
157
|
+
});
|
|
158
|
+
continue;
|
|
284
159
|
}
|
|
285
|
-
|
|
286
|
-
|
|
287
|
-
|
|
288
|
-
|
|
289
|
-
|
|
290
|
-
|
|
291
|
-
|
|
160
|
+
// Re-validate the transaction
|
|
161
|
+
if (postprocessValidator) {
|
|
162
|
+
// Only accept processed transactions that are not double-spends,
|
|
163
|
+
// public functions emitting nullifiers would pass earlier check but fail here.
|
|
164
|
+
// Note that we're checking all nullifiers generated in the private execution twice,
|
|
165
|
+
// we could store the ones already checked and skip them here as an optimization.
|
|
166
|
+
// TODO(palla/txs): Can we get into this case? AVM validates this. We should be able to remove it.
|
|
167
|
+
const result = await postprocessValidator.validateTx(processedTx);
|
|
168
|
+
if (result.result !== 'valid') {
|
|
169
|
+
const reason = result.reason.join(', ');
|
|
170
|
+
this.log.error(`Rejecting tx ${processedTx.hash} after processing: ${reason}.`);
|
|
171
|
+
failed.push({
|
|
172
|
+
tx,
|
|
173
|
+
error: new Error(`Tx failed post-process validation: ${reason}`)
|
|
174
|
+
});
|
|
175
|
+
continue;
|
|
176
|
+
} else {
|
|
177
|
+
this.log.trace(`Tx ${(await tx.getTxHash()).toString()} is valid post processing.`);
|
|
178
|
+
}
|
|
292
179
|
}
|
|
293
|
-
|
|
294
|
-
await this.
|
|
295
|
-
|
|
296
|
-
|
|
297
|
-
|
|
298
|
-
|
|
299
|
-
|
|
300
|
-
|
|
301
|
-
|
|
302
|
-
|
|
303
|
-
.
|
|
304
|
-
|
|
305
|
-
.map(log => ContractClassRegisteredEvent.fromLog(log.data)));
|
|
306
|
-
return [processedTx, undefined];
|
|
307
|
-
}
|
|
308
|
-
async processTxWithPublicCalls(tx) {
|
|
309
|
-
const timer = new Timer();
|
|
310
|
-
const { avmProvingRequest, gasUsed, revertCode, revertReason, processedPhases } = await this.publicTxSimulator.simulate(tx);
|
|
311
|
-
if (!avmProvingRequest) {
|
|
312
|
-
this.metrics.recordFailedTx();
|
|
313
|
-
throw new Error('Avm proving result was not generated.');
|
|
180
|
+
// Otherwise, commit tx state for the next tx to be processed
|
|
181
|
+
await this.commitTxState(processedTx);
|
|
182
|
+
nullifierCache?.addNullifiers(processedTx.txEffect.nullifiers.map((n)=>n.toBuffer()));
|
|
183
|
+
result.push(processedTx);
|
|
184
|
+
returns = returns.concat(returnValues);
|
|
185
|
+
totalPublicGas = totalPublicGas.add(processedTx.gasUsed.publicGas);
|
|
186
|
+
totalBlockGas = totalBlockGas.add(processedTx.gasUsed.totalGas);
|
|
187
|
+
totalSizeInBytes += txSize;
|
|
188
|
+
} catch (err) {
|
|
189
|
+
if (err?.name === 'PublicProcessorTimeoutError') {
|
|
190
|
+
this.log.warn(`Stopping tx processing due to timeout.`);
|
|
191
|
+
break;
|
|
314
192
|
}
|
|
315
|
-
|
|
316
|
-
|
|
317
|
-
|
|
318
|
-
|
|
319
|
-
|
|
320
|
-
this.metrics.recordPhaseDuration(phase.phase, phase.durationMs);
|
|
321
|
-
}
|
|
193
|
+
const errorMessage = err instanceof Error ? err.message : 'Unknown error';
|
|
194
|
+
this.log.warn(`Failed to process tx ${tx.getTxHash()}: ${errorMessage} ${err?.stack}`);
|
|
195
|
+
failed.push({
|
|
196
|
+
tx,
|
|
197
|
+
error: err instanceof Error ? err : new Error(errorMessage)
|
|
322
198
|
});
|
|
323
|
-
|
|
324
|
-
.unrollLogs()
|
|
325
|
-
.filter(log => ContractClassRegisteredEvent.isContractClassRegisteredEvent(log.data))
|
|
326
|
-
.map(log => ContractClassRegisteredEvent.fromLog(log.data)));
|
|
327
|
-
const phaseCount = processedPhases.length;
|
|
328
|
-
const durationMs = timer.ms();
|
|
329
|
-
this.metrics.recordTx(phaseCount, durationMs, gasUsed.publicGas);
|
|
330
|
-
const processedTx = await makeProcessedTxFromTxWithPublicCalls(tx, avmProvingRequest, gasUsed, revertCode, revertReason);
|
|
331
|
-
const returnValues = processedPhases.find(({ phase }) => phase === TxExecutionPhase.APP_LOGIC)?.returnValues ?? [];
|
|
332
|
-
return [processedTx, returnValues];
|
|
199
|
+
returns.push(new NestedProcessReturnValues([]));
|
|
333
200
|
}
|
|
334
|
-
}
|
|
335
|
-
(
|
|
336
|
-
|
|
337
|
-
|
|
338
|
-
|
|
339
|
-
|
|
340
|
-
|
|
341
|
-
|
|
342
|
-
|
|
343
|
-
|
|
344
|
-
|
|
345
|
-
|
|
346
|
-
|
|
347
|
-
|
|
348
|
-
|
|
349
|
-
|
|
350
|
-
}
|
|
351
|
-
|
|
352
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"public_processor.js","sourceRoot":"","sources":["../../src/public/public_processor.ts"],"names":[],"mappings":"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"}
|
|
201
|
+
}
|
|
202
|
+
const duration = timer.s();
|
|
203
|
+
const rate = duration > 0 ? totalPublicGas.l2Gas / duration : 0;
|
|
204
|
+
this.metrics.recordAllTxs(totalPublicGas, rate);
|
|
205
|
+
this.log.info(`Processed ${result.length} successful txs and ${failed.length} txs in ${duration}s`, {
|
|
206
|
+
duration,
|
|
207
|
+
rate,
|
|
208
|
+
totalPublicGas,
|
|
209
|
+
totalBlockGas,
|
|
210
|
+
totalSizeInBytes
|
|
211
|
+
});
|
|
212
|
+
return [
|
|
213
|
+
result,
|
|
214
|
+
failed,
|
|
215
|
+
returns
|
|
216
|
+
];
|
|
217
|
+
}
|
|
218
|
+
async processTx(tx, deadline) {
|
|
219
|
+
const [time, [processedTx, returnValues]] = await elapsed(()=>this.processTxWithinDeadline(tx, deadline));
|
|
220
|
+
this.log.verbose(!tx.hasPublicCalls() ? `Processed tx ${processedTx.hash} with no public calls in ${time}ms` : `Processed tx ${processedTx.hash} with ${tx.enqueuedPublicFunctionCalls.length} public calls in ${time}ms`, {
|
|
221
|
+
txHash: processedTx.hash,
|
|
222
|
+
txFee: processedTx.txEffect.transactionFee.toBigInt(),
|
|
223
|
+
revertCode: processedTx.txEffect.revertCode.getCode(),
|
|
224
|
+
revertReason: processedTx.revertReason,
|
|
225
|
+
gasUsed: processedTx.gasUsed,
|
|
226
|
+
publicDataWriteCount: processedTx.txEffect.publicDataWrites.length,
|
|
227
|
+
nullifierCount: processedTx.txEffect.nullifiers.length,
|
|
228
|
+
noteHashCount: processedTx.txEffect.noteHashes.length,
|
|
229
|
+
contractClassLogCount: processedTx.txEffect.contractClassLogs.getTotalLogCount(),
|
|
230
|
+
publicLogCount: processedTx.txEffect.publicLogs.length,
|
|
231
|
+
privateLogCount: processedTx.txEffect.privateLogs.length,
|
|
232
|
+
l2ToL1MessageCount: processedTx.txEffect.l2ToL1Msgs.length,
|
|
233
|
+
durationMs: time
|
|
234
|
+
});
|
|
235
|
+
return [
|
|
236
|
+
processedTx,
|
|
237
|
+
returnValues ?? []
|
|
238
|
+
];
|
|
239
|
+
}
|
|
240
|
+
async commitTxState(processedTx, txValidator) {
|
|
241
|
+
// Commit the state updates from this transaction
|
|
242
|
+
// TODO(palla/txs): It seems like this doesn't do anything...?
|
|
243
|
+
await this.worldStateDB.commit();
|
|
244
|
+
// Update the state so that the next tx in the loop has the correct .startState
|
|
245
|
+
// NB: before this change, all .startStates were actually incorrect, but the issue was never caught because we either:
|
|
246
|
+
// a) had only 1 tx with public calls per block, so this loop had len 1
|
|
247
|
+
// b) always had a txHandler with the same db passed to it as this.db, which updated the db in buildBaseRollupHints in this loop
|
|
248
|
+
// To see how this ^ happens, move back to one shared db in test_context and run orchestrator_multi_public_functions.test.ts
|
|
249
|
+
// The below is taken from buildBaseRollupHints:
|
|
250
|
+
const treeInsertionStart = process.hrtime.bigint();
|
|
251
|
+
await this.db.appendLeaves(MerkleTreeId.NOTE_HASH_TREE, padArrayEnd(processedTx.txEffect.noteHashes, Fr.ZERO, MAX_NOTE_HASHES_PER_TX));
|
|
252
|
+
try {
|
|
253
|
+
await this.db.batchInsert(MerkleTreeId.NULLIFIER_TREE, padArrayEnd(processedTx.txEffect.nullifiers, Fr.ZERO, MAX_NULLIFIERS_PER_TX).map((n)=>n.toBuffer()), NULLIFIER_SUBTREE_HEIGHT);
|
|
254
|
+
} catch (error) {
|
|
255
|
+
if (txValidator) {
|
|
256
|
+
// Ideally the validator has already caught this above, but just in case:
|
|
257
|
+
throw new Error(`Transaction ${processedTx.hash} invalid after processing public functions`);
|
|
258
|
+
} else {
|
|
259
|
+
// We have no validator and assume this call should blindly process txs with duplicates being caught later
|
|
260
|
+
this.log.warn(`Detected duplicate nullifier after public processing for: ${processedTx.hash}.`);
|
|
261
|
+
}
|
|
262
|
+
}
|
|
263
|
+
await this.db.sequentialInsert(MerkleTreeId.PUBLIC_DATA_TREE, processedTx.txEffect.publicDataWrites.map((x)=>x.toBuffer()));
|
|
264
|
+
const treeInsertionEnd = process.hrtime.bigint();
|
|
265
|
+
this.metrics.recordTreeInsertions(Number(treeInsertionEnd - treeInsertionStart) / 1_000);
|
|
266
|
+
}
|
|
267
|
+
/** Processes the given tx within deadline. Returns timeout if deadline is hit. */ async processTxWithinDeadline(tx, deadline) {
|
|
268
|
+
const processFn = tx.hasPublicCalls() ? ()=>this.processTxWithPublicCalls(tx) : ()=>this.processPrivateOnlyTx(tx);
|
|
269
|
+
if (!deadline) {
|
|
270
|
+
return await processFn();
|
|
271
|
+
}
|
|
272
|
+
const txHash = await tx.getTxHash();
|
|
273
|
+
const timeout = +deadline - this.dateProvider.now();
|
|
274
|
+
if (timeout <= 0) {
|
|
275
|
+
throw new PublicProcessorTimeoutError();
|
|
276
|
+
}
|
|
277
|
+
this.log.debug(`Processing tx ${txHash.toString()} within ${timeout}ms`, {
|
|
278
|
+
deadline: deadline.toISOString(),
|
|
279
|
+
now: new Date(this.dateProvider.now()).toISOString(),
|
|
280
|
+
txHash
|
|
281
|
+
});
|
|
282
|
+
return await executeTimeout(()=>processFn(), timeout, ()=>new PublicProcessorTimeoutError());
|
|
283
|
+
}
|
|
284
|
+
/**
|
|
285
|
+
* Creates the public data write for paying the tx fee.
|
|
286
|
+
* This is used in private only txs, since for txs with public calls
|
|
287
|
+
* the avm handles the fee payment itself.
|
|
288
|
+
*/ async getFeePaymentPublicDataWrite(txFee, feePayer) {
|
|
289
|
+
if (feePayer.isZero()) {
|
|
290
|
+
this.log.debug(`No one is paying the fee of ${txFee.toBigInt()}`);
|
|
291
|
+
return;
|
|
292
|
+
}
|
|
293
|
+
const feeJuiceAddress = ProtocolContractAddress.FeeJuice;
|
|
294
|
+
const balanceSlot = await computeFeePayerBalanceStorageSlot(feePayer);
|
|
295
|
+
const leafSlot = await computeFeePayerBalanceLeafSlot(feePayer);
|
|
296
|
+
this.log.debug(`Deducting ${txFee.toBigInt()} balance in Fee Juice for ${feePayer}`);
|
|
297
|
+
const balance = await this.worldStateDB.storageRead(feeJuiceAddress, balanceSlot);
|
|
298
|
+
if (balance.lt(txFee)) {
|
|
299
|
+
throw new Error(`Not enough balance for fee payer to pay for transaction (got ${balance.toBigInt()} needs ${txFee.toBigInt()})`);
|
|
300
|
+
}
|
|
301
|
+
const updatedBalance = balance.sub(txFee);
|
|
302
|
+
await this.worldStateDB.storageWrite(feeJuiceAddress, balanceSlot, updatedBalance);
|
|
303
|
+
return new PublicDataWrite(leafSlot, updatedBalance);
|
|
304
|
+
}
|
|
305
|
+
async processPrivateOnlyTx(tx) {
|
|
306
|
+
const gasFees = this.globalVariables.gasFees;
|
|
307
|
+
const transactionFee = tx.data.gasUsed.computeFee(gasFees);
|
|
308
|
+
const feePaymentPublicDataWrite = await this.getFeePaymentPublicDataWrite(transactionFee, tx.data.feePayer);
|
|
309
|
+
const processedTx = await makeProcessedTxFromPrivateOnlyTx(tx, transactionFee, feePaymentPublicDataWrite, this.globalVariables);
|
|
310
|
+
this.metrics.recordClassRegistration(...tx.contractClassLogs.unrollLogs().filter((log)=>ContractClassRegisteredEvent.isContractClassRegisteredEvent(log.data)).map((log)=>ContractClassRegisteredEvent.fromLog(log.data)));
|
|
311
|
+
return [
|
|
312
|
+
processedTx,
|
|
313
|
+
undefined
|
|
314
|
+
];
|
|
315
|
+
}
|
|
316
|
+
async processTxWithPublicCalls(tx) {
|
|
317
|
+
const timer = new Timer();
|
|
318
|
+
const { avmProvingRequest, gasUsed, revertCode, revertReason, processedPhases } = await this.publicTxSimulator.simulate(tx);
|
|
319
|
+
if (!avmProvingRequest) {
|
|
320
|
+
this.metrics.recordFailedTx();
|
|
321
|
+
throw new Error('Avm proving result was not generated.');
|
|
322
|
+
}
|
|
323
|
+
processedPhases.forEach((phase)=>{
|
|
324
|
+
if (phase.revertReason) {
|
|
325
|
+
this.metrics.recordRevertedPhase(phase.phase);
|
|
326
|
+
} else {
|
|
327
|
+
this.metrics.recordPhaseDuration(phase.phase, phase.durationMs);
|
|
328
|
+
}
|
|
329
|
+
});
|
|
330
|
+
this.metrics.recordClassRegistration(...tx.contractClassLogs.unrollLogs().filter((log)=>ContractClassRegisteredEvent.isContractClassRegisteredEvent(log.data)).map((log)=>ContractClassRegisteredEvent.fromLog(log.data)));
|
|
331
|
+
const phaseCount = processedPhases.length;
|
|
332
|
+
const durationMs = timer.ms();
|
|
333
|
+
this.metrics.recordTx(phaseCount, durationMs, gasUsed.publicGas);
|
|
334
|
+
const processedTx = await makeProcessedTxFromTxWithPublicCalls(tx, avmProvingRequest, gasUsed, revertCode, revertReason);
|
|
335
|
+
const returnValues = processedPhases.find(({ phase })=>phase === TxExecutionPhase.APP_LOGIC)?.returnValues ?? [];
|
|
336
|
+
return [
|
|
337
|
+
processedTx,
|
|
338
|
+
returnValues
|
|
339
|
+
];
|
|
340
|
+
}
|
|
341
|
+
}
|
|
342
|
+
_ts_decorate([
|
|
343
|
+
trackSpan('PublicProcessor.processTx', async (tx)=>({
|
|
344
|
+
[Attributes.TX_HASH]: (await tx.getTxHash()).toString()
|
|
345
|
+
}))
|
|
346
|
+
], PublicProcessor.prototype, "processTx", null);
|
|
347
|
+
_ts_decorate([
|
|
348
|
+
trackSpan('PublicProcessor.processPrivateOnlyTx', async (tx)=>({
|
|
349
|
+
[Attributes.TX_HASH]: (await tx.getTxHash()).toString()
|
|
350
|
+
}))
|
|
351
|
+
], PublicProcessor.prototype, "processPrivateOnlyTx", null);
|
|
352
|
+
_ts_decorate([
|
|
353
|
+
trackSpan('PublicProcessor.processTxWithPublicCalls', async (tx)=>({
|
|
354
|
+
[Attributes.TX_HASH]: (await tx.getTxHash()).toString()
|
|
355
|
+
}))
|
|
356
|
+
], PublicProcessor.prototype, "processTxWithPublicCalls", null);
|