@atomiqlabs/lp-lib 11.0.2 → 11.0.4

package/dist/swaps/tobtcln_abstract/ToBtcLnAbs.js

@@ -60,9 +60,17 @@ class ToBtcLnAbs extends ToBtcBaseSwapHandler_1.ToBtcBaseSwapHandler {
                 //Cancel the swaps where signature is expired
                 const isSignatureExpired = yield swapContract.isInitAuthorizationExpired(swap.data, swap);
                 if (isSignatureExpired) {
-                    this.swapLogger.info(swap, "processPastSwap(state=SAVED): signature expired, cancel uncommited swap, invoice: " + swap.pr);
-                    yield this.removeSwapData(swap, ToBtcLnSwapAbs_1.ToBtcLnSwapState.CANCELED);
-                    return;
+                    const isCommitted = yield swapContract.isCommited(swap.data);
+                    if (!isCommitted) {
+                        this.swapLogger.info(swap, "processPastSwap(state=SAVED): authorization expired & swap not committed, cancelling swap, invoice: " + swap.pr);
+                        yield this.removeSwapData(swap, ToBtcLnSwapAbs_1.ToBtcLnSwapState.CANCELED);
+                        return;
+                    }
+                    else {
+                        this.swapLogger.info(swap, "processPastSwap(state=SAVED): swap committed (detected from processPastSwap), invoice: " + swap.pr);
+                        yield swap.setState(ToBtcLnSwapAbs_1.ToBtcLnSwapState.COMMITED);
+                        yield this.storageManager.saveData(swap.data.getHash(), swap.getSequence(), swap);
+                    }
                 }
                 //Cancel the swaps where lightning invoice is expired
                 const decodedPR = yield this.lightning.parsePaymentRequest(swap.pr);
@@ -231,8 +239,6 @@ class ToBtcLnAbs extends ToBtcBaseSwapHandler_1.ToBtcBaseSwapHandler {
             //Compute max cltv delta
             const maxFee = swap.quotedNetworkFee;
             const maxUsableCLTVdelta = expiryTimestamp.sub(currentTimestamp).sub(this.config.gracePeriod).div(this.config.bitcoinBlocktime.mul(this.config.safetyFactor));
-            yield swap.setState(ToBtcLnSwapAbs_1.ToBtcLnSwapState.COMMITED);
-            yield this.storageManager.saveData(decodedPR.id, swap.data.getSequence(), swap);
             //Initiate payment
             this.swapLogger.info(swap, "sendLightningPayment(): paying lightning network invoice," +
                 " cltvDelta: " + maxUsableCLTVdelta.toString(10) +
@@ -267,11 +273,28 @@ class ToBtcLnAbs extends ToBtcBaseSwapHandler_1.ToBtcBaseSwapHandler {
     processInitialized(swap) {
         return __awaiter(this, void 0, void 0, function* () {
             //Check if payment was already made
-            let lnPaymentStatus = yield this.lightning.getPayment(swap.getHash());
-            if (swap.metadata != null)
-                swap.metadata.times.payPaymentChecked = Date.now();
-            const paymentExists = lnPaymentStatus != null;
-            if (!paymentExists) {
+            if (swap.state === ToBtcLnSwapAbs_1.ToBtcLnSwapState.COMMITED) {
+                let lnPaymentStatus = yield this.lightning.getPayment(swap.getHash());
+                if (lnPaymentStatus != null) {
+                    if (lnPaymentStatus.status === "pending") {
+                        //Payment still ongoing, process the result
+                        this.subscribeToPayment(swap);
+                        return;
+                    }
+                    else {
+                        //Payment has already concluded, process the result
+                        yield this.processPaymentResult(swap, lnPaymentStatus);
+                        return;
+                    }
+                }
+                else {
+                    //Payment not founds, try to process again
+                    yield swap.setState(ToBtcLnSwapAbs_1.ToBtcLnSwapState.SAVED);
+                }
+            }
+            if (swap.state === ToBtcLnSwapAbs_1.ToBtcLnSwapState.SAVED) {
+                yield swap.setState(ToBtcLnSwapAbs_1.ToBtcLnSwapState.COMMITED);
+                yield this.storageManager.saveData(swap.data.getHash(), swap.data.getSequence(), swap);
                 try {
                     yield this.sendLightningPayment(swap);
                 }
@@ -290,12 +313,6 @@ class ToBtcLnAbs extends ToBtcBaseSwapHandler_1.ToBtcBaseSwapHandler {
                 this.subscribeToPayment(swap);
                 return;
             }
-            if (lnPaymentStatus.status === "pending") {
-                this.subscribeToPayment(swap);
-                return;
-            }
-            //Payment has already concluded, process the result
-            yield this.processPaymentResult(swap, lnPaymentStatus);
         });
     }
     processInitializeEvent(chainIdentifier, event) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atomiqlabs/lp-lib",
-  "version": "11.0.2",
+  "version": "11.0.4",
   "description": "Main functionality implementation for atomiq LP node",
   "main": "./dist/index.js",
   "types:": "./dist/index.d.ts",

package/src/swaps/tobtcln_abstract/ToBtcLnAbs.ts

@@ -3,14 +3,7 @@ import {Express, Request, Response} from "express";
 import {ToBtcLnSwapAbs, ToBtcLnSwapState} from "./ToBtcLnSwapAbs";
 import {MultichainData, SwapHandlerType} from "../SwapHandler";
 import {ISwapPrice} from "../ISwapPrice";
-import {
-    ChainSwapType,
-    ClaimEvent,
-    InitializeEvent,
-    RefundEvent,
-    SwapCommitStatus,
-    SwapData
-} from "@atomiqlabs/base";
+import {ChainSwapType, ClaimEvent, InitializeEvent, RefundEvent, SwapCommitStatus, SwapData} from "@atomiqlabs/base";
 import {expressHandlerWrapper, HEX_REGEX, isDefinedRuntimeError} from "../../utils/Utils";
 import {PluginManager} from "../../plugins/PluginManager";
 import {IIntermediaryStorage} from "../../storage/IIntermediaryStorage";
@@ -23,8 +16,10 @@ import {ToBtcBaseConfig, ToBtcBaseSwapHandler} from "../ToBtcBaseSwapHandler";
 import {
     ILightningWallet,
     OutgoingLightningNetworkPayment,
-    ParsedPaymentRequest, ProbeAndRouteInit,
-    ProbeAndRouteResponse, routesMatch
+    ParsedPaymentRequest,
+    ProbeAndRouteInit,
+    ProbeAndRouteResponse,
+    routesMatch
 } from "../../wallets/ILightningWallet";
 
 export type ToBtcLnConfig = ToBtcBaseConfig & {
@@ -142,11 +137,17 @@ export class ToBtcLnAbs extends ToBtcBaseSwapHandler<ToBtcLnSwapAbs, ToBtcLnSwap
             //Cancel the swaps where signature is expired
             const isSignatureExpired = await swapContract.isInitAuthorizationExpired(swap.data, swap);
             if(isSignatureExpired) {
-                this.swapLogger.info(swap, "processPastSwap(state=SAVED): signature expired, cancel uncommited swap, invoice: "+swap.pr);
-                await this.removeSwapData(swap, ToBtcLnSwapState.CANCELED);
-                return;
+                const isCommitted = await swapContract.isCommited(swap.data);
+                if(!isCommitted) {
+                    this.swapLogger.info(swap, "processPastSwap(state=SAVED): authorization expired & swap not committed, cancelling swap, invoice: "+swap.pr);
+                    await this.removeSwapData(swap, ToBtcLnSwapState.CANCELED);
+                    return;
+                } else {
+                    this.swapLogger.info(swap, "processPastSwap(state=SAVED): swap committed (detected from processPastSwap), invoice: "+swap.pr);
+                    await swap.setState(ToBtcLnSwapState.COMMITED);
+                    await this.storageManager.saveData(swap.data.getHash(), swap.getSequence(), swap);
+                }
             }
-
             //Cancel the swaps where lightning invoice is expired
             const decodedPR = await this.lightning.parsePaymentRequest(swap.pr);
             const isInvoiceExpired = decodedPR.expiryEpochMillis < Date.now();
@@ -321,9 +322,6 @@ export class ToBtcLnAbs extends ToBtcBaseSwapHandler<ToBtcLnSwapAbs, ToBtcLnSwap
         const maxFee = swap.quotedNetworkFee;
         const maxUsableCLTVdelta = expiryTimestamp.sub(currentTimestamp).sub(this.config.gracePeriod).div(this.config.bitcoinBlocktime.mul(this.config.safetyFactor));
 
-        await swap.setState(ToBtcLnSwapState.COMMITED);
-        await this.storageManager.saveData(decodedPR.id, swap.data.getSequence(), swap);
-
         //Initiate payment
         this.swapLogger.info(swap, "sendLightningPayment(): paying lightning network invoice,"+
             " cltvDelta: "+maxUsableCLTVdelta.toString(10)+
@@ -357,11 +355,27 @@ export class ToBtcLnAbs extends ToBtcBaseSwapHandler<ToBtcLnSwapAbs, ToBtcLnSwap
      */
     private async processInitialized(swap: ToBtcLnSwapAbs) {
         //Check if payment was already made
-        let lnPaymentStatus = await this.lightning.getPayment(swap.getHash());
-        if(swap.metadata!=null) swap.metadata.times.payPaymentChecked = Date.now();
+        if(swap.state===ToBtcLnSwapState.COMMITED) {
+            let lnPaymentStatus = await this.lightning.getPayment(swap.getHash());
+            if(lnPaymentStatus!=null) {
+                if(lnPaymentStatus.status==="pending") {
+                    //Payment still ongoing, process the result
+                    this.subscribeToPayment(swap);
+                    return;
+                } else {
+                    //Payment has already concluded, process the result
+                    await this.processPaymentResult(swap, lnPaymentStatus);
+                    return;
+                }
+            } else {
+                //Payment not founds, try to process again
+                await swap.setState(ToBtcLnSwapState.SAVED);
+            }
+        }
 
-        const paymentExists = lnPaymentStatus!=null;
-        if(!paymentExists) {
+        if(swap.state===ToBtcLnSwapState.SAVED) {
+            await swap.setState(ToBtcLnSwapState.COMMITED);
+            await this.storageManager.saveData(swap.data.getHash(), swap.data.getSequence(), swap);
             try {
                 await this.sendLightningPayment(swap);
             } catch (e) {
@@ -376,14 +390,6 @@ export class ToBtcLnAbs extends ToBtcBaseSwapHandler<ToBtcLnSwapAbs, ToBtcLnSwap
             this.subscribeToPayment(swap);
             return;
         }
-
-        if(lnPaymentStatus.status==="pending") {
-            this.subscribeToPayment(swap);
-            return;
-        }
-
-        //Payment has already concluded, process the result
-        await this.processPaymentResult(swap, lnPaymentStatus);
     }
 
     protected async processInitializeEvent(chainIdentifier: string, event: InitializeEvent<SwapData>): Promise<void> {