Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

gui: add listcoins filters #967

Merged
merged 14 commits into from
Apr 19, 2024
Merged

gui: add listcoins filters #967

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
6c7ca2c
gui(daemon): add optional filter to `list_coins`
jp1ac4 Feb 5, 2024
f3fdb96
gui(daemon): extract common function for historytxs
jp1ac4 Mar 25, 2024
4612159
gui(daemon): filter outpoints from txs inputs & outputs
jp1ac4 Mar 25, 2024
aa578ba
gui(daemon): filter coins for pending txs
jp1ac4 Feb 6, 2024
4641d9e
gui(daemon): filter coins using spend txs prev outpoints
jp1ac4 Mar 19, 2024
ddd1e84
gui(psbt): get conflicting txs from filtered coins
jp1ac4 Feb 6, 2024
21f8704
gui(transactions): filter coins by tx outpoints
jp1ac4 Feb 6, 2024
685f83b
gui(transactions): remove unused list_coins
jp1ac4 Mar 19, 2024
4509bd6
gui(coins): filter for confirmed & unconfirmed
jp1ac4 Feb 6, 2024
c9fcfae
gui(recovery): filter coins by psbt outpoints
jp1ac4 Feb 6, 2024
85b053f
gui(recovery): filter for unconfirmed & confirmed coins
jp1ac4 Feb 6, 2024
982220d
gui(home): filter for unconfirmed & confirmed coins
jp1ac4 Feb 6, 2024
daf9f85
gui(spend): filter for unconfirmed & confirmed coins
jp1ac4 Feb 6, 2024
1c99376
gui(app): cache unconfirmed & confirmed coins only
jp1ac4 Mar 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions gui/src/app/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ use std::time::Duration;
use iced::{clipboard, time, Command, Subscription};
use tracing::{error, info, warn};

pub use liana::{config::Config as DaemonConfig, miniscript::bitcoin};
pub use liana::{commands::CoinStatus, config::Config as DaemonConfig, miniscript::bitcoin};
use liana_ui::widget::Element;

