@atomiqlabs/sdk 8.5.0 → 8.6.2

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,10 +211,9 @@ export class FromBTCLNAutoWrapper<
                 return false;
             }
 
-            swap._commitTxId = event.meta?.txId;
             swap._commitedAt ??= Date.now();
             swap._state = FromBTCLNAutoSwapState.CLAIM_COMMITED;
-            swap._broadcastSecret().catch(e => {
+            if(swap.hasSecretPreimage()) swap._broadcastSecret().catch(e => {
                 this.logger.error("processEventInitialize("+swap.getId()+"): Error when broadcasting swap secret: ", e);
             });
             return true;
@@ -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);

package/src/swaps/spv_swaps/SpvFromBTCSwap.ts

@@ -193,6 +193,8 @@ export class SpvFromBTCSwap<T extends ChainType>
     extends ISwap<T, SpvFromBTCTypeDefinition<T>>
     implements IBTCWalletSwap, ISwapWithGasDrop<T>, IClaimableSwap<T, SpvFromBTCTypeDefinition<T>, SpvFromBTCSwapState> {
 
+    protected readonly currentVersion: number = 2;
+
     readonly TYPE: SwapType.SPV_VAULT_FROM_BTC = SwapType.SPV_VAULT_FROM_BTC;
 
     /**
@@ -240,6 +242,8 @@ export class SpvFromBTCSwap<T extends ChainType>
 
     private readonly gasPricingInfo?: PriceInfoType;
 
+    private posted?: boolean;
+
     /**
      * @internal
      */
@@ -337,6 +341,7 @@ export class SpvFromBTCSwap<T extends ChainType>
             this._frontTxId = initOrObject.frontTxId;
             this.gasPricingInfo = deserializePriceInfoType(initOrObject.gasPricingInfo);
             this.btcTxConfirmedAt = initOrObject.btcTxConfirmedAt;
+            this.posted = initOrObject.posted;
             if(initOrObject.data!=null) this._data = new this.wrapper._spvWithdrawalDataDeserializer(initOrObject.data);
         }
         this.tryCalculateSwapFee();
@@ -347,7 +352,12 @@ export class SpvFromBTCSwap<T extends ChainType>
      * @inheritDoc
      * @internal
      */
-    protected upgradeVersion() { /*NOOP*/ }
+    protected upgradeVersion() {
+        if(this.version===1) {
+            this.posted = this.initiated && this._data!=null;
+            this.version = 2;
+        }
+    }
 
     /**
      * @inheritDoc
@@ -973,6 +983,7 @@ export class SpvFromBTCSwap<T extends ChainType>
 
         this._data = data;
         this.initiated = true;
+        this.posted = true;
         await this._saveAndEmit(SpvFromBTCSwapState.SIGNED);
 
         try {
@@ -1186,7 +1197,7 @@ export class SpvFromBTCSwap<T extends ChainType>
         if(
             this._state!==SpvFromBTCSwapState.POSTED &&
             this._state!==SpvFromBTCSwapState.BROADCASTED &&
-            !(this._state===SpvFromBTCSwapState.QUOTE_SOFT_EXPIRED && this.initiated)
+            !(this._state===SpvFromBTCSwapState.QUOTE_SOFT_EXPIRED && this.posted)
         ) throw new Error("Must be in POSTED or BROADCASTED state!");
         if(this._data==null) throw new Error("Expected swap to have withdrawal data filled!");
 
@@ -1529,6 +1540,7 @@ export class SpvFromBTCSwap<T extends ChainType>
             executionFeeShare: this.executionFeeShare.toString(10),
             genesisSmartChainBlockHeight: this._genesisSmartChainBlockHeight,
             gasPricingInfo: serializePriceInfoType(this.gasPricingInfo),
+            posted: this.posted,
 
             senderAddress: this._senderAddress,
             claimTxId: this._claimTxId,
@@ -1559,6 +1571,8 @@ export class SpvFromBTCSwap<T extends ChainType>
         this._senderAddress = btcTx.inputAddresses[1];
     }
 
+    private btcTxLastChecked?: number;
+
     /**
      * @internal
      */
@@ -1566,6 +1580,7 @@ export class SpvFromBTCSwap<T extends ChainType>
         if(this._data?.btcTx==null) return false;
 
         //Check if bitcoin payment was confirmed
+        this.btcTxLastChecked = Date.now();
         const res = await this.getBitcoinPayment();
         if(res==null) {
             //Check inputs double-spent
@@ -1704,7 +1719,7 @@ export class SpvFromBTCSwap<T extends ChainType>
             }
         }
 
