Try to remove invoice from pending nwc after payment

Author: benthecarman

mutiny-core/src/lib.rs

@@ -1331,6 +1331,17 @@ impl<S: MutinyStorage> MutinyWallet<S> {
                         .await;
                     match payment_result {
                         Ok(r) => {
+                            // spawn a task to remove the pending invoice if it exists
+                            let nostr_clone = self.nostr.clone();
+                            let payment_hash = *inv.payment_hash();
+                            let logger = self.logger.clone();
+                            utils::spawn(async move {
+                                if let Err(e) =
+                                    nostr_clone.remove_pending_nwc_invoice(&payment_hash).await
+                                {
+                                    log_warn!(logger, "Failed to remove pending NWC invoice: {e}");
+                                }
+                            });
                             return Ok(r);
                         }
                         Err(e) => match e {
@@ -1368,9 +1379,22 @@ impl<S: MutinyStorage> MutinyWallet<S> {
             .sum::<u64>()
             > 0
         {
-            self.node_manager
+            let res = self
+                .node_manager
                 .pay_invoice(None, inv, amt_sats, labels)
-                .await
+                .await?;
+
+            // spawn a task to remove the pending invoice if it exists
+            let nostr_clone = self.nostr.clone();
+            let payment_hash = *inv.payment_hash();
+            let logger = self.logger.clone();
+            utils::spawn(async move {
+                if let Err(e) = nostr_clone.remove_pending_nwc_invoice(&payment_hash).await {
+                    log_warn!(logger, "Failed to remove pending NWC invoice: {e}");
+                }
+            });
+
+            Ok(res)
         } else {
             Err(last_federation_error.unwrap_or(MutinyError::InsufficientBalance))
         }

mutiny-core/src/nostr/mod.rs

@@ -966,6 +966,35 @@ impl<S: MutinyStorage> NostrManager<S> {
         Ok(event_id)
     }
 
+    /// Removes an invoice from the pending list
+    pub(crate) async fn remove_pending_nwc_invoice(
+        &self,
+        hash: &sha256::Hash,
+    ) -> Result<(), MutinyError> {
+        // get lock for writing
+        self.pending_nwc_lock.lock().await;
+
+        let mut pending: Vec<PendingNwcInvoice> = self
+            .storage
+            .get_data(PENDING_NWC_EVENTS_KEY)?
+            .unwrap_or_default();
+
+        let original_len = pending.len();
+
+        // remove from storage
+        pending.retain(|x| x.invoice.payment_hash() != hash);
+
+        // if we didn't remove anything, we don't need to save
+        if original_len == pending.len() {
+            return Ok(());
+        }
+
+        self.storage
+            .set_data(PENDING_NWC_EVENTS_KEY.to_string(), pending, None)?;
+
+        Ok(())
+    }
+
     /// Approves an invoice and sends the payment
     pub async fn approve_invoice(
         &self,
@@ -998,19 +1027,8 @@ impl<S: MutinyStorage> NostrManager<S> {
             }
         };
 
-        // get lock for writing
-        self.pending_nwc_lock.lock().await;
-
-        // get from storage again, in case it was updated
-        let mut pending: Vec<PendingNwcInvoice> = self
-            .storage
-            .get_data(PENDING_NWC_EVENTS_KEY)?
-            .unwrap_or_default();
-
-        // remove from storage
-        pending.retain(|x| x.invoice.payment_hash() != &hash);
-        self.storage
-            .set_data(PENDING_NWC_EVENTS_KEY.to_string(), pending, None)?;
+        // remove from our pending list
+        self.remove_pending_nwc_invoice(&hash).await?;
 
         Ok(event_id)
     }