pub use config::Config;
Expand Down Expand Up @@ -239,8 +239,8 @@ impl App {
daemon.is_alive()?;

let info = daemon.get_info()?;
// todo: filter coins to only have current coins.
let coins = daemon.list_coins()?;
let coins = daemon
.list_coins(&[CoinStatus::Unconfirmed, CoinStatus::Confirmed], &[])?;
Ok(Cache {
datadir_path,
coins: coins.coins,
Expand Down
5 changes: 3 additions & 2 deletions gui/src/app/state/coins.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ use std::{cmp::Ordering, collections::HashSet};

use iced::Command;

use liana::commands::CoinStatus;
use liana_ui::widget::Element;

use crate::{
Expand Down Expand Up @@ -162,7 +163,7 @@ impl State for CoinsPanel {
Command::perform(
async move {
daemon1
.list_coins()
.list_coins(&[CoinStatus::Unconfirmed, CoinStatus::Confirmed], &[])
.map(|res| res.coins)
.map_err(|e| e.into())
},
Expand All @@ -171,7 +172,7 @@ impl State for CoinsPanel {
Command::perform(
async move {
let coins = daemon2
.list_coins()
.list_coins(&[CoinStatus::Unconfirmed, CoinStatus::Confirmed], &[])
.map(|res| res.coins)
.map_err(Error::from)?;
let mut targets = HashSet::<LabelItem>::new();
Expand Down
7 changes: 5 additions & 2 deletions gui/src/app/state/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,10 @@ use std::sync::Arc;
use std::time::{SystemTime, UNIX_EPOCH};

use iced::{Command, Subscription};
use liana::miniscript::bitcoin::{Amount, OutPoint};
use liana::{
commands::CoinStatus,
miniscript::bitcoin::{Amount, OutPoint},
};
use liana_ui::widget::*;

use super::{cache::Cache, error::Error, menu::Menu, message::Message, view, wallet::Wallet};
Expand Down Expand Up @@ -295,7 +298,7 @@ impl State for Home {
Command::perform(
async move {
daemon2
.list_coins()
.list_coins(&[CoinStatus::Unconfirmed, CoinStatus::Confirmed], &[])
.map(|res| res.coins)
.map_err(|e| e.into())
},
Expand Down
15 changes: 4 additions & 11 deletions gui/src/app/state/psbt.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ use iced::Subscription;

use iced::Command;
use liana::{
commands::CoinStatus,
descriptors::LianaPolicy,
miniscript::bitcoin::{bip32::Fingerprint, psbt::Psbt, Network, Txid},
};
Expand Down Expand Up @@ -167,23 +168,15 @@ impl PsbtState {
return cmd;
}
Message::View(view::Message::Spend(view::SpendTxMessage::Broadcast)) => {
let outpoints: HashSet<_> = self.tx.coins.keys().cloned().collect();
let outpoints: Vec<_> = self.tx.coins.keys().cloned().collect();
return Command::perform(
async move {
daemon
// TODO: filter for the outpoints in `tx.coins` when this is possible:
// https://github.com/wizardsardine/liana/issues/677
.list_coins()
.list_coins(&[CoinStatus::Spending], &outpoints)
Copy link
Member

@edouardparis edouardparis Apr 18, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

we use the outpoint, it is enough, you can remove the status filter. My fear is that the coin exists, just is not yet marked as spending

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think it's OK to keep the status filter here as the previous filter_map was already filtering for coins with a non-null spend txid.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah you may right, I think we are good then.

.map(|res| {
res.coins
.iter()
.filter_map(|c| {
if outpoints.contains(&c.outpoint) {
c.spend_info.map(|info| info.txid)
} else {
None
}
})
.filter_map(|c| c.spend_info.map(|info| info.txid))
.collect()
})
.map_err(|e| e.into())
Expand Down
26 changes: 13 additions & 13 deletions gui/src/app/state/recovery.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,12 @@ use std::sync::Arc;

use iced::Command;

use liana::miniscript::bitcoin::{
bip32::{DerivationPath, Fingerprint},
secp256k1,
use liana::{
commands::CoinStatus,
miniscript::bitcoin::{
bip32::{DerivationPath, Fingerprint},
secp256k1,
},
};
use liana_ui::{component::form, widget::Element};

Expand Down Expand Up @@ -155,16 +158,13 @@ impl State for RecoveryPanel {
return Command::perform(
async move {
let psbt = daemon.create_recovery(address, feerate_vb, sequence)?;
let coins = daemon.list_coins().map(|res| res.coins)?;
let coins = coins
.into_iter()
.filter(|coin| {
psbt.unsigned_tx
.input
.iter()
.any(|input| input.previous_output == coin.outpoint)
})
let outpoints: Vec<_> = psbt
.unsigned_tx
.input
.iter()
.map(|txin| txin.previous_output)
.collect();
let coins = daemon.list_coins(&[], &outpoints).map(|res| res.coins)?;
Ok(SpendTx::new(
None,
psbt,
Expand Down Expand Up @@ -207,7 +207,7 @@ impl State for RecoveryPanel {
Command::perform(
async move {
daemon
.list_coins()
.list_coins(&[CoinStatus::Unconfirmed, CoinStatus::Confirmed], &[])
.map(|res| res.coins)
.map_err(|e| e.into())
},
Expand Down
9 changes: 6 additions & 3 deletions gui/src/app/state/spend/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,10 @@ use std::sync::Arc;

use iced::Command;

use liana::miniscript::bitcoin::{Network, OutPoint};
use liana::{
commands::CoinStatus,
miniscript::bitcoin::{Network, OutPoint},
};
use liana_ui::widget::Element;

use super::{redirect, State};
Expand Down Expand Up @@ -123,7 +126,7 @@ impl State for CreateSpendPanel {
Command::perform(
async move {
daemon1
.list_coins()
.list_coins(&[CoinStatus::Unconfirmed, CoinStatus::Confirmed], &[])
.map(|res| res.coins)
.map_err(|e| e.into())
},
Expand All @@ -132,7 +135,7 @@ impl State for CreateSpendPanel {
Command::perform(
async move {
let coins = daemon
.list_coins()
.list_coins(&[CoinStatus::Unconfirmed, CoinStatus::Confirmed], &[])
.map(|res| res.coins)
.map_err(Error::from)?;
let mut targets = HashSet::<LabelItem>::new();
Expand Down
35 changes: 13 additions & 22 deletions gui/src/app/state/transactions.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ use std::{

use iced::Command;
use liana::{
commands::CoinStatus,
miniscript::bitcoin::{OutPoint, Txid},
spend::{SpendCreationError, MAX_FEERATE},
};
Expand Down Expand Up @@ -146,23 +147,23 @@ impl State for TransactionsPanel {
if let Some(tx) = &self.selected_tx {
if tx.fee_amount.is_some() {
let tx = tx.clone();
let txid = tx.tx.txid();
let outpoints: Vec<_> = (0..tx.tx.output.len())
.map(|vout| {
OutPoint::new(
tx.tx.txid(),
vout.try_into()
.expect("number of transaction outputs must fit in u32"),
)
})
.collect();
return Command::perform(
async move {
daemon
// TODO: filter for spending coins when this is possible:
// https://github.com/wizardsardine/liana/issues/677
.list_coins()
.list_coins(&[CoinStatus::Spending], &outpoints)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

we use the outpoint, it is enough, you can remove the status filter. My fear is that the coin exists, just is not yet marked as spending

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As with the other comment, I've kept the status filter.

.map(|res| {
res.coins
.iter()
.filter_map(|c| {
if c.outpoint.txid == txid {
c.spend_info.map(|info| info.txid)
} else {
None
}
})
.filter_map(|c| c.spend_info.map(|info| info.txid))
.collect()
})
.map_err(|e| e.into())
Expand Down Expand Up @@ -248,7 +249,6 @@ impl State for TransactionsPanel {
self.selected_tx = None;
let daemon1 = daemon.clone();
let daemon2 = daemon.clone();
let daemon3 = daemon.clone();
let now: u32 = SystemTime::now()
.duration_since(UNIX_EPOCH)
.unwrap()
Expand All @@ -257,7 +257,7 @@ impl State for TransactionsPanel {
.unwrap();
Command::batch(vec![
Command::perform(
async move { daemon3.list_pending_txs().map_err(|e| e.into()) },
async move { daemon2.list_pending_txs().map_err(|e| e.into()) },
Message::PendingTransactions,
),
Command::perform(
Expand All @@ -268,15 +268,6 @@ impl State for TransactionsPanel {
},
Message::HistoryTransactions,
),
Command::perform(
async move {
daemon2
.list_coins()
.map(|res| res.coins)
.map_err(|e| e.into())
},
Message::Coins,
),
])
}
}
Expand Down
16 changes: 13 additions & 3 deletions gui/src/daemon/client/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ use std::collections::{HashMap, HashSet};
use std::fmt::Debug;
use std::iter::FromIterator;

use liana::commands::CreateRecoveryResult;
use liana::commands::{CoinStatus, CreateRecoveryResult};
use serde::de::DeserializeOwned;
use serde::{Deserialize, Serialize};
use serde_json::json;
Expand Down Expand Up @@ -77,8 +77,18 @@ impl<C: Client + Debug> Daemon for Lianad<C> {
self.call("getnewaddress", Option::<Request>::None)
}

fn list_coins(&self) -> Result<ListCoinsResult, DaemonError> {
self.call("listcoins", Option::<Request>::None)
fn list_coins(
&self,
statuses: &[CoinStatus],
outpoints: &[OutPoint],
) -> Result<ListCoinsResult, DaemonError> {
self.call(
"listcoins",
Some(vec![
json!(statuses.iter().map(|s| s.to_arg()).collect::<Vec<&str>>()),
json!(outpoints),
]),
)
}

fn list_spend_txs(&self) -> Result<ListSpendResult, DaemonError> {
Expand Down
10 changes: 7 additions & 3 deletions gui/src/daemon/embedded.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ use std::sync::Mutex;

use super::{model::*, Daemon, DaemonError};
use liana::{
commands::LabelItem,
commands::{CoinStatus, LabelItem},
config::Config,
miniscript::bitcoin::{address, psbt::Psbt, Address, OutPoint, Txid},
DaemonControl, DaemonHandle,
Expand Down Expand Up @@ -87,8 +87,12 @@ impl Daemon for EmbeddedDaemon {
self.command(|daemon| Ok(daemon.get_new_address()))
}

fn list_coins(&self) -> Result<ListCoinsResult, DaemonError> {
self.command(|daemon| Ok(daemon.list_coins(&[], &[])))
fn list_coins(
&self,
statuses: &[CoinStatus],
outpoints: &[OutPoint],
) -> Result<ListCoinsResult, DaemonError> {
self.command(|daemon| Ok(daemon.list_coins(statuses, outpoints)))
}

fn list_spend_txs(&self) -> Result<ListSpendResult, DaemonError> {
Expand Down
Loading
Loading