@atomiqlabs/chain-evm 1.0.0-dev.34 → 1.0.0-dev.36

package/dist/evm/swaps/EscrowManagerTypechain.js

@@ -1,2 +1,2 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/dist/evm/swaps/handlers/IHandler.d.ts

@@ -1,13 +1,13 @@
-/// <reference types="node" />
-/// <reference types="node" />
-import { EVMSwapData } from "../EVMSwapData";
-import { EVMTx } from "../../chain/modules/EVMTransactions";
-export interface IHandler<TCommitmentData, TWitnessData> {
-    readonly address: string;
-    getCommitment(data: TCommitmentData): string;
-    getWitness(signer: string, data: EVMSwapData, witnessData: TWitnessData, feeRate?: string): Promise<{
-        initialTxns: EVMTx[];
-        witness: Buffer;
-    }>;
-    getGas(data: EVMSwapData): number;
-}
+/// <reference types="node" />
+/// <reference types="node" />
+import { EVMSwapData } from "../EVMSwapData";
+import { EVMTx } from "../../chain/modules/EVMTransactions";
+export interface IHandler<TCommitmentData, TWitnessData> {
+    readonly address: string;
+    getCommitment(data: TCommitmentData): string;
+    getWitness(signer: string, data: EVMSwapData, witnessData: TWitnessData, feeRate?: string): Promise<{
+        initialTxns: EVMTx[];
+        witness: Buffer;
+    }>;
+    getGas(data: EVMSwapData): number;
+}

package/dist/evm/swaps/handlers/IHandler.js

@@ -1,2 +1,2 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/dist/evm/swaps/handlers/claim/ClaimHandlers.d.ts

@@ -1,10 +1,10 @@
-import { ChainSwapType } from "@atomiqlabs/base";
-import { IHandler } from "../IHandler";
-export interface IClaimHandler<C, W> extends IHandler<C, W> {
-    getType(): ChainSwapType;
-}
-export type ClaimHandlerType = {
-    gas: number;
-    type: ChainSwapType;
-} & (new (address: string) => IClaimHandler<any, any>);
-export declare const claimHandlersList: ClaimHandlerType[];
+import { ChainSwapType } from "@atomiqlabs/base";
+import { IHandler } from "../IHandler";
+export interface IClaimHandler<C, W> extends IHandler<C, W> {
+    getType(): ChainSwapType;
+}
+export type ClaimHandlerType = {
+    gas: number;
+    type: ChainSwapType;
+} & (new (address: string) => IClaimHandler<any, any>);
+export declare const claimHandlersList: ClaimHandlerType[];

package/dist/evm/swaps/handlers/claim/ClaimHandlers.js

@@ -1,13 +1,13 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.claimHandlersList = void 0;
-const HashlockClaimHandler_1 = require("./HashlockClaimHandler");
-const BitcoinTxIdClaimHandler_1 = require("./btc/BitcoinTxIdClaimHandler");
-const BitcoinOutputClaimHandler_1 = require("./btc/BitcoinOutputClaimHandler");
-const BitcoinNoncedOutputClaimHandler_1 = require("./btc/BitcoinNoncedOutputClaimHandler");
-exports.claimHandlersList = [
-    HashlockClaimHandler_1.HashlockClaimHandler,
-    BitcoinTxIdClaimHandler_1.BitcoinTxIdClaimHandler,
-    BitcoinOutputClaimHandler_1.BitcoinOutputClaimHandler,
-    BitcoinNoncedOutputClaimHandler_1.BitcoinNoncedOutputClaimHandler
-];
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.claimHandlersList = void 0;
+const HashlockClaimHandler_1 = require("./HashlockClaimHandler");
+const BitcoinTxIdClaimHandler_1 = require("./btc/BitcoinTxIdClaimHandler");
+const BitcoinOutputClaimHandler_1 = require("./btc/BitcoinOutputClaimHandler");
+const BitcoinNoncedOutputClaimHandler_1 = require("./btc/BitcoinNoncedOutputClaimHandler");
+exports.claimHandlersList = [
+    HashlockClaimHandler_1.HashlockClaimHandler,
+    BitcoinTxIdClaimHandler_1.BitcoinTxIdClaimHandler,
+    BitcoinOutputClaimHandler_1.BitcoinOutputClaimHandler,
+    BitcoinNoncedOutputClaimHandler_1.BitcoinNoncedOutputClaimHandler
+];

