Added validate_domain in electrum option

Author: Rahamath-unnisa

src/commands.rs

@@ -12,7 +12,8 @@
 //! All optional args are defined in the structs below.
 //! All subcommands are defined in the below enums.
 
-#![allow(clippy::large_enum_variant)]
+
+#[allow(clippy::large_enum_variant)]
 
 use bdk_wallet::bitcoin::{
     Address, Network, OutPoint, ScriptBuf,
@@ -186,6 +187,10 @@ pub struct WalletOpts {
     #[cfg(feature = "electrum")]
     #[arg(env = "ELECTRUM_BATCH_SIZE", short = 'b', long, default_value = "10")]
     pub batch_size: usize,
+    ///Electrum validate domain option.
+    #[cfg(feature = "electrum")]
+    #[arg(env="VALIDATE_DOMAIN",long = "validate-domain", action = clap::ArgAction::Set, default_value_t = true)]
+    pub validate_domain: bool,
     /// Esplora parallel requests.
     #[cfg(feature = "esplora")]
     #[arg(
@@ -396,8 +401,11 @@ pub enum OnlineWalletSubCommand {
         stop_gap: usize,
     },
     /// Syncs with the chosen blockchain server.
-    Sync,
-    /// Broadcasts a transaction to the network. Takes either a raw transaction or a PSBT to extract.
+   Sync {
+        #[command(flatten)]
+        wallet_opts: WalletOpts,
+    },
+
     Broadcast {
         /// Sets the PSBT to sign.
         #[arg(

src/handlers.rs

@@ -9,7 +9,7 @@
 //! Command Handlers
 //!
 //! This module describes all the command handling logic used by bdk-cli.
-
+ use crate::debug;
 use crate::commands::OfflineWalletSubCommand::*;
 use crate::commands::*;
 use crate::error::BDKCliError as Error;
@@ -619,7 +619,7 @@ pub(crate) async fn handle_online_wallet_subcommand(
             });
             match client {
                 #[cfg(feature = "electrum")]
-                Electrum { client, batch_size } => {
+                Electrum { client, batch_size,validate_domain } => {
                     // Populate the electrum client's transaction cache so it doesn't re-download transaction we
                     // already have.
                     client
@@ -694,15 +694,16 @@ pub(crate) async fn handle_online_wallet_subcommand(
                     let pc = (100 * progress.consumed()) as f32 / progress.total() as f32;
                     eprintln!("[ SCANNING {pc:03.0}% ] {item}");
                 });
+
             match client {
                 #[cfg(feature = "electrum")]
-                Electrum { client, batch_size } => {
+                Electrum { client, batch_size, validate_domain } => {
                     // Populate the electrum client's transaction cache so it doesn't re-download transaction we
                     // already have.
                     client
                         .populate_tx_cache(wallet.tx_graph().full_txs().map(|tx_node| tx_node.tx));
 
-                    let update = client.sync(request, batch_size, false)?;
+                    let update = client.sync(request, batch_size, validate_domain)?;
                     wallet.apply_update(update)?;
                 }
                 #[cfg(feature = "esplora")]
@@ -788,6 +789,7 @@ pub(crate) async fn handle_online_wallet_subcommand(
                 Electrum {
                     client,
                     batch_size: _,
+                    validate_domain,
                 } => client
                     .transaction_broadcast(&tx)
                     .map_err(|e| Error::Generic(e.to_string()))?,

src/utils.rs

@@ -127,6 +127,7 @@ pub(crate) enum BlockchainClient {
     Electrum {
         client: Box<bdk_electrum::BdkElectrumClient<bdk_electrum::electrum_client::Client>>,
         batch_size: usize,
+        validate_domain: bool,
     },
     #[cfg(feature = "esplora")]
     Esplora {
@@ -164,6 +165,7 @@ pub(crate) fn new_blockchain_client(
             BlockchainClient::Electrum {
                 client: Box::new(client),
                 batch_size: wallet_opts.batch_size,
+                validate_domain: wallet_opts.validate_domain,
             }
         }
         #[cfg(feature = "esplora")]