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

Merge #785: gui: view: fix the display of PSBT missing signatures

Browse Source 
73f168bd0986b86fc5a3059f6004515deceb3b2d gui: view: fix the display of PSBT missing signatures (Antoine Poinsot)

Pull request description:

  The analysis was wrongly displayed. For instance it could display a fingerprint as having both signed and not signed yet.

  Clean up the code and fix the analysis.

ACKs for top commit:
  darosior:
    ACK 73f168bd0986b86fc5a3059f6004515deceb3b2d -- reapplying Edouard's ACK from #783

Tree-SHA512: 1e59702b58e843248c62b62a5ac277f1b0d58841b7d0a9a6ca045fbbbf956999d5982e975f8812fcd59bb4b5c2366bb3c01a69a9a373fecc6d2f719ec046ab62
This commit is contained in:
Antoine Poinsot 2023-11-02 13:38:53 +01:00
commit d32e0ff813
No known key found for this signature in database
GPG Key ID: E13FC145CD3F4304
1 changed files with 56 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

128
gui/src/app/view/psbt.rs
View File

@ -8,9 +8,8 @@ use iced::{
use liana::{
descriptors::{LianaPolicy, PathInfo, PathSpendInfo},
miniscript::bitcoin::{
bip32::{DerivationPath, Fingerprint},
blockdata::transaction::TxOut,
Address, Amount, Network, OutPoint, Transaction, Txid,
bip32::Fingerprint, blockdata::transaction::TxOut, Address, Amount, Network, OutPoint,
Transaction, Txid,
},
};
@ -432,25 +431,64 @@ pub fn signatures<'a>(
.into()
}
// Display a fingerprint first by its alias if there is any, or in hex otherwise.
fn container_from_fg(
fg: Fingerprint,
aliases: &HashMap<Fingerprint, String>,
) -> Container<Message> {
if let Some(alias) = aliases.get(&fg) {
Container::new(
tooltip::Tooltip::new(
Container::new(text(alias))
.padding(10)
.style(theme::Container::Pill(theme::Pill::Simple)),
fg.to_string(),
tooltip::Position::Bottom,
)
.style(theme::Container::Card(theme::Card::Simple)),
)
} else {
Container::new(text(fg.to_string()))
.padding(10)
.style(theme::Container::Pill(theme::Pill::Simple))
}
}
pub fn path_view<'a>(
path: &'a PathInfo,
sigs: &'a PathSpendInfo,
key_aliases: &'a HashMap<Fingerprint, String>,
) -> Element<'a, Message> {
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_by_key(|a| a.0);
// We get a sorted list of all the fingerprints (which correspond to a signer) from this
// spending path, and from it get an iterator on those of these fingerprints for which a
// signature was provided in the PSBT, and those for which there isn't any.
let mut all_fgs: Vec<Fingerprint> = path.thresh_origins().1.into_keys().collect();
all_fgs.sort();
let signed_fgs = sigs.signed_pubkeys.keys();
let non_signed_fgs = all_fgs
.into_iter()
.filter(|fg| !sigs.signed_pubkeys.contains_key(fg));
let missing_signatures = sigs.threshold.saturating_sub(sigs.sigs_count);
// From these iterators, create the appropriate rows to be displayed.
let row_unsigned = non_signed_fgs.into_iter().fold(None, |row, fg| {
Some(
row.unwrap_or_else(|| Row::new().spacing(5))
.push(container_from_fg(fg, key_aliases)),
)
});
let row_signed = signed_fgs
.into_iter()
.fold(Row::new().spacing(5), |row, fg| {
row.push(container_from_fg(*fg, key_aliases))
});
scrollable(
Row::new()
.align_items(Alignment::Center)
.push(
Row::new()
.push(if sigs.sigs_count >= sigs.threshold {
.push(if missing_signatures == 0 {
icon::circle_check_icon().style(color::GREEN)
} else {
icon::circle_cross_icon().style(color::GREY_3)
@ -471,66 +509,12 @@ pub fn path_view<'a>(
))
.style(color::GREY_3),
)
.push_maybe(if keys.is_empty() {
None
} else {
Some(
keys.iter()
.fold(Row::new().spacing(5), |row, (key_fg, paths)| {
row.push_maybe(
if !sigs.signed_pubkeys.iter().any(|(fg, &total_sigs)| {
fg == key_fg && paths.len() == total_sigs
}) {
Some(if let Some(alias) = key_aliases.get(key_fg) {
Container::new(
tooltip::Tooltip::new(
Container::new(text(alias)).padding(10).style(
theme::Container::Pill(theme::Pill::Simple),
),
key_fg.to_string(),
tooltip::Position::Bottom,
)
.style(theme::Container::Card(theme::Card::Simple)),
)
} else {
Container::new(text(key_fg.to_string()))
.padding(10)
.style(theme::Container::Pill(theme::Pill::Simple))
})
} else {
None
},
)
}),
)
})
.push_maybe(if sigs.signed_pubkeys.is_empty() {
None
} else {
Some(p1_regular(", already signed by ").style(color::GREY_3))
})
.push(
sigs.signed_pubkeys
.keys()
.fold(Row::new().spacing(5), |row, value| {
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.to_string(),
tooltip::Position::Bottom,
)
.style(theme::Container::Card(theme::Card::Simple)),
)
} else {
Container::new(text(value.to_string()))
.padding(10)
.style(theme::Container::Pill(theme::Pill::Simple))
})
}),
),
.push_maybe(row_unsigned)
.push_maybe(
(!sigs.signed_pubkeys.is_empty())
.then_some(p1_regular(", already signed by ").style(color::GREY_3)),
)
.push(row_signed),
)
.horizontal_scroll(scrollable::Properties::new().width(2).scroller_width(2))
.into()