feat: make max_fee_estimation_tolerance configurable in call handlers and Executable APIs

grandima · grandima · commit 323c2d7a9092 · 2025-05-16T19:03:08.000+02:00
Closes #1591
diff --git a/packages/fuels-programs/src/calls/call_handler.rs b/packages/fuels-programs/src/calls/call_handler.rs
@@ -21,15 +21,12 @@ use fuels_core::{
     },
 };
 
-use crate::{
-    calls::{
-        CallParameters, ContractCall, Execution, ExecutionType, ScriptCall,
-        receipt_parser::ReceiptParser,
-        traits::{ContractDependencyConfigurator, ResponseParser, TransactionTuner},
-        utils::find_ids_of_missing_contracts,
-    },
-    responses::{CallResponse, SubmitResponse},
-};
+use crate::{calls::{
+    CallParameters, ContractCall, Execution, ExecutionType, ScriptCall,
+    receipt_parser::ReceiptParser,
+    traits::{ContractDependencyConfigurator, ResponseParser, TransactionTuner},
+    utils::find_ids_of_missing_contracts,
+}, responses::{CallResponse, SubmitResponse}, DEFAULT_MAX_FEE_ESTIMATION_TOLERANCE};
 
 // Trait implemented by contract instances so that
 // they can be passed to the `with_contracts` method
