@atomiqlabs/lp-lib 12.0.0 → 12.0.2

package/dist/swaps/tobtcln_abstract/ToBtcLnAbs.js

@@ -115,6 +115,24 @@ class ToBtcLnAbs extends ToBtcBaseSwapHandler_1.ToBtcBaseSwapHandler {
         if (swap.secret == null)
             throw new Error("Invalid swap state, needs payment pre-image!");
         const { swapContract, signer } = this.getChain(swap.chainIdentifier);
+        //Check if escrow state exists
+        const isCommited = await swapContract.isCommited(swap.data);
+        if (!isCommited) {
+            const status = await swapContract.getCommitStatus(signer.getAddress(), swap.data);
+            if (status === base_1.SwapCommitStatus.PAID) {
+                //This is alright, we got the money
+                await this.removeSwapData(swap, ToBtcLnSwapAbs_1.ToBtcLnSwapState.CLAIMED);
+                return true;
+            }
+            else if (status === base_1.SwapCommitStatus.EXPIRED) {
+                //This means the user was able to refund before we were able to claim, no good
+                await this.removeSwapData(swap, ToBtcLnSwapAbs_1.ToBtcLnSwapState.REFUNDED);
+            }
+            this.swapLogger.warn(swap, "processPaymentResult(): tried to claim but escrow doesn't exist anymore," +
+                " status: " + status +
+                " invoice: " + swap.pr);
+            return false;
+        }
         //Set flag that we are sending the transaction already, so we don't end up with race condition
         const unlock = swap.lock(swapContract.claimWithSecretTimeout);
         if (unlock == null)
@@ -151,30 +169,11 @@ class ToBtcLnAbs extends ToBtcBaseSwapHandler_1.ToBtcBaseSwapHandler {
                 await this.saveSwapData(swap);
                 return;
             case "confirmed":
-                const { swapContract, signer } = this.getChain(swap.chainIdentifier);
                 swap.secret = lnPaymentStatus.secret;
                 swap.setRealNetworkFee(lnPaymentStatus.feeMtokens / 1000n);
                 this.swapLogger.info(swap, "processPaymentResult(): invoice paid, secret: " + swap.secret + " realRoutingFee: " + swap.realNetworkFee.toString(10) + " invoice: " + swap.pr);
                 await swap.setState(ToBtcLnSwapAbs_1.ToBtcLnSwapState.PAID);
                 await this.saveSwapData(swap);
-                //Check if escrow state exists
-                const isCommited = await swapContract.isCommited(swap.data);
-                if (!isCommited) {
-                    const status = await swapContract.getCommitStatus(signer.getAddress(), swap.data);
-                    if (status === base_1.SwapCommitStatus.PAID) {
-                        //This is alright, we got the money
-                        await this.removeSwapData(swap, ToBtcLnSwapAbs_1.ToBtcLnSwapState.CLAIMED);
-                        return;
-                    }
-                    else if (status === base_1.SwapCommitStatus.EXPIRED) {
-                        //This means the user was able to refund before we were able to claim, no good
-                        await this.removeSwapData(swap, ToBtcLnSwapAbs_1.ToBtcLnSwapState.REFUNDED);
-                    }
-                    this.swapLogger.warn(swap, "processPaymentResult(): tried to claim but escrow doesn't exist anymore," +
-                        " status: " + status +
-                        " invoice: " + swap.pr);
-                    return;
-                }
                 const success = await this.tryClaimSwap(swap);
                 if (success)
                     this.swapLogger.info(swap, "processPaymentResult(): swap claimed successfully, invoice: " + swap.pr);
@@ -254,6 +253,12 @@ class ToBtcLnAbs extends ToBtcBaseSwapHandler_1.ToBtcBaseSwapHandler {
      */
     async processInitialized(swap) {
         //Check if payment was already made
+        if (swap.state === ToBtcLnSwapAbs_1.ToBtcLnSwapState.PAID) {
+            const success = await this.tryClaimSwap(swap);
+            if (success)
+                this.swapLogger.info(swap, "processInitialized(): swap claimed successfully, invoice: " + swap.pr);
+            return;
+        }
         if (swap.state === ToBtcLnSwapAbs_1.ToBtcLnSwapState.COMMITED) {
             if (swap.metadata != null)
                 swap.metadata.times.payPaymentChecked = Date.now();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atomiqlabs/lp-lib",
-  "version": "12.0.0",
+  "version": "12.0.2",
   "description": "Main functionality implementation for atomiq LP node",
   "main": "./dist/index.js",
   "types:": "./dist/index.d.ts",
@@ -22,7 +22,7 @@
   "author": "adambor",
   "license": "ISC",
   "dependencies": {
-    "@atomiqlabs/base": "8.0.0",
+    "@atomiqlabs/base": "^8.0.0",
     "@atomiqlabs/server-base": "2.0.0",
     "@scure/btc-signer": "1.6.0",
     "express": "4.21.1",

package/src/swaps/tobtcln_abstract/ToBtcLnAbs.ts

@@ -216,6 +216,24 @@ export class ToBtcLnAbs extends ToBtcBaseSwapHandler<ToBtcLnSwapAbs, ToBtcLnSwap
 
         const {swapContract, signer} = this.getChain(swap.chainIdentifier);
 
+        //Check if escrow state exists
+        const isCommited = await swapContract.isCommited(swap.data);
+        if(!isCommited) {
+            const status = await swapContract.getCommitStatus(signer.getAddress(), swap.data);
+            if(status===SwapCommitStatus.PAID) {
+                //This is alright, we got the money
+                await this.removeSwapData(swap, ToBtcLnSwapState.CLAIMED);
+                return true;
+            } else if(status===SwapCommitStatus.EXPIRED) {
+                //This means the user was able to refund before we were able to claim, no good
+                await this.removeSwapData(swap, ToBtcLnSwapState.REFUNDED);
+            }
+            this.swapLogger.warn(swap, "processPaymentResult(): tried to claim but escrow doesn't exist anymore,"+
+                " status: "+status+
+                " invoice: "+swap.pr);
+            return false;
+        }
+
         //Set flag that we are sending the transaction already, so we don't end up with race condition
         const unlock: () => boolean = swap.lock(swapContract.claimWithSecretTimeout);
         if(unlock==null) return false;
@@ -253,32 +271,12 @@ export class ToBtcLnAbs extends ToBtcBaseSwapHandler<ToBtcLnSwapAbs, ToBtcLnSwap
                 return;
 
             case "confirmed":
-                const {swapContract, signer} = this.getChain(swap.chainIdentifier);
-
                 swap.secret = lnPaymentStatus.secret;
                 swap.setRealNetworkFee(lnPaymentStatus.feeMtokens / 1000n);
                 this.swapLogger.info(swap, "processPaymentResult(): invoice paid, secret: "+swap.secret+" realRoutingFee: "+swap.realNetworkFee.toString(10)+" invoice: "+swap.pr);
                 await swap.setState(ToBtcLnSwapState.PAID);
                 await this.saveSwapData(swap);
 
-                //Check if escrow state exists
-                const isCommited = await swapContract.isCommited(swap.data);
-                if(!isCommited) {
-                    const status = await swapContract.getCommitStatus(signer.getAddress(), swap.data);
-                    if(status===SwapCommitStatus.PAID) {
-                        //This is alright, we got the money
-                        await this.removeSwapData(swap, ToBtcLnSwapState.CLAIMED);
-                        return;
-                    } else if(status===SwapCommitStatus.EXPIRED) {
-                        //This means the user was able to refund before we were able to claim, no good
-                        await this.removeSwapData(swap, ToBtcLnSwapState.REFUNDED);
-                    }
-                    this.swapLogger.warn(swap, "processPaymentResult(): tried to claim but escrow doesn't exist anymore,"+
-                        " status: "+status+
-                        " invoice: "+swap.pr);
-                    return;
-                }
-
                 const success = await this.tryClaimSwap(swap);
                 if(success) this.swapLogger.info(swap, "processPaymentResult(): swap claimed successfully, invoice: "+swap.pr);
                 return;
@@ -364,6 +362,12 @@ export class ToBtcLnAbs extends ToBtcBaseSwapHandler<ToBtcLnSwapAbs, ToBtcLnSwap
      */
     private async processInitialized(swap: ToBtcLnSwapAbs) {
         //Check if payment was already made
+        if(swap.state===ToBtcLnSwapState.PAID) {
+            const success = await this.tryClaimSwap(swap);
+            if(success) this.swapLogger.info(swap, "processInitialized(): swap claimed successfully, invoice: "+swap.pr);
+            return;
+        }
+
         if(swap.state===ToBtcLnSwapState.COMMITED) {
             if(swap.metadata!=null) swap.metadata.times.payPaymentChecked = Date.now();
             let lnPaymentStatus = await this.lightning.getPayment(swap.lnPaymentHash);