@atomiqlabs/lp-lib 16.0.3 → 16.0.5

package/dist/swaps/SwapHandler.d.ts

@@ -82,7 +82,7 @@ export declare abstract class SwapHandler<V extends SwapHandlerSwap<S> = SwapHan
     readonly swapPricing: ISwapPrice;
     abstract readonly inflightSwapStates: Set<S>;
     abstract config: SwapBaseConfig;
-    inflightSwaps: Set<SwapHandlerSwap<S>>;
+    inflightSwaps: Set<string>;
     logger: LoggerType;
     protected swapLogger: {
         debug: (swap: SwapHandlerSwap, msg: string, ...args: any) => void;

package/dist/swaps/SwapHandler.js

@@ -67,7 +67,7 @@ class SwapHandler {
                 await this.storageManager.saveData(swap.getIdentifierHash(), swap.getSequence(), swap);
             }
             if (this.inflightSwapStates.has(swap.state))
-                this.inflightSwaps.add(swap);
+                this.inflightSwaps.add(swap.getIdentifier());
         }
     }
     /**
@@ -77,7 +77,8 @@ class SwapHandler {
      * @param ultimateState set the ultimate state of the swap before removing
      */
     async removeSwapData(swap, ultimateState) {
-        this.inflightSwaps.delete(swap);
+        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,10 +88,12 @@ class SwapHandler {
     }
     async saveSwapData(swap) {
         if (this.inflightSwapStates.has(swap.state)) {
-            this.inflightSwaps.add(swap);
+            this.inflightSwaps.add(swap.getIdentifier());
+            this.logger.debug("removeSwapData(): Adding in-flight swap, current in-flight swaps: " + this.inflightSwaps.size);
         }
         else {
-            this.inflightSwaps.delete(swap);
+            this.inflightSwaps.delete(swap.getIdentifier());
+            this.logger.debug("removeSwapData(): Removing in-flight swap, current in-flight swaps: " + this.inflightSwaps.size);
         }
         await this.storageManager.saveData(swap.getIdentifierHash(), swap.getSequence(), swap);
     }

package/dist/swaps/escrow/EscrowHandler.js

@@ -74,6 +74,8 @@ class EscrowHandler extends SwapHandler_1.SwapHandler {
         }
     }
     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 (ultimateState != null)
             await swap.setState(ultimateState);
         if (swap != null)

package/dist/swaps/spv_vault_swap/SpvVaultSwapHandler.d.ts

@@ -64,6 +64,5 @@ export declare class SpvVaultSwapHandler extends SwapHandler<SpvVaultSwap, SpvVa
     startRestServer(restServer: Express): void;
     getInfoData(): any;
     protected saveSwapData(swap: SpvVaultSwap): Promise<void>;
-    protected removeSwapData(hash: string, sequence: bigint): Promise<void>;
     protected removeSwapData(swap: SpvVaultSwap, ultimateState?: SpvVaultSwapState): Promise<void>;
 }

package/dist/swaps/spv_vault_swap/SpvVaultSwapHandler.js

@@ -518,22 +518,10 @@ class SpvVaultSwapHandler extends SwapHandler_1.SwapHandler {
             this.btcTxIdIndex.set(swap.btcTxId, swap);
         return super.saveSwapData(swap);
     }
-    async removeSwapData(hashOrSwap, sequenceOrUltimateState) {
-        let swap;
-        let state;
-        if (typeof (hashOrSwap) === "string") {
-            if (typeof (sequenceOrUltimateState) !== "bigint")
-                throw new Error("Sequence must be a BN instance!");
-            swap = await this.storageManager.getData(hashOrSwap, sequenceOrUltimateState);
-        }
-        else {
-            swap = hashOrSwap;
-            if (sequenceOrUltimateState != null && typeof (sequenceOrUltimateState) !== "bigint")
-                state = sequenceOrUltimateState;
-        }
+    async removeSwapData(swap, ultimateState) {
         if (swap.btcTxId != null)
             this.btcTxIdIndex.delete(swap.btcTxId);
-        return super.removeSwapData(swap, state);
+        return super.removeSwapData(swap, ultimateState);
     }
 }
 exports.SpvVaultSwapHandler = SpvVaultSwapHandler;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atomiqlabs/lp-lib",
