blockifier: clean get_execution_info syscall test (#11355)

Author: meship-starkware

crates/blockifier/src/execution/syscalls/syscall_tests/get_execution_info.rs

@@ -303,31 +303,48 @@ use crate::transaction::test_utils::proof_facts_as_cairo_array;
     false,
     true;
     "Exclude l1 data gas: query")]
+/// Tests the `get_execution_info` syscall by invoking `test_get_execution_info` across multiple
+/// contract implementations and transaction variants.
+///
+/// Contracts covered:
+/// - `TestContract` (Cairo 1): uses `get_execution_info_v3_syscall()`, expects V3 `TxInfo`.
+/// - `SierraExecutionInfoV1Contract` (Cairo 1): uses `get_execution_info_syscall()`, expects V1
+///   `TxInfo`.
+/// - `LegacyTestContract` (Cairo 0, compiler v2.1.0): uses `get_execution_info()`, expects V1
+///   `TxInfo`.
+///
+/// The test matrix varies execution mode (`Validate` vs `Execute`), tx version (V1 vs V3),
+/// query mode, and special account behaviors (v1-bound / data-gas / high-tip).
+/// In `Validate`, block info fields are rounded/zeroed; in `Execute`, they are populated normally.
+
 fn test_get_execution_info(
     test_contract: FeatureContract,
     execution_mode: ExecutionMode,
-    mut version: TransactionVersion,
+    version: TransactionVersion,
     only_query: bool,
     v1_bound_account: bool,
     // Whether the tip is larger than `v1_bound_accounts_max_tip`.
     high_tip: bool,
     exclude_l1_data_gas: bool,
 ) {
     let mut test_contract_data: FeatureContractData = test_contract.into();
+
+    // Override class hash for special account types that affect execution info behavior.
     if v1_bound_account {
         assert!(
             !exclude_l1_data_gas,
             "Unable to set both exclude_l1_data_gas and v1_bound_account."
         );
-        let optional_class_hash =
-            VersionedConstants::latest_constants().os_constants.v1_bound_accounts_cairo1.first();
-        test_contract_data.class_hash =
-            *optional_class_hash.expect("No v1 bound accounts found in versioned constants.");
+        test_contract_data.class_hash = *VersionedConstants::latest_constants()
+            .os_constants
+            .v1_bound_accounts_cairo1
+            .first()
+            .expect("No v1 bound accounts found in versioned constants.");
     } else if exclude_l1_data_gas {
         test_contract_data.class_hash =
             *VersionedConstants::latest_constants().os_constants.data_gas_accounts.first().unwrap();
     }
-    // Set the erc20 version to be the same as the test contract version.
+
     let erc20_version = test_contract.cairo_version();
     let state = &mut test_state_inner(
         &ChainInfo::create_for_testing(),
@@ -336,6 +353,8 @@ fn test_get_execution_info(
         &HashVersion::V2,
         erc20_version,
     );
+
+    // Build expected block info.
     let expected_block_info = match execution_mode {
         ExecutionMode::Validate => [
             // Rounded block number.
@@ -351,56 +370,15 @@ fn test_get_execution_info(
         ],
     };
 
+    // Build transaction fields.
     let test_contract_address = test_contract.get_instance_address(0);
-
-    // Transaction tip.
-    let tip = Tip(VersionedConstants::latest_constants().os_constants.v1_bound_accounts_max_tip.0
-        + if high_tip { 1 } else { 0 });
-    let expected_tip = if version == TransactionVersion::THREE { tip } else { Tip(0) };
-
     let tx_hash = tx_hash!(1991);
-
-    let (expected_unsupported_fields, expected_signature) = match test_contract {
-        FeatureContract::LegacyTestContract => {
-            // Read and parse file content.
-            let raw_contract: serde_json::Value =
-                serde_json::from_str(&test_contract.get_raw_class()).expect("Error parsing JSON");
-            // Verify version.
-            if let Some(compiler_version) = raw_contract["compiler_version"].as_str() {
-                assert_eq!(compiler_version, "2.1.0");
-            } else {
-                panic!("'compiler_version' not found or not a valid string in JSON.");
-            };
-            (vec![], vec![])
-        }
-        #[cfg(feature = "cairo_native")]
-        FeatureContract::SierraExecutionInfoV1Contract(RunnableCairo1::Native) => (vec![], vec![]),
-        _ => {
-            (
-                vec![
-                    expected_tip.into(), // Tip.
-                    Felt::ZERO,          // Paymaster data.
-                    Felt::ZERO,          // Nonce DA.
-                    Felt::ZERO,          // Fee DA.
-                    Felt::ZERO,          // Account data.
-                ],
-                vec![tx_hash.0],
-            )
-        }
-    };
-
-    let mut expected_version = if v1_bound_account && !high_tip { 1.into() } else { version.0 };
-    if only_query {
-        let simulate_version_base = *QUERY_VERSION_BASE;
-        let query_version = simulate_version_base + version.0;
-        version = TransactionVersion(query_version);
-        expected_version += simulate_version_base;
-    }
-
-    let max_fee = Fee(42);
+    let max_fee = if version == TransactionVersion::ONE { Fee(42) } else { Fee(0) };
     let nonce = nonce!(3_u16);
     let sender_address = test_contract_address;
-    let signature = TransactionSignature(Arc::new(expected_signature));
+    let tip = Tip(VersionedConstants::latest_constants().os_constants.v1_bound_accounts_max_tip.0
+        + if high_tip { 1 } else { 0 });
+    let expected_tip = if version == TransactionVersion::THREE { tip } else { Tip(0) };
 
     let resource_bounds =
         ResourceBounds { max_amount: GasAmount(13), max_price_per_unit: GasPrice(61) };
@@ -410,116 +388,125 @@ fn test_get_execution_info(
         l1_data_gas: resource_bounds,
     });
 
-    let expected_resource_bounds: Vec<Felt> = match (test_contract, version) {
-        (FeatureContract::LegacyTestContract, _) => vec![],
+    // Sanity check: verify legacy contract has expected compiler version.
+    if matches!(test_contract, FeatureContract::LegacyTestContract) {
+        let raw_contract: serde_json::Value =
+            serde_json::from_str(&test_contract.get_raw_class()).expect("Error parsing JSON");
+        let compiler_version = raw_contract["compiler_version"]
+            .as_str()
+            .expect("'compiler_version' not found or not a valid string in JSON.");
+        assert_eq!(compiler_version, "2.1.0");
+    }
+
+    let expected_signature = match test_contract {
+        FeatureContract::LegacyTestContract => vec![],
         #[cfg(feature = "cairo_native")]
-        (FeatureContract::SierraExecutionInfoV1Contract(RunnableCairo1::Native), _) => vec![],
-        (_, version) if version == TransactionVersion::ONE => vec![
-            felt!(0_u16), // Length of resource bounds array.
-        ],
-        (_, _) => {
-            vec![felt!(if exclude_l1_data_gas { 2_u8 } else { 3_u8 })] // Length of resource bounds array.
-                .into_iter()
-                .chain(
-                    valid_resource_bounds_as_felts(&all_resource_bounds, exclude_l1_data_gas)
-                        .unwrap()
-                        .into_iter()
-                        .flat_map(|bounds| bounds.flatten()),
-                )
-                .collect()
-        }
+        FeatureContract::SierraExecutionInfoV1Contract(RunnableCairo1::Native) => vec![],
+        FeatureContract::TestContract(_) => vec![tx_hash.0],
+        _ => panic!("Unsupported contract for this test."),
     };
+    let signature = TransactionSignature(Arc::new(expected_signature));
 
-    // Only transaction V3 supports non-trivial proof facts.
-    // TODO(Meshi): Make sure we do not change the version or the transaction.
-    let proof_facts = if version == TransactionVersion::ONE {
-        ProofFacts::default()
-    } else {
+    let mut expected_version = if v1_bound_account && !high_tip { 1.into() } else { version.0 };
+    if only_query {
+        expected_version += *QUERY_VERSION_BASE;
+    }
+
+    // Only V3 transactions support non-trivial proof facts.
+    let proof_facts = if version == TransactionVersion::THREE {
         ProofFacts::snos_proof_facts_for_testing()
+    } else {
+        ProofFacts::default()
     };
 
-    let expected_tx_info: Vec<Felt>;
-    let tx_info: TransactionInfo;
-    if version == TransactionVersion::ONE {
-        expected_tx_info = vec![
-            expected_version,                     // Transaction version.
-            *sender_address.0.key(),              // Account address.
-            felt!(max_fee.0),                     // Max fee.
-            Felt::ZERO,                           // Signature.
-            tx_hash.0,                            // Transaction hash.
-            felt!(&*CHAIN_ID_FOR_TESTS.as_hex()), // Chain ID.
-            nonce.0,                              // Nonce.
-        ];
+    // Build transaction info object.
+    let common_fields = CommonAccountFields {
+        transaction_hash: tx_hash,
+        version,
+        signature,
+        nonce,
+        sender_address,
+        only_query,
+    };
 
-        tx_info = TransactionInfo::Deprecated(DeprecatedTransactionInfo {
-            common_fields: CommonAccountFields {
-                transaction_hash: tx_hash,
-                version: TransactionVersion::ONE,
-                signature,
-                nonce,
-                sender_address,
-                only_query,
-            },
-            max_fee,
-        });
+    let tx_info = if version == TransactionVersion::ONE {
+        TransactionInfo::Deprecated(DeprecatedTransactionInfo { common_fields, max_fee })
     } else {
-        expected_tx_info = vec![
-            expected_version,                     // Transaction version.
-            *sender_address.0.key(),              // Account address.
-            Felt::ZERO,                           // Max fee.
-            Felt::ZERO,                           // Signature.
-            tx_hash.0,                            // Transaction hash.
-            felt!(&*CHAIN_ID_FOR_TESTS.as_hex()), // Chain ID.
-            nonce.0,                              // Nonce.
-        ];
-
-        tx_info = TransactionInfo::Current(CurrentTransactionInfo {
-            common_fields: CommonAccountFields {
-                transaction_hash: tx_hash,
-                version: TransactionVersion::THREE,
-                signature,
-                nonce,
-                sender_address,
-                only_query,
-            },
+        TransactionInfo::Current(CurrentTransactionInfo {
+            common_fields,
             resource_bounds: all_resource_bounds,
             tip,
             nonce_data_availability_mode: DataAvailabilityMode::L1,
             fee_data_availability_mode: DataAvailabilityMode::L1,
             paymaster_data: PaymasterData::default(),
             account_deployment_data: AccountDeploymentData::default(),
             proof_facts: proof_facts.clone(),
-        });
-    }
+        })
+    };
 
+    // Build expected calldata to pass to the contract's test_get_execution_info entry point.
+    // The contract will compare the syscall results with the expected values.
     let entry_point_selector = selector_from_name("test_get_execution_info");
+
     let expected_call_info = vec![
-        felt!(0_u16),                   // Caller address.
-        *test_contract_address.0.key(), // Storage address.
-        entry_point_selector.0,         // Entry point selector.
+        felt!(0_u16), // Caller address.
+        *test_contract_address.0.key(),
+        entry_point_selector.0,
     ];
 
-    let expected_proof_facts = proof_facts_as_cairo_array(proof_facts);
-    let mut calldata = vec![
-        expected_block_info.to_vec(),
-        expected_call_info,
-        expected_tx_info,
-        expected_resource_bounds.into_iter().chain(expected_unsupported_fields).collect(),
+    // TxInfo fields (shared between V1 and V3).
+    let expected_tx_info = vec![
+        expected_version,
+        *sender_address.0.key(),
+        felt!(max_fee.0),
+        Felt::ZERO, // Signature
+        tx_hash.0,
+        felt!(&*CHAIN_ID_FOR_TESTS.as_hex()),
+        nonce.0,
     ];
 
-    // Only `TestContract` was updated to call the `get_execution_info_v3` that includes
-    // `proof_facts`. The other contracts continue to call `get_execution_info_v1`, so their
-    // calldata layout must remain unchanged.
+    let mut calldata = vec![expected_block_info.to_vec(), expected_call_info, expected_tx_info];
+
+    // TestContract uses get_execution_info_v3 which includes additional V3 fields.
+    // The LegacyTestContract and SierraExecutionInfoV1Contract use get_execution_info_v1 and don't
+    // expect these fields.
     if matches!(test_contract, FeatureContract::TestContract(_)) {
-        calldata.push(expected_proof_facts);
+        let expected_resource_bounds: Vec<Felt> = if version == TransactionVersion::ONE {
+            vec![felt!(0_u16)] // Empty resource bounds for V1.
+        } else {
+            let num_resources = if exclude_l1_data_gas { 2_u8 } else { 3_u8 };
+            std::iter::once(felt!(num_resources))
+                .chain(
+                    valid_resource_bounds_as_felts(&all_resource_bounds, exclude_l1_data_gas)
+                        .unwrap()
+                        .into_iter()
+                        .flat_map(|bounds| bounds.flatten()),
+                )
+                .collect()
+        };
+
+        let expected_unsupported_fields = vec![
+            expected_tip.into(),
+            Felt::ZERO, // Paymaster data.
+            Felt::ZERO, // Nonce DA mode.
+            Felt::ZERO, // Fee DA mode.
+            Felt::ZERO, // Account deployment data.
+        ];
+
+        calldata.push(
+            expected_resource_bounds.into_iter().chain(expected_unsupported_fields).collect(),
+        );
+        calldata.push(proof_facts_as_cairo_array(proof_facts));
     }
 
+    // Execute and verify.
     let entry_point_call = CallEntryPoint {
         entry_point_selector,
         code_address: None,
         calldata: Calldata(calldata.concat().into()),
         ..trivial_external_entry_point_with_address(test_contract_address)
     };
+
     let result = entry_point_call.execute_directly_given_tx_info(
         state,
         tx_info,