Update minisafe master

gui/Cargo.lock

@@ -1390,9 +1390,10 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
 [[package]]
 name = "minisafe"
 version = "0.0.1"
-source = "git+https://github.com/revault/minisafe?branch=master#4a802890634f60d77e4da5a56f9189024ef99500"
+source = "git+https://github.com/revault/minisafe?branch=master#9bb20303e71cd95528b39e0aa7c8d44f3e61d1c2"
 dependencies = [
  "backtrace",
+ "base64",
  "dirs",
  "fern",
  "jsonrpc",

gui/src/installer/config.rs

@@ -3,7 +3,7 @@ use std::convert::TryFrom;
 use bitcoin::Network;
 use minisafe::{
     config::{BitcoinConfig, BitcoindConfig, Config as MinisafeConfig},
-    miniscript::{Descriptor, DescriptorPublicKey},
+    descriptors::InheritanceDescriptor,
 };
 
 use serde::Serialize;
@@ -14,7 +14,7 @@ use std::{net::SocketAddr, path::PathBuf, time::Duration};
 #[derive(Debug, Clone, Serialize)]
 pub struct Config {
     #[serde(serialize_with = "serialize_option_to_string")]
-    pub main_descriptor: Option<Descriptor<DescriptorPublicKey>>,
+    pub main_descriptor: Option<InheritanceDescriptor>,
     pub bitcoin_config: BitcoinConfig,
     /// Everything we need to know to talk to bitcoind
     pub bitcoind_config: BitcoindConfig,

gui/src/installer/step/mod.rs

@@ -3,7 +3,7 @@ use std::str::FromStr;
 
 use iced::pure::Element;
 use minisafe::{
-    descriptors::inheritance_descriptor,
+    descriptors::InheritanceDescriptor,
     miniscript::descriptor::{Descriptor, DescriptorPublicKey},
 };
 
@@ -153,9 +153,7 @@ impl Step for DefineDescriptor {
             }
             false
         } else if !self.imported_descriptor.value.is_empty() {
-            if let Ok(desc) =
-                Descriptor::<DescriptorPublicKey>::from_str(&self.imported_descriptor.value)
-            {
+            if let Ok(desc) = InheritanceDescriptor::from_str(&self.imported_descriptor.value) {
                 config.main_descriptor = Some(desc);
                 true
             } else {
@@ -176,7 +174,11 @@ impl Step for DefineDescriptor {
                 return false;
             }
 
-            match inheritance_descriptor(user_key.unwrap(), heir_key.unwrap(), sequence.unwrap()) {
+            match InheritanceDescriptor::new(
+                user_key.unwrap(),
+                heir_key.unwrap(),
+                sequence.unwrap(),
+            ) {
                 Ok(desc) => {
                     config.main_descriptor = Some(desc);
                     true