add clap restriction and comment

bin/sozo/src/commands/options/transaction.rs

@@ -11,8 +11,14 @@ pub struct TransactionOptions {
     #[arg(long_help = "The multiplier to use for the fee estimate. This value will be used on \
                        the estimated fee which will be used as the max fee for the transaction. \
                        (max_fee = estimated_fee * multiplier)")]
+    #[arg(conflicts_with = "max_fee_raw")]
     pub fee_estimate_multiplier: Option<f64>,
 
+    #[arg(short, long)]
+    #[arg(help = "Maximum raw value to be used for fees, in Wei.")]
+    #[arg(conflicts_with = "fee_estimate_multiplier")]
+    pub max_fee_raw: Option<FieldElement>,
+
     #[arg(short, long)]
     #[arg(help = "Wait until the transaction is accepted by the sequencer, returning the status \
                   and hash.")]
@@ -28,10 +34,6 @@ pub struct TransactionOptions {
     #[arg(long_help = "If --wait is set, returns the full transaction receipt. Otherwise, it is \
                        a no-op.")]
     pub receipt: bool,
-
-    #[arg(short, long)]
-    #[arg(help = "Maximum raw value to be used for fees, in Wei.")]
-    pub max_fee_raw: Option<FieldElement>,
 }
 
 impl From<TransactionOptions> for TxnConfig {
@@ -40,7 +42,7 @@ impl From<TransactionOptions> for TxnConfig {
             fee_estimate_multiplier: value.fee_estimate_multiplier,
             wait: value.wait,
             receipt: value.receipt,
-            max_fee_raw: value.max_fee_raw
+            max_fee_raw: value.max_fee_raw,
         }
     }
 }

crates/dojo-world/src/utils.rs

@@ -341,8 +341,10 @@ where
 {
     type R;
 
-    /// Sets `fee_estimate_multiplier` from `TxnConfig` if its present before calling `send` method
-    /// on the respective type.
+    /// Sets `fee_estimate_multiplier` and `max_fee_raw` from `TxnConfig` if its present before
+    /// calling `send` method on the respective type.
+    /// NOTE: If both are specified `max_fee_raw` will take precedence and `fee_estimate_multiplier`
+    /// will be ignored by `starknet-rs`
     async fn send_with_cfg(
         self,
         txn_config: &TxnConfig,
@@ -363,7 +365,7 @@ where
             self = self.fee_estimate_multiplier(*fee_est_mul);
         }
 
-        if let TxnConfig { max_fee_raw: Some(max_fee_r), ..} = txn_config {
+        if let TxnConfig { max_fee_raw: Some(max_fee_r), .. } = txn_config {
             self = self.max_fee(*max_fee_r);
         }
 
@@ -385,7 +387,7 @@ where
             self = self.fee_estimate_multiplier(*fee_est_mul);
         }
 
-        if let TxnConfig { max_fee_raw: Some(max_raw_f), ..} = txn_config {
+        if let TxnConfig { max_fee_raw: Some(max_raw_f), .. } = txn_config {
             self = self.max_fee(*max_raw_f);
         }
 

crates/sozo/ops/src/tests/migration.rs

@@ -97,7 +97,7 @@ async fn migrate_with_small_fee_multiplier_will_fail() {
             &ws,
             &mut migration,
             &account,
-            TxnConfig { fee_estimate_multiplier: Some(0.2f64), ..Default::default()},
+            TxnConfig { fee_estimate_multiplier: Some(0.2f64), ..Default::default() },
         )
         .await
         .is_err()