joinstr: add Joinstr::start_coinjoin_blocking() and make Joinstr::start_coinjoin() non blocking

Author: pythcoiner

rust/joinstr/src/interface.rs

@@ -140,7 +140,7 @@ pub fn initiate_coinjoin(config: PoolConfig, peer: PeerConfig) -> Result<Txid, E
     initiator.set_coin(coin)?;
     initiator.set_address(addr)?;
 
-    initiator.start_coinjoin(None, Some(&signer))?;
+    initiator.start_coinjoin_blocking(None, Some(signer.clone()))?;
 
     let txid = initiator
         .final_tx()
@@ -200,7 +200,7 @@ pub fn join_coinjoin(pool: Pool, peer: PeerConfig) -> Result<String /* Txid */,
     let client = Client::new(&url, port)?;
     signer.set_client(client);
 
-    joinstr_peer.start_coinjoin(None, Some(&signer))?;
+    joinstr_peer.start_coinjoin_blocking(None, Some(signer.clone()))?;
 
     let txid = joinstr_peer
         .final_tx()

rust/joinstr/src/joinstr/mod.rs

@@ -5,6 +5,7 @@ pub use error::Error;
 use std::{
     collections::HashSet,
     sync::{Arc, Mutex},
+    thread,
     time::{SystemTime, UNIX_EPOCH},
 };
 
@@ -28,9 +29,9 @@ use crate::{
 // delay we wait between (non-blocking) polls of a channel
 pub const WAIT: u64 = 50;
 
-#[derive(Debug)]
+#[derive(Debug, Clone)]
 pub struct Joinstr<'a> {
-    inner: Arc<Mutex<JoinstrInner<'a>>>,
+    pub inner: Arc<Mutex<JoinstrInner<'a>>>,
 }
 
 #[derive(Debug, Default, Clone, Copy)]
@@ -62,6 +63,7 @@ pub struct Status {
     registered_outputs: usize,
     registered_inputs: usize,
     confirmations: usize,
+    error: Option<String>,
 }
 
 #[derive(Debug)]
@@ -72,6 +74,7 @@ pub struct JoinstrInner<'a> {
     registered_outputs: usize,
     registered_inputs: usize,
     confirmations: usize,
+    error: Option<String>,
     pub client: NostrClient,
     pub pool: Option<Pool>,
     pub denomination: Option<Amount>,
@@ -96,6 +99,7 @@ impl Default for JoinstrInner<'_> {
             registered_outputs: 0,
             registered_inputs: 0,
             confirmations: 0,
+            error: None,
             client: Default::default(),
             pool: Default::default(),
             denomination: Default::default(),
@@ -729,9 +733,29 @@ impl Joinstr<'_> {
     /// # Errors
     ///
     /// This function will return an error if any step return an error.
-    pub fn start_coinjoin<S>(&mut self, pool: Option<Pool>, signer: Option<&S>) -> Result<(), Error>
+    pub fn start_coinjoin<S>(&mut self, pool: Option<Pool>, signer: Option<S>)
     where
-        S: JoinstrSigner,
+        S: JoinstrSigner + Sized + Sync + Clone + Send + 'static,
+        Self: Sized + Send + 'static,
+    {
+        let mut cloned = self.clone();
+        let signer = signer.clone();
+        thread::spawn(move || {
+            if let Err(e) = cloned.start_coinjoin_blocking(pool, signer) {
+                let mut inner = cloned.inner.lock().expect("poisoned");
+                inner.error = Some(format!("{:?}", e));
+                inner.step = Step::Failed;
+            }
+        });
+    }
+
+    pub fn start_coinjoin_blocking<S>(
+        &mut self,
+        pool: Option<Pool>,
+        signer: Option<S>,
+    ) -> Result<(), Error>
+    where
+        S: JoinstrSigner + Sync + Clone + Send + 'static,
     {
         let mut inner = self.inner.lock().expect("poisoned");
 
@@ -762,7 +786,7 @@ impl Joinstr<'_> {
         let mut inner = self.inner.lock().expect("poisoned");
         if inner.input.is_some() {
             if let Some(s) = signer {
-                inner.register_input(s)?;
+                inner.register_input(&s)?;
             } else {
                 return Err(Error::SignerMissing);
             }
@@ -1207,6 +1231,7 @@ impl<'a> JoinstrInner<'a> {
             registered_outputs: self.registered_outputs,
             registered_inputs: self.registered_inputs,
             confirmations: self.confirmations,
+            error: self.error.clone(),
         }
     }
 }

rust/joinstr/src/signer/mod.rs

@@ -24,6 +24,7 @@ pub trait JoinstrSigner {
     fn sign_input(&self, tx: &Transaction, input_data: Coin) -> Result<InputDataSigned, String>;
 }
 
+// S: JoinstrSigner + Sync + Clone + Send + 'static,
 #[derive(Clone)]
 pub struct WpkhHotSigner {
     #[allow(unused)]

rust/joinstr/tests/joinstr.rs

@@ -139,7 +139,7 @@ fn simple_coinjoin() {
 
     let coordinator_handle = thread::spawn(move || {
         coordinator
-            .start_coinjoin(None, Option::<&WpkhHotSigner>::None)
+            .start_coinjoin_blocking(None, Option::<WpkhHotSigner>::None)
             .unwrap();
         coordinator.final_tx()
     });
@@ -226,11 +226,11 @@ fn simple_coinjoin() {
     let signer_a = signer.clone();
     let pool_a = pool.clone();
     let _peer_a = thread::spawn(move || {
-        let _ = peer_a.start_coinjoin(Some(pool_a), Some(&signer_a));
+        let _ = peer_a.start_coinjoin_blocking(Some(pool_a), Some(signer_a));
     });
 
     let _peer_b = thread::spawn(move || {
-        let _ = peer_b.start_coinjoin(Some(pool), Some(&signer));
+        let _ = peer_b.start_coinjoin_blocking(Some(pool), Some(signer));
     });
 
     let final_tx = coordinator_handle.join().unwrap().unwrap();