@atomiqlabs/lp-lib 13.0.1 → 14.0.0-dev.3

package/dist/storagemanager/IntermediaryStorageManager.d.ts

@@ -4,6 +4,7 @@ export declare class IntermediaryStorageManager<T extends StorageObject> impleme
     private readonly directory;
     private type;
     private data;
+    private logger;
     constructor(directory: string);
     init(): Promise<void>;
     query(params: StorageQueryParam[]): Promise<{

package/dist/storagemanager/IntermediaryStorageManager.js

@@ -2,10 +2,12 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.IntermediaryStorageManager = void 0;
 const fs = require("fs/promises");
+const Utils_1 = require("../utils/Utils");
 class IntermediaryStorageManager {
     constructor(directory) {
         this.data = {};
         this.directory = directory;
+        this.logger = (0, Utils_1.getLogger)("IntermediaryStorageManager(" + directory + "): ");
     }
     async init() {
         try {
@@ -79,7 +81,7 @@ class IntermediaryStorageManager {
             await fs.rm(this.directory + "/" + identifier + ".json");
         }
         catch (e) {
-            console.error(e);
+            this.logger.error("removeData(): Error when removing data: ", e);
         }
     }
     async loadData(type) {
@@ -89,7 +91,7 @@ class IntermediaryStorageManager {
             files = await fs.readdir(this.directory);
         }
         catch (e) {
-            console.error(e);
+            this.logger.error("loadData(): Error when checking directory: ", e);
             return;
         }
         for (let file of files) {

package/dist/storagemanager/StorageManager.d.ts

@@ -4,6 +4,7 @@ export declare class StorageManager<T extends StorageObject> implements IStorage
     data: {
         [key: string]: T;
     };
+    private logger;
     constructor(directory: string);
     init(): Promise<void>;
     saveData(hash: string, object: T): Promise<void>;

package/dist/storagemanager/StorageManager.js

@@ -2,10 +2,12 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.StorageManager = void 0;
 const fs = require("fs/promises");
+const Utils_1 = require("../utils/Utils");
 class StorageManager {
     constructor(directory) {
         this.data = {};
         this.directory = directory;
+        this.logger = (0, Utils_1.getLogger)("StorageManager(" + directory + "): ");
     }
     async init() {
         try {
@@ -30,7 +32,7 @@ class StorageManager {
             await fs.rm(this.directory + "/" + paymentHash + ".json");
         }
         catch (e) {
-            console.error(e);
+            this.logger.error("removeData(): Error when removing data: ", e);
         }
     }
     async loadData(type) {
@@ -39,7 +41,7 @@ class StorageManager {
             files = await fs.readdir(this.directory);
         }
         catch (e) {
-            console.error(e);
+            this.logger.error("loadData(): Error when checking directory: ", e);
             return [];
         }
         const arr = [];

package/dist/swaps/SwapHandler.d.ts

@@ -4,6 +4,7 @@ import { ChainType } from "@atomiqlabs/base";
 import { SwapHandlerSwap } from "./SwapHandlerSwap";
 import { IIntermediaryStorage } from "../storage/IIntermediaryStorage";
 import { IParamReader } from "../utils/paramcoders/IParamReader";
+import { LoggerType } from "../utils/Utils";
 export declare enum SwapHandlerType {
     TO_BTC = "TO_BTC",
     FROM_BTC = "FROM_BTC",
@@ -77,12 +78,7 @@ export declare abstract class SwapHandler<V extends SwapHandlerSwap<S> = SwapHan
     };
     readonly swapPricing: ISwapPrice;
     abstract config: SwapBaseConfig;
-    logger: {
-        debug: (msg: string, ...args: any) => void;
-        info: (msg: string, ...args: any) => void;
-        warn: (msg: string, ...args: any) => void;
-        error: (msg: string, ...args: any) => void;
-    };
+    logger: LoggerType;
     protected swapLogger: {
         debug: (swap: SwapHandlerSwap, msg: string, ...args: any) => void;
         info: (swap: SwapHandlerSwap, msg: string, ...args: any) => void;

package/dist/swaps/SwapHandler.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SwapHandler = exports.SwapHandlerType = void 0;
 const PluginManager_1 = require("../plugins/PluginManager");
+const Utils_1 = require("../utils/Utils");
 var SwapHandlerType;
 (function (SwapHandlerType) {
     SwapHandlerType["TO_BTC"] = "TO_BTC";
@@ -17,12 +18,7 @@ var SwapHandlerType;
  */
 class SwapHandler {
     constructor(storageDirectory, path, chainsData, swapPricing) {
-        this.logger = {
-            debug: (msg, ...args) => console.debug("SwapHandler(" + this.type + "): " + msg, ...args),
-            info: (msg, ...args) => console.info("SwapHandler(" + this.type + "): " + msg, ...args),
-            warn: (msg, ...args) => console.warn("SwapHandler(" + this.type + "): " + msg, ...args),
-            error: (msg, ...args) => console.error("SwapHandler(" + this.type + "): " + msg, ...args)
-        };
+        this.logger = (0, Utils_1.getLogger)(() => "SwapHandler(" + this.type + "): ");
         this.swapLogger = {
             debug: (swap, msg, ...args) => this.logger.debug(swap.getIdentifier() + ": " + msg, ...args),
             info: (swap, msg, ...args) => this.logger.info(swap.getIdentifier() + ": " + msg, ...args),
@@ -57,7 +53,7 @@ class SwapHandler {
     async startWatchdog() {
         let rerun;
         rerun = async () => {
-            await this.processPastSwaps().catch(e => console.error(e));
+            await this.processPastSwaps().catch(e => this.logger.error("startWatchdog(): Error when processing past swaps: ", e));
             setTimeout(rerun, this.config.swapCheckInterval);
         };
         await rerun();

package/dist/swaps/escrow/tobtc_abstract/ToBtcAbs.js

@@ -100,14 +100,18 @@ class ToBtcAbs extends ToBtcBaseSwapHandler_1.ToBtcBaseSwapHandler {
             const isCommited = await swapContract.isCommited(swap.data);
             if (!isCommited) {
                 const status = await swapContract.getCommitStatus(signer.getAddress(), swap.data);
-                if (status === base_1.SwapCommitStatus.PAID) {
+                if (status.type === base_1.SwapCommitStateType.PAID) {
                     this.swapLogger.info(swap, "processPastSwap(state=BTC_SENT): swap claimed (detected from processPastSwap), address: " + swap.address);
                     this.unsubscribePayment(swap);
+                    swap.txIds ?? (swap.txIds = {});
+                    swap.txIds.claim = await status.getClaimTxId();
                     await this.removeSwapData(swap, ToBtcSwapAbs_1.ToBtcSwapState.CLAIMED);
                 }
-                else if (status === base_1.SwapCommitStatus.EXPIRED) {
+                else if (status.type === base_1.SwapCommitStateType.EXPIRED) {
                     this.swapLogger.warn(swap, "processPastSwap(state=BTC_SENT): swap expired, but bitcoin was probably already sent, txId: " + swap.txId + " address: " + swap.address);
                     this.unsubscribePayment(swap);
+                    swap.txIds ?? (swap.txIds = {});
+                    swap.txIds.refund = status.getRefundTxId == null ? null : await status.getRefundTxId();
                     await this.removeSwapData(swap, ToBtcSwapAbs_1.ToBtcSwapState.REFUNDED);
                 }
                 return;

package/dist/swaps/escrow/tobtcln_abstract/ToBtcLnAbs.js

@@ -120,13 +120,17 @@ class ToBtcLnAbs extends ToBtcBaseSwapHandler_1.ToBtcBaseSwapHandler {
         const isCommited = await swapContract.isCommited(swap.data);
         if (!isCommited) {
             const status = await swapContract.getCommitStatus(signer.getAddress(), swap.data);
-            if (status === base_1.SwapCommitStatus.PAID) {
+            if (status?.type === base_1.SwapCommitStateType.PAID) {
                 //This is alright, we got the money
+                swap.txIds ?? (swap.txIds = {});
+                swap.txIds.claim = await status.getClaimTxId();
                 await this.removeSwapData(swap, ToBtcLnSwapAbs_1.ToBtcLnSwapState.CLAIMED);
                 return true;
             }
-            else if (status === base_1.SwapCommitStatus.EXPIRED) {
+            else if (status?.type === base_1.SwapCommitStateType.EXPIRED) {
                 //This means the user was able to refund before we were able to claim, no good
+                swap.txIds ?? (swap.txIds = {});
+                swap.txIds.refund = status.getRefundTxId == null ? null : await status.getRefundTxId();
                 await this.removeSwapData(swap, ToBtcLnSwapAbs_1.ToBtcLnSwapState.REFUNDED);
             }
             this.swapLogger.warn(swap, "processPaymentResult(): tried to claim but escrow doesn't exist anymore," +

package/dist/swaps/spv_vault_swap/SpvVaultSwapHandler.js

@@ -366,7 +366,7 @@ class SpvVaultSwapHandler extends SwapHandler_1.SwapHandler {
                     msg: "PSBT transaction cannot be parsed!"
                 };
             }
-            if (data.recipient !== swap.recipient ||
+            if (!data.isRecipient(swap.recipient) ||
                 data.callerFeeRate !== swap.callerFeeShare ||
                 data.frontingFeeRate !== swap.frontingFeeShare ||
                 data.executionFeeRate !== swap.executionFeeShare ||

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

@@ -15,12 +15,7 @@ export declare class SpvVaults {
         maxUnclaimedWithdrawals?: number;
     };
     readonly getChain: (chainId: string) => ChainData;
-    readonly logger: {
-        debug: (msg: string, ...args: any) => void;
-        info: (msg: string, ...args: any) => void;
-        warn: (msg: string, ...args: any) => void;
-        error: (msg: string, ...args: any) => void;
-    };
+    readonly logger: import("../../utils/Utils").LoggerType;
     constructor(vaultStorage: IStorageManager<SpvVault>, bitcoin: IBitcoinWallet, vaultSigner: ISpvVaultSigner, bitcoinRpc: BitcoinRpc<any>, getChain: (chainId: string) => ChainData, config: {
         vaultsCheckInterval: number;
         maxUnclaimedWithdrawals?: number;

package/dist/swaps/spv_vault_swap/SpvVaults.js

@@ -11,12 +11,7 @@ const VAULT_INIT_CONFIRMATIONS = 2;
 const BTC_FINALIZATION_CONFIRMATIONS = 6;
 class SpvVaults {
     constructor(vaultStorage, bitcoin, vaultSigner, bitcoinRpc, getChain, config) {
-        this.logger = {
-            debug: (msg, ...args) => console.debug("SpvVaults: " + msg, ...args),
-            info: (msg, ...args) => console.info("SpvVaults: " + msg, ...args),
-            warn: (msg, ...args) => console.warn("SpvVaults: " + msg, ...args),
-            error: (msg, ...args) => console.error("SpvVaults: " + msg, ...args)
-        };
+        this.logger = (0, Utils_1.getLogger)("SpvVaults: ");
         this.vaultStorage = vaultStorage;
         this.bitcoin = bitcoin;
         this.vaultSigner = vaultSigner;
@@ -357,7 +352,7 @@ class SpvVaults {
     async startVaultsWatchdog() {
         let rerun;
         rerun = async () => {
-            await this.checkVaults().catch(e => console.error(e));
+            await this.checkVaults().catch(e => this.logger.error("startVaultsWatchdog(): Error when periodically checking SPV vaults: ", e));
             setTimeout(rerun, this.config.vaultsCheckInterval);
         };
         await rerun();

package/dist/swaps/trusted/frombtc_trusted/FromBtcTrusted.js

@@ -618,7 +618,7 @@ class FromBtcTrusted extends SwapHandler_1.SwapHandler {
     async startDoubleSpendWatchdog() {
         let rerun;
         rerun = async () => {
-            await this.checkDoubleSpends().catch(e => console.error(e));
+            await this.checkDoubleSpends().catch(e => this.logger.error("startDoubleSpendWatchdog(): Error when checking double spends: ", e));
             setTimeout(rerun, this.config.doubleSpendCheckInterval);
         };
         await rerun();

package/dist/swaps/trusted/frombtcln_trusted/FromBtcLnTrusted.js

@@ -53,7 +53,7 @@ class FromBtcLnTrusted extends SwapHandler_1.SwapHandler {
             this.swapLogger.debug(invoiceData, "subscribeToInvoice(): invoice_updated: ", invoice);
             if (invoice.status !== "held")
                 return;
-            this.htlcReceived(invoiceData, invoice).catch(e => console.error(e));
+            this.htlcReceived(invoiceData, invoice).catch(e => this.swapLogger.error(invoiceData, "subscribeToInvoice(): Error calling htlcReceived(): ", e));
             this.activeSubscriptions.delete(hash);
         });
         this.swapLogger.debug(invoiceData, "subscribeToInvoice(): Subscribed to invoice payment");
@@ -79,7 +79,7 @@ class FromBtcLnTrusted extends SwapHandler_1.SwapHandler {
                     //Result is either FromBtcLnTrustedSwapState.RECEIVED or FromBtcLnTrustedSwapState.CANCELED
                 }
                 catch (e) {
-                    console.error(e);
+                    this.swapLogger.error(swap, "processPastSwap(): Error calling htlcReceived(): ", e);
                 }
                 return false;
             case "confirmed":
@@ -182,7 +182,7 @@ class FromBtcLnTrusted extends SwapHandler_1.SwapHandler {
                     await invoiceData.setState(FromBtcLnTrustedSwap_1.FromBtcLnTrustedSwapState.SENT);
                     await this.storageManager.saveData(invoice.id, null, invoiceData);
                 }
-            }).catch(e => console.error(e));
+            }).catch(e => this.swapLogger.error(invoiceData, "htlcReceived(): Error sending transfer txns", e));
             if (result == null) {
                 //Cancel invoice
                 await invoiceData.setState(FromBtcLnTrustedSwap_1.FromBtcLnTrustedSwapState.REFUNDED);
@@ -385,7 +385,6 @@ class FromBtcLnTrusted extends SwapHandler_1.SwapHandler {
             abortController.signal.throwIfAborted();
             metadata.times.invoiceCreated = Date.now();
             metadata.invoiceResponse = { ...hodlInvoice };
-            console.log("[From BTC-LN: REST.CreateInvoice] hodl invoice created: ", hodlInvoice);
             const createdSwap = new FromBtcLnTrustedSwap_1.FromBtcLnTrustedSwap(chainIdentifier, hodlInvoice.request, hodlInvoice.mtokens, swapFee, swapFeeInToken, totalInToken, secret.toString("hex"), parsedBody.address, useToken);
             metadata.times.swapCreated = Date.now();
             createdSwap.metadata = metadata;

package/dist/utils/Utils.d.ts

@@ -1,5 +1,12 @@
 import { Request, Response } from "express";
 import { ServerParamEncoder } from "./paramcoders/server/ServerParamEncoder";
+export type LoggerType = {
+    debug: (msg: string, ...args: any[]) => void;
+    info: (msg: string, ...args: any[]) => void;
+    warn: (msg: string, ...args: any[]) => void;
+    error: (msg: string, ...args: any[]) => void;
+};
+export declare function getLogger(prefix: string | (() => string)): LoggerType;
 export type DefinedRuntimeError = {
     code: number;
     msg?: string;
@@ -10,13 +17,6 @@ export declare function isDefinedRuntimeError(obj: any): obj is DefinedRuntimeEr
 export declare function expressHandlerWrapper(func: (req: Request, res: Response) => Promise<void>): ((req: Request, res: Response & {
     responseStream: ServerParamEncoder;
 }) => void);
-export type LoggerType = {
-    debug: (msg: string, ...args: any[]) => void;
-    info: (msg: string, ...args: any[]) => void;
-    warn: (msg: string, ...args: any[]) => void;
-    error: (msg: string, ...args: any[]) => void;
-};
-export declare function getLogger(prefix: string): LoggerType;
 export declare const HEX_REGEX: RegExp;
 export declare function serializeBN(bn: bigint | null): string | null;
 export declare function deserializeBN(str: string | null): bigint | null;

package/dist/utils/Utils.js

@@ -1,6 +1,15 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getAbortController = exports.bigIntSorter = exports.deserializeBN = exports.serializeBN = exports.HEX_REGEX = exports.getLogger = exports.expressHandlerWrapper = exports.isDefinedRuntimeError = void 0;
+exports.getAbortController = exports.bigIntSorter = exports.deserializeBN = exports.serializeBN = exports.HEX_REGEX = exports.expressHandlerWrapper = exports.isDefinedRuntimeError = exports.getLogger = void 0;
+function getLogger(prefix) {
+    return {
+        debug: (msg, ...args) => global.atomiqLogLevel >= 3 && console.debug((typeof (prefix) === "function" ? prefix() : prefix) + msg, ...args),
+        info: (msg, ...args) => global.atomiqLogLevel >= 2 && console.info((typeof (prefix) === "function" ? prefix() : prefix) + msg, ...args),
+        warn: (msg, ...args) => (global.atomiqLogLevel == null || global.atomiqLogLevel >= 1) && console.warn((typeof (prefix) === "function" ? prefix() : prefix) + msg, ...args),
+        error: (msg, ...args) => (global.atomiqLogLevel == null || global.atomiqLogLevel >= 0) && console.error((typeof (prefix) === "function" ? prefix() : prefix) + msg, ...args)
+    };
+}
+exports.getLogger = getLogger;
 function isDefinedRuntimeError(obj) {
     if (obj.code != null && typeof (obj.code) === "number") {
         if (obj.msg != null && typeof (obj.msg) !== "string")
@@ -12,6 +21,7 @@ function isDefinedRuntimeError(obj) {
     return false;
 }
 exports.isDefinedRuntimeError = isDefinedRuntimeError;
+const expressHandlerWrapperLogger = getLogger("ExpressHandlerWrapper: ");
 function expressHandlerWrapper(func) {
     return (req, res) => {
         (async () => {
@@ -19,7 +29,7 @@ function expressHandlerWrapper(func) {
                 await func(req, res);
             }
             catch (e) {
-                console.error(e);
+                expressHandlerWrapperLogger.error("Error in called function " + req.path + ": ", e);
                 let statusCode = 500;
                 const obj = {
                     code: 0,
@@ -46,15 +56,6 @@ function expressHandlerWrapper(func) {
     };
 }
 exports.expressHandlerWrapper = expressHandlerWrapper;
-function getLogger(prefix) {
-    return {
-        debug: (msg, ...args) => console.debug(prefix + msg, ...args),
-        info: (msg, ...args) => console.info(prefix + msg, ...args),
-        warn: (msg, ...args) => console.warn(prefix + msg, ...args),
-        error: (msg, ...args) => console.error(prefix + msg, ...args)
-    };
-}
-exports.getLogger = getLogger;
 exports.HEX_REGEX = /[0-9a-fA-F]+/;
 function serializeBN(bn) {
     return bn == null ? null : bn.toString(10);

package/dist/utils/paramcoders/server/ServerParamDecoder.js

@@ -4,6 +4,7 @@ exports.serverParamDecoder = exports.RequestParsingError = exports.RequestTimeou
 const SchemaVerifier_1 = require("../SchemaVerifier");
 const ParamDecoder_1 = require("../ParamDecoder");
 const ServerParamEncoder_1 = require("./ServerParamEncoder");
+const Utils_1 = require("../../Utils");
 class RequestTimeoutError extends Error {
     constructor() {
         super("Request timed out");
@@ -20,6 +21,7 @@ class RequestParsingError extends Error {
     }
 }
 exports.RequestParsingError = RequestParsingError;
+const logger = (0, Utils_1.getLogger)("ServerParamDecoder: ");
 const serverParamDecoder = (timeoutMillis) => (req, res, next) => {
     let timeout;
     res.responseStream = new ServerParamEncoder_1.ServerParamEncoder(res, 200, req);
@@ -43,14 +45,14 @@ const serverParamDecoder = (timeoutMillis) => (req, res, next) => {
                 next();
             }
             catch (e) {
-                console.error("ServerParamDecoder: error reading legacy (non-streaming) http request", e);
+                logger.error("error reading legacy (non-streaming) http request", e);
                 req.destroy(new RequestParsingError());
                 res.destroy(new RequestParsingError());
             }
             clearTimeout(timeout);
         });
         req.on("error", (e) => {
-            console.error("ServerParamDecoder: error reading legacy (non-streaming) http request", e);
+            logger.error("error reading legacy (non-streaming) http request", e);
         });
         timeout = setTimeout(() => {
             req.destroy(new RequestTimeoutError());
@@ -64,7 +66,7 @@ const serverParamDecoder = (timeoutMillis) => (req, res, next) => {
             decoder.onData(data);
         }
         catch (e) {
-            console.error("ServerParamDecoder: error reading streaming http request: on(\"data\")", e);
+            logger.error("error reading streaming http request: on(\"data\")", e);
             req.destroy(new RequestParsingError());
             res.destroy(new RequestParsingError());
         }
@@ -74,7 +76,7 @@ const serverParamDecoder = (timeoutMillis) => (req, res, next) => {
             decoder.onEnd();
         }
         catch (e) {
-            console.error("ServerParamDecoder: error reading streaming http request: on(\"end\")", e);
+            logger.error("error reading streaming http request: on(\"end\")", e);
             req.destroy(new RequestParsingError());
             res.destroy(new RequestParsingError());
         }
@@ -85,7 +87,7 @@ const serverParamDecoder = (timeoutMillis) => (req, res, next) => {
             decoder.onError(e);
         }
         catch (e) {
-            console.error("ServerParamDecoder: error reading streaming http request: on(\"error\")", e);
+            logger.error("error reading streaming http request: on(\"error\")", e);
         }
     });
     timeout = setTimeout(() => {
@@ -93,7 +95,7 @@ const serverParamDecoder = (timeoutMillis) => (req, res, next) => {
             decoder.onEnd();
         }
         catch (e) {
-            console.error("ServerParamDecoder: error reading streaming http request: timeout", e);
+            logger.error("error reading streaming http request: timeout", e);
         }
         req.destroy(new RequestTimeoutError());
         res.destroy(new RequestTimeoutError());

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atomiqlabs/lp-lib",
-  "version": "13.0.1",
+  "version": "14.0.0-dev.3",
   "description": "Main functionality implementation for atomiq LP node",
   "main": "./dist/index.js",
   "types:": "./dist/index.d.ts",
@@ -22,7 +22,7 @@
   "author": "adambor",
   "license": "ISC",
   "dependencies": {
-    "@atomiqlabs/base": "^9.0.0",
+    "@atomiqlabs/base": "^10.0.0-dev.1",
     "@atomiqlabs/server-base": "2.0.0",
     "@scure/btc-signer": "1.6.0",
     "express": "4.21.1",

package/src/storagemanager/IntermediaryStorageManager.ts

@@ -1,6 +1,7 @@
 import {StorageObject} from "@atomiqlabs/base";
 import * as fs from "fs/promises";
 import {IIntermediaryStorage, StorageQueryParam} from "../storage/IIntermediaryStorage";
+import {getLogger, LoggerType} from "../utils/Utils";
 
 export class IntermediaryStorageManager<T extends StorageObject> implements IIntermediaryStorage<T> {
 
@@ -9,9 +10,11 @@ export class IntermediaryStorageManager<T extends StorageObject> implements IInt
     private data: {
         [key: string]: T
     } = {};
+    private logger: LoggerType;
 
     constructor(directory: string) {
         this.directory = directory;
+        this.logger = getLogger("IntermediaryStorageManager("+directory+"): ");
     }
 
     async init(): Promise<void> {
@@ -82,7 +85,7 @@ export class IntermediaryStorageManager<T extends StorageObject> implements IInt
             if(this.data[identifier]!=null) delete this.data[identifier];
             await fs.rm(this.directory+"/"+identifier+".json");
         } catch (e) {
-            console.error(e);
+            this.logger.error("removeData(): Error when removing data: ", e);
         }
     }
 
@@ -93,7 +96,7 @@ export class IntermediaryStorageManager<T extends StorageObject> implements IInt
         try {
             files = await fs.readdir(this.directory);
         } catch (e) {
-            console.error(e);
+            this.logger.error("loadData(): Error when checking directory: ", e);
             return;
         }
 

package/src/storagemanager/StorageManager.ts

@@ -1,5 +1,6 @@
 import {StorageObject, IStorageManager} from "@atomiqlabs/base";
 import * as fs from "fs/promises";
+import {getLogger, LoggerType} from "../utils/Utils";
 
 export class StorageManager<T extends StorageObject> implements IStorageManager<T> {
 
@@ -8,8 +9,11 @@ export class StorageManager<T extends StorageObject> implements IStorageManager<
         [key: string]: T
     } = {};
 
+    private logger: LoggerType;
+
     constructor(directory: string) {
         this.directory = directory;
+        this.logger = getLogger("StorageManager("+directory+"): ");
     }
 
     async init(): Promise<void> {
@@ -38,7 +42,7 @@ export class StorageManager<T extends StorageObject> implements IStorageManager<
             if(this.data[paymentHash]!=null) delete this.data[paymentHash];
             await fs.rm(this.directory+"/"+paymentHash+".json");
         } catch (e) {
-            console.error(e);
+            this.logger.error("removeData(): Error when removing data: ", e);
         }
     }
 
@@ -47,7 +51,7 @@ export class StorageManager<T extends StorageObject> implements IStorageManager<
         try {
             files = await fs.readdir(this.directory);
         } catch (e) {
-            console.error(e);
+            this.logger.error("loadData(): Error when checking directory: ", e);
             return [];
         }
 

package/src/swaps/SwapHandler.ts

@@ -8,6 +8,7 @@ import {SwapHandlerSwap} from "./SwapHandlerSwap";
 import {PluginManager} from "../plugins/PluginManager";
 import {IIntermediaryStorage} from "../storage/IIntermediaryStorage";
 import {IParamReader} from "../utils/paramcoders/IParamReader";
+import {getLogger, LoggerType} from "../utils/Utils";
 
 export enum SwapHandlerType {
     TO_BTC = "TO_BTC",
@@ -85,12 +86,7 @@ export abstract class SwapHandler<V extends SwapHandlerSwap<S> = SwapHandlerSwap
 
     abstract config: SwapBaseConfig;
 
-    logger = {
-        debug: (msg: string, ...args: any) => console.debug("SwapHandler("+this.type+"): "+msg, ...args),
-        info: (msg: string, ...args: any) => console.info("SwapHandler("+this.type+"): "+msg, ...args),
-        warn: (msg: string, ...args: any) => console.warn("SwapHandler("+this.type+"): "+msg, ...args),
-        error: (msg: string, ...args: any) => console.error("SwapHandler("+this.type+"): "+msg, ...args)
-    };
+    logger: LoggerType = getLogger(() => "SwapHandler("+this.type+"): ");
 
     protected swapLogger = {
         debug: (swap: SwapHandlerSwap, msg: string, ...args: any) => this.logger.debug(swap.getIdentifier()+": "+msg, ...args),
@@ -137,7 +133,7 @@ export abstract class SwapHandler<V extends SwapHandlerSwap<S> = SwapHandlerSwap
     async startWatchdog() {
         let rerun: () => Promise<void>;
         rerun = async () => {
-            await this.processPastSwaps().catch( e => console.error(e));
+            await this.processPastSwaps().catch( e => this.logger.error("startWatchdog(): Error when processing past swaps: ", e));
             setTimeout(rerun, this.config.swapCheckInterval);
         };
         await rerun();

package/src/swaps/escrow/EscrowHandler.ts

@@ -46,7 +46,7 @@ export abstract class EscrowHandler<V extends EscrowHandlerSwap<SwapData, S>, S>
                 const swap = this.getSwapByEscrowHash(chainIdentifier, event.escrowHash);
                 if(swap==null) continue;
 
-                swap.txIds.init = (event as any).meta?.txId;
+                swap.txIds.init = event.meta?.txId;
                 if(swap.metadata!=null) swap.metadata.times.initTxReceived = Date.now();
 
                 await this.processInitializeEvent(chainIdentifier, swap, event);
@@ -54,7 +54,7 @@ export abstract class EscrowHandler<V extends EscrowHandlerSwap<SwapData, S>, S>
                 const swap = this.getSwapByEscrowHash(chainIdentifier, event.escrowHash);
                 if(swap==null) continue;
 
-                swap.txIds.claim = (event as any).meta?.txId;
+                swap.txIds.claim = event.meta?.txId;
                 if(swap.metadata!=null) swap.metadata.times.claimTxReceived = Date.now();
 
                 await this.processClaimEvent(chainIdentifier, swap, event);
@@ -62,7 +62,7 @@ export abstract class EscrowHandler<V extends EscrowHandlerSwap<SwapData, S>, S>
                 const swap = this.getSwapByEscrowHash(chainIdentifier, event.escrowHash);
                 if(swap==null) continue;
 
-                swap.txIds.refund = (event as any).meta?.txId;
+                swap.txIds.refund = event.meta?.txId;
                 if(swap.metadata!=null) swap.metadata.times.refundTxReceived = Date.now();
 
                 await this.processRefundEvent(chainIdentifier, swap, event);

package/src/swaps/escrow/tobtc_abstract/ToBtcAbs.ts

@@ -8,10 +8,9 @@ import {
     ClaimEvent,
     InitializeEvent,
     RefundEvent,
-    SwapCommitStatus,
     SwapData,
     BitcoinRpc,
-    BtcBlock, BigIntBufferUtils
+    BtcBlock, BigIntBufferUtils, SwapCommitStateType
 } from "@atomiqlabs/base";
 import {expressHandlerWrapper, getAbortController, HEX_REGEX, isDefinedRuntimeError} from "../../../utils/Utils";
 import {PluginManager} from "../../../plugins/PluginManager";
@@ -169,13 +168,17 @@ export class ToBtcAbs extends ToBtcBaseSwapHandler<ToBtcSwapAbs, ToBtcSwapState>
             const isCommited = await swapContract.isCommited(swap.data);
             if(!isCommited) {
                 const status = await swapContract.getCommitStatus(signer.getAddress(), swap.data);
-                if(status===SwapCommitStatus.PAID) {
+                if(status.type===SwapCommitStateType.PAID) {
                     this.swapLogger.info(swap, "processPastSwap(state=BTC_SENT): swap claimed (detected from processPastSwap), address: "+swap.address);
                     this.unsubscribePayment(swap);
+                    swap.txIds ??= {};
+                    swap.txIds.claim = await status.getClaimTxId();
                     await this.removeSwapData(swap, ToBtcSwapState.CLAIMED);
-                } else if(status===SwapCommitStatus.EXPIRED) {
+                } else if(status.type===SwapCommitStateType.EXPIRED) {
                     this.swapLogger.warn(swap, "processPastSwap(state=BTC_SENT): swap expired, but bitcoin was probably already sent, txId: "+swap.txId+" address: "+swap.address);
                     this.unsubscribePayment(swap);
+                    swap.txIds ??= {};
+                    swap.txIds.refund = status.getRefundTxId==null ? null : await status.getRefundTxId();
                     await this.removeSwapData(swap, ToBtcSwapState.REFUNDED);
                 }
                 return;

package/src/swaps/escrow/tobtcln_abstract/ToBtcLnAbs.ts

@@ -7,8 +7,7 @@ import {
     ChainSwapType,
     ClaimEvent,
     InitializeEvent,
-    RefundEvent,
-    SwapCommitStatus,
+    RefundEvent, SwapCommitStateType,
     SwapData
 } from "@atomiqlabs/base";
 import {expressHandlerWrapper, getAbortController, HEX_REGEX, isDefinedRuntimeError} from "../../../utils/Utils";
@@ -218,12 +217,16 @@ export class ToBtcLnAbs extends ToBtcBaseSwapHandler<ToBtcLnSwapAbs, ToBtcLnSwap
         const isCommited = await swapContract.isCommited(swap.data);
         if(!isCommited) {
             const status = await swapContract.getCommitStatus(signer.getAddress(), swap.data);
-            if(status===SwapCommitStatus.PAID) {
+            if(status?.type===SwapCommitStateType.PAID) {
                 //This is alright, we got the money
+                swap.txIds ??= {};
+                swap.txIds.claim = await status.getClaimTxId();
                 await this.removeSwapData(swap, ToBtcLnSwapState.CLAIMED);
                 return true;
-            } else if(status===SwapCommitStatus.EXPIRED) {
+            } else if(status?.type===SwapCommitStateType.EXPIRED) {
                 //This means the user was able to refund before we were able to claim, no good
+                swap.txIds ??= {};
+                swap.txIds.refund = status.getRefundTxId==null ? null : await status.getRefundTxId();
                 await this.removeSwapData(swap, ToBtcLnSwapState.REFUNDED);
             }
             this.swapLogger.warn(swap, "processPaymentResult(): tried to claim but escrow doesn't exist anymore,"+

package/src/swaps/spv_vault_swap/SpvVaultSwapHandler.ts

@@ -496,7 +496,7 @@ export class SpvVaultSwapHandler extends SwapHandler<SpvVaultSwap, SpvVaultSwapS
             }
 
             if(
-                data.recipient!==swap.recipient ||
+                !data.isRecipient(swap.recipient) ||
                 data.callerFeeRate!==swap.callerFeeShare ||
                 data.frontingFeeRate!==swap.frontingFeeShare ||
                 data.executionFeeRate!==swap.executionFeeShare ||

package/src/swaps/spv_vault_swap/SpvVaults.ts

@@ -8,7 +8,7 @@ import {
     SpvVaultOpenEvent, SpvWithdrawalTransactionData
 } from "@atomiqlabs/base";
 import {SpvVaultSwap} from "./SpvVaultSwap";
-import {bigIntSorter} from "../../utils/Utils";
+import {bigIntSorter, getLogger} from "../../utils/Utils";
 import {PluginManager} from "../../plugins/PluginManager";
 import {IBitcoinWallet} from "../../wallets/IBitcoinWallet";
 import {ISpvVaultSigner} from "../../wallets/ISpvVaultSigner";
@@ -30,12 +30,7 @@ export class SpvVaults {
     readonly config: {vaultsCheckInterval: number, maxUnclaimedWithdrawals?: number};
     readonly getChain: (chainId: string) => ChainData
 
-    readonly logger = {
-        debug: (msg: string, ...args: any) => console.debug("SpvVaults: "+msg, ...args),
-        info: (msg: string, ...args: any) => console.info("SpvVaults: "+msg, ...args),
-        warn: (msg: string, ...args: any) => console.warn("SpvVaults: "+msg, ...args),
-        error: (msg: string, ...args: any) => console.error("SpvVaults: "+msg, ...args)
-    };
+    readonly logger = getLogger("SpvVaults: ");
 
     constructor(
         vaultStorage: IStorageManager<SpvVault>,
@@ -428,7 +423,7 @@ export class SpvVaults {
     async startVaultsWatchdog() {
         let rerun: () => Promise<void>;
         rerun = async () => {
-            await this.checkVaults().catch( e => console.error(e));
+            await this.checkVaults().catch( e => this.logger.error("startVaultsWatchdog(): Error when periodically checking SPV vaults: ", e));
             setTimeout(rerun, this.config.vaultsCheckInterval);
         };
         await rerun();

package/src/swaps/trusted/frombtc_trusted/FromBtcTrusted.ts

@@ -713,7 +713,7 @@ export class FromBtcTrusted extends SwapHandler<FromBtcTrustedSwap, FromBtcTrust
     private async startDoubleSpendWatchdog() {
         let rerun: () => Promise<void>;
         rerun = async () => {
-            await this.checkDoubleSpends().catch( e => console.error(e));
+            await this.checkDoubleSpends().catch( e => this.logger.error("startDoubleSpendWatchdog(): Error when checking double spends: ", e));
             setTimeout(rerun, this.config.doubleSpendCheckInterval);
         };
         await rerun();

package/src/swaps/trusted/frombtcln_trusted/FromBtcLnTrusted.ts

@@ -90,7 +90,7 @@ export class FromBtcLnTrusted extends SwapHandler<FromBtcLnTrustedSwap, FromBtcL
         this.lightning.waitForInvoice(hash, abortController.signal).then(invoice => {
             this.swapLogger.debug(invoiceData, "subscribeToInvoice(): invoice_updated: ", invoice);
             if(invoice.status!=="held") return;
-            this.htlcReceived(invoiceData, invoice).catch(e => console.error(e));
+            this.htlcReceived(invoiceData, invoice).catch(e => this.swapLogger.error(invoiceData, "subscribeToInvoice(): Error calling htlcReceived(): ", e));
             this.activeSubscriptions.delete(hash);
         });
 
@@ -117,7 +117,7 @@ export class FromBtcLnTrusted extends SwapHandler<FromBtcLnTrustedSwap, FromBtcL
                     await this.htlcReceived(swap, invoice);
                     //Result is either FromBtcLnTrustedSwapState.RECEIVED or FromBtcLnTrustedSwapState.CANCELED
                 } catch (e) {
-                    console.error(e);
+                    this.swapLogger.error(swap, "processPastSwap(): Error calling htlcReceived(): ", e);
                 }
                 return false;
             case "confirmed":
@@ -226,7 +226,7 @@ export class FromBtcLnTrusted extends SwapHandler<FromBtcLnTrustedSwap, FromBtcL
                     await invoiceData.setState(FromBtcLnTrustedSwapState.SENT);
                     await this.storageManager.saveData(invoice.id, null, invoiceData);
                 }
-            }).catch(e => console.error(e));
+            }).catch(e => this.swapLogger.error(invoiceData, "htlcReceived(): Error sending transfer txns", e));
 
             if(result==null) {
                 //Cancel invoice
@@ -459,8 +459,6 @@ export class FromBtcLnTrusted extends SwapHandler<FromBtcLnTrustedSwap, FromBtcL
             metadata.times.invoiceCreated = Date.now();
             metadata.invoiceResponse = {...hodlInvoice};
 
-            console.log("[From BTC-LN: REST.CreateInvoice] hodl invoice created: ", hodlInvoice);
-
             const createdSwap = new FromBtcLnTrustedSwap(
                 chainIdentifier,
                 hodlInvoice.request,

package/src/utils/Utils.ts

@@ -1,6 +1,22 @@
 import {Request, Response} from "express";
 import {ServerParamEncoder} from "./paramcoders/server/ServerParamEncoder";
 
+export type LoggerType = {
+    debug: (msg: string, ...args: any[]) => void,
+    info: (msg: string, ...args: any[]) => void,
+    warn: (msg: string, ...args: any[]) => void,
+    error: (msg: string, ...args: any[]) => void
+};
+
+export function getLogger(prefix: string | (() => string)): LoggerType {
+    return {
+        debug: (msg, ...args) => global.atomiqLogLevel >= 3 && console.debug((typeof(prefix)==="function" ? prefix() : prefix)+msg, ...args),
+        info: (msg, ...args) => global.atomiqLogLevel >= 2 && console.info((typeof(prefix)==="function" ? prefix() : prefix)+msg, ...args),
+        warn: (msg, ...args) => (global.atomiqLogLevel==null || global.atomiqLogLevel >= 1) && console.warn((typeof(prefix)==="function" ? prefix() : prefix)+msg, ...args),
+        error: (msg, ...args) => (global.atomiqLogLevel==null || global.atomiqLogLevel >= 0) && console.error((typeof(prefix)==="function" ? prefix() : prefix)+msg, ...args)
+    };
+}
+
 export type DefinedRuntimeError = {
     code: number;
     msg?: string;
@@ -17,6 +33,8 @@ export function isDefinedRuntimeError(obj: any): obj is DefinedRuntimeError {
     return false;
 }
 
+const expressHandlerWrapperLogger = getLogger("ExpressHandlerWrapper: ");
+
 export function expressHandlerWrapper(func: (
     req: Request,
     res: Response
@@ -32,7 +50,7 @@ export function expressHandlerWrapper(func: (
             try {
                 await func(req, res);
             } catch (e) {
-                console.error(e);
+                expressHandlerWrapperLogger.error("Error in called function "+req.path+": ", e);
                 let statusCode = 500;
                 const obj: {code: number, msg: string, data?: any} = {
                     code: 0,
@@ -56,22 +74,6 @@ export function expressHandlerWrapper(func: (
     }
 }
 
-export type LoggerType = {
-    debug: (msg: string, ...args: any[]) => void,
-    info: (msg: string, ...args: any[]) => void,
-    warn: (msg: string, ...args: any[]) => void,
-    error: (msg: string, ...args: any[]) => void
-};
-
-export function getLogger(prefix: string): LoggerType {
-    return {
-        debug: (msg, ...args) => console.debug(prefix+msg, ...args),
-        info: (msg, ...args) => console.info(prefix+msg, ...args),
-        warn: (msg, ...args) => console.warn(prefix+msg, ...args),
-        error: (msg, ...args) => console.error(prefix+msg, ...args)
-    };
-}
-
 export const HEX_REGEX = /[0-9a-fA-F]+/;
 
 export function serializeBN(bn: bigint | null): string | null {

package/src/utils/paramcoders/server/ServerParamDecoder.ts

@@ -3,6 +3,7 @@ import {RequestSchema, verifySchema} from "../SchemaVerifier";
 import {ParamDecoder} from "../ParamDecoder";
 import {ServerParamEncoder} from "./ServerParamEncoder";
 import {IParamReader} from "../IParamReader";
+import {getLogger} from "../../Utils";
 
 export class RequestTimeoutError extends Error {
 
@@ -24,6 +25,8 @@ export class RequestParsingError extends Error {
 
 }
 
+const logger = getLogger("ServerParamDecoder: ");
+
 export const serverParamDecoder = (timeoutMillis: number) => (req: Request, res: Response, next: () => void) => {
 
     let timeout;
@@ -50,14 +53,14 @@ export const serverParamDecoder = (timeoutMillis: number) => (req: Request, res:
                 (req as any).paramReader = paramReader;
                 next();
             } catch (e) {
-                console.error("ServerParamDecoder: error reading legacy (non-streaming) http request", e);
+                logger.error("error reading legacy (non-streaming) http request", e);
                 req.destroy(new RequestParsingError());
                 res.destroy(new RequestParsingError());
             }
             clearTimeout(timeout);
         });
         req.on("error", (e) => {
-            console.error("ServerParamDecoder: error reading legacy (non-streaming) http request",e);
+            logger.error("error reading legacy (non-streaming) http request",e);
         });
 
         timeout = setTimeout(() => {
@@ -74,7 +77,7 @@ export const serverParamDecoder = (timeoutMillis: number) => (req: Request, res:
         try {
             decoder.onData(data);
         } catch (e) {
-            console.error("ServerParamDecoder: error reading streaming http request: on(\"data\")", e);
+            logger.error("error reading streaming http request: on(\"data\")", e);
             req.destroy(new RequestParsingError());
             res.destroy(new RequestParsingError());
         }
@@ -83,7 +86,7 @@ export const serverParamDecoder = (timeoutMillis: number) => (req: Request, res:
         try {
             decoder.onEnd();
         } catch (e) {
-            console.error("ServerParamDecoder: error reading streaming http request: on(\"end\")", e);
+            logger.error("error reading streaming http request: on(\"end\")", e);
             req.destroy(new RequestParsingError());
             res.destroy(new RequestParsingError());
         }
@@ -93,7 +96,7 @@ export const serverParamDecoder = (timeoutMillis: number) => (req: Request, res:
         try {
             decoder.onError(e);
         } catch(e) {
-            console.error("ServerParamDecoder: error reading streaming http request: on(\"error\")", e);
+            logger.error("error reading streaming http request: on(\"error\")", e);
         }
     });
 
@@ -101,7 +104,7 @@ export const serverParamDecoder = (timeoutMillis: number) => (req: Request, res:
         try {
             decoder.onEnd();
         } catch(e) {
-            console.error("ServerParamDecoder: error reading streaming http request: timeout", e);
+            logger.error("error reading streaming http request: timeout", e);
         }
         req.destroy(new RequestTimeoutError());
         res.destroy(new RequestTimeoutError());