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

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

@@ -12,6 +12,7 @@ const ServerParamDecoder_1 = require("../../../utils/paramcoders/server/ServerPa
 const ToBtcBaseSwapHandler_1 = require("../ToBtcBaseSwapHandler");
 const promise_queue_ts_1 = require("promise-queue-ts");
 const OUTPUT_SCRIPT_MAX_LENGTH = 200;
+const MAX_PARALLEL_TX_PROCESSED = 10;
 /**
  * Handler for to BTC swaps, utilizing PTLCs (proof-time locked contracts) using btc relay (on-chain bitcoin SPV)
  */
@@ -170,22 +171,30 @@ class ToBtcAbs extends ToBtcBaseSwapHandler_1.ToBtcBaseSwapHandler {
      */
     async processBtcTxs() {
         const unsubscribeSwaps = [];
+        let promises = [];
         for (let txId in this.activeSubscriptions) {
             const swap = this.activeSubscriptions[txId];
             //TODO: RBF the transaction if it's already taking too long to confirm
-            try {
-                let tx = await this.bitcoin.getWalletTransaction(txId);
-                if (tx == null)
-                    continue;
-                if (await this.processBtcTx(swap, tx)) {
-                    this.swapLogger.info(swap, "processBtcTxs(): swap claimed successfully, txId: " + tx.txid + " address: " + swap.address);
-                    unsubscribeSwaps.push(swap);
+            promises.push((async () => {
+                try {
+                    let tx = await this.bitcoin.getWalletTransaction(txId);
+                    if (tx == null)
+                        return;
+                    if (await this.processBtcTx(swap, tx)) {
+                        this.swapLogger.info(swap, "processBtcTxs(): swap claimed successfully, txId: " + tx.txid + " address: " + swap.address);
+                        unsubscribeSwaps.push(swap);
+                    }
                 }
-            }
-            catch (e) {
-                this.swapLogger.error(swap, "processBtcTxs(): error processing btc transaction", e);
+                catch (e) {
+                    this.swapLogger.error(swap, "processBtcTxs(): error processing btc transaction", e);
+                }
+            })());
+            if (promises.length >= MAX_PARALLEL_TX_PROCESSED) {
+                await Promise.all(promises);
+                promises = [];
             }
         }
+        await Promise.all(promises);
         unsubscribeSwaps.forEach(swap => {
             this.unsubscribePayment(swap);
         });

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 (effectiveFeeRate.feeRate < swap.btcFeeRate)
+            if (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.25",
+  "version": "14.0.0-dev.27",
   "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

@@ -51,6 +51,8 @@ export type ToBtcRequestType = {
     exactIn?: boolean
 };
 
+const MAX_PARALLEL_TX_PROCESSED = 10;
+
 /**
  * Handler for to BTC swaps, utilizing PTLCs (proof-time locked contracts) using btc relay (on-chain bitcoin SPV)
  */
@@ -248,21 +250,29 @@ export class ToBtcAbs extends ToBtcBaseSwapHandler<ToBtcSwapAbs, ToBtcSwapState>
     private async processBtcTxs() {
         const unsubscribeSwaps: ToBtcSwapAbs[] = [];
 
+        let promises: Promise<void>[] = [];
         for(let txId in this.activeSubscriptions) {
             const swap: ToBtcSwapAbs = this.activeSubscriptions[txId];
             //TODO: RBF the transaction if it's already taking too long to confirm
-            try {
-                let tx: BtcTx = await this.bitcoin.getWalletTransaction(txId);
-                if(tx==null) continue;
-
-                if(await this.processBtcTx(swap, tx)) {
-                    this.swapLogger.info(swap, "processBtcTxs(): swap claimed successfully, txId: "+tx.txid+" address: "+swap.address);
-                    unsubscribeSwaps.push(swap);
+            promises.push((async () => {
+                try {
+                    let tx: BtcTx = await this.bitcoin.getWalletTransaction(txId);
+                    if(tx==null) return;
+
+                    if(await this.processBtcTx(swap, tx)) {
+                        this.swapLogger.info(swap, "processBtcTxs(): swap claimed successfully, txId: "+tx.txid+" address: "+swap.address);
+                        unsubscribeSwaps.push(swap);
+                    }
+                } catch (e) {
+                    this.swapLogger.error(swap, "processBtcTxs(): error processing btc transaction", e);
                 }
-            } catch (e) {
-                this.swapLogger.error(swap, "processBtcTxs(): error processing btc transaction", e);
+            })());
+            if(promises.length >= MAX_PARALLEL_TX_PROCESSED) {
+                await Promise.all(promises);
+                promises = [];
             }
         }
+        await Promise.all(promises);
 
         unsubscribeSwaps.forEach(swap => {
             this.unsubscribePayment(swap);

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(effectiveFeeRate.feeRate < swap.btcFeeRate) throw {
+            if(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
             }