package/dist/evm/swaps/handlers/claim/HashlockClaimHandler.d.ts

@@ -1,20 +1,20 @@
-/// <reference types="node" />
-/// <reference types="node" />
-import { ChainSwapType } from "@atomiqlabs/base";
-import { Buffer } from "buffer";
-import { IClaimHandler } from "./ClaimHandlers";
-import { EVMSwapData } from "../../EVMSwapData";
-import { EVMTx } from "../../../chain/modules/EVMTransactions";
-export declare class HashlockClaimHandler implements IClaimHandler<Buffer, string> {
-    readonly address: string;
-    static readonly type: ChainSwapType;
-    static readonly gas: number;
-    constructor(address: string);
-    getCommitment(data: Buffer): string;
-    getWitness(signer: string, data: EVMSwapData, witnessData: string): Promise<{
-        initialTxns: EVMTx[];
-        witness: Buffer;
-    }>;
-    getGas(): number;
-    getType(): ChainSwapType;
-}
+/// <reference types="node" />
+/// <reference types="node" />
+import { ChainSwapType } from "@atomiqlabs/base";
+import { Buffer } from "buffer";
+import { IClaimHandler } from "./ClaimHandlers";
+import { EVMSwapData } from "../../EVMSwapData";
+import { EVMTx } from "../../../chain/modules/EVMTransactions";
+export declare class HashlockClaimHandler implements IClaimHandler<Buffer, string> {
+    readonly address: string;
+    static readonly type: ChainSwapType;
+    static readonly gas: number;
+    constructor(address: string);
+    getCommitment(data: Buffer): string;
+    getWitness(signer: string, data: EVMSwapData, witnessData: string): Promise<{
+        initialTxns: EVMTx[];
+        witness: Buffer;
+    }>;
+    getGas(): number;
+    getType(): ChainSwapType;
+}

package/dist/evm/swaps/handlers/claim/HashlockClaimHandler.js

