starknet_os_flow_tests: utility method to fund address

Author: dorimedini-starkware

crates/starknet_os_flow_tests/src/test_manager.rs

@@ -11,6 +11,7 @@ use blockifier::state::stateful_compression_test_utils::decompress;
 use blockifier::test_utils::ALIAS_CONTRACT_ADDRESS;
 use blockifier::transaction::objects::TransactionExecutionInfo;
 use blockifier::transaction::transaction_execution::Transaction as BlockifierTransaction;
+use blockifier_test_utils::calldata::create_calldata;
 use blockifier_test_utils::contracts::FeatureContract;
 use itertools::Itertools;
 use starknet_api::abi::abi_utils::get_fee_token_var_address;
@@ -26,10 +27,11 @@ use starknet_api::executable_transaction::{
     L1HandlerTransaction,
     Transaction as StarknetApiTransaction,
 };
+use starknet_api::invoke_tx_args;
 use starknet_api::state::{SierraContractClass, StorageKey};
 use starknet_api::test_utils::invoke::{invoke_tx, InvokeTxArgs};
 use starknet_api::test_utils::{NonceManager, CHAIN_ID_FOR_TESTS};
-use starknet_api::transaction::fields::Calldata;
+use starknet_api::transaction::fields::{Calldata, Tip};
 use starknet_api::transaction::MessageToL1;
 use starknet_committer::block_committer::input::{IsSubset, StarknetStorageKey, StateDiff};
 use starknet_os::io::os_input::{
@@ -60,6 +62,7 @@ use crate::initial_state::{
     OsExecutionContracts,
 };
 use crate::state_trait::FlowTestState;
+use crate::tests::NON_TRIVIAL_RESOURCE_BOUNDS;
 use crate::utils::{
     commit_state_diff,
     create_cached_state_input_and_commitment_infos,
@@ -371,6 +374,32 @@ impl<S: FlowTestState> TestManager<S> {
         });
     }
 
