Merge #581: gui installer: append derivation path to xpubs

30ce2de installer: use appended path instead of account number for xpubs (edouard) Pull request description: ACKs for top commit: darosior: ACK 30ce2de -- tested it locally and reviewed the descriptor analysis related changes. Edouard also tested it against a setup with a Specter device. Tree-SHA512: d407c4d96e7990161595a94cc4341268676325a76a241e9a070cb84218a3f49b3cbf6c2918cf9d0f108e2019aefbed90fd86f4412001f0d540eb3edb51a1c58c
wizardsardine · Aug 16, 2023 · b2baed5 · b2baed5
2 parents 1a964f3 + 30ce2de
commit b2baed5
Show file tree

Hide file tree

Showing 11 changed files with 448 additions and 441 deletions.
diff --git a/gui/Cargo.lock b/gui/Cargo.lock
diff --git a/gui/Cargo.toml b/gui/Cargo.toml
@@ -14,7 +14,7 @@ name = "liana-gui"
 path = "src/main.rs"
 
 [dependencies]
-async-hwi = "0.0.9"
+async-hwi = "0.0.10"
 liana = { git = "https://github.com/wizardsardine/liana", branch = "master", default-features = false }
 liana_ui = { path = "ui" }
 backtrace = "0.3"

diff --git a/gui/src/app/state/coins.rs b/gui/src/app/state/coins.rs
@@ -136,24 +136,28 @@ mod tests {
                 amount: bitcoin::Amount::from_sat(1),
                 block_height: Some(3),
                 spend_info: None,
+                is_immature: false,
             },
             Coin {
                 outpoint: bitcoin::OutPoint { txid, vout: 3 },
                 amount: bitcoin::Amount::from_sat(1),
                 block_height: None,
                 spend_info: None,
+                is_immature: false,
             },
             Coin {
                 outpoint: bitcoin::OutPoint { txid, vout: 0 },
                 amount: bitcoin::Amount::from_sat(1),
                 block_height: Some(2),
                 spend_info: None,
+                is_immature: false,
             },
             Coin {
                 outpoint: bitcoin::OutPoint { txid, vout: 1 },
                 amount: bitcoin::Amount::from_sat(1),
                 block_height: Some(3),
                 spend_info: None,
+                is_immature: false,
             },
         ]);
 

diff --git a/gui/src/app/state/recovery.rs b/gui/src/app/state/recovery.rs
@@ -1,3 +1,4 @@
+use std::collections::HashSet;
 use std::str::FromStr;
 use std::sync::Arc;
 