@@ -1,39 +1,39 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.HashlockClaimHandler = void 0;
-const base_1 = require("@atomiqlabs/base");
-const buffer_1 = require("buffer");
-const ethers_1 = require("ethers");
-const sha2_1 = require("@noble/hashes/sha2");
-class HashlockClaimHandler {
-    constructor(address) {
-        this.address = address;
-    }
-    getCommitment(data) {
-        if (data.length !== 32)
-            throw new Error("Invalid swap hash");
-        return (0, ethers_1.hexlify)(data);
-    }
-    getWitness(signer, data, witnessData) {
-        if (!data.isClaimHandler(this.address))
-            throw new Error("Invalid claim handler");
-        if (witnessData.length !== 64)
-            throw new Error("Invalid hash secret: string length");
-        const buffer = buffer_1.Buffer.from(witnessData, "hex");
-        if (buffer.length !== 32)
-            throw new Error("Invalid hash secret: buff length");
-        const witnessSha256 = buffer_1.Buffer.from((0, sha2_1.sha256)(buffer));
-        if (!data.isClaimData(this.getCommitment(witnessSha256)))
-            throw new Error("Invalid hash secret: poseidon hash doesn't match");
-        return Promise.resolve({ initialTxns: [], witness: buffer });
-    }
-    getGas() {
-        return HashlockClaimHandler.gas;
-    }
-    getType() {
-        return HashlockClaimHandler.type;
-    }
-}
-exports.HashlockClaimHandler = HashlockClaimHandler;
-HashlockClaimHandler.type = base_1.ChainSwapType.HTLC;
-HashlockClaimHandler.gas = 5000;
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.HashlockClaimHandler = void 0;
+const base_1 = require("@atomiqlabs/base");
+const buffer_1 = require("buffer");
+const ethers_1 = require("ethers");
+const sha2_1 = require("@noble/hashes/sha2");
+class HashlockClaimHandler {
+    constructor(address) {
+        this.address = address;
+    }
+    getCommitment(data) {
+        if (data.length !== 32)
+            throw new Error("Invalid swap hash");
+        return (0, ethers_1.hexlify)(data);
+    }
+    getWitness(signer, data, witnessData) {
+        if (!data.isClaimHandler(this.address))
+            throw new Error("Invalid claim handler");
+        if (witnessData.length !== 64)
+            throw new Error("Invalid hash secret: string length");
+        const buffer = buffer_1.Buffer.from(witnessData, "hex");
+        if (buffer.length !== 32)
+            throw new Error("Invalid hash secret: buff length");
+        const witnessSha256 = buffer_1.Buffer.from((0, sha2_1.sha256)(buffer));
+        if (!data.isClaimData(this.getCommitment(witnessSha256)))
+            throw new Error("Invalid hash secret: poseidon hash doesn't match");
+        return Promise.resolve({ initialTxns: [], witness: buffer });
+    }
+    getGas() {
+        return HashlockClaimHandler.gas;
+    }
+    getType() {
+        return HashlockClaimHandler.type;
+    }
+}
+exports.HashlockClaimHandler = HashlockClaimHandler;
+HashlockClaimHandler.type = base_1.ChainSwapType.HTLC;
+HashlockClaimHandler.gas = 5000;

package/dist/evm/swaps/handlers/claim/btc/BitcoinNoncedOutputClaimHandler.d.ts

@@ -1,24 +1,24 @@
-/// <reference types="node" />
-/// <reference types="node" />
-import { ChainSwapType } from "@atomiqlabs/base";
-import { BitcoinCommitmentData, IBitcoinClaimHandler } from "./IBitcoinClaimHandler";
-import { BitcoinOutputWitnessData } from "./BitcoinOutputClaimHandler";
-import { Buffer } from "buffer";
-import { EVMSwapData } from "../../../EVMSwapData";
-import { EVMTx } from "../../../../chain/modules/EVMTransactions";
-export type BitcoinNoncedOutputCommitmentData = {
-    output: Buffer;
-    amount: bigint;
-    nonce: bigint;
-};
-export declare class BitcoinNoncedOutputClaimHandler extends IBitcoinClaimHandler<BitcoinNoncedOutputCommitmentData, BitcoinOutputWitnessData> {
-    static readonly type: ChainSwapType;
-    static readonly gas: number;
-    protected serializeCommitment(data: BitcoinNoncedOutputCommitmentData & BitcoinCommitmentData): Buffer;
-    getWitness(signer: string, swapData: EVMSwapData, witnessData: BitcoinOutputWitnessData, feeRate?: string): Promise<{
-        initialTxns: EVMTx[];
-        witness: Buffer;
-    }>;
-    getGas(data: EVMSwapData): number;
-    getType(): ChainSwapType;
-}
+/// <reference types="node" />
+/// <reference types="node" />
+import { ChainSwapType } from "@atomiqlabs/base";
+import { BitcoinCommitmentData, IBitcoinClaimHandler } from "./IBitcoinClaimHandler";
+import { BitcoinOutputWitnessData } from "./BitcoinOutputClaimHandler";
+import { Buffer } from "buffer";
+import { EVMSwapData } from "../../../EVMSwapData";
+import { EVMTx } from "../../../../chain/modules/EVMTransactions";
+export type BitcoinNoncedOutputCommitmentData = {
+    output: Buffer;
+    amount: bigint;
+    nonce: bigint;
+};
+export declare class BitcoinNoncedOutputClaimHandler extends IBitcoinClaimHandler<BitcoinNoncedOutputCommitmentData, BitcoinOutputWitnessData> {
+    static readonly type: ChainSwapType;
+    static readonly gas: number;
+    protected serializeCommitment(data: BitcoinNoncedOutputCommitmentData & BitcoinCommitmentData): Buffer;
+    getWitness(signer: string, swapData: EVMSwapData, witnessData: BitcoinOutputWitnessData, feeRate?: string): Promise<{
+        initialTxns: EVMTx[];
+        witness: Buffer;
+    }>;
+    getGas(data: EVMSwapData): number;
+    getType(): ChainSwapType;
+}

