@atomiqlabs/sdk 8.6.0 → 8.6.3

package/src/swaps/spv_swaps/SpvFromBTCSwap.ts

@@ -354,7 +354,7 @@ export class SpvFromBTCSwap<T extends ChainType>
      */
     protected upgradeVersion() {
         if(this.version===1) {
-            this.posted = this.initiated;
+            this.posted = this.initiated && this._data!=null;
             this.version = 2;
         }
     }
@@ -1571,6 +1571,8 @@ export class SpvFromBTCSwap<T extends ChainType>
         this._senderAddress = btcTx.inputAddresses[1];
     }
 
+    private btcTxLastChecked?: number;
+
     /**
      * @internal
      */
@@ -1578,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
@@ -1724,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;
     }
 

package/src/utils/RetryUtils.ts

@@ -40,12 +40,19 @@ function checkError(e: any, errorAllowed: ((e: any) => boolean) | Constructor<Er
  * @param retryPolicy.exponential Whether to use exponentially increasing delays
  * @param errorAllowed A callback for determining whether a given error is allowed, and we should therefore not retry
  * @param abortSignal
+ * @param failureLogLevel
  * @returns Result of the action executing callback
  * @category Utilities
  */
-export async function tryWithRetries<T>(func: (retryCount: number) => Promise<T>, retryPolicy?: {
-    maxRetries?: number, delay?: number, exponential?: boolean
-}, errorAllowed?: ((e: any) => boolean) | Constructor<Error> | Constructor<Error>[], abortSignal?: AbortSignal): Promise<T> {
+export async function tryWithRetries<T>(
+    func: (retryCount: number) => Promise<T>,
+    retryPolicy?: {
+        maxRetries?: number, delay?: number, exponential?: boolean
+    },
+    errorAllowed?: ((e: any) => boolean) | Constructor<Error> | Constructor<Error>[],
+    abortSignal?: AbortSignal,
+    failureLogLevel: "debug" | "info" | "warn" | "error" = "warn"
+): Promise<T> {
     retryPolicy = retryPolicy || {};
     retryPolicy.maxRetries = retryPolicy.maxRetries || 5;
     retryPolicy.delay = retryPolicy.delay || 500;
@@ -59,7 +66,7 @@ export async function tryWithRetries<T>(func: (retryCount: number) => Promise<T>
         } catch (e) {
             if (errorAllowed != null && checkError(e, errorAllowed)) throw e;
             err = e;
-            logger.debug("tryWithRetries(): Error on try number: " + i, e);
+            logger[failureLogLevel]("tryWithRetries(): Error on try number: " + i, e);
         }
         if (abortSignal != null && abortSignal.aborted) throw (abortSignal.reason || new Error("Aborted"));
         if (i !== retryPolicy.maxRetries - 1) {