From ad4345febb0a0479de10008c43ac65eb218f958a Mon Sep 17 00:00:00 2001
From: Alekos Filini <alekos.filini@gmail.com>
Date: Sun, 19 Jul 2020 19:24:05 +0200
Subject: [PATCH] Update miniscript to version 1.0

---
 Cargo.toml | 7 ++++---
 src/cli.rs | 2 +-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index 994ea1b..65be202 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -7,10 +7,9 @@ authors = ["Riccardo Casatta <riccardo@casatta.it>", "Alekos Filini <alekos.fili
 [dependencies]
 log = "^0.4"
 bitcoin = { version = "0.23", features = ["use-serde"] }
-miniscript = { version = "0.12" }
+miniscript = { version = "1.0" }
 serde = { version = "^1.0", features = ["derive"] }
 serde_json = { version = "^1.0" }
-base64 = "^0.11"
 
 # Optional dependencies
 sled = { version = "0.31.0", optional = true }
@@ -19,6 +18,7 @@ reqwest = { version = "0.10", optional = true, features = ["json"] }
 tokio = { version = "0.2", optional = true, features = ["rt-core"] }
 futures = { version = "0.3", optional = true }
 clap = { version = "2.33", optional = true }
+base64 = { version = "^0.11", optional = true }
 
 [features]
 minimal = []
@@ -27,7 +27,7 @@ default = ["key-value-db", "electrum"]
 electrum = ["electrum-client"]
 esplora = ["reqwest", "futures", "tokio"]
 key-value-db = ["sled"]
-cli-utils = ["clap"]
+cli-utils = ["clap", "base64"]
 
 [dev-dependencies]
 lazy_static = "1.4"
@@ -41,6 +41,7 @@ name = "repl"
 required-features = ["cli-utils"]
 [[example]]
 name = "psbt"
+required-features = ["cli-utils"]
 [[example]]
 name = "parse_descriptor"
 
diff --git a/src/cli.rs b/src/cli.rs
index 5d61ff0..90c0704 100644
--- a/src/cli.rs
+++ b/src/cli.rs
@@ -240,7 +240,7 @@ pub fn add_global_flags<'a, 'b>(app: App<'a, 'b>) -> App<'a, 'b> {
             .value_name("SERVER:PORT")
             .help("Sets the Electrum server to use")
             .takes_value(true)
-            .default_value("tn.not.fyi:55001"),
+            .default_value("ssl://electrum.blockstream.info:60002"),
     )
     .arg(
         Arg::with_name("proxy")
-- 
2.49.0