+    pub(crate) fn add_fund_address_tx_with_default_amount(
+        &mut self,
+        address: ContractAddress,
+        nonce_manager: &mut NonceManager,
+    ) {
+        let transfer_amount = 2 * NON_TRIVIAL_RESOURCE_BOUNDS.max_possible_fee(Tip(0)).0;
+        self.add_fund_address_tx(address, nonce_manager, transfer_amount);
+    }
+
+    pub(crate) fn add_fund_address_tx(
+        &mut self,
+        address: ContractAddress,
+        nonce_manager: &mut NonceManager,
+        amount: u128,
+    ) {
+        let transfer_tx_args = invoke_tx_args! {
+            sender_address: *FUNDED_ACCOUNT_ADDRESS,
+            nonce: nonce_manager.next(*FUNDED_ACCOUNT_ADDRESS),
+            calldata: create_calldata(
+                *STRK_FEE_TOKEN_ADDRESS, "transfer", &[**address, Felt::from(amount), Felt::ZERO]
+            ),
+            resource_bounds: *NON_TRIVIAL_RESOURCE_BOUNDS,
+        };
+        self.add_invoke_tx_from_args(transfer_tx_args, &CHAIN_ID_FOR_TESTS, None);
+    }
+
     /// Executes the test using default block contexts, starting from the given block number.
     pub(crate) async fn execute_test_with_default_block_contexts(
         self,

crates/starknet_os_flow_tests/src/tests.rs

@@ -1034,17 +1034,7 @@ async fn test_v1_bound_accounts_cairo1() {
 
     // Transfer funds to the account.
     let transfer_amount = 2 * NON_TRIVIAL_RESOURCE_BOUNDS.max_possible_fee(max_tip).0;
-    let transfer_tx_args = invoke_tx_args! {
-        sender_address: *FUNDED_ACCOUNT_ADDRESS,
-        nonce: nonce_manager.next(*FUNDED_ACCOUNT_ADDRESS),
-        calldata: create_calldata(
-            *STRK_FEE_TOKEN_ADDRESS,
-            "transfer",
-            &[**v1_bound_account_address, Felt::from(transfer_amount), Felt::ZERO]
-        ),
-        resource_bounds: *NON_TRIVIAL_RESOURCE_BOUNDS,
-    };
-    test_manager.add_invoke_tx_from_args(transfer_tx_args, &CHAIN_ID_FOR_TESTS, None);
+    test_manager.add_fund_address_tx(v1_bound_account_address, &mut nonce_manager, transfer_amount);
 
     // Create an invoke tx, compute the hash, sign the hash and update the signature on the tx.
     let invoke_tx_args = invoke_tx_args! {
@@ -1627,18 +1617,8 @@ async fn test_new_class_flow(#[case] use_kzg_da: bool, #[case] n_blocks_in_multi
     )
     .unwrap();
     // Fund the address.
-    let transfer_amount = 2 * NON_TRIVIAL_RESOURCE_BOUNDS.max_possible_fee(Tip(0)).0;
-    let transfer_tx_args = invoke_tx_args! {
-        sender_address: *FUNDED_ACCOUNT_ADDRESS,
-        nonce: nonce_manager.next(*FUNDED_ACCOUNT_ADDRESS),
-        calldata: create_calldata(
-            *STRK_FEE_TOKEN_ADDRESS,
-            "transfer",
-            &[**faulty_account_address, Felt::from(transfer_amount), Felt::ZERO]
-        ),
-        resource_bounds: *NON_TRIVIAL_RESOURCE_BOUNDS,
-    };
-    test_manager.add_invoke_tx_from_args(transfer_tx_args, &CHAIN_ID_FOR_TESTS, None);
+    test_manager
+        .add_fund_address_tx_with_default_amount(faulty_account_address, &mut nonce_manager);
 
     // Create a DeployAccount transaction.
     let deploy_tx_args = deploy_account_tx_args! {
@@ -1789,18 +1769,8 @@ async fn test_deprecated_tx_info() {
     .unwrap();
 
     // Fund the address.
-    let transfer_amount = 2 * NON_TRIVIAL_RESOURCE_BOUNDS.max_possible_fee(Tip(0)).0;
-    let transfer_tx_args = invoke_tx_args! {
-        sender_address: *FUNDED_ACCOUNT_ADDRESS,
-        nonce: nonce_manager.next(*FUNDED_ACCOUNT_ADDRESS),
-        calldata: create_calldata(
-            *STRK_FEE_TOKEN_ADDRESS,
-            "transfer",
-            &[**tx_info_account_address, Felt::from(transfer_amount), Felt::ZERO]
-        ),
-        resource_bounds: *NON_TRIVIAL_RESOURCE_BOUNDS,
-    };
-    test_manager.add_invoke_tx_from_args(transfer_tx_args, &CHAIN_ID_FOR_TESTS, None);
+    test_manager
+        .add_fund_address_tx_with_default_amount(tx_info_account_address, &mut nonce_manager);
 
     // Deploy the account.
     let deploy_tx_args = deploy_account_tx_args! {
@@ -2078,18 +2048,8 @@ async fn test_block_info(#[values(true, false)] is_cairo0: bool) {
     .unwrap();
 
     // Fund the address.
-    let transfer_amount = 2 * NON_TRIVIAL_RESOURCE_BOUNDS.max_possible_fee(Tip(0)).0;
-    let transfer_tx_args = invoke_tx_args! {
-        sender_address: *FUNDED_ACCOUNT_ADDRESS,
-        nonce: nonce_manager.next(*FUNDED_ACCOUNT_ADDRESS),
-        calldata: create_calldata(
-            *STRK_FEE_TOKEN_ADDRESS,
-            "transfer",
-            &[**block_info_account_address, Felt::from(transfer_amount), Felt::ZERO]
-        ),
-        resource_bounds: *NON_TRIVIAL_RESOURCE_BOUNDS,
-    };
-    test_manager.add_invoke_tx_from_args(transfer_tx_args, &CHAIN_ID_FOR_TESTS, None);
+    test_manager
+        .add_fund_address_tx_with_default_amount(block_info_account_address, &mut nonce_manager);
 
     // Deploy the contract using a DeployAccount transaction.
     let deploy_account_tx_args = deploy_account_tx_args! {
@@ -2166,18 +2126,7 @@ async fn test_initial_sierra_gas() {
         .await;
 
     // Fund the account.
-    let transfer_amount = 2 * NON_TRIVIAL_RESOURCE_BOUNDS.max_possible_fee(Tip(0)).0;
-    let fund_tx_args = invoke_tx_args! {
-        sender_address: *FUNDED_ACCOUNT_ADDRESS,
-        nonce: nonce_manager.next(*FUNDED_ACCOUNT_ADDRESS),
-        calldata: create_calldata(
-            *STRK_FEE_TOKEN_ADDRESS,
-            "transfer",
-            &[**account_address, Felt::from(transfer_amount), Felt::ZERO]
-        ),
-        resource_bounds: *NON_TRIVIAL_RESOURCE_BOUNDS,
-    };
-    test_manager.add_invoke_tx_from_args(fund_tx_args, &CHAIN_ID_FOR_TESTS, None);
+    test_manager.add_fund_address_tx_with_default_amount(account_address, &mut nonce_manager);
 
     // Test invoke gas limits.
     let os_constants = &VersionedConstants::latest_constants().os_constants;