@atomiqlabs/lp-lib 17.1.2 → 17.3.0

package/dist/info/InfoHandler.js

@@ -43,7 +43,8 @@ class InfoHandler {
                 const singleChain = this.chainData.chains[chainIdentifier];
                 chains[chainIdentifier] = {
                     address: singleChain.signer.getAddress(),
-                    signature: await singleChain.swapContract.getDataSignature(singleChain.signer, envelopeBuffer)
+                    signature: await singleChain.swapContract.getDataSignature(singleChain.signer, envelopeBuffer),
+                    contractVersion: singleChain.contractVersion ?? "v1"
                 };
             }
             const response = {

package/dist/plugins/IPlugin.d.ts

@@ -1,5 +1,5 @@
 import { BitcoinRpc } from "@atomiqlabs/base";
-import { FromBtcLnRequestType, FromBtcRequestType, FromBtcTrustedRequestType, ISwapPrice, MultichainData, RequestData, SpvVaultPostQuote, SpvVaultSwap, SpvVaultSwapRequestType, SwapHandler, SwapHandlerType, ToBtcLnRequestType, ToBtcRequestType } from "..";
+import { FromBtcLnAutoSwap, FromBtcLnRequestType, FromBtcLnSwapAbs, FromBtcLnTrustedSwap, FromBtcRequestType, FromBtcSwapAbs, FromBtcTrustedRequestType, FromBtcTrustedSwap, ISwapPrice, MultichainData, RequestData, SpvVaultPostQuote, SpvVaultSwap, SpvVaultSwapRequestType, SwapHandler, SwapHandlerType, ToBtcLnRequestType, ToBtcLnSwapAbs, ToBtcRequestType, ToBtcSwapAbs } from "..";
 import { SwapHandlerSwap } from "../swaps/SwapHandlerSwap";
 import { Command } from "@atomiqlabs/server-base";
 import { FromBtcLnTrustedRequestType } from "../swaps/trusted/frombtcln_trusted/FromBtcLnTrusted";
@@ -104,6 +104,19 @@ export interface IPlugin {
         token: string;
         pricePrefetch?: Promise<bigint>;
     }): Promise<QuoteThrow | QuoteSetFees | QuoteAmountTooLow | QuoteAmountTooHigh | PluginQuote>;
