@atomiqlabs/lp-lib 15.0.9 → 15.0.11

package/dist/plugins/IPlugin.d.ts

@@ -1,5 +1,5 @@
 import { BitcoinRpc } from "@atomiqlabs/base";
-import { FromBtcLnRequestType, FromBtcRequestType, FromBtcTrustedRequestType, ISwapPrice, MultichainData, RequestData, SpvVaultSwapRequestType, SwapHandler, SwapHandlerType, ToBtcLnRequestType, ToBtcRequestType } from "..";
+import { FromBtcLnRequestType, FromBtcRequestType, FromBtcTrustedRequestType, ISwapPrice, MultichainData, RequestData, SpvVaultPostQuote, SpvVaultSwap, SpvVaultSwapRequestType, SwapHandler, SwapHandlerType, ToBtcLnRequestType, ToBtcRequestType } from "..";
 import { SwapHandlerSwap } from "../swaps/SwapHandlerSwap";
 import { Command } from "@atomiqlabs/server-base";
 import { FromBtcLnTrustedRequestType } from "../swaps/trusted/frombtcln_trusted/FromBtcLnTrusted";
@@ -128,6 +128,7 @@ export interface IPlugin {
         feePPM: bigint;
         networkFeeGetter: (amount: bigint) => Promise<bigint>;
     }): Promise<QuoteThrow | QuoteSetFees | QuoteAmountTooLow | QuoteAmountTooHigh | ToBtcPluginQuote>;
