@atomiqlabs/lp-lib 15.0.14 → 16.0.0

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

@@ -1,121 +1,121 @@
-import {createHash} from "crypto";
-import {deserializeBN, serializeBN} from "../../../utils/Utils";
-import {SwapHandlerSwap} from "../../SwapHandlerSwap";
-import {SwapHandlerType} from "../../SwapHandler";
-
-export enum FromBtcLnTrustedSwapState {
-    REFUNDED = -2,
-    CANCELED = -1,
-    CREATED = 0,
-    RECEIVED = 1,
-    SENT = 2,
-    CONFIRMED = 3,
-    SETTLED = 4,
-}
-
-export class FromBtcLnTrustedSwap extends SwapHandlerSwap<FromBtcLnTrustedSwapState> {
-
-    readonly pr: string;
-    amount: bigint;
-    readonly output: bigint;
-    readonly dstAddress: string;
-    readonly secret: string;
-    readonly token: string;
-
-    scRawTx: string;
-
-    constructor(
-        chainIdentifier: string,
-        pr: string,
-        inputMtokens: bigint,
-        swapFee: bigint,
-        swapFeeInToken: bigint,
-        output: bigint,
-        secret: string,
-        dstAddress: string,
-        token: string
-    );
-    constructor(obj: any);
-
-    constructor(
-        chainIdOrObj: string | any,
-        pr?: string,
-        inputMtokens?: bigint,
-        swapFee?: bigint,
-        swapFeeInToken?: bigint,
-        output?: bigint,
-        secret?: string,
-        dstAddress?: string,
-        token?: string
-    ) {
-        if(typeof(chainIdOrObj)==="string") {
-            super(chainIdOrObj, swapFee, swapFeeInToken);
-            this.state = FromBtcLnTrustedSwapState.CREATED;
-            this.pr = pr;
-            this.amount = (inputMtokens + 999n) / 1000n;
-            this.output = output;
-            this.secret = secret;
-            this.dstAddress = dstAddress;
-            this.token = token;
-        } else {
-            super(chainIdOrObj);
-            this.pr = chainIdOrObj.pr;
-            this.amount = deserializeBN(chainIdOrObj.amount);
-            this.output = deserializeBN(chainIdOrObj.output);
-            this.secret = chainIdOrObj.secret;
-            this.dstAddress = chainIdOrObj.dstAddress;
-            this.token = chainIdOrObj.token;
-            this.scRawTx = chainIdOrObj.scRawTx;
-        }
-        this.type = SwapHandlerType.FROM_BTCLN_TRUSTED;
-    }
-
-    getToken(): string {
-        return this.token;
-    }
-
-    getOutputAmount(): bigint {
-        return this.output;
-    }
-
-    getSwapFee(): { inInputToken: bigint; inOutputToken: bigint } {
-        return {inInputToken: this.swapFee, inOutputToken: this.swapFeeInToken};
-    }
-
-    getTotalInputAmount(): bigint {
-        return this.amount;
-    }
-
-    getSequence(): bigint {
-        return 0n;
-    }
-
-    serialize(): any {
-        const partialSerialized = super.serialize();
-        partialSerialized.pr = this.pr;
-        partialSerialized.amount = serializeBN(this.amount);
-        partialSerialized.output = serializeBN(this.output);
-        partialSerialized.secret = this.secret;
-        partialSerialized.dstAddress = this.dstAddress;
-        partialSerialized.token = this.token;
-        partialSerialized.scRawTx = this.scRawTx;
-        return partialSerialized;
-    }
-
-    isFailed(): boolean {
-        return this.state===FromBtcLnTrustedSwapState.CANCELED || this.state===FromBtcLnTrustedSwapState.REFUNDED;
-    }
-
-    isInitiated(): boolean {
-        return this.state!==FromBtcLnTrustedSwapState.CREATED;
-    }
-
-    isSuccess(): boolean {
-        return this.state===FromBtcLnTrustedSwapState.SETTLED;
-    }
-
-    getIdentifierHash(): string {
-        return createHash("sha256").update(Buffer.from(this.secret, "hex")).digest().toString("hex");
-    }
-
-}
+import {createHash} from "crypto";
+import {deserializeBN, serializeBN} from "../../../utils/Utils";
+import {SwapHandlerSwap} from "../../SwapHandlerSwap";
+import {SwapHandlerType} from "../../SwapHandler";
+
+export enum FromBtcLnTrustedSwapState {
+    REFUNDED = -2,
+    CANCELED = -1,
+    CREATED = 0,
+    RECEIVED = 1,
+    SENT = 2,
+    CONFIRMED = 3,
+    SETTLED = 4,
+}
+
+export class FromBtcLnTrustedSwap extends SwapHandlerSwap<FromBtcLnTrustedSwapState> {
+
+    readonly pr: string;
+    amount: bigint;
+    readonly output: bigint;
+    readonly dstAddress: string;
+    readonly secret: string;
+    readonly token: string;
+
+    scRawTx: string;
+
+    constructor(
+        chainIdentifier: string,
+        pr: string,
+        inputMtokens: bigint,
+        swapFee: bigint,
+        swapFeeInToken: bigint,
+        output: bigint,
+        secret: string,
+        dstAddress: string,
+        token: string
+    );
+    constructor(obj: any);
+
+    constructor(
+        chainIdOrObj: string | any,
+        pr?: string,
+        inputMtokens?: bigint,
+        swapFee?: bigint,
+        swapFeeInToken?: bigint,
+        output?: bigint,
+        secret?: string,
+        dstAddress?: string,
+        token?: string
+    ) {
+        if(typeof(chainIdOrObj)==="string") {
+            super(chainIdOrObj, swapFee, swapFeeInToken);
+            this.state = FromBtcLnTrustedSwapState.CREATED;
+            this.pr = pr;
+            this.amount = (inputMtokens + 999n) / 1000n;
+            this.output = output;
+            this.secret = secret;
+            this.dstAddress = dstAddress;
+            this.token = token;
+        } else {
+            super(chainIdOrObj);
+            this.pr = chainIdOrObj.pr;
+            this.amount = deserializeBN(chainIdOrObj.amount);
+            this.output = deserializeBN(chainIdOrObj.output);
+            this.secret = chainIdOrObj.secret;
+            this.dstAddress = chainIdOrObj.dstAddress;
+            this.token = chainIdOrObj.token;
+            this.scRawTx = chainIdOrObj.scRawTx;
+        }
+        this.type = SwapHandlerType.FROM_BTCLN_TRUSTED;
+    }
+
+    getToken(): string {
+        return this.token;
+    }
+
+    getOutputAmount(): bigint {
+        return this.output;
+    }
+
+    getSwapFee(): { inInputToken: bigint; inOutputToken: bigint } {
+        return {inInputToken: this.swapFee, inOutputToken: this.swapFeeInToken};
+    }
+
+    getTotalInputAmount(): bigint {
+        return this.amount;
+    }
+
+    getSequence(): bigint {
+        return 0n;
+    }
+
+    serialize(): any {
+        const partialSerialized = super.serialize();
+        partialSerialized.pr = this.pr;
+        partialSerialized.amount = serializeBN(this.amount);
+        partialSerialized.output = serializeBN(this.output);
+        partialSerialized.secret = this.secret;
+        partialSerialized.dstAddress = this.dstAddress;
+        partialSerialized.token = this.token;
+        partialSerialized.scRawTx = this.scRawTx;
+        return partialSerialized;
+    }
+
+    isFailed(): boolean {
+        return this.state===FromBtcLnTrustedSwapState.CANCELED || this.state===FromBtcLnTrustedSwapState.REFUNDED;
+    }
+
+    isInitiated(): boolean {
+        return this.state!==FromBtcLnTrustedSwapState.CREATED;
+    }
+
+    isSuccess(): boolean {
+        return this.state===FromBtcLnTrustedSwapState.SETTLED;
+    }
+
+    getIdentifierHash(): string {
+        return createHash("sha256").update(Buffer.from(this.secret, "hex")).digest().toString("hex");
+    }
+
+}

