Use transfer id as id of outgoing lightning payments

Author: danielgranhao

crates/breez-sdk/core/src/models/adaptors/spark_sdk.rs

@@ -154,6 +154,14 @@ impl Payment {
         payment: LightningSendPayment,
         amount_sat: u64,
     ) -> Result<Self, SdkError> {
+        let id = payment
+            .transfer_id
+            .ok_or(SdkError::Generic(
+                "Transfer id not found in LightningSendPayment".to_string(),
+            ))?
+            .clone()
+            .to_string();
+
         let status = match payment.status {
             LightningSendStatus::LightningPaymentSucceeded => PaymentStatus::Completed,
             LightningSendStatus::LightningPaymentFailed => PaymentStatus::Failed,
@@ -173,7 +181,7 @@ impl Payment {
         };
 
         Ok(Payment {
-            id: payment.id,
+            id,
             payment_type: PaymentType::Send,
             status,
             amount: amount_sat,

crates/breez-sdk/core/src/sdk.rs

@@ -429,7 +429,7 @@ impl BreezSdk {
     }
 
     /// Syncs pending payments so that we have their latest status
-    /// Uses the Spark SDK API (SparkWallet) to get the latest status of the payments
+    /// Uses the Spark SDK API to get the latest status of the payments
     async fn sync_pending_payments(&self) -> Result<(), SdkError> {
         // TODO: implement pending payment syncing using sparkscan API (including live updates)
         // Advantages:
@@ -438,7 +438,7 @@ impl BreezSdk {
         // Why it can't be done now:
         // - Sparkscan needs one of the following:
         //   - Batch transaction querying by id
-        //   - Sorting by updated_at timestamp in address transactions query (simpler) 
+        //   - Sorting by updated_at timestamp in address transactions query (simpler)
 
         let pending_payments = self
             .storage

crates/spark/src/services/lightning.rs

@@ -332,11 +332,16 @@ impl LightningService {
         let swap = self
             .start_lightning_swap(invoice, amount_to_send, leaves)
             .await?;
-        let _ = self
+        let transfer = self
             .transfer_service
             .deliver_transfer_package(&swap.transfer, &swap.leaves, Default::default())
             .await?;
-        self.finalize_lightning_swap(&swap).await
+        let mut lightning_payment = self.finalize_lightning_swap(&swap).await?;
+        // If ssp doesn't return a transfer id, we use the transfer id from the transfer service
+        if lightning_payment.transfer_id.is_none() {
+            lightning_payment.transfer_id = Some(transfer.id);
+        }
+        Ok(lightning_payment)
     }
 
     async fn start_lightning_swap(