@atomiqlabs/lp-lib 14.0.0-dev.27 → 14.0.0-dev.29

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

@@ -628,21 +628,23 @@ class ToBtcAbs extends ToBtcBaseSwapHandler_1.ToBtcBaseSwapHandler {
                     msg: "Payment not found"
                 };
             await this.checkExpired(payment);
-            if (payment.state === ToBtcSwapAbs_1.ToBtcSwapState.COMMITED)
-                throw {
-                    _httpStatus: 200,
+            if (payment.state === ToBtcSwapAbs_1.ToBtcSwapState.COMMITED) {
+                res.status(200).json({
                     code: 20008,
                     msg: "Payment processing"
-                };
-            if (payment.state === ToBtcSwapAbs_1.ToBtcSwapState.BTC_SENT || payment.state === ToBtcSwapAbs_1.ToBtcSwapState.BTC_SENDING)
-                throw {
-                    _httpStatus: 200,
+                });
+                return;
+            }
+            if (payment.state === ToBtcSwapAbs_1.ToBtcSwapState.BTC_SENT || payment.state === ToBtcSwapAbs_1.ToBtcSwapState.BTC_SENDING) {
+                res.status(200).json({
                     code: 20006,
                     msg: "Already paid",
                     data: {
                         txId: payment.txId
                     }
-                };
+                });
+                return;
+            }
             const { swapContract, signer } = this.getChain(payment.chainIdentifier);
             if (payment.state === ToBtcSwapAbs_1.ToBtcSwapState.NON_PAYABLE) {
                 const isCommited = await swapContract.isCommited(payment.data);

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

@@ -811,21 +811,23 @@ class ToBtcLnAbs extends ToBtcBaseSwapHandler_1.ToBtcBaseSwapHandler {
                     code: 20007,
                     msg: "Payment not found"
                 };
-            if (payment.status === "pending")
-                throw {
-                    _httpStatus: 200,
+            if (payment.status === "pending") {
+                res.status(200).json({
                     code: 20008,
                     msg: "Payment in-flight"
-                };
-            if (payment.status === "confirmed")
-                throw {
-                    _httpStatus: 200,
+                });
+                return;
+            }
+            if (payment.status === "confirmed") {
+                res.status(200).json({
                     code: 20006,
                     msg: "Already paid",
                     data: {
                         secret: payment.secret
                     }
-                };
+                });
+                return;
+            }
             if (payment.status === "failed")
                 throw {
                     _httpStatus: 200,

package/dist/swaps/spv_vault_swap/SpvVaultSwapHandler.js

@@ -404,7 +404,7 @@ class SpvVaultSwapHandler extends SwapHandler_1.SwapHandler {
                     msg: "One or more PSBT inputs not finalized!"
                 };
             const effectiveFeeRate = await this.bitcoinRpc.getEffectiveFeeRate(await this.bitcoin.parsePsbt(signedTx));
-            if (Math.round(effectiveFeeRate.feeRate) < swap.btcFeeRate)
+            if (effectiveFeeRate.feeRate < 1 || Math.round(effectiveFeeRate.feeRate) < swap.btcFeeRate)
                 throw {
                     code: 20511,
                     msg: "Bitcoin transaction fee too low, expected minimum: " + swap.btcFeeRate + " adjusted effective fee rate: " + effectiveFeeRate.feeRate

package/package.json

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

package/src/swaps/escrow/tobtc_abstract/ToBtcAbs.ts

@@ -789,20 +789,24 @@ export class ToBtcAbs extends ToBtcBaseSwapHandler<ToBtcSwapAbs, ToBtcSwapState>
 
             await this.checkExpired(payment);
 
-            if (payment.state === ToBtcSwapState.COMMITED) throw {
-                _httpStatus: 200,
-                code: 20008,
-                msg: "Payment processing"
-            };
+            if (payment.state === ToBtcSwapState.COMMITED) {
+                res.status(200).json({
+                    code: 20008,
+                    msg: "Payment processing"
+                });
+                return;
+            }
 
-            if (payment.state === ToBtcSwapState.BTC_SENT || payment.state===ToBtcSwapState.BTC_SENDING) throw {
-                _httpStatus: 200,
-                code: 20006,
-                msg: "Already paid",
-                data: {
-                    txId: payment.txId
-                }
-            };
+            if (payment.state === ToBtcSwapState.BTC_SENT || payment.state===ToBtcSwapState.BTC_SENDING) {
+                res.status(200).json({
+                    code: 20006,
+                    msg: "Already paid",
+                    data: {
+                        txId: payment.txId
+                    }
+                });
+                return;
+            }
 
             const {swapContract, signer} = this.getChain(payment.chainIdentifier);
 

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

@@ -1057,20 +1057,24 @@ export class ToBtcLnAbs extends ToBtcBaseSwapHandler<ToBtcLnSwapAbs, ToBtcLnSwap
                 msg: "Payment not found"
             };
 
-            if(payment.status==="pending") throw {
-                _httpStatus: 200,
-                code: 20008,
-                msg: "Payment in-flight"
-            };
+            if(payment.status==="pending") {
+                res.status(200).json({
+                    code: 20008,
+                    msg: "Payment in-flight"
+                });
+                return;
+            }
 
-            if(payment.status==="confirmed") throw {
-                _httpStatus: 200,
-                code: 20006,
-                msg: "Already paid",
-                data: {
-                    secret: payment.secret
-                }
-            };
+            if(payment.status==="confirmed") {
+                res.status(200).json({
+                    code: 20006,
+                    msg: "Already paid",
+                    data: {
+                        secret: payment.secret
+                    }
+                });
+                return;
+            }
 
             if(payment.status==="failed") throw {
                 _httpStatus: 200,

package/src/swaps/spv_vault_swap/SpvVaultSwapHandler.ts

@@ -538,7 +538,7 @@ export class SpvVaultSwapHandler extends SwapHandler<SpvVaultSwap, SpvVaultSwapS
             };
 
             const effectiveFeeRate = await this.bitcoinRpc.getEffectiveFeeRate(await this.bitcoin.parsePsbt(signedTx));
-            if(Math.round(effectiveFeeRate.feeRate) < swap.btcFeeRate) throw {
+            if(effectiveFeeRate.feeRate < 1 || Math.round(effectiveFeeRate.feeRate) < swap.btcFeeRate) throw {
                 code: 20511,
                 msg: "Bitcoin transaction fee too low, expected minimum: "+swap.btcFeeRate+" adjusted effective fee rate: "+effectiveFeeRate.feeRate
             }