package/dist/evm/swaps/handlers/claim/btc/BitcoinNoncedOutputClaimHandler.js

@@ -1,59 +1,59 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.BitcoinNoncedOutputClaimHandler = void 0;
-const base_1 = require("@atomiqlabs/base");
-const IBitcoinClaimHandler_1 = require("./IBitcoinClaimHandler");
-const btc_signer_1 = require("@scure/btc-signer");
-const buffer_1 = require("buffer");
-const ethers_1 = require("ethers");
-function getTransactionNonce(btcTx) {
-    const locktimeSub500M = BigInt(btcTx.lockTime - 500000000);
-    if (locktimeSub500M < 0n)
-        throw new Error("Locktime too low!");
-    const nSequence = BigInt(btcTx.getInput(0).sequence);
-    return (locktimeSub500M << 24n) | (nSequence & 0x00ffffffn);
-}
-class BitcoinNoncedOutputClaimHandler extends IBitcoinClaimHandler_1.IBitcoinClaimHandler {
-    serializeCommitment(data) {
-        const txoHash = (0, ethers_1.solidityPackedKeccak256)(["uint64", "uint64", "bytes32"], [data.nonce, data.amount, (0, ethers_1.keccak256)(data.output)]);
-        return buffer_1.Buffer.concat([
-            buffer_1.Buffer.from(txoHash.substring(2), "hex"),
-            super.serializeCommitment(data)
-        ]);
-    }
-    async getWitness(signer, swapData, witnessData, feeRate) {
-        if (!swapData.isClaimHandler(this.address))
-            throw new Error("Invalid claim handler");
-        const txBuffer = buffer_1.Buffer.from(witnessData.tx.hex, "hex");
-        const parsedBtcTx = btc_signer_1.Transaction.fromRaw(txBuffer);
-        const out = parsedBtcTx.getOutput(witnessData.vout);
-        const { initialTxns, commitment, blockheader, merkleProof } = await this._getWitness(signer, swapData, witnessData, {
-            output: buffer_1.Buffer.from(out.script),
-            amount: out.amount,
-            nonce: getTransactionNonce(parsedBtcTx)
-        });
-        const voutAndTxData = buffer_1.Buffer.concat([
-            base_1.BigIntBufferUtils.toBuffer(BigInt(witnessData.vout), "be", 4),
-            base_1.BigIntBufferUtils.toBuffer(BigInt(txBuffer.length), "be", 32),
-            txBuffer
-        ]);
-        return {
-            initialTxns,
-            witness: buffer_1.Buffer.concat([
-                commitment,
-                blockheader,
-                voutAndTxData,
-                merkleProof
-            ])
-        };
-    }
-    getGas(data) {
-        return BitcoinNoncedOutputClaimHandler.gas;
-    }
-    getType() {
-        return BitcoinNoncedOutputClaimHandler.type;
-    }
-}
-exports.BitcoinNoncedOutputClaimHandler = BitcoinNoncedOutputClaimHandler;
-BitcoinNoncedOutputClaimHandler.type = base_1.ChainSwapType.CHAIN_NONCED;
-BitcoinNoncedOutputClaimHandler.gas = 40000;
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.BitcoinNoncedOutputClaimHandler = void 0;
+const base_1 = require("@atomiqlabs/base");
+const IBitcoinClaimHandler_1 = require("./IBitcoinClaimHandler");
+const btc_signer_1 = require("@scure/btc-signer");
+const buffer_1 = require("buffer");
+const ethers_1 = require("ethers");
+function getTransactionNonce(btcTx) {
+    const locktimeSub500M = BigInt(btcTx.lockTime - 500000000);
+    if (locktimeSub500M < 0n)
+        throw new Error("Locktime too low!");
+    const nSequence = BigInt(btcTx.getInput(0).sequence);
+    return (locktimeSub500M << 24n) | (nSequence & 0x00ffffffn);
+}
+class BitcoinNoncedOutputClaimHandler extends IBitcoinClaimHandler_1.IBitcoinClaimHandler {
+    serializeCommitment(data) {
+        const txoHash = (0, ethers_1.solidityPackedKeccak256)(["uint64", "uint64", "bytes32"], [data.nonce, data.amount, (0, ethers_1.keccak256)(data.output)]);
+        return buffer_1.Buffer.concat([
+            buffer_1.Buffer.from(txoHash.substring(2), "hex"),
+            super.serializeCommitment(data)
+        ]);
+    }
+    async getWitness(signer, swapData, witnessData, feeRate) {
+        if (!swapData.isClaimHandler(this.address))
+            throw new Error("Invalid claim handler");
+        const txBuffer = buffer_1.Buffer.from(witnessData.tx.hex, "hex");
+        const parsedBtcTx = btc_signer_1.Transaction.fromRaw(txBuffer);
+        const out = parsedBtcTx.getOutput(witnessData.vout);
+        const { initialTxns, commitment, blockheader, merkleProof } = await this._getWitness(signer, swapData, witnessData, {
+            output: buffer_1.Buffer.from(out.script),
+            amount: out.amount,
+            nonce: getTransactionNonce(parsedBtcTx)
+        });
+        const voutAndTxData = buffer_1.Buffer.concat([
+            base_1.BigIntBufferUtils.toBuffer(BigInt(witnessData.vout), "be", 4),
+            base_1.BigIntBufferUtils.toBuffer(BigInt(txBuffer.length), "be", 32),
+            txBuffer
+        ]);
+        return {
+            initialTxns,
+            witness: buffer_1.Buffer.concat([
+                commitment,
+                blockheader,
+                voutAndTxData,
+                merkleProof
+            ])
+        };
+    }
+    getGas(data) {
+        return BitcoinNoncedOutputClaimHandler.gas;
+    }
+    getType() {
+        return BitcoinNoncedOutputClaimHandler.type;
+    }
+}
+exports.BitcoinNoncedOutputClaimHandler = BitcoinNoncedOutputClaimHandler;
+BitcoinNoncedOutputClaimHandler.type = base_1.ChainSwapType.CHAIN_NONCED;
+BitcoinNoncedOutputClaimHandler.gas = 40000;