@@ -45,6 +42,7 @@ pub struct CallHandler<A, C, T> {
     pub account: A,
     pub call: C,
     pub tx_policies: TxPolicies,
+    pub max_fee_estimation_tolerance: f32,
     pub log_decoder: LogDecoder,
     pub datatype: PhantomData<T>,
     decoder_config: DecoderConfig,
@@ -66,6 +64,11 @@ impl<A, C, T> CallHandler<A, C, T> {
         self
     }
 
+    pub fn with_max_fee_estimation_tolerance(mut self, max_fee_estimation_tolerance: f32) -> Self {
+        self.max_fee_estimation_tolerance = max_fee_estimation_tolerance;
+        self
+    }
+
     pub fn with_decoder_config(mut self, decoder_config: DecoderConfig) -> Self {
         self.decoder_config = decoder_config;
         self.log_decoder.set_decoder_config(decoder_config);
@@ -99,7 +102,7 @@ where
     pub async fn transaction_builder(&self) -> Result<ScriptTransactionBuilder> {
         let mut tb = self
             .call
-            .transaction_builder(self.tx_policies, self.variable_output_policy, &self.account)
+            .tx_builder_with_max_fee_est_tolerance(self.tx_policies, self.variable_output_policy, &self.account, self.max_fee_estimation_tolerance)
             .await?;
 
         tb.add_signers(&self.unresolved_signers)?;
@@ -288,6 +291,7 @@ where
             account,
             call,
             tx_policies: TxPolicies::default(),
+            max_fee_estimation_tolerance: DEFAULT_MAX_FEE_ESTIMATION_TOLERANCE,
             log_decoder,
             datatype: PhantomData,
             decoder_config: DecoderConfig::default(),
@@ -381,6 +385,7 @@ where
             account,
             call,
             tx_policies: TxPolicies::default(),
+            max_fee_estimation_tolerance: DEFAULT_MAX_FEE_ESTIMATION_TOLERANCE,
             log_decoder,
             datatype: PhantomData,
             decoder_config: DecoderConfig::default(),
@@ -414,6 +419,7 @@ where
             account,
             call: vec![],
             tx_policies: TxPolicies::default(),
+            max_fee_estimation_tolerance: DEFAULT_MAX_FEE_ESTIMATION_TOLERANCE,
             log_decoder: LogDecoder::new(Default::default(), Default::default()),
             datatype: PhantomData,
             decoder_config: DecoderConfig::default(),
diff --git a/packages/fuels-programs/src/calls/traits/transaction_tuner.rs b/packages/fuels-programs/src/calls/traits/transaction_tuner.rs
@@ -11,7 +11,7 @@ use crate::{
     DEFAULT_MAX_FEE_ESTIMATION_TOLERANCE,
     calls::{
         ContractCall, ScriptCall,
-        utils::{build_with_tb, sealed, transaction_builder_from_contract_calls},
+        utils::{build_with_tb, sealed, transaction_builder_from_contract_calls, tx_builder_from_ct_calls_with_max_fee_est_tolerance},
     },
 };
 
@@ -24,6 +24,14 @@ pub trait TransactionTuner: sealed::Sealed {
         account: &T,
     ) -> Result<ScriptTransactionBuilder>;
 
+    async fn tx_builder_with_max_fee_est_tolerance<T: Account>(
+        &self,
+        tx_policies: TxPolicies,
+        variable_output_policy: VariableOutputPolicy,
+        account: &T,
+        max_fee_estimation_tolerance: f32
+    ) -> Result<ScriptTransactionBuilder>;
+
     async fn build_tx<T: Account>(
         &self,
         tb: ScriptTransactionBuilder,
@@ -39,11 +47,29 @@ impl TransactionTuner for ContractCall {
         variable_output_policy: VariableOutputPolicy,
         account: &T,
     ) -> Result<ScriptTransactionBuilder> {
-        transaction_builder_from_contract_calls(
+        tx_builder_from_ct_calls_with_max_fee_est_tolerance(
+            std::slice::from_ref(self),
+            tx_policies,
+            variable_output_policy,
+            account,
+            DEFAULT_MAX_FEE_ESTIMATION_TOLERANCE,
+        )
+            .await
+    }
+    
+    async fn tx_builder_with_max_fee_est_tolerance<T: Account>(
+        &self,
+        tx_policies: TxPolicies,
+        variable_output_policy: VariableOutputPolicy,
+        account: &T,
+        max_fee_estimation_tolerance: f32
+    ) -> Result<ScriptTransactionBuilder> {
+        tx_builder_from_ct_calls_with_max_fee_est_tolerance(
             std::slice::from_ref(self),
             tx_policies,
             variable_output_policy,
             account,
+            max_fee_estimation_tolerance,
         )
         .await
     }
@@ -64,6 +90,22 @@ impl TransactionTuner for ScriptCall {
         tx_policies: TxPolicies,
         variable_output_policy: VariableOutputPolicy,
         _account: &T,
+    ) -> Result<ScriptTransactionBuilder> {
+        self.tx_builder_with_max_fee_est_tolerance(
+            tx_policies, 
+            variable_output_policy, 
+            _account, 
+            DEFAULT_MAX_FEE_ESTIMATION_TOLERANCE
+        )
+            .await
+    }
+
+    async fn tx_builder_with_max_fee_est_tolerance<T: Account>(
+        &self,
+        tx_policies: TxPolicies,
+        variable_output_policy: VariableOutputPolicy,
+        _account: &T,
+        max_fee_estimation_tolerance: f32
     ) -> Result<ScriptTransactionBuilder> {
         let (inputs, outputs) = self.prepare_inputs_outputs()?;
 
@@ -75,7 +117,7 @@ impl TransactionTuner for ScriptCall {
             .with_inputs(inputs)
             .with_outputs(outputs)
             .with_gas_estimation_tolerance(DEFAULT_MAX_FEE_ESTIMATION_TOLERANCE)
-            .with_max_fee_estimation_tolerance(DEFAULT_MAX_FEE_ESTIMATION_TOLERANCE))
+            .with_max_fee_estimation_tolerance(max_fee_estimation_tolerance))
     }
 
     async fn build_tx<T: Account>(
@@ -108,6 +150,18 @@ impl TransactionTuner for Vec<ContractCall> {
         transaction_builder_from_contract_calls(self, tx_policies, variable_output_policy, account)
             .await
     }
+    
+    async fn tx_builder_with_max_fee_est_tolerance<T: Account>(
+        &self,
+        tx_policies: TxPolicies,
+        variable_output_policy: VariableOutputPolicy,
+        account: &T,
+        max_fee_estimation_tolerance: f32
+    ) -> Result<ScriptTransactionBuilder> {
+        validate_contract_calls(self)?;
+        tx_builder_from_ct_calls_with_max_fee_est_tolerance(self, tx_policies, variable_output_policy, account, max_fee_estimation_tolerance)
+            .await
+    }
 
     /// Returns the script that executes the contract calls
     async fn build_tx<T: Account>(
diff --git a/packages/fuels-programs/src/calls/utils.rs b/packages/fuels-programs/src/calls/utils.rs
@@ -29,12 +29,13 @@ pub(crate) mod sealed {
     pub trait Sealed {}
 }
 
-/// Creates a [`ScriptTransactionBuilder`] from contract calls.
-pub(crate) async fn transaction_builder_from_contract_calls(
+/// Creates a [`ScriptTransactionBuilder`] from contract calls with customizable [`max_fee_estimation_tolerance`].
+pub(crate) async fn tx_builder_from_ct_calls_with_max_fee_est_tolerance(
     calls: &[ContractCall],
     tx_policies: TxPolicies,
     variable_outputs: VariableOutputPolicy,
     account: &impl Account,
+    max_fee_estimation_tolerance: f32
 ) -> Result<ScriptTransactionBuilder> {
     let calls_instructions_len = compute_calls_instructions_len(calls);
     let provider = account.try_provider()?;
@@ -75,7 +76,17 @@ pub(crate) async fn transaction_builder_from_contract_calls(
         .with_inputs(inputs)
         .with_outputs(outputs)
         .with_gas_estimation_tolerance(DEFAULT_MAX_FEE_ESTIMATION_TOLERANCE)
-        .with_max_fee_estimation_tolerance(DEFAULT_MAX_FEE_ESTIMATION_TOLERANCE))
+        .with_max_fee_estimation_tolerance(max_fee_estimation_tolerance))
+}
+
+/// Creates a [`ScriptTransactionBuilder`] from contract calls.
+pub(crate) async fn transaction_builder_from_contract_calls(
+    calls: &[ContractCall],
+    tx_policies: TxPolicies,
+    variable_outputs: VariableOutputPolicy,
+    account: &impl Account,
+) -> Result<ScriptTransactionBuilder> {
+    tx_builder_from_ct_calls_with_max_fee_est_tolerance(calls, tx_policies, variable_outputs, account, DEFAULT_MAX_FEE_ESTIMATION_TOLERANCE).await
 }
 
 /// Creates a [`ScriptTransaction`] from contract calls. The internal [Transaction] is
diff --git a/packages/fuels-programs/src/executable.rs b/packages/fuels-programs/src/executable.rs
@@ -167,6 +167,14 @@ impl Executable<Loader> {
     pub async fn upload_blob(
         &self,
         account: impl fuels_accounts::Account,
+    ) -> Result<Option<TxResponse>> {
+        self.upload_blob_with_max_fee_est_tolerance(account, DEFAULT_MAX_FEE_ESTIMATION_TOLERANCE).await
+    }
+
+    pub async fn upload_blob_with_max_fee_est_tolerance(
+        &self,
+        account: impl fuels_accounts::Account,
+        max_fee_estimation_tolerance: f32,
     ) -> Result<Option<TxResponse>> {
         let blob = self.blob();
         let provider = account.try_provider()?;
@@ -178,7 +186,7 @@ impl Executable<Loader> {
 
         let mut tb = BlobTransactionBuilder::default()
             .with_blob(self.blob())
-            .with_max_fee_estimation_tolerance(DEFAULT_MAX_FEE_ESTIMATION_TOLERANCE);
+            .with_max_fee_estimation_tolerance(max_fee_estimation_tolerance);
 
         account
             .adjust_for_fee(&mut tb, 0)
