@atomiqlabs/sdk 8.6.0 → 8.6.3

package/src/swaps/ISwapWrapper.ts

@@ -13,6 +13,9 @@ import {PriceInfoType} from "../types/PriceInfoType";
 import {fromHumanReadableString} from "../utils/TokenUtils";
 import {UserError} from "../errors/UserError";
 
+export const DEFAULT_MAX_PARALLEL_SWAP_TICKS = 50;
+export const DEFAULT_MAX_PARALLEL_SWAP_SYNCS = 50;
+
 /**
  * Options for swap wrapper configuration
  *
@@ -20,7 +23,19 @@ import {UserError} from "../errors/UserError";
  */
 export type ISwapWrapperOptions = {
     getRequestTimeout?: number,
-    postRequestTimeout?: number
+    postRequestTimeout?: number,
+    /**
+     * How many swaps to call `_tick()` for in parallel
+     */
+    maxParallelSwapTicks?: number,
+    /**
+     * How many swaps to call `_sync()` for in parallel
+     */
+    maxParallelSwapSyncs?: number,
+    /**
+     * Whether to save swaps that are not initialized into the persistent storage
+     */
+    saveUninitializedSwaps?: boolean
 };
 
 /**
@@ -101,6 +116,11 @@ export abstract class ISwapWrapper<
      * @internal
      */
     protected tickInterval?: NodeJS.Timeout;
+    /**
+     * An internal abort controller for the running tick handler
+     * @internal
+     */
+    protected tickAbortController?: AbortController;
 
 
     /**
@@ -152,6 +172,11 @@ export abstract class ISwapWrapper<
         options: O,
         events?: EventEmitter<{swapState: [ISwap]}>
     ) {
+        if(options?.maxParallelSwapTicks!=null && options.maxParallelSwapTicks < 1)
+            throw new Error("maxParallelSwapTicks must be at least 1!");
+        if(options?.maxParallelSwapSyncs!=null && options.maxParallelSwapSyncs < 1)
+            throw new Error("maxParallelSwapSyncs must be at least 1!");
+
         this.unifiedStorage = unifiedStorage;
         this.unifiedChainEvents = unifiedChainEvents;
 
@@ -274,9 +299,20 @@ export abstract class ISwapWrapper<
      */
     protected startTickInterval(): void {
         if(this.tickSwapState==null || this.tickSwapState.length===0) return;
-        this.tickInterval = setInterval(() => {
-            this.tick();
-        }, 1000);
+        if(this.tickAbortController!=null) this.tickAbortController.abort("New tick interval has been started!");
+        const abortController = this.tickAbortController = new AbortController();
+        let run: () => Promise<void>;
+        run = async () => {
+            if(!this.isInitialized) return;
+            await this.tick(undefined, abortController.signal).catch(e => {
+                if(abortController.signal.aborted) return;
+                this.logger.warn("startTickInterval(): Tick on swaps failed, error: ", e);
+            });
+            if(abortController.signal.aborted) return;
+            if(!this.isInitialized) return;
+            this.tickInterval = setTimeout(run, 1000);
+        }
+        run();
     }
 
     /**
@@ -343,11 +379,11 @@ export abstract class ISwapWrapper<
 
         if(this.processEvent!=null) this.unifiedChainEvents.registerListener(this.TYPE, this.processEvent.bind(this), this._swapDeserializer.bind(null, this));
 
+        this.isInitialized = true;
+
         if(!noTimers) this.startTickInterval();
 
         // this.logger.info("init(): Swap wrapper initialized");
-
-        this.isInitialized = true;
     }
 
     /**
@@ -357,12 +393,21 @@ export abstract class ISwapWrapper<
         this.isInitialized = false;
         this.unifiedChainEvents.unregisterListener(this.TYPE);
         this.logger.info("stop(): Swap wrapper stopped");
-        if(this.tickInterval!=null) clearInterval(this.tickInterval);
+        if(this.tickInterval!=null) {
+            clearTimeout(this.tickInterval);
+            delete this.tickInterval;
+        }
+        if(this.tickAbortController!=null) {
+            this.tickAbortController.abort("Wrapper instance stopped!");
+            delete this.tickAbortController;
+        }
     }
 
     /**
      * Runs checks on all the known pending swaps, syncing their state from on-chain data
      *
+     * @remarks Doesn't work properly if you pass non-persisted swaps
+     *
      * @param pastSwaps Optional array of past swaps to check, otherwise all relevant swaps will be fetched
      *  from the persistent storage
      * @param noSave Whether to skip saving the swap changes in the persistent storage
@@ -373,18 +418,25 @@ export abstract class ISwapWrapper<
             (val: any) => new this._swapDeserializer(this, val)
         );
 
-        const {removeSwaps, changedSwaps} = await this._checkPastSwaps(pastSwaps);
-
-        if (!noSave) {
-            await this.unifiedStorage.removeAll(removeSwaps);
-            await this.unifiedStorage.saveAll(changedSwaps);
-            changedSwaps.forEach(swap => swap._emitEvent());
-            removeSwaps.forEach(swap => swap._emitEvent());
+        const maxParallelSyncs = this._options.maxParallelSwapSyncs ?? DEFAULT_MAX_PARALLEL_SWAP_SYNCS;
+
+        const totalRemoveSwaps: D["Swap"][] = [];
+        const totalChangedSwaps: D["Swap"][] = [];
+        for(let i=0; i<pastSwaps.length; i+=maxParallelSyncs) {
+            const {removeSwaps, changedSwaps} = await this._checkPastSwaps(pastSwaps.slice(i, i+maxParallelSyncs));
+            if (!noSave) {
+                await this.unifiedStorage.removeAll(removeSwaps);
+                await this.unifiedStorage.saveAll(changedSwaps);
+                changedSwaps.forEach(swap => swap._emitEvent());
+                removeSwaps.forEach(swap => swap._emitEvent());
+            }
+            totalRemoveSwaps.push(...removeSwaps);
+            totalChangedSwaps.push(...changedSwaps);
         }
 
         return {
-            removeSwaps,
-            changedSwaps
+            removeSwaps: totalRemoveSwaps,
+            changedSwaps: totalChangedSwaps
         }
     }
 
@@ -393,21 +445,43 @@ export abstract class ISwapWrapper<
      *
      * @param swaps Optional array of swaps to invoke `_tick()` on, otherwise all relevant swaps will be fetched
      *  from the persistent storage
+     * @param abortSignal Abort signal
      */