package/dist/evm/swaps/handlers/claim/btc/BitcoinOutputClaimHandler.d.ts

@@ -1,25 +1,25 @@
-/// <reference types="node" />
-/// <reference types="node" />
-import { ChainSwapType } from "@atomiqlabs/base";
-import { BitcoinCommitmentData, BitcoinWitnessData, IBitcoinClaimHandler } from "./IBitcoinClaimHandler";
-import { Buffer } from "buffer";
-import { EVMTx } from "../../../../chain/modules/EVMTransactions";
-import { EVMSwapData } from "../../../EVMSwapData";
-export type BitcoinOutputCommitmentData = {
-    output: Buffer;
-    amount: bigint;
-};
-export type BitcoinOutputWitnessData = BitcoinWitnessData & {
-    vout: number;
-};
-export declare class BitcoinOutputClaimHandler extends IBitcoinClaimHandler<BitcoinOutputCommitmentData, BitcoinOutputWitnessData> {
-    static readonly type: ChainSwapType;
-    static readonly gas: number;
-    protected serializeCommitment(data: BitcoinOutputCommitmentData & BitcoinCommitmentData): Buffer;
-    getWitness(signer: string, swapData: EVMSwapData, witnessData: BitcoinOutputWitnessData, feeRate?: string): Promise<{
-        initialTxns: EVMTx[];
-        witness: Buffer;
-    }>;
-    getGas(data: EVMSwapData): number;
-    getType(): ChainSwapType;
-}
+/// <reference types="node" />
+/// <reference types="node" />
+import { ChainSwapType } from "@atomiqlabs/base";
+import { BitcoinCommitmentData, BitcoinWitnessData, IBitcoinClaimHandler } from "./IBitcoinClaimHandler";
+import { Buffer } from "buffer";
+import { EVMTx } from "../../../../chain/modules/EVMTransactions";
+import { EVMSwapData } from "../../../EVMSwapData";
+export type BitcoinOutputCommitmentData = {
+    output: Buffer;
+    amount: bigint;
+};
+export type BitcoinOutputWitnessData = BitcoinWitnessData & {
+    vout: number;
+};
+export declare class BitcoinOutputClaimHandler extends IBitcoinClaimHandler<BitcoinOutputCommitmentData, BitcoinOutputWitnessData> {
+    static readonly type: ChainSwapType;
+    static readonly gas: number;
+    protected serializeCommitment(data: BitcoinOutputCommitmentData & BitcoinCommitmentData): Buffer;
+    getWitness(signer: string, swapData: EVMSwapData, witnessData: BitcoinOutputWitnessData, feeRate?: string): Promise<{
+        initialTxns: EVMTx[];
+        witness: Buffer;
+    }>;
+    getGas(data: EVMSwapData): number;
+    getType(): ChainSwapType;
+}

