Payjoin v4

liana-gui/Cargo.toml

@@ -54,6 +54,9 @@ reqwest = { version = "0.11", default-features=false, features = ["json", "rustl
 rust-ini = "0.19.0"
 rfd = "0.15.1"
 
+# Payjoin
+payjoin = { git = "https://github.com/payjoin/rust-payjoin.git", branch = "master", features = ["v2", "io"] }
+
 
 [target.'cfg(windows)'.dependencies]
 zip = { version = "0.6", default-features=false, features = ["bzip2", "deflate"] }

liana-gui/src/app/message.rs

@@ -7,6 +7,7 @@ use liana::miniscript::bitcoin::{
     Address, Txid,
 };
 use lianad::config::Config as DaemonConfig;
+use payjoin::Url;
 
 use crate::{
     app::{cache::Cache, error::Error, view, wallet::Wallet},
@@ -25,7 +26,7 @@ pub enum Message {
     DaemonConfigLoaded(Result<(), Error>),
     LoadWallet(Wallet),
     Info(Result<GetInfoResult, Error>),
-    ReceiveAddress(Result<(Address, ChildNumber), Error>),
+    ReceiveAddress(Result<(Address, ChildNumber, Option<Url>), Error>),
     /// Revealed addresses. The second element contains the start index used for the request.
     RevealedAddresses(
         Result<ListRevealedAddressesResult, Error>,
@@ -55,6 +56,8 @@ pub enum Message {
     BroadcastModal(Result<HashSet<Txid>, Error>),
     RbfModal(Box<HistoryTransaction>, bool, Result<HashSet<Txid>, Error>),
     Export(ImportExportMessage),
+    SendPayjoin(Result<(), Error>),
+    PayjoinInitiated(Result<String, Error>),
 }
 
 impl From<ImportExportMessage> for Message {

liana-gui/src/app/state/psbt.rs

@@ -58,6 +58,7 @@ pub enum PsbtModal {
     Broadcast(BroadcastModal),
     Delete(DeleteModal),
     Export(ExportModal),
+    SendPayjoin(SendPayjoinModal),
 }
 
 impl<'a> AsRef<dyn Modal + 'a> for PsbtModal {
@@ -68,6 +69,7 @@ impl<'a> AsRef<dyn Modal + 'a> for PsbtModal {
             Self::Broadcast(a) => a,
             Self::Delete(a) => a,
             Self::Export(a) => a,
+            Self::SendPayjoin(a) => a,
         }
     }
 }
@@ -80,6 +82,7 @@ impl<'a> AsMut<dyn Modal + 'a> for PsbtModal {
             Self::Broadcast(a) => a,
             Self::Delete(a) => a,
             Self::Export(a) => a,
+            Self::SendPayjoin(a) => a,
         }
     }
 }
@@ -88,21 +91,23 @@ pub struct PsbtState {
     pub wallet: Arc<Wallet>,
     pub desc_policy: LianaPolicy,
     pub tx: SpendTx,
+    pub bip21: Option<String>,
     pub saved: bool,
     pub warning: Option<Error>,
     pub labels_edited: LabelsEdited,
     pub modal: Option<PsbtModal>,
 }
 
 impl PsbtState {
-    pub fn new(wallet: Arc<Wallet>, tx: SpendTx, saved: bool) -> Self {
+    pub fn new(wallet: Arc<Wallet>, tx: SpendTx, saved: bool, bip21: Option<String>) -> Self {
         Self {
             desc_policy: wallet.main_descriptor.policy(),
             wallet,
             labels_edited: LabelsEdited::default(),
             warning: None,
             modal: None,
             tx,
+            bip21,
             saved,
         }
     }
@@ -182,6 +187,30 @@ impl PsbtState {
             Message::View(view::Message::Spend(view::SpendTxMessage::Delete)) => {
                 self.modal = Some(PsbtModal::Delete(DeleteModal::default()));
             }
+            Message::View(view::Message::Spend(view::SpendTxMessage::SendPayjoin)) => {
+                let modal = SendPayjoinModal::new();
+                let cmd = modal.load(daemon);
+                self.modal = Some(PsbtModal::SendPayjoin(modal));
+                return cmd;
+            }
+            Message::View(view::Message::Spend(view::SpendTxMessage::PayjoinInitiated)) => {
+                self.tx.status = SpendStatus::PayjoinInitiated;
+                self.modal = None;
+                if let Some(_payjoin_info) = self.tx.payjoin_status.clone() {
+                    let psbt = self.tx.psbt.clone();
+                    // TODO: should this be an error?
+                    let bip21 = self.bip21.clone().expect("bip21 should be set");
+                    return Task::perform(
+                        async move {
+                            daemon
+                                .send_payjoin(bip21, &psbt)
+                                .await
+                                .map_err(|e| e.into())
+                        },
+                        Message::SendPayjoin,
+                    );
+                }
+            }
             Message::View(view::Message::Spend(view::SpendTxMessage::Sign)) => {
                 if let Some(PsbtModal::Sign(SignModal { display_modal, .. })) = &mut self.modal {
                     *display_modal = true;
@@ -301,6 +330,28 @@ impl PsbtState {
     }
 }
 
+#[derive(Default)]
+pub struct SendPayjoinModal {
+    _error: Option<Error>,
+}
+
+impl SendPayjoinModal {
+    pub fn new() -> Self {
+        Self { _error: None }
+    }
+}
+
+impl Modal for SendPayjoinModal {
+    fn view<'a>(&'a self, content: Element<'a, view::Message>) -> Element<'a, view::Message> {
+        modal::Modal::new(content, view::psbt::payjoin_send_success_view())
+            // On blur, show the psbts view
+            .on_blur(Some(view::Message::Spend(
+                view::SpendTxMessage::PayjoinInitiated,
+            )))
+            .into()
+    }
+}
+
 #[derive(Default)]
 pub struct SaveModal {
     saved: bool,
@@ -537,6 +588,7 @@ impl Modal for SignModal {
                         self.signed.insert(fingerprint);
                         let daemon = daemon.clone();
                         merge_signatures(&mut tx.psbt, &psbt);
+
                         if self.is_saved {
                             return Task::perform(
                                 async move { daemon.update_spend_tx(&psbt).await.map_err(|e| e.into()) },

liana-gui/src/app/state/psbts.rs

@@ -31,7 +31,7 @@ impl PsbtsPanel {
     }
 
     pub fn preselect(&mut self, spend_tx: SpendTx) {
-        let psbt_state = psbt::PsbtState::new(self.wallet.clone(), spend_tx, true);
+        let psbt_state = psbt::PsbtState::new(self.wallet.clone(), spend_tx, true, None);
         self.selected_tx = Some(psbt_state);
         self.warning = None;
         self.modal = None;
@@ -81,7 +81,8 @@ impl State for PsbtsPanel {
                             spend_tx.psbt.unsigned_tx.compute_txid()
                                 == tx.tx.psbt.unsigned_tx.compute_txid()
                         }) {
-                            let tx = psbt::PsbtState::new(self.wallet.clone(), tx.clone(), true);
+                            let tx =
+                                psbt::PsbtState::new(self.wallet.clone(), tx.clone(), true, None);
                             let cmd = tx.load(daemon);
                             self.selected_tx = Some(tx);
                             return cmd;
@@ -119,7 +120,7 @@ impl State for PsbtsPanel {
             }
             Message::View(view::Message::Select(i)) => {
                 if let Some(tx) = self.spend_txs.get(i) {
-                    let tx = psbt::PsbtState::new(self.wallet.clone(), tx.clone(), true);
+                    let tx = psbt::PsbtState::new(self.wallet.clone(), tx.clone(), true, None);
                     let cmd = tx.load(daemon);
                     self.selected_tx = Some(tx);
                     return cmd;

liana-gui/src/app/state/receive.rs

@@ -7,6 +7,7 @@ use liana::miniscript::bitcoin::{
     Address, Network,
 };
 use liana_ui::{component::modal, widget::*};
+use payjoin::Url;
 
 use crate::daemon::model::LabelsLoader;
 use crate::dir::LianaDirectory;
@@ -33,12 +34,14 @@ const PREV_ADDRESSES_PAGE_SIZE: usize = 20;
 pub enum Modal {
     VerifyAddress(VerifyAddressModal),
     ShowQrCode(ShowQrCodeModal),
+    ShowBip21QrCode(ShowBip21QrCodeModal),
     None,
 }
 
 #[derive(Debug, Default)]
 pub struct Addresses {
     list: Vec<Address>,
+    bip21s: HashMap<Address, Url>,
     derivation_indexes: Vec<ChildNumber>,
     labels: HashMap<String, String>,
 }
@@ -121,6 +124,7 @@ impl State for ReceivePanel {
             self.warning.as_ref(),
             view::receive::receive(
                 &self.addresses.list,
+                &self.addresses.bip21s,
                 &self.addresses.labels,
                 &self.prev_addresses.list,
                 &self.prev_addresses.labels,
@@ -139,6 +143,9 @@ impl State for ReceivePanel {
             Modal::ShowQrCode(m) => modal::Modal::new(content, m.view())
                 .on_blur(Some(view::Message::Close))
                 .into(),
+            Modal::ShowBip21QrCode(m) => modal::Modal::new(content, m.view())
+                .on_blur(Some(view::Message::Close))
+                .into(),
             Modal::None => content,
         }
     }
@@ -175,10 +182,13 @@ impl State for ReceivePanel {
             }
             Message::ReceiveAddress(res) => {
                 match res {
-                    Ok((address, derivation_index)) => {
+                    Ok((address, derivation_index, bip21)) => {
                         self.warning = None;
-                        self.addresses.list.push(address);
+                        self.addresses.list.push(address.clone());
                         self.addresses.derivation_indexes.push(derivation_index);
+                        if let Some(bip21) = bip21 {
+                            self.addresses.bip21s.insert(address, bip21);
+                        }
                     }
                     Err(e) => self.warning = Some(e),
                 }
@@ -209,7 +219,7 @@ impl State for ReceivePanel {
                         daemon
                             .get_new_address()
                             .await
-                            .map(|res| (res.address, res.derivation_index))
+                            .map(|res| (res.address, res.derivation_index, res.bip21))
                             .map_err(|e| e.into())
                     },
                     Message::ReceiveAddress,
@@ -294,6 +304,33 @@ impl State for ReceivePanel {
                 }
                 Task::none()
             }
+            Message::View(view::Message::ShowBip21QrCode(i)) => {
+                if let (Some(bip21), Some(index)) = (
+                    &self
+                        .addresses
+                        .bip21s
+                        .get(self.address(i).expect("Address should be in bip21")),
+                    self.derivation_index(i),
+                ) {
+                    if let Some(modal) = ShowBip21QrCodeModal::new(bip21, *index) {
+                        self.modal = Modal::ShowBip21QrCode(modal);
+                    }
+                }
+                Task::none()
+            }
+            Message::View(view::Message::PayjoinInitiate) => {
+                let daemon = daemon.clone();
+                Task::perform(
+                    async move {
+                        daemon
+                            .receive_payjoin()
+                            .await
+                            .map(|res| (res.address, res.derivation_index, res.bip21))
+                            .map_err(|e| e.into())
+                    },
+                    Message::ReceiveAddress,
+                )
+            }
             _ => {
                 if let Modal::VerifyAddress(ref mut m) = self.modal {
                     m.update(daemon, cache, message)
@@ -434,6 +471,26 @@ impl ShowQrCodeModal {
     }
 }
 
+pub struct ShowBip21QrCodeModal {
+    qr_code: qr_code::Data,
+    bip21: String,
+}
+
+impl ShowBip21QrCodeModal {
+    pub fn new(bip21: &payjoin::Url, _index: ChildNumber) -> Option<Self> {
+        qr_code::Data::new(format!("{}", bip21))
+            .ok()
+            .map(|qr_code| Self {
+                qr_code,
+                bip21: bip21.to_string(),
+            })
+    }
+
+    fn view(&self) -> Element<view::Message> {
+        view::receive::qr_modal(&self.qr_code, &self.bip21)
+    }
+}
+
 async fn verify_address(
     hw: std::sync::Arc<dyn async_hwi::HWI + Send + Sync>,
     index: ChildNumber,
@@ -484,7 +541,8 @@ mod tests {
                 Some(json!({"method": "getnewaddress", "params": Option::<Request>::None})),
                 Ok(json!(GetAddressResult::new(
                     addr.clone(),
-                    ChildNumber::from_normal_idx(0).unwrap()
+                    ChildNumber::from_normal_idx(0).unwrap(),
+                    None,
                 ))),
             ),
         ]);