add electrum support

Cargo.toml

@@ -20,7 +20,9 @@ bp-std = "0.11.0-beta.4"
 psbt = "0.11.0-beta.4"
 descriptors = "0.11.0-beta.4"
 bp-esplora = "0.11.0-beta.4"
+bp-electrum = "0.11.0-beta.5"
 serde_crate = { package = "serde", version = "1", features = ["derive"] }
+serde_json = "1.0.114"
 serde_with = "3.4.0"
 serde_yaml = "0.9.19"
 toml = "0.8.2"
@@ -48,17 +50,20 @@ name = "bpwallet"
 amplify = { workspace = true }
 bp-std = { workspace = true }
 bp-esplora = { workspace = true, optional = true }
+bp-electrum = { workspace = true, optional = true }
 psbt = { workspace = true }
 descriptors = { workspace = true }
 serde_crate = { workspace = true, optional = true }
+serde_json = { workspace = true, optional = true }
 serde_with = { workspace = true, optional = true }
 serde_yaml = { workspace = true, optional = true }
 toml = { workspace = true, optional = true }
 cfg_eval = { workspace = true, optional = true }
 
 [features]
 default = []
-all = ["esplora", "fs"]
+all = ["electrum", "esplora", "fs"]
+electrum = ["bp-electrum", "serde", "serde_json"]
 esplora = ["bp-esplora"]
 fs = ["serde"]
 serde = ["cfg_eval", "serde_crate", "serde_with", "serde_yaml", "toml", "bp-std/serde"]

cli/Cargo.toml

@@ -21,11 +21,12 @@ path = "src/bin/bp.rs"
 [dependencies]
 amplify = { workspace = true, features = ["serde"] }
 strict_encoding = { workspace = true }
-bp-wallet = { version = "0.11.0-beta.2", path = "..", features = ["serde", "fs", "esplora"] }
+bp-wallet = { version = "0.11.0-beta.4", path = "..", features = ["all"] }
 bp-std = { workspace = true, features = ["serde"] }
 descriptors = { workspace = true, features = ["serde"] }
 psbt = { workspace = true, features = ["serde"] }
 bp-esplora = { workspace = true }
+bp-electrum = { workspace = true }
 base64 = "0.21.5"
 log = { workspace = true }
 env_logger = "0.10.0"

cli/src/args.rs

@@ -23,12 +23,12 @@
 use std::fmt::Debug;
 use std::path::PathBuf;
 
-use bpwallet::Runtime;
+use bpwallet::{AnyIndexer, Runtime};
 use clap::Subcommand;
 use descriptors::Descriptor;
 use strict_encoding::Ident;
 
-use crate::opts::{DescrStdOpts, DescriptorOpts};
+use crate::opts::{DescrStdOpts, DescriptorOpts, DEFAULT_ELECTRUM};
 use crate::{Config, GeneralOpts, ResolverOpt, RuntimeError, WalletOpts};
 
 /// Command-line arguments
@@ -118,7 +118,13 @@ impl<C: Clone + Eq + Debug + Subcommand, O: DescriptorOpts> Args<C, O> {
 
         if sync || self.wallet.descriptor_opts.is_some() {
             eprint!("Syncing");
-            let indexer = esplora::Builder::new(&self.resolver.esplora).build_blocking()?;
+            let indexer = if self.resolver.electrum != DEFAULT_ELECTRUM {
+                AnyIndexer::Electrum(Box::new(electrum::Client::new(&self.resolver.electrum)?))
+            } else {
+                AnyIndexer::Esplora(Box::new(
+                    esplora::Builder::new(&self.resolver.esplora).build_blocking()?,
+                ))
+            };
             if let Err(errors) = runtime.sync(&indexer) {
                 eprintln!(" partial, some requests has failed:");
                 for err in errors {

cli/src/lib.rs

@@ -42,5 +42,5 @@ pub use config::Config;
 pub use loglevel::LogLevel;
 pub use opts::{
     DescrStdOpts, DescriptorOpts, GeneralOpts, ResolverOpt, WalletOpts, DATA_DIR, DATA_DIR_ENV,
-    DEFAULT_ESPLORA,
+    DEFAULT_ELECTRUM, DEFAULT_ESPLORA,
 };

cli/src/opts.rs

@@ -42,13 +42,26 @@ pub const DATA_DIR: &str = "~/Documents";
 #[cfg(target_os = "android")]
 pub const DATA_DIR: &str = ".";
 
+pub const DEFAULT_ELECTRUM: &str = "example.com:50001";
 pub const DEFAULT_ESPLORA: &str = "https://blockstream.info/testnet/api";
 
 #[derive(Args, Clone, PartialEq, Eq, Debug)]
 pub struct ResolverOpt {
+    /// Electrum server to use.
+    #[arg(
+        conflicts_with = "esplora",
+        long,
+        global = true,
+        default_value = DEFAULT_ELECTRUM,
+        env = "ELECRTUM_SERVER",
+        value_hint = ValueHint::Url,
+        value_name = "URL"
+    )]
+    pub electrum: String,
+
     /// Esplora server to use.
     #[arg(
-        short,
+        conflicts_with = "electrum",
         long,
         global = true,
         default_value = DEFAULT_ESPLORA,