@atomiqlabs/lp-lib 17.5.1 → 17.5.2

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

@@ -1,125 +1,125 @@
-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");
-    }
-
-    getDestinationAddress(): string {
-        return this.dstAddress;
-    }
-
-}
+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");
+    }
+
+    getDestinationAddress(): string {
+        return this.dstAddress;
+    }
+
+}

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);
+}