feat: lnd cancel invoice

crates/cdk-lnd/Cargo.toml

@@ -15,5 +15,6 @@ cdk = { path = "../cdk", version= "0.4.0", default-features = false, features =
 fedimint-tonic-lnd = "0.2.0"
 futures = { version = "0.3.28", default-features = false }
 tokio = { version = "1", default-features = false }
+tokio-util = { version = "0.7.11", default-features = false }
 tracing = { version = "0.1", default-features = false, features = ["attributes", "log"] }
 thiserror = "1"

crates/cdk-lnd/src/lib.rs

@@ -8,6 +8,7 @@
 use std::path::PathBuf;
 use std::pin::Pin;
 use std::str::FromStr;
+use std::sync::atomic::{AtomicBool, Ordering};
 use std::sync::Arc;
 
 use anyhow::anyhow;
@@ -30,6 +31,7 @@ use fedimint_tonic_lnd::lnrpc::FeeLimit;
 use fedimint_tonic_lnd::Client;
 use futures::{Stream, StreamExt};
 use tokio::sync::Mutex;
+use tokio_util::sync::CancellationToken;
 
 pub mod error;
 
@@ -43,6 +45,8 @@ pub struct Lnd {
     fee_reserve: FeeReserve,
     mint_settings: MintMethodSettings,
     melt_settings: MeltMethodSettings,
+    wait_invoice_cancel_token: CancellationToken,
+    wait_invoice_is_active: Arc<AtomicBool>,
 }
 
 impl Lnd {
@@ -70,6 +74,8 @@ impl Lnd {
             fee_reserve,
             mint_settings,
             melt_settings,
+            wait_invoice_cancel_token: CancellationToken::new(),
+            wait_invoice_is_active: Arc::new(AtomicBool::new(false)),
         })
     }
 }
@@ -89,11 +95,11 @@ impl MintLightning for Lnd {
     }
 
     fn is_wait_invoice_active(&self) -> bool {
-        todo!()
+        self.wait_invoice_is_active.load(Ordering::SeqCst)
     }
 
     fn cancel_wait_invoice(&self) {
-        todo!()
+        self.wait_invoice_cancel_token.cancel()
     }
 
     async fn wait_any_invoice(
@@ -116,19 +122,52 @@ impl MintLightning for Lnd {
             .unwrap()
             .into_inner();
 
-        Ok(futures::stream::unfold(stream, |mut stream| async move {
+        let cancel_token = self.wait_invoice_cancel_token.clone();
-            match stream.message().await {
+
-                Ok(Some(msg)) => {
+        Ok(futures::stream::unfold(
-                    if msg.state == 1 {
+            (
-                        Some((hex::encode(msg.r_hash), stream))
+                stream,
-                    } else {
+                cancel_token,
+                Arc::clone(&self.wait_invoice_is_active),
+            ),
+            |(mut stream, cancel_token, is_active)| async move {
+                is_active.store(true, Ordering::SeqCst);
+
+                tokio::select! {
+                    _ = cancel_token.cancelled() => {
+                    // Stream is cancelled
+                    is_active.store(false, Ordering::SeqCst);
+                    tracing::info!("Waiting for lnd invoice ending");
+                    return None;
+
+                    }
+                    msg = stream.message() => {
+
+                match msg {
+                    Ok(Some(msg)) => {
+                        if msg.state == 1 {
+                            Some((hex::encode(msg.r_hash), (stream, cancel_token, is_active)))
+                        } else {
+                            None
+                        }
+                    }
+                    Ok(None) => {
+                    is_active.store(false, Ordering::SeqCst);
+                    tracing::info!("LND invoice stream ended.");
                         None
+                    }, // End of stream
+                    Err(err) => {
+                    is_active.store(false, Ordering::SeqCst);
+                    tracing::warn!("Encounrdered error in LND invoice stream. Stream ending");
+                    tracing::error!("{:?}", err);
+                    None
+
+                    },   // Handle errors gracefully, ends the stream on error
+                }
                     }
                 }
-                Ok(None) => None, // End of stream
+            },
-                Err(_) => None,   // Handle errors gracefully, ends the stream on error
+        )
-            }
-        })
         .boxed())
     }