@atomiqlabs/lp-lib 17.6.0 → 17.6.1

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

@@ -36,7 +36,7 @@ class FromBtcAbs extends FromBtcBaseSwapHandler_1.FromBtcBaseSwapHandler {
     getHash(chainIdentifier, address, amount) {
         const parsedOutputScript = this.bitcoin.toOutputScript(address);
         const { swapContract } = this.getChain(chainIdentifier);
-        return swapContract.getHashForOnchain(parsedOutputScript, amount, this.config.confirmations, 0n);
+        return swapContract.getHashForOnchain(parsedOutputScript, amount, this.config.confirmations);
     }
     /**
      * Processes past swap
@@ -51,13 +51,18 @@ class FromBtcAbs extends FromBtcBaseSwapHandler_1.FromBtcBaseSwapHandler {
         if (swap.state === FromBtcSwapAbs_1.FromBtcSwapState.CREATED) {
             if (!await swapContract.isInitAuthorizationExpired(swap.data, swap))
                 return false;
-            const isCommited = await swapContract.isCommited(swap.data);
-            if (isCommited) {
+            const commitState = await swapContract.getCommitStatus(signer.getAddress(), swap.data);
+            if (commitState.type === base_1.SwapCommitStateType.COMMITED || commitState.type === base_1.SwapCommitStateType.REFUNDABLE) {
                 this.swapLogger.info(swap, "processPastSwap(state=CREATED): swap was commited, but processed from watchdog, address: " + swap.address);
                 await swap.setState(FromBtcSwapAbs_1.FromBtcSwapState.COMMITED);
                 await this.saveSwapData(swap);
                 return false;
             }
+            if (commitState.type === base_1.SwapCommitStateType.PAID) {
+                this.swapLogger.info(swap, "processPastSwap(state=CREATED): swap was claimed, but processed from watchdog, address: " + swap.address);
+                await this.removeSwapData(swap, FromBtcSwapAbs_1.FromBtcSwapState.CLAIMED);
+                return false;
+            }
             this.swapLogger.info(swap, "processPastSwap(state=CREATED): removing past swap due to authorization expiry, address: " + swap.address);
             await this.removeSwapData(swap, FromBtcSwapAbs_1.FromBtcSwapState.CANCELED);
             await this.bitcoin.addUnusedAddress(swap.address);
@@ -67,11 +72,16 @@ class FromBtcAbs extends FromBtcBaseSwapHandler_1.FromBtcBaseSwapHandler {
         if (swap.state === FromBtcSwapAbs_1.FromBtcSwapState.COMMITED) {
             if (!await swapContract.isExpired(signer.getAddress(), swap.data))
                 return false;
-            const isCommited = await swapContract.isCommited(swap.data);
-            if (isCommited) {
+            const commitState = await swapContract.getCommitStatus(signer.getAddress(), swap.data);
+            if (commitState.type === base_1.SwapCommitStateType.COMMITED || commitState.type === base_1.SwapCommitStateType.REFUNDABLE) {
                 this.swapLogger.info(swap, "processPastSwap(state=COMMITED): swap expired, will refund, address: " + swap.address);
                 return true;
             }
+            if (commitState.type === base_1.SwapCommitStateType.PAID) {
+                this.swapLogger.info(swap, "processPastSwap(state=COMMITED): swap was claimed, but processed from watchdog, address: " + swap.address);
+                await this.removeSwapData(swap, FromBtcSwapAbs_1.FromBtcSwapState.CLAIMED);
+                return false;
+            }
             this.swapLogger.warn(swap, "processPastSwap(state=COMMITED): commited swap expired and not committed anymore (already refunded?), address: " + swap.address);
             await this.removeSwapData(swap, FromBtcSwapAbs_1.FromBtcSwapState.CANCELED);
             return false;
@@ -157,11 +167,11 @@ class FromBtcAbs extends FromBtcBaseSwapHandler_1.FromBtcBaseSwapHandler {
     async getClaimerBounty(req, expiry, signal) {
         const parsedClaimerBounty = await req.paramReader.getParams({
             claimerBounty: {
-                feePerBlock: SchemaVerifier_1.FieldTypeEnum.BigInt,
-                safetyFactor: SchemaVerifier_1.FieldTypeEnum.BigInt,
-                startTimestamp: SchemaVerifier_1.FieldTypeEnum.BigInt,
-                addBlock: SchemaVerifier_1.FieldTypeEnum.BigInt,
-                addFee: SchemaVerifier_1.FieldTypeEnum.BigInt,
+                feePerBlock: SchemaVerifier_1.FieldTypeEnum.BigIntNotNegative,
+                safetyFactor: SchemaVerifier_1.FieldTypeEnum.BigIntNotNegative,
+                startTimestamp: SchemaVerifier_1.FieldTypeEnum.BigIntNotNegative,
+                addBlock: SchemaVerifier_1.FieldTypeEnum.BigIntNotNegative,
+                addFee: SchemaVerifier_1.FieldTypeEnum.BigIntNotNegative,
             },
         }).catch(e => null);
         signal.throwIfAborted();
@@ -172,6 +182,12 @@ class FromBtcAbs extends FromBtcBaseSwapHandler_1.FromBtcBaseSwapHandler {
             };
         }
         const tsDelta = expiry - parsedClaimerBounty.claimerBounty.startTimestamp;
+        if (tsDelta < 0n) {
+            throw {
+                code: 20043,
+                msg: "Invalid claimerBounty (ts delta < 0)"
+            };
+        }
         const blocksDelta = tsDelta / this.config.bitcoinBlocktime * parsedClaimerBounty.claimerBounty.safetyFactor;
         const totalBlock = blocksDelta + parsedClaimerBounty.claimerBounty.addBlock;
         return parsedClaimerBounty.claimerBounty.addFee + (totalBlock * parsedClaimerBounty.claimerBounty.feePerBlock);
@@ -179,7 +195,7 @@ class FromBtcAbs extends FromBtcBaseSwapHandler_1.FromBtcBaseSwapHandler {
     getDummySwapData(chainIdentifier, useToken, address) {
         const { swapContract, signer } = this.getChain(chainIdentifier);
         const dummyAmount = BigInt(Math.floor(Math.random() * 0x1000000));
-        return swapContract.createSwapData(base_1.ChainSwapType.CHAIN, signer.getAddress(), address, useToken, dummyAmount, swapContract.getHashForOnchain((0, crypto_1.randomBytes)(32), dummyAmount, 3, null).toString("hex"), base_1.BigIntBufferUtils.fromBuffer((0, crypto_1.randomBytes)(8)), BigInt(Math.floor(Date.now() / 1000)) + this.config.swapTsCsvDelta, false, true, BigInt(Math.floor(Math.random() * 0x10000)), BigInt(Math.floor(Math.random() * 0x10000)));
+        return swapContract.createSwapData(base_1.ChainSwapType.CHAIN, signer.getAddress(), address, useToken, dummyAmount, swapContract.getHashForOnchain((0, crypto_1.randomBytes)(32), dummyAmount, 3).toString("hex"), base_1.BigIntBufferUtils.fromBuffer((0, crypto_1.randomBytes)(8)), BigInt(Math.floor(Date.now() / 1000)) + this.config.swapTsCsvDelta, false, true, BigInt(Math.floor(Math.random() * 0x10000)), BigInt(Math.floor(Math.random() * 0x10000)));
     }
     /**
      * Sets up required listeners for the REST server
@@ -215,11 +231,11 @@ class FromBtcAbs extends FromBtcBaseSwapHandler_1.FromBtcBaseSwapHandler {
                 address: (val) => val != null &&
                     typeof (val) === "string" &&
                     chainInterface.isValidAddress(val, true) ? val : null,
-                amount: SchemaVerifier_1.FieldTypeEnum.BigInt,
+                amount: SchemaVerifier_1.FieldTypeEnum.BigIntPositive,
                 token: (val) => val != null &&
                     typeof (val) === "string" &&
                     this.isTokenSupported(chainIdentifier, val) ? val : null,
-                sequence: SchemaVerifier_1.FieldTypeEnum.BigInt,
+                sequence: SchemaVerifier_1.FieldTypeEnum.BigIntNotNegative,
                 exactOut: SchemaVerifier_1.FieldTypeEnum.BooleanOptional
             });
             if (parsedBody == null)

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

@@ -520,7 +520,7 @@ class FromBtcLnAbs extends FromBtcBaseSwapHandler_1.FromBtcBaseSwapHandler {
                     typeof (val) === "string" &&
                     val.length === 64 &&
                     Utils_1.HEX_REGEX.test(val) ? val : null,
-                amount: SchemaVerifier_1.FieldTypeEnum.BigInt,
+                amount: SchemaVerifier_1.FieldTypeEnum.BigIntPositive,
                 token: (val) => val != null &&
                     typeof (val) === "string" &&
                     this.isTokenSupported(chainIdentifier, val) ? val : null,

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

@@ -553,7 +553,7 @@ class FromBtcLnAuto extends FromBtcBaseSwapHandler_1.FromBtcBaseSwapHandler {
                     typeof (val) === "string" &&
                     val.length === 64 &&
                     Utils_1.HEX_REGEX.test(val) ? val : null,
-                amount: SchemaVerifier_1.FieldTypeEnum.BigInt,
+                amount: SchemaVerifier_1.FieldTypeEnum.BigIntPositive,
                 token: (val) => val != null &&
                     typeof (val) === "string" &&
                     this.isTokenSupported(chainIdentifier, val) ? val : null,
@@ -562,8 +562,8 @@ class FromBtcLnAuto extends FromBtcBaseSwapHandler_1.FromBtcBaseSwapHandler {
                 gasToken: (val) => val != null &&
                     typeof (val) === "string" &&
                     chainInterface.isValidToken(val) ? val : null,
-                gasAmount: SchemaVerifier_1.FieldTypeEnum.BigInt,
-                claimerBounty: SchemaVerifier_1.FieldTypeEnum.BigInt
+                gasAmount: SchemaVerifier_1.FieldTypeEnum.BigIntNotNegative,
+                claimerBounty: SchemaVerifier_1.FieldTypeEnum.BigIntNotNegative
             });
             if (parsedBody == null)
                 throw {

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

@@ -438,7 +438,7 @@ class ToBtcAbs extends ToBtcBaseSwapHandler_1.ToBtcBaseSwapHandler {
      * @throws {DefinedRuntimeError} will throw an error if the nonce is invalid
      */
     checkNonceValid(nonce) {
-        if (nonce < 0 || nonce >= (2n ** 64n))
+        if (nonce < 1 || nonce >= (2n ** 64n))
             throw {
                 code: 20021,
                 msg: "Invalid request body (nonce - cannot be parsed)"
@@ -458,6 +458,11 @@ class ToBtcAbs extends ToBtcBaseSwapHandler_1.ToBtcBaseSwapHandler {
      * @throws {DefinedRuntimeError} will throw an error if the confirmationTarget is out of bounds
      */
     checkConfirmationTarget(confirmationTarget) {
+        if (!Number.isFinite(confirmationTarget) || !Number.isSafeInteger(confirmationTarget))
+            throw {
+                code: 20028,
+                msg: "Invalid request body (confirmationTarget - not whole number)"
+            };
         if (confirmationTarget > this.config.maxConfTarget)
             throw {
                 code: 20023,
@@ -476,6 +481,11 @@ class ToBtcAbs extends ToBtcBaseSwapHandler_1.ToBtcBaseSwapHandler {
      * @throws {DefinedRuntimeError} will throw an error if the confirmations are out of bounds
      */
     checkRequiredConfirmations(confirmations) {
+        if (!Number.isFinite(confirmations) || !Number.isSafeInteger(confirmations))
+            throw {
+                code: 20027,
+                msg: "Invalid request body (confirmations - not whole number)"
+            };
         if (confirmations > this.config.maxConfirmations)
             throw {
                 code: 20025,
@@ -569,10 +579,10 @@ class ToBtcAbs extends ToBtcBaseSwapHandler_1.ToBtcBaseSwapHandler {
              */
             const parsedBody = await req.paramReader.getParams({
                 address: SchemaVerifier_1.FieldTypeEnum.String,
-                amount: SchemaVerifier_1.FieldTypeEnum.BigInt,
-                confirmationTarget: SchemaVerifier_1.FieldTypeEnum.Number,
-                confirmations: SchemaVerifier_1.FieldTypeEnum.Number,
-                nonce: SchemaVerifier_1.FieldTypeEnum.BigInt,
+                amount: SchemaVerifier_1.FieldTypeEnum.BigIntPositive,
+                confirmationTarget: SchemaVerifier_1.FieldTypeEnum.NumberPositive,
+                confirmations: SchemaVerifier_1.FieldTypeEnum.NumberPositive,
+                nonce: SchemaVerifier_1.FieldTypeEnum.BigIntNotNegative,
                 token: (val) => val != null &&
                     typeof (val) === "string" &&
                     this.isTokenSupported(chainIdentifier, val) ? val : null,
@@ -649,7 +659,8 @@ class ToBtcAbs extends ToBtcBaseSwapHandler_1.ToBtcBaseSwapHandler {
                 data: {
                     amount: amountBD.toString(10),
                     address: signer.getAddress(),
-                    satsPervByte: networkFeeData.satsPerVbyte.toString(10),
+                    satsPervByte: Math.floor(networkFeeData.satsPerVbyte).toString(10),
+                    satsPervByteNumber: networkFeeData.satsPerVbyte,
                     networkFee: networkFeeInToken.toString(10),
                     swapFee: swapFeeInToken.toString(10),
                     totalFee: (swapFeeInToken + networkFeeInToken).toString(10),

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

@@ -68,6 +68,7 @@ export declare class ToBtcLnAbs extends ToBtcBaseSwapHandler<ToBtcLnSwapAbs, ToB
     };
     readonly lightning: ILightningWallet;
     readonly LightningAssertions: LightningAssertions;
+    readonly cltvDeltaLowerBound: bigint;
     constructor(storageDirectory: IIntermediaryStorage<ToBtcLnSwapAbs>, path: string, chainData: MultichainData, lightning: ILightningWallet, swapPricing: ISwapPrice, config: ToBtcLnConfig);
     /**
      * Cleans up exactIn authorization that are already past their expiry

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

@@ -33,9 +33,10 @@ class ToBtcLnAbs extends ToBtcBaseSwapHandler_1.ToBtcBaseSwapHandler {
         this.config.minLnBaseFee = this.config.minLnBaseFee || 5n;
         this.config.exactInExpiry = this.config.exactInExpiry || 10 * 1000;
         this.config.lnSendBitcoinBlockTimeSafetyFactorPPM = this.config.lnSendBitcoinBlockTimeSafetyFactorPPM ?? (this.config.safetyFactor * 1000000n);
-        if (this.config.lnSendBitcoinBlockTimeSafetyFactorPPM <= 1100000n) {
-            throw new Error("Lightning network send block safety factor set below 1.1, this is insecure!");
+        if (this.config.lnSendBitcoinBlockTimeSafetyFactorPPM <= 1250000n) {
+            throw new Error("Lightning network send block safety factor set below 1.25, this is insecure!");
         }
+        this.cltvDeltaLowerBound = (0, Utils_1.getMinSafeBlockWindowSlow)(Number(this.config.lnSendBitcoinBlockTimeSafetyFactorPPM) / 1000000);
     }
     /**
      * Cleans up exactIn authorization that are already past their expiry
@@ -229,6 +230,11 @@ class ToBtcLnAbs extends ToBtcBaseSwapHandler_1.ToBtcBaseSwapHandler {
         const maxFee = swap.quotedNetworkFee;
         const maxUsableCLTVdelta = (expiryTimestamp - currentTimestamp - this.config.gracePeriod)
             / (this.config.bitcoinBlocktime * this.config.lnSendBitcoinBlockTimeSafetyFactorPPM / 1000000n);
+        if (maxUsableCLTVdelta < this.cltvDeltaLowerBound)
+            throw {
+                code: 90008,
+                msg: "Calculated CLTV delta is too low for current safety factor!"
+            };
         //Initiate payment
         this.swapLogger.info(swap, "sendLightningPayment(): paying lightning network invoice," +
             " cltvDelta: " + maxUsableCLTVdelta.toString(10) +
@@ -476,6 +482,11 @@ class ToBtcLnAbs extends ToBtcBaseSwapHandler_1.ToBtcBaseSwapHandler {
     async checkAndGetNetworkFee(amountBD, maxFee, expiryTimestamp, currentTimestamp, pr, metadata, abortSignal) {
         const maxUsableCLTV = (expiryTimestamp - currentTimestamp - this.config.gracePeriod)
             / (this.config.bitcoinBlocktime * this.config.lnSendBitcoinBlockTimeSafetyFactorPPM / 1000000n);
+        if (maxUsableCLTV < this.cltvDeltaLowerBound)
+            throw {
+                code: 20002,
+                msg: "Cannot route the payment (calculated CLTV delta too short - increase timeout)!"
+            };
         const blockHeight = await this.lightning.getBlockheight();
         abortSignal.throwIfAborted();
         metadata.times.blockheightFetched = Date.now();
@@ -682,8 +693,8 @@ class ToBtcLnAbs extends ToBtcBaseSwapHandler_1.ToBtcBaseSwapHandler {
              */
             const parsedBody = await req.paramReader.getParams({
                 pr: SchemaVerifier_1.FieldTypeEnum.String,
-                maxFee: SchemaVerifier_1.FieldTypeEnum.BigInt,
-                expiryTimestamp: SchemaVerifier_1.FieldTypeEnum.BigInt,
+                maxFee: SchemaVerifier_1.FieldTypeEnum.BigIntPositive,
+                expiryTimestamp: SchemaVerifier_1.FieldTypeEnum.BigIntPositive,
                 token: (val) => val != null &&
                     typeof (val) === "string" &&
                     this.isTokenSupported(chainIdentifier, val) ? val : null,
@@ -691,7 +702,7 @@ class ToBtcLnAbs extends ToBtcBaseSwapHandler_1.ToBtcBaseSwapHandler {
                     typeof (val) === "string" &&
                     chainInterface.isValidAddress(val, true) ? val : null,
                 exactIn: SchemaVerifier_1.FieldTypeEnum.BooleanOptional,
-                amount: SchemaVerifier_1.FieldTypeEnum.BigIntOptional
+                amount: SchemaVerifier_1.FieldTypeEnum.BigIntPositiveOptional
             });
             if (parsedBody == null) {
                 throw {

package/dist/swaps/spv_vault_swap/SpvVaultSwapHandler.js

@@ -174,13 +174,21 @@ class SpvVaultSwapHandler extends SwapHandler_1.SwapHandler {
             const vault = await this.Vaults.getVault(swap.chainIdentifier, swap.vaultOwner, swap.vaultId);
             const foundWithdrawal = vault.pendingWithdrawals.find(val => val.btcTx.txid === swap.btcTxId);
             let tx = foundWithdrawal?.btcTx;
-            if (tx == null)
+            if (tx == null) {
                 tx = await this.bitcoinRpc.getTransaction(swap.btcTxId);
+            }
+            else {
+                tx = await (0, BitcoinUtils_1.checkTransactionReplaced)(tx.txid, tx.raw, this.bitcoinRpc);
+            }
             if (tx == null) {
                 await this.removeSwapData(swap, SpvVaultSwap_1.SpvVaultSwapState.FAILED);
+                if (foundWithdrawal != null) {
+                    vault.removeWithdrawal(foundWithdrawal);
+                    await this.Vaults.saveVault(vault);
+                }
                 return;
             }
-            else if (tx.confirmations === 0) {
+            else if (tx.confirmations == null || tx.confirmations === 0) {
                 await swap.setState(SpvVaultSwap_1.SpvVaultSwapState.SENT);
                 await this.saveSwapData(swap);
                 return;
@@ -315,11 +323,11 @@ class SpvVaultSwapHandler extends SwapHandler_1.SwapHandler {
              * frontingFeeRate: string      Fronting fee (in output token) to assign to the swap
              */
             const actualParsedBody = await req.paramReader.getParams({
-                amount: SchemaVerifier_1.FieldTypeEnum.BigInt,
-                gasAmount: SchemaVerifier_1.FieldTypeEnum.BigInt,
+                amount: SchemaVerifier_1.FieldTypeEnum.BigIntPositive,
+                gasAmount: SchemaVerifier_1.FieldTypeEnum.BigIntNotNegative,
                 exactOut: SchemaVerifier_1.FieldTypeEnum.BooleanOptional,
-                callerFeeRate: SchemaVerifier_1.FieldTypeEnum.BigInt,
-                frontingFeeRate: SchemaVerifier_1.FieldTypeEnum.BigInt,
+                callerFeeRate: SchemaVerifier_1.FieldTypeEnum.BigIntNotNegative,
+                frontingFeeRate: SchemaVerifier_1.FieldTypeEnum.BigIntNotNegative,
             });
             abortController.signal.throwIfAborted();
             if (actualParsedBody == null)
@@ -329,7 +337,7 @@ class SpvVaultSwapHandler extends SwapHandler_1.SwapHandler {
                 };
             const inputAmountAdjustments = req.paramReader.getExistingParamsOrNull({
                 amountUtxos: SchemaVerifier_1.FieldTypeEnum.AnyOptional,
-                amountFeeRate: SchemaVerifier_1.FieldTypeEnum.NumberOptional
+                amountFeeRate: SchemaVerifier_1.FieldTypeEnum.NumberPositiveOptional
             });
             if (inputAmountAdjustments == null)
                 throw {
@@ -630,25 +638,26 @@ class SpvVaultSwapHandler extends SwapHandler_1.SwapHandler {
                     msg: "Vault UTXO already spent, please get another quote and try again!"
                 };
             }
+            //Double-check the state to prevent race condition
+            if (swap.state !== SpvVaultSwap_1.SpvVaultSwapState.CREATED)
+                throw {
+                    code: 20505,
+                    msg: "Invalid quote ID, not found or expired!"
+                }; //Continues here is only synchronous code until the state change to SIGNED
             const unlock = swap.lock(120);
             if (!unlock)
                 throw {
                     code: 20517,
                     msg: "Bitcoin transaction submission already in progress, please retry later!"
                 };
+            const txId = signedTx.id;
             let swapSendingSet = false;
             let dataSendingSet = false;
             try {
                 const btcRawTx = Buffer.from(signedTx.toBytes(true, true)).toString("hex");
-                //Double-check the state to prevent race condition
-                if (swap.state !== SpvVaultSwap_1.SpvVaultSwapState.CREATED)
-                    throw {
-                        code: 20505,
-                        msg: "Invalid quote ID, not found or expired!"
-                    };
                 //Double check in-flight swap count
                 this.checkTooManyInflightSwaps();
-                swap.btcTxId = signedTx.id;
+                swap.btcTxId = txId;
                 swap.state = SpvVaultSwap_1.SpvVaultSwapState.SIGNED;
                 swap.sending = true;
                 swapSendingSet = true;
@@ -658,7 +667,7 @@ class SpvVaultSwapHandler extends SwapHandler_1.SwapHandler {
                 vault.addWithdrawal(data);
                 dataSendingSet = true;
                 await this.Vaults.saveVault(vault);
-                this.swapLogger.info(swap, "REST: /postQuote: BTC transaction signed, txId: " + swap.btcTxId);
+                this.swapLogger.info(swap, "REST: /postQuote: BTC transaction signed, txId: " + txId);
                 try {
                     await this.bitcoin.sendRawTransaction(btcRawTx);
                     await swap.setState(SpvVaultSwap_1.SpvVaultSwapState.SENT);
@@ -676,21 +685,45 @@ class SpvVaultSwapHandler extends SwapHandler_1.SwapHandler {
             catch (e) {
                 if (swapSendingSet)
                     swap.sending = false;
-                if (dataSendingSet) {
+                if (dataSendingSet)
                     data.sending = false;
-                    vault.removeWithdrawal(data);
-                    await this.Vaults.saveVault(vault);
-                }
-                //Check if the error is only because the state has already changed
-                if (!(0, Utils_1.isDefinedRuntimeError)(e) || e.code !== 20505) {
-                    //We only make the swap failed if the error happened in CREATED or SIGNED states
-                    if (swap.state === SpvVaultSwap_1.SpvVaultSwapState.CREATED || swap.state === SpvVaultSwap_1.SpvVaultSwapState.SIGNED) {
-                        if ((0, Utils_1.isDefinedRuntimeError)(e) && swap.metadata != null)
-                            swap.metadata.postQuoteError = e;
-                        await this.removeSwapData(swap, SpvVaultSwap_1.SpvVaultSwapState.FAILED);
+                //We only make the swap failed if the error happened in CREATED or SIGNED states
+                if (swap.state === SpvVaultSwap_1.SpvVaultSwapState.CREATED || swap.state === SpvVaultSwap_1.SpvVaultSwapState.SIGNED) {
+                    try {
+                        const fetchedBtcTx = await this.bitcoin.getWalletTransaction(txId);
+                        if (fetchedBtcTx == null) {
+                            if (dataSendingSet) {
+                                vault.removeWithdrawal(data);
+                                await this.Vaults.saveVault(vault);
+                            }
+                            if ((0, Utils_1.isDefinedRuntimeError)(e) && swap.metadata != null)
+                                swap.metadata.postQuoteError = e;
+                            await this.removeSwapData(swap, SpvVaultSwap_1.SpvVaultSwapState.FAILED);
+                            throw e; //This will get caught locally and throw the post quote error
+                        }
+                        else {
+                            //Transaction not-null set state to sent and fall through without throwing
+                            await swap.setState(SpvVaultSwap_1.SpvVaultSwapState.SENT);
+                        }
                     }
+                    catch (getTxErr) {
+                        if (getTxErr === e)
+                            throw e;
+                        //Cannot determine whether the bitcoin transaction was broadcasted or not
+                        // do nothing here and let the watchdog handle this!
+                        throw {
+                            _httpStatus: 200,
+                            code: 20001,
+                            msg: "Transaction status unknown",
+                            data: {
+                                txId: swap.btcTxId
+                            }
+                        };
+                    }
+                }
+                else {
+                    throw e;
                 }
-                throw e;
             }
             finally {
                 unlock();

package/dist/swaps/trusted/frombtcln_trusted/FromBtcLnTrusted.js

@@ -211,13 +211,9 @@ class FromBtcLnTrusted extends SwapHandler_1.SwapHandler {
                 }
             }).catch(e => this.swapLogger.error(invoiceData, "htlcReceived(): Error sending transfer txns", e));
             if (result == null) {
-                //Cancel invoice
-                await invoiceData.setState(FromBtcLnTrustedSwap_1.FromBtcLnTrustedSwapState.REFUNDED);
-                await this.storageManager.saveData(invoice.id, null, invoiceData);
-                await this.lightning.cancelHodlInvoice(invoice.id);
-                this.unsubscribeInvoice(invoice.id);
-                await this.removeSwapData(invoiceData);
-                this.swapLogger.info(invoiceData, "htlcReceived(): transaction sending failed, refunding lightning: ", invoiceData.pr);
+                this.swapLogger.info(invoiceData, "htlcReceived(): transaction sending failed: ", invoiceData.pr);
+                //Let the swap watchdog handle this case
+                unlock();
                 throw {
                     code: 20002,
                     msg: "Transaction sending failed"
@@ -235,14 +231,7 @@ class FromBtcLnTrusted extends SwapHandler_1.SwapHandler {
             if (invoiceData.isLocked())
                 return;
             const txStatus = await chainInterface.getTxStatus(invoiceData.scRawTx);
-            if (txStatus === "not_found") {
-                //Retry
-                invoiceData.txIds = { init: null };
-                invoiceData.scRawTx = null;
-                await invoiceData.setState(FromBtcLnTrustedSwap_1.FromBtcLnTrustedSwapState.RECEIVED);
-                await this.storageManager.saveData(invoice.id, null, invoiceData);
-            }
-            if (txStatus === "reverted") {
+            if (txStatus === "reverted" || txStatus === "not_found") {
                 //Cancel invoice
                 await invoiceData.setState(FromBtcLnTrustedSwap_1.FromBtcLnTrustedSwapState.REFUNDED);
                 await this.storageManager.saveData(invoice.id, null, invoiceData);

package/dist/utils/paramcoders/ParamDecoder.js

@@ -118,51 +118,8 @@ class ParamDecoder {
         const resultSchema = {};
         for (let fieldName in schema) {
             const val = await this.getParam(fieldName);
-            const type = schema[fieldName];
-            if (typeof (type) === "function") {
-                const result = type(val);
-                if (result == null)
-                    return null;
-                resultSchema[fieldName] = result;
-                continue;
-            }
-            if (val == null && type >= 100) {
-                resultSchema[fieldName] = null;
-                continue;
-            }
-            if (type === SchemaVerifier_1.FieldTypeEnum.Any || type === SchemaVerifier_1.FieldTypeEnum.AnyOptional) {
-                resultSchema[fieldName] = val;
-            }
-            else if (type === SchemaVerifier_1.FieldTypeEnum.Boolean || type === SchemaVerifier_1.FieldTypeEnum.BooleanOptional) {
-                if (typeof (val) !== "boolean")
-                    return null;
-                resultSchema[fieldName] = val;
-            }
-            else if (type === SchemaVerifier_1.FieldTypeEnum.Number || type === SchemaVerifier_1.FieldTypeEnum.NumberOptional) {
-                if (typeof (val) !== "number")
-                    return null;
-                if (isNaN(val))
-                    return null;
-                resultSchema[fieldName] = val;
-            }
-            else if (type === SchemaVerifier_1.FieldTypeEnum.BigInt || type === SchemaVerifier_1.FieldTypeEnum.BigIntOptional) {
-                const result = (0, SchemaVerifier_1.parseBigInt)(val);
-                if (result == null)
-                    return null;
-                resultSchema[fieldName] = result;
-            }
-            else if (type === SchemaVerifier_1.FieldTypeEnum.String || type === SchemaVerifier_1.FieldTypeEnum.StringOptional) {
-                if (typeof (val) !== "string")
-                    return null;
-                resultSchema[fieldName] = val;
-            }
-            else {
-                //Probably another request schema
-                const result = (0, SchemaVerifier_1.verifySchema)(val, type);
-                if (result == null)
-                    return null;
-                resultSchema[fieldName] = result;
-            }
+            if (!(0, SchemaVerifier_1.verifySchemaField)(val, schema[fieldName], fieldName, resultSchema))
+                return null;
         }
         return resultSchema;
     }
@@ -174,47 +131,8 @@ class ParamDecoder {
                 resultSchema[fieldName] = null;
                 continue;
             }
-            const type = schema[fieldName];
-            if (typeof (type) === "function") {
-                const result = type(val);
-                if (result == null)
-                    return null;
-                resultSchema[fieldName] = result;
-                continue;
-            }
-            if (type === SchemaVerifier_1.FieldTypeEnum.Any || type === SchemaVerifier_1.FieldTypeEnum.AnyOptional) {
-                resultSchema[fieldName] = val;
-            }
-            else if (type === SchemaVerifier_1.FieldTypeEnum.Boolean || type === SchemaVerifier_1.FieldTypeEnum.BooleanOptional) {
-                if (typeof (val) !== "boolean")
-                    return null;
-                resultSchema[fieldName] = val;
-            }
-            else if (type === SchemaVerifier_1.FieldTypeEnum.Number || type === SchemaVerifier_1.FieldTypeEnum.NumberOptional) {
-                if (typeof (val) !== "number")
-                    return null;
-                if (isNaN(val))
-                    return null;
-                resultSchema[fieldName] = val;
-            }
-            else if (type === SchemaVerifier_1.FieldTypeEnum.BigInt || type === SchemaVerifier_1.FieldTypeEnum.BigIntOptional) {
-                const result = (0, SchemaVerifier_1.parseBigInt)(val);
-                if (result == null)
-                    return null;
-                resultSchema[fieldName] = result;
-            }
-            else if (type === SchemaVerifier_1.FieldTypeEnum.String || type === SchemaVerifier_1.FieldTypeEnum.StringOptional) {
-                if (typeof (val) !== "string")
-                    return null;
-                resultSchema[fieldName] = val;
-            }
-            else {
-                //Probably another request schema
-                const result = (0, SchemaVerifier_1.verifySchema)(val, type);
-                if (result == null)
-                    return null;
-                resultSchema[fieldName] = result;
-            }
+            if (!(0, SchemaVerifier_1.verifySchemaField)(val, schema[fieldName], fieldName, resultSchema))
+                return null;
         }
         return resultSchema;
     }

package/dist/utils/paramcoders/SchemaVerifier.d.ts

@@ -5,17 +5,26 @@ export declare enum FieldTypeEnum {
     Number = 2,
     BigInt = 3,
     Any = 4,
+    BigIntPositive = 5,
+    BigIntNotNegative = 6,
+    NumberPositive = 7,
+    NumberNotNegative = 8,
     StringOptional = 100,
     BooleanOptional = 101,
     NumberOptional = 102,
     BigIntOptional = 103,
-    AnyOptional = 104
+    AnyOptional = 104,
+    BigIntPositiveOptional = 105,
+    BigIntNotNegativeOptional = 106,
+    NumberPositiveOptional = 107,
+    NumberNotNegativeOptional = 108
 }
-export type FieldType<T extends FieldTypeEnum | RequestSchema | ((val: any) => (string | boolean | number | bigint | any))> = T extends FieldTypeEnum.String ? string : T extends FieldTypeEnum.Boolean ? boolean : T extends FieldTypeEnum.Number ? number : T extends FieldTypeEnum.BigInt ? bigint : T extends FieldTypeEnum.Any ? any : T extends FieldTypeEnum.StringOptional ? string : T extends FieldTypeEnum.BooleanOptional ? boolean : T extends FieldTypeEnum.NumberOptional ? number : T extends FieldTypeEnum.BigIntOptional ? bigint : T extends FieldTypeEnum.AnyOptional ? any : T extends RequestSchema ? RequestSchemaResult<T> : T extends ((val: any) => string) ? string : T extends ((val: any) => boolean) ? boolean : T extends ((val: any) => number) ? number : T extends ((val: any) => bigint) ? bigint : T extends ((val: any) => any) ? any : never;
+export type FieldType<T extends FieldTypeEnum | RequestSchema | ((val: any) => (string | boolean | number | bigint | any))> = T extends FieldTypeEnum.String ? string : T extends FieldTypeEnum.Boolean ? boolean : T extends FieldTypeEnum.Number ? number : T extends FieldTypeEnum.NumberPositive ? number : T extends FieldTypeEnum.NumberNotNegative ? number : T extends FieldTypeEnum.BigInt ? bigint : T extends FieldTypeEnum.Any ? any : T extends FieldTypeEnum.BigIntPositive ? bigint : T extends FieldTypeEnum.BigIntNotNegative ? bigint : T extends FieldTypeEnum.StringOptional ? string : T extends FieldTypeEnum.BooleanOptional ? boolean : T extends FieldTypeEnum.NumberOptional ? number : T extends FieldTypeEnum.NumberPositiveOptional ? number : T extends FieldTypeEnum.NumberNotNegativeOptional ? number : T extends FieldTypeEnum.BigIntOptional ? bigint : T extends FieldTypeEnum.AnyOptional ? any : T extends FieldTypeEnum.BigIntPositiveOptional ? bigint : T extends FieldTypeEnum.BigIntNotNegativeOptional ? bigint : T extends RequestSchema ? RequestSchemaResult<T> : T extends ((val: any) => string) ? string : T extends ((val: any) => boolean) ? boolean : T extends ((val: any) => number) ? number : T extends ((val: any) => bigint) ? bigint : T extends ((val: any) => any) ? any : never;
 export type RequestSchemaResult<T extends RequestSchema> = {
     [key in keyof T]: FieldType<T[key]>;
 };
 export type RequestSchema = {
     [fieldName: string]: FieldTypeEnum | RequestSchema | ((val: any) => any);
 };
+export declare function verifySchemaField(val: any, type: FieldTypeEnum | RequestSchema | ((val: any) => any), fieldName: string, resultSchema: any): boolean;
 export declare function verifySchema<T extends RequestSchema>(req: any, schema: T): RequestSchemaResult<T>;