@atomiqlabs/lp-lib 14.0.0-dev.16 → 14.0.0-dev.19

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

@@ -32,6 +32,7 @@ export type FromBtcLnAutoRequestType = {
 export declare class FromBtcLnAuto extends FromBtcBaseSwapHandler<FromBtcLnAutoSwap, FromBtcLnAutoSwapState> {
     readonly type = SwapHandlerType.FROM_BTCLN_AUTO;
     readonly swapType = ChainSwapType.HTLC;
+    activeSubscriptions: Set<string>;
     readonly config: FromBtcLnAutoConfig;
     readonly lightning: ILightningWallet;
     readonly LightningAssertions: LightningAssertions;
@@ -46,6 +47,12 @@ export declare class FromBtcLnAuto extends FromBtcBaseSwapHandler<FromBtcLnAutoS
     protected processInitializeEvent(chainIdentifier: string, savedSwap: FromBtcLnAutoSwap, event: InitializeEvent<SwapData>): Promise<void>;
     protected processClaimEvent(chainIdentifier: string, savedSwap: FromBtcLnAutoSwap, event: ClaimEvent<SwapData>): Promise<void>;
     protected processRefundEvent(chainIdentifier: string, savedSwap: FromBtcLnAutoSwap, event: RefundEvent<SwapData>): Promise<void>;
+    /**
+     * Subscribe to a lightning network invoice
+     *
+     * @param swap
+     */
+    private subscribeToInvoice;
     /**
      * Called when lightning HTLC is received, also signs an init transaction on the smart chain side, expiry of the
      *  smart chain authorization starts ticking as soon as this HTLC is received

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

@@ -19,6 +19,7 @@ class FromBtcLnAuto extends FromBtcBaseSwapHandler_1.FromBtcBaseSwapHandler {
         super(storageDirectory, path, chains, swapPricing, config);
         this.type = SwapHandler_1.SwapHandlerType.FROM_BTCLN_AUTO;
         this.swapType = base_1.ChainSwapType.HTLC;
+        this.activeSubscriptions = new Set();
         this.config = config;
         this.config.invoiceTimeoutSeconds = this.config.invoiceTimeoutSeconds || 90;
         this.lightning = lightning;
@@ -34,10 +35,12 @@ class FromBtcLnAuto extends FromBtcBaseSwapHandler_1.FromBtcBaseSwapHandler {
             if (!isBeingPaid) {
                 //Not paid
                 const isInvoiceExpired = parsedPR.expiryEpochMillis < Date.now();
-                if (!isInvoiceExpired)
+                if (isInvoiceExpired) {
+                    this.swapLogger.info(swap, "processPastSwap(state=CREATED): swap LN invoice expired, cancelling, invoice: " + swap.pr);
+                    await this.cancelSwapAndInvoice(swap);
                     return null;
-                this.swapLogger.info(swap, "processPastSwap(state=CREATED): swap LN invoice expired, cancelling, invoice: " + swap.pr);
-                await this.cancelSwapAndInvoice(swap);
+                }
+                this.subscribeToInvoice(swap);
                 return null;
             }
             //Adjust the state of the swap and expiry
@@ -219,6 +222,24 @@ class FromBtcLnAuto extends FromBtcBaseSwapHandler_1.FromBtcBaseSwapHandler {
         // await this.lightning.cancelHodlInvoice(savedSwap.lnPaymentHash);
         await this.removeSwapData(savedSwap, FromBtcLnAutoSwap_1.FromBtcLnAutoSwapState.REFUNDED);
     }
+    /**
+     * Subscribe to a lightning network invoice
+     *
+     * @param swap
+     */
+    subscribeToInvoice(swap) {
+        const paymentHash = swap.lnPaymentHash;
+        if (this.activeSubscriptions.has(paymentHash))
+            return false;
+        this.lightning.waitForInvoice(paymentHash).then(result => {
+            this.swapLogger.info(swap, "subscribeToInvoice(): result callback, outcome: " + result.status + " invoice: " + swap.pr);
+            this.htlcReceived(swap, result).catch(e => this.swapLogger.error(swap, "subscribeToInvoice(): HTLC received result", e));
+            this.activeSubscriptions.delete(paymentHash);
+        });
+        this.swapLogger.info(swap, "subscribeToInvoice(): subscribe to invoice: " + swap.pr);
+        this.activeSubscriptions.add(paymentHash);
+        return true;
+    }
     /**
      * Called when lightning HTLC is received, also signs an init transaction on the smart chain side, expiry of the
      *  smart chain authorization starts ticking as soon as this HTLC is received
@@ -227,6 +248,8 @@ class FromBtcLnAuto extends FromBtcBaseSwapHandler_1.FromBtcBaseSwapHandler {
      * @param invoice
      */
     async htlcReceived(invoiceData, invoice) {
+        if (invoiceData.state !== FromBtcLnAutoSwap_1.FromBtcLnAutoSwapState.CREATED)
+            return;
         this.swapLogger.debug(invoiceData, "htlcReceived(): invoice: ", invoice);
         if (invoiceData.metadata != null)
             invoiceData.metadata.times.htlcReceived = Date.now();
@@ -257,8 +280,8 @@ class FromBtcLnAuto extends FromBtcBaseSwapHandler_1.FromBtcBaseSwapHandler {
             //Setting the state variable is done outside the promise, so is done synchronously
             await invoiceData.setState(FromBtcLnAutoSwap_1.FromBtcLnAutoSwapState.RECEIVED);
             await this.saveSwapData(invoiceData);
+            await this.offerHtlc(invoiceData);
         }
-        await this.offerHtlc(invoiceData);
     }
     async offerHtlc(invoiceData) {
         if (invoiceData.state !== FromBtcLnAutoSwap_1.FromBtcLnAutoSwapState.RECEIVED)
@@ -310,7 +333,7 @@ class FromBtcLnAuto extends FromBtcBaseSwapHandler_1.FromBtcBaseSwapHandler {
             //Setting the state variable is done outside the promise, so is done synchronously
             await invoiceData.setState(FromBtcLnAutoSwap_1.FromBtcLnAutoSwapState.TXS_SENT);
             await this.saveSwapData(invoiceData);
-            await chainInterface.sendAndConfirm(signer, [...txWithdraw, ...txInit], true);
+            await chainInterface.sendAndConfirm(signer, [...txWithdraw, ...txInit], true, undefined, true);
         }
         return true;
     }
@@ -577,6 +600,7 @@ class FromBtcLnAuto extends FromBtcBaseSwapHandler_1.FromBtcBaseSwapHandler {
             await PluginManager_1.PluginManager.swapCreate(createdSwap);
             await this.saveSwapData(createdSwap);
             this.swapLogger.info(createdSwap, "REST: /createInvoice: Created swap invoice: " + hodlInvoice.request + " amount: " + totalBtcInput.toString(10));
+            this.subscribeToInvoice(createdSwap);
             await responseStream.writeParamsAndEnd({
                 code: 20000,
                 msg: "Success",

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

@@ -232,6 +232,8 @@ class ToBtcLnAbs extends ToBtcBaseSwapHandler_1.ToBtcBaseSwapHandler {
             " maxFee: " + maxFee.toString(10) +
             " invoice: " + swap.pr);
         const blockHeight = await this.lightning.getBlockheight();
+        swap.payInitiated = true;
+        await this.saveSwapData(swap);
         try {
             await this.lightning.pay({
                 request: swap.pr,

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

@@ -12,6 +12,7 @@ export declare enum ToBtcLnSwapState {
 export declare class ToBtcLnSwapAbs<T extends SwapData = SwapData> extends ToBtcBaseSwap<T, ToBtcLnSwapState> {
     lnPaymentHash: string;
     readonly pr: string;
+    payInitiated: boolean;
     secret: string;
     constructor(chainIdentifier: string, lnPaymentHash: string, pr: string, amountMtokens: bigint, swapFee: bigint, swapFeeInToken: bigint, quotedNetworkFee: bigint, quotedNetworkFeeInToken: bigint);
     constructor(obj: any);

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

@@ -27,6 +27,7 @@ class ToBtcLnSwapAbs extends ToBtcBaseSwap_1.ToBtcBaseSwap {
             this.pr = chainIdOrObj.pr;
             this.secret = chainIdOrObj.secret;
             this.lnPaymentHash = chainIdOrObj.lnPaymentHash;
+            this.payInitiated = chainIdOrObj.payInitiated;
             //Compatibility with older versions
             this.quotedNetworkFee ?? (this.quotedNetworkFee = (0, Utils_1.deserializeBN)(chainIdOrObj.maxFee));
             this.realNetworkFee ?? (this.realNetworkFee = (0, Utils_1.deserializeBN)(chainIdOrObj.realRoutingFee));
@@ -41,6 +42,7 @@ class ToBtcLnSwapAbs extends ToBtcBaseSwap_1.ToBtcBaseSwap {
         partialSerialized.pr = this.pr;
         partialSerialized.lnPaymentHash = this.lnPaymentHash;
         partialSerialized.secret = this.secret;
+        partialSerialized.payInitiated = this.payInitiated;
         return partialSerialized;
     }
     isInitiated() {

package/dist/swaps/spv_vault_swap/SpvVaultSwapHandler.js

@@ -12,6 +12,7 @@ const FromBtcAmountAssertions_1 = require("../assertions/FromBtcAmountAssertions
 const crypto_1 = require("crypto");
 const btc_signer_1 = require("@scure/btc-signer");
 const SpvVaults_1 = require("./SpvVaults");
+const BitcoinUtils_1 = require("../../utils/BitcoinUtils");
 const TX_MAX_VSIZE = 16 * 1024;
 class SpvVaultSwapHandler extends SwapHandler_1.SwapHandler {
     constructor(storageDirectory, vaultStorage, path, chainsData, swapPricing, bitcoin, bitcoinRpc, spvVaultSigner, config) {
@@ -342,7 +343,7 @@ class SpvVaultSwapHandler extends SwapHandler_1.SwapHandler {
             //Check correct psbt
             for (let i = 1; i < transaction.inputsLength; i++) { //Skip first vault input
                 const txIn = transaction.getInput(i);
-                if ((0, btc_signer_1.getInputType)(txIn).txType === "legacy")
+                if ((0, BitcoinUtils_1.isLegacyInput)(txIn))
                     throw {
                         code: 20514,
                         msg: "Legacy (pre-segwit) inputs in tx are not allowed!"

package/dist/swaps/spv_vault_swap/SpvVaults.js

@@ -217,7 +217,7 @@ class SpvVaults {
                 }
                 const txs = await spvVaultContract.txsOpen(signer.getAddress(), vault.data);
                 let numTx = 0;
-                const txIds = await chainInterface.sendAndConfirm(signer, txs, true, undefined, false, async (txId, rawTx) => {
+                const txIds = await chainInterface.sendAndConfirm(signer, txs, true, undefined, true, async (txId, rawTx) => {
                     numTx++;
                     if (numTx === txs.length) {
                         //Final tx

package/dist/utils/BitcoinUtils.d.ts

@@ -0,0 +1,2 @@
+import { TransactionInput } from "@scure/btc-signer/psbt";
+export declare function isLegacyInput(input: TransactionInput): boolean;

package/dist/utils/BitcoinUtils.js

@@ -0,0 +1,45 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.isLegacyInput = void 0;
+const utxo_1 = require("@scure/btc-signer/utxo");
+const btc_signer_1 = require("@scure/btc-signer");
+function parsePushOpcode(script) {
+    if (script[0] === 0x00) {
+        return Uint8Array.from([]);
+    }
+    if (script[0] <= 0x4b) {
+        return script.slice(1, 1 + script[0]);
+    }
+    if (script[0] === 0x4c) {
+        return script.slice(2, 2 + script[1]);
+    }
+    if (script[0] === 0x4d) {
+        const length = Buffer.from(script.slice(1, 3)).readUInt16LE();
+        return script.slice(3, 3 + length);
+    }
+    if (script[0] === 0x4e) {
+        const length = Buffer.from(script.slice(1, 5)).readUInt32LE();
+        return script.slice(5, 5 + length);
+    }
+    if (script[0] === 0x4f) {
+        return Uint8Array.from([0x81]);
+    }
+    if (script[0] >= 0x51 && script[0] <= 0x60) {
+        return Uint8Array.from([script[0] - 0x50]);
+    }
+    throw new Error("No push opcode detected");
+}
+function isLegacyInput(input) {
+    const prevOut = (0, utxo_1.getPrevOut)(input);
+    const first = btc_signer_1.OutScript.decode(prevOut.script);
+    if (first.type === "tr" || first.type === "wsh" || first.type === "wpkh")
+        return false;
+    if (first.type === "sh") {
+        const redeemScript = input.redeemScript ?? parsePushOpcode(input.finalScriptSig);
+        const second = btc_signer_1.OutScript.decode(redeemScript);
+        if (second.type === "wsh" || second.type === "wpkh")
+            return false;
+    }
+    return true;
+}
+exports.isLegacyInput = isLegacyInput;

package/package.json

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

package/src/swaps/escrow/frombtcln_autoinit/FromBtcLnAuto.ts

@@ -20,6 +20,7 @@ import {
 } from "../../../wallets/ILightningWallet";
 import {LightningAssertions} from "../../assertions/LightningAssertions";
 import {FromBtcLnSwapState} from "../frombtcln_abstract/FromBtcLnSwapAbs";
+import {ToBtcLnSwapAbs} from "../tobtcln_abstract/ToBtcLnSwapAbs";
 
 export type FromBtcLnAutoConfig = FromBtcBaseConfig & {
     invoiceTimeoutSeconds?: number,
@@ -47,6 +48,8 @@ export class FromBtcLnAuto extends FromBtcBaseSwapHandler<FromBtcLnAutoSwap, Fro
     readonly type = SwapHandlerType.FROM_BTCLN_AUTO;
     readonly swapType = ChainSwapType.HTLC;
 
+    activeSubscriptions: Set<string> = new Set<string>();
+
     readonly config: FromBtcLnAutoConfig;
     readonly lightning: ILightningWallet;
     readonly LightningAssertions: LightningAssertions;
@@ -77,10 +80,12 @@ export class FromBtcLnAuto extends FromBtcBaseSwapHandler<FromBtcLnAutoSwap, Fro
             if(!isBeingPaid) {
                 //Not paid
                 const isInvoiceExpired = parsedPR.expiryEpochMillis<Date.now();
-                if(!isInvoiceExpired) return null;
-
-                this.swapLogger.info(swap, "processPastSwap(state=CREATED): swap LN invoice expired, cancelling, invoice: "+swap.pr);
-                await this.cancelSwapAndInvoice(swap);
+                if(isInvoiceExpired) {
+                    this.swapLogger.info(swap, "processPastSwap(state=CREATED): swap LN invoice expired, cancelling, invoice: "+swap.pr);
+                    await this.cancelSwapAndInvoice(swap);
+                    return null;
+                }
+                this.subscribeToInvoice(swap);
                 return null;
             }
 
@@ -282,6 +287,26 @@ export class FromBtcLnAuto extends FromBtcBaseSwapHandler<FromBtcLnAutoSwap, Fro
         await this.removeSwapData(savedSwap, FromBtcLnAutoSwapState.REFUNDED)
     }
 
+    /**
+     * Subscribe to a lightning network invoice
+     *
+     * @param swap
+     */
+    private subscribeToInvoice(swap: FromBtcLnAutoSwap): boolean {
+        const paymentHash = swap.lnPaymentHash;
+        if(this.activeSubscriptions.has(paymentHash)) return false;
+
+        this.lightning.waitForInvoice(paymentHash).then(result => {
+            this.swapLogger.info(swap, "subscribeToInvoice(): result callback, outcome: "+result.status+" invoice: "+swap.pr);
+            this.htlcReceived(swap, result).catch(e => this.swapLogger.error(swap, "subscribeToInvoice(): HTLC received result", e));
+            this.activeSubscriptions.delete(paymentHash);
+        });
+        this.swapLogger.info(swap, "subscribeToInvoice(): subscribe to invoice: "+swap.pr);
+
+        this.activeSubscriptions.add(paymentHash);
+        return true;
+    }
+
     /**
      * Called when lightning HTLC is received, also signs an init transaction on the smart chain side, expiry of the
      *  smart chain authorization starts ticking as soon as this HTLC is received
@@ -290,6 +315,7 @@ export class FromBtcLnAuto extends FromBtcBaseSwapHandler<FromBtcLnAutoSwap, Fro
      * @param invoice
      */
     private async htlcReceived(invoiceData: FromBtcLnAutoSwap, invoice: LightningNetworkInvoice) {
+        if(invoiceData.state!==FromBtcLnAutoSwapState.CREATED) return;
         this.swapLogger.debug(invoiceData, "htlcReceived(): invoice: ", invoice);
         if(invoiceData.metadata!=null) invoiceData.metadata.times.htlcReceived = Date.now();
 
@@ -336,9 +362,9 @@ export class FromBtcLnAuto extends FromBtcBaseSwapHandler<FromBtcLnAutoSwap, Fro
             await invoiceData.setState(FromBtcLnAutoSwapState.RECEIVED);
 
             await this.saveSwapData(invoiceData);
-        }
 
-        await this.offerHtlc(invoiceData);
+            await this.offerHtlc(invoiceData);
+        }
     }
 
     private async offerHtlc(invoiceData: FromBtcLnAutoSwap) {
@@ -394,7 +420,7 @@ export class FromBtcLnAuto extends FromBtcBaseSwapHandler<FromBtcLnAutoSwap, Fro
             //Setting the state variable is done outside the promise, so is done synchronously
             await invoiceData.setState(FromBtcLnAutoSwapState.TXS_SENT);
             await this.saveSwapData(invoiceData);
-            await chainInterface.sendAndConfirm(signer, [...txWithdraw, ...txInit], true);
+            await chainInterface.sendAndConfirm(signer, [...txWithdraw, ...txInit], true, undefined, true);
         }
 
         return true;
@@ -722,6 +748,7 @@ export class FromBtcLnAuto extends FromBtcBaseSwapHandler<FromBtcLnAutoSwap, Fro
             await this.saveSwapData(createdSwap);
 
             this.swapLogger.info(createdSwap, "REST: /createInvoice: Created swap invoice: "+hodlInvoice.request+" amount: "+totalBtcInput.toString(10));
+            this.subscribeToInvoice(createdSwap);
 
             await responseStream.writeParamsAndEnd({
                 code: 20000,

package/src/swaps/escrow/tobtcln_abstract/ToBtcLnAbs.ts

@@ -338,6 +338,8 @@ export class ToBtcLnAbs extends ToBtcBaseSwapHandler<ToBtcLnSwapAbs, ToBtcLnSwap
 
         const blockHeight = await this.lightning.getBlockheight();
 
+        swap.payInitiated = true;
+        await this.saveSwapData(swap);
         try {
             await this.lightning.pay({
                 request: swap.pr,

package/src/swaps/escrow/tobtcln_abstract/ToBtcLnSwapAbs.ts

@@ -17,6 +17,7 @@ export class ToBtcLnSwapAbs<T extends SwapData = SwapData> extends ToBtcBaseSwap
 
     lnPaymentHash: string;
     readonly pr: string;
+    payInitiated: boolean;
 
     secret: string;
 
@@ -43,6 +44,7 @@ export class ToBtcLnSwapAbs<T extends SwapData = SwapData> extends ToBtcBaseSwap
             this.pr = chainIdOrObj.pr;
             this.secret = chainIdOrObj.secret;
             this.lnPaymentHash = chainIdOrObj.lnPaymentHash;
+            this.payInitiated = chainIdOrObj.payInitiated;
 
             //Compatibility with older versions
             this.quotedNetworkFee ??= deserializeBN(chainIdOrObj.maxFee);
@@ -60,6 +62,7 @@ export class ToBtcLnSwapAbs<T extends SwapData = SwapData> extends ToBtcBaseSwap
         partialSerialized.pr = this.pr;
         partialSerialized.lnPaymentHash = this.lnPaymentHash;
         partialSerialized.secret = this.secret;
+        partialSerialized.payInitiated = this.payInitiated;
         return partialSerialized;
     }
 

package/src/swaps/spv_vault_swap/SpvVaultSwapHandler.ts

@@ -29,6 +29,7 @@ import {FromBtcAmountAssertions} from "../assertions/FromBtcAmountAssertions";
 import {randomBytes} from "crypto";
 import {getInputType, OutScript, Transaction} from "@scure/btc-signer";
 import {SpvVaults, VAULT_DUST_AMOUNT} from "./SpvVaults";
+import {isLegacyInput} from "../../utils/BitcoinUtils";
 
 export type SpvVaultSwapHandlerConfig = SwapBaseConfig & {
     vaultsCheckInterval: number,
@@ -471,7 +472,7 @@ export class SpvVaultSwapHandler extends SwapHandler<SpvVaultSwap, SpvVaultSwapS
             //Check correct psbt
             for(let i=1;i<transaction.inputsLength;i++) { //Skip first vault input
                 const txIn = transaction.getInput(i);
-                if(getInputType(txIn).txType==="legacy") throw {
+                if(isLegacyInput(txIn)) throw {
                     code: 20514,
                     msg: "Legacy (pre-segwit) inputs in tx are not allowed!"
                 };

package/src/swaps/spv_vault_swap/SpvVaults.ts

@@ -272,7 +272,7 @@ export class SpvVaults {
                 const txs = await spvVaultContract.txsOpen(signer.getAddress(), vault.data);
                 let numTx = 0;
                 const txIds = await chainInterface.sendAndConfirm(
-                    signer, txs, true, undefined, false,
+                    signer, txs, true, undefined, true,
                     async (txId: string, rawTx: string) => {
                         numTx++;
                         if(numTx===txs.length) {

package/src/utils/BitcoinUtils.ts

@@ -0,0 +1,42 @@
+import {TransactionInput} from "@scure/btc-signer/psbt";
+import {getPrevOut} from "@scure/btc-signer/utxo";
+import {OutScript} from "@scure/btc-signer";
+
+function parsePushOpcode(script: Uint8Array): Uint8Array {
+    if(script[0]===0x00) {
+        return Uint8Array.from([]);
+    }
+    if(script[0]<=0x4b) {
+        return script.slice(1, 1+script[0]);
+    }
+    if(script[0]===0x4c) {
+        return script.slice(2, 2+script[1]);
+    }
+    if(script[0]===0x4d) {
+        const length = Buffer.from(script.slice(1, 3)).readUInt16LE();
+        return script.slice(3, 3+length);
+    }
+    if(script[0]===0x4e) {
+        const length = Buffer.from(script.slice(1, 5)).readUInt32LE();
+        return script.slice(5, 5+length);
+    }
+    if(script[0]===0x4f) {
+        return Uint8Array.from([0x81]);
+    }
+    if(script[0]>=0x51 && script[0]<=0x60) {
+        return Uint8Array.from([script[0] - 0x50]);
+    }
+    throw new Error("No push opcode detected");
+}
+
+export function isLegacyInput(input: TransactionInput): boolean {
+    const prevOut = getPrevOut(input);
+    const first = OutScript.decode(prevOut.script);
+    if(first.type==="tr" || first.type==="wsh" || first.type==="wpkh") return false;
+    if(first.type==="sh") {
+        const redeemScript = input.redeemScript ?? parsePushOpcode(input.finalScriptSig);
+        const second = OutScript.decode(redeemScript);
+        if(second.type==="wsh" || second.type==="wpkh") return false;
+    }
+    return true;
+}