package/dist/evm/swaps/handlers/claim/btc/BitcoinOutputClaimHandler.js

@@ -1,51 +1,51 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.BitcoinOutputClaimHandler = void 0;
-const base_1 = require("@atomiqlabs/base");
-const IBitcoinClaimHandler_1 = require("./IBitcoinClaimHandler");
-const buffer_1 = require("buffer");
-const ethers_1 = require("ethers");
-const btc_signer_1 = require("@scure/btc-signer");
-class BitcoinOutputClaimHandler extends IBitcoinClaimHandler_1.IBitcoinClaimHandler {
-    serializeCommitment(data) {
-        const txoHash = (0, ethers_1.solidityPackedKeccak256)(["uint64", "bytes32"], [data.amount, (0, ethers_1.keccak256)(data.output)]);
-        return buffer_1.Buffer.concat([
-            buffer_1.Buffer.from(txoHash.substring(2), "hex"),
-            super.serializeCommitment(data)
-        ]);
-    }
-    async getWitness(signer, swapData, witnessData, feeRate) {
-        if (!swapData.isClaimHandler(this.address))
-            throw new Error("Invalid claim handler");
-        const txBuffer = buffer_1.Buffer.from(witnessData.tx.hex, "hex");
-        const parsedBtcTx = btc_signer_1.Transaction.fromRaw(txBuffer);
-        const out = parsedBtcTx.getOutput(witnessData.vout);
-        const { initialTxns, commitment, blockheader, merkleProof } = await this._getWitness(signer, swapData, witnessData, {
-            output: buffer_1.Buffer.from(out.script),
-            amount: out.amount
-        });
-        const voutAndTxData = buffer_1.Buffer.concat([
-            base_1.BigIntBufferUtils.toBuffer(BigInt(witnessData.vout), "be", 4),
-            base_1.BigIntBufferUtils.toBuffer(BigInt(txBuffer.length), "be", 32),
-            txBuffer
-        ]);
-        return {
-            initialTxns,
-            witness: buffer_1.Buffer.concat([
-                commitment,
-                blockheader,
-                voutAndTxData,
-                merkleProof
-            ])
-        };
-    }
-    getGas(data) {
-        return BitcoinOutputClaimHandler.gas;
-    }
-    getType() {
-        return BitcoinOutputClaimHandler.type;
-    }
-}
-exports.BitcoinOutputClaimHandler = BitcoinOutputClaimHandler;
-BitcoinOutputClaimHandler.type = base_1.ChainSwapType.CHAIN;
-BitcoinOutputClaimHandler.gas = 40000;
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.BitcoinOutputClaimHandler = void 0;
+const base_1 = require("@atomiqlabs/base");
+const IBitcoinClaimHandler_1 = require("./IBitcoinClaimHandler");
+const buffer_1 = require("buffer");
+const ethers_1 = require("ethers");
+const btc_signer_1 = require("@scure/btc-signer");
+class BitcoinOutputClaimHandler extends IBitcoinClaimHandler_1.IBitcoinClaimHandler {
+    serializeCommitment(data) {
+        const txoHash = (0, ethers_1.solidityPackedKeccak256)(["uint64", "bytes32"], [data.amount, (0, ethers_1.keccak256)(data.output)]);
+        return buffer_1.Buffer.concat([
+            buffer_1.Buffer.from(txoHash.substring(2), "hex"),
+            super.serializeCommitment(data)
+        ]);
+    }
+    async getWitness(signer, swapData, witnessData, feeRate) {
+        if (!swapData.isClaimHandler(this.address))
+            throw new Error("Invalid claim handler");
+        const txBuffer = buffer_1.Buffer.from(witnessData.tx.hex, "hex");
+        const parsedBtcTx = btc_signer_1.Transaction.fromRaw(txBuffer);
+        const out = parsedBtcTx.getOutput(witnessData.vout);
+        const { initialTxns, commitment, blockheader, merkleProof } = await this._getWitness(signer, swapData, witnessData, {
+            output: buffer_1.Buffer.from(out.script),
+            amount: out.amount
+        });
+        const voutAndTxData = buffer_1.Buffer.concat([
+            base_1.BigIntBufferUtils.toBuffer(BigInt(witnessData.vout), "be", 4),
+            base_1.BigIntBufferUtils.toBuffer(BigInt(txBuffer.length), "be", 32),
+            txBuffer
+        ]);
+        return {
+            initialTxns,
+            witness: buffer_1.Buffer.concat([
+                commitment,
+                blockheader,
+                voutAndTxData,
+                merkleProof
+            ])
+        };
+    }
+    getGas(data) {
+        return BitcoinOutputClaimHandler.gas;
+    }
+    getType() {
+        return BitcoinOutputClaimHandler.type;
+    }
+}
+exports.BitcoinOutputClaimHandler = BitcoinOutputClaimHandler;
+BitcoinOutputClaimHandler.type = base_1.ChainSwapType.CHAIN;
+BitcoinOutputClaimHandler.gas = 40000;

