Skip to content

Commit 195e583

Browse files
starknet_api: auto-test diff regression in versioned constants (#10328)
* blockifier: sort VC json keys * starknet_api: auto-test diff regression in versioned constants
1 parent 8c3fa0e commit 195e583

File tree

17 files changed

+377
-6
lines changed

17 files changed

+377
-6
lines changed

Cargo.lock

Lines changed: 24 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -268,6 +268,7 @@ indoc = "2.0.5"
268268
insta = "1.29.0"
269269
integer-encoding = "3.0.4"
270270
itertools = "0.12.1"
271+
json-patch = "4.1.0"
271272
jsonrpsee = "0.20.3"
272273
jsonschema = "0.17.0"
273274
keccak = "0.1.3"
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
~ /gas_target: 4800000000
2+
~ /max_block_size: 6000000000

crates/apollo_consensus_orchestrator/src/orchestrator_versioned_constants.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ use starknet_api::versioned_constants_logic::VersionedConstantsTrait;
66
use thiserror::Error;
77

88
/// Versioned constants for the Consensus.
9-
#[derive(Clone, Deserialize)]
9+
#[derive(Clone, Debug, Deserialize)]
1010
pub struct VersionedConstants {
1111
/// This is used to calculate the base gas price for the next block according to EIP-1559 and
1212
/// serves as a sensitivity parameter that limits the maximum rate of change of the gas price
@@ -29,6 +29,7 @@ define_versioned_constants!(
2929
VersionedConstants,
3030
VersionedConstantsError,
3131
StarknetVersion::V0_14_0,
32+
"resources/versioned_constants_diff_regression",
3233
(V0_14_0, "../resources/orchestrator_versioned_constants_0_14_0.json"),
3334
(V0_14_1, "../resources/orchestrator_versioned_constants_0_14_1.json"),
3435
);
Lines changed: 82 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,82 @@
1+
~ /archival_data_gas_costs/event_key_factor/0: 2
2+
~ /archival_data_gas_costs/gas_per_code_byte/0: 35000
3+
~ /archival_data_gas_costs/gas_per_data_felt/0: 5120
4+
~ /deprecated_l2_resource_gas_costs/event_key_factor/0: 2
5+
~ /deprecated_l2_resource_gas_costs/gas_per_code_byte/0: 875
6+
~ /deprecated_l2_resource_gas_costs/gas_per_code_byte/1: 1000
7+
~ /deprecated_l2_resource_gas_costs/gas_per_data_felt/0: 128
8+
~ /deprecated_l2_resource_gas_costs/gas_per_data_felt/1: 1000
9+
~ /gateway/max_contract_bytecode_size: 81920
10+
~ /ignore_inner_event_resources: true
11+
~ /invoke_tx_max_n_steps: 4000000
12+
+ /os_constants/syscall_gas_costs/Secp256k1Mul/memory_hole_gas_cost: 2
13+
~ /os_constants/syscall_gas_costs/Secp256k1Mul/step_gas_cost: 76501
14+
+ /os_constants/syscall_gas_costs/Secp256r1Mul/memory_hole_gas_cost: 2
15+
~ /os_constants/syscall_gas_costs/Secp256r1Mul/step_gas_cost: 125340
16+
~ /os_constants/validate_rounding_consts/validate_block_number_rounding: 100
17+
~ /os_constants/validate_rounding_consts/validate_timestamp_rounding: 3600
18+
~ /os_resources/execute_syscalls/CallContract/builtin_instance_counter/range_check_builtin: 20
19+
~ /os_resources/execute_syscalls/CallContract/n_steps: 760
20+
~ /os_resources/execute_syscalls/Deploy/builtin_instance_counter/range_check_builtin: 19
21+
~ /os_resources/execute_syscalls/Deploy/n_steps: 1012
22+
+ /os_resources/execute_syscalls/EmitEvent/builtin_instance_counter/range_check_builtin: 1
23+
~ /os_resources/execute_syscalls/EmitEvent/n_steps: 61
24+
~ /os_resources/execute_syscalls/GetBlockHash/n_steps: 104
25+
+ /os_resources/execute_syscalls/GetCallerAddress/builtin_instance_counter/range_check_builtin: 1
26+
~ /os_resources/execute_syscalls/GetCallerAddress/n_steps: 64
27+
+ /os_resources/execute_syscalls/GetContractAddress/builtin_instance_counter/range_check_builtin: 1
28+
~ /os_resources/execute_syscalls/GetContractAddress/n_steps: 64
29+
+ /os_resources/execute_syscalls/GetExecutionInfo/builtin_instance_counter/range_check_builtin: 1
30+
~ /os_resources/execute_syscalls/GetExecutionInfo/n_steps: 64
31+
+ /os_resources/execute_syscalls/GetTxInfo/builtin_instance_counter/range_check_builtin: 1
32+
~ /os_resources/execute_syscalls/GetTxInfo/n_steps: 64
33+
~ /os_resources/execute_syscalls/LibraryCall/builtin_instance_counter/range_check_builtin: 20
34+
~ /os_resources/execute_syscalls/LibraryCall/n_steps: 751
35+
+ /os_resources/execute_syscalls/ReplaceClass/builtin_instance_counter/range_check_builtin: 1
36+
~ /os_resources/execute_syscalls/ReplaceClass/n_steps: 98
37+
~ /os_resources/execute_syscalls/Secp256k1Add/n_steps: 408
38+
~ /os_resources/execute_syscalls/Secp256k1GetPointFromX/n_memory_holes: 0
39+
~ /os_resources/execute_syscalls/Secp256k1GetPointFromX/n_steps: 393
40+
~ /os_resources/execute_syscalls/Secp256k1GetXy/n_memory_holes: 0
41+
~ /os_resources/execute_syscalls/Secp256k1GetXy/n_steps: 205
42+
~ /os_resources/execute_syscalls/Secp256k1Mul/n_steps: 76503
43+
~ /os_resources/execute_syscalls/Secp256k1New/n_memory_holes: 0
44+
~ /os_resources/execute_syscalls/Secp256k1New/n_steps: 459
45+
~ /os_resources/execute_syscalls/Secp256r1Add/n_steps: 591
46+
~ /os_resources/execute_syscalls/Secp256r1GetPointFromX/n_memory_holes: 0
47+
~ /os_resources/execute_syscalls/Secp256r1GetPointFromX/n_steps: 512
48+
~ /os_resources/execute_syscalls/Secp256r1GetXy/n_memory_holes: 0
49+
~ /os_resources/execute_syscalls/Secp256r1GetXy/n_steps: 207
50+
~ /os_resources/execute_syscalls/Secp256r1Mul/n_steps: 125342
51+
~ /os_resources/execute_syscalls/Secp256r1New/n_memory_holes: 0
52+
~ /os_resources/execute_syscalls/Secp256r1New/n_steps: 578
53+
+ /os_resources/execute_syscalls/SendMessageToL1/builtin_instance_counter/range_check_builtin: 1
54+
~ /os_resources/execute_syscalls/SendMessageToL1/n_steps: 139
55+
+ /os_resources/execute_syscalls/StorageRead/builtin_instance_counter/range_check_builtin: 1
56+
~ /os_resources/execute_syscalls/StorageRead/n_steps: 87
57+
+ /os_resources/execute_syscalls/StorageWrite/builtin_instance_counter/range_check_builtin: 1
58+
~ /os_resources/execute_syscalls/StorageWrite/n_steps: 89
59+
~ /os_resources/execute_txs_inner/Declare/constant/builtin_instance_counter/pedersen_builtin: 16
60+
~ /os_resources/execute_txs_inner/Declare/constant/n_steps: 2839
61+
+ /os_resources/execute_txs_inner/DeployAccount/calldata_factor/builtin_instance_counter/pedersen_builtin: 2
62+
~ /os_resources/execute_txs_inner/DeployAccount/calldata_factor/n_steps: 21
63+
~ /os_resources/execute_txs_inner/DeployAccount/constant/n_steps: 3792
64+
+ /os_resources/execute_txs_inner/InvokeFunction/calldata_factor/builtin_instance_counter/pedersen_builtin: 1
65+
~ /os_resources/execute_txs_inner/InvokeFunction/calldata_factor/n_steps: 8
66+
~ /os_resources/execute_txs_inner/InvokeFunction/constant/builtin_instance_counter/pedersen_builtin: 14
67+
~ /os_resources/execute_txs_inner/InvokeFunction/constant/n_steps: 3546
68+
+ /os_resources/execute_txs_inner/L1Handler/calldata_factor/builtin_instance_counter/pedersen_builtin: 1
69+
~ /os_resources/execute_txs_inner/L1Handler/calldata_factor/n_steps: 13
70+
~ /os_resources/execute_txs_inner/L1Handler/constant/n_steps: 1146
71+
~ /tx_event_limits/max_data_length: 300
72+
~ /tx_event_limits/max_keys_length: 50
73+
~ /tx_event_limits/max_n_emitted_events: 1000
74+
~ /vm_resource_fee_cost/builtins/bitwise_builtin/0: 16
75+
~ /vm_resource_fee_cost/builtins/ec_op_builtin/0: 256
76+
~ /vm_resource_fee_cost/builtins/ecdsa_builtin/0: 512
77+
~ /vm_resource_fee_cost/builtins/keccak_builtin/0: 512
78+
~ /vm_resource_fee_cost/builtins/pedersen_builtin/0: 8
79+
~ /vm_resource_fee_cost/builtins/poseidon_builtin/0: 8
80+
~ /vm_resource_fee_cost/builtins/range_check_builtin/0: 4
81+
~ /vm_resource_fee_cost/n_steps/0: 25
82+
~ /vm_resource_fee_cost/n_steps/1: 10000
Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
~ /archival_data_gas_costs/gas_per_code_byte/0: 35000
2+
~ /deprecated_l2_resource_gas_costs/gas_per_code_byte/0: 875
3+
~ /disable_cairo0_redeclaration: true
4+
~ /invoke_tx_max_n_steps: 10000000
5+
~ /os_constants/builtin_gas_costs/bitwise: 594
6+
+ /os_constants/syscall_gas_costs/Sha256ProcessBlock/bitwise: 1115
7+
~ /os_constants/syscall_gas_costs/Sha256ProcessBlock/range_check: 65
8+
~ /os_constants/syscall_gas_costs/Sha256ProcessBlock/step_gas_cost: 1852
9+
~ /os_constants/syscall_gas_costs/Sha256ProcessBlock/syscall_base_gas_cost: 1
10+
+ /os_resources/compute_os_kzg_commitment_info/builtin_instance_counter/range_check_builtin: 17
11+
~ /os_resources/compute_os_kzg_commitment_info/n_steps: 113
12+
~ /os_resources/execute_syscalls/CallContract/builtin_instance_counter/range_check_builtin: 15
13+
~ /os_resources/execute_syscalls/CallContract/n_steps: 827
14+
~ /os_resources/execute_syscalls/Deploy/builtin_instance_counter/range_check_builtin: 18
15+
~ /os_resources/execute_syscalls/Deploy/n_steps: 1097
16+
~ /os_resources/execute_syscalls/LibraryCall/builtin_instance_counter/range_check_builtin: 15
17+
~ /os_resources/execute_syscalls/LibraryCall/n_steps: 818
18+
~ /os_resources/execute_syscalls/Secp256k1Add/n_steps: 410
19+
~ /os_resources/execute_syscalls/Secp256k1GetPointFromX/n_steps: 395
20+
~ /os_resources/execute_syscalls/Secp256k1GetXy/n_steps: 207
21+
~ /os_resources/execute_syscalls/Secp256k1Mul/n_steps: 76505
22+
~ /os_resources/execute_syscalls/Secp256k1New/n_steps: 461
23+
~ /os_resources/execute_syscalls/Secp256r1Add/n_steps: 593
24+
~ /os_resources/execute_syscalls/Secp256r1GetPointFromX/n_steps: 514
25+
~ /os_resources/execute_syscalls/Secp256r1GetXy/n_steps: 209
26+
~ /os_resources/execute_syscalls/Secp256r1Mul/n_steps: 125344
27+
~ /os_resources/execute_syscalls/Secp256r1New/n_steps: 580
28+
~ /os_resources/execute_syscalls/SendMessageToL1/n_steps: 141
29+
+ /os_resources/execute_syscalls/Sha256ProcessBlock/builtin_instance_counter/bitwise_builtin: 1115
30+
+ /os_resources/execute_syscalls/Sha256ProcessBlock/builtin_instance_counter/range_check_builtin: 65
31+
~ /os_resources/execute_syscalls/Sha256ProcessBlock/n_steps: 1855
32+
~ /os_resources/execute_txs_inner/Declare/constant/builtin_instance_counter/range_check_builtin: 53
33+
~ /os_resources/execute_txs_inner/Declare/constant/n_steps: 2973
34+
~ /os_resources/execute_txs_inner/DeployAccount/constant/builtin_instance_counter/range_check_builtin: 72
35+
~ /os_resources/execute_txs_inner/DeployAccount/constant/n_steps: 4015
36+
~ /os_resources/execute_txs_inner/InvokeFunction/constant/builtin_instance_counter/range_check_builtin: 69
37+
~ /os_resources/execute_txs_inner/InvokeFunction/constant/n_steps: 3763
38+
~ /os_resources/execute_txs_inner/L1Handler/constant/builtin_instance_counter/range_check_builtin: 16
39+
~ /os_resources/execute_txs_inner/L1Handler/constant/n_steps: 1233
40+
~ /segment_arena_cells: false
41+
~ /vm_resource_fee_cost/builtins/add_mod_builtin/0: 4
42+
~ /vm_resource_fee_cost/builtins/add_mod_builtin/1: 100
43+
~ /vm_resource_fee_cost/builtins/mul_mod_builtin/0: 4
44+
~ /vm_resource_fee_cost/builtins/mul_mod_builtin/1: 100
45+
~ /vm_resource_fee_cost/builtins/range_check96_builtin/0: 4
46+
~ /vm_resource_fee_cost/builtins/range_check96_builtin/1: 100
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
~ /archival_data_gas_costs/gas_per_code_byte/0: 1280
2+
~ /deprecated_l2_resource_gas_costs/gas_per_code_byte/0: 32
3+
~ /gateway/max_calldata_length: 5000
4+
~ /ignore_inner_event_resources: false
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
~ /archival_data_gas_costs/gas_per_code_byte/0: 1280
2+
~ /deprecated_l2_resource_gas_costs/gas_per_code_byte/0: 32
Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
~ /allocation_cost/blob_cost/l1_data_gas: 32
2+
~ /allocation_cost/gas_cost/l1_gas: 551
3+
~ /comprehensive_state_diff: true
4+
~ /enable_reverts: true
5+
~ /enable_stateful_compression: true
6+
~ /min_sierra_version_for_sierra_gas: "1.7.0"
7+
~ /os_constants/builtin_gas_costs/add_mod: 230
8+
~ /os_constants/builtin_gas_costs/bitwise: 583
9+
~ /os_constants/builtin_gas_costs/ecdsa: 10561
10+
~ /os_constants/builtin_gas_costs/ecop: 4085
11+
~ /os_constants/builtin_gas_costs/keccak: 136189
12+
~ /os_constants/builtin_gas_costs/mul_mod: 604
13+
~ /os_constants/builtin_gas_costs/pedersen: 4050
14+
~ /os_constants/builtin_gas_costs/poseidon: 491
15+
~ /os_constants/builtin_gas_costs/range_check96: 56
16+
~ /os_constants/execute_max_sierra_gas: 1000000000
17+
~ /os_constants/validate_max_sierra_gas: 100000000
18+
- /os_constants/syscall_gas_costs
19+
~ /os_resources/execute_syscalls/CallContract/n_steps: 866
20+
~ /os_resources/execute_syscalls/Deploy/n_steps: 1132
21+
+ /os_resources/execute_syscalls/GetClassHashAt/builtin_instance_counter/range_check_builtin: 1
22+
~ /os_resources/execute_syscalls/GetClassHashAt/n_steps: 89
23+
~ /os_resources/execute_syscalls/Keccak/n_steps: 100
24+
~ /os_resources/execute_syscalls/KeccakRound/n_steps: 281
25+
~ /os_resources/execute_syscalls/LibraryCall/n_steps: 842
26+
~ /os_resources/execute_syscalls/ReplaceClass/n_steps: 104
27+
~ /os_resources/execute_syscalls/Sha256ProcessBlock/n_steps: 1865
28+
~ /os_resources/execute_syscalls/StorageWrite/n_steps: 93
29+
+ /os_resources/execute_txs_inner/Declare/constant/builtin_instance_counter/poseidon_builtin: 4
30+
~ /os_resources/execute_txs_inner/Declare/constant/builtin_instance_counter/range_check_builtin: 56
31+
~ /os_resources/execute_txs_inner/Declare/constant/n_steps: 3203
32+
~ /os_resources/execute_txs_inner/DeployAccount/constant/n_steps: 4161
33+
~ /os_resources/execute_txs_inner/InvokeFunction/constant/n_steps: 3918
34+
~ /os_resources/execute_txs_inner/L1Handler/constant/n_steps: 1279

0 commit comments

Comments
 (0)