nik/liana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

installer: hint the user if the plugged signing device is not part of the descriptor

Browse Source
This commit is contained in:
pythcoiner 2025-03-25 06:36:14 +01:00
parent 5ae13dd025
commit aead34cc8e
No known key found for this signature in database
GPG Key ID: C1048AEEDF303B88
3 changed files with 22 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
liana-gui/src/installer/step/descriptor/editor/key.rs
View File

@ -459,6 +459,7 @@ impl super::DescriptorEditModal for EditXpubModal {
hw.fingerprint() == chosen_signer, hw.fingerprint() == chosen_signer,
self.processing, self.processing,
hw.fingerprint() == chosen_signer, hw.fingerprint() == chosen_signer,
None,
self.device_must_support_tapminiscript, self.device_must_support_tapminiscript,
)) ))
} }

3
liana-gui/src/installer/step/descriptor/mod.rs
View File

@ -306,10 +306,11 @@ impl Step for RegisterDescriptor {
email: Option<&'a str>, email: Option<&'a str>,
) -> Element<'a, Message> { ) -> Element<'a, Message> {
let desc = self.descriptor.as_ref().unwrap(); let desc = self.descriptor.as_ref().unwrap();
view::register_descriptor( view::register_descriptor(
progress, progress,
email, email,
desc.to_string(), desc,
&hws.list, &hws.list,
&self.registered, &self.registered,
self.error.as_ref(), self.error.as_ref(),

28
liana-gui/src/installer/view/mod.rs
View File

@ -584,7 +584,7 @@ pub fn share_xpubs<'a>(
pub fn register_descriptor<'a>( pub fn register_descriptor<'a>(
progress: (usize, usize), progress: (usize, usize),
email: Option<&'a str>, email: Option<&'a str>,
descriptor: String, descriptor: &'a LianaDescriptor,
hws: &'a [HardwareWallet], hws: &'a [HardwareWallet],
registered: &HashSet<bitcoin::bip32::Fingerprint>, registered: &HashSet<bitcoin::bip32::Fingerprint>,
error: Option<&Error>, error: Option<&Error>,
@ -593,8 +593,9 @@ pub fn register_descriptor<'a>(
done: bool, done: bool,
created_desc: bool, created_desc: bool,
) -> Element<'a, Message> { ) -> Element<'a, Message> {
let descriptor_str = descriptor.to_string();
let displayed_descriptor = let displayed_descriptor =
if let Ok((template, keys)) = extract_keys_and_template::<String>(&descriptor) { if let Ok((template, keys)) = extract_keys_and_template::<String>(&descriptor_str) {
let mut col = Column::new() let mut col = Column::new()
.push( .push(
card::simple( card::simple(
@ -651,7 +652,7 @@ pub fn register_descriptor<'a>(
.push( .push(
scrollable( scrollable(
Column::new() Column::new()
.push(text(descriptor.to_owned()).small()) .push(text(descriptor_str.to_owned()).small())
.push(Space::with_height(Length::Fixed(5.0))), .push(Space::with_height(Length::Fixed(5.0))),
) )
.direction(scrollable::Direction::Horizontal( .direction(scrollable::Direction::Horizontal(
@ -661,7 +662,7 @@ pub fn register_descriptor<'a>(
.push( .push(
Row::new().push(Column::new().width(Length::Fill)).push( Row::new().push(Column::new().width(Length::Fill)).push(
button::secondary(Some(icon::clipboard_icon()), "Copy") button::secondary(Some(icon::clipboard_icon()), "Copy")
.on_press(Message::Clibpboard(descriptor)), .on_press(Message::Clibpboard(descriptor_str)),
), ),
) )
.spacing(10), .spacing(10),
@ -705,6 +706,7 @@ pub fn register_descriptor<'a>(
hw.fingerprint() hw.fingerprint()
.map(|fg| registered.contains(&fg)) .map(|fg| registered.contains(&fg))
.unwrap_or(false), .unwrap_or(false),
Some(descriptor),
false, false,
)) ))
}), }),
@ -1642,14 +1644,16 @@ pub fn defined_sequence<'a>(
.into() .into()
} }
pub fn hw_list_view( pub fn hw_list_view<'a>(
i: usize, i: usize,
hw: &HardwareWallet, hw: &'a HardwareWallet,
chosen: bool, chosen: bool,
processing: bool, processing: bool,
selected: bool, selected: bool,
descriptor: Option<&'a LianaDescriptor>,
device_must_support_taproot: bool, device_must_support_taproot: bool,
) -> Element<Message> { ) -> Element<'a, Message> {
let mut unrelated = false;
let mut bttn = Button::new(match hw { let mut bttn = Button::new(match hw {
HardwareWallet::Supported { HardwareWallet::Supported {
kind, kind,
@ -1658,9 +1662,15 @@ pub fn hw_list_view(
alias, alias,
.. ..
} => { } => {
let device_in_descriptor = descriptor
.map(|d| d.contains_fingerprint(*fingerprint))
.unwrap_or(true);
let not_tapminiscript = device_must_support_taproot let not_tapminiscript = device_must_support_taproot
&& !is_compatible_with_tapminiscript(kind, version.as_ref()); && !is_compatible_with_tapminiscript(kind, version.as_ref());
if chosen && processing { if !device_in_descriptor {
unrelated = true;
hw::unrelated_hardware_wallet(kind.to_string(), version.as_ref(), fingerprint)
} else if chosen && processing {
hw::processing_hardware_wallet(kind, version.as_ref(), fingerprint, alias.as_ref()) hw::processing_hardware_wallet(kind, version.as_ref(), fingerprint, alias.as_ref())
} else if selected { } else if selected {
hw::selected_hardware_wallet(kind, version.as_ref(), fingerprint, alias.as_ref(), { hw::selected_hardware_wallet(kind, version.as_ref(), fingerprint, alias.as_ref(), {
@ -1709,7 +1719,7 @@ pub fn hw_list_view(
}) })
.style(theme::button::secondary) .style(theme::button::secondary)
.width(Length::Fill); .width(Length::Fill);
if !processing && hw.is_supported() { if !processing && hw.is_supported() && !unrelated {
bttn = bttn.on_press(Message::Select(i)); bttn = bttn.on_press(Message::Select(i));
} }
bttn.into() bttn.into()