From 43571e9a4cce52d2be25cb2d394eb3ec14d7552b Mon Sep 17 00:00:00 2001 From: Yonatan-Starkware Date: Sun, 22 Dec 2024 13:58:44 +0200 Subject: [PATCH] chore(blockifier): remove syscall_gas_costs from os_constans --- .../resources/versioned_constants_0_13_4.json | 110 +----------------- .../syscalls/syscall_tests/constants.rs | 8 +- .../syscalls/syscall_tests/deploy.rs | 6 +- .../syscalls/syscall_tests/emit_event.rs | 2 +- .../syscalls/syscall_tests/library_call.rs | 14 +-- .../execution/syscalls/syscall_tests/secp.rs | 4 +- .../syscalls/syscall_tests/sha256.rs | 2 +- 7 files changed, 19 insertions(+), 127 deletions(-) diff --git a/crates/blockifier/resources/versioned_constants_0_13_4.json b/crates/blockifier/resources/versioned_constants_0_13_4.json index b000fd3e15f..1d170f9be4b 100644 --- a/crates/blockifier/resources/versioned_constants_0_13_4.json +++ b/crates/blockifier/resources/versioned_constants_0_13_4.json @@ -115,115 +115,7 @@ "validate_block_number_rounding": 100, "validate_timestamp_rounding": 3600 }, - "validated": "VALID", - "syscall_gas_costs": { - "call_contract": { - "entry_point_initial_budget": 1, - "step_gas_cost": 860, - "range_check": 15 - }, - "deploy": { - "entry_point_initial_budget": 1, - "step_gas_cost": 1128, - "range_check": 18, - "pedersen": 7 - }, - "emit_event": { - "step_gas_cost": 100, - "range_check": 1 - }, - "get_block_hash": { - "step_gas_cost": 104, - "range_check": 2 - }, - "get_execution_info": { - "step_gas_cost": 100, - "range_check": 1 - }, - "keccak": { - "syscall_base_gas_cost": 1 - }, - "keccak_round_cost": 180000, - "library_call": { - "entry_point_initial_budget": 1, - "step_gas_cost": 836, - "range_check": 15 - }, - "sha256_process_block": { - "step_gas_cost": 1855, - "range_check": 65, - "bitwise": 1115, - "syscall_base_gas_cost": 1 - }, - "replace_class": { - "step_gas_cost": 104, - "range_check": 1 - }, - "secp256k1_add": { - "range_check": 29, - "step_gas_cost": 410 - }, - "secp256k1_get_point_from_x": { - "memory_hole_gas_cost": 20, - "range_check": 30, - "step_gas_cost": 395 - }, - "secp256k1_get_xy": { - "memory_hole_gas_cost": 40, - "range_check": 11, - "step_gas_cost": 207 - }, - "secp256k1_mul": { - "memory_hole_gas_cost": 2, - "range_check": 7045, - "step_gas_cost": 76505 - }, - "secp256k1_new": { - "memory_hole_gas_cost": 40, - "range_check": 35, - "step_gas_cost": 461 - }, - "secp256r1_add": { - "range_check": 57, - "step_gas_cost": 593 - }, - "secp256r1_get_point_from_x": { - "memory_hole_gas_cost": 20, - "range_check": 44, - "step_gas_cost": 514 - }, - "secp256r1_get_xy": { - "memory_hole_gas_cost": 40, - "range_check": 11, - "step_gas_cost": 209 - }, - "secp256r1_mul": { - "memory_hole_gas_cost": 2, - "range_check": 13961, - "step_gas_cost": 125344 - }, - "secp256r1_new": { - "memory_hole_gas_cost": 40, - "range_check": 49, - "step_gas_cost": 580 - }, - "send_message_to_l1": { - "step_gas_cost": 141, - "range_check": 1 - }, - "storage_read": { - "step_gas_cost": 100, - "range_check": 1 - }, - "storage_write": { - "step_gas_cost": 100, - "range_check": 1 - }, - "get_class_hash_at": { - "step_gas_cost": 100, - "range_check": 1 - } - } + "validated": "VALID" }, "os_resources": { "execute_syscalls": { diff --git a/crates/blockifier/src/execution/syscalls/syscall_tests/constants.rs b/crates/blockifier/src/execution/syscalls/syscall_tests/constants.rs index ff3ebd021d2..8e34491bff3 100644 --- a/crates/blockifier/src/execution/syscalls/syscall_tests/constants.rs +++ b/crates/blockifier/src/execution/syscalls/syscall_tests/constants.rs @@ -1,4 +1,4 @@ -pub const REQUIRED_GAS_CALL_CONTRACT_TEST: u64 = 120370; -pub const REQUIRED_GAS_STORAGE_READ_WRITE_TEST: u64 = 16990; -pub const REQUIRED_GAS_GET_CLASS_HASH_AT_TEST: u64 = 7830; -pub const REQUIRED_GAS_LIBRARY_CALL_TEST: u64 = 117970; +pub const REQUIRED_GAS_CALL_CONTRACT_TEST: u64 = 110830; +pub const REQUIRED_GAS_STORAGE_READ_WRITE_TEST: u64 = 16920; +pub const REQUIRED_GAS_GET_CLASS_HASH_AT_TEST: u64 = 7760; +pub const REQUIRED_GAS_LIBRARY_CALL_TEST: u64 = 108430; diff --git a/crates/blockifier/src/execution/syscalls/syscall_tests/deploy.rs b/crates/blockifier/src/execution/syscalls/syscall_tests/deploy.rs index c2428bfeafe..d8c9bf216ac 100644 --- a/crates/blockifier/src/execution/syscalls/syscall_tests/deploy.rs +++ b/crates/blockifier/src/execution/syscalls/syscall_tests/deploy.rs @@ -43,7 +43,7 @@ fn no_constructor(runnable_version: RunnableCairo1) { let deploy_call = &entry_point_call.execute_directly(&mut state).unwrap(); assert_eq!( deploy_call.execution, - CallExecution { retdata: retdata![], gas_consumed: 155200, ..CallExecution::default() } + CallExecution { retdata: retdata![], gas_consumed: 145600, ..CallExecution::default() } ); let deployed_contract_address = calculate_contract_address( @@ -124,7 +124,7 @@ fn with_constructor(runnable_version: RunnableCairo1) { let deploy_call = &entry_point_call.execute_directly(&mut state).unwrap(); assert_eq!( deploy_call.execution, - CallExecution { retdata: retdata![], gas_consumed: 164550, ..CallExecution::default() } + CallExecution { retdata: retdata![], gas_consumed: 154880, ..CallExecution::default() } ); let constructor_call = &deploy_call.inner_calls[0]; @@ -136,7 +136,7 @@ fn with_constructor(runnable_version: RunnableCairo1) { // The test contract constructor returns its first argument. retdata: retdata![constructor_calldata[0]], // This reflects the gas cost of storage write syscall. - gas_consumed: 4610, + gas_consumed: 4540, ..CallExecution::default() } ); diff --git a/crates/blockifier/src/execution/syscalls/syscall_tests/emit_event.rs b/crates/blockifier/src/execution/syscalls/syscall_tests/emit_event.rs index f45e9aa2570..15675f2b4d4 100644 --- a/crates/blockifier/src/execution/syscalls/syscall_tests/emit_event.rs +++ b/crates/blockifier/src/execution/syscalls/syscall_tests/emit_event.rs @@ -41,7 +41,7 @@ fn positive_flow(runnable_version: RunnableCairo1) { call_info.execution, CallExecution { events: vec![OrderedEvent { order: 0, event }], - gas_consumed: 47330, + gas_consumed: 47260, ..Default::default() } ); diff --git a/crates/blockifier/src/execution/syscalls/syscall_tests/library_call.rs b/crates/blockifier/src/execution/syscalls/syscall_tests/library_call.rs index b2d7e38d3f3..ff2b87af6d9 100644 --- a/crates/blockifier/src/execution/syscalls/syscall_tests/library_call.rs +++ b/crates/blockifier/src/execution/syscalls/syscall_tests/library_call.rs @@ -84,7 +84,7 @@ fn test_library_call_assert_fails(runnable_version: RunnableCairo1) { // 'ENTRYPOINT_FAILED'. felt!("0x454e545259504f494e545f4641494c4544") ]), - gas_consumed: 100980, + gas_consumed: 91580, failed: true, ..Default::default() } @@ -124,7 +124,7 @@ fn test_nested_library_call(runnable_version: RunnableCairo1) { class_hash: Some(test_class_hash), code_address: None, call_type: CallType::Delegate, - initial_gas: 9999085960, + initial_gas: 9999104760, ..trivial_external_entry_point_new(test_contract) }; let library_entry_point = CallEntryPoint { @@ -139,16 +139,16 @@ fn test_nested_library_call(runnable_version: RunnableCairo1) { class_hash: Some(test_class_hash), code_address: None, call_type: CallType::Delegate, - initial_gas: 9999186940, + initial_gas: 9999196340, ..trivial_external_entry_point_new(test_contract) }; let storage_entry_point = CallEntryPoint { calldata: calldata![felt!(key), felt!(value)], - initial_gas: 9998984320, + initial_gas: 9999012660, ..nested_storage_entry_point }; - let storage_entry_point_gas = GasAmount(16990); + let storage_entry_point_gas = GasAmount(16850); // The default VersionedConstants is used in the execute_directly call bellow. let tracked_resource = test_contract.get_runnable_class().tracked_resource( @@ -177,7 +177,7 @@ fn test_nested_library_call(runnable_version: RunnableCairo1) { gas_consumed: REQUIRED_GAS_LIBRARY_CALL_TEST, ..CallExecution::default() }, - charged_resources: ChargedResources::from_gas(GasAmount(117970)), + charged_resources: ChargedResources::from_gas(GasAmount(108430)), inner_calls: vec![nested_storage_call_info], tracked_resource, ..Default::default() @@ -197,7 +197,7 @@ fn test_nested_library_call(runnable_version: RunnableCairo1) { ..Default::default() }; - let main_gas_consumed = 325110; + let main_gas_consumed = 296630; let expected_call_info = CallInfo { call: main_entry_point.clone(), execution: CallExecution { diff --git a/crates/blockifier/src/execution/syscalls/syscall_tests/secp.rs b/crates/blockifier/src/execution/syscalls/syscall_tests/secp.rs index a6ff6d624f4..9f7069c9692 100644 --- a/crates/blockifier/src/execution/syscalls/syscall_tests/secp.rs +++ b/crates/blockifier/src/execution/syscalls/syscall_tests/secp.rs @@ -25,7 +25,7 @@ fn test_secp256k1(runnable_version: RunnableCairo1) { pretty_assertions::assert_eq!( entry_point_call.execute_directly(&mut state).unwrap().execution, - CallExecution { gas_consumed: 17033486, ..Default::default() } + CallExecution { gas_consumed: 17202553, ..Default::default() } ); } @@ -45,6 +45,6 @@ fn test_secp256r1(runnable_version: RunnableCairo1) { pretty_assertions::assert_eq!( entry_point_call.execute_directly(&mut state).unwrap().execution, - CallExecution { gas_consumed: 27562930, ..Default::default() } + CallExecution { gas_consumed: 27560090, ..Default::default() } ); } diff --git a/crates/blockifier/src/execution/syscalls/syscall_tests/sha256.rs b/crates/blockifier/src/execution/syscalls/syscall_tests/sha256.rs index bf9b9cd36ff..daf6ab84887 100644 --- a/crates/blockifier/src/execution/syscalls/syscall_tests/sha256.rs +++ b/crates/blockifier/src/execution/syscalls/syscall_tests/sha256.rs @@ -26,6 +26,6 @@ fn test_sha256(runnable_version: RunnableCairo1) { pretty_assertions::assert_eq!( entry_point_call.execute_directly(&mut state).unwrap().execution, - CallExecution { gas_consumed: 881425, ..CallExecution::from_retdata(retdata![]) } + CallExecution { gas_consumed: 872425, ..CallExecution::from_retdata(retdata![]) } ); }