@atomiqlabs/lp-lib 14.0.0-dev.30 → 14.0.0-dev.32

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

@@ -5,7 +5,6 @@ import { ISwapPrice } from "../../../prices/ISwapPrice";
 import { BtcTx, ChainSwapType, ClaimEvent, InitializeEvent, RefundEvent, SwapData, BitcoinRpc, BtcBlock } from "@atomiqlabs/base";
 import { IIntermediaryStorage } from "../../../storage/IIntermediaryStorage";
 import { ToBtcBaseConfig, ToBtcBaseSwapHandler } from "../ToBtcBaseSwapHandler";
-import { PromiseQueue } from "promise-queue-ts";
 import { IBitcoinWallet } from "../../../wallets/IBitcoinWallet";
 export type ToBtcConfig = ToBtcBaseConfig & {
     sendSafetyFactor: bigint;
@@ -38,7 +37,6 @@ export declare class ToBtcAbs extends ToBtcBaseSwapHandler<ToBtcSwapAbs, ToBtcSw
     };
     bitcoinRpc: BitcoinRpc<BtcBlock>;
     bitcoin: IBitcoinWallet;
-    sendBtcQueue: PromiseQueue;
     readonly config: ToBtcConfig;
     constructor(storageDirectory: IIntermediaryStorage<ToBtcSwapAbs>, path: string, chainData: MultichainData, bitcoin: IBitcoinWallet, swapPricing: ISwapPrice, bitcoinRpc: BitcoinRpc<BtcBlock>, config: ToBtcConfig);
     /**

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

@@ -10,7 +10,6 @@ const crypto_1 = require("crypto");
 const SchemaVerifier_1 = require("../../../utils/paramcoders/SchemaVerifier");
 const ServerParamDecoder_1 = require("../../../utils/paramcoders/server/ServerParamDecoder");
 const ToBtcBaseSwapHandler_1 = require("../ToBtcBaseSwapHandler");
-const promise_queue_ts_1 = require("promise-queue-ts");
 const BitcoinUtils_1 = require("../../../utils/BitcoinUtils");
 const OUTPUT_SCRIPT_MAX_LENGTH = 200;
 const MAX_PARALLEL_TX_PROCESSED = 10;
@@ -23,7 +22,6 @@ class ToBtcAbs extends ToBtcBaseSwapHandler_1.ToBtcBaseSwapHandler {
         this.type = SwapHandler_1.SwapHandlerType.TO_BTC;
         this.swapType = base_1.ChainSwapType.CHAIN_NONCED;
         this.activeSubscriptions = {};
-        this.sendBtcQueue = new promise_queue_ts_1.PromiseQueue();
         this.bitcoinRpc = bitcoinRpc;
         this.bitcoin = bitcoin;
         this.config = config;
@@ -269,7 +267,7 @@ class ToBtcAbs extends ToBtcBaseSwapHandler_1.ToBtcBaseSwapHandler {
     sendBitcoinPayment(swap) {
         //Make sure that bitcoin payouts are processed sequentially to avoid race conditions between multiple payouts,
         // e.g. that 2 payouts share the same input and would effectively double-spend each other
-        return this.sendBtcQueue.enqueue(async () => {
+        return this.bitcoin.execute(async () => {
             //Run checks
             this.checkExpiresTooSoon(swap);
             if (swap.metadata != null)

package/dist/swaps/spv_vault_swap/SpvVaults.js

@@ -80,35 +80,40 @@ class SpvVaults {
             const address = await this.vaultSigner.getAddress(chainId, vaultId);
             vaultAddreses.push({ vaultId, address });
         }
-        //Construct transaction
-        const txResult = await this.bitcoin.getSignedMultiTransaction(vaultAddreses.map(val => {
-            return { address: val.address, amount: exports.VAULT_DUST_AMOUNT };
-        }), feeRate);
         const nativeToken = chainInterface.getNativeCurrencyAddress();
-        const vaults = await Promise.all(vaultAddreses.map(async (val, index) => {
-            const vaultData = await spvVaultContract.createVaultData(signerAddress, val.vaultId, txResult.txId + ":" + index, confirmations, [
-                { token, multiplier: tokenMultipliers?.[token] ?? 1n },
-                { token: nativeToken, multiplier: tokenMultipliers?.[nativeToken] ?? 1n }
-            ]);
-            return new SpvVault_1.SpvVault(chainId, vaultData, val.address);
-        }));
-        //Save vaults
-        if (this.vaultStorage.saveDataArr != null) {
-            await this.vaultStorage.saveDataArr(vaults.map(val => {
-                return { id: val.getIdentifier(), object: val };
+        let txId = null;
+        let vaults = null;
+        await this.bitcoin.execute(async () => {
+            //Construct transaction
+            const txResult = await this.bitcoin.getSignedMultiTransaction(vaultAddreses.map(val => {
+                return { address: val.address, amount: exports.VAULT_DUST_AMOUNT };
+            }), feeRate);
+            vaults = await Promise.all(vaultAddreses.map(async (val, index) => {
+                const vaultData = await spvVaultContract.createVaultData(signerAddress, val.vaultId, txResult.txId + ":" + index, confirmations, [
+                    { token, multiplier: tokenMultipliers?.[token] ?? 1n },
+                    { token: nativeToken, multiplier: tokenMultipliers?.[nativeToken] ?? 1n }
+                ]);
+                return new SpvVault_1.SpvVault(chainId, vaultData, val.address);
             }));
-        }
-        else {
-            for (let vault of vaults) {
-                await this.vaultStorage.saveData(vault.getIdentifier(), vault);
+            //Save vaults
+            if (this.vaultStorage.saveDataArr != null) {
+                await this.vaultStorage.saveDataArr(vaults.map(val => {
+                    return { id: val.getIdentifier(), object: val };
+                }));
             }
-        }
-        //Send bitcoin tx
-        await this.bitcoin.sendRawTransaction(txResult.raw);
-        this.logger.info("createVaults(): Funding " + count + " vaults, bitcoin txId: " + txResult.txId);
+            else {
+                for (let vault of vaults) {
+                    await this.vaultStorage.saveData(vault.getIdentifier(), vault);
+                }
+            }
+            //Send bitcoin tx
+            await this.bitcoin.sendRawTransaction(txResult.raw);
+            txId = txResult.txId;
+        });
+        this.logger.info("createVaults(): Funding " + count + " vaults, bitcoin txId: " + txId);
         return {
             vaultsCreated: vaults.map(val => val.data.getVaultId()),
-            btcTxId: txResult.txId
+            btcTxId: txId
         };
     }
     async listVaults(chainId, token) {

package/dist/wallets/IBitcoinWallet.d.ts

@@ -64,4 +64,11 @@ export interface IBitcoinWallet {
     parsePsbt(psbt: Transaction): Promise<BtcTx>;
     getBlockheight(): Promise<number>;
     getFeeRate(): Promise<number>;
+    /**
+     * Post a task to be executed on the sequential thread of the wallet, this makes sure the UTXOs stay consistent during
+     *  operation, it is recommended to use this approach when spending wallet UTXOs
+     *
+     * @param executor
+     */
+    execute(executor: () => Promise<void>): Promise<void>;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atomiqlabs/lp-lib",
-  "version": "14.0.0-dev.30",
+  "version": "14.0.0-dev.32",
   "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

