@atomiqlabs/lp-lib 17.1.0 → 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/dist/swaps/escrow/frombtcln_abstract/FromBtcLnAbs.d.ts

@@ -17,7 +17,6 @@ export type FromBtcLnRequestType = {
     paymentHash: string;
     amount: bigint;
     token: string;
-    description?: string;
     descriptionHash?: string;
     exactOut?: boolean;
 };

package/dist/swaps/escrow/frombtcln_abstract/FromBtcLnAbs.js

@@ -500,7 +500,6 @@ class FromBtcLnAbs extends FromBtcBaseSwapHandler_1.FromBtcBaseSwapHandler {
                 token: (val) => val != null &&
                     typeof (val) === "string" &&
                     this.isTokenSupported(chainIdentifier, val) ? val : null,
-                description: SchemaVerifier_1.FieldTypeEnum.StringOptional,
                 descriptionHash: SchemaVerifier_1.FieldTypeEnum.StringOptional,
                 exactOut: SchemaVerifier_1.FieldTypeEnum.BooleanOptional
             });
@@ -510,6 +509,10 @@ class FromBtcLnAbs extends FromBtcBaseSwapHandler_1.FromBtcBaseSwapHandler {
                     msg: "Invalid request body"
                 };
             metadata.request = parsedBody;
