ensure the published zap receipt is stored locally

Author: JssDWt

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

@@ -84,7 +84,7 @@ pub trait LnurlServerClient: Send + Sync {
     async fn publish_zap_receipt(
         &self,
         request: &PublishZapReceiptRequest,
-    ) -> Result<bool, LnurlServerError>;
+    ) -> Result<String, LnurlServerError>;
 }
 
 #[derive(Debug, Clone, thiserror::Error)]
@@ -393,7 +393,7 @@ impl LnurlServerClient for ReqwestLnurlServerClient {
     async fn publish_zap_receipt(
         &self,
         request: &PublishZapReceiptRequest,
-    ) -> Result<bool, LnurlServerError> {
+    ) -> Result<String, LnurlServerError> {
         let spark_address = self.wallet.get_spark_address().map_err(|e| {
             LnurlServerError::SigningError(format!("Failed to get spark address: {e}"))
         })?;
@@ -436,7 +436,7 @@ impl LnurlServerClient for ReqwestLnurlServerClient {
                             "failed to deserialize response json: {e}"
                         ))
                     })?;
-                return Ok(body.published);
+                return Ok(body.zap_receipt);
             }
             other => {
                 return Err(LnurlServerError::Network {

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

@@ -397,19 +397,22 @@ impl BreezSdk {
                 };
 
                 // Publish the zap receipt via the server
-                if let Err(e) = lnurl_server_client
+                let zap_receipt = match lnurl_server_client
                     .publish_zap_receipt(&PublishZapReceiptRequest {
                         payment_hash: payment_hash.clone(),
                         zap_receipt: zap_receipt.clone(),
                     })
                     .await
                 {
-                    error!(
-                        "Failed to publish zap receipt for payment {}: {}",
-                        payment.id, e
-                    );
-                    continue;
-                }
+                    Ok(zap_receipt) => zap_receipt,
+                    Err(e) => {
+                        error!(
+                            "Failed to publish zap receipt for payment {}: {}",
+                            payment.id, e
+                        );
+                        continue;
+                    }
+                };
 
                 if let Err(e) = self
                     .storage

crates/breez-sdk/lnurl-models/src/lib.rs

@@ -73,6 +73,7 @@ pub struct PublishZapReceiptRequest {
 #[derive(Debug, Serialize, Deserialize)]
 pub struct PublishZapReceiptResponse {
     pub published: bool,
+    pub zap_receipt: String,
 }
 
 pub fn sanitize_username(username: &str) -> String {

crates/breez-sdk/lnurl/src/routes.rs

@@ -331,12 +331,15 @@ where
 
         // Check if zap receipt already exists
         let mut published = false;
-        if zap.zap_event.is_some() {
+        if let Some(zap_receipt) = &zap.zap_event {
             debug!(
                 "Zap receipt already exists for payment hash {}",
                 payment_hash
             );
-            return Ok(Json(PublishZapReceiptResponse { published }));
+            return Ok(Json(PublishZapReceiptResponse {
+                published,
+                zap_receipt: zap_receipt.clone(),
+            }));
         }
 
         // Parse the zap request to get relay info
@@ -404,13 +407,6 @@ where
             }
         };
 
-        // The nostr keys are not really needed here, but we use them to create the client
-        let publish_nostr_keys = match &state.nostr_keys {
-            Some(keys) => keys.clone(),
-            None => Keys::generate(),
-        };
-        let nostr_client = nostr_sdk::Client::new(publish_nostr_keys);
-
         let relays = zap_request
             .tags
             .iter()
@@ -424,32 +420,39 @@ where
             .flatten()
             .collect::<Vec<_>>();
 
-        if relays.is_empty() {
-            debug!(
-                "No relays to publish zap receipt for payment hash {}",
-                payment_hash
-            );
-            return Ok(Json(PublishZapReceiptResponse { published }));
-        }
-
-        for r in &relays {
-            if let Err(e) = nostr_client.add_relay(r).await {
-                warn!("Failed to add relay {r}: {e}");
+        if !relays.is_empty() {
+            // The nostr keys are not really needed here, but we use them to create the client
+            let publish_nostr_keys = match &state.nostr_keys {
+                Some(keys) => keys.clone(),
+                None => Keys::generate(),
+            };
+            let nostr_client = nostr_sdk::Client::new(publish_nostr_keys);
+            for r in &relays {
+                if let Err(e) = nostr_client.add_relay(r).await {
+                    warn!("Failed to add relay {r}: {e}");
+                }
             }
-        }
 
-        nostr_client.connect().await;
+            nostr_client.connect().await;
 
-        if let Err(e) = nostr_client.send_event(&zap_receipt).await {
-            error!("Failed to publish zap receipt to relays: {e}");
-        } else {
-            debug!("Published zap receipt to {} relays", relays.len());
-            published = true;
-        }
+            if let Err(e) = nostr_client.send_event(&zap_receipt).await {
+                error!("Failed to publish zap receipt to relays: {e}");
+            } else {
+                debug!("Published zap receipt to {} relays", relays.len());
+                published = !relays.is_empty();
+            }
 
-        nostr_client.disconnect().await;
+            nostr_client.disconnect().await;
+        }
 
-        zap.zap_event = Some(payload.zap_receipt);
+        let zap_receipt_json = zap_receipt.try_as_json().map_err(|e| {
+            error!("failed to serialize zap receipt: {}", e);
+            (
+                StatusCode::INTERNAL_SERVER_ERROR,
+                Json(json!({"error": "internal server error"})),
+            )
+        })?;
+        zap.zap_event = Some(zap_receipt_json.clone());
         zap.updated_at = now_millis();
         state.db.upsert_zap(&zap).await.map_err(|e| {
             error!("failed to save zap receipt: {}", e);
@@ -459,7 +462,10 @@ where
             )
         })?;
 
-        Ok(Json(PublishZapReceiptResponse { published }))
+        Ok(Json(PublishZapReceiptResponse {
+            published,
+            zap_receipt: zap_receipt_json,
+        }))
     }
 
     pub async fn handle_lnurl_pay(