-  "version": "16.0.3",
+  "version": "16.0.5",
   "description": "Main functionality implementation for atomiq LP node",
   "main": "./dist/index.js",
   "types:": "./dist/index.d.ts",

package/src/swaps/SwapHandler.ts

@@ -89,7 +89,7 @@ export abstract class SwapHandler<V extends SwapHandlerSwap<S> = SwapHandlerSwap
     abstract readonly inflightSwapStates: Set<S>;
     abstract config: SwapBaseConfig;
 
-    inflightSwaps: Set<SwapHandlerSwap<S>> = new Set();
+    inflightSwaps: Set<string> = new Set();
 
     logger: LoggerType = getLogger(() => "SwapHandler("+this.type+"): ");
 
@@ -156,7 +156,7 @@ export abstract class SwapHandler<V extends SwapHandlerSwap<S> = SwapHandlerSwap
                 await this.storageManager.removeData(hash, sequence);
                 await this.storageManager.saveData(swap.getIdentifierHash(), swap.getSequence(), swap);
             }
-            if(this.inflightSwapStates.has(swap.state)) this.inflightSwaps.add(swap);
+            if(this.inflightSwapStates.has(swap.state)) this.inflightSwaps.add(swap.getIdentifier());
         }
     }
 
@@ -179,7 +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);
+        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,9 +189,11 @@ export abstract class SwapHandler<V extends SwapHandlerSwap<S> = SwapHandlerSwap
 
     protected async saveSwapData(swap: V) {
         if(this.inflightSwapStates.has(swap.state)) {
-            this.inflightSwaps.add(swap);
+            this.inflightSwaps.add(swap.getIdentifier());
+            this.logger.debug("removeSwapData(): Adding in-flight swap, current in-flight swaps: "+this.inflightSwaps.size);
         } else {
-            this.inflightSwaps.delete(swap);
+            this.inflightSwaps.delete(swap.getIdentifier());
+            this.logger.debug("removeSwapData(): Removing in-flight swap, current in-flight swaps: "+this.inflightSwaps.size);
         }
         await this.storageManager.saveData(swap.getIdentifierHash(), swap.getSequence(), swap);
     }

package/src/swaps/escrow/EscrowHandler.ts

@@ -89,8 +89,9 @@ export abstract class EscrowHandler<V extends EscrowHandlerSwap<SwapData, S>, S>
         }
     }
 
-    protected removeSwapData(swap: V, ultimateState?: S): Promise<void>;
     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(ultimateState!=null) await swap.setState(ultimateState);
         if(swap!=null) await PluginManager.swapRemove(swap);
         this.swapLogger.debug(swap, "removeSwapData(): removing swap final state: "+swap.state);

package/src/swaps/spv_vault_swap/SpvVaultSwapHandler.ts

@@ -667,20 +667,9 @@ export class SpvVaultSwapHandler extends SwapHandler<SpvVaultSwap, SpvVaultSwapS
         return super.saveSwapData(swap);
     }
 
-    protected removeSwapData(hash: string, sequence: bigint): Promise<void>;
-    protected removeSwapData(swap: SpvVaultSwap, ultimateState?: SpvVaultSwapState): Promise<void>;
-    protected async removeSwapData(hashOrSwap: string | SpvVaultSwap, sequenceOrUltimateState?: bigint | SpvVaultSwapState): Promise<void> {
-        let swap: SpvVaultSwap;
-        let state: SpvVaultSwapState;
-        if(typeof(hashOrSwap)==="string") {
-            if(typeof(sequenceOrUltimateState)!=="bigint") throw new Error("Sequence must be a BN instance!");
-            swap = await this.storageManager.getData(hashOrSwap, sequenceOrUltimateState);
-        } else {
-            swap = hashOrSwap;
-            if(sequenceOrUltimateState!=null && typeof(sequenceOrUltimateState)!=="bigint") state = sequenceOrUltimateState;
-        }
+    protected async removeSwapData(swap: SpvVaultSwap, ultimateState?: SpvVaultSwapState): Promise<void> {
         if(swap.btcTxId!=null) this.btcTxIdIndex.delete(swap.btcTxId);
-        return super.removeSwapData(swap, state);
+        return super.removeSwapData(swap, ultimateState);
     }
 
 }