@atomiqlabs/sdk 8.4.3 → 8.5.0

package/src/swaps/escrow_swaps/tobtc/ln/ToBTCLNWrapper.ts

@@ -21,15 +21,60 @@ import {sha256} from "@noble/hashes/sha2";
 import {AmountData} from "../../../../types/AmountData";
 import {LNURLPayParamsWithUrl} from "../../../../types/lnurl/LNURLPay";
 import {tryWithRetries} from "../../../../utils/RetryUtils";
-import {AllOptional, AllRequired} from "../../../../utils/TypeUtils";
+import {AllOptional} from "../../../../utils/TypeUtils";
 import {LightningInvoiceCreateService} from "../../../../types/wallets/LightningInvoiceCreateService";
 
 export type ToBTCLNOptions = {
+    /**
+     * HTLC expiration timeout in seconds to use when offering the HTLC to the LP. Larger expirations mean that more
+     *  lightning network payment paths can be considered (every hop in the lightning network payment adds additional
+     *  timeout requirement). On the other side, larger expiration also means that user's funds are locked for longer
+     *  in case of a non-cooperative LP.
+     *
+     * Uses 5 days as default.
+     */
     expirySeconds?: number,
-    maxFee?: bigint | Promise<bigint>,
-    expiryTimestamp?: bigint,
+    /**
+     * Maximum fee for routing the swap output payment through the lightning network. Higher fee percentages means that
+     *  more payment routes can be considered (every hop in the lightning network payment adds additional fee
+     *  requirements).
+     *
+     * The fee is express as percentage of the swap value, uses `0.2` by default which means the maximum
+     *  routing fee is capped at 0.2% of the swap value.
+     *
+     * The full fee also contains the base component (set by `maxRoutingBaseFee` option), the resulting maximum routing
+     *  fee rate is:
+     *
+     * `maxRoutingFee` = `maxRoutingBaseFee` sats + `value` * `maxRoutingFeePercentage`%
+     */
+    maxRoutingFeePercentage?: number,
+    /**
+     *
+     * Maximum base fee (in sats) for routing the swap output payment through the lightning network. Higher fee
+     *  percentages means that more payment routes can be considered (every hop in the lightning network payment adds additional fee
+     *  requirements).
+     *
+     * Uses 10 sats as a default.
+     *
+     * The full fee also contains the value percentage component (set by `maxRoutingFeePercentage` option), the
+     *  resulting maximum routing fee rate is:
+     *
+     * `maxRoutingFee` = `maxRoutingBaseFee` sats + (`value` * `maxRoutingFeePercentage`%)
+     */
+    maxRoutingBaseFee?: bigint,
+
+    /**
+     * @deprecated Use `maxRoutingFeePercentage` and express the routing fee in percentage instead!
+     */
     maxRoutingPPM?: bigint,
-    maxRoutingBaseFee?: bigint
+    /**
+     * @deprecated Adjust fee with `maxRoutingFeePercentage` & `maxRoutingBaseFee` params!
+     */
+    maxFee?: bigint | Promise<bigint>,
+    /**
+     * @deprecated Pass desired HTLC expiration timeout as `expirySeconds`
+     */
+    expiryTimestamp?: bigint
 }
 
 export type ToBTCLNWrapperOptions = ISwapWrapperOptions & {
@@ -67,7 +112,7 @@ export class ToBTCLNWrapper<T extends ChainType> extends IToBTCWrapper<T, ToBTCL
         super(
             chainIdentifier, unifiedStorage, unifiedChainEvents, chain, contract, prices, tokens, swapDataDeserializer,
             {
-                paymentTimeoutSeconds: options?.paymentTimeoutSeconds ?? 4*24*60*60,
+                paymentTimeoutSeconds: options?.paymentTimeoutSeconds ?? 5*24*60*60,
                 lightningBaseFee: options?.lightningBaseFee ?? 10,
                 lightningFeePPM: options?.lightningFeePPM ?? 2000
             },
@@ -75,10 +120,12 @@ export class ToBTCLNWrapper<T extends ChainType> extends IToBTCWrapper<T, ToBTCL
         );
     }
 