package/src/utils/BitcoinUtils.ts

@@ -1,59 +1,59 @@
-import {TransactionInput} from "@scure/btc-signer/psbt";
-import {getPrevOut} from "@scure/btc-signer/utxo";
-import {OutScript} from "@scure/btc-signer";
-import {BitcoinRpc, BtcTx} from "@atomiqlabs/base";
-import {IBitcoinWallet} from "../wallets/IBitcoinWallet";
-import {getLogger} from "./Utils";
-
-const logger = getLogger("BitcoinUtils: ");
-
-function parsePushOpcode(script: Uint8Array): Uint8Array {
-    if(script[0]===0x00) {
-        return Uint8Array.from([]);
-    }
-    if(script[0]<=0x4b) {
-        return script.slice(1, 1+script[0]);
-    }
-    if(script[0]===0x4c) {
-        return script.slice(2, 2+script[1]);
-    }
-    if(script[0]===0x4d) {
-        const length = Buffer.from(script.slice(1, 3)).readUInt16LE();
-        return script.slice(3, 3+length);
-    }
-    if(script[0]===0x4e) {
-        const length = Buffer.from(script.slice(1, 5)).readUInt32LE();
-        return script.slice(5, 5+length);
-    }
-    if(script[0]===0x4f) {
-        return Uint8Array.from([0x81]);
-    }
-    if(script[0]>=0x51 && script[0]<=0x60) {
-        return Uint8Array.from([script[0] - 0x50]);
-    }
-    throw new Error("No push opcode detected");
-}
-
-export function isLegacyInput(input: TransactionInput): boolean {
-    const prevOut = getPrevOut(input);
-    const first = OutScript.decode(prevOut.script);
-    if(first.type==="tr" || first.type==="wsh" || first.type==="wpkh") return false;
-    if(first.type==="sh") {
-        const redeemScript = input.redeemScript ?? parsePushOpcode(input.finalScriptSig);
-        const second = OutScript.decode(redeemScript);
-        if(second.type==="wsh" || second.type==="wpkh") return false;
-    }
-    return true;
-}
-
-export async function checkTransactionReplaced(txId: string, txRaw: string, bitcoin: BitcoinRpc<any>): Promise<BtcTx> {
-    const existingTx = await bitcoin.getTransaction(txId);
-    if(existingTx!=null) return existingTx;
-    //Try to re-broadcast
-    try {
-        await bitcoin.sendRawTransaction(txRaw);
-    } catch (e) {
-        logger.error("checkTransactionReplaced("+txId+"): Error when trying to re-broadcast raw transaction: ", e);
-    }
-    return await bitcoin.getTransaction(txId);
-}
+import {TransactionInput} from "@scure/btc-signer/psbt";
+import {getPrevOut} from "@scure/btc-signer/utxo";
+import {OutScript} from "@scure/btc-signer";
+import {BitcoinRpc, BtcTx} from "@atomiqlabs/base";
+import {IBitcoinWallet} from "../wallets/IBitcoinWallet";
+import {getLogger} from "./Utils";
+
+const logger = getLogger("BitcoinUtils: ");
+
+function parsePushOpcode(script: Uint8Array): Uint8Array {
+    if(script[0]===0x00) {
+        return Uint8Array.from([]);
+    }
+    if(script[0]<=0x4b) {
+        return script.slice(1, 1+script[0]);
+    }
+    if(script[0]===0x4c) {
+        return script.slice(2, 2+script[1]);
+    }
+    if(script[0]===0x4d) {
+        const length = Buffer.from(script.slice(1, 3)).readUInt16LE();
+        return script.slice(3, 3+length);
+    }
+    if(script[0]===0x4e) {
+        const length = Buffer.from(script.slice(1, 5)).readUInt32LE();
+        return script.slice(5, 5+length);
+    }
+    if(script[0]===0x4f) {
+        return Uint8Array.from([0x81]);
+    }
+    if(script[0]>=0x51 && script[0]<=0x60) {
+        return Uint8Array.from([script[0] - 0x50]);
+    }
+    throw new Error("No push opcode detected");
+}
+
+export function isLegacyInput(input: TransactionInput): boolean {
+    const prevOut = getPrevOut(input);
+    const first = OutScript.decode(prevOut.script);
+    if(first.type==="tr" || first.type==="wsh" || first.type==="wpkh") return false;
+    if(first.type==="sh") {
+        const redeemScript = input.redeemScript ?? parsePushOpcode(input.finalScriptSig);
+        const second = OutScript.decode(redeemScript);
+        if(second.type==="wsh" || second.type==="wpkh") return false;
+    }
+    return true;
+}
+
+export async function checkTransactionReplaced(txId: string, txRaw: string, bitcoin: BitcoinRpc<any>): Promise<BtcTx> {
+    const existingTx = await bitcoin.getTransaction(txId);
+    if(existingTx!=null) return existingTx;
+    //Try to re-broadcast
+    try {
+        await bitcoin.sendRawTransaction(txRaw);
+    } catch (e) {
+        logger.error("checkTransactionReplaced("+txId+"): Error when trying to re-broadcast raw transaction: ", e);
+    }
+    return await bitcoin.getTransaction(txId);
+}