@@ -21,7 +21,6 @@ import {serverParamDecoder} from "../../../utils/paramcoders/server/ServerParamD
 import {IParamReader} from "../../../utils/paramcoders/IParamReader";
 import {ServerParamEncoder} from "../../../utils/paramcoders/server/ServerParamEncoder";
 import {ToBtcBaseConfig, ToBtcBaseSwapHandler} from "../ToBtcBaseSwapHandler";
-import {PromiseQueue} from "promise-queue-ts";
 import {IBitcoinWallet} from "../../../wallets/IBitcoinWallet";
 import {checkTransactionReplaced} from "../../../utils/BitcoinUtils";
 
@@ -64,7 +63,6 @@ export class ToBtcAbs extends ToBtcBaseSwapHandler<ToBtcSwapAbs, ToBtcSwapState>
     activeSubscriptions: {[txId: string]: ToBtcSwapAbs} = {};
     bitcoinRpc: BitcoinRpc<BtcBlock>;
     bitcoin: IBitcoinWallet;
-    sendBtcQueue: PromiseQueue = new PromiseQueue();
 
     readonly config: ToBtcConfig;
 
@@ -351,7 +349,7 @@ export class ToBtcAbs extends ToBtcBaseSwapHandler<ToBtcSwapAbs, ToBtcSwapState>
     private sendBitcoinPayment(swap: ToBtcSwapAbs) {
         //Make sure that bitcoin payouts are processed sequentially to avoid race conditions between multiple payouts,
         // e.g. that 2 payouts share the same input and would effectively double-spend each other
-        return this.sendBtcQueue.enqueue<void>(async () => {
+        return this.bitcoin.execute(async () => {
             //Run checks
             this.checkExpiresTooSoon(swap);
             if(swap.metadata!=null) swap.metadata.times.payCLTVChecked = Date.now();

package/src/swaps/spv_vault_swap/SpvVaults.ts

@@ -115,40 +115,46 @@ export class SpvVaults {
             vaultAddreses.push({vaultId, address});
         }
 
-        //Construct transaction
-        const txResult = await this.bitcoin.getSignedMultiTransaction(vaultAddreses.map(val => {
-            return {address: val.address, amount: VAULT_DUST_AMOUNT}
-        }), feeRate);
-
         const nativeToken = chainInterface.getNativeCurrencyAddress();
 
-        const vaults = await Promise.all(vaultAddreses.map(async (val, index) => {
-            const vaultData = await spvVaultContract.createVaultData(signerAddress, val.vaultId, txResult.txId+":"+index, confirmations, [
-                {token, multiplier: tokenMultipliers?.[token] ?? 1n},
-                {token: nativeToken, multiplier: tokenMultipliers?.[nativeToken] ?? 1n}
-            ]);
-            return new SpvVault(chainId, vaultData, val.address);
-        }));
-
-        //Save vaults
-        if(this.vaultStorage.saveDataArr!=null) {
-            await this.vaultStorage.saveDataArr(vaults.map(val => {
-                return {id: val.getIdentifier(), object: val}
+        let txId: string = null;
+        let vaults: SpvVault[] = null;
+        await this.bitcoin.execute(async () => {
+            //Construct transaction
+            const txResult = await this.bitcoin.getSignedMultiTransaction(vaultAddreses.map(val => {
+                return {address: val.address, amount: VAULT_DUST_AMOUNT}
+            }), feeRate);
+
+            vaults = await Promise.all(vaultAddreses.map(async (val, index) => {
+                const vaultData = await spvVaultContract.createVaultData(signerAddress, val.vaultId, txResult.txId+":"+index, confirmations, [
+                    {token, multiplier: tokenMultipliers?.[token] ?? 1n},
+                    {token: nativeToken, multiplier: tokenMultipliers?.[nativeToken] ?? 1n}
+                ]);
+                return new SpvVault(chainId, vaultData, val.address);
             }));
-        } else {
-            for(let vault of vaults) {
-                await this.vaultStorage.saveData(vault.getIdentifier(), vault);
+
+            //Save vaults
+            if(this.vaultStorage.saveDataArr!=null) {
+                await this.vaultStorage.saveDataArr(vaults.map(val => {
+                    return {id: val.getIdentifier(), object: val}
+                }));
+            } else {
+                for(let vault of vaults) {
+                    await this.vaultStorage.saveData(vault.getIdentifier(), vault);
+                }
             }
-        }
 
-        //Send bitcoin tx
-        await this.bitcoin.sendRawTransaction(txResult.raw);
+            //Send bitcoin tx
+            await this.bitcoin.sendRawTransaction(txResult.raw);
+
+            txId = txResult.txId;
+        });
 
-        this.logger.info("createVaults(): Funding "+count+" vaults, bitcoin txId: "+txResult.txId);
+        this.logger.info("createVaults(): Funding "+count+" vaults, bitcoin txId: "+txId);
 
         return {
             vaultsCreated: vaults.map(val => val.data.getVaultId()),
-            btcTxId: txResult.txId
+            btcTxId: txId
         };
     }
 

package/src/wallets/IBitcoinWallet.ts

@@ -66,4 +66,12 @@ export interface IBitcoinWallet {
     getBlockheight(): Promise<number>;
     getFeeRate(): Promise<number>;
 
+    /**
+     * Post a task to be executed on the sequential thread of the wallet, this makes sure the UTXOs stay consistent during
+     *  operation, it is recommended to use this approach when spending wallet UTXOs
+     *
+     * @param executor
+     */
+    execute(executor: () => Promise<void>): Promise<void>;
+
 }