Add a generalized "Blockchain" interface

diff --git a/Cargo.toml b/Cargo.toml
index 0edd8c32bf852be71c21ce374c69da79c8235bbb..a3aa967e459241b8d7a6f7b72adc4920b3873b1f 100644 (file)
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -18,7 +18,7 @@ electrum-client = { version = "0.1.0-beta.5", optional = true }
 [features]
 minimal = []
 compiler = ["miniscript/compiler"]
-default = ["sled", "electrum-client"]
+default = ["key-value-db", "electrum"]
 electrum = ["electrum-client"]
 key-value-db = ["sled"]
 

diff --git a/examples/repl.rs b/examples/repl.rs
index 82c41f308703c566c9ac5448ac8d936f938d9129..66598514d37f6f1caaf59dbb26bda71d2de0d27f 100644 (file)
--- a/examples/repl.rs
+++ b/examples/repl.rs
@@ -23,6 +23,7 @@ use bitcoin::util::psbt::PartiallySignedTransaction;
 use bitcoin::{Address, Network, OutPoint};
 
 use magical_bitcoin_wallet::bitcoin;
+use magical_bitcoin_wallet::blockchain::ElectrumBlockchain;
 use magical_bitcoin_wallet::sled;
 use magical_bitcoin_wallet::types::ScriptType;
 use magical_bitcoin_wallet::{Client, Wallet};
@@ -255,7 +256,14 @@ fn main() {
     debug!("database opened successfully");
 
     let client = Client::new(matches.value_of("server").unwrap()).unwrap();
-    let wallet = Wallet::new(descriptor, change_descriptor, network, tree, client).unwrap();
+    let wallet = Wallet::new(
+        descriptor,
+        change_descriptor,
+        network,
+        tree,
+        ElectrumBlockchain::from(client),
+    )
+    .unwrap();
 
     // TODO: print errors in a nice way
     let handle_matches = |matches: ArgMatches<'_>| {