+            const descriptionBodyPart = req.paramReader.getExistingParamsOrNull({
+                description: SchemaVerifier_1.FieldTypeEnum.StringOptional
+            });
+            const description = descriptionBodyPart?.description;
             const requestedAmount = { input: !parsedBody.exactOut, amount: parsedBody.amount, token: parsedBody.token };
             const request = {
                 chainIdentifier,
@@ -520,7 +523,7 @@ class FromBtcLnAbs extends FromBtcBaseSwapHandler_1.FromBtcBaseSwapHandler {
             const useToken = parsedBody.token;
             //Check request params
             this.checkTooManyInflightSwaps();
-            this.checkDescription(parsedBody.description);
+            this.checkDescription(description);
             this.checkDescriptionHash(parsedBody.descriptionHash);
             const fees = await this.AmountAssertions.preCheckFromBtcAmounts(this.type, request, requestedAmount);
             metadata.times.requestChecked = Date.now();
@@ -551,7 +554,7 @@ class FromBtcLnAbs extends FromBtcBaseSwapHandler_1.FromBtcBaseSwapHandler {
             metadata.times.balanceChecked = Date.now();
             //Create swap
             const hodlInvoiceObj = {
-                description: parsedBody.description ?? (chainIdentifier + "-" + parsedBody.address),
+                description: description ?? (chainIdentifier + "-" + parsedBody.address),
                 cltvDelta: Number(this.config.minCltv) + 5,
                 expiresAt: Date.now() + (this.config.invoiceTimeoutSeconds * 1000),
                 id: parsedBody.paymentHash,

package/dist/swaps/escrow/frombtcln_autoinit/FromBtcLnAuto.d.ts

@@ -23,7 +23,6 @@ export type FromBtcLnAutoRequestType = {
     gasToken: string;
     gasAmount: bigint;
     claimerBounty: bigint;
-    description?: string;
     descriptionHash?: string;
     exactOut?: boolean;
 };

package/dist/swaps/escrow/frombtcln_autoinit/FromBtcLnAuto.js

@@ -527,7 +527,6 @@ class FromBtcLnAuto extends FromBtcBaseSwapHandler_1.FromBtcBaseSwapHandler {
                 token: (val) => val != null &&
                     typeof (val) === "string" &&
                     this.isTokenSupported(chainIdentifier, val) ? val : null,
-                description: SchemaVerifier_1.FieldTypeEnum.StringOptional,
                 descriptionHash: SchemaVerifier_1.FieldTypeEnum.StringOptional,
                 exactOut: SchemaVerifier_1.FieldTypeEnum.BooleanOptional,
                 gasToken: (val) => val != null &&
@@ -541,6 +540,10 @@ class FromBtcLnAuto extends FromBtcBaseSwapHandler_1.FromBtcBaseSwapHandler {
                     code: 20100,
                     msg: "Invalid request body"
                 };
+            const descriptionBodyPart = req.paramReader.getExistingParamsOrNull({
+                description: SchemaVerifier_1.FieldTypeEnum.StringOptional
+            });
+            const description = descriptionBodyPart?.description;
             if (parsedBody.gasToken !== chainInterface.getNativeCurrencyAddress())
                 throw {
                     code: 20290,
@@ -572,7 +575,7 @@ class FromBtcLnAuto extends FromBtcBaseSwapHandler_1.FromBtcBaseSwapHandler {
             const useToken = parsedBody.token;
             const gasToken = parsedBody.gasToken;
             //Check request params
-            this.checkDescription(parsedBody.description);
+            this.checkDescription(description);
             this.checkDescriptionHash(parsedBody.descriptionHash);
             this.checkTooManyInflightSwaps();
             const fees = await this.AmountAssertions.preCheckFromBtcAmounts(this.type, request, requestedAmount, gasTokenAmount);
@@ -607,7 +610,7 @@ class FromBtcLnAuto extends FromBtcBaseSwapHandler_1.FromBtcBaseSwapHandler {
             metadata.times.balanceChecked = Date.now();
             //Create swap
             const hodlInvoiceObj = {
-                description: parsedBody.description ?? (chainIdentifier + "-" + parsedBody.address),
+                description: description ?? (chainIdentifier + "-" + parsedBody.address),
                 cltvDelta: Number(this.config.minCltv) + 5,
                 expiresAt: Date.now() + (this.config.invoiceTimeoutSeconds * 1000),
                 id: parsedBody.paymentHash,

package/package.json

@@ -1,10 +1,11 @@
 {
   "name": "@atomiqlabs/lp-lib",
-  "version": "17.1.0",
+  "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"

package/src/swaps/escrow/frombtcln_abstract/FromBtcLnAbs.ts

@@ -27,7 +27,6 @@ import {
     LightningNetworkInvoice
 } from "../../../wallets/ILightningWallet";
 import {LightningAssertions} from "../../assertions/LightningAssertions";
-import {FromBtcLnAutoSwapState} from "../frombtcln_autoinit/FromBtcLnAutoSwap";
 
 export type FromBtcLnConfig = FromBtcBaseConfig & {
     invoiceTimeoutSeconds?: number,
@@ -40,7 +39,6 @@ export type FromBtcLnRequestType = {
     paymentHash: string,
     amount: bigint,
     token: string,
-    description?: string,
     descriptionHash?: string,
     exactOut?: boolean
 }
@@ -618,7 +616,6 @@ export class FromBtcLnAbs extends FromBtcBaseSwapHandler<FromBtcLnSwapAbs, FromB
                 token: (val: string) => val!=null &&
                         typeof(val)==="string" &&
                         this.isTokenSupported(chainIdentifier, val) ? val : null,
-                description: FieldTypeEnum.StringOptional,
                 descriptionHash: FieldTypeEnum.StringOptional,
                 exactOut: FieldTypeEnum.BooleanOptional
             });
@@ -628,6 +625,11 @@ export class FromBtcLnAbs extends FromBtcBaseSwapHandler<FromBtcLnSwapAbs, FromB
             };
             metadata.request = parsedBody;
 
+            const descriptionBodyPart = req.paramReader.getExistingParamsOrNull({
+                description: FieldTypeEnum.StringOptional
+            });
+            const description = descriptionBodyPart?.description;
+
             const requestedAmount = {input: !parsedBody.exactOut, amount: parsedBody.amount, token: parsedBody.token};
             const request = {
                 chainIdentifier,
@@ -639,7 +641,7 @@ export class FromBtcLnAbs extends FromBtcBaseSwapHandler<FromBtcLnSwapAbs, FromB
 
             //Check request params
             this.checkTooManyInflightSwaps();
-            this.checkDescription(parsedBody.description);
+            this.checkDescription(description);
             this.checkDescriptionHash(parsedBody.descriptionHash);
             const fees = await this.AmountAssertions.preCheckFromBtcAmounts(this.type, request, requestedAmount);
             metadata.times.requestChecked = Date.now();
@@ -692,7 +694,7 @@ export class FromBtcLnAbs extends FromBtcBaseSwapHandler<FromBtcLnSwapAbs, FromB
 
             //Create swap
             const hodlInvoiceObj: HodlInvoiceInit = {
-                description: parsedBody.description ?? (chainIdentifier+"-"+parsedBody.address),
+                description: description ?? (chainIdentifier+"-"+parsedBody.address),
                 cltvDelta:  Number(this.config.minCltv) + 5,
                 expiresAt: Date.now()+(this.config.invoiceTimeoutSeconds*1000),
                 id: parsedBody.paymentHash,

package/src/swaps/escrow/frombtcln_autoinit/FromBtcLnAuto.ts

@@ -35,7 +35,6 @@ export type FromBtcLnAutoRequestType = {
     gasToken: string,
     gasAmount: bigint,
     claimerBounty: bigint,
-    description?: string,
     descriptionHash?: string,
     exactOut?: boolean
 }
@@ -623,7 +622,6 @@ export class FromBtcLnAuto extends FromBtcBaseSwapHandler<FromBtcLnAutoSwap, Fro
                 token: (val: string) => val!=null &&
                         typeof(val)==="string" &&
                         this.isTokenSupported(chainIdentifier, val) ? val : null,
-                description: FieldTypeEnum.StringOptional,
                 descriptionHash: FieldTypeEnum.StringOptional,
                 exactOut: FieldTypeEnum.BooleanOptional,
                 gasToken: (val: string) => val!=null &&
@@ -637,6 +635,11 @@ export class FromBtcLnAuto extends FromBtcBaseSwapHandler<FromBtcLnAutoSwap, Fro
                 msg: "Invalid request body"
             };
 
+            const descriptionBodyPart = req.paramReader.getExistingParamsOrNull({
+                description: FieldTypeEnum.StringOptional
+            });
+            const description = descriptionBodyPart?.description;
+
             if(parsedBody.gasToken!==chainInterface.getNativeCurrencyAddress()) throw {
                 code: 20290,
                 msg: "Unsupported gas token"
@@ -668,7 +671,7 @@ export class FromBtcLnAuto extends FromBtcBaseSwapHandler<FromBtcLnAutoSwap, Fro
             const gasToken = parsedBody.gasToken;
 
             //Check request params
-            this.checkDescription(parsedBody.description);
+            this.checkDescription(description);
             this.checkDescriptionHash(parsedBody.descriptionHash);
             this.checkTooManyInflightSwaps();
             const fees = await this.AmountAssertions.preCheckFromBtcAmounts(this.type, request, requestedAmount, gasTokenAmount);
@@ -727,7 +730,7 @@ export class FromBtcLnAuto extends FromBtcBaseSwapHandler<FromBtcLnAutoSwap, Fro
 
             //Create swap
             const hodlInvoiceObj: HodlInvoiceInit = {
-                description: parsedBody.description ?? (chainIdentifier+"-"+parsedBody.address),
+                description: description ?? (chainIdentifier+"-"+parsedBody.address),
                 cltvDelta:  Number(this.config.minCltv) + 5,
                 expiresAt: Date.now()+(this.config.invoiceTimeoutSeconds*1000),
                 id: parsedBody.paymentHash,