Skip to content
This repository was archived by the owner on Feb 3, 2025. It is now read-only.

Commit 576d118

Browse files
DanGouldDanGould
committed
Handle payjoin errors
1 parent f77afba commit 576d118

3 files changed

Lines changed: 108 additions & 80 deletions

File tree

‎mutiny-core/src/lib.rs‎

Lines changed: 15 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -910,59 +910,21 @@ impl<S: MutinyStorage> MutinyWallet<S> {
910910
return Err(MutinyError::WalletOperationFailed);
911911
};
912912

913-
let pj = {
914-
use anyhow::anyhow;
915-
// DANGER! TODO get from &self config, do not get config directly from PAYJOIN_DIR ohttp-gateway
916-
// That would reveal IP address
917-
918-
let http_client = reqwest::Client::builder().build().unwrap();
919-
920-
let ohttp_config_base64 = http_client
921-
.get(format!("{}/ohttp-config", crate::payjoin::PAYJOIN_DIR))
922-
.send()
923-
.await
924-
.unwrap()
925-
.text()
926-
.await
927-
.unwrap();
928-
929-
let mut enroller = pj::receive::v2::Enroller::from_relay_config(
930-
crate::payjoin::PAYJOIN_DIR,
931-
&ohttp_config_base64,
932-
crate::payjoin::OHTTP_RELAYS[0], // TODO pick ohttp relay at random
933-
);
934-
935-
// enroll client
936-
let (req, context) = enroller.extract_req().unwrap();
937-
let ohttp_response = http_client
938-
.post(req.url)
939-
.body(req.body)
940-
.send()
941-
.await
942-
.unwrap();
943-
let ohttp_response = ohttp_response.bytes().await.unwrap();
944-
let enrolled = enroller
945-
.process_res(ohttp_response.as_ref(), context)
946-
.map_err(|e| anyhow!("parse error {}", e))
947-
.unwrap();
948-
let session = self
949-
.node_manager
950-
.storage
951-
.persist_payjoin(enrolled.clone())
952-
.unwrap();
953-
let pj_uri = enrolled.fallback_target();
954-
log_debug!(self.logger, "{pj_uri}");
955-
let wallet = self.node_manager.wallet.clone();
956-
let stop = self.node_manager.stop.clone();
957-
let storage = Arc::new(self.node_manager.storage.clone());
958-
// run await payjoin task in the background as it'll keep polling the relay
959-
utils::spawn(async move {
960-
let pj_txid = NodeManager::receive_payjoin(wallet, stop, storage, session)
961-
.await
962-
.unwrap();
963-
log::info!("Received payjoin txid: {}", pj_txid);
964-
});
965-
Some(pj_uri)
913+
let pj = match self.node_manager.start_payjoin_session().await {
914+
Ok(enrolled) => {
915+
let session = self
916+
.node_manager
917+
.storage
918+
.persist_payjoin(enrolled.clone())?;
919+
let pj_uri = session.enrolled.fallback_target();
920+
log_debug!(self.logger, "{pj_uri}");
921+
self.node_manager.spawn_payjoin_receiver(session);
922+
Some(pj_uri)
923+
}
924+
Err(e) => {
925+
log_error!(self.logger, "Error enrolling payjoin: {e}");
926+
None
927+
}
966928
};
967929

968930
Ok(MutinyBip21RawMaterials {

‎mutiny-core/src/nodemanager.rs‎

Lines changed: 52 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
use crate::event::{HTLCStatus, PaymentInfo};
22
use crate::labels::LabelStorage;
33
use crate::logging::LOGGING_KEY;
4-
use crate::payjoin::PayjoinStorage;
4+
use crate::payjoin::{Error as PayjoinError, PayjoinStorage};
55
use crate::utils::{sleep, spawn};
66
use crate::ActivityItem;
77
use crate::MutinyWalletConfig;
@@ -47,6 +47,7 @@ use lightning::util::logger::*;
4747
use lightning::{log_debug, log_error, log_info, log_warn};
4848
use lightning_invoice::{Bolt11Invoice, Bolt11InvoiceDescription};
4949
use lightning_transaction_sync::EsploraSyncClient;
50+
use payjoin::receive::v2::Enrolled;
5051
use payjoin::Uri;
5152
use reqwest::Client;
5253
use serde::{Deserialize, Serialize};
@@ -693,15 +694,7 @@ impl<S: MutinyStorage> NodeManager<S> {
693694
pub(crate) fn resume_payjoins(nm: Arc<NodeManager<S>>) {
694695
let all = nm.storage.get_payjoins().unwrap_or_default();
695696
for payjoin in all {
696-
let wallet = nm.wallet.clone();
697-
let stop = nm.stop.clone();
698-
let storage = Arc::new(nm.storage.clone());
699-
utils::spawn(async move {
700-
let pj_txid = Self::receive_payjoin(wallet, stop, storage, payjoin)
701-
.await
702-
.unwrap();
703-
log::info!("Received payjoin txid: {}", pj_txid);
704-
});
697+
nm.clone().spawn_payjoin_receiver(payjoin);
705698
}
706699
}
707700

@@ -793,6 +786,31 @@ impl<S: MutinyStorage> NodeManager<S> {
793786
Err(MutinyError::WalletOperationFailed)
794787
}
795788

789+
pub async fn start_payjoin_session(&self) -> Result<Enrolled, PayjoinError> {
790+
// DANGER! TODO get from &self config, do not get config directly from PAYJOIN_DIR ohttp-gateway
791+
// That would reveal IP address
792+
793+
let http_client = reqwest::Client::builder().build()?;
794+
795+
let ohttp_config_base64 = http_client
796+
.get(format!("{}/ohttp-config", crate::payjoin::PAYJOIN_DIR))
797+
.send()
798+
.await?
799+
.text()
800+
.await?;
801+
802+
let mut enroller = payjoin::receive::v2::Enroller::from_relay_config(
803+
crate::payjoin::PAYJOIN_DIR,
804+
&ohttp_config_base64,
805+
crate::payjoin::OHTTP_RELAYS[0], // TODO pick ohttp relay at random
806+
);
807+
// enroll client
808+
let (req, context) = enroller.extract_req()?;
809+
let ohttp_response = http_client.post(req.url).body(req.body).send().await?;
810+
let ohttp_response = ohttp_response.bytes().await?;
811+
Ok(enroller.process_res(ohttp_response.as_ref(), context)?)
812+
}
813+
796814
// Send v1 payjoin request
797815
pub async fn send_payjoin(
798816
&self,
@@ -865,38 +883,45 @@ impl<S: MutinyStorage> NodeManager<S> {
865883
Ok(txid)
866884
}
867885

886+
pub fn spawn_payjoin_receiver(&self, session: crate::payjoin::Session) {
887+
let logger = self.logger.clone();
888+
let wallet = self.wallet.clone();
889+
let stop = self.stop.clone();
890+
let storage = Arc::new(self.storage.clone());
891+
utils::spawn(async move {
892+
match Self::receive_payjoin(wallet, stop, storage, session).await {
893+
Ok(txid) => log_info!(logger, "Received payjoin txid: {txid}"),
894+
Err(e) => log_error!(logger, "Error receiving payjoin: {e}"),
895+
};
896+
});
897+
}
898+
868899
/// Poll the payjoin relay to maintain a payjoin session and create a payjoin proposal.
869-
pub async fn receive_payjoin(
900+
async fn receive_payjoin(
870901
wallet: Arc<OnChainWallet<S>>,
871902
stop: Arc<AtomicBool>,
872903
storage: Arc<S>,
873904
mut session: crate::payjoin::Session,
874-
) -> Result<Txid, MutinyError> {
905+
) -> Result<Txid, PayjoinError> {
875906
let http_client = reqwest::Client::builder()
876907
//.danger_accept_invalid_certs(true) ? is tls unchecked :O
877-
.build()
878-
.unwrap();
908+
.build()?;
879909
let proposal: payjoin::receive::v2::UncheckedProposal =
880910
Self::poll_for_fallback_psbt(stop, storage, &http_client, &mut session)
881911
.await
882912
.unwrap();
883-
let payjoin_proposal = wallet.process_payjoin_proposal(proposal).unwrap();
913+
let payjoin_proposal = wallet
914+
.process_payjoin_proposal(proposal)
915+
.map_err(PayjoinError::Wallet)?;
884916

885-
let (req, ohttp_ctx) = payjoin_proposal.extract_v2_req().unwrap(); // extraction failed
886-
let res = http_client
887-
.post(req.url)
888-
.body(req.body)
889-
.send()
890-
.await
891-
.unwrap();
892-
let res = res.bytes().await.unwrap();
917+
let (req, ohttp_ctx) = payjoin_proposal.extract_v2_req()?; // extraction failed
918+
let res = http_client.post(req.url).body(req.body).send().await?;
919+
let res = res.bytes().await?;
893920
// enroll must succeed
894-
let _res = payjoin_proposal
895-
.deserialize_res(res.to_vec(), ohttp_ctx)
896-
.unwrap();
921+
let _res = payjoin_proposal.deserialize_res(res.to_vec(), ohttp_ctx)?;
897922
// convert from bitcoin 29 to 30
898923
let txid = payjoin_proposal.psbt().clone().extract_tx().txid();
899-
let txid = Txid::from_str(&txid.to_string()).unwrap();
924+
let txid = Txid::from_str(&txid.to_string()).map_err(PayjoinError::Txid)?;
900925
Ok(txid)
901926
}
902927

‎mutiny-core/src/payjoin.rs‎

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,3 +61,44 @@ impl<S: MutinyStorage> PayjoinStorage for S {
6161
self.delete(&[get_payjoin_key(id)])
6262
}
6363
}
64+
65+
#[derive(Debug)]
66+
pub enum Error {
67+
Reqwest(reqwest::Error),
68+
ReceiverStateMachine(payjoin::receive::Error),
69+
V2Encapsulation(payjoin::v2::Error),
70+
Wallet(payjoin::Error),
71+
Txid(bitcoin::hashes::hex::Error),
72+
}
73+
74+
impl std::error::Error for Error {}
75+
76+
impl std::fmt::Display for Error {
77+
fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
78+
match &self {
79+
Error::Reqwest(e) => write!(f, "Reqwest error: {}", e),
80+
Error::ReceiverStateMachine(e) => write!(f, "Payjoin error: {}", e),
81+
Error::V2Encapsulation(e) => write!(f, "Payjoin v2 error: {}", e),
82+
Error::Wallet(e) => write!(f, "Payjoin wallet error: {}", e),
83+
Error::Txid(e) => write!(f, "Payjoin txid error: {}", e),
84+
}
85+
}
86+
}
87+
88+
impl From<reqwest::Error> for Error {
89+
fn from(e: reqwest::Error) -> Self {
90+
Error::Reqwest(e)
91+
}
92+
}
93+
94+
impl From<payjoin::receive::Error> for Error {
95+
fn from(e: payjoin::receive::Error) -> Self {
96+
Error::ReceiverStateMachine(e)
97+
}
98+
}
99+
100+
impl From<payjoin::v2::Error> for Error {
101+
fn from(e: payjoin::v2::Error) -> Self {
102+
Error::V2Encapsulation(e)
103+
}
104+
}

0 commit comments

Comments
 (0)