@atomiqlabs/lp-lib 16.0.2 → 16.0.4

package/src/swaps/spv_vault_swap/SpvVaultSwapHandler.ts

@@ -3,7 +3,7 @@ import {Express, Request, Response} from "express";
 import {IBitcoinWallet} from "../../wallets/IBitcoinWallet";
 import {
     BitcoinRpc,
-    BtcBlock, BtcTx,
+    BtcBlock,
     ChainEvent,
     IStorageManager,
     SpvVaultClaimEvent,
@@ -21,7 +21,7 @@ import {ISpvVaultSigner} from "../../wallets/ISpvVaultSigner";
 import {PluginManager} from "../../plugins/PluginManager";
 import {SpvVault} from "./SpvVault";
 import {serverParamDecoder} from "../../utils/paramcoders/server/ServerParamDecoder";
-import {expressHandlerWrapper, getAbortController, HEX_REGEX} from "../../utils/Utils";
+import {expressHandlerWrapper, getAbortController, HEX_REGEX, isDefinedRuntimeError} from "../../utils/Utils";
 import {IParamReader} from "../../utils/paramcoders/IParamReader";
 import {ServerParamEncoder} from "../../utils/paramcoders/server/ServerParamEncoder";
 import {FieldTypeEnum} from "../../utils/paramcoders/SchemaVerifier";
@@ -57,8 +57,8 @@ export type SpvVaultPostQuote = {
 const TX_MAX_VSIZE = 16*1024;
 
 export class SpvVaultSwapHandler extends SwapHandler<SpvVaultSwap, SpvVaultSwapState> {
-
     readonly type = SwapHandlerType.FROM_BTC_SPV;
+    readonly inflightSwapStates = new Set([SpvVaultSwapState.SIGNED, SpvVaultSwapState.SENT, SpvVaultSwapState.BTC_CONFIRMED]);
 
     readonly bitcoin: IBitcoinWallet;
     readonly bitcoinRpc: BitcoinRpc<BtcBlock>;
@@ -318,6 +318,8 @@ export class SpvVaultSwapHandler extends SwapHandler<SpvVaultSwap, SpvVaultSwapS
             const useToken = parsedBody.token;
             const gasToken = parsedBody.gasToken;
 
+            this.checkTooManyInflightSwaps();
+
             //Check request params
             const fees = await this.AmountAssertions.preCheckFromBtcAmounts(this.type, request, requestedAmount, gasTokenAmount);
             metadata.times.requestChecked = Date.now();
@@ -331,6 +333,9 @@ export class SpvVaultSwapHandler extends SwapHandler<SpvVaultSwap, SpvVaultSwapS
                 pricePrefetchPromise,
                 gasTokenPricePrefetchPromise
             } = this.getPricePrefetches(chainIdentifier, useToken, gasToken, abortController);
+            const nativeBalancePrefetch = this.prefetchNativeBalanceIfNeeded(chainIdentifier, abortController);
+
+            await this.checkNativeBalance(chainIdentifier, nativeBalancePrefetch, abortController.signal);
 
             //Check valid amount specified (min/max)
             let {
@@ -465,6 +470,8 @@ export class SpvVaultSwapHandler extends SwapHandler<SpvVaultSwap, SpvVaultSwapS
             metadata.times ??= {};
             metadata.times.requestReceived = requestReceived;
 
+            this.checkTooManyInflightSwaps();
+
             const vault = await this.Vaults.getVault(swap.chainIdentifier, swap.vaultOwner, swap.vaultId);
             if(vault==null || !vault.isReady()) {
                 throw {
@@ -593,6 +600,9 @@ export class SpvVaultSwapHandler extends SwapHandler<SpvVaultSwap, SpvVaultSwapS
                     };
                 }
 
+                //Double check in-flight swap count
+                this.checkTooManyInflightSwaps();
+
                 swap.btcTxId = signedTx.id;
                 swap.state = SpvVaultSwapState.SIGNED;
                 swap.sending = true;
@@ -622,7 +632,10 @@ export class SpvVaultSwapHandler extends SwapHandler<SpvVaultSwap, SpvVaultSwapS
                 swap.sending = false;
                 vault.removeWithdrawal(data);
                 await this.Vaults.saveVault(vault);
+
+                if(isDefinedRuntimeError(e) && swap.metadata!=null) swap.metadata.postQuoteError = e;
                 await this.removeSwapData(swap, SpvVaultSwapState.FAILED);
+
                 throw e;
             }
 

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

@@ -28,6 +28,7 @@ export type FromBtcTrustedRequestType = {
 
 export class FromBtcTrusted extends SwapHandler<FromBtcTrustedSwap, FromBtcTrustedSwapState> {
     readonly type = SwapHandlerType.FROM_BTC_TRUSTED;
+    readonly inflightSwapStates = new Set([FromBtcTrustedSwapState.RECEIVED, FromBtcTrustedSwapState.BTC_CONFIRMED, FromBtcTrustedSwapState.SENT, FromBtcTrustedSwapState.CONFIRMED]);
 
     readonly config: FromBtcTrustedConfig;
     readonly bitcoin: IBitcoinWallet;
@@ -199,6 +200,14 @@ export class FromBtcTrusted extends SwapHandler<FromBtcTrustedSwap, FromBtcTrust
             swap.txId = tx.txid;
             swap.vout = vout;
             this.subscriptions.delete(outputScript);
+
+            try {
+                this.checkTooManyInflightSwaps();
+            } catch (e) {
+                await this.refundSwap(swap);
+                return;
+            }
+
             await swap.setState(FromBtcTrustedSwapState.RECEIVED);
             await this.storageManager.saveData(swap.getIdentifierHash(), swap.getSequence(), swap);
         }
@@ -435,6 +444,8 @@ export class FromBtcTrusted extends SwapHandler<FromBtcTrustedSwap, FromBtcTrust
             };
             const useToken = parsedBody.token;
 
+            this.checkTooManyInflightSwaps();
+
             //Check request params
             const fees = await this.AmountAssertions.preCheckFromBtcAmounts(this.type, request, requestedAmount);
             metadata.times.requestChecked = Date.now();
@@ -454,6 +465,10 @@ export class FromBtcTrusted extends SwapHandler<FromBtcTrustedSwap, FromBtcTrust
                 abortController.abort(e);
                 return null;
             });