package/src/utils/Utils.ts

@@ -1,102 +1,104 @@
-import {Request, Response} from "express";
-import {ServerParamEncoder} from "./paramcoders/server/ServerParamEncoder";
-
-export type DefinedRuntimeError = {
-    code: number;
-    msg?: string;
-    _httpStatus?: number;
-    data?: any;
-};
-
-export function isDefinedRuntimeError(obj: any): obj is DefinedRuntimeError {
-    if(obj.code!=null && typeof(obj.code)==="number") {
-        if(obj.msg!=null && typeof(obj.msg)!=="string") return false;
-        if(obj._httpStatus!=null && typeof(obj._httpStatus)!=="number") return false;
-        return true;
-    }
-    return false;
-}
-
-export function expressHandlerWrapper(func: (
-    req: Request,
-    res: Response
-) => Promise<void>) : ((
-    req: Request,
-    res: Response & {responseStream: ServerParamEncoder}
-) => void) {
-    return (
-        req: Request,
-        res: Response & {responseStream: ServerParamEncoder}
-    ) => {
-        (async () => {
-            try {
-                await func(req, res);
-            } catch (e) {
-                console.error(e);
-                let statusCode = 500;
-                const obj: {code: number, msg: string, data?: any} = {
-                    code: 0,
-                    msg: "Internal server error"
-                };
-                if(isDefinedRuntimeError(e)) {
-                    obj.msg = e.msg;
-                    obj.code = e.code;
-                    obj.data = e.data;
-                    statusCode = 400;
-                    if(e._httpStatus!=null) statusCode = e._httpStatus;
-                }
-                if(res.responseStream!=null) {
-                    if(res.responseStream.getAbortSignal().aborted) return;
-                    res.responseStream.writeParamsAndEnd(obj).catch(e => null);
-                } else {
-                    res.status(statusCode).json(obj);
-                }
-            }
-        })();
-    }
-}
-
-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 {
-    return bn==null ? null : bn.toString(10);
-}
-
-export function deserializeBN(str: string | null): bigint | null {
-    return str==null ? null : BigInt(str);
-}
-
-export function bigIntSorter(a: bigint, b: bigint): -1 | 0 | 1 {
-    if(a < b) return -1;
-    if(a > b) return 1;
-    return 0;
-}
-
-/**
- * Creates an abort controller that extends the responseStream's abort signal
- *
- * @param responseStream
- */
-export function getAbortController(responseStream: ServerParamEncoder): AbortController {
-    const abortController = new AbortController();
-    if(responseStream==null || responseStream.getAbortSignal==null) return abortController;
-    const responseStreamAbortController = responseStream.getAbortSignal();
-    responseStreamAbortController.addEventListener("abort", () => abortController.abort(responseStreamAbortController.reason));
-    return abortController;
-}
+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;
+    _httpStatus?: number;
+    data?: any;
+};
+
+export function isDefinedRuntimeError(obj: any): obj is DefinedRuntimeError {
+    if(obj.code!=null && typeof(obj.code)==="number") {
+        if(obj.msg!=null && typeof(obj.msg)!=="string") return false;
+        if(obj._httpStatus!=null && typeof(obj._httpStatus)!=="number") return false;
+        return true;
+    }
+    return false;
+}
+
+const expressHandlerWrapperLogger = getLogger("ExpressHandlerWrapper: ");
+
+export function expressHandlerWrapper(func: (
+    req: Request,
+    res: Response
+) => Promise<void>) : ((
+    req: Request,
+    res: Response & {responseStream: ServerParamEncoder}
+) => void) {
+    return (
+        req: Request,
+        res: Response & {responseStream: ServerParamEncoder}
+    ) => {
+        (async () => {
+            try {
+                await func(req, res);
+            } catch (e) {
+                expressHandlerWrapperLogger.error("Error in called function "+req.path+": ", e);
+                let statusCode = 500;
+                const obj: {code: number, msg: string, data?: any} = {
+                    code: 0,
+                    msg: "Internal server error"
+                };
+                if(isDefinedRuntimeError(e)) {
+                    obj.msg = e.msg;
+                    obj.code = e.code;
+                    obj.data = e.data;
+                    statusCode = 400;
+                    if(e._httpStatus!=null) statusCode = e._httpStatus;
+                }
+                if(res.responseStream!=null) {
+                    if(res.responseStream.getAbortSignal().aborted) return;
+                    res.responseStream.writeParamsAndEnd(obj).catch(e => null);
+                } else {
+                    res.status(statusCode).json(obj);
+                }
+            }
+        })();
+    }
+}
+
+export const HEX_REGEX = /[0-9a-fA-F]+/;
+
+export function serializeBN(bn: bigint | null): string | null {
+    return bn==null ? null : bn.toString(10);
+}
+
+export function deserializeBN(str: string | null): bigint | null {
+    return str==null ? null : BigInt(str);
+}
+
+export function bigIntSorter(a: bigint, b: bigint): -1 | 0 | 1 {
+    if(a < b) return -1;
+    if(a > b) return 1;
+    return 0;
+}
+
+/**
+ * Creates an abort controller that extends the responseStream's abort signal
+ *
+ * @param responseStream
+ */
+export function getAbortController(responseStream: ServerParamEncoder): AbortController {
+    const abortController = new AbortController();
+    if(responseStream==null || responseStream.getAbortSignal==null) return abortController;
+    const responseStreamAbortController = responseStream.getAbortSignal();
+    responseStreamAbortController.addEventListener("abort", () => abortController.abort(responseStreamAbortController.reason));
+    return abortController;
+}

