fix(electrum): always enable domain validation internally

Signed-off-by: Rahamath-Unnisa <rahamathunnisa287@gmail.com>

Author: Rahamath-unnisa

Cargo.lock

@@ -21,18 +21,16 @@ serde_json = "1.0"
 thiserror = "2.0.11"
 tokio = { version = "1", features = ["full"] }
 cli-table = "0.5.0"
-
+bdk_electrum = { version = "0.23.0", optional = true }
 # Optional dependencies
 bdk_bitcoind_rpc = { version = "0.21.0", features = ["std"], optional = true }
-bdk_electrum = { version = "0.23.0", optional = true }
+
 bdk_esplora = { version = "0.22.1", features = ["async-https", "tokio"], optional = true }
 bdk_kyoto = { version = "0.15.1", optional = true }
 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"]
 

Cargo.toml

@@ -185,10 +185,6 @@ 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(

src/commands.rs

@@ -618,11 +618,7 @@ pub(crate) async fn handle_online_wallet_subcommand(
             });
             match client {
                 #[cfg(feature = "electrum")]
-                Electrum {
-                    client,
-                    batch_size,
-                    validate_domain: _,
-                } => {
+                Electrum { client, batch_size } => {
                     // Populate the electrum client's transaction cache so it doesn't re-download transaction we
                     // already have.
                     client
@@ -700,11 +696,7 @@ pub(crate) async fn handle_online_wallet_subcommand(
 
             match client {
                 #[cfg(feature = "electrum")]
-                Electrum {
-                    client,
-                    batch_size,
-                    validate_domain,
-                } => {
+                Electrum { client, batch_size } => {
                     // Populate the electrum client's transaction cache so it doesn't re-download transaction we
                     // already have.
                     client
@@ -796,7 +788,6 @@ 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/handlers.rs

@@ -11,13 +11,13 @@
 //! This module includes all the utility tools used by the App.
 use crate::commands::WalletOpts;
 use crate::error::BDKCliError as Error;
+use bdk_electrum::electrum_client::ConfigBuilder;
 #[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;
@@ -126,7 +126,6 @@ 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,15 +158,12 @@ pub(crate) fn new_blockchain_client(
     let client = match wallet_opts.client_type {
         #[cfg(feature = "electrum")]
         ClientType::Electrum => {
-            let config = ConfigBuilder::new()
-                .validate_domain(wallet_opts.validate_domain)
-                .build();
+            let config = ConfigBuilder::new().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")]