package/dist/evm/swaps/handlers/claim/btc/BitcoinTxIdClaimHandler.d.ts

@@ -1,21 +1,21 @@
-/// <reference types="node" />
-/// <reference types="node" />
-import { ChainSwapType } from "@atomiqlabs/base";
-import { BitcoinCommitmentData, BitcoinWitnessData, IBitcoinClaimHandler } from "./IBitcoinClaimHandler";
-import { Buffer } from "buffer";
-import { EVMSwapData } from "../../../EVMSwapData";
-import { EVMTx } from "../../../../chain/modules/EVMTransactions";
-export type BitcoinTxIdCommitmentData = {
-    txId: string;
-};
-export declare class BitcoinTxIdClaimHandler extends IBitcoinClaimHandler<BitcoinTxIdCommitmentData, BitcoinWitnessData> {
-    static readonly type: ChainSwapType;
-    static readonly gas: number;
-    protected serializeCommitment(data: BitcoinTxIdCommitmentData & BitcoinCommitmentData): Buffer;
-    getWitness(signer: string, swapData: EVMSwapData, witnessData: BitcoinWitnessData, feeRate?: string): Promise<{
-        initialTxns: EVMTx[];
-        witness: Buffer;
-    }>;
-    getGas(data: EVMSwapData): number;
-    getType(): ChainSwapType;
-}
+/// <reference types="node" />
+/// <reference types="node" />
+import { ChainSwapType } from "@atomiqlabs/base";
+import { BitcoinCommitmentData, BitcoinWitnessData, IBitcoinClaimHandler } from "./IBitcoinClaimHandler";
+import { Buffer } from "buffer";
+import { EVMSwapData } from "../../../EVMSwapData";
+import { EVMTx } from "../../../../chain/modules/EVMTransactions";
+export type BitcoinTxIdCommitmentData = {
+    txId: string;
+};
+export declare class BitcoinTxIdClaimHandler extends IBitcoinClaimHandler<BitcoinTxIdCommitmentData, BitcoinWitnessData> {
+    static readonly type: ChainSwapType;
+    static readonly gas: number;
+    protected serializeCommitment(data: BitcoinTxIdCommitmentData & BitcoinCommitmentData): Buffer;
+    getWitness(signer: string, swapData: EVMSwapData, witnessData: BitcoinWitnessData, feeRate?: string): Promise<{
+        initialTxns: EVMTx[];
+        witness: Buffer;
+    }>;
+    getGas(data: EVMSwapData): number;
+    getType(): ChainSwapType;
+}

