chore: fix merge conflicts against main; refine common fixture usage

Author: aorumbayev

crates/algokit_utils/src/applications/app_client/abi_integration.rs

@@ -4,7 +4,7 @@ use base64::Engine;
 use std::str::FromStr;
 
 use super::AppClient;
-use crate::transactions::{AppCallMethodCallParams, AppMethodCallArg, CommonParams};
+use crate::transactions::{AppCallMethodCallParams, AppMethodCallArg, CommonTransactionParams};
 
 impl AppClient {
     fn build_method_call_params_no_defaults(
@@ -18,7 +18,7 @@ impl AppClient {
             .map_err(|e| e.to_string())?
             .to_abi_method()
             .map_err(|e| e.to_string())?;
-        let common_params = CommonParams {
+        let common_params = CommonTransactionParams {
             sender: self.get_sender_address(&sender.map(|s| s.to_string()))?,
             signer: None,
             rekey_to: None,

crates/algokit_utils/src/applications/app_client/params_builder.rs

@@ -3,7 +3,8 @@ use algokit_transact::OnApplicationComplete;
 use std::str::FromStr;
 
 use crate::transactions::{
-    AppCallMethodCallParams, AppCallParams, AppMethodCallArg, CommonParams, PaymentParams,
+    AppCallMethodCallParams, AppCallParams, AppMethodCallArg, CommonTransactionParams,
+    PaymentParams,
 };
 
 use super::AppClient;
@@ -80,7 +81,7 @@ impl<'a> ParamsBuilder<'a> {
         let rekey_to = AppClient::get_optional_address(&params.rekey_to)?;
 
         Ok(PaymentParams {
-            common_params: CommonParams {
+            common_params: CommonTransactionParams {
                 sender,
                 signer: None,
                 rekey_to,
@@ -146,8 +147,8 @@ impl<'a> ParamsBuilder<'a> {
     fn build_common_params_from_method(
         &self,
         params: &AppClientMethodCallParams,
-    ) -> Result<CommonParams, String> {
-        Ok(CommonParams {
+    ) -> Result<CommonTransactionParams, String> {
+        Ok(CommonTransactionParams {
             sender: self.client.get_sender_address(&params.sender)?,
             signer: None,
             rekey_to: AppClient::get_optional_address(&params.rekey_to)?,
@@ -284,8 +285,8 @@ impl BareParamsBuilder<'_> {
     fn build_common_params_from_bare(
         &self,
         params: &AppClientBareCallParams,
-    ) -> Result<CommonParams, String> {
-        Ok(CommonParams {
+    ) -> Result<CommonTransactionParams, String> {
+        Ok(CommonTransactionParams {
             sender: self.client.get_sender_address(&params.sender)?,
             signer: None,
             rekey_to: AppClient::get_optional_address(&params.rekey_to)?,

crates/algokit_utils/src/applications/app_client/sender.rs

@@ -126,7 +126,7 @@ impl<'a> TransactionSender<'a> {
                 })?
         };
 
-        let common_params = crate::transactions::CommonParams {
+        let common_params = crate::transactions::CommonTransactionParams {
             sender: self
                 .client
                 .get_sender_address(&params.sender)

crates/algokit_utils/src/applications/app_client/transaction_builder.rs

@@ -124,7 +124,7 @@ impl TransactionBuilder<'_> {
         };
 
         // Build AppUpdateMethodCallParams
-        let common_params = crate::transactions::CommonParams {
+        let common_params = crate::transactions::CommonTransactionParams {
             sender: self
                 .client
                 .get_sender_address(&params.sender)

crates/algokit_utils/src/applications/app_client/types.rs

@@ -45,7 +45,7 @@ pub struct FundAppAccountParams {
     pub static_fee: Option<u64>,
     pub extra_fee: Option<u64>,
     pub max_fee: Option<u64>,
-    pub validity_window: Option<u64>,
+    pub validity_window: Option<u32>,
     pub first_valid_round: Option<u64>,
     pub last_valid_round: Option<u64>,
     pub close_remainder_to: Option<String>,
@@ -63,7 +63,7 @@ pub struct AppClientMethodCallParams {
     pub static_fee: Option<u64>,
     pub extra_fee: Option<u64>,
     pub max_fee: Option<u64>,
-    pub validity_window: Option<u64>,
+    pub validity_window: Option<u32>,
     pub first_valid_round: Option<u64>,
     pub last_valid_round: Option<u64>,
     pub account_references: Option<Vec<String>>,
@@ -84,7 +84,7 @@ pub struct AppClientBareCallParams {
     pub static_fee: Option<u64>,
     pub extra_fee: Option<u64>,
     pub max_fee: Option<u64>,
-    pub validity_window: Option<u64>,
+    pub validity_window: Option<u32>,
     pub first_valid_round: Option<u64>,
     pub last_valid_round: Option<u64>,
     pub account_references: Option<Vec<String>>,