Added validate_domain in electrum option

Cargo.toml

@@ -31,6 +31,7 @@ bdk_redb = { version = "0.1.0", optional = true }
 shlex = {  version = "1.3.0", optional = true }
 tracing = "0.1.41"
 tracing-subscriber = "0.3.20"
+electrum-client = "0.24.0"
 
 [features]
 default = ["repl", "sqlite"]

src/commands.rs

@@ -13,7 +13,6 @@
 //! All subcommands are defined in the below enums.
 
 #![allow(clippy::large_enum_variant)]
-
 use bdk_wallet::bitcoin::{
     Address, Network, OutPoint, ScriptBuf,
     bip32::{DerivationPath, Xpriv},
@@ -186,6 +185,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 +399,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,6 @@
 //! Command Handlers
 //!
 //! This module describes all the command handling logic used by bdk-cli.
-
 use crate::commands::OfflineWalletSubCommand::*;
 use crate::commands::*;
 use crate::error::BDKCliError as Error;
@@ -619,7 +618,11 @@ 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
@@ -686,17 +689,22 @@ pub(crate) async fn handle_online_wallet_subcommand(
             }
             Ok(serde_json::to_string_pretty(&json!({}))?)
         }
-        Sync => {
+        sync => {
             #[cfg(any(feature = "electrum", feature = "esplora"))]
             let request = wallet
                 .start_sync_with_revealed_spks()
                 .inspect(|item, progress| {
                     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
@@ -788,6 +796,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

@@ -9,19 +9,18 @@
 //! Utility Tools
 //!
 //! This module includes all the utility tools used by the App.
-use crate::error::BDKCliError as Error;
-use std::fmt::Display;
-use std::str::FromStr;
-
-use std::path::{Path, PathBuf};
-
 use crate::commands::WalletOpts;
+use crate::error::BDKCliError as Error;
 #[cfg(feature = "cbf")]
 use bdk_kyoto::{
     BuilderExt, Info, LightClient, Receiver, ScanType::Sync, UnboundedReceiver, Warning,
     builder::Builder,
 };
 use bdk_wallet::bitcoin::{Address, Network, OutPoint, ScriptBuf};
+use electrum_client::ConfigBuilder;
+use std::fmt::Display;
+use std::path::{Path, PathBuf};
+use std::str::FromStr;
 
 #[cfg(any(
     feature = "electrum",
@@ -127,6 +126,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 {
@@ -159,11 +159,15 @@ pub(crate) fn new_blockchain_client(
     let client = match wallet_opts.client_type {
         #[cfg(feature = "electrum")]
         ClientType::Electrum => {
-            let client = bdk_electrum::electrum_client::Client::new(url)
+            let config = ConfigBuilder::new()
+                .validate_domain(wallet_opts.validate_domain)
+                .build();
+            let client = bdk_electrum::electrum_client::Client::from_config(url, config)
                 .map(bdk_electrum::BdkElectrumClient::new)?;
             BlockchainClient::Electrum {
                 client: Box::new(client),
                 batch_size: wallet_opts.batch_size,
+                validate_domain: wallet_opts.validate_domain,
             }
         }
         #[cfg(feature = "esplora")]