@atomiqlabs/lp-lib 13.0.0 → 14.0.0-dev.10

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

@@ -0,0 +1,120 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.FromBtcLnAutoSwap = exports.FromBtcLnAutoSwapState = void 0;
+const index_1 = require("../../../index");
+const FromBtcBaseSwap_1 = require("../FromBtcBaseSwap");
+const Utils_1 = require("../../../utils/Utils");
+var FromBtcLnAutoSwapState;
+(function (FromBtcLnAutoSwapState) {
+    FromBtcLnAutoSwapState[FromBtcLnAutoSwapState["REFUNDED"] = -2] = "REFUNDED";
+    FromBtcLnAutoSwapState[FromBtcLnAutoSwapState["CANCELED"] = -1] = "CANCELED";
+    FromBtcLnAutoSwapState[FromBtcLnAutoSwapState["CREATED"] = 0] = "CREATED";
+    FromBtcLnAutoSwapState[FromBtcLnAutoSwapState["RECEIVED"] = 1] = "RECEIVED";
+    FromBtcLnAutoSwapState[FromBtcLnAutoSwapState["TXS_SENT"] = 2] = "TXS_SENT";
+    FromBtcLnAutoSwapState[FromBtcLnAutoSwapState["COMMITED"] = 3] = "COMMITED";
+    FromBtcLnAutoSwapState[FromBtcLnAutoSwapState["CLAIMED"] = 4] = "CLAIMED";
+    FromBtcLnAutoSwapState[FromBtcLnAutoSwapState["SETTLED"] = 5] = "SETTLED";
+})(FromBtcLnAutoSwapState = exports.FromBtcLnAutoSwapState || (exports.FromBtcLnAutoSwapState = {}));
+class FromBtcLnAutoSwap extends FromBtcBaseSwap_1.FromBtcBaseSwap {
+    constructor(chainIdOrObj, pr, lnPaymentHash, claimHash, amountMtokens, claimer, token, gasToken, amountToken, amountGasToken, tokenSwapFee, tokenSwapFeeInToken, gasSwapFee, gasSwapFeeInToken, claimerBounty) {
+        if (typeof (chainIdOrObj) === "string") {
+            super(chainIdOrObj, (amountMtokens + 999n) / 1000n, tokenSwapFee + gasSwapFee, tokenSwapFeeInToken);
+            this.state = FromBtcLnAutoSwapState.CREATED;
+            this.pr = pr;
+            this.lnPaymentHash = lnPaymentHash;
+            this.claimHash = claimHash;
+            this.claimer = claimer;
+            this.token = token;
+            this.gasToken = gasToken;
+            this.amountToken = amountToken;
+            this.amountGasToken = amountGasToken;
+            this.tokenSwapFee = tokenSwapFee;
+            this.tokenSwapFeeInToken = tokenSwapFeeInToken;
+            this.gasSwapFee = gasSwapFee;
+            this.gasSwapFeeInToken = gasSwapFeeInToken;
+            this.claimerBounty = claimerBounty;
+        }
+        else {
+            super(chainIdOrObj);
+            this.pr = chainIdOrObj.pr;
+            this.lnPaymentHash = chainIdOrObj.lnPaymentHash;
+            this.claimHash = chainIdOrObj.claimHash;
+            this.claimer = chainIdOrObj.claimer;
+            this.token = chainIdOrObj.token;
+            this.gasToken = chainIdOrObj.gasToken;
+            this.amountToken = (0, Utils_1.deserializeBN)(chainIdOrObj.amountToken);
+            this.amountGasToken = (0, Utils_1.deserializeBN)(chainIdOrObj.amountGasToken);
+            this.tokenSwapFee = (0, Utils_1.deserializeBN)(chainIdOrObj.tokenSwapFee);
+            this.tokenSwapFeeInToken = (0, Utils_1.deserializeBN)(chainIdOrObj.tokenSwapFeeInToken);
+            this.gasSwapFee = (0, Utils_1.deserializeBN)(chainIdOrObj.gasSwapFee);
+            this.gasSwapFeeInToken = (0, Utils_1.deserializeBN)(chainIdOrObj.gasSwapFeeInToken);
+            this.claimerBounty = (0, Utils_1.deserializeBN)(chainIdOrObj.claimerBounty);
+            this.secret = chainIdOrObj.secret;
+        }
+        this.type = index_1.SwapHandlerType.FROM_BTCLN;
+    }
+    serialize() {
+        const partialSerialized = super.serialize();
+        partialSerialized.pr = this.pr;
+        partialSerialized.secret = this.secret;
+        partialSerialized.lnPaymentHash = this.lnPaymentHash;
+        partialSerialized.claimHash = this.claimHash;
+        partialSerialized.claimer = this.claimer;
+        partialSerialized.token = this.token;
+        partialSerialized.gasToken = this.gasToken;
+        partialSerialized.amountToken = (0, Utils_1.serializeBN)(this.amountToken);
+        partialSerialized.amountGasToken = (0, Utils_1.serializeBN)(this.amountGasToken);
+        partialSerialized.tokenSwapFee = (0, Utils_1.serializeBN)(this.tokenSwapFee);
+        partialSerialized.tokenSwapFeeInToken = (0, Utils_1.serializeBN)(this.tokenSwapFeeInToken);
+        partialSerialized.gasSwapFee = (0, Utils_1.serializeBN)(this.gasSwapFee);
+        partialSerialized.gasSwapFeeInToken = (0, Utils_1.serializeBN)(this.gasSwapFeeInToken);
+        partialSerialized.claimerBounty = (0, Utils_1.serializeBN)(this.claimerBounty);
+        return partialSerialized;
+    }
+    getClaimHash() {
+        return this.claimHash;
+    }
+    getIdentifierHash() {
+        return this.lnPaymentHash;
+    }
+    getOutputGasAmount() {
+        return this.amountGasToken;
+    }
+    getOutputAmount() {
+        return this.amountToken;
+    }
+    getTotalOutputAmount() {
+        return this.amountToken;
+    }
+    getTotalOutputGasAmount() {
+        return this.amountGasToken + this.claimerBounty;
+    }
+    getSequence() {
+        return 0n;
+    }
+    getSwapFee() {
+        return { inInputToken: this.swapFee, inOutputToken: this.swapFeeInToken };
+    }
+    getTokenSwapFee() {
+        return { inInputToken: this.tokenSwapFee, inOutputToken: this.tokenSwapFeeInToken };
+    }
+    getGasSwapFee() {
+        return { inInputToken: this.gasSwapFee, inOutputToken: this.gasSwapFeeInToken };
+    }
+    getToken() {
+        return this.token;
+    }
+    getGasToken() {
+        return this.gasToken;
+    }
+    isInitiated() {
+        return this.state !== FromBtcLnAutoSwapState.CREATED;
+    }
+    isFailed() {
+        return this.state === FromBtcLnAutoSwapState.CANCELED || this.state === FromBtcLnAutoSwapState.REFUNDED;
+    }
+    isSuccess() {
+        return this.state === FromBtcLnAutoSwapState.SETTLED;
+    }
+}
+exports.FromBtcLnAutoSwap = FromBtcLnAutoSwap;

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 ||
@@ -376,7 +376,9 @@ class SpvVaultSwapHandler extends SwapHandler_1.SwapHandler {
                 data.btcTx.outs[0].value !== SpvVaults_1.VAULT_DUST_AMOUNT ||
                 !Buffer.from(data.btcTx.outs[0].scriptPubKey.hex, "hex").equals(this.bitcoin.toOutputScript(swap.vaultAddress)) ||
                 BigInt(data.btcTx.outs[2].value) !== swap.amountBtc ||
-                !Buffer.from(data.btcTx.outs[2].scriptPubKey.hex, "hex").equals(this.bitcoin.toOutputScript(swap.btcAddress))) {
+                !Buffer.from(data.btcTx.outs[2].scriptPubKey.hex, "hex").equals(this.bitcoin.toOutputScript(swap.btcAddress)) ||
+                (data.btcTx.locktime > 0 && data.btcTx.locktime < 500000000) ||
+                data.btcTx.locktime > Math.floor(Date.now() / 1000) - 1000000) {
                 this.swapLogger.error(swap, "REST: /postQuote: Invalid psbt data submitted, raw psbt hex: ", parsedBody.psbtHex);
                 throw {
                     code: 20509,

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.0",
+  "version": "14.0.0-dev.10",
   "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.7",
     "@atomiqlabs/server-base": "2.0.0",
     "@scure/btc-signer": "1.6.0",
     "express": "4.21.1",

package/src/index.ts

@@ -13,6 +13,8 @@ export * from "./swaps/escrow/frombtc_abstract/FromBtcAbs";
 export * from "./swaps/escrow/frombtc_abstract/FromBtcSwapAbs";
 export * from "./swaps/escrow/frombtcln_abstract/FromBtcLnAbs";
 export * from "./swaps/escrow/frombtcln_abstract/FromBtcLnSwapAbs";
+export * from "./swaps/escrow/frombtcln_autoinit/FromBtcLnAuto";
+export * from "./swaps/escrow/frombtcln_autoinit/FromBtcLnAutoSwap";
 export * from "./swaps/escrow/tobtc_abstract/ToBtcAbs";
 export * from "./swaps/escrow/tobtc_abstract/ToBtcSwapAbs";
 export * from "./swaps/escrow/tobtcln_abstract/ToBtcLnAbs";

package/src/plugins/IPlugin.ts

@@ -116,7 +116,7 @@ export interface IPlugin {
     onSwapRemove?(swap: SwapHandlerSwap): Promise<void>;
 
     onHandlePreFromBtcQuote?(
-        swapType: SwapHandlerType.FROM_BTCLN | SwapHandlerType.FROM_BTC | SwapHandlerType.FROM_BTCLN_TRUSTED | SwapHandlerType.FROM_BTC_TRUSTED | SwapHandlerType.FROM_BTC_SPV,
+        swapType: SwapHandlerType.FROM_BTCLN | SwapHandlerType.FROM_BTC | SwapHandlerType.FROM_BTCLN_TRUSTED | SwapHandlerType.FROM_BTC_TRUSTED | SwapHandlerType.FROM_BTC_SPV | SwapHandlerType.FROM_BTCLN_AUTO,
         request: RequestData<FromBtcLnRequestType | FromBtcRequestType | FromBtcLnTrustedRequestType | FromBtcTrustedRequestType | SpvVaultSwapRequestType>,
         requestedAmount: {input: boolean, amount: bigint, token: string},
         chainIdentifier: string,
@@ -125,7 +125,7 @@ export interface IPlugin {
         gasTokenAmount?: {input: false, amount: bigint, token: string}
     ): Promise<QuoteThrow | QuoteSetFees | QuoteAmountTooLow | QuoteAmountTooHigh>;
     onHandlePostFromBtcQuote?(
-        swapType: SwapHandlerType.FROM_BTCLN | SwapHandlerType.FROM_BTC | SwapHandlerType.FROM_BTCLN_TRUSTED | SwapHandlerType.FROM_BTC_TRUSTED | SwapHandlerType.FROM_BTC_SPV,
+        swapType: SwapHandlerType.FROM_BTCLN | SwapHandlerType.FROM_BTC | SwapHandlerType.FROM_BTCLN_TRUSTED | SwapHandlerType.FROM_BTC_TRUSTED | SwapHandlerType.FROM_BTC_SPV | SwapHandlerType.FROM_BTCLN_AUTO,
         request: RequestData<FromBtcLnRequestType | FromBtcRequestType | FromBtcLnTrustedRequestType | FromBtcTrustedRequestType | SpvVaultSwapRequestType>,
         requestedAmount: {input: boolean, amount: bigint, token: string, pricePrefetch?: Promise<bigint>},
         chainIdentifier: string,

package/src/plugins/PluginManager.ts

@@ -167,7 +167,7 @@ export class PluginManager {
     }
 
     static async onHandlePostFromBtcQuote(
-        swapType: SwapHandlerType.FROM_BTCLN | SwapHandlerType.FROM_BTC | SwapHandlerType.FROM_BTCLN_TRUSTED | SwapHandlerType.FROM_BTC_TRUSTED | SwapHandlerType.FROM_BTC_SPV,
+        swapType: SwapHandlerType.FROM_BTCLN | SwapHandlerType.FROM_BTC | SwapHandlerType.FROM_BTCLN_TRUSTED | SwapHandlerType.FROM_BTC_TRUSTED | SwapHandlerType.FROM_BTC_SPV | SwapHandlerType.FROM_BTCLN_AUTO,
         request: RequestData<FromBtcLnRequestType | FromBtcRequestType | FromBtcLnTrustedRequestType | FromBtcTrustedRequestType | SpvVaultSwapRequestType>,
         requestedAmount: {input: boolean, amount: bigint, token: string, pricePrefetch?: Promise<bigint>},
         chainIdentifier: string,
@@ -198,7 +198,7 @@ export class PluginManager {
     }
 
     static async onHandlePreFromBtcQuote(
-        swapType: SwapHandlerType.FROM_BTCLN | SwapHandlerType.FROM_BTC | SwapHandlerType.FROM_BTCLN_TRUSTED | SwapHandlerType.FROM_BTC_TRUSTED | SwapHandlerType.FROM_BTC_SPV,
+        swapType: SwapHandlerType.FROM_BTCLN | SwapHandlerType.FROM_BTC | SwapHandlerType.FROM_BTCLN_TRUSTED | SwapHandlerType.FROM_BTC_TRUSTED | SwapHandlerType.FROM_BTC_SPV | SwapHandlerType.FROM_BTCLN_AUTO,
         request: RequestData<FromBtcLnRequestType | FromBtcRequestType | FromBtcLnTrustedRequestType | FromBtcTrustedRequestType | SpvVaultSwapRequestType>,
         requestedAmount: {input: boolean, amount: bigint, token: string},
         chainIdentifier: string,

package/src/storagemanager/IntermediaryStorageManager.ts

@@ -1,6 +1,8 @@
 import {StorageObject} from "@atomiqlabs/base";
 import * as fs from "fs/promises";
+import * as fsSync from "fs";
 import {IIntermediaryStorage, StorageQueryParam} from "../storage/IIntermediaryStorage";
+import {getLogger, LoggerType} from "../utils/Utils";
 
 export class IntermediaryStorageManager<T extends StorageObject> implements IIntermediaryStorage<T> {
 
@@ -9,9 +11,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,18 +86,23 @@ 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);
         }
     }
 
     async loadData(type: new(data: any) => T): Promise<void> {
         this.type = type;
 
+        if(!fsSync.existsSync(this.directory)) {
+            this.logger.debug("loadData(): Data directory not found!");
+            return;
+        }
+
         let files: string[];
         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,7 @@
 import {StorageObject, IStorageManager} from "@atomiqlabs/base";
 import * as fs from "fs/promises";
+import {getLogger, LoggerType} from "../utils/Utils";
+import * as fsSync from "fs";
 
 export class StorageManager<T extends StorageObject> implements IStorageManager<T> {
 
@@ -8,8 +10,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,16 +43,21 @@ 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);
         }
     }
 
     async loadData(type: new(data: any) => T): Promise<T[]> {
+        if(!fsSync.existsSync(this.directory)) {
+            this.logger.debug("loadData(): Data directory not found!");
+            return;
+        }
+
         let files;
         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",
@@ -16,7 +17,8 @@ export enum SwapHandlerType {
     FROM_BTCLN = "FROM_BTCLN",
     FROM_BTCLN_TRUSTED = "FROM_BTCLN_TRUSTED",
     FROM_BTC_TRUSTED = "FROM_BTC_TRUSTED",
-    FROM_BTC_SPV = "FROM_BTC_SPV"
+    FROM_BTC_SPV = "FROM_BTC_SPV",
+    FROM_BTCLN_AUTO = "FROM_BTCLN_AUTO"
 }
 
 export type SwapHandlerInfoType = {
@@ -85,12 +87,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 +134,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/assertions/FromBtcAmountAssertions.ts

@@ -3,7 +3,7 @@ import {FromBtcRequestType} from "../escrow/frombtc_abstract/FromBtcAbs";
 import {FromBtcLnTrustedRequestType} from "../trusted/frombtcln_trusted/FromBtcLnTrusted";
 import {PluginManager} from "../../plugins/PluginManager";
 import {isPluginQuote, isQuoteSetFees} from "../../plugins/IPlugin";
-import {RequestData, SwapHandlerType} from "../SwapHandler";
+import {RequestData, SwapHandler, SwapHandlerType} from "../SwapHandler";
 import {AmountAssertions, AmountAssertionsConfig} from "./AmountAssertions";
 import {ISwapPrice} from "../../prices/ISwapPrice";
 import {FromBtcTrustedRequestType} from "../trusted/frombtc_trusted/FromBtcTrusted";
@@ -32,7 +32,7 @@ export class FromBtcAmountAssertions extends AmountAssertions {
      * @throws {DefinedRuntimeError} will throw an error if the amount is outside minimum/maximum bounds
      */
     async preCheckFromBtcAmounts(
-        swapType: SwapHandlerType.FROM_BTCLN | SwapHandlerType.FROM_BTC | SwapHandlerType.FROM_BTCLN_TRUSTED | SwapHandlerType.FROM_BTC_TRUSTED | SwapHandlerType.FROM_BTC_SPV,
+        swapType: SwapHandlerType.FROM_BTCLN | SwapHandlerType.FROM_BTC | SwapHandlerType.FROM_BTCLN_TRUSTED | SwapHandlerType.FROM_BTC_TRUSTED | SwapHandlerType.FROM_BTC_SPV | SwapHandlerType.FROM_BTCLN_AUTO,
         request: RequestData<FromBtcLnRequestType | FromBtcRequestType | FromBtcLnTrustedRequestType | FromBtcTrustedRequestType | SpvVaultSwapRequestType>,
         requestedAmount: {input: boolean, amount: bigint, token: string},
         gasAmount?: {input: false, amount: bigint, token: string}
@@ -94,7 +94,7 @@ export class FromBtcAmountAssertions extends AmountAssertions {
      * @throws {DefinedRuntimeError} will throw an error if the amount is outside minimum/maximum bounds
      */
     async checkFromBtcAmount(
-        swapType: SwapHandlerType.FROM_BTCLN | SwapHandlerType.FROM_BTC | SwapHandlerType.FROM_BTCLN_TRUSTED | SwapHandlerType.FROM_BTC_TRUSTED | SwapHandlerType.FROM_BTC_SPV,
+        swapType: SwapHandlerType.FROM_BTCLN | SwapHandlerType.FROM_BTC | SwapHandlerType.FROM_BTCLN_TRUSTED | SwapHandlerType.FROM_BTC_TRUSTED | SwapHandlerType.FROM_BTC_SPV | SwapHandlerType.FROM_BTCLN_AUTO,
         request: RequestData<FromBtcLnRequestType | FromBtcRequestType | FromBtcLnTrustedRequestType | FromBtcTrustedRequestType | SpvVaultSwapRequestType>,
         requestedAmount: {input: boolean, amount: bigint, token: string, pricePrefetch?: Promise<bigint>},
         fees: {baseFee: bigint, feePPM: bigint},