-    private toRequiredSwapOptions(amountData: AmountData, options?: ToBTCLNOptions, pricePreFetchPromise?: Promise<bigint | undefined>, abortSignal?: AbortSignal): AllRequired<ToBTCLNOptions> {
+    private toRequiredSwapOptions(amountData: AmountData, options?: ToBTCLNOptions, pricePreFetchPromise?: Promise<bigint | undefined>, abortSignal?: AbortSignal) {
         const expirySeconds = options?.expirySeconds ?? this._options.paymentTimeoutSeconds;
         const maxRoutingBaseFee = options?.maxRoutingBaseFee ?? BigInt(this._options.lightningBaseFee);
-        const maxRoutingPPM = options?.maxRoutingPPM ?? BigInt(this._options.lightningFeePPM);
+        const maxRoutingPPM = options?.maxRoutingFeePercentage!=null
+            ? BigInt(Math.floor(options.maxRoutingFeePercentage * 10_000))
+            : options?.maxRoutingPPM ?? BigInt(this._options.lightningFeePPM);
 
         let maxFee: bigint | Promise<bigint>;
         if(options?.maxFee!=null) {
@@ -97,10 +144,7 @@ export class ToBTCLNWrapper<T extends ChainType> extends IToBTCWrapper<T, ToBTCL
         }
 
         return {
-            expirySeconds,
             expiryTimestamp: options?.expiryTimestamp ?? BigInt(Math.floor(Date.now()/1000)+expirySeconds),
-            maxRoutingBaseFee,
-            maxRoutingPPM,
             maxFee
         }
     }
@@ -149,7 +193,7 @@ export class ToBTCLNWrapper<T extends ChainType> extends IToBTCWrapper<T, ToBTCL
      * @param parsedPr Parsed bolt11 lightning invoice
      * @param token Smart chain token to be used in the swap
      * @param lp
-     * @param options Swap options as passed to the swap create function
+     * @param calculatedOptions Swap options computed from the swap create options
      * @param data Parsed swap data returned by the LP
      * @param requiredTotal Required total to be paid on the input (for exactIn swaps)
      *
@@ -163,11 +207,14 @@ export class ToBTCLNWrapper<T extends ChainType> extends IToBTCWrapper<T, ToBTCL
         parsedPr: PaymentRequestObject & {tagsObject: TagsObject},
         token: string,
         lp: Intermediary,
-        options: AllRequired<ToBTCLNOptions>,
+        calculatedOptions: {
+            maxFee: bigint | Promise<bigint>,
+            expiryTimestamp: bigint
+        },
         data: T["Data"],
         requiredTotal?: bigint
     ): Promise<void> {
-        if(resp.routingFeeSats > await options.maxFee) throw new IntermediaryError("Invalid max fee sats returned");
+        if(resp.routingFeeSats > await calculatedOptions.maxFee) throw new IntermediaryError("Invalid max fee sats returned");
 
         if(requiredTotal!=null && resp.total !== requiredTotal)
             throw new IntermediaryError("Invalid data returned - total amount");
@@ -178,7 +225,7 @@ export class ToBTCLNWrapper<T extends ChainType> extends IToBTCWrapper<T, ToBTCL
         if(
             data.getAmount() !== resp.total ||
             !Buffer.from(data.getClaimHash(), "hex").equals(claimHash) ||
-            data.getExpiry() !== options.expiryTimestamp ||
+            data.getExpiry() !== calculatedOptions.expiryTimestamp ||
             data.getType()!==ChainSwapType.HTLC ||
             !data.isPayIn() ||
             !data.isToken(token) ||
@@ -198,7 +245,7 @@ export class ToBTCLNWrapper<T extends ChainType> extends IToBTCWrapper<T, ToBTCL
      * @param lp Intermediary
      * @param pr bolt11 lightning network invoice
      * @param parsedPr Parsed bolt11 lightning network invoice
-     * @param options Options as passed to the swap create function
+     * @param calculatedOptions Swap options computed from the swap create options
      * @param preFetches
      * @param abort Abort signal or controller, if AbortController is passed it is used as-is, when AbortSignal is passed
      *  it is extended with extendAbortController and then used
@@ -212,7 +259,10 @@ export class ToBTCLNWrapper<T extends ChainType> extends IToBTCWrapper<T, ToBTCL
         lp: Intermediary,
         pr: string,
         parsedPr: PaymentRequestObject & {tagsObject: TagsObject},
-        options: AllRequired<ToBTCLNOptions>,
+        calculatedOptions: {
+            maxFee: bigint | Promise<bigint>,
+            expiryTimestamp: bigint
+        },
         preFetches: {
             feeRatePromise: Promise<string | undefined>,
             pricePreFetchPromise: Promise<bigint | undefined>,
@@ -232,8 +282,8 @@ export class ToBTCLNWrapper<T extends ChainType> extends IToBTCWrapper<T, ToBTCL
                 const {signDataPrefetch, response} = IntermediaryAPI.initToBTCLN(this.chainIdentifier, lp.url, {
                     offerer: signer,
                     pr,
-                    maxFee: await options.maxFee,
-                    expiryTimestamp: options.expiryTimestamp,
+                    maxFee: await calculatedOptions.maxFee,
+                    expiryTimestamp: calculatedOptions.expiryTimestamp,
                     token: amountData.token,
                     feeRate: throwIfUndefined(preFetches.feeRatePromise),
                     additionalParams
@@ -251,7 +301,7 @@ export class ToBTCLNWrapper<T extends ChainType> extends IToBTCWrapper<T, ToBTCL
             const data: T["Data"] = new this._swapDataDeserializer(resp.data);
             data.setOfferer(signer);
 
-            await this.verifyReturnedData(signer, resp, parsedPr, amountData.token, lp, options, data);
+            await this.verifyReturnedData(signer, resp, parsedPr, amountData.token, lp, calculatedOptions, data);
 
             const [pricingInfo, signatureExpiry, reputation] = await Promise.all([
                 this.verifyReturnedPrice(
@@ -309,7 +359,7 @@ export class ToBTCLNWrapper<T extends ChainType> extends IToBTCWrapper<T, ToBTCL
     async create(
         signer: string,
         recipient: string,
-        amountData: Omit<AmountData, "amount">,
+        amountData: Omit<AmountData, "amount"> & {exactIn: false},
         lps: Intermediary[],
         options?: ToBTCLNOptions,
         additionalParams?: Record<string, any>,
@@ -328,17 +378,7 @@ export class ToBTCLNWrapper<T extends ChainType> extends IToBTCWrapper<T, ToBTCL
         if(parsedPr.millisatoshis==null) throw new UserError("Must be an invoice with amount");
         const amountOut: bigint = (BigInt(parsedPr.millisatoshis) + 999n) / 1000n;
 
-        const expirySeconds = options?.expirySeconds ?? this._options.paymentTimeoutSeconds;
-        const maxRoutingBaseFee = options?.maxRoutingBaseFee ?? BigInt(this._options.lightningBaseFee);
-        const maxRoutingPPM = options?.maxRoutingPPM ?? BigInt(this._options.lightningFeePPM);
-
-        const _options: AllRequired<ToBTCLNOptions> = {
-            expirySeconds,
-            expiryTimestamp: options?.expiryTimestamp ?? BigInt(Math.floor(Date.now()/1000)+expirySeconds),
-            maxRoutingBaseFee,
-            maxRoutingPPM,
-            maxFee: options?.maxFee ?? this.calculateFeeForAmount(amountOut, maxRoutingBaseFee, maxRoutingPPM)
-        }
+        const _options = this.toRequiredSwapOptions({...amountData, amount: amountOut}, options);
 
         if(parsedPr.tagsObject.payment_hash==null) throw new Error("Provided lightning invoice doesn't contain payment hash field!");
         await this.checkPaymentHashWasPaid(parsedPr.tagsObject.payment_hash);
@@ -388,7 +428,7 @@ export class ToBTCLNWrapper<T extends ChainType> extends IToBTCWrapper<T, ToBTCL
      * @param lp Intermediary (LPs) to get the quote from
      * @param dummyPr Dummy minimum value bolt11 lightning invoice returned from the LNURL-pay, used to estimate
      *  network fees for an actual invoice
-     * @param options Optional additional quote options
+     * @param calculatedOptions Swap options computed from the swap create options
      * @param preFetches Optional existing pre-fetch promises for the swap (only used internally for LNURL swaps)
      * @param abortSignal Abort signal
      * @param additionalParams Additional params to be sent to the intermediary
@@ -401,7 +441,10 @@ export class ToBTCLNWrapper<T extends ChainType> extends IToBTCWrapper<T, ToBTCL
         invoiceCreateService: LightningInvoiceCreateService,
         lp: Intermediary,
         dummyPr: string,
-        options: AllRequired<ToBTCLNOptions> & {comment?: string},
+        calculatedOptions: {
+            maxFee: bigint | Promise<bigint>,
+            expiryTimestamp: bigint
+        },
         preFetches: {
             feeRatePromise: Promise<string | undefined>,
             pricePreFetchPromise: Promise<bigint | undefined>,
@@ -422,8 +465,8 @@ export class ToBTCLNWrapper<T extends ChainType> extends IToBTCWrapper<T, ToBTCL
                     offerer: signer,
                     pr: dummyPr,
                     amount: amountData.amount,
-                    maxFee: await options.maxFee,
-                    expiryTimestamp: options.expiryTimestamp,
+                    maxFee: await calculatedOptions.maxFee,
+                    expiryTimestamp: calculatedOptions.expiryTimestamp,
                     additionalParams
                 }, this._options.postRequestTimeout, abortController.signal, retryCount>0 ? false : undefined);
 
@@ -462,7 +505,7 @@ export class ToBTCLNWrapper<T extends ChainType> extends IToBTCWrapper<T, ToBTCL
             const data: T["Data"] = new this._swapDataDeserializer(resp.data);
             data.setOfferer(signer);
 
-            await this.verifyReturnedData(signer, resp, parsedInvoice, amountData.token, lp, options, data, amountData.amount);
+            await this.verifyReturnedData(signer, resp, parsedInvoice, amountData.token, lp, calculatedOptions, data, amountData.amount);
 
             const [pricingInfo, signatureExpiry, reputation] = await Promise.all([
                 this.verifyReturnedPrice(
@@ -570,7 +613,7 @@ export class ToBTCLNWrapper<T extends ChainType> extends IToBTCWrapper<T, ToBTCL
 
                 const invoice = await invoiceCreateService.getInvoice(Number(amountData.amount), _abortController.signal);
 
-                return (await this.create(signer, invoice, amountData, lps, options, additionalParams, _abortController.signal, {
+                return (await this.create(signer, invoice, {...amountData, exactIn: false}, lps, options, additionalParams, _abortController.signal, {
                     feeRatePromise,
                     pricePreFetchPromise,
                     usdPricePrefetchPromise,

package/src/swaps/escrow_swaps/tobtc/onchain/ToBTCSwap.ts

@@ -154,7 +154,7 @@ export class ToBTCSwap<T extends ChainType = ChainType> extends IToBTCSwap<T, To
     /**
      * @inheritDoc
      */
-    getOutput(): TokenAmount<T["ChainId"], BtcToken<false>> {
+    getOutput(): TokenAmount<BtcToken<false>> {
         return toTokenAmount(this.amount ?? null, this.outputToken, this.wrapper._prices, this.pricingInfo);
     }
 

package/src/swaps/escrow_swaps/tobtc/onchain/ToBTCWrapper.ts

@@ -25,11 +25,17 @@ import {UnifiedSwapStorage} from "../../../../storage/UnifiedSwapStorage";
 import {ISwap} from "../../../ISwap";
 import {AmountData} from "../../../../types/AmountData";
 import {tryWithRetries} from "../../../../utils/RetryUtils";
-import {AllOptional, AllRequired} from "../../../../utils/TypeUtils";
+import {AllOptional} from "../../../../utils/TypeUtils";
 import {ToBTCSwapState} from "../IToBTCSwap";
 
 export type ToBTCOptions = {
+    /**
+     * @deprecated Ignored by the LP anyway
+     */
     confirmationTarget?: number,
+    /**
+     * @deprecated Default 2 confirmations should be enough for any currently supported amount by atomiq
+     */
     confirmations?: number
 }
 
@@ -154,7 +160,10 @@ export class ToBTCWrapper<T extends ChainType> extends IToBTCWrapper<T, ToBTCDef
         resp: ToBTCResponseType,
         amountData: AmountData,
         lp: Intermediary,
-        options: AllRequired<ToBTCOptions>,
+        options: {
+            confirmations: number,
+            confirmationTarget: number
+        },
         data: T["Data"],
         hash: string
     ): void {
@@ -220,7 +229,7 @@ export class ToBTCWrapper<T extends ChainType> extends IToBTCWrapper<T, ToBTCDef
         intermediary: Intermediary
     }[] {
         if(!this.isInitialized) throw new Error("Not initialized, call init() first!");
-        const _options: AllRequired<ToBTCOptions> = {
+        const _options = {
             confirmationTarget: options?.confirmationTarget ?? 3,
             confirmations: options?.confirmations ?? 2
         };

package/src/swaps/spv_swaps/SpvFromBTCSwap.ts

@@ -506,6 +506,15 @@ export class SpvFromBTCSwap<T extends ChainType>
         return this._state===SpvFromBTCSwapState.FAILED || this._state===SpvFromBTCSwapState.DECLINED || this._state===SpvFromBTCSwapState.CLOSED;
     }
 
+    /**
+     * @inheritDoc
+     */
+    isInProgress(): boolean {
+        return this._state===SpvFromBTCSwapState.POSTED ||
+            this._state===SpvFromBTCSwapState.BROADCASTED ||
+            this._state===SpvFromBTCSwapState.BTC_TX_CONFIRMED;
+    }
+
     /**
      * @inheritDoc
      */
@@ -573,7 +582,7 @@ export class SpvFromBTCSwap<T extends ChainType>
      *
      * @internal
      */
-    protected getOutputWithoutFee(): TokenAmount<T["ChainId"], SCToken<T["ChainId"]>, true> {
+    protected getOutputWithoutFee(): TokenAmount<SCToken<T["ChainId"]>, true> {
         return toTokenAmount(
             (this.outputTotalSwap * (100_000n + this.callerFeeShare + this.frontingFeeShare + this.executionFeeShare) / 100_000n) + (this.swapFee ?? 0n),
             this.wrapper._tokens[this.outputSwapToken], this.wrapper._prices, this.pricingInfo
@@ -695,21 +704,21 @@ export class SpvFromBTCSwap<T extends ChainType>
     /**
      * @inheritDoc
      */
-    getOutput(): TokenAmount<T["ChainId"], SCToken<T["ChainId"]>, true> {
+    getOutput(): TokenAmount<SCToken<T["ChainId"]>, true> {
         return toTokenAmount(this.outputTotalSwap, this.wrapper._tokens[this.outputSwapToken], this.wrapper._prices, this.pricingInfo);
     }
 
     /**
      * @inheritDoc
      */
-    getGasDropOutput(): TokenAmount<T["ChainId"], SCToken<T["ChainId"]>, true> {
+    getGasDropOutput(): TokenAmount<SCToken<T["ChainId"]>, true> {
         return toTokenAmount(this.outputTotalGas, this.wrapper._tokens[this.outputGasToken], this.wrapper._prices, this.gasPricingInfo);
     }
 
     /**
      * @inheritDoc
      */
-    getInputWithoutFee(): TokenAmount<T["ChainId"], BtcToken<false>, true> {
+    getInputWithoutFee(): TokenAmount<BtcToken<false>, true> {
         return toTokenAmount(this.getInputAmountWithoutFee(), BitcoinTokens.BTC, this.wrapper._prices, this.pricingInfo);
     }
 
@@ -723,7 +732,7 @@ export class SpvFromBTCSwap<T extends ChainType>
     /**
      * @inheritDoc
      */
-    getInput(): TokenAmount<T["ChainId"], BtcToken<false>, true> {
+    getInput(): TokenAmount<BtcToken<false>, true> {
         return toTokenAmount(this.btcAmount, BitcoinTokens.BTC, this.wrapper._prices, this.pricingInfo);
     }
 
@@ -987,7 +996,7 @@ export class SpvFromBTCSwap<T extends ChainType>
     /**
      * @inheritDoc
      */
-    async estimateBitcoinFee(_bitcoinWallet: IBitcoinWallet | MinimalBitcoinWalletInterface, feeRate?: number): Promise<TokenAmount<any, BtcToken<false>, true> | null> {
+    async estimateBitcoinFee(_bitcoinWallet: IBitcoinWallet | MinimalBitcoinWalletInterface, feeRate?: number): Promise<TokenAmount<BtcToken<false>, true> | null> {
         const bitcoinWallet: IBitcoinWallet = toBitcoinWallet(_bitcoinWallet, this.wrapper._btcRpc, this.wrapper._options.bitcoinNetwork);
         const txFee = await bitcoinWallet.getFundedPsbtFee((await this.getPsbt()).psbt, feeRate);
         if(txFee==null) return null;

package/src/swaps/spv_swaps/SpvFromBTCWrapper.ts

@@ -32,13 +32,47 @@ import {ISwap} from "../ISwap";
 import {IClaimableSwapWrapper} from "../IClaimableSwapWrapper";
 import {AmountData} from "../../types/AmountData";
 import {tryWithRetries} from "../../utils/RetryUtils";
-import {AllOptional, AllRequired} from "../../utils/TypeUtils";
+import {AllOptional} from "../../utils/TypeUtils";
+import {fromHumanReadableString} from "../../utils/TokenUtils";
+import {UserError} from "../../errors/UserError";
 
 export type SpvFromBTCOptions = {
-    gasAmount?: bigint,
+    /**
+     * Optional additional native token to receive as an output of the swap (e.g. STRK on Starknet or cBTC on Citrea).
+     *
+     * When passed as a `bigint` it is specified in base units of the token and in `string` it is the human readable
+     *  decimal format.
+     */
+    gasAmount?: bigint | string,
+    /**
+     * The LP enforces a minimum bitcoin fee rate in sats/vB for the swap transaction. With this config you can optionally
+     *  limit how high of a minimum fee rate would you accept.
+     *
+     * By default the maximum allowed fee rate is calculated dynamically based on current bitcoin fee rate as:
+     *
+     * `maxAllowedBitcoinFeeRate` = 10 + `currentBitcoinFeeRate` * 1.5
+     */
+    maxAllowedBitcoinFeeRate?: number,
+    /**
+     * A flag to attach 0 watchtower fee to the swap, this would make the settlement unattractive for the watchtowers
+     *  and therefore automatic settlement for such swaps will not be possible, you will have to settle manually
+     *  with {@link FromBTCLNSwap.claim} or {@link FromBTCLNSwap.txsClaim} functions.
+     */
     unsafeZeroWatchtowerFee?: boolean,
+    /**
+     * A safety factor to use when estimating the watchtower fee to attach to the swap (this has to cover the gas fee
+     *  of watchtowers settling the swap). A higher multiple here would mean that a swap is more attractive for
+     *  watchtowers to settle automatically.
+     *
+     * Uses a `1.25` multiple by default (i.e. the current network fee is multiplied by 1.25 and then used to estimate
+     *  the settlement gas fee cost)
+     */
     feeSafetyFactor?: number,
-    maxAllowedNetworkFeeRate?: number
+
+    /**
+     * @deprecated Use `maxAllowedBitcoinFeeRate` instead!
+     */
+    maxAllowedNetworkFeeRate?: number,
 };
 
 export type SpvFromBTCWrapperOptions = ISwapWrapperOptions & {
@@ -275,7 +309,10 @@ export class SpvFromBTCWrapper<
      */
     private async preFetchCallerFeeShare(
         amountData: AmountData,
-        options: AllRequired<SpvFromBTCOptions>,
+        options: {
+            unsafeZeroWatchtowerFee: boolean,
+            feeSafetyFactor: number
+        },
         pricePrefetch: Promise<bigint | undefined>,
         nativeTokenPricePrefetch: Promise<bigint | undefined> | undefined,
         abortController: AbortController
@@ -355,7 +392,9 @@ export class SpvFromBTCWrapper<
         resp: SpvFromBTCPrepareResponseType,
         amountData: AmountData,
         lp: Intermediary,
-        options: SpvFromBTCOptions,
+        options: {
+            gasAmount: bigint
+        },
         callerFeeShare: bigint,
         bitcoinFeeRatePromise: Promise<number | undefined>,
         abortSignal: AbortSignal
@@ -438,7 +477,7 @@ export class SpvFromBTCWrapper<
                         throw new IntermediaryError("Invalid amount0 multiplier used, rawAmount diff too high");
                     if(resp.total !== adjustedAmount) throw new IntermediaryError("Invalid total returned");
                 }
-                if(options.gasAmount==null || options.gasAmount===0n) {
+                if(options.gasAmount===0n) {
                     if(resp.totalGas !== 0n) throw new IntermediaryError("Invalid gas total returned");
                 } else {
                     //Check the difference between amount adjusted due to scaling to raw amount
@@ -548,13 +587,16 @@ export class SpvFromBTCWrapper<
         quote: Promise<SpvFromBTCSwap<T>>,
         intermediary: Intermediary
     }[] {
-        const _options: AllRequired<SpvFromBTCOptions> = {
-            gasAmount: options?.gasAmount ?? 0n,
+        const _options = {
+            gasAmount: this.parseGasAmount(options?.gasAmount),
             unsafeZeroWatchtowerFee: options?.unsafeZeroWatchtowerFee ?? false,
             feeSafetyFactor: options?.feeSafetyFactor ?? 1.25,
-            maxAllowedNetworkFeeRate: options?.maxAllowedNetworkFeeRate ?? Infinity
+            maxAllowedBitcoinFeeRate: options?.maxAllowedBitcoinFeeRate ?? options?.maxAllowedNetworkFeeRate ?? Infinity
         };
 
+        if(amountData.token===this._chain.getNativeCurrencyAddress() && _options.gasAmount!==0n)
+            throw new UserError("Cannot specify `gasAmount` for swaps to a native token!");
+
         const _abortController = extendAbortController(abortSignal);
         const pricePrefetchPromise: Promise<bigint | undefined> = this.preFetchPrice(amountData, _abortController.signal);
         const usdPricePrefetchPromise: Promise<number | undefined> = this.preFetchUsdPrice(_abortController.signal);
@@ -564,8 +606,8 @@ export class SpvFromBTCWrapper<
             undefined :
             this.preFetchPrice({token: nativeTokenAddress}, _abortController.signal);
         const callerFeePrefetchPromise = this.preFetchCallerFeeShare(amountData, _options, pricePrefetchPromise, gasTokenPricePrefetchPromise, _abortController);
-        const bitcoinFeeRatePromise: Promise<number | undefined> = _options.maxAllowedNetworkFeeRate!=Infinity ?
-            Promise.resolve(_options.maxAllowedNetworkFeeRate) :
+        const bitcoinFeeRatePromise: Promise<number | undefined> = _options.maxAllowedBitcoinFeeRate!=Infinity ?
+            Promise.resolve(_options.maxAllowedBitcoinFeeRate) :
             this._btcRpc.getFeeRate().then(x => this._options.maxBtcFeeOffset + (x*this._options.maxBtcFeeMultiplier)).catch(e => {
                 _abortController.abort(e);
                 return undefined;

package/src/swaps/trusted/ln/LnForGasSwap.ts

@@ -272,6 +272,13 @@ export class LnForGasSwap<T extends ChainType = ChainType> extends ISwap<T, LnFo
         return this._state===LnForGasSwapState.FINISHED;
     }
 
+    /**
+     * @inheritDoc
+     */
+    isInProgress(): boolean {
+        return (this._state===LnForGasSwapState.PR_CREATED && this.initiated) || this._state===LnForGasSwapState.PR_PAID;
+    }
+
     /**
      * @inheritDoc
      * @internal
@@ -311,7 +318,7 @@ export class LnForGasSwap<T extends ChainType = ChainType> extends ISwap<T, LnFo
     /**
      * @inheritDoc
      */
-    getOutput(): TokenAmount<T["ChainId"], SCToken<T["ChainId"]>, true> {
+    getOutput(): TokenAmount<SCToken<T["ChainId"]>, true> {
         return toTokenAmount(
             this.outputAmount, this.wrapper._tokens[this.wrapper._chain.getNativeCurrencyAddress()],
             this.wrapper._prices, this.pricingInfo
@@ -328,7 +335,7 @@ export class LnForGasSwap<T extends ChainType = ChainType> extends ISwap<T, LnFo
     /**
      * @inheritDoc
      */
-    getInput(): TokenAmount<T["ChainId"], BtcToken<true>, true> {
+    getInput(): TokenAmount<BtcToken<true>, true> {
         const parsed = bolt11Decode(this.pr);
         const msats = parsed.millisatoshis;
         if(msats==null) throw new Error("Swap lightning invoice has no msat amount field!");
@@ -339,7 +346,7 @@ export class LnForGasSwap<T extends ChainType = ChainType> extends ISwap<T, LnFo
     /**
      * @inheritDoc
      */
-    getInputWithoutFee(): TokenAmount<T["ChainId"], BtcToken<true>, true> {
+    getInputWithoutFee(): TokenAmount<BtcToken<true>, true> {
         const parsed = bolt11Decode(this.pr);
         const msats = parsed.millisatoshis;
         if(msats==null) throw new Error("Swap lightning invoice has no msat amount field!");
@@ -420,6 +427,13 @@ export class LnForGasSwap<T extends ChainType = ChainType> extends ISwap<T, LnFo
         throw new Error("Invalid swap state to obtain execution txns, required PR_CREATED");
     }
 
+    /**
+     * @remark Not supported
+     */
+    async execute(): Promise<boolean> {
+        throw new Error("Not supported");
+    }
+
     /**
      * @inheritDoc
      */
@@ -572,4 +586,4 @@ export class LnForGasSwap<T extends ChainType = ChainType> extends ISwap<T, LnFo
         return Promise.resolve(false);
     }
 
-}
+}

package/src/swaps/trusted/onchain/OnchainForGasSwap.ts

@@ -314,6 +314,14 @@ export class OnchainForGasSwap<T extends ChainType = ChainType> extends ISwap<T,
         return this._state===OnchainForGasSwapState.FINISHED;
     }
 
+    /**
+     * @inheritDoc
+     */
+    isInProgress(): boolean {
+        return (this._state===OnchainForGasSwapState.PR_CREATED && this.txId!=null) ||
+            (this._state===OnchainForGasSwapState.REFUNDABLE && this.refundAddress!=null);
+    }
+
     /**
      * @inheritDoc
      * @internal
@@ -354,7 +362,7 @@ export class OnchainForGasSwap<T extends ChainType = ChainType> extends ISwap<T,
     /**
      * @inheritDoc
      */
-    getOutput(): TokenAmount<T["ChainId"], SCToken<T["ChainId"]>, true> {
+    getOutput(): TokenAmount<SCToken<T["ChainId"]>, true> {
         return toTokenAmount(
             this.outputAmount, this.wrapper._tokens[this.wrapper._chain.getNativeCurrencyAddress()],
             this.wrapper._prices, this.pricingInfo
@@ -371,14 +379,14 @@ export class OnchainForGasSwap<T extends ChainType = ChainType> extends ISwap<T,
     /**
      * @inheritDoc
      */
-    getInput(): TokenAmount<T["ChainId"], BtcToken<false>, true> {
+    getInput(): TokenAmount<BtcToken<false>, true> {
         return toTokenAmount(this.inputAmount, BitcoinTokens.BTC, this.wrapper._prices, this.pricingInfo);
     }
 
     /**
      * @inheritDoc
      */
-    getInputWithoutFee(): TokenAmount<T["ChainId"], BtcToken<false>, true> {
+    getInputWithoutFee(): TokenAmount<BtcToken<false>, true> {
         return toTokenAmount(
             this.inputAmount - (this.swapFeeBtc ?? 0n), BitcoinTokens.BTC,
             this.wrapper._prices, this.pricingInfo
@@ -518,7 +526,7 @@ export class OnchainForGasSwap<T extends ChainType = ChainType> extends ISwap<T,
     /**
      * @inheritDoc
      */
-    async estimateBitcoinFee(_bitcoinWallet: IBitcoinWallet | MinimalBitcoinWalletInterface, feeRate?: number): Promise<TokenAmount<any, BtcToken<false>, true> | null> {
+    async estimateBitcoinFee(_bitcoinWallet: IBitcoinWallet | MinimalBitcoinWalletInterface, feeRate?: number): Promise<TokenAmount<BtcToken<false>, true> | null> {
         const bitcoinWallet: IBitcoinWallet = toBitcoinWallet(_bitcoinWallet, this.wrapper._btcRpc, this.wrapper._options.bitcoinNetwork);
         const txFee = await bitcoinWallet.getTransactionFee(this.address, this.inputAmount, feeRate);
         if(txFee==null) return null;
@@ -584,6 +592,13 @@ export class OnchainForGasSwap<T extends ChainType = ChainType> extends ISwap<T,
         throw new Error("Invalid swap state to obtain execution txns, required PR_CREATED or CLAIM_COMMITED");
     }
 
+    /**
+     * @remark Not supported
+     */
+    async execute(): Promise<boolean> {
+        throw new Error("Not supported");
+    }
+
     /**
      * @inheritDoc
      *