+    /**
+     * Triggered when the quote is about to get executed, this means:
+     * - FROM_BTCLN - lightning network payment received and the LP is about to sign an authorization allowing the user to settle
+     * - FROM_BTC - triggered on quote request, before the final authorization is given to the user
+     * - FROM_BTCLN_TRUSTED - triggered when the LP receives the funds on the source chain and before destination funds are sent
+     * - FROM_BTC_TRUSTED - triggered when the LP receives the funds on the source chain and before destination funds are sent
+     * - FROM_BTC_SPV - triggered before LP broadcasts the co-signed swap PSBT
+     * - FROM_BTCLN_AUTO - lightning network payment received and the LP is about to offer an HTLC to the user
+     *
+     * @param swapType
+     * @param swap
+     */
+    onHandlePreFromBtcExecute?(swapType: SwapHandlerType.FROM_BTCLN | SwapHandlerType.FROM_BTC | SwapHandlerType.FROM_BTCLN_TRUSTED | SwapHandlerType.FROM_BTC_TRUSTED | SwapHandlerType.FROM_BTC_SPV | SwapHandlerType.FROM_BTCLN_AUTO, swap: FromBtcLnSwapAbs | FromBtcSwapAbs | FromBtcLnTrustedSwap | FromBtcTrustedSwap | SpvVaultSwap | FromBtcLnAutoSwap): Promise<QuoteThrow | null>;
     onHandlePreToBtcQuote?(swapType: SwapHandlerType.TO_BTCLN | SwapHandlerType.TO_BTC, request: RequestData<ToBtcLnRequestType | ToBtcRequestType>, requestedAmount: {
         input: boolean;
         amount: bigint;
@@ -128,6 +141,7 @@ export interface IPlugin {
         feePPM: bigint;
         networkFeeGetter: (amount: bigint) => Promise<bigint>;
     }): Promise<QuoteThrow | QuoteSetFees | QuoteAmountTooLow | QuoteAmountTooHigh | ToBtcPluginQuote>;
+    onHandlePreToBtcExecute?(swapType: SwapHandlerType.TO_BTCLN | SwapHandlerType.TO_BTC, swap: ToBtcLnSwapAbs | ToBtcSwapAbs): Promise<QuoteThrow | null>;
     onHandlePostedFromBtcQuote?(swapType: SwapHandlerType.FROM_BTC_SPV, request: RequestData<SpvVaultPostQuote>, swap: SpvVaultSwap): Promise<QuoteThrow | null>;
     onVaultSelection?(chainIdentifier: string, totalSats: bigint, requestedAmount: {
         amount: bigint;

package/dist/plugins/IPlugin.js

@@ -2,11 +2,12 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.isToBtcPluginQuote = exports.isPluginQuote = exports.isQuoteAmountTooHigh = exports.isQuoteAmountTooLow = exports.isQuoteSetFees = exports.isQuoteThrow = void 0;
 function isQuoteThrow(obj) {
-    return obj.type === "throw" && typeof (obj.message) === "string";
+    return obj != null && obj.type === "throw" && typeof (obj.message) === "string";
 }
 exports.isQuoteThrow = isQuoteThrow;
 function isQuoteSetFees(obj) {
-    return obj.type === "fees" &&
+    return obj != null &&
+        obj.type === "fees" &&
         (obj.baseFee == null || typeof (obj.baseFee) === "bigint") &&
         (obj.feePPM == null || typeof (obj.feePPM) === "bigint") &&
         (obj.securityDepositApyPPM == null || typeof (obj.securityDepositApyPPM) === "bigint") &&
@@ -14,21 +15,21 @@ function isQuoteSetFees(obj) {
 }
 exports.isQuoteSetFees = isQuoteSetFees;
 function isQuoteAmountTooLow(obj) {
-    return obj.type === "low" && typeof (obj.data) === "object" && typeof (obj.data.min) === "bigint" && typeof (obj.data.max) === "bigint";
+    return obj != null && obj.type === "low" && obj.data != null && typeof (obj.data) === "object" && typeof (obj.data.min) === "bigint" && typeof (obj.data.max) === "bigint";
 }
 exports.isQuoteAmountTooLow = isQuoteAmountTooLow;
 function isQuoteAmountTooHigh(obj) {
-    return obj.type === "high" && typeof (obj.data) === "object" && typeof (obj.data.min) === "bigint" && typeof (obj.data.max) === "bigint";
+    return obj != null && obj.type === "high" && obj.data != null && typeof (obj.data) === "object" && typeof (obj.data.min) === "bigint" && typeof (obj.data.max) === "bigint";
 }
 exports.isQuoteAmountTooHigh = isQuoteAmountTooHigh;
 function isPluginQuote(obj) {
-    return obj.type === "success" &&
-        typeof (obj.amount) === "object" && typeof (obj.amount.input) === "boolean" && typeof (obj.amount.amount) === "bigint" &&
-        typeof (obj.swapFee) === "object" && typeof (obj.swapFee.inInputTokens) === "bigint" && typeof (obj.swapFee.inOutputTokens) === "bigint";
+    return obj != null && obj.type === "success" &&
+        obj.amount != null && typeof (obj.amount) === "object" && typeof (obj.amount.input) === "boolean" && typeof (obj.amount.amount) === "bigint" &&
+        obj.swapFee != null && typeof (obj.swapFee) === "object" && typeof (obj.swapFee.inInputTokens) === "bigint" && typeof (obj.swapFee.inOutputTokens) === "bigint";
 }
 exports.isPluginQuote = isPluginQuote;
 function isToBtcPluginQuote(obj) {
-    return typeof (obj.networkFee) === "object" && typeof (obj.networkFee.inInputTokens) === "bigint" && typeof (obj.networkFee.inOutputTokens) === "bigint" &&
+    return obj != null && obj.networkFee != null && typeof (obj.networkFee) === "object" && typeof (obj.networkFee.inInputTokens) === "bigint" && typeof (obj.networkFee.inOutputTokens) === "bigint" &&
         isPluginQuote(obj);
 }
 exports.isToBtcPluginQuote = isToBtcPluginQuote;

package/dist/plugins/PluginManager.d.ts

@@ -1,6 +1,6 @@
 import { BitcoinRpc, SwapData } from "@atomiqlabs/base";
 import { IPlugin, PluginQuote, QuoteAmountTooHigh, QuoteAmountTooLow, QuoteSetFees, QuoteThrow, ToBtcPluginQuote } from "./IPlugin";
-import { FromBtcLnRequestType, FromBtcRequestType, FromBtcTrustedRequestType, ISwapPrice, MultichainData, RequestData, SpvVaultPostQuote, SpvVaultSwap, SpvVaultSwapRequestType, SwapHandler, SwapHandlerType, ToBtcLnRequestType, ToBtcRequestType } from "..";
+import { FromBtcLnAutoSwap, FromBtcLnRequestType, FromBtcLnSwapAbs, FromBtcLnTrustedSwap, FromBtcRequestType, FromBtcSwapAbs, FromBtcTrustedRequestType, FromBtcTrustedSwap, ISwapPrice, MultichainData, RequestData, SpvVaultPostQuote, SpvVaultSwap, SpvVaultSwapRequestType, SwapHandler, SwapHandlerType, ToBtcLnRequestType, ToBtcLnSwapAbs, ToBtcRequestType, ToBtcSwapAbs } from "..";
 import { SwapHandlerSwap } from "../swaps/SwapHandlerSwap";
 import { FromBtcLnTrustedRequestType } from "../swaps/trusted/frombtcln_trusted/FromBtcLnTrusted";
 import { IBitcoinWallet } from "../wallets/IBitcoinWallet";
@@ -73,6 +73,7 @@ export declare class PluginManager {
         amount: bigint;
         token: string;
     }): Promise<QuoteThrow | QuoteSetFees | QuoteAmountTooLow | QuoteAmountTooHigh>;
+    static onHandlePreFromBtcExecute(swapType: SwapHandlerType.FROM_BTCLN | SwapHandlerType.FROM_BTC | SwapHandlerType.FROM_BTCLN_TRUSTED | SwapHandlerType.FROM_BTC_TRUSTED | SwapHandlerType.FROM_BTC_SPV | SwapHandlerType.FROM_BTCLN_AUTO, swap: FromBtcLnSwapAbs | FromBtcSwapAbs | FromBtcLnTrustedSwap | FromBtcTrustedSwap | SpvVaultSwap | FromBtcLnAutoSwap): Promise<QuoteThrow | null>;
     static onHandlePostToBtcQuote<T extends {
         networkFee: bigint;
     }>(swapType: SwapHandlerType.TO_BTCLN | SwapHandlerType.TO_BTC, request: RequestData<ToBtcLnRequestType | ToBtcRequestType>, requestedAmount: {
@@ -101,6 +102,7 @@ export declare class PluginManager {
         baseFeeInBtc: bigint;
         feePPM: bigint;
     }): Promise<QuoteThrow | QuoteSetFees | QuoteAmountTooLow | QuoteAmountTooHigh>;
+    static onHandlePreToBtcExecute(swapType: SwapHandlerType.TO_BTCLN | SwapHandlerType.TO_BTC, swap: ToBtcLnSwapAbs | ToBtcSwapAbs): Promise<QuoteThrow | null>;
     static onHandlePostedFromBtcQuote(swapType: SwapHandlerType.FROM_BTC_SPV, request: RequestData<SpvVaultPostQuote>, swap: SpvVaultSwap): Promise<QuoteThrow | null>;
     static onVaultSelection(chainIdentifier: string, totalSats: bigint, requestedAmount: {
         amount: bigint;

package/dist/plugins/PluginManager.js

@@ -152,6 +152,21 @@ class PluginManager {
         }
         return null;
     }
+    static async onHandlePreFromBtcExecute(swapType, swap) {
+        for (let plugin of PluginManager.plugins.values()) {
+            try {
+                if (plugin.onHandlePreFromBtcExecute != null) {
+                    const result = await plugin.onHandlePreFromBtcExecute(swapType, swap);
+                    if (result != null && (0, IPlugin_1.isQuoteThrow)(result))
+                        return result;
+                }
+            }
+            catch (e) {
+                pluginLogger.error(plugin, "onHandlePreFromBtcExecute(): plugin error", e);
+            }
+        }
+        return null;
+    }
     static async onHandlePostToBtcQuote(swapType, request, requestedAmount, chainIdentifier, constraints, fees) {
         for (let plugin of PluginManager.plugins.values()) {
             try {
@@ -214,6 +229,21 @@ class PluginManager {
         }
         return null;
     }
+    static async onHandlePreToBtcExecute(swapType, swap) {
+        for (let plugin of PluginManager.plugins.values()) {
+            try {
+                if (plugin.onHandlePreToBtcExecute != null) {
+                    const result = await plugin.onHandlePreToBtcExecute(swapType, swap);
+                    if (result != null && (0, IPlugin_1.isQuoteThrow)(result))
+                        return result;
+                }
+            }
+            catch (e) {
+                pluginLogger.error(plugin, "onHandlePreToBtcExecute(): plugin error", e);
+            }
+        }
+        return null;
+    }
     static async onHandlePostedFromBtcQuote(swapType, request, swap) {
         for (let plugin of PluginManager.plugins.values()) {
             try {

package/dist/swaps/SwapHandler.d.ts

@@ -59,6 +59,7 @@ export type ChainData<T extends ChainType = ChainType> = {
     };
     allowedDepositTokens?: string[];
     btcRelay?: T["BtcRelay"];
+    contractVersion?: string;
 };
 export type RequestData<T> = {
     chainIdentifier: string;

package/dist/swaps/SwapHandlerSwap.d.ts

@@ -76,4 +76,5 @@ export declare abstract class SwapHandlerSwap<S = any> extends Lockable implemen
         inInputToken: bigint;
         inOutputToken: bigint;
     };
+    abstract getDestinationAddress(): string;
 }

package/dist/swaps/escrow/frombtc_abstract/FromBtcAbs.js

@@ -10,6 +10,7 @@ const PluginManager_1 = require("../../../plugins/PluginManager");
 const SchemaVerifier_1 = require("../../../utils/paramcoders/SchemaVerifier");
 const ServerParamDecoder_1 = require("../../../utils/paramcoders/server/ServerParamDecoder");
 const FromBtcBaseSwapHandler_1 = require("../FromBtcBaseSwapHandler");
+const IPlugin_1 = require("../../../plugins/IPlugin");
 /**
  * Swap handler handling from BTC swaps using PTLCs (proof-time locked contracts) and btc relay (on-chain bitcoin SPV)
  */
@@ -281,6 +282,12 @@ class FromBtcAbs extends FromBtcBaseSwapHandler_1.FromBtcBaseSwapHandler {
             createdSwap.timeout = sigData.timeout;
             createdSwap.signature = sigData.signature;
             createdSwap.feeRate = sigData.feeRate;
+            const pluginCheckResult = await PluginManager_1.PluginManager.onHandlePreFromBtcExecute(SwapHandler_1.SwapHandlerType.FROM_BTC, createdSwap);
+            if ((0, IPlugin_1.isQuoteThrow)(pluginCheckResult))
+                throw {
+                    code: 29999,
+                    msg: pluginCheckResult.message
+                };
             await PluginManager_1.PluginManager.swapCreate(createdSwap);
             await this.saveSwapData(createdSwap);
             this.swapLogger.info(createdSwap, "REST: /getAddress: Created swap address: " + receiveAddress + " amount: " + amountBD.toString(10));

package/dist/swaps/escrow/frombtc_abstract/FromBtcSwapAbs.d.ts

@@ -18,4 +18,5 @@ export declare class FromBtcSwapAbs<T extends SwapData = SwapData> extends FromB
     isFailed(): boolean;
     isSuccess(): boolean;
     getTotalInputAmount(): bigint;
+    getDestinationAddress(): string;
 }

package/dist/swaps/escrow/frombtc_abstract/FromBtcSwapAbs.js

@@ -46,5 +46,8 @@ class FromBtcSwapAbs extends FromBtcBaseSwap_1.FromBtcBaseSwap {
     getTotalInputAmount() {
         return this.amount;
     }
+    getDestinationAddress() {
+        return this.data.getClaimer();
+    }
 }
 exports.FromBtcSwapAbs = FromBtcSwapAbs;

package/dist/swaps/escrow/frombtcln_abstract/FromBtcLnAbs.js

@@ -11,6 +11,7 @@ const SchemaVerifier_1 = require("../../../utils/paramcoders/SchemaVerifier");
 const ServerParamDecoder_1 = require("../../../utils/paramcoders/server/ServerParamDecoder");
 const FromBtcBaseSwapHandler_1 = require("../FromBtcBaseSwapHandler");
 const LightningAssertions_1 = require("../../assertions/LightningAssertions");
+const IPlugin_1 = require("../../../plugins/IPlugin");
 /**
  * Swap handler handling from BTCLN swaps using submarine swaps
  */
@@ -291,6 +292,18 @@ class FromBtcLnAbs extends FromBtcBaseSwapHandler_1.FromBtcBaseSwapHandler {
         //No need to check abortController anymore since all pending promises are resolved by now
         if (invoiceData.metadata != null)
             invoiceData.metadata.times.htlcSwapSigned = Date.now();
+        const pluginCheckResult = await PluginManager_1.PluginManager.onHandlePreFromBtcExecute(SwapHandler_1.SwapHandlerType.FROM_BTCLN, invoiceData);
+        if ((0, IPlugin_1.isQuoteThrow)(pluginCheckResult)) {
+            const error = {
+                code: 29999,
+                msg: pluginCheckResult.message
+            };
+            if (invoiceData.metadata != null)
+                invoiceData.metadata.htlcReceiveError = error;
+            if (invoiceData.state === FromBtcLnSwapAbs_1.FromBtcLnSwapState.CREATED)
+                await this.cancelSwapAndInvoice(invoiceData);
+            throw error;
+        }
         //Important to prevent race condition and issuing 2 signed init messages at the same time
         if (invoiceData.state === FromBtcLnSwapAbs_1.FromBtcLnSwapState.CREATED) {
             //Re-check right before signing
@@ -662,17 +675,24 @@ class FromBtcLnAbs extends FromBtcBaseSwapHandler_1.FromBtcBaseSwapHandler {
                     code: 10004,
                     msg: "Invoice already committed"
                 };
-            res.status(200).json({
-                code: 10000,
-                msg: "Success",
-                data: {
-                    address: signer.getAddress(),
-                    data: swap.data.serialize(),
-                    prefix: swap.prefix,
-                    timeout: swap.timeout,
-                    signature: swap.signature
-                }
-            });
+            if (swap.state === FromBtcLnSwapAbs_1.FromBtcLnSwapState.CLAIMED)
+                throw {
+                    _httpStatus: 200,
+                    code: 10005,
+                    msg: "Invoice already committed & claimed"
+                };
+            if (swap.state === FromBtcLnSwapAbs_1.FromBtcLnSwapState.RECEIVED)
+                res.status(200).json({
+                    code: 10000,
+                    msg: "Success",
+                    data: {
+                        address: signer.getAddress(),
+                        data: swap.data.serialize(),
+                        prefix: swap.prefix,
+                        timeout: swap.timeout,
+                        signature: swap.signature
+                    }
+                });
         });
         restServer.post(this.path + "/getInvoicePaymentAuth", getInvoicePaymentAuth);
         restServer.get(this.path + "/getInvoicePaymentAuth", getInvoicePaymentAuth);

package/dist/swaps/escrow/frombtcln_abstract/FromBtcLnSwapAbs.d.ts

@@ -30,4 +30,5 @@ export declare class FromBtcLnSwapAbs<T extends SwapData = SwapData> extends Fro
     isInitiated(): boolean;
     isFailed(): boolean;
     isSuccess(): boolean;
+    getDestinationAddress(): string;
 }

package/dist/swaps/escrow/frombtcln_abstract/FromBtcLnSwapAbs.js

@@ -87,5 +87,8 @@ class FromBtcLnSwapAbs extends FromBtcBaseSwap_1.FromBtcBaseSwap {
     isSuccess() {
         return this.state === FromBtcLnSwapState.SETTLED;
     }
+    getDestinationAddress() {
+        return this.claimer;
+    }
 }
 exports.FromBtcLnSwapAbs = FromBtcLnSwapAbs;

package/dist/swaps/escrow/frombtcln_autoinit/FromBtcLnAuto.js

@@ -11,6 +11,7 @@ const SchemaVerifier_1 = require("../../../utils/paramcoders/SchemaVerifier");
 const ServerParamDecoder_1 = require("../../../utils/paramcoders/server/ServerParamDecoder");
 const FromBtcBaseSwapHandler_1 = require("../FromBtcBaseSwapHandler");
 const LightningAssertions_1 = require("../../assertions/LightningAssertions");
+const IPlugin_1 = require("../../../plugins/IPlugin");
 /**
  * Swap handler handling from BTCLN swaps using submarine swaps
  */
@@ -340,6 +341,18 @@ class FromBtcLnAuto extends FromBtcBaseSwapHandler_1.FromBtcBaseSwapHandler {
             timeout: invoiceData.timeout,
             signature: invoiceData.signature
         }, true);
+        const pluginCheckResult = await PluginManager_1.PluginManager.onHandlePreFromBtcExecute(SwapHandler_1.SwapHandlerType.FROM_BTCLN_AUTO, invoiceData);
+        if ((0, IPlugin_1.isQuoteThrow)(pluginCheckResult)) {
+            const error = {
+                code: 29999,
+                msg: pluginCheckResult.message
+            };
+            if (invoiceData.metadata != null)
+                invoiceData.metadata.htlcOfferError = error;
+            if (invoiceData.state === FromBtcLnAutoSwap_1.FromBtcLnAutoSwapState.RECEIVED)
+                await this.cancelSwapAndInvoice(invoiceData);
+            throw error;
+        }
         if (invoiceData.state === FromBtcLnAutoSwap_1.FromBtcLnAutoSwapState.RECEIVED) {
             //Re-check the current HTLC count
             try {
@@ -667,8 +680,7 @@ class FromBtcLnAuto extends FromBtcBaseSwapHandler_1.FromBtcBaseSwapHandler {
                     code: 10001,
                     msg: "Invoice expired/canceled"
                 };
-            if (swap.state === FromBtcLnAutoSwap_1.FromBtcLnAutoSwapState.RECEIVED ||
-                swap.state === FromBtcLnAutoSwap_1.FromBtcLnAutoSwapState.TXS_SENT ||
+            if (swap.state === FromBtcLnAutoSwap_1.FromBtcLnAutoSwapState.TXS_SENT ||
                 swap.state === FromBtcLnAutoSwap_1.FromBtcLnAutoSwapState.COMMITED) {
                 res.status(200).json({
                     code: 10000,

package/dist/swaps/escrow/frombtcln_autoinit/FromBtcLnAutoSwap.d.ts

@@ -52,4 +52,5 @@ export declare class FromBtcLnAutoSwap<T extends SwapData = SwapData> extends Fr
     isInitiated(): boolean;
     isFailed(): boolean;
     isSuccess(): boolean;
+    getDestinationAddress(): string;
 }

package/dist/swaps/escrow/frombtcln_autoinit/FromBtcLnAutoSwap.js

@@ -116,5 +116,8 @@ class FromBtcLnAutoSwap extends FromBtcBaseSwap_1.FromBtcBaseSwap {
     isSuccess() {
         return this.state === FromBtcLnAutoSwapState.SETTLED;
     }
+    getDestinationAddress() {
+        return this.claimer;
+    }
 }
 exports.FromBtcLnAutoSwap = FromBtcLnAutoSwap;

package/dist/swaps/escrow/tobtc_abstract/ToBtcAbs.js

@@ -11,6 +11,7 @@ const SchemaVerifier_1 = require("../../../utils/paramcoders/SchemaVerifier");
 const ServerParamDecoder_1 = require("../../../utils/paramcoders/server/ServerParamDecoder");
 const ToBtcBaseSwapHandler_1 = require("../ToBtcBaseSwapHandler");
 const BitcoinUtils_1 = require("../../../utils/BitcoinUtils");
+const IPlugin_1 = require("../../../plugins/IPlugin");
 const OUTPUT_SCRIPT_MAX_LENGTH = 200;
 const MAX_PARALLEL_TX_PROCESSED = 10;
 /**
@@ -346,9 +347,29 @@ class ToBtcAbs extends ToBtcBaseSwapHandler_1.ToBtcBaseSwapHandler {
             await this.saveSwapData(swap);
         }
         if (swap.state === ToBtcSwapAbs_1.ToBtcSwapState.COMMITED) {
-            const unlock = swap.lock(60);
+            const unlock = swap.lock(Infinity);
             if (unlock == null)
                 return;
+            const pluginCheckResult = await PluginManager_1.PluginManager.onHandlePreToBtcExecute(SwapHandler_1.SwapHandlerType.TO_BTC, swap);
+            if ((0, IPlugin_1.isQuoteThrow)(pluginCheckResult)) {
+                const error = {
+                    code: 29999,
+                    msg: pluginCheckResult.message
+                };
+                this.swapLogger.error(swap, "processInitialized(state=COMMITED): setting state to NON_PAYABLE due to send bitcoin payment error", error);
+                if (swap.metadata != null)
+                    swap.metadata.payError = error;
+                unlock();
+                if (swap.state === ToBtcSwapAbs_1.ToBtcSwapState.COMMITED) {
+                    await swap.setState(ToBtcSwapAbs_1.ToBtcSwapState.NON_PAYABLE);
+                    await this.saveSwapData(swap);
+                }
+                return;
+            }
+            if (swap.state !== ToBtcSwapAbs_1.ToBtcSwapState.COMMITED) {
+                unlock();
+                return;
+            }
             this.swapLogger.debug(swap, "processInitialized(state=COMMITED): sending bitcoin transaction, address: " + swap.address);
             try {
                 await this.sendBitcoinPayment(swap);
@@ -367,7 +388,9 @@ class ToBtcAbs extends ToBtcBaseSwapHandler_1.ToBtcBaseSwapHandler {
                     throw e;
                 }
             }
-            unlock();
+            finally {
+                unlock();
+            }
         }
         if (swap.state === ToBtcSwapAbs_1.ToBtcSwapState.NON_PAYABLE)
             return;

package/dist/swaps/escrow/tobtc_abstract/ToBtcSwapAbs.d.ts

@@ -25,4 +25,5 @@ export declare class ToBtcSwapAbs<T extends SwapData = SwapData> extends ToBtcBa
     isInitiated(): boolean;
     isFailed(): boolean;
     isSuccess(): boolean;
+    getDestinationAddress(): string;
 }

package/dist/swaps/escrow/tobtc_abstract/ToBtcSwapAbs.js

@@ -60,5 +60,8 @@ class ToBtcSwapAbs extends ToBtcBaseSwap_1.ToBtcBaseSwap {
     isSuccess() {
         return this.state === ToBtcSwapState.CLAIMED;
     }
+    getDestinationAddress() {
+        return this.address;
+    }
 }
 exports.ToBtcSwapAbs = ToBtcSwapAbs;

package/dist/swaps/escrow/tobtcln_abstract/ToBtcLnAbs.js

@@ -12,6 +12,7 @@ const SchemaVerifier_1 = require("../../../utils/paramcoders/SchemaVerifier");
 const ToBtcBaseSwapHandler_1 = require("../ToBtcBaseSwapHandler");
 const ILightningWallet_1 = require("../../../wallets/ILightningWallet");
 const LightningAssertions_1 = require("../../assertions/LightningAssertions");
+const IPlugin_1 = require("../../../plugins/IPlugin");
 /**
  * Swap handler handling to BTCLN swaps using submarine swaps
  */
@@ -229,6 +230,15 @@ class ToBtcLnAbs extends ToBtcBaseSwapHandler_1.ToBtcBaseSwapHandler {
             " maxFee: " + maxFee.toString(10) +
             " invoice: " + swap.pr);
         const blockHeight = await this.lightning.getBlockheight();
+        const pluginCheckResult = await PluginManager_1.PluginManager.onHandlePreToBtcExecute(SwapHandler_1.SwapHandlerType.TO_BTCLN, swap);
+        if ((0, IPlugin_1.isQuoteThrow)(pluginCheckResult)) {
+            throw {
+                code: 29999,
+                msg: pluginCheckResult.message
+            };
+        }
+        if (swap.state !== ToBtcLnSwapAbs_1.ToBtcLnSwapState.COMMITED)
+            return false;
         swap.payInitiated = true;
         await this.saveSwapData(swap);
         try {
@@ -249,6 +259,7 @@ class ToBtcLnAbs extends ToBtcBaseSwapHandler_1.ToBtcBaseSwapHandler {
         }
         if (swap.metadata != null)
             swap.metadata.times.payComplete = Date.now();
+        return true;
     }
     /**
      * Begins a lightning network payment attempt, if not attempted already
@@ -303,7 +314,8 @@ class ToBtcLnAbs extends ToBtcBaseSwapHandler_1.ToBtcBaseSwapHandler {
             await swap.setState(ToBtcLnSwapAbs_1.ToBtcLnSwapState.COMMITED);
             await this.saveSwapData(swap);
             try {
-                await this.sendLightningPayment(swap);
+                if (!await this.sendLightningPayment(swap))
+                    return;
             }
             catch (e) {
                 this.swapLogger.error(swap, "processInitialized(): lightning payment error", e);

package/dist/swaps/escrow/tobtcln_abstract/ToBtcLnSwapAbs.d.ts

@@ -21,4 +21,5 @@ export declare class ToBtcLnSwapAbs<T extends SwapData = SwapData> extends ToBtc
     isInitiated(): boolean;
     isFailed(): boolean;
     isSuccess(): boolean;
+    getDestinationAddress(): string;
 }

package/dist/swaps/escrow/tobtcln_abstract/ToBtcLnSwapAbs.js

@@ -54,5 +54,8 @@ class ToBtcLnSwapAbs extends ToBtcBaseSwap_1.ToBtcBaseSwap {
     isSuccess() {
         return this.state === ToBtcLnSwapState.CLAIMED;
     }
+    getDestinationAddress() {
+        return this.pr;
+    }
 }
 exports.ToBtcLnSwapAbs = ToBtcLnSwapAbs;

package/dist/swaps/spv_vault_swap/SpvVaultSwap.d.ts

@@ -65,4 +65,5 @@ export declare class SpvVaultSwap extends SwapHandlerSwap<SpvVaultSwapState> {
     isFailed(): boolean;
     isInitiated(): boolean;
     isSuccess(): boolean;
+    getDestinationAddress(): string;
 }

package/dist/swaps/spv_vault_swap/SpvVaultSwap.js

@@ -154,5 +154,8 @@ class SpvVaultSwap extends SwapHandlerSwap_1.SwapHandlerSwap {
     isSuccess() {
         return this.state === SpvVaultSwapState.CLAIMED;
     }
+    getDestinationAddress() {
+        return this.recipient;
+    }
 }
 exports.SpvVaultSwap = SpvVaultSwap;

package/dist/swaps/spv_vault_swap/SpvVaultSwapHandler.js

@@ -14,6 +14,7 @@ const btc_signer_1 = require("@scure/btc-signer");
 const SpvVaults_1 = require("./SpvVaults");
 const BitcoinUtils_1 = require("../../utils/BitcoinUtils");
 const AmountAssertions_1 = require("../assertions/AmountAssertions");
+const IPlugin_1 = require("../../plugins/IPlugin");
 const TX_MAX_VSIZE = 16 * 1024;
 class SpvVaultSwapHandler extends SwapHandler_1.SwapHandler {
     constructor(storageDirectory, vaultStorage, path, chainsData, swapPricing, bitcoin, bitcoinRpc, spvVaultSigner, config) {
@@ -452,7 +453,7 @@ class SpvVaultSwapHandler extends SwapHandler_1.SwapHandler {
             if (swap.vaultUtxo !== vault.getLatestUtxo()) {
                 throw {
                     code: 20510,
-                    msg: "Vault UTXO already spent, please try again!"
+                    msg: "Vault UTXO already spent, please get another quote and try again!"
                 };
             }
             //Create abortController for parallel prefetches
@@ -475,11 +476,22 @@ class SpvVaultSwapHandler extends SwapHandler_1.SwapHandler {
                     code: 20516,
                     msg: "Bitcoin transaction size too large, maximum: " + TX_MAX_VSIZE + " actual: " + txVsize
                 };
+            const pluginCheckResult = await PluginManager_1.PluginManager.onHandlePreFromBtcExecute(SwapHandler_1.SwapHandlerType.FROM_BTC_SPV, swap);
+            if ((0, IPlugin_1.isQuoteThrow)(pluginCheckResult)) {
+                const error = {
+                    code: 29999,
+                    msg: pluginCheckResult.message
+                };
+                if (swap.metadata != null)
+                    swap.metadata.postQuoteError = error;
+                await this.removeSwapData(swap, SpvVaultSwap_1.SpvVaultSwapState.FAILED);
+                throw error;
+            }
             await this.Vaults.checkVaultReplacedTransactions(vault, true);
             if (swap.vaultUtxo !== vault.getLatestUtxo()) {
                 throw {
                     code: 20510,
-                    msg: "Vault UTXO already spent, please try again!"
+                    msg: "Vault UTXO already spent, please get another quote and try again!"
                 };
             }
             try {