@atomiqlabs/lp-lib 17.1.1 → 17.1.2

package/dist/swaps/SwapHandler.js

@@ -77,8 +77,8 @@ class SwapHandler {
      * @param ultimateState set the ultimate state of the swap before removing
      */
     async removeSwapData(swap, ultimateState) {
-        this.inflightSwaps.delete(swap.getIdentifier());
-        this.logger.debug("removeSwapData(): Removing in-flight swap, current in-flight swaps: " + this.inflightSwaps.size);
+        if (this.inflightSwaps.delete(swap.getIdentifier()))
+            this.logger.debug("removeSwapData(): Removing in-flight swap, current in-flight swaps: " + this.inflightSwaps.size);
         if (ultimateState != null)
             await swap.setState(ultimateState);
         if (swap != null)
@@ -87,13 +87,16 @@ class SwapHandler {
         await this.storageManager.removeData(swap.getIdentifierHash(), swap.getSequence());
     }
     async saveSwapData(swap) {
+        const identifier = swap.getIdentifier();
         if (this.inflightSwapStates.has(swap.state)) {
-            this.inflightSwaps.add(swap.getIdentifier());
-            this.logger.debug("removeSwapData(): Adding in-flight swap, current in-flight swaps: " + this.inflightSwaps.size);
+            if (!this.inflightSwaps.has(identifier)) {
+                this.inflightSwaps.add(identifier);
+                this.logger.debug("saveSwapData(): Adding in-flight swap, current in-flight swaps: " + this.inflightSwaps.size);
+            }
         }
         else {
-            this.inflightSwaps.delete(swap.getIdentifier());
-            this.logger.debug("removeSwapData(): Removing in-flight swap, current in-flight swaps: " + this.inflightSwaps.size);
+            if (this.inflightSwaps.delete(identifier))
+                this.logger.debug("saveSwapData(): Removing in-flight swap, current in-flight swaps: " + this.inflightSwaps.size);
         }
         await this.storageManager.saveData(swap.getIdentifierHash(), swap.getSequence(), swap);
     }
@@ -130,7 +133,12 @@ class SwapHandler {
         if (minNativeTokenReserve === 0n)
             return;
         const balance = await balancePrefetch;
-        if (balance == null || balance < minNativeTokenReserve) {
+        if (signal != null)
+            signal.throwIfAborted();
+        if (balance == null) {
+            throw new Error("Failed to fetch native token balance!");
+        }
+        if (balance < minNativeTokenReserve) {
             throw {
                 code: 20012,
                 msg: "LP ran out of native token to cover gas fees"

package/package.json

@@ -1,10 +1,11 @@
 {
   "name": "@atomiqlabs/lp-lib",
-  "version": "17.1.1",
+  "version": "17.1.2",
   "description": "Main functionality implementation for atomiq LP node",
   "main": "./dist/index.js",
   "types:": "./dist/index.d.ts",
   "scripts": {
+    "build": "npx -y -p typescript@4.9 tsc",
     "test": "echo \"Error: no test specified\" && exit 1"
   },
   "files": [

package/src/swaps/SwapHandler.ts

@@ -179,8 +179,8 @@ export abstract class SwapHandler<V extends SwapHandlerSwap<S> = SwapHandlerSwap
      * @param ultimateState set the ultimate state of the swap before removing
      */
     protected async removeSwapData(swap: V, ultimateState?: S) {
-        this.inflightSwaps.delete(swap.getIdentifier());
-        this.logger.debug("removeSwapData(): Removing in-flight swap, current in-flight swaps: "+this.inflightSwaps.size);
+        if(this.inflightSwaps.delete(swap.getIdentifier()))
+            this.logger.debug("removeSwapData(): Removing in-flight swap, current in-flight swaps: "+this.inflightSwaps.size);
         if(ultimateState!=null) await swap.setState(ultimateState);
         if(swap!=null) await PluginManager.swapRemove(swap);
         this.swapLogger.debug(swap, "removeSwapData(): removing swap final state: "+swap.state);
@@ -188,12 +188,15 @@ export abstract class SwapHandler<V extends SwapHandlerSwap<S> = SwapHandlerSwap
     }
 
     protected async saveSwapData(swap: V) {
+        const identifier = swap.getIdentifier();
         if(this.inflightSwapStates.has(swap.state)) {
-            this.inflightSwaps.add(swap.getIdentifier());
-            this.logger.debug("removeSwapData(): Adding in-flight swap, current in-flight swaps: "+this.inflightSwaps.size);
+            if(!this.inflightSwaps.has(identifier)) {
+                this.inflightSwaps.add(identifier);
+                this.logger.debug("saveSwapData(): Adding in-flight swap, current in-flight swaps: "+this.inflightSwaps.size);
+            }
         } else {
-            this.inflightSwaps.delete(swap.getIdentifier());
-            this.logger.debug("removeSwapData(): Removing in-flight swap, current in-flight swaps: "+this.inflightSwaps.size);
+            if(this.inflightSwaps.delete(identifier))
+                this.logger.debug("saveSwapData(): Removing in-flight swap, current in-flight swaps: "+this.inflightSwaps.size);
         }
         await this.storageManager.saveData(swap.getIdentifierHash(), swap.getSequence(), swap);
     }
@@ -232,8 +235,13 @@ export abstract class SwapHandler<V extends SwapHandlerSwap<S> = SwapHandlerSwap
         const minNativeTokenReserve: bigint = this.config.minNativeBalances?.[chainIdentifier] ?? 0n;
         if(minNativeTokenReserve===0n) return;
         const balance = await balancePrefetch;
+        if(signal!=null) signal.throwIfAborted();
+
+        if(balance==null) {
+            throw new Error("Failed to fetch native token balance!");
+        }
 
-        if(balance==null || balance < minNativeTokenReserve) {
+        if(balance < minNativeTokenReserve) {
             throw {
                 code: 20012,
                 msg: "LP ran out of native token to cover gas fees"