blockifier: add tests to get_execution_info_v3

Author: meship-starkware

crates/blockifier/src/bouncer_test.rs

@@ -777,11 +777,11 @@ fn class_hash_migration_data_from_state(
 
     if should_migrate {
         expect![[r#"
-            103123738
+            103697877
         "#]]
         .assert_debug_eq(&migration_sierra_gas.0);
         expect![[r#"
-            267987710
+            269540840
         "#]]
         .assert_debug_eq(&migration_proving_gas.0);
     } else {

crates/blockifier/src/execution/syscalls/hint_processor.rs

@@ -462,7 +462,9 @@ impl<'a> SyscallHintProcessor<'a> {
                     zero_felt.clone(), // Nonce DA mode.
                     zero_felt.clone(), // Fee DA mode.
                     zero_felt.clone(), // Empty segment of account deployment data (start ptr).
-                    zero_felt,         // Empty segment of account deployment data (end ptr).
+                    zero_felt.clone(), // Empty segment of account deployment data (end ptr).
+                    zero_felt.clone(), // Empty segment of proof_facts (start ptr).
+                    zero_felt,         // Empty segment of proof_facts (end ptr).
                 ]);
             }
         };

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

@@ -22,7 +22,6 @@ use starknet_api::transaction::fields::{
     Calldata,
     Fee,
     PaymasterData,
-    ProofFacts,
     Resource,
     ResourceBounds,
     Tip,
@@ -31,7 +30,7 @@ use starknet_api::transaction::fields::{
 };
 use starknet_api::transaction::{TransactionVersion, QUERY_VERSION_BASE};
 use starknet_api::versioned_constants_logic::VersionedConstantsTrait;
-use starknet_api::{felt, nonce, tx_hash};
+use starknet_api::{felt, nonce, proof_facts, tx_hash};
 use starknet_types_core::felt::Felt;
 use test_case::test_case;
 
@@ -479,8 +478,7 @@ fn test_get_execution_info(
             fee_data_availability_mode: DataAvailabilityMode::L1,
             paymaster_data: PaymasterData::default(),
             account_deployment_data: AccountDeploymentData::default(),
-            // TODO(Meshi): Add proof facts.
-            proof_facts: ProofFacts::default(),
+            proof_facts: proof_facts![felt!(1_u16), felt!(2_u16), felt!(3_u16)],
         });
     }
 
@@ -490,19 +488,35 @@ fn test_get_execution_info(
         *test_contract_address.0.key(), // Storage address.
         entry_point_selector.0,         // Entry point selector.
     ];
+
+    // Transaction V1 doesn't support proof facts.
+    let proof_facts = if version == TransactionVersion::ONE {
+        vec![Felt::ZERO]
+    } else {
+        vec![felt!(3_u16), felt!(1_u16), felt!(2_u16), felt!(3_u16)]
+    };
+
+    let calldata = match test_contract {
+        // We only changed the 'test_get_execution_info' logic in the test contract to make sure the
+        // other tests still checks the old behavior.
+        FeatureContract::TestContract(_) => vec![
+            expected_block_info.to_vec(),
+            expected_tx_info,
+            expected_resource_bounds.into_iter().chain(expected_unsupported_fields).collect(),
+            proof_facts,
+            expected_call_info,
+        ],
+        _ => vec![
+            expected_block_info.to_vec(),
+            expected_tx_info,
+            expected_resource_bounds.into_iter().chain(expected_unsupported_fields).collect(),
+            expected_call_info,
+        ],
+    };
     let entry_point_call = CallEntryPoint {
         entry_point_selector,
         code_address: None,
-        calldata: Calldata(
-            [
-                expected_block_info.to_vec(),
-                expected_tx_info,
-                expected_resource_bounds.into_iter().chain(expected_unsupported_fields).collect(),
-                expected_call_info,
-            ]
-            .concat()
-            .into(),
-        ),
+        calldata: Calldata(calldata.concat().into()),
         ..trivial_external_entry_point_with_address(test_contract_address)
     };
     let result = entry_point_call.execute_directly_given_tx_info(

crates/blockifier/src/transaction/test_utils.rs

@@ -33,6 +33,7 @@ use starknet_api::transaction::fields::{
     Fee,
     GasVectorComputationMode,
     PaymasterData,
+    ProofFacts,
     Resource,
     ResourceBounds,
     TransactionSignature,
@@ -476,6 +477,7 @@ pub struct ExpectedExecutionInfo {
     pub nonce_data_availability_mode: DataAvailabilityMode,
     pub fee_data_availability_mode: DataAvailabilityMode,
     pub account_deployment_data: AccountDeploymentData,
+    pub proof_facts: ProofFacts,
     pub caller_address: ContractAddress,
     pub contract_address: ContractAddress,
     pub entry_point_selector: EntryPointSelector,
@@ -498,6 +500,7 @@ impl ExpectedExecutionInfo {
         sequencer_address: ContractAddress,
         resource_bounds: ValidResourceBounds,
         nonce: Nonce,
+        proof_facts: ProofFacts,
     ) -> Self {
         let mut version = Felt::THREE;
         if only_query {
@@ -515,6 +518,7 @@ impl ExpectedExecutionInfo {
             sequencer_address,
             resource_bounds,
             nonce,
+            proof_facts,
             max_fee: Fee::default(),
             transaction_hash: TransactionHash::default(),
             paymaster_data: PaymasterData::default(),
@@ -572,12 +576,18 @@ impl ExpectedExecutionInfo {
             felt!(self.block_timestamp.0),
             **self.sequencer_address,
         ];
+        let mut proof_facts: Vec<Felt> = self.proof_facts.0.to_vec();
+        
+        // For an Array in cairo function we assume the first value is the length of the field.
+        let len: u128 = proof_facts.len().try_into().expect("proof_facts length is too large");
+        proof_facts.insert(0, felt!(len));
 
         [
             expected_block_info,
             expected_tx_info,
             expected_resource_bounds,
             expected_unsupported_fields,
+            proof_facts,
             expected_call_info,
         ]
         .concat()

crates/blockifier/src/transaction/transactions_test.rs

@@ -56,6 +56,7 @@ use starknet_api::transaction::fields::{
     Calldata,
     Fee,
     GasVectorComputationMode,
+    ProofFacts,
     Resource,
     ResourceBounds,
     Tip,
@@ -2647,6 +2648,7 @@ fn test_only_query_flag(
         ContractAddress(felt!(TEST_SEQUENCER_ADDRESS).try_into().unwrap()),
         default_all_resource_bounds,
         Nonce::default(),
+        ProofFacts::default(),
     )
     .to_syscall_result();
     let execute_calldata = vec![