@@ -197,7 +198,7 @@ impl From<RecoveryPanel> for Box<dyn State> {
 pub struct RecoveryPath {
     threshold: usize,
     sequence: u16,
-    origins: Vec<(Fingerprint, DerivationPath)>,
+    origins: Vec<(Fingerprint, HashSet<DerivationPath>)>,
     total_amount: Amount,
     number_of_coins: usize,
 }

diff --git a/gui/src/app/view/psbt.rs b/gui/src/app/view/psbt.rs
@@ -309,19 +309,19 @@ pub fn signatures<'a>(
                             sigs.signed_pubkeys
                             .keys()
                             .fold(Row::new().spacing(5), |row, value| {
-                                row.push(if let Some(alias) = keys_aliases.get(&value.0) {
+                                row.push(if let Some(alias) = keys_aliases.get(value) {
                                 Container::new(
                                     tooltip::Tooltip::new(
                                         Container::new(text(alias))
                                             .padding(10)
                                             .style(theme::Container::Pill(theme::Pill::Simple)),
-                                            value.0.to_string(),
+                                            value.to_string(),
                                             tooltip::Position::Bottom,
                                     )
                                     .style(theme::Container::Card(theme::Card::Simple)),
                                 )
                             } else {
-                                Container::new(text(value.0.to_string()))
+                                Container::new(text(value.to_string()))
                                     .padding(10)
                                     .style(theme::Container::Pill(theme::Pill::Simple))
                             })
@@ -401,14 +401,14 @@ pub fn path_view<'a>(
     sigs: &'a PathSpendInfo,
     key_aliases: &'a HashMap<Fingerprint, String>,
 ) -> Element<'a, Message> {
-    let mut keys: Vec<(Fingerprint, DerivationPath)> =
+    let mut keys: Vec<(Fingerprint, HashSet<DerivationPath>)> =
         path.thresh_origins().1.into_iter().collect();
     let missing_signatures = if sigs.sigs_count >= sigs.threshold {
         0
     } else {
         sigs.threshold - sigs.sigs_count
     };
-    keys.sort();
+    keys.sort_by_key(|a| a.0);
     scrollable(
         Row::new()
             .align_items(Alignment::Center)
@@ -439,7 +439,7 @@ pub fn path_view<'a>(
                 None
             } else {
                 Some(keys.iter().fold(Row::new().spacing(5), |row, value| {
-                    row.push_maybe(if !sigs.signed_pubkeys.contains_key(value) {
+                    row.push_maybe(if !sigs.signed_pubkeys.contains_key(&value.0) {
                         Some(if let Some(alias) = key_aliases.get(&value.0) {
                             Container::new(
                                 tooltip::Tooltip::new(
@@ -470,19 +470,19 @@ pub fn path_view<'a>(
                 sigs.signed_pubkeys
                     .keys()
                     .fold(Row::new().spacing(5), |row, value| {
-                        row.push(if let Some(alias) = key_aliases.get(&value.0) {
+                        row.push(if let Some(alias) = key_aliases.get(value) {
                             Container::new(
                                 tooltip::Tooltip::new(
                                     Container::new(text(alias))
                                         .padding(10)
                                         .style(theme::Container::Pill(theme::Pill::Simple)),
-                                    value.0.to_string(),
+                                    value.to_string(),
                                     tooltip::Position::Bottom,
                                 )
                                 .style(theme::Container::Card(theme::Card::Simple)),
                             )
                         } else {
-                            Container::new(text(value.0.to_string()))
+                            Container::new(text(value.to_string()))
                                 .padding(10)
                                 .style(theme::Container::Pill(theme::Pill::Simple))
                         })

diff --git a/gui/src/app/view/recovery.rs b/gui/src/app/view/recovery.rs
@@ -1,4 +1,4 @@
-use std::collections::HashMap;
+use std::collections::{HashMap, HashSet};
 
 use iced::{
     widget::{checkbox, tooltip, Space},
@@ -137,7 +137,7 @@ pub fn recovery<'a>(
 pub fn recovery_path_view<'a>(
     index: usize,
     threshold: usize,
-    origins: &'a [(Fingerprint, DerivationPath)],
+    origins: &'a [(Fingerprint, HashSet<DerivationPath>)],
     total_amount: Amount,
     number_of_coins: usize,
     key_aliases: &'a HashMap<Fingerprint, String>,

diff --git a/gui/src/daemon/model.rs b/gui/src/daemon/model.rs
@@ -106,12 +106,12 @@ impl SpendTx {
 
     pub fn signers(&self) -> HashSet<Fingerprint> {
         let mut signers = HashSet::new();
-        for (fg, _) in self.sigs.primary_path().signed_pubkeys.keys() {
+        for fg in self.sigs.primary_path().signed_pubkeys.keys() {
             signers.insert(*fg);
         }
 
         for path in self.sigs.recovery_paths().values() {
-            for (fg, _) in path.signed_pubkeys.keys() {
+            for fg in path.signed_pubkeys.keys() {
                 signers.insert(*fg);
             }
         }

diff --git a/gui/src/hw.rs b/gui/src/hw.rs
@@ -230,12 +230,10 @@ fn ledger_version_supported(version: Option<&Version>) -> bool {
     }
 }
 
-pub async fn list_unregistered_hardware_wallets(
-    aliases: Option<&HashMap<Fingerprint, String>>,
-) -> Vec<HardwareWallet> {
+pub async fn list_unregistered_hardware_wallets() -> Vec<HardwareWallet> {
     let mut hws: Vec<HardwareWallet> = Vec::new();
     match specter::SpecterSimulator::try_connect().await {
-        Ok(device) => match HardwareWallet::new(Arc::new(device), aliases).await {
+        Ok(device) => match HardwareWallet::new(Arc::new(device), None).await {
             Ok(hw) => hws.push(hw),
             Err(e) => {
                 debug!("{}", e);
@@ -249,7 +247,7 @@ pub async fn list_unregistered_hardware_wallets(
     match specter::Specter::enumerate().await {
         Ok(devices) => {
             for device in devices {
-                match HardwareWallet::new(Arc::new(device), aliases).await {
+                match HardwareWallet::new(Arc::new(device), None).await {
                     Ok(hw) => hws.push(hw),
                     Err(e) => {
                         debug!("{}", e);
@@ -270,7 +268,7 @@ pub async fn list_unregistered_hardware_wallets(
                         device: Arc::new(device),
                         version,
                         registered: None,
-                        alias: aliases.and_then(|aliases| aliases.get(&fingerprint).cloned()),
+                        alias: None,
                     });
                 } else {
                     hws.push(HardwareWallet::Unsupported {
@@ -310,8 +308,7 @@ pub async fn list_unregistered_hardware_wallets(
                                     device: Arc::new(device),
                                     version,
                                     registered: None,
-                                    alias: aliases
-                                        .and_then(|aliases| aliases.get(&fingerprint).cloned()),
+                                    alias: None,
                                 });
                             } else {
                                 hws.push(HardwareWallet::Unsupported {

diff --git a/gui/src/installer/message.rs b/gui/src/installer/message.rs
@@ -78,6 +78,7 @@ pub enum ImportKeyModal {
     EditName,
     NameEdited(String),
     ConfirmXpub,
+    SelectKey(usize),
 }
 
 #[derive(Debug, Clone)]