Stop payjoin session with nodemanager

Author: DanGould

mutiny-core/src/lib.rs

@@ -1540,10 +1540,11 @@ impl<S: MutinyStorage> MutinyWallet<S> {
             let pj_uri = enrolled.fallback_target();
             log_debug!(self.logger, "{pj_uri}");
             let wallet = self.node_manager.wallet.clone();
+            let stop = self.node_manager.stop.clone();
             // run await payjoin task in the background as it'll keep polling the relay
             let logger = self.logger.clone();
             utils::spawn(async move {
-                match NodeManager::receive_payjoin(wallet, enrolled).await {
+                match NodeManager::receive_payjoin(wallet, stop, enrolled).await {
                     Ok(pj_txid) => log_info!(logger, "Received payjoin txid: {}", pj_txid),
                     Err(e) => log_error!(logger, "Payjoin error: {e}"),
                 }

mutiny-core/src/nodemanager.rs

@@ -795,6 +795,7 @@ impl<S: MutinyStorage> NodeManager<S> {
     /// Poll the payjoin relay to maintain a payjoin session and create a payjoin proposal.
     pub async fn receive_payjoin(
         wallet: Arc<OnChainWallet<S>>,
+        stop: Arc<AtomicBool>,
         mut enrolled: payjoin::receive::v2::Enrolled,
     ) -> Result<Txid, MutinyError> {
         use crate::payjoin::Error as PayjoinError;
@@ -803,10 +804,10 @@ impl<S: MutinyStorage> NodeManager<S> {
             .build()
             .map_err(PayjoinError::Reqwest)?;
         let proposal: payjoin::receive::v2::UncheckedProposal =
-            Self::poll_for_fallback_psbt(&http_client, &mut enrolled).await?;
-        let mut payjoin_proposal = wallet
-            .process_payjoin_proposal(proposal)
-            .map_err(|_| crate::payjoin::Error::ReceiverStateMachine)?;
+            Self::poll_for_fallback_psbt(stop, &http_client, &mut enrolled)
+                .await
+                .map_err(|_| crate::payjoin::Error::ReceiverStateMachine)?;
+        let mut payjoin_proposal = wallet.process_payjoin_proposal(proposal).unwrap();
 
         let (req, ohttp_ctx) = payjoin_proposal
             .extract_v2_req()
@@ -827,10 +828,14 @@ impl<S: MutinyStorage> NodeManager<S> {
     }
 
     async fn poll_for_fallback_psbt(
+        stop: Arc<AtomicBool>,
         client: &reqwest::Client,
         enroller: &mut payjoin::receive::v2::Enrolled,
     ) -> Result<payjoin::receive::v2::UncheckedProposal, crate::payjoin::Error> {
         loop {
+            if stop.load(Ordering::Relaxed) {
+                return Err(crate::payjoin::Error::Shutdown);
+            }
             let (req, context) = enroller.extract_req()?;
             let ohttp_response = client
                 .post(req.url)

mutiny-core/src/payjoin.rs

@@ -31,6 +31,7 @@ pub enum Error {
     Reqwest(reqwest::Error),
     ReceiverStateMachine,
     Txid(bitcoin::hashes::hex::Error),
+    Shutdown,
 }
 
 impl std::error::Error for Error {}
@@ -41,6 +42,7 @@ impl std::fmt::Display for Error {
             Error::Reqwest(e) => write!(f, "Reqwest error: {}", e),
             Error::ReceiverStateMachine => write!(f, "Payjoin state machine error"),
             Error::Txid(e) => write!(f, "Payjoin txid error: {}", e),
+            Error::Shutdown => write!(f, "Payjoin stopped by application shutdown"),
         }
     }
 }