+    onHandlePostedFromBtcQuote?(swapType: SwapHandlerType.FROM_BTC_SPV, request: RequestData<SpvVaultPostQuote>, swap: SpvVaultSwap): Promise<QuoteThrow | null>;
     onVaultSelection?(chainIdentifier: string, totalSats: bigint, requestedAmount: {
         amount: bigint;
         token: string;

package/dist/plugins/PluginManager.d.ts

@@ -1,6 +1,6 @@
 import { BitcoinRpc, SwapData } from "@atomiqlabs/base";
 import { IPlugin, PluginQuote, QuoteAmountTooHigh, QuoteAmountTooLow, QuoteSetFees, QuoteThrow, ToBtcPluginQuote } from "./IPlugin";
-import { FromBtcLnRequestType, FromBtcRequestType, FromBtcTrustedRequestType, ISwapPrice, MultichainData, RequestData, SpvVaultSwapRequestType, SwapHandler, SwapHandlerType, ToBtcLnRequestType, ToBtcRequestType } from "..";
+import { FromBtcLnRequestType, FromBtcRequestType, FromBtcTrustedRequestType, ISwapPrice, MultichainData, RequestData, SpvVaultPostQuote, SpvVaultSwap, SpvVaultSwapRequestType, SwapHandler, SwapHandlerType, ToBtcLnRequestType, ToBtcRequestType } from "..";
 import { SwapHandlerSwap } from "../swaps/SwapHandlerSwap";
 import { FromBtcLnTrustedRequestType } from "../swaps/trusted/frombtcln_trusted/FromBtcLnTrusted";
 import { IBitcoinWallet } from "../wallets/IBitcoinWallet";
@@ -101,6 +101,7 @@ export declare class PluginManager {
         baseFeeInBtc: bigint;
         feePPM: bigint;
     }): Promise<QuoteThrow | QuoteSetFees | QuoteAmountTooLow | QuoteAmountTooHigh>;
+    static onHandlePostedFromBtcQuote(swapType: SwapHandlerType.FROM_BTC_SPV, request: RequestData<SpvVaultPostQuote>, swap: SpvVaultSwap): Promise<QuoteThrow | null>;
     static onVaultSelection(chainIdentifier: string, totalSats: bigint, requestedAmount: {
         amount: bigint;
         token: string;

package/dist/plugins/PluginManager.js

@@ -214,6 +214,21 @@ class PluginManager {
         }
         return null;
     }
+    static async onHandlePostedFromBtcQuote(swapType, request, swap) {
+        for (let plugin of PluginManager.plugins.values()) {
+            try {
+                if (plugin.onHandlePostedFromBtcQuote != null) {
+                    const result = await plugin.onHandlePostedFromBtcQuote(swapType, request, swap);
+                    if (result != null && (0, IPlugin_1.isQuoteThrow)(result))
+                        return result;
+                }
+            }
+            catch (e) {
+                pluginLogger.error(plugin, "onHandlePostedFromBtcQuote(): plugin error", e);
+            }
+        }
+        return null;
+    }
     static async onVaultSelection(chainIdentifier, totalSats, requestedAmount, gasAmount) {
         for (let plugin of PluginManager.plugins.values()) {
             try {

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

@@ -309,7 +309,7 @@ class ToBtcAbs extends ToBtcBaseSwapHandler_1.ToBtcBaseSwapHandler {
             if (swap.sending)
                 return;
             //Bitcoin transaction was signed (maybe also sent)
-            const tx = await (0, BitcoinUtils_1.checkTransactionReplaced)(swap.txId, swap.btcRawTx, this.bitcoin);
+            const tx = await (0, BitcoinUtils_1.checkTransactionReplaced)(swap.txId, swap.btcRawTx, this.bitcoinRpc);
             const isTxSent = tx != null;
             if (!isTxSent) {
                 //Reset the state to COMMITED

package/dist/swaps/spv_vault_swap/SpvVaultSwapHandler.js

@@ -13,6 +13,7 @@ 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 AmountAssertions_1 = require("../assertions/AmountAssertions");
 const TX_MAX_VSIZE = 16 * 1024;
 class SpvVaultSwapHandler extends SwapHandler_1.SwapHandler {
     constructor(storageDirectory, vaultStorage, path, chainsData, swapPricing, bitcoin, bitcoinRpc, spvVaultSigner, config) {
@@ -105,7 +106,7 @@ class SpvVaultSwapHandler extends SwapHandler_1.SwapHandler {
             const foundWithdrawal = vault.pendingWithdrawals.find(val => val.btcTx.txid === swap.btcTxId);
             let tx = foundWithdrawal?.btcTx;
             if (tx == null)
-                tx = await this.bitcoin.getWalletTransaction(swap.btcTxId);
+                tx = await this.bitcoinRpc.getTransaction(swap.btcTxId);
             if (tx == null) {
                 await this.removeSwapData(swap, SpvVaultSwap_1.SpvVaultSwapState.FAILED);
                 return;
@@ -128,7 +129,7 @@ class SpvVaultSwapHandler extends SwapHandler_1.SwapHandler {
             const foundWithdrawal = vault.pendingWithdrawals.find(val => val.btcTx.txid === swap.btcTxId);
             let tx = foundWithdrawal?.btcTx;
             if (tx == null)
-                tx = await this.bitcoin.getWalletTransaction(swap.btcTxId);
+                tx = await this.bitcoinRpc.getTransaction(swap.btcTxId);
             if (tx == null) {
                 await this.removeSwapData(swap, SpvVaultSwap_1.SpvVaultSwapState.DOUBLE_SPENT);
                 return;
@@ -343,6 +344,8 @@ class SpvVaultSwapHandler extends SwapHandler_1.SwapHandler {
                     msg: "Used vault not found!"
                 };
             }
+            //Check the posted quote with the plugins
+            AmountAssertions_1.AmountAssertions.handlePluginErrorResponses(await PluginManager_1.PluginManager.onHandlePostedFromBtcQuote(this.type, { chainIdentifier: swap.chainIdentifier, raw: req, parsed: parsedBody, metadata }, swap));
             //Try parse psbt
             let transaction;
             try {

package/dist/swaps/spv_vault_swap/SpvVaults.js

@@ -330,7 +330,7 @@ class SpvVaults {
                     if (pendingWithdrawal.sending)
                         continue;
                     //Check all the pending withdrawals that were not finalized yet
-                    const btcTx = await (0, BitcoinUtils_1.checkTransactionReplacedRpc)(pendingWithdrawal.btcTx.txid, pendingWithdrawal.btcTx.raw, this.bitcoinRpc);
+                    const btcTx = await (0, BitcoinUtils_1.checkTransactionReplaced)(pendingWithdrawal.btcTx.txid, pendingWithdrawal.btcTx.raw, this.bitcoinRpc);
                     if (btcTx == null) {
                         //Probable double-spend, remove from pending withdrawals
                         if (!vault.doubleSpendPendingWithdrawal(pendingWithdrawal)) {

package/dist/swaps/trusted/frombtc_trusted/FromBtcTrusted.js

@@ -608,7 +608,7 @@ class FromBtcTrusted extends SwapHandler_1.SwapHandler {
     }
     async checkDoubleSpends() {
         for (let swap of this.doubleSpendWatchdogSwaps.keys()) {
-            const tx = await this.bitcoin.getWalletTransaction(swap.txId);
+            const tx = await this.bitcoinRpc.getTransaction(swap.txId);
             if (tx == null) {
                 this.swapLogger.debug(swap, "checkDoubleSpends(): Swap was double spent, burning... - original txId: " + swap.txId);
                 this.processPastSwap(swap, null, null);

package/dist/utils/BitcoinUtils.d.ts

@@ -1,6 +1,4 @@
 import { TransactionInput } from "@scure/btc-signer/psbt";
 import { BitcoinRpc, BtcTx } from "@atomiqlabs/base";
-import { IBitcoinWallet } from "../wallets/IBitcoinWallet";
 export declare function isLegacyInput(input: TransactionInput): boolean;
-export declare function checkTransactionReplaced(txId: string, txRaw: string, bitcoin: IBitcoinWallet): Promise<BtcTx>;
-export declare function checkTransactionReplacedRpc(txId: string, txRaw: string, bitcoin: BitcoinRpc<any>): Promise<BtcTx>;
+export declare function checkTransactionReplaced(txId: string, txRaw: string, bitcoin: BitcoinRpc<any>): Promise<BtcTx>;

package/dist/utils/BitcoinUtils.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.checkTransactionReplacedRpc = exports.checkTransactionReplaced = exports.isLegacyInput = void 0;
+exports.checkTransactionReplaced = exports.isLegacyInput = void 0;
 const utxo_1 = require("@scure/btc-signer/utxo");
 const btc_signer_1 = require("@scure/btc-signer");
 const Utils_1 = require("./Utils");
@@ -46,20 +46,6 @@ function isLegacyInput(input) {
 }
 exports.isLegacyInput = isLegacyInput;
 async function checkTransactionReplaced(txId, txRaw, bitcoin) {
-    const existingTx = await bitcoin.getWalletTransaction(txId);
-    if (existingTx != null)
-        return existingTx;
-    //Try to re-broadcast
-    try {
-        await bitcoin.sendRawTransaction(txRaw);
-    }
-    catch (e) {
-        logger.error("checkTransactionReplaced(" + txId + "): Error when trying to re-broadcast raw transaction: ", e);
-    }
-    return await bitcoin.getWalletTransaction(txId);
-}
-exports.checkTransactionReplaced = checkTransactionReplaced;
-async function checkTransactionReplacedRpc(txId, txRaw, bitcoin) {
     const existingTx = await bitcoin.getTransaction(txId);
     if (existingTx != null)
         return existingTx;
@@ -72,4 +58,4 @@ async function checkTransactionReplacedRpc(txId, txRaw, bitcoin) {
     }
     return await bitcoin.getTransaction(txId);
 }
-exports.checkTransactionReplacedRpc = checkTransactionReplacedRpc;
+exports.checkTransactionReplaced = checkTransactionReplaced;

package/package.json

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

package/src/plugins/IPlugin.ts

@@ -1,8 +1,8 @@
-import {BitcoinRpc, SpvWithdrawalTransactionData, SwapData} from "@atomiqlabs/base";
+import {BitcoinRpc} from "@atomiqlabs/base";
 import {
     FromBtcLnRequestType,
     FromBtcRequestType, FromBtcTrustedRequestType,
-    ISwapPrice, MultichainData, RequestData, SpvVaultSwapRequestType,
+    ISwapPrice, MultichainData, RequestData, SpvVaultPostQuote, SpvVaultSwap, SpvVaultSwapRequestType,
     SwapHandler, SwapHandlerType,
     ToBtcLnRequestType,
     ToBtcRequestType
@@ -151,6 +151,12 @@ export interface IPlugin {
         fees: {baseFeeInBtc: bigint, feePPM: bigint, networkFeeGetter: (amount: bigint) => Promise<bigint>}
     ): Promise<QuoteThrow | QuoteSetFees | QuoteAmountTooLow | QuoteAmountTooHigh | ToBtcPluginQuote>;
 
+    onHandlePostedFromBtcQuote?(
+        swapType: SwapHandlerType.FROM_BTC_SPV,
+        request: RequestData<SpvVaultPostQuote>,
+        swap: SpvVaultSwap
+    ): Promise<QuoteThrow | null>;
+
     onVaultSelection?(
         chainIdentifier: string,
         totalSats: bigint,

package/src/plugins/PluginManager.ts

@@ -1,4 +1,4 @@
-import {BitcoinRpc, SpvWithdrawalTransactionData, SwapData} from "@atomiqlabs/base";
+import {BitcoinRpc, SwapData} from "@atomiqlabs/base";
 import {
     IPlugin, isPluginQuote, isQuoteAmountTooHigh, isQuoteAmountTooLow, isQuoteSetFees,
     isQuoteThrow, isToBtcPluginQuote, PluginQuote,
@@ -10,7 +10,7 @@ import {
 import {
     FromBtcLnRequestType,
     FromBtcRequestType, FromBtcTrustedRequestType,
-    ISwapPrice, MultichainData, RequestData, SpvVaultSwapRequestType,
+    ISwapPrice, MultichainData, RequestData, SpvVaultPostQuote, SpvVaultSwap, SpvVaultSwapRequestType,
     SwapHandler, SwapHandlerType,
     ToBtcLnRequestType,
     ToBtcRequestType
@@ -291,6 +291,24 @@ export class PluginManager {
         return null;
     }
 
+    static async onHandlePostedFromBtcQuote(
+        swapType: SwapHandlerType.FROM_BTC_SPV,
+        request: RequestData<SpvVaultPostQuote>,
+        swap: SpvVaultSwap
+    ): Promise<QuoteThrow | null> {
+        for(let plugin of PluginManager.plugins.values()) {
+            try {
+                if(plugin.onHandlePostedFromBtcQuote!=null) {
+                    const result = await plugin.onHandlePostedFromBtcQuote(swapType, request, swap);
+                    if(result!=null && isQuoteThrow(result)) return result;
+                }
+            } catch (e) {
+                pluginLogger.error(plugin, "onHandlePostedFromBtcQuote(): plugin error", e);
+            }
+        }
+        return null;
+    }
+
     static async onVaultSelection(
         chainIdentifier: string,
         totalSats: bigint,

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

@@ -396,7 +396,7 @@ export class ToBtcAbs extends ToBtcBaseSwapHandler<ToBtcSwapAbs, ToBtcSwapState>
         if(swap.state===ToBtcSwapState.BTC_SENDING) {
             if(swap.sending) return;
             //Bitcoin transaction was signed (maybe also sent)
-            const tx = await checkTransactionReplaced(swap.txId, swap.btcRawTx, this.bitcoin);
+            const tx = await checkTransactionReplaced(swap.txId, swap.btcRawTx, this.bitcoinRpc);
 
             const isTxSent = tx!=null;
             if(!isTxSent) {

package/src/swaps/spv_vault_swap/SpvVaultSwapHandler.ts

@@ -27,9 +27,10 @@ import {ServerParamEncoder} from "../../utils/paramcoders/server/ServerParamEnco
 import {FieldTypeEnum} from "../../utils/paramcoders/SchemaVerifier";
 import {FromBtcAmountAssertions} from "../assertions/FromBtcAmountAssertions";
 import {randomBytes} from "crypto";
-import {getInputType, OutScript, Transaction} from "@scure/btc-signer";
+import {Transaction} from "@scure/btc-signer";
 import {SpvVaults, VAULT_DUST_AMOUNT} from "./SpvVaults";
-import {checkTransactionReplaced, isLegacyInput} from "../../utils/BitcoinUtils";
+import {isLegacyInput} from "../../utils/BitcoinUtils";
+import {AmountAssertions} from "../assertions/AmountAssertions";
 
 export type SpvVaultSwapHandlerConfig = SwapBaseConfig & {
     vaultsCheckInterval: number,
@@ -170,7 +171,7 @@ export class SpvVaultSwapHandler extends SwapHandler<SpvVaultSwap, SpvVaultSwapS
             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) tx = await this.bitcoin.getWalletTransaction(swap.btcTxId);
+            if(tx==null) tx = await this.bitcoinRpc.getTransaction(swap.btcTxId);
 
             if(tx==null) {
                 await this.removeSwapData(swap, SpvVaultSwapState.FAILED);
@@ -191,7 +192,7 @@ export class SpvVaultSwapHandler extends SwapHandler<SpvVaultSwap, SpvVaultSwapS
             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) tx = await this.bitcoin.getWalletTransaction(swap.btcTxId);
+            if(tx==null) tx = await this.bitcoinRpc.getTransaction(swap.btcTxId);
 
             if(tx==null) {
                 await this.removeSwapData(swap, SpvVaultSwapState.DOUBLE_SPENT);
@@ -470,6 +471,13 @@ export class SpvVaultSwapHandler extends SwapHandler<SpvVaultSwap, SpvVaultSwapS
                 };
             }
 
+            //Check the posted quote with the plugins
+            AmountAssertions.handlePluginErrorResponses(await PluginManager.onHandlePostedFromBtcQuote(
+                this.type,
+                {chainIdentifier: swap.chainIdentifier, raw: req, parsed: parsedBody, metadata},
+                swap
+            ));
+
             //Try parse psbt
             let transaction: Transaction;
             try {

package/src/swaps/spv_vault_swap/SpvVaults.ts

@@ -15,7 +15,7 @@ import {ISpvVaultSigner} from "../../wallets/ISpvVaultSigner";
 import {AmountAssertions} from "../assertions/AmountAssertions";
 import {ChainData} from "../SwapHandler";
 import {Transaction} from "@scure/btc-signer";
-import {checkTransactionReplacedRpc} from "../../utils/BitcoinUtils";
+import {checkTransactionReplaced} from "../../utils/BitcoinUtils";
 
 export const VAULT_DUST_AMOUNT = 600;
 const VAULT_INIT_CONFIRMATIONS = 2;
@@ -389,7 +389,7 @@ export class SpvVaults {
                     if(pendingWithdrawal.sending) continue;
 
                     //Check all the pending withdrawals that were not finalized yet
-                    const btcTx = await checkTransactionReplacedRpc(pendingWithdrawal.btcTx.txid, pendingWithdrawal.btcTx.raw, this.bitcoinRpc);
+                    const btcTx = await checkTransactionReplaced(pendingWithdrawal.btcTx.txid, pendingWithdrawal.btcTx.raw, this.bitcoinRpc);
                     if(btcTx==null) {
                         //Probable double-spend, remove from pending withdrawals
                         if(!vault.doubleSpendPendingWithdrawal(pendingWithdrawal)) {

package/src/swaps/trusted/frombtc_trusted/FromBtcTrusted.ts

@@ -702,7 +702,7 @@ export class FromBtcTrusted extends SwapHandler<FromBtcTrustedSwap, FromBtcTrust
 
     private async checkDoubleSpends(): Promise<void> {
         for(let swap of this.doubleSpendWatchdogSwaps.keys()) {
-            const tx = await this.bitcoin.getWalletTransaction(swap.txId);
+            const tx = await this.bitcoinRpc.getTransaction(swap.txId);
             if(tx==null) {
                 this.swapLogger.debug(swap, "checkDoubleSpends(): Swap was double spent, burning... - original txId: "+swap.txId);
                 this.processPastSwap(swap, null, null);

package/src/utils/BitcoinUtils.ts

@@ -46,19 +46,7 @@ export function isLegacyInput(input: TransactionInput): boolean {
     return true;
 }
 
-export async function checkTransactionReplaced(txId: string, txRaw: string, bitcoin: IBitcoinWallet): Promise<BtcTx> {
-    const existingTx = await bitcoin.getWalletTransaction(txId);
-    if(existingTx!=null) return existingTx;
-    //Try to re-broadcast
-    try {
-        await bitcoin.sendRawTransaction(txRaw);
-    } catch (e) {
-        logger.error("checkTransactionReplaced("+txId+"): Error when trying to re-broadcast raw transaction: ", e);
-    }
-    return await bitcoin.getWalletTransaction(txId);
-}
-
-export async function checkTransactionReplacedRpc(txId: string, txRaw: string, bitcoin: BitcoinRpc<any>): Promise<BtcTx> {
+export async function checkTransactionReplaced(txId: string, txRaw: string, bitcoin: BitcoinRpc<any>): Promise<BtcTx> {
     const existingTx = await bitcoin.getTransaction(txId);
     if(existingTx!=null) return existingTx;
     //Try to re-broadcast