Handle ReverseSwapUpdated event (#1258)

src/activities.rs

@@ -162,6 +162,41 @@ impl Activities {
         }
     }
 
+    /// Get a reverse swap activity by reverse swap id.
+    ///
+    /// Parameters:
+    /// * `reverse_swap_id` - the id of a reverse swap.
+    ///
+    /// Requires network: **no**
+    pub fn get_by_reverse_swap(&self, reverse_swap_id: String) -> Result<Option<Activity>> {
+        const LEEWAY_FOR_REVERSE_SWAPS: u32 = 30;
+        let list_payments_request = ListPaymentsRequest {
+            filters: Some(vec![PaymentTypeFilter::Sent]),
+            metadata_filters: None,
+            from_timestamp: None,
+            to_timestamp: None,
+            include_failures: Some(false),
+            limit: Some(LEEWAY_FOR_REVERSE_SWAPS),
+            offset: None,
+        };
+
+        let is_swap_with_id = |p: &breez_sdk_core::Payment| {
+            if let breez_sdk_core::PaymentDetails::Ln { ref data } = p.details {
+                if let Some(ref swap_info) = data.reverse_swap_info {
+                    return swap_info.id == reverse_swap_id;
+                }
+            }
+            false
+        };
+        self.rt_handle
+            .block_on(self.sdk.list_payments(list_payments_request))
+            .map_to_runtime_error(RuntimeErrorCode::NodeUnavailable, "Failed to list payments")?
+            .into_iter()
+            .find(is_swap_with_id)
+            .map(|p| self.activity_from_breez_payment(p))
+            .transpose()
+    }
+
     /// Get an incoming payment by its payment hash.
     ///
     /// Parameters:

src/callbacks.rs

@@ -37,10 +37,17 @@ pub trait EventsCallback: Send + Sync {
     /// This callback will be called when an incoming swap has completed.
     ///
     /// Parameters:
-    /// * `payment_hash` - can be used to find the [´Activity´](crate::Activity) corresponding to
+    /// * `payment_hash` - can be used to find the [`Activity`](crate::Activity) corresponding to
     ///   this swap.
     fn swap_received(&self, payment_hash: String);
 
+    /// This callback will be called when a reverse swap has completed.
+    ///
+    /// Parameters:
+    /// * `reverse_swap_id` - can be used to find the [`Activity`](crate::Activity) corresponding to
+    ///   this swap using [`get_by_reverse_swap`](crate::Activities::get_by_reverse_swap).
+    fn reverse_swap_sent(&self, reverse_swap_id: String);
+
     /// This callback will be called when a change to the Breez services health is noticed
     ///
     /// Parameters:

src/event.rs

@@ -1,6 +1,6 @@
 use crate::{analytics::AnalyticsInterceptor, EventsCallback};
 
-use breez_sdk_core::{BreezEvent, EventListener, PaymentDetails, SwapStatus};
+use breez_sdk_core::{BreezEvent, EventListener, PaymentDetails, ReverseSwapStatus, SwapStatus};
 use std::sync::Arc;
 
 pub(crate) struct LipaEventListener {
@@ -32,13 +32,13 @@ impl EventListener for LipaEventListener {
                 self.events_callback.synced();
             }
             BreezEvent::PaymentSucceed { details } => {
-                if let PaymentDetails::Ln { data } = details.details.clone() {
+                if let PaymentDetails::Ln { data } = details.details {
                     self.events_callback
                         .payment_sent(data.payment_hash, data.payment_preimage)
                 }
             }
             BreezEvent::PaymentFailed { details } => {
-                if let Some(invoice) = details.invoice.clone() {
+                if let Some(invoice) = details.invoice {
                     self.events_callback.payment_failed(invoice.payment_hash)
                 }
             }
@@ -51,7 +51,11 @@ impl EventListener for LipaEventListener {
                         .swap_received(hex::encode(details.payment_hash));
                 }
             }
-            BreezEvent::ReverseSwapUpdated { .. } => {}
+            BreezEvent::ReverseSwapUpdated { details } => {
+                if details.status == ReverseSwapStatus::CompletedConfirmed {
+                    self.events_callback.reverse_swap_sent(details.id);
+                }
+            }
         }
     }
 }

src/lipalightninglib.udl

@@ -204,6 +204,9 @@ interface Activities {
 
     [Throws=LnError]
     Activity get(string hash);
+
+    [Throws=LnError]
+    Activity? get_by_reverse_swap(string reverse_swap_id);
 
     [Throws=LnError]
     IncomingPaymentInfo get_incoming_payment(string hash);
@@ -278,6 +281,7 @@ callback interface EventsCallback {
     void payment_failed(string payment_hash);
     void channel_closed(string channel_id, string reason);
     void swap_received(string payment_hash);
+    void reverse_swap_sent(string reverse_swap_id);
     void breez_health_status_changed_to(BreezHealthCheckStatus status);
     void synced();
 };

tests/monitoring_test.rs

@@ -95,6 +95,10 @@ impl EventsCallback for ReturnFundsEventsHandler {
         // do nothing
     }
 
+    fn reverse_swap_sent(&self, _reverse_swap_id: String) {
+        // do nothing
+    }
+
     fn breez_health_status_changed_to(&self, _status: BreezHealthCheckStatus) {
         // do nothing
     }

tests/print_events_handler/mod.rs

@@ -23,6 +23,10 @@ impl EventsCallback for PrintEventsHandler {
         println!("A swap has been received! Its hash is {payment_hash}");
     }
 
+    fn reverse_swap_sent(&self, reverse_swap_id: String) {
+        println!("A reverse swap has been sent! Its id is {reverse_swap_id}");
+    }
+
     fn breez_health_status_changed_to(&self, status: BreezHealthCheckStatus) {
         println!("The Breez SDK health status changed to {status:?}");
     }