-        if(this._state===SpvFromBTCSwapState.QUOTE_SOFT_EXPIRED && !this.initiated) {
+        if(this._state===SpvFromBTCSwapState.QUOTE_SOFT_EXPIRED && !this.posted) {
             if(this.expiry<Date.now()) {
                 this._state = SpvFromBTCSwapState.QUOTE_EXPIRED;
                 if(save) await this._saveAndEmit();
@@ -1712,7 +1727,7 @@ export class SpvFromBTCSwap<T extends ChainType>
             }
         }
 
-        if(Math.floor(Date.now()/1000)%120===0) {
+        if(this.btcTxLastChecked==null || Date.now() - this.btcTxLastChecked > 120_000) {
             if (
                 this._state === SpvFromBTCSwapState.POSTED ||
                 this._state === SpvFromBTCSwapState.BROADCASTED

package/src/swaps/spv_swaps/SpvFromBTCWrapper.ts

@@ -186,6 +186,7 @@ export class SpvFromBTCWrapper<
         super(
             chainIdentifier, unifiedStorage, unifiedChainEvents, chain, prices, tokens,
             {
+                ...options,
                 bitcoinNetwork: options?.bitcoinNetwork ?? TEST_NETWORK,
                 maxConfirmations: options?.maxConfirmations ?? 6,
                 bitcoinBlocktime: options?.bitcoinBlocktime ?? 10*60,
@@ -210,7 +211,6 @@ export class SpvFromBTCWrapper<
             swap._state===SpvFromBTCSwapState.QUOTE_SOFT_EXPIRED || swap._state===SpvFromBTCSwapState.BTC_TX_CONFIRMED
         ) {
             swap._state = SpvFromBTCSwapState.FRONTED;
-            swap._frontTxId = event.meta?.txId;
             await swap._setBitcoinTxId(event.btcTxId).catch(e => {
                 this.logger.warn("processEventFront(): Failed to set bitcoin txId: ", e);
             });
@@ -227,7 +227,6 @@ export class SpvFromBTCWrapper<
             swap._state===SpvFromBTCSwapState.BTC_TX_CONFIRMED
         ) {
             swap._state = SpvFromBTCSwapState.CLAIMED;
-            swap._claimTxId = event.meta?.txId;
             await swap._setBitcoinTxId(event.btcTxId).catch(e => {
                 this.logger.warn("processEventClaim(): Failed to set bitcoin txId: ", e);
             });
@@ -708,7 +707,6 @@ export class SpvFromBTCWrapper<
                             )
                         };
                         const quote = new SpvFromBTCSwap<T>(this, swapInit);
-                        await quote._save();
                         return quote;
                     } catch (e) {
                         abortController.abort(e);

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

@@ -84,7 +84,6 @@ export class LnForGasWrapper<T extends ChainType> extends ISwapWrapper<T, LnForG
             exactIn: false
         };
         const quote = new LnForGasSwap(this, quoteInit);
-        await quote._save();
         return quote;
     }
 

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

@@ -124,7 +124,6 @@ export class OnchainForGasWrapper<T extends ChainType> extends ISwapWrapper<T, O
             exactIn: false,
             token
         } as OnchainForGasSwapInit);
-        await quote._save();
         return quote;
     }