-    public async tick(swaps?: D["Swap"][]): Promise<void> {
+    public async tick(swaps?: D["Swap"][], abortSignal?: AbortSignal): Promise<void> {
         if(swaps==null) swaps = await this.unifiedStorage.query<D["Swap"]>(
             [[{key: "type", value: this.TYPE}, {key: "state", value: this.tickSwapState}]],
             (val: any) => new this._swapDeserializer(this, val)
         );
+        abortSignal?.throwIfAborted();
 
+        const parallelTicks = this._options.maxParallelSwapTicks ?? DEFAULT_MAX_PARALLEL_SWAP_TICKS;
+
+        let promises: Promise<any>[] = [];
         for(let pendingSwap of this.pendingSwaps.values()) {
             const value = pendingSwap.deref();
-            if(value != null) value._tick(true);
+            if(value != null) promises.push(value._tick(true).catch(e => {
+                this.logger.warn(`tick(): Error ticking swap ${value.getId()}: `, e);
+            }));
+            if(promises.length >= parallelTicks) {
+                await Promise.all(promises);
+                abortSignal?.throwIfAborted();
+                promises = [];
+            }
         }
 
-        swaps.forEach(value => {
-            value._tick(true)
-        });
+        for(let value of swaps) {
+            promises.push(value._tick(true).catch(e => {
+                this.logger.warn(`tick(): Error ticking swap ${value.getId()}: `, e);
+            }));
+            if(promises.length >= parallelTicks) {
+                await Promise.all(promises);
+                abortSignal?.throwIfAborted();
+                promises = [];
+            }
+        }
+
+        if(promises.length>0) await Promise.all(promises);
+        abortSignal?.throwIfAborted();
     }
 
     /**
@@ -426,12 +500,14 @@ export abstract class ISwapWrapper<
      * @internal
      */
     _saveSwapData(swap: D["Swap"]): Promise<void> {
-        if(!swap.isInitiated()) {
-            this.logger.debug("saveSwapData(): Swap "+swap.getId()+" not initiated, saving to pending swaps");
-            this.pendingSwaps.set(swap.getId(), new WeakRef<D["Swap"]>(swap));
-            return Promise.resolve();
-        } else {
-            this.pendingSwaps.delete(swap.getId());
+        if(!this._options.saveUninitializedSwaps) {
+            if(!swap.isInitiated()) {
+                this.logger.debug("saveSwapData(): Swap "+swap.getId()+" not initiated, saving to pending swaps");
+                this.pendingSwaps.set(swap.getId(), new WeakRef<D["Swap"]>(swap));
+                return Promise.resolve();
+            } else {
+                this.pendingSwaps.delete(swap.getId());
+            }
         }
         return this.unifiedStorage.save(swap);
     }
@@ -445,7 +521,7 @@ export abstract class ISwapWrapper<
      */
     _removeSwapData(swap: D["Swap"]): Promise<void> {
         this.pendingSwaps.delete(swap.getId());
-        if(!swap.isInitiated()) return Promise.resolve();
+        if(!swap._persisted) return Promise.resolve();
         return this.unifiedStorage.remove(swap);
     }
 

package/src/swaps/escrow_swaps/IEscrowSwapWrapper.ts

@@ -66,7 +66,11 @@ export abstract class IEscrowSwapWrapper<
      * @internal
      */
     protected preFetchSignData(signDataPrefetch: Promise<any | null>): Promise<T["PreFetchVerification"] | undefined> {
-        if(this._contract.preFetchForInitSignatureVerification==null) return Promise.resolve(undefined);
+        if(this._contract.preFetchForInitSignatureVerification==null) {
+            // Catch promise rejections, should they happen
+            signDataPrefetch.catch(() => {});
+            return Promise.resolve(undefined);
+        }
         return signDataPrefetch.then(obj => {
             if(obj==null) return undefined;
             return this._contract.preFetchForInitSignatureVerification!(obj);

package/src/swaps/escrow_swaps/frombtc/IFromBTCSelfInitSwap.ts

@@ -71,7 +71,7 @@ export abstract class IFromBTCSelfInitSwap<
      * Returns if the swap can be committed
      * @internal
      */
-    protected abstract canCommit(): boolean;
+    protected abstract canCommit(skipQuoteExpiryChecks?: boolean): boolean;
 
     /**
      * @inheritDoc
@@ -239,7 +239,7 @@ export abstract class IFromBTCSelfInitSwap<
      * @throws {Error} When in invalid state to commit the swap
      */
     async txsCommit(skipChecks?: boolean): Promise<T["TX"][]> {
-        if(!this.canCommit()) throw new Error("Must be in CREATED state!");
+        if(!this.canCommit(skipChecks)) throw new Error("Must be in CREATED state!");
         if(this._data==null || this.signatureData==null) throw new Error("data or signature data is null, invalid state?");
 
         if(!this.initiated) {
@@ -285,7 +285,7 @@ export abstract class IFromBTCSelfInitSwap<
     /**
      * @inheritDoc
      */
-    abstract txsClaim(signer?: T["Signer"]): Promise<T["TX"][]>;
+    abstract txsClaim(signer?: string | T["Signer"] | T["NativeSigner"]): Promise<T["TX"][]>;
 
     /**
      * @inheritDoc

package/src/swaps/escrow_swaps/frombtc/ln/FromBTCLNSwap.ts

@@ -282,8 +282,8 @@ export class FromBTCLNSwap<T extends ChainType = ChainType>
      * @inheritDoc
      * @internal
      */
-    protected canCommit(): boolean {
-        return this._state===FromBTCLNSwapState.PR_PAID;
+    protected canCommit(skipQuoteExpiryChecks?: boolean): boolean {
+        return this._state===FromBTCLNSwapState.PR_PAID || (!!skipQuoteExpiryChecks && this._state===FromBTCLNSwapState.QUOTE_SOFT_EXPIRED);
     }
 
     /**
@@ -899,7 +899,7 @@ export class FromBTCLNSwap<T extends ChainType = ChainType>
         );
 
         this._commitTxId = result[result.length-1];
-        if(this._state===FromBTCLNSwapState.PR_PAID || this._state===FromBTCLNSwapState.QUOTE_SOFT_EXPIRED) {
+        if(this._state===FromBTCLNSwapState.PR_PAID || this._state===FromBTCLNSwapState.QUOTE_SOFT_EXPIRED || this._state===FromBTCLNSwapState.QUOTE_EXPIRED) {
             await this._saveAndEmit(FromBTCLNSwapState.CLAIM_COMMITED);
         }
         return this._commitTxId;
@@ -953,7 +953,18 @@ export class FromBTCLNSwap<T extends ChainType = ChainType>
      *
      * @internal
      */
-    private async _txsClaim(_signer?: T["Signer"] | T["NativeSigner"], secret?: string): Promise<T["TX"][]> {
+    private async _txsClaim(_signer?: string | T["Signer"] | T["NativeSigner"], secret?: string): Promise<T["TX"][]> {
+        let address: string | undefined = undefined;
+        if(_signer!=null) {
+            if (typeof (_signer) === "string") {
+                address = _signer;
+            } else if (isAbstractSigner(_signer)) {
+                address = _signer.getAddress();
+            } else {
+                address = (await this.wrapper._chain.wrapSigner(_signer)).getAddress();
+            }
+        }
+
         if(this._data==null) throw new Error("Unknown data, wrong state?");
         const useSecret = secret ?? this.secret;
         if(useSecret==null)
@@ -962,9 +973,7 @@ export class FromBTCLNSwap<T extends ChainType = ChainType>
             throw new Error("Invalid swap secret pre-image provided!");
 
         return this.wrapper._contract.txsClaimWithSecret(
-            _signer==null ?
-                this._getInitiator() :
-                (isAbstractSigner(_signer) ? _signer : await this.wrapper._chain.wrapSigner(_signer)),
+            address ?? this._getInitiator(),
             this._data, useSecret, true, true
         );
     }
@@ -978,7 +987,7 @@ export class FromBTCLNSwap<T extends ChainType = ChainType>
      *
      * @throws {Error} If in invalid state (must be {@link FromBTCLNSwapState.CLAIM_COMMITED})
      */
-    async txsClaim(_signer?: T["Signer"] | T["NativeSigner"], secret?: string): Promise<T["TX"][]> {
+    async txsClaim(_signer?: string | T["Signer"] | T["NativeSigner"], secret?: string): Promise<T["TX"][]> {
         if(this._state!==FromBTCLNSwapState.CLAIM_COMMITED) throw new Error("Must be in CLAIM_COMMITED state!");
         return this._txsClaim(_signer, secret);
     }

package/src/swaps/escrow_swaps/frombtc/ln/FromBTCLNWrapper.ts

@@ -4,7 +4,7 @@ import {
     ChainSwapType,
     ChainType,
     ClaimEvent,
-    InitializeEvent, LightningNetworkApi,
+    InitializeEvent, LightningNetworkApi, LNNodeLiquidity,
     RefundEvent, SwapCommitState, SwapCommitStateType
 } from "@atomiqlabs/base";
 import {Intermediary} from "../../../../intermediaries/Intermediary";
@@ -137,6 +137,7 @@ export class FromBTCLNWrapper<
         super(
             chainIdentifier, unifiedStorage, unifiedChainEvents, chain, contract, prices, tokens, swapDataDeserializer, lnApi,
             {
+                ...options,
                 safetyFactor: options?.safetyFactor ?? 2,
                 bitcoinBlocktime: options?.bitcoinBlocktime ?? 10*60,
                 unsafeSkipLnNodeCheck: options?.unsafeSkipLnNodeCheck ?? false
@@ -317,8 +318,13 @@ export class FromBTCLNWrapper<
                             this._options.postRequestTimeout, abortController.signal, retryCount>0 ? false : undefined
                         );
 
+                        let lnCapacityPromise: Promise<LNNodeLiquidity | null> | undefined;
+                        if(!_options.unsafeSkipLnNodeCheck) {
+                            lnCapacityPromise = this.preFetchLnCapacity(lnPublicKey);
+                        } else lnPublicKey.catch(() => {});
+
                         return {
-                            lnCapacityPromise: _options.unsafeSkipLnNodeCheck ? null : this.preFetchLnCapacity(lnPublicKey),
+                            lnCapacityPromise,
                             resp: await response
                         };
                     }, undefined, RequestError, abortController.signal);
@@ -356,7 +362,6 @@ export class FromBTCLNWrapper<
                             secret: secret?.toString("hex"),
                             exactIn: amountData.exactIn ?? true
                         } as FromBTCLNSwapInit<T["Data"]>);
-                        await quote._save();
                         return quote;
                     } catch (e) {
                         abortController.abort(e);

package/src/swaps/escrow_swaps/frombtc/ln_auto/FromBTCLNAutoSwap.ts

@@ -566,7 +566,7 @@ export class FromBTCLNAutoSwap<T extends ChainType = ChainType>
      * @internal
      */
     protected getInputAmountWithoutFee(): bigint | null {
-        if(this.btcAmountGas==null || this.btcAmountSwap) return null;
+        if(this.btcAmountGas==null || this.btcAmountSwap==null) return null;
         return this.getInputSwapAmountWithoutFee()! + this.getInputGasAmountWithoutFee()! - this.getWatchtowerFeeAmountBtc()!;
     }
 
@@ -1144,7 +1144,17 @@ export class FromBTCLNAutoSwap<T extends ChainType = ChainType>
      *
      * @throws {Error} If in invalid state (must be {@link FromBTCLNAutoSwapState.CLAIM_COMMITED})
      */
-    async txsClaim(_signer?: T["Signer"] | T["NativeSigner"], secret?: string): Promise<T["TX"][]> {
+    async txsClaim(_signer?: string | T["Signer"] | T["NativeSigner"], secret?: string): Promise<T["TX"][]> {
+        let address: string | undefined = undefined;
+        if(_signer!=null) {
+            if (typeof (_signer) === "string") {
+                address = _signer;
+            } else if (isAbstractSigner(_signer)) {
+                address = _signer.getAddress();
+            } else {
+                address = (await this.wrapper._chain.wrapSigner(_signer)).getAddress();
+            }
+        }
         if(this._state!==FromBTCLNAutoSwapState.CLAIM_COMMITED) throw new Error("Must be in CLAIM_COMMITED state!");
         if(this._data==null) throw new Error("Unknown data, wrong state?");
 
@@ -1155,9 +1165,7 @@ export class FromBTCLNAutoSwap<T extends ChainType = ChainType>
             throw new Error("Invalid swap secret pre-image provided!");
 
         return await this.wrapper._contract.txsClaimWithSecret(
-            _signer==null ?
-                this._getInitiator() :
-                (isAbstractSigner(_signer) ? _signer : await this.wrapper._chain.wrapSigner(_signer)),
+            address ?? this._getInitiator(),
             this._data, useSecret, true, true
         );
     }

package/src/swaps/escrow_swaps/frombtc/ln_auto/FromBTCLNAutoWrapper.ts

@@ -3,7 +3,7 @@ import {
     ChainSwapType,
     ChainType,
     ClaimEvent,
-    InitializeEvent, LightningNetworkApi, Messenger,
+    InitializeEvent, LightningNetworkApi, LNNodeLiquidity, Messenger,
     RefundEvent, SwapCommitState, SwapCommitStateType
 } from "@atomiqlabs/base";
 import {Intermediary} from "../../../../intermediaries/Intermediary";
@@ -174,6 +174,7 @@ export class FromBTCLNAutoWrapper<
         super(
             chainIdentifier, unifiedStorage, unifiedChainEvents, chain, contract, prices, tokens, swapDataDeserializer, lnApi,
             {
+                ...options,
                 safetyFactor: options?.safetyFactor ?? 2,
                 bitcoinBlocktime: options?.bitcoinBlocktime ?? 10*60,
                 unsafeSkipLnNodeCheck: options?.unsafeSkipLnNodeCheck ?? false
@@ -210,7 +211,6 @@ export class FromBTCLNAutoWrapper<
                 return false;
             }
 
-            swap._commitTxId = event.meta?.txId;
             swap._commitedAt ??= Date.now();
             swap._state = FromBTCLNAutoSwapState.CLAIM_COMMITED;
             if(swap.hasSecretPreimage()) swap._broadcastSecret().catch(e => {
@@ -227,7 +227,6 @@ export class FromBTCLNAutoWrapper<
      */
     protected processEventClaim(swap: FromBTCLNAutoSwap<T>, event: ClaimEvent<T["Data"]>): Promise<boolean> {
         if(swap._state!==FromBTCLNAutoSwapState.FAILED && swap._state!==FromBTCLNAutoSwapState.CLAIM_CLAIMED) {
-            swap._claimTxId = event.meta?.txId;
             swap._state = FromBTCLNAutoSwapState.CLAIM_CLAIMED;
             swap._setSwapSecret(event.result);
             return Promise.resolve(true);
@@ -241,7 +240,6 @@ export class FromBTCLNAutoWrapper<
      */
     protected processEventRefund(swap: FromBTCLNAutoSwap<T>, event: RefundEvent<T["Data"]>): Promise<boolean> {
         if(swap._state!==FromBTCLNAutoSwapState.CLAIM_CLAIMED && swap._state!==FromBTCLNAutoSwapState.FAILED) {
-            swap._refundTxId ??= event.meta?.txId;
             swap._state = FromBTCLNAutoSwapState.FAILED;
             return Promise.resolve(true);
         }
@@ -435,8 +433,13 @@ export class FromBTCLNAutoWrapper<
                             this._options.postRequestTimeout, abortController.signal, retryCount>0 ? false : undefined
                         );
 
+                        let lnCapacityPromise: Promise<LNNodeLiquidity | null> | undefined;
+                        if(!_options.unsafeSkipLnNodeCheck) {
+                            lnCapacityPromise = this.preFetchLnCapacity(lnPublicKey);
+                        } else lnPublicKey.catch(() => {});
+
                         return {
-                            lnCapacityPromise: _options.unsafeSkipLnNodeCheck ? undefined : this.preFetchLnCapacity(lnPublicKey),
+                            lnCapacityPromise,
                             resp: await response
                         };
                     }, undefined, RequestError, abortController.signal);
@@ -493,8 +496,6 @@ export class FromBTCLNAutoWrapper<
                             exactIn: amountData.exactIn ?? true
                         };
                         const quote = new FromBTCLNAutoSwap<T>(this, swapInit);
-                        await quote._save();
-                        this.logger.debug("create(): Created new FromBTCLNAutoSwap quote, claimHash (pseudo escrowHash): ", quote._getEscrowHash());
                         return quote;
                     } catch (e) {
                         abortController.abort(e);

package/src/swaps/escrow_swaps/frombtc/onchain/FromBTCSwap.ts

@@ -333,8 +333,8 @@ export class FromBTCSwap<T extends ChainType = ChainType>
      * @inheritDoc
      * @internal
      */
-    protected canCommit(): boolean {
-        if(this._state!==FromBTCSwapState.PR_CREATED) return false;
+    protected canCommit(skipQuoteExpiryChecks?: boolean): boolean {
+        if(this._state!==FromBTCSwapState.PR_CREATED && (!skipQuoteExpiryChecks || this._state!==FromBTCSwapState.QUOTE_SOFT_EXPIRED)) return false;
         if(this.requiredConfirmations==null) return false;
         const expiry = this.wrapper._getOnchainSendTimeout(this._data, this.requiredConfirmations);
         const currentTimestamp = BigInt(Math.floor(Date.now()/1000));
@@ -900,7 +900,7 @@ export class FromBTCSwap<T extends ChainType = ChainType>
         );
 
         this._commitTxId = result[result.length - 1];
-        if(this._state===FromBTCSwapState.PR_CREATED || this._state===FromBTCSwapState.QUOTE_SOFT_EXPIRED) {
+        if(this._state===FromBTCSwapState.PR_CREATED || this._state===FromBTCSwapState.QUOTE_SOFT_EXPIRED || this._state===FromBTCSwapState.QUOTE_EXPIRED) {
             await this._saveAndEmit(FromBTCSwapState.CLAIM_COMMITED);
         }
         return this._commitTxId;
@@ -1191,6 +1191,8 @@ export class FromBTCSwap<T extends ChainType = ChainType>
         return changed;
     }
 
+    private btcTxLastChecked?: number;
+
     /**
      * @inheritDoc
      * @internal
@@ -1222,6 +1224,7 @@ export class FromBTCSwap<T extends ChainType = ChainType>
                 }
                 if(this.address==null) return save;
 
+                this.btcTxLastChecked = Date.now();
                 const res = await this.getBitcoinPayment();
                 if(res!=null) {
                     if(this.txId!==res.txId) {
@@ -1261,9 +1264,10 @@ export class FromBTCSwap<T extends ChainType = ChainType>
                     return true;
                 }
             case FromBTCSwapState.EXPIRED:
-                //Check if bitcoin payment was received every 2 minutes
-                if(Math.floor(Date.now()/1000)%120===0) {
+                //Check if bitcoin payment was received at least every 2 minutes
+                if(this.btcTxLastChecked==null || Date.now() - this.btcTxLastChecked > 120_000) {
                     if(this.address!=null) try {
+                        this.btcTxLastChecked = Date.now();
                         const res = await this.getBitcoinPayment();
                         if(res!=null) {
                             let shouldSave: boolean = false;

package/src/swaps/escrow_swaps/frombtc/onchain/FromBTCWrapper.ts

@@ -150,6 +150,7 @@ export class FromBTCWrapper<
         super(
             chainIdentifier, unifiedStorage, unifiedChainEvents, chain, contract, prices, tokens, swapDataDeserializer,
             {
+                ...options,
                 bitcoinNetwork: options?.bitcoinNetwork ?? TEST_NETWORK,
                 safetyFactor: options?.safetyFactor ?? 2,
                 blocksTillTxConfirms: options?.blocksTillTxConfirms ?? 12,
@@ -472,8 +473,13 @@ export class FromBTCWrapper<
                                 this._options.postRequestTimeout, abortController.signal, retryCount>0 ? false : undefined
                             );
 
+                            let signDataPromise = _signDataPromise;
+                            if(signDataPromise==null) {
+                                signDataPromise = this.preFetchSignData(signDataPrefetch);
+                            } else signDataPrefetch.catch(() => {});
+
                             return {
-                                signDataPromise: _signDataPromise ?? this.preFetchSignData(signDataPrefetch),
+                                signDataPromise,
                                 resp: await response
                             };
                         }, undefined, e => e instanceof RequestError, abortController.signal);
@@ -506,7 +512,6 @@ export class FromBTCWrapper<
                             exactIn: amountData.exactIn ?? true,
                             requiredConfirmations: resp.confirmations
                         } as FromBTCSwapInit<T["Data"]>);
-                        await quote._save();
                         return quote;
                     } catch (e) {
                         abortController.abort(e);

package/src/swaps/escrow_swaps/tobtc/IToBTCSwap.ts

@@ -593,7 +593,7 @@ export abstract class IToBTCSwap<
      * @throws {Error} When in invalid state (not {@link ToBTCSwapState.CREATED})
      */
     async txsCommit(skipChecks?: boolean): Promise<T["TX"][]> {
-        if(this._state!==ToBTCSwapState.CREATED) throw new Error("Must be in CREATED state!");
+        if(this._state!==ToBTCSwapState.CREATED && (!skipChecks || this._state!==ToBTCSwapState.QUOTE_SOFT_EXPIRED)) throw new Error("Must be in CREATED state!");
         if(this.signatureData==null) throw new Error("Init signature data not known, cannot commit!");
 
         if(!this.initiated) {

package/src/swaps/escrow_swaps/tobtc/IToBTCWrapper.ts

@@ -90,7 +90,6 @@ export abstract class IToBTCWrapper<
     protected async processEventInitialize(swap: D["Swap"], event: InitializeEvent<T["Data"]>): Promise<boolean> {
         if(swap._state===ToBTCSwapState.CREATED || swap._state===ToBTCSwapState.QUOTE_SOFT_EXPIRED) {
             swap._state = ToBTCSwapState.COMMITED;
-            if(swap._commitTxId==null) swap._commitTxId = event.meta?.txId;
             return true;
         }
         return false;
@@ -108,7 +107,6 @@ export abstract class IToBTCWrapper<
                 this.logger.warn(`processEventClaim(): Failed to set payment result ${event.result}: `, e);
             });
             swap._state = ToBTCSwapState.CLAIMED;
-            if(swap._claimTxId==null) swap._claimTxId = event.meta?.txId;
             return true;
         }
         return false;
@@ -120,7 +118,6 @@ export abstract class IToBTCWrapper<
     protected processEventRefund(swap: D["Swap"], event: RefundEvent<T["Data"]>): Promise<boolean> {
         if(swap._state!==ToBTCSwapState.CLAIMED && swap._state!==ToBTCSwapState.REFUNDED) {
             swap._state = ToBTCSwapState.REFUNDED;
-            if(swap._refundTxId==null) swap._refundTxId = event.meta?.txId;
             return Promise.resolve(true);
         }
         return Promise.resolve(false);

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

@@ -112,6 +112,7 @@ export class ToBTCLNWrapper<T extends ChainType> extends IToBTCWrapper<T, ToBTCL
         super(
             chainIdentifier, unifiedStorage, unifiedChainEvents, chain, contract, prices, tokens, swapDataDeserializer,
             {
+                ...options,
                 paymentTimeoutSeconds: options?.paymentTimeoutSeconds ?? 5*24*60*60,
                 lightningBaseFee: options?.lightningBaseFee ?? 10,
                 lightningFeePPM: options?.lightningFeePPM ?? 2000
@@ -289,8 +290,13 @@ export class ToBTCLNWrapper<T extends ChainType> extends IToBTCWrapper<T, ToBTCL
                     additionalParams
                 }, this._options.postRequestTimeout, abortController.signal, retryCount>0 ? false : undefined);
 
+                let signDataPromise = preFetches.signDataPrefetchPromise;
+                if(signDataPromise==null) {
+                    signDataPromise = this.preFetchSignData(signDataPrefetch);
+                } else signDataPrefetch.catch(() => {});
+
                 return {
-                    signDataPromise: preFetches.signDataPrefetchPromise ?? this.preFetchSignData(signDataPrefetch),
+                    signDataPromise,
                     resp: await response
                 };
             }, undefined, e => e instanceof RequestError, abortController.signal);
@@ -335,7 +341,6 @@ export class ToBTCLNWrapper<T extends ChainType> extends IToBTCWrapper<T, ToBTCL
                 pr,
                 exactIn: false
             } as IToBTCSwapInit<T["Data"]>);
-            await quote._save();
             return quote;
         } catch (e) {
             abortController.abort(e);
@@ -539,7 +544,6 @@ export class ToBTCLNWrapper<T extends ChainType> extends IToBTCWrapper<T, ToBTCL
                 pr: invoice,
                 exactIn: true
             } as IToBTCSwapInit<T["Data"]>);
-            await quote._save();
             return quote;
         } catch (e) {
             abortController.abort(e);

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

@@ -97,6 +97,7 @@ export class ToBTCWrapper<T extends ChainType> extends IToBTCWrapper<T, ToBTCDef
         super(
             chainIdentifier, unifiedStorage, unifiedChainEvents, chain, contract, prices, tokens, swapDataDeserializer,
             {
+                ...options,
                 bitcoinNetwork: options?.bitcoinNetwork ?? TEST_NETWORK,
                 safetyFactor: options?.safetyFactor ?? 2,
                 maxConfirmations: options?.maxConfirmations ?? 6,
@@ -272,8 +273,13 @@ export class ToBTCWrapper<T extends ChainType> extends IToBTCWrapper<T, ToBTCDef
                                 additionalParams
                             }, this._options.postRequestTimeout, abortController.signal, retryCount>0 ? false : undefined);
 
+                            let signDataPromise = _signDataPromise;
+                            if(signDataPromise==null) {
+                                signDataPromise = this.preFetchSignData(signDataPrefetch);
+                            } else signDataPrefetch.catch(() => {});
+
                             return {
-                                signDataPromise: _signDataPromise ?? this.preFetchSignData(signDataPrefetch),
+                                signDataPromise,
                                 resp: await response
                             };
                         }, undefined, RequestError, abortController.signal);
@@ -319,7 +325,6 @@ export class ToBTCWrapper<T extends ChainType> extends IToBTCWrapper<T, ToBTCDef
                             requiredConfirmations: _options.confirmations,
                             nonce
                         } as ToBTCSwapInit<T["Data"]>);
-                        await quote._save();
                         return quote;
                     } catch (e) {
                         abortController.abort(e);