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

Add coins and recipients view

Browse Source
This commit is contained in:
edouard 2022-11-04 18:07:49 +01:00
parent a043f024e2
commit 6f75515f9b
4 changed files with 105 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
gui/src/app/cache.rs
View File

@ -1,8 +1,20 @@
use crate::daemon::model::{Coin, SpendTx};
use minisafe::miniscript::bitcoin::Network;
#[derive(Default)]
pub struct Cache {
pub network: Network,
pub blockheight: i32,
pub coins: Vec<Coin>,
pub spend_txs: Vec<SpendTx>,
}
impl std::default::Default for Cache {
fn default() -> Self {
Self {
network: Network::Bitcoin,
blockheight: 0,
coins: Vec::new(),
spend_txs: Vec::new(),
}
}
}

3
gui/src/app/state/spend/detail.rs
View File

@ -91,12 +91,13 @@ impl SpendTxState {
}
}
pub fn view<'a>(&'a self, _cache: &'a Cache) -> Element<'a, view::Message> {
pub fn view<'a>(&'a self, cache: &'a Cache) -> Element<'a, view::Message> {
detail::spend_view(
self.action.warning(),
&self.tx,
self.action.view(),
self.saved,
cache.network,
)
}
}

92
gui/src/app/view/spend/detail.rs
View File

@ -3,14 +3,17 @@ use iced::{
Alignment, Length,
};
use minisafe::miniscript::bitcoin::util::bip32::Fingerprint;
use minisafe::miniscript::bitcoin::{
util::{bip32::Fingerprint, psbt::Psbt},
Address, Amount, Network,
};
use crate::{
app::{
error::Error,
view::{message::*, modal_section, warning::warn, ModalSectionStyle},
},
daemon::model::{SpendStatus, SpendTx},
daemon::model::{Coin, SpendStatus, SpendTx},
hw::HardwareWallet,
ui::{
color,
@ -28,6 +31,7 @@ pub fn spend_view<'a, T: Into<Element<'a, Message>>>(
tx: &SpendTx,
action: T,
show_delete: bool,
network: Network,
) -> Element<'a, Message> {
spend_modal(
show_delete,
@ -35,7 +39,13 @@ pub fn spend_view<'a, T: Into<Element<'a, Message>>>(
column()
.spacing(20)
.push(spend_overview_view(tx))
.push(action),
.push(action)
.push(inputs_and_outputs_view(
&tx.coins,
&tx.psbt,
network,
tx.change_index,
)),
)
}
@ -225,6 +235,82 @@ fn spend_overview_view<'a>(tx: &SpendTx) -> Element<'a, Message> {
.into()
}
fn inputs_and_outputs_view<'a>(
coins: &[Coin],
psbt: &Psbt,
network: Network,
change_index: Option<usize>,
) -> Element<'a, Message> {
column()
.push(
row()
.spacing(10)
.push(
column()
.spacing(10)
.push(text("Spent coins:").bold())
.push(coins.iter().fold(column().spacing(10), |col, coin| {
col.push(
card::simple(
column()
.width(Length::Fill)
.push(text(&format!("{} BTC", coin.amount.to_btc())).bold())
.push(text(&format!("{}", coin.outpoint)).small()),
)
.width(Length::Fill),
)
}))
.width(Length::FillPortion(1)),
)
.push(
column()
.spacing(10)
.push(text("Recipients:").bold())
.push(psbt.unsigned_tx.output.iter().enumerate().fold(
column().spacing(10),
|col, (i, output)| {
col.push(
card::simple(
column()
.width(Length::Fill)
.push(
text(&format!(
"{} BTC",
Amount::from_sat(output.value).to_btc()
))
.bold(),
)
.push(
text(&format!(
"{}",
Address::from_script(
&output.script_pubkey,
network
)
.unwrap()
))
.small(),
)
.push_maybe(if Some(i) == change_index {
Some(
container(text("Change"))
.padding(5)
.style(badge::PillStyle::Success),
)
} else {
None
}),
)
.width(Length::Fill),
)
},
))
.width(Length::FillPortion(1)),
),
)
.into()
}
pub fn sign_action<'a>(
hws: &[HardwareWallet],
processing: bool,

1
gui/src/main.rs
View File

@ -163,6 +163,7 @@ impl Application for GUI {
(State::Loader(loader), Message::Load(msg)) => {
if let loader::Message::Synced(info, coins, spend_txs, minisafed) = *msg {
let cache = Cache {
network: minisafed.config().bitcoin_config.network,
blockheight: info.blockheight,
coins,
spend_txs,