starknet_os: initial test, measure call contract resources

dorimedini-starkware · dorimedini-starkware · commit d24049e00db8 · 2026-06-02T14:05:35.000+03:00
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/crates/apollo_starknet_os_program/src/cairo/starkware/starknet/core/os/constants.cairo b/crates/apollo_starknet_os_program/src/cairo/starkware/starknet/core/os/constants.cairo
@@ -71,7 +71,10 @@ const ALLOWED_VIRTUAL_OS_PROGRAM_HASHES_0 = (
 const ALLOWED_VIRTUAL_OS_PROGRAM_HASHES_1 = (
     0x06ecb73d21c7d98ddd4148f5bcd91cc2747c65364245fbf32a63b05cca1685c2
 );
-const ALLOWED_VIRTUAL_OS_PROGRAM_HASHES_LEN = 2;
+const ALLOWED_VIRTUAL_OS_PROGRAM_HASHES_2 = (
+    0x059a0052ae80a978ca71126c9774a17c67c19f79b14bb9d1ea96fb77dc6032d8
+);
+const ALLOWED_VIRTUAL_OS_PROGRAM_HASHES_LEN = 3;
 
 // Gas constants.
 
@@ -104,7 +107,7 @@ const ENTRY_POINT_INITIAL_BUDGET = 10000;
 const SYSCALL_BASE_GAS_COST = 10000;
 
 // Syscall gas costs.
-const CALL_CONTRACT_GAS_COST = 91560;
+const CALL_CONTRACT_GAS_COST = 91360;
 const DEPLOY_GAS_COST = 147120;
 const DEPLOY_CALLDATA_FACTOR_GAS_COST = 4850;
 const GET_BLOCK_HASH_GAS_COST = 10840;
diff --git a/crates/apollo_starknet_os_program/src/cairo/starkware/starknet/core/os/execution/execution_constraints.cairo b/crates/apollo_starknet_os_program/src/cairo/starkware/starknet/core/os/execution/execution_constraints.cairo
@@ -6,6 +6,7 @@ from starkware.cairo.common.math import assert_le, assert_nn_le, assert_not_zero
 from starkware.starknet.core.os.constants import (
     ALLOWED_VIRTUAL_OS_PROGRAM_HASHES_0,
     ALLOWED_VIRTUAL_OS_PROGRAM_HASHES_1,
+    ALLOWED_VIRTUAL_OS_PROGRAM_HASHES_2,
     ALLOWED_VIRTUAL_OS_PROGRAM_HASHES_LEN,
     STORED_BLOCK_HASH_BUFFER,
 )
@@ -25,9 +26,10 @@ func check_is_reverted(is_reverted: felt) {
 
 // Returns TRUE if the given virtual OS program hash is allowed, FALSE otherwise.
 func is_program_hash_allowed(program_hash: felt) -> felt {
-    static_assert ALLOWED_VIRTUAL_OS_PROGRAM_HASHES_LEN == 2;
+    static_assert ALLOWED_VIRTUAL_OS_PROGRAM_HASHES_LEN == 3;
     if ((program_hash - ALLOWED_VIRTUAL_OS_PROGRAM_HASHES_0) *
-        (program_hash - ALLOWED_VIRTUAL_OS_PROGRAM_HASHES_1) == 0) {
+        (program_hash - ALLOWED_VIRTUAL_OS_PROGRAM_HASHES_1) *
+        (program_hash - ALLOWED_VIRTUAL_OS_PROGRAM_HASHES_2) == 0) {
         return TRUE;
     }
     return FALSE;
diff --git a/crates/apollo_starknet_os_program/src/program_hash.json b/crates/apollo_starknet_os_program/src/program_hash.json
@@ -1,6 +1,6 @@
 {
-  "os": "0x783b9a9b8e6204534cd82ea7a594892bff6c44e0cc7cbbc09698e9c66ec9784",
-  "virtual_os": "0x6ecb73d21c7d98ddd4148f5bcd91cc2747c65364245fbf32a63b05cca1685c2",
+  "os": "0x47f5b47e73f1736037ea946704c57d9072f26d12beee01a55d947d87f779436",
+  "virtual_os": "0x59a0052ae80a978ca71126c9774a17c67c19f79b14bb9d1ea96fb77dc6032d8",
   "aggregator": "0x700786d51b3854af43d8e12180380bda3029be6c1767e007858de6ca2edac40",
   "aggregator_with_prefix": "0xe08d300e3f5996e43d6d7cc5a20068e0e58cf1309089f2348317ac580f6c1f"
 }
diff --git a/crates/apollo_starknet_os_program/src/virtual_os_test.rs b/crates/apollo_starknet_os_program/src/virtual_os_test.rs
@@ -19,7 +19,7 @@ fn test_virtual_os_swapped_files() {
 #[test]
 fn test_program_bytecode_lengths() {
     expect![[r#"
-        16392
+        16395
     "#]]
     .assert_debug_eq(&OS_PROGRAM.data_len());
     expect![[r#"
diff --git a/crates/blockifier/resources/blockifier_versioned_constants_0_14_4.json b/crates/blockifier/resources/blockifier_versioned_constants_0_14_4.json
@@ -127,7 +127,8 @@
     "os_constants": {
         "allowed_virtual_os_program_hashes": [
             "0x3e98c2d7703b03a7edb73ed7f075f97f1dcbaa8f717cdf6e1a57bf058265473",
-            "0x6ecb73d21c7d98ddd4148f5bcd91cc2747c65364245fbf32a63b05cca1685c2"
+            "0x6ecb73d21c7d98ddd4148f5bcd91cc2747c65364245fbf32a63b05cca1685c2",
+            "0x59a0052ae80a978ca71126c9774a17c67c19f79b14bb9d1ea96fb77dc6032d8"
         ],
         "constructor_entry_point_selector": "0x28ffe4ff0f226a9107253e17a904099aa4f63a02a5621de0576e5aa71bc5194",
         "default_entry_point_selector": "0x0",
@@ -224,7 +225,7 @@
     "os_resources": {
         "execute_syscalls": {
             "CallContract": {
-                "n_steps": 903,
+                "n_steps": 901,
                 "n_memory_holes": 0,
                 "builtin_instance_counter": {
                     "range_check_builtin": 18
diff --git a/crates/blockifier/resources/versioned_constants_diff_regression/0.14.3_0.14.4.txt b/crates/blockifier/resources/versioned_constants_diff_regression/0.14.3_0.14.4.txt
@@ -1 +1,2 @@
-
++ /os_constants/allowed_virtual_os_program_hashes/2: "0x59a0052ae80a978ca71126c9774a17c67c19f79b14bb9d1ea96fb77dc6032d8"
+~ /os_resources/execute_syscalls/CallContract/n_steps: 901
diff --git a/crates/blockifier/src/blockifier_versioned_constants.rs b/crates/blockifier/src/blockifier_versioned_constants.rs
@@ -98,9 +98,9 @@ pub struct RawVersionedConstants {
     pub os_resources: RawOsResources,
 }
 
-#[cfg(test)]
+#[cfg(any(test, feature = "testing"))]
 impl RawVersionedConstants {
-    fn to_string_pretty(&self) -> String {
+    pub fn to_string_pretty(&self) -> String {
         let mut buffer = Vec::new();
         let formatter = serde_json::ser::PrettyFormatter::with_indent(b"    ");
         let mut serializer = serde_json::Serializer::with_formatter(&mut buffer, formatter);
diff --git a/crates/blockifier/src/execution/syscalls/syscall_tests/call_contract.rs b/crates/blockifier/src/execution/syscalls/syscall_tests/call_contract.rs
@@ -268,7 +268,7 @@ fn test_call_contract(outer_contract: FeatureContract, inner_contract: FeatureCo
             l2_to_l1_messages: [],
             cairo_native: false,
             failed: false,
-            gas_consumed: 191570,
+            gas_consumed: 191370,
         }
     "#]]
     .assert_debug_eq(&execution);
diff --git a/crates/blockifier/src/transaction/transactions_test.rs b/crates/blockifier/src/transaction/transactions_test.rs
@@ -591,15 +591,15 @@ fn add_kzg_da_resources_to_resources_mapping(
         resources: ExtendedExecutionResources::default(),
         validate_gas_consumed: 7820, // The gas consumption results from parsing the input
             // arguments.
-        execute_gas_consumed: 113920,
+        execute_gas_consumed: 113720,
     },
     CairoVersion::Cairo1(RunnableCairo1::Casm))]
 #[cfg_attr(feature = "cairo_native", case::with_cairo1_native_account(
     ExpectedResultTestInvokeTx{
         resources: ExtendedExecutionResources::default(),
         validate_gas_consumed: 7820, // The gas consumption results from parsing the input
             // arguments.
-        execute_gas_consumed: 113920,
+        execute_gas_consumed: 113720,
     },
     CairoVersion::Cairo1(RunnableCairo1::Native)))]
 // TODO(Tzahi): Add calls to cairo1 test contracts (where gas flows to and from the inner call).
diff --git a/crates/blockifier/src/versioned_constants_test.rs b/crates/blockifier/src/versioned_constants_test.rs
@@ -2,7 +2,7 @@ use std::path::PathBuf;
 
 use apollo_infra_utils::compile_time_cargo_manifest_dir;
 use cached::proc_macro::cached;
-use expect_test::expect_file;
+use expect_test::{expect, expect_file, Expect};
 use glob::{glob, Paths};
 use indexmap::IndexMap;
 use pretty_assertions::assert_eq;
@@ -227,24 +227,24 @@ fn test_latest_no_panic() {
 
 #[test]
 fn test_syscall_gas_cost_calculation() {
-    const EXPECTED_CALL_CONTRACT_GAS_COST: u64 = 91560;
-    const EXPECTED_SECP256K1MUL_GAS_COST: u64 = 8143850;
-    const EXPECTED_SHA256PROCESSBLOCK_GAS_COST: u64 = 841295;
+    const EXPECTED_CALL_CONTRACT_GAS_COST: Expect = expect!["91360"];
+    const EXPECTED_SECP256K1MUL_GAS_COST: Expect = expect!["8143850"];
+    const EXPECTED_SHA256PROCESSBLOCK_GAS_COST: Expect = expect!["841295"];
 
     let versioned_constants = VersionedConstants::latest_constants().clone();
 
-    assert_eq!(
-        versioned_constants.os_constants.gas_costs.syscalls.call_contract.base,
-        EXPECTED_CALL_CONTRACT_GAS_COST
-    );
-    assert_eq!(
-        versioned_constants.os_constants.gas_costs.syscalls.secp256k1_mul.base,
-        EXPECTED_SECP256K1MUL_GAS_COST
-    );
-    assert_eq!(
-        versioned_constants.os_constants.gas_costs.syscalls.sha256_process_block.base,
-        EXPECTED_SHA256PROCESSBLOCK_GAS_COST
-    );
+    EXPECTED_CALL_CONTRACT_GAS_COST.assert_eq(&format!(
+        "{}",
+        versioned_constants.os_constants.gas_costs.syscalls.call_contract.base
+    ));
+    EXPECTED_SECP256K1MUL_GAS_COST.assert_eq(&format!(
+        "{}",
+        versioned_constants.os_constants.gas_costs.syscalls.secp256k1_mul.base
+    ));
+    EXPECTED_SHA256PROCESSBLOCK_GAS_COST.assert_eq(&format!(
+        "{}",
+        versioned_constants.os_constants.gas_costs.syscalls.sha256_process_block.base
+    ));
 }
 
 /// Linear gas cost factor of deploy syscall should not be trivial.
diff --git a/crates/blockifier_test_utils/resources/feature_contracts/cairo1/os_resources_test_contract.cairo b/crates/blockifier_test_utils/resources/feature_contracts/cairo1/os_resources_test_contract.cairo
@@ -5,36 +5,34 @@ mod OsResourcesTestContract {
     use starknet::syscalls::call_contract_syscall;
     use starknet::{ClassHash, ContractAddress};
 
-    const EMPTY_FUNCTION_SELECTOR: felt252 = selector!("empty_function");
+    const STABLE_EXTERNAL_ENTRY_POINT_SELECTOR: felt252 = selector!("external");
 
     #[storage]
     struct Storage {}
 
     #[external(v0)]
     fn __validate_declare__(
-        self: @ContractState, class_hash: ClassHash, self_address: ContractAddress,
+        self: @ContractState, stable_class_hash: ClassHash, stable_address: ContractAddress,
     ) -> felt252 {
         starknet::VALIDATED
     }
 
     #[external(v0)]
     fn __validate__(
-        self: @ContractState, self_class_hash: ClassHash, self_address: ContractAddress,
+        self: @ContractState, stable_class_hash: ClassHash, stable_address: ContractAddress,
     ) -> felt252 {
         starknet::VALIDATED
     }
 
     // Calls every measured syscall in order.
     #[external(v0)]
     fn __execute__(
-        ref self: ContractState, self_class_hash: ClassHash, self_address: ContractAddress,
+        ref self: ContractState, stable_class_hash: ClassHash, stable_address: ContractAddress,
     ) {
-        // call_contract syscall — calls empty_function on self.
-        call_contract_syscall(self_address, EMPTY_FUNCTION_SELECTOR, ArrayTrait::new().span())
+        // call_contract syscall — calls external function on stable contract.
+        call_contract_syscall(
+            stable_address, STABLE_EXTERNAL_ENTRY_POINT_SELECTOR, array![0].span(),
+        )
             .unwrap_syscall();
     }
-
-    // Target for call_contract and library_call — accepts no arguments.
-    #[external(v0)]
-    fn empty_function(self: @ContractState) {}
 }
diff --git a/crates/central_systest_blobs/resources/blob_file_generation b/crates/central_systest_blobs/resources/blob_file_generation
@@ -1 +1 @@
-26
+28
diff --git a/crates/central_systest_blobs/resources/preconfirmed_block.json b/crates/central_systest_blobs/resources/preconfirmed_block.json
@@ -20,13 +20,13 @@
     "timestamp": 1013,
     "transaction_receipts": [
       {
-        "actual_fee": "0x1089a9",
+        "actual_fee": "0x108751",
         "events": [
           {
             "data": [
               "0x3d3759cf036b96f8105f40dcf3fe0c209be3419154aa458d03336ad0443ce81",
               "0x1000",
-              "0x1089a9",
+              "0x108751",
               "0x0"
             ],
             "from_address": "0x6c6a50ee425e9ff35846be376051b8cdbdc1aadc6c954209fe3fd247a571b33",
@@ -51,7 +51,7 @@
           "total_gas_consumed": {
             "l1_data_gas": 0,
             "l1_gas": 1652,
-            "l2_gas": 1082165
+            "l2_gas": 1081565
           }
         },
         "execution_status": "SUCCEEDED",
@@ -74,11 +74,11 @@
           "0x6c6a50ee425e9ff35846be376051b8cdbdc1aadc6c954209fe3fd247a571b33": [
             {
               "key": "0x2cbac7495ce24b399327e9282b09d029b1dd772b24b7e8dcd0467fedab5af58",
-              "value": "0xffffffffffffffffffffffff95c51f43"
+              "value": "0xffffffffffffffffffffffff95c528a3"
             },
             {
               "key": "0x723973208639b7839ce298f7ffea61e3f9533872defd7abdb91023db4658812",
-              "value": "0x6a3ae0bc"
+              "value": "0x6a3ad75c"
             }
           ]
         }
diff --git a/crates/starknet_api/src/versioned_constants_logic.rs b/crates/starknet_api/src/versioned_constants_logic.rs
@@ -25,6 +25,9 @@ pub trait VersionedConstantsTrait: Debug {
     /// Gets the first version with versioned constants.
     fn first_version() -> StarknetVersion;
 
+    /// Gets the path to the JSON file for the specified Starknet version.
+    fn json_path(version: &StarknetVersion) -> Result<String, Self::Error>;
+
     /// Gets the contents of the JSON file for the specified Starknet version.
     fn json_str(version: &StarknetVersion) -> Result<&'static str, Self::Error>;
 
@@ -161,6 +164,17 @@ macro_rules! define_versioned_constants_inner {
                 $first_version
             }
 
+            fn json_path(version: &StarknetVersion) -> Result<String, Self::Error> {
+                Ok(format!(
+                    "{}/src/{}",
+                    env!("CARGO_MANIFEST_DIR"),
+                    match version {
+                        $(StarknetVersion::$variant => $path_to_json.to_string(),)*
+                        _ => return Err(Self::Error::InvalidStarknetVersion(*version)),
+                    }
+                ))
+            }
+
             fn json_str(
                 version: &starknet_api::block::StarknetVersion
             ) -> Result<&'static str, Self::Error> {
diff --git a/crates/starknet_os/src/hint_processor/os_logger.rs b/crates/starknet_os/src/hint_processor/os_logger.rs
@@ -96,6 +96,11 @@ impl SyscallTrace {
     pub fn push_inner_syscall(&mut self, inner: SyscallTrace) {
         self.inner_syscalls.push(inner);
     }
+
+    #[cfg(any(test, feature = "testing"))]
+    pub fn get_selector(&self) -> SyscallSelector {
+        self.selector
+    }
 }
 
 impl ResourceFinalizer for SyscallTrace {
@@ -156,6 +161,11 @@ impl OsTransactionTrace {
     pub fn push_syscall(&mut self, syscall: SyscallTrace) {
         self.syscalls.push(syscall);
     }
+
+    #[cfg(any(test, feature = "testing"))]
+    pub fn get_syscalls(&self) -> &Vec<SyscallTrace> {
+        &self.syscalls
+    }
 }
 
 impl ResourceFinalizer for OsTransactionTrace {
diff --git a/crates/starknet_os_flow_tests/Cargo.toml b/crates/starknet_os_flow_tests/Cargo.toml
@@ -21,6 +21,7 @@ cairo-lang-starknet-classes.workspace = true
 cairo-vm.workspace = true
 chrono.workspace = true
 expect-test.workspace = true
+indexmap.workspace = true
 itertools.workspace = true
 rand.workspace = true
 rand_chacha.workspace = true
diff --git a/crates/starknet_os_flow_tests/src/initial_state.rs b/crates/starknet_os_flow_tests/src/initial_state.rs
@@ -335,13 +335,30 @@ pub(crate) fn get_deploy_contract_tx_and_address_with_salt(
     nonce: Nonce,
     resource_bounds: ValidResourceBounds,
     contract_address_salt: ContractAddressSalt,
+) -> (InvokeTransaction, ContractAddress) {
+    get_deploy_contract_tx_and_address_with_salt_and_deployer(
+        class_hash,
+        ctor_calldata,
+        nonce,
+        resource_bounds,
+        contract_address_salt,
+        false,
+    )
+}
+
+pub(crate) fn get_deploy_contract_tx_and_address_with_salt_and_deployer(
+    class_hash: ClassHash,
+    ctor_calldata: Calldata,
+    nonce: Nonce,
+    resource_bounds: ValidResourceBounds,
+    contract_address_salt: ContractAddressSalt,
+    deploy_from_zero: bool,
 ) -> (InvokeTransaction, ContractAddress) {
     let calldata = [class_hash.0, contract_address_salt.0, ctor_calldata.0.len().into()]
         .iter()
         .chain(ctor_calldata.0.iter())
         .cloned()
-        // deploy_from_zero
-        .chain(vec![false.into()])
+        .chain(vec![deploy_from_zero.into()])
         .collect::<Vec<Felt>>();
 
     let deploy_contract_calldata = create_calldata(
@@ -364,7 +381,7 @@ pub(crate) fn get_deploy_contract_tx_and_address_with_salt(
         contract_address_salt,
         class_hash,
         &ctor_calldata,
-        *FUNDED_ACCOUNT_ADDRESS,
+        if deploy_from_zero { ContractAddress::default() } else { *FUNDED_ACCOUNT_ADDRESS },
     )
     .unwrap();
     (deploy_contract_tx, contract_address)
diff --git a/crates/starknet_os_flow_tests/src/lib.rs b/crates/starknet_os_flow_tests/src/lib.rs
@@ -2,6 +2,7 @@
 
 pub(crate) mod fuzz_tests;
 pub(crate) mod initial_state;
+pub(crate) mod os_resources_test;
 pub(crate) mod special_contracts;
 pub(crate) mod test_manager;
 pub(crate) mod tests;
diff --git a/crates/starknet_os_flow_tests/src/os_resources_test.rs b/crates/starknet_os_flow_tests/src/os_resources_test.rs
diff --git a/crates/starknet_os_flow_tests/src/special_contracts.rs b/crates/starknet_os_flow_tests/src/special_contracts.rs

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`		`- "os": "0x783b9a9b8e6204534cd82ea7a594892bff6c44e0cc7cbbc09698e9c66ec9784",`
`3`		`- "virtual_os": "0x6ecb73d21c7d98ddd4148f5bcd91cc2747c65364245fbf32a63b05cca1685c2",`
	`2`	`+ "os": "0x47f5b47e73f1736037ea946704c57d9072f26d12beee01a55d947d87f779436",`
	`3`	`+ "virtual_os": "0x59a0052ae80a978ca71126c9774a17c67c19f79b14bb9d1ea96fb77dc6032d8",`
`4`	`4`	`"aggregator": "0x700786d51b3854af43d8e12180380bda3029be6c1767e007858de6ca2edac40",`
`5`	`5`	`"aggregator_with_prefix": "0xe08d300e3f5996e43d6d7cc5a20068e0e58cf1309089f2348317ac580f6c1f"`
`6`	`6`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1 +1,2 @@`
`1`		`-`
	`1`	`++ /os_constants/allowed_virtual_os_program_hashes/2: "0x59a0052ae80a978ca71126c9774a17c67c19f79b14bb9d1ea96fb77dc6032d8"`
	`2`	`+~ /os_resources/execute_syscalls/CallContract/n_steps: 901`
Original file line number	Diff line number	Diff line change
`@@ -268,7 +268,7 @@ fn test_call_contract(outer_contract: FeatureContract, inner_contract: FeatureCo`
`268`	`268`	`l2_to_l1_messages: [],`
`269`	`269`	`cairo_native: false,`
`270`	`270`	`failed: false,`
`271`		`- gas_consumed: 191570,`
	`271`	`+ gas_consumed: 191370,`
`272`	`272`	`}`
`273`	`273`	`"#]]`
`274`	`274`	`.assert_debug_eq(&execution);`