fix: always watch temporarily failed xpay payments

BoltzExchange · Feb 2, 2025 · 984761c · 984761c
1 parent 9c92159
commit 984761c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 18 deletions.
diff --git a/lib/lightning/PendingPaymentTracker.ts b/lib/lightning/PendingPaymentTracker.ts
@@ -230,11 +230,7 @@ class PendingPaymentTracker {
         this.lightningTrackers[lightningClient.type].isPermanentError(e);
 
       // CLN xpay does throw errors while the payment is still pending
-      if (
-        lightningClient.type === NodeType.CLN &&
-        !isPermanentError &&
-        ClnPendingPaymentTracker.shouldBeWatched(e)
-      ) {
+      if (lightningClient.type === NodeType.CLN && !isPermanentError) {
         this.lightningTrackers[lightningClient.type].watchPayment(
           lightningClient,
           swap.invoice!,

diff --git a/lib/lightning/paymentTrackers/ClnPendingPaymentTracker.ts b/lib/lightning/paymentTrackers/ClnPendingPaymentTracker.ts
@@ -29,15 +29,6 @@ class ClnPendingPaymentTracker extends NodePendingPendingTracker {
     );
   }
 
-  public static shouldBeWatched = (error: unknown) => {
-    const msg = formatError(error);
-    return (
-      (msg.includes('Failed after') && msg.includes('attempts')) ||
-      msg.includes('xpay') ||
-      msg === 'Connection dropped'
-    );
-  };
-
   public stop = () => {
     clearInterval(this.checkInterval as unknown as number);
   };
@@ -52,10 +43,7 @@ class ClnPendingPaymentTracker extends NodePendingPendingTracker {
       .then((result) => this.handleSucceededPayment(preimageHash, result))
       .catch((error) => {
         // CLN xpay throws errors while the payment is still pending
-        if (
-          !this.isPermanentError(error) &&
-          ClnPendingPaymentTracker.shouldBeWatched(error)
-        ) {
+        if (!this.isPermanentError(error)) {
           this.watchPayment(client, invoice, preimageHash);
         } else {
           this.handleFailedPayment(client, preimageHash, error);