blockifier_test_utils: put tx hash in signature for exec info tests

Author: dorimedini-starkware

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

@@ -1,3 +1,5 @@
+use std::sync::Arc;
+
 use blockifier_test_utils::cairo_versions::{CairoVersion, RunnableCairo1};
 use blockifier_test_utils::contracts::FeatureContract;
 use starknet_api::abi::abi_utils::selector_from_name;
@@ -23,6 +25,7 @@ use starknet_api::transaction::fields::{
     Resource,
     ResourceBounds,
     Tip,
+    TransactionSignature,
     ValidResourceBounds,
 };
 use starknet_api::transaction::{TransactionVersion, QUERY_VERSION_BASE};
@@ -352,7 +355,9 @@ fn test_get_execution_info(
         + if high_tip { 1 } else { 0 });
     let expected_tip = if version == TransactionVersion::THREE { tip } else { Tip(0) };
 
-    let expected_unsupported_fields = match test_contract {
+    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 =
@@ -363,20 +368,23 @@ fn test_get_execution_info(
             } else {
                 panic!("'compiler_version' not found or not a valid string in JSON.");
             };
-            vec![]
+            (vec![], vec![])
         }
         #[cfg(feature = "cairo_native")]
         FeatureContract::SierraExecutionInfoV1Contract(RunnableCairo1::Native) => {
-            vec![]
+            (vec![], vec![tx_hash.0])
         }
         _ => {
-            vec![
-                expected_tip.into(), // Tip.
-                Felt::ZERO,          // Paymaster data.
-                Felt::ZERO,          // Nonce DA.
-                Felt::ZERO,          // Fee DA.
-                Felt::ZERO,          // Account data.
-            ]
+            (
+                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],
+            )
         }
     };
 
@@ -388,10 +396,10 @@ fn test_get_execution_info(
         expected_version += simulate_version_base;
     }
 
-    let tx_hash = tx_hash!(1991);
     let max_fee = Fee(42);
     let nonce = nonce!(3_u16);
     let sender_address = test_contract_address;
+    let signature = TransactionSignature(Arc::new(expected_signature));
 
     let resource_bounds =
         ResourceBounds { max_amount: GasAmount(13), max_price_per_unit: GasPrice(61) };
@@ -438,10 +446,10 @@ fn test_get_execution_info(
             common_fields: CommonAccountFields {
                 transaction_hash: tx_hash,
                 version: TransactionVersion::ONE,
+                signature,
                 nonce,
                 sender_address,
                 only_query,
-                ..Default::default()
             },
             max_fee,
         });
@@ -460,10 +468,10 @@ fn test_get_execution_info(
             common_fields: CommonAccountFields {
                 transaction_hash: tx_hash,
                 version: TransactionVersion::THREE,
+                signature,
                 nonce,
                 sender_address,
                 only_query,
-                ..Default::default()
             },
             resource_bounds: all_resource_bounds,
             tip,

crates/blockifier/src/transaction/transactions_test.rs

@@ -25,6 +25,7 @@ use starknet_api::core::{ascii_as_felt, ClassHash, ContractAddress, Nonce};
 use starknet_api::executable_transaction::{
     AccountTransaction as ApiExecutableTransaction,
     DeployAccountTransaction,
+    InvokeTransaction,
     TransactionType,
 };
 use starknet_api::execution_resources::{GasAmount, GasVector};
@@ -35,7 +36,7 @@ use starknet_api::test_utils::deploy_account::{
     executable_deploy_account_tx,
     DeployAccountTxArgs,
 };
-use starknet_api::test_utils::invoke::{executable_invoke_tx, InvokeTxArgs};
+use starknet_api::test_utils::invoke::{executable_invoke_tx, invoke_tx, InvokeTxArgs};
 use starknet_api::test_utils::{
     NonceManager,
     CHAIN_ID_FOR_TESTS,
@@ -66,6 +67,7 @@ use starknet_api::transaction::{
     EventContent,
     EventData,
     EventKey,
+    InvokeTransaction as ApiInvokeTransaction,
     L2ToL1Payload,
     TransactionVersion,
 };
@@ -2606,13 +2608,23 @@ fn test_only_query_flag(
         ), // Calldata length.
     ];
     let execute_calldata = Calldata([execute_calldata, expected_execution_info].concat().into());
-    let tx = executable_invoke_tx(invoke_tx_args! {
+    let invoke_args = invoke_tx_args! {
         calldata: execute_calldata,
         resource_bounds: default_all_resource_bounds,
         sender_address: account_address,
-    });
+    };
+    let invoke_tx =
+        InvokeTransaction::create(invoke_tx(invoke_args), &block_context.chain_info.chain_id)
+            .unwrap();
+    let tx_hash = invoke_tx.tx_hash;
+    let ApiInvokeTransaction::V3(mut tx) = invoke_tx.tx else {
+        panic!("Expected V3 transaction");
+    };
+    tx.signature = TransactionSignature(Arc::new(vec![tx_hash.0]));
+    let invoke_tx = InvokeTransaction { tx: ApiInvokeTransaction::V3(tx), tx_hash };
     let execution_flags = ExecutionFlags { only_query, ..Default::default() };
-    let invoke_tx = AccountTransaction { tx, execution_flags };
+    let invoke_tx =
+        AccountTransaction { tx: ApiExecutableTransaction::Invoke(invoke_tx), execution_flags };
 
     let tx_execution_info = invoke_tx.execute(&mut state, &block_context).unwrap();
     assert_eq!(tx_execution_info.revert_error, None);