fix(electrum): always enable domain validation internally

- removed validate_domain CLI option
- cleaned up commands, handlers, and utils
- restored Cargo.toml to upstream version
- removed conflict markers and fixed issues

Author: Rahamath-unnisa

Cargo.toml

@@ -22,15 +22,21 @@ serde_json = "1.0"
 thiserror = "2.0.18"
 tokio = { version = "1", features = ["full"] }
 cli-table = "0.5.0"
+tracing = "0.1.44"
+tracing-subscriber = "0.3.20"
+toml = "1.1.0"
+serde= {version = "1.0", features = ["derive"]}
 
-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.2", optional = true }
 bdk_esplora = { version = "0.22.1", features = ["async-https", "tokio"], optional = true }
 bdk_kyoto = { version = "0.15.4", optional = true }
 bdk_redb = { version = "0.1.1", optional = true }
 shlex = {  version = "1.3.0", optional = true }
+payjoin = { version = "=1.0.0-rc.1", features = ["v1", "v2", "io", "_test-utils"], optional = true}
+reqwest = { version = "0.13.2", default-features = false, optional = true }
+url = { version = "2.5.8", optional = true }
 
 [features]
 default = ["repl", "sqlite"]

src/handlers.rs

@@ -9,13 +9,7 @@
 //! Command Handlers
 //!
 //! This module describes all the command handling logic used by bdk-cli.
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
- use crate::debug;
->>>>>>> 7931dbd (Added validate_domain in electrum option)
-=======
->>>>>>> a2f5954 (Clean up commands.rs and handlers.rs per review comments)
+
 use crate::commands::OfflineWalletSubCommand::*;
 use crate::commands::*;
 use crate::config::{WalletConfig, WalletConfigInner};

src/utils.rs

@@ -24,7 +24,6 @@ use bdk_wallet::bitcoin::{Address, Network, OutPoint, ScriptBuf};
 use std::fmt::Display;
 use std::path::{Path, PathBuf};
 use std::str::FromStr;
->>>>>>> 80e132f (Added validate-domain option config in utils.rs and made changes required to that.)
 
 #[cfg(any(
     feature = "electrum",