package/dist/evm/swaps/handlers/claim/btc/BitcoinTxIdClaimHandler.js

@@ -1,28 +1,28 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.BitcoinTxIdClaimHandler = void 0;
-const base_1 = require("@atomiqlabs/base");
-const IBitcoinClaimHandler_1 = require("./IBitcoinClaimHandler");
-const buffer_1 = require("buffer");
-class BitcoinTxIdClaimHandler extends IBitcoinClaimHandler_1.IBitcoinClaimHandler {
-    serializeCommitment(data) {
-        return buffer_1.Buffer.concat([
-            buffer_1.Buffer.from(data.txId, "hex").reverse(),
-            super.serializeCommitment(data)
-        ]);
-    }
-    getWitness(signer, swapData, witnessData, feeRate) {
-        if (!swapData.isClaimHandler(this.address))
-            throw new Error("Invalid claim handler");
-        return this._getWitness(signer, swapData, witnessData, { txId: witnessData.tx.txid });
-    }
-    getGas(data) {
-        return BitcoinTxIdClaimHandler.gas;
-    }
-    getType() {
-        return BitcoinTxIdClaimHandler.type;
-    }
-}
-exports.BitcoinTxIdClaimHandler = BitcoinTxIdClaimHandler;
-BitcoinTxIdClaimHandler.type = base_1.ChainSwapType.CHAIN_TXID;
-BitcoinTxIdClaimHandler.gas = 10000;
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.BitcoinTxIdClaimHandler = void 0;
+const base_1 = require("@atomiqlabs/base");
+const IBitcoinClaimHandler_1 = require("./IBitcoinClaimHandler");
+const buffer_1 = require("buffer");
+class BitcoinTxIdClaimHandler extends IBitcoinClaimHandler_1.IBitcoinClaimHandler {
+    serializeCommitment(data) {
+        return buffer_1.Buffer.concat([
+            buffer_1.Buffer.from(data.txId, "hex").reverse(),
+            super.serializeCommitment(data)
+        ]);
+    }
+    getWitness(signer, swapData, witnessData, feeRate) {
+        if (!swapData.isClaimHandler(this.address))
+            throw new Error("Invalid claim handler");
+        return this._getWitness(signer, swapData, witnessData, { txId: witnessData.tx.txid });
+    }
+    getGas(data) {
+        return BitcoinTxIdClaimHandler.gas;
+    }
+    getType() {
+        return BitcoinTxIdClaimHandler.type;
+    }
+}
+exports.BitcoinTxIdClaimHandler = BitcoinTxIdClaimHandler;
+BitcoinTxIdClaimHandler.type = base_1.ChainSwapType.CHAIN_TXID;
+BitcoinTxIdClaimHandler.gas = 10000;