package/src/utils/paramcoders/IParamReader.ts

@@ -1,8 +1,8 @@
-import {RequestSchema, RequestSchemaResult} from "./SchemaVerifier";
-
-export interface IParamReader {
-
-    getParams<T extends RequestSchema>(schema: T): Promise<RequestSchemaResult<T>>;
-    getExistingParamsOrNull<T extends RequestSchema>(schema: T): RequestSchemaResult<T>;
-
+import {RequestSchema, RequestSchemaResult} from "./SchemaVerifier";
+
+export interface IParamReader {
+
+    getParams<T extends RequestSchema>(schema: T): Promise<RequestSchemaResult<T>>;
+    getExistingParamsOrNull<T extends RequestSchema>(schema: T): RequestSchemaResult<T>;
+
 }

package/src/utils/paramcoders/IParamWriter.ts

@@ -1,8 +1,8 @@
-
-export interface IParamWriter {
-
-    end(): Promise<void>;
-    writeParams(data: any): Promise<void>;
-
-}
-
+
+export interface IParamWriter {
+
+    end(): Promise<void>;
+    writeParams(data: any): Promise<void>;
+
+}
+

package/src/utils/paramcoders/LegacyParamEncoder.ts

@@ -1,28 +1,28 @@
-import {IParamWriter} from "./IParamWriter";
-
-
-export class LegacyParamEncoder implements IParamWriter {
-
-    private readonly writeFN: (data: Buffer) => Promise<void>;
-    private readonly endFN: () => Promise<void>;
-
-    private obj = {};
-
-    constructor(write: (data: Buffer) => Promise<void>, end: () => Promise<void>) {
-        this.writeFN = write;
-        this.endFN = end;
-    }
-
-    writeParams(data: any): Promise<void> {
-        for(let key in data) {
-            if(this.obj[key]==null) this.obj[key] = data[key];
-        }
-        return Promise.resolve();
-    }
-
-    async end(): Promise<void> {
-        await this.writeFN(Buffer.from(JSON.stringify(this.obj)));
-        await this.endFN();
-    }
-
+import {IParamWriter} from "./IParamWriter";
+
+
+export class LegacyParamEncoder implements IParamWriter {
+
+    private readonly writeFN: (data: Buffer) => Promise<void>;
+    private readonly endFN: () => Promise<void>;
+
+    private obj = {};
+
+    constructor(write: (data: Buffer) => Promise<void>, end: () => Promise<void>) {
+        this.writeFN = write;
+        this.endFN = end;
+    }
+
+    writeParams(data: any): Promise<void> {
+        for(let key in data) {
+            if(this.obj[key]==null) this.obj[key] = data[key];
+        }
+        return Promise.resolve();
+    }
+
+    async end(): Promise<void> {
+        await this.writeFN(Buffer.from(JSON.stringify(this.obj)));
+        await this.endFN();
+    }
+
 }