+            const nativeBalancePrefetch: Promise<bigint> = useToken===chainInterface.getNativeCurrencyAddress() ?
+                balancePrefetch : this.prefetchNativeBalanceIfNeeded(chainIdentifier, abortController);
+
+            await this.checkNativeBalance(chainIdentifier, nativeBalancePrefetch, abortController.signal);
 
             //Check valid amount specified (min/max)
             const {

package/src/swaps/trusted/frombtcln_trusted/FromBtcLnTrusted.ts

@@ -36,6 +36,7 @@ export type FromBtcLnTrustedRequestType = {
  */
 export class FromBtcLnTrusted extends SwapHandler<FromBtcLnTrustedSwap, FromBtcLnTrustedSwapState> {
     readonly type = SwapHandlerType.FROM_BTCLN_TRUSTED;
+    readonly inflightSwapStates = new Set([FromBtcLnTrustedSwapState.RECEIVED, FromBtcLnTrustedSwapState.SENT, FromBtcLnTrustedSwapState.CONFIRMED]);
 
     activeSubscriptions: Map<string, AbortController> = new Map<string, AbortController>();
     processedTxIds: Map<string, string> = new Map<string, string>();
@@ -197,6 +198,13 @@ export class FromBtcLnTrusted extends SwapHandler<FromBtcLnTrustedSwap, FromBtcL
 
         //Important to prevent race condition and issuing 2 signed init messages at the same time
         if(invoiceData.state===FromBtcLnTrustedSwapState.CREATED) {
+            try {
+                this.checkTooManyInflightSwaps();
+            } catch (e) {
+                await this.cancelSwapAndInvoice(invoiceData);
+                throw e;
+            }
+
             if(invoiceData.metadata!=null) invoiceData.metadata.times.htlcReceived = Date.now();
             await invoiceData.setState(FromBtcLnTrustedSwapState.RECEIVED);
             await this.storageManager.saveData(invoice.id, null, invoiceData);
@@ -406,6 +414,8 @@ export class FromBtcLnTrusted extends SwapHandler<FromBtcLnTrustedSwap, FromBtcL
             };
             const useToken = parsedBody.token;
 
+            this.checkTooManyInflightSwaps();
+
             //Check request params
             const fees = await this.AmountAssertions.preCheckFromBtcAmounts(this.type, request, requestedAmount);
             metadata.times.requestChecked = Date.now();
@@ -420,13 +430,17 @@ export class FromBtcLnTrusted extends SwapHandler<FromBtcLnTrustedSwap, FromBtcL
                 abortController.abort(e);
                 return null;
             });
-            const balancePrefetch = chainInterface.getBalance(signer.getAddress(), useToken).catch(e => {
+            const balancePrefetch: Promise<bigint> = chainInterface.getBalance(signer.getAddress(), useToken).catch(e => {
                 this.logger.error("getBalancePrefetch(): balancePrefetch error: ", e);
                 abortController.abort(e);
                 return null;
             });
+            const nativeBalancePrefetch: Promise<bigint> = useToken===chainInterface.getNativeCurrencyAddress() ?
+                balancePrefetch : this.prefetchNativeBalanceIfNeeded(chainIdentifier, abortController);
             const channelsPrefetch: Promise<LightningNetworkChannel[]> = this.LightningAssertions.getChannelsPrefetch(abortController);
 
+            await this.checkNativeBalance(chainIdentifier, nativeBalancePrefetch, abortController.signal);
+
             //Check valid amount specified (min/max)
             const {
                 amountBD,