@teleportdao/bitcoin 1.4.3 → 1.4.6

package/dist/transaction-builder/transaction-builder.d.ts

@@ -1,13 +1,202 @@
-export = BaseBitcoinLikeTransaction;
-declare class BaseBitcoinLikeTransaction extends BaseBitcoinLikeTransactionBuilderCommon {
-    convertBaseInputsToInputs(baseInputs?: any[]): Promise<any[]>;
-    createUnsignedTransaction({ inputs, outputs, change, fee, feeRate, }: any): {
+/// <reference types="node" />
+import * as bitcoin from "bitcoinjs-lib";
+export type Utxo = {
+    hash: string;
+    value: number;
+    index: number;
+};
+export type SignerInfo = {
+    address: string;
+    publicKey: string;
+    addressType: string;
+    derivationPath?: string;
+    masterFingerprint?: string;
+    includeHex?: boolean;
+};
+export type ExtendedUtxo = {
+    signerInfo: SignerInfo;
+    hash: string;
+    value: number;
+    index: number;
+};
+export type TargetAddress = {
+    address: string;
+    value: number;
+};
+export type TargetScript = {
+    script: Buffer;
+    value: number;
+};
+export type Target = TargetAddress | TargetScript;
+export type ChangeTarget = TargetAddress & {
+    bip32Derivation?: {
+        path: string;
+        pubkey: Buffer;
+        masterFingerprint: Buffer;
+    }[];
+};
+export type BitcoinJSInputInfo = ExtendedUtxo & {
+    bip32Derivation?: {
+        path: string;
+        pubkey: Buffer;
+        masterFingerprint: Buffer;
+    }[];
+    nonWitnessUtxo?: Buffer;
+    witnessUtxo?: {
+        script: Buffer;
+        value: number;
+    };
+    redeemScript?: Buffer;
+    tapInternalKey?: Buffer;
+};
+export type ExtendedUnsignedTransaction = {
+    unsignedTransaction: string;
+    outputs: Target[];
+    inputs: {
+        hash: string;
+        value: number;
+        index: number;
+        signerInfo: SignerInfo;
+    }[];
+    fee: number;
+    change: TargetAddress | undefined;
+};
+declare class BaseBitcoinLikeTransaction {
+    testnet: boolean;
+    network: bitcoin.Network;
+    maximumNumberOfOutputsInTransaction: number;
+    feeMin: number;
+    dustLimit: number;
+    constructor({ network, testnet, feeMin, dustLimit, maximumNumberOfOutputsInTransaction, }: {
+        network: bitcoin.Network;
+        testnet: boolean;
+        feeMin?: number;
+        dustLimit?: number;
+        maximumNumberOfOutputsInTransaction?: number;
+    });
+    _getUtxo(userAddress: string): Promise<Utxo[]>;
+    _getTransactionHex(transactionId: string): Promise<string>;
+    createAddressObject(input: {
+        addressType: string;
+        publicKey: Buffer;
+    }): bitcoin.payments.Payment;
+    validateAddress(address: string): boolean;
+    getOpReturnTarget(dataHex: string): {
+        script: Buffer;
+        value: number;
+    };
+    getExtendedUtxo(signerInfo: SignerInfo): Promise<{
+        signerInfo: SignerInfo;
+        hash: string;
+        value: number;
+        index: number;
+    }[]>;
+    static helperHandleInputsAndOutputs({ targets, extendedUtxo, feeRate, changeObject, selectType, }: {
+        extendedUtxo: ExtendedUtxo[];
+        targets: Target[];
+        feeRate: number;
+        changeObject?: {
+            address: string;
+            publicKey?: string;
+            addressType?: string;
+            derivationPath?: string;
+            masterFingerprint?: string;
+        };
+        selectType?: "normal" | "accumulative" | "full";
+    }): {
+        inputs: ExtendedUtxo[];
+        fee: number;
+        outputs: Target[];
+        change: ChangeTarget | undefined;
+    };
+    filterAndConvertTxDataToStandardFormat({ extendedUtxo, targets, changeObject, feeRate, selectType, }: {
+        extendedUtxo: ExtendedUtxo[];
+        targets: Target[];
+        feeRate: number;
+        changeObject?: {
+            address: string;
+            publicKey?: string;
+            addressType?: string;
+            derivationPath?: string;
+            masterFingerprint?: string;
+        };
+        selectType?: "normal" | "accumulative" | "full";
+    }): Promise<{
+        inputs: (ExtendedUtxo & {
+            bip32Derivation?: {
+                path: string;
+                pubkey: Buffer;
+                masterFingerprint: Buffer;
+            }[] | undefined;
+            nonWitnessUtxo?: Buffer | undefined;
+            witnessUtxo?: {
+                script: Buffer;
+                value: number;
+            } | undefined;
+            redeemScript?: Buffer | undefined;
+            tapInternalKey?: Buffer | undefined;
+        } & {
+            signerInfo: SignerInfo;
+        })[];
+        outputs: Target[];
+        change: ChangeTarget | undefined;
+        fee: number;
+        feeRate: number;
+    }>;
+    convertExtendedUtxoToInputs(baseInputs?: ExtendedUtxo[]): Promise<(ExtendedUtxo & {
+        bip32Derivation?: {
+            path: string;
+            pubkey: Buffer;
+            masterFingerprint: Buffer;
+        }[] | undefined;
+        nonWitnessUtxo?: Buffer | undefined;
+        witnessUtxo?: {
+            script: Buffer;
+            value: number;
+        } | undefined;
+        redeemScript?: Buffer | undefined;
+        tapInternalKey?: Buffer | undefined;
+    } & {
+        signerInfo: SignerInfo;
+    })[]>;
+    createUnsignedTransaction({ inputs, outputs, change, fee, feeRate, }: {
+        inputs: BitcoinJSInputInfo[];
+        outputs: Target[];
+        change?: ChangeTarget;
+        fee: number;
+        feeRate: number;
+    }): {
         unsignedTransaction: string;
-        outputs: any;
-        inputs: any;
-        fee: any;
-        change: any;
+        outputs: Target[];
+        inputs: {
+            hash: string;
+            value: number;
+            index: number;
+            signerInfo: SignerInfo;
+        }[];
+        fee: number;
+        change: ChangeTarget | undefined;
     };
+    processUnsignedTransaction({ extendedUtxo, targets, changeAddress, fullAmount, feeRate, selfTransaction, selectType, }: {
+        extendedUtxo: ExtendedUtxo[];
+        targets: Target[];
+        feeRate: number;
+        changeAddress?: string | SignerInfo;
+        fullAmount?: boolean;
+        selfTransaction?: boolean;
+        selectType?: "normal" | "accumulative" | "full";
+    }): Promise<{
+        unsignedTransaction: string;
+        outputs: Target[];
+        inputs: {
+            hash: string;
+            value: number;
+            index: number;
+            signerInfo: SignerInfo;
+        }[];
+        fee: number;
+        change: ChangeTarget | undefined;
+    }>;
 }
-import BaseBitcoinLikeTransactionBuilderCommon = require("./transaction-builder-common");
+export default BaseBitcoinLikeTransaction;
 //# sourceMappingURL=transaction-builder.d.ts.map

package/dist/transaction-builder/transaction-builder.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"transaction-builder.d.ts","sourceRoot":"","sources":["../../src/transaction-builder/transaction-builder.js"],"names":[],"mappings":";AAGA;IACE,8DA+CC;IAOD;;;;;;MAiGC;CACF"}
+{"version":3,"file":"transaction-builder.d.ts","sourceRoot":"","sources":["../../src/transaction-builder/transaction-builder.ts"],"names":[],"mappings":"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"}

package/dist/transaction-builder/transaction-builder.js

@@ -1,4 +1,27 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
@@ -8,10 +31,156 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-const bitcoin = require("bitcoinjs-lib");
-const BaseBitcoinLikeTransactionBuilderCommon = require("./transaction-builder-common");
-class BaseBitcoinLikeTransaction extends BaseBitcoinLikeTransactionBuilderCommon {
-    convertBaseInputsToInputs(baseInputs = []) {
+Object.defineProperty(exports, "__esModule", { value: true });
+const bitcoin = __importStar(require("bitcoinjs-lib"));
+const bitcoin_utils_1 = require("../bitcoin-utils");
+const coinselect = require("coinselect");
+const coinselectSplit = require("coinselect/split");
+const coinselectAccumulative = require("coinselect/accumulative");
+const TX_EMPTY_SIZE = 4 + 1 + 1 + 4;
+const TX_INPUT_BASE = 32 + 4 + 1 + 4;
+const TX_INPUT_P2PKH = 107;
+const TX_INPUT_P2SH_P2PKH = 50;
+const TX_INPUT_P2WPKH = 47;
+const TX_OUTPUT_BASE = 8 + 1;
+const TX_OUTPUT_P2PKH = 25;
+const componentBytes = {
+    bytePerInput: {
+        p2pkh: TX_INPUT_BASE + TX_INPUT_P2PKH,
+        p2wpkh: TX_INPUT_BASE + TX_INPUT_P2WPKH,
+        p2shp2wpkh: TX_INPUT_BASE + TX_INPUT_P2SH_P2PKH,
+    },
+    baseTxBytes: TX_EMPTY_SIZE,
+    bytePerOutput: TX_OUTPUT_BASE + TX_OUTPUT_P2PKH,
+};
+class BaseBitcoinLikeTransaction {
+    constructor({ network, testnet, feeMin = 0, dustLimit, maximumNumberOfOutputsInTransaction = 50, }) {
+        this.testnet = testnet;
+        this.network = network;
+        this.maximumNumberOfOutputsInTransaction = maximumNumberOfOutputsInTransaction;
+        this.feeMin = feeMin;
+        this.dustLimit = dustLimit || 1 * 2 * componentBytes.bytePerInput.p2pkh;
+    }
+    _getUtxo(userAddress) {
+        return __awaiter(this, void 0, void 0, function* () {
+            throw new Error("Do not call abstract method directly");
+        });
+    }
+    _getTransactionHex(transactionId) {
+        return __awaiter(this, void 0, void 0, function* () {
+            throw new Error("Do not call abstract method directly");
+        });
+    }
+    createAddressObject(input) {
+        return (0, bitcoin_utils_1.createAddressObjectByPublicKey)(input, this.network);
+    }
+    validateAddress(address) {
+        try {
+            (0, bitcoin_utils_1.getAddressType)(address);
+            return true;
+        }
+        catch (error) {
+            return false;
+        }
+    }
+    getOpReturnTarget(dataHex) {
+        if (!(dataHex.length > 0))
+            throw new Error("invalid data in hex");
+        const embed = bitcoin.payments.embed({
+            data: [Buffer.from(dataHex, "hex")],
+            network: this.network,
+        });
+        return {
+            script: embed.output,
+            value: 0,
+        };
+    }
+    getExtendedUtxo(signerInfo) {
+        return __awaiter(this, void 0, void 0, function* () {
+            let utxo = yield this._getUtxo(signerInfo.address);
+            const extendedUtxo = utxo.map((input) => (Object.assign(Object.assign({}, input), { signerInfo })));
+            if (!extendedUtxo || extendedUtxo.length === 0) {
+                throw new Error("no utxo found");
+            }
+            return extendedUtxo;
+        });
+    }
+    static helperHandleInputsAndOutputs({ targets, extendedUtxo, feeRate, changeObject, selectType = "normal", }) {
+        let selectResponse;
+        switch (selectType) {
+            case "normal":
+                selectResponse = coinselect(extendedUtxo, targets, Math.round(feeRate));
+                break;
+            case "accumulative":
+                selectResponse = coinselectAccumulative(extendedUtxo, targets, Math.round(feeRate));
+                break;
+            case "full":
+                if (!targets[0].address) {
+                    throw new Error();
+                }
+                selectResponse = coinselectSplit(extendedUtxo, [{ address: targets[0].address }], Math.round(feeRate));
+                break;
+            default:
+                break;
+        }
+        let { inputs, outputs, fee, } = selectResponse;
+        if (!inputs || !outputs) {
+            throw new Error("not enough balance");
+        }
+        let changeIndex = outputs.findIndex((x) => !(x === null || x === void 0 ? void 0 : x.address) && !x.script && (x.value || 0) > 0);
+        let change;
+        if (changeIndex >= 0) {
+            if (!changeObject)
+                throw new Error("change not exist");
+            if (changeObject.derivationPath && changeObject.masterFingerprint && changeObject.publicKey) {
+                change = {
+                    address: changeObject.address,
+                    value: outputs[changeIndex].value,
+                    bip32Derivation: [
+                        {
+                            path: changeObject.derivationPath,
+                            pubkey: Buffer.from(changeObject.publicKey, "hex"),
+                            masterFingerprint: Buffer.from(changeObject.masterFingerprint, "hex"),
+                        },
+                    ],
+                };
+            }
+            else {
+                change = {
+                    address: changeObject.address,
+                    value: outputs[changeIndex].value,
+                };
+            }
+            outputs.splice(changeIndex, 1);
+        }
+        return {
+            inputs,
+            fee,
+            outputs: outputs,
+            change,
+        };
+    }
+    filterAndConvertTxDataToStandardFormat({ extendedUtxo, targets, changeObject, feeRate, selectType, }) {
+        return __awaiter(this, void 0, void 0, function* () {
+            let { inputs: filteredInputs, outputs, change, fee, } = BaseBitcoinLikeTransaction.helperHandleInputsAndOutputs({
+                targets,
+                extendedUtxo,
+                feeRate,
+                changeObject,
+                selectType,
+            });
+            let inputs = yield this.convertExtendedUtxoToInputs(filteredInputs);
+            return {
+                inputs,
+                outputs,
+                change,
+                fee,
+                feeRate,
+            };
+        });
+    }
+    convertExtendedUtxoToInputs(baseInputs = []) {
+        var _a;
         return __awaiter(this, void 0, void 0, function* () {
             let inputs = baseInputs;
             let transactionId = null;
@@ -19,11 +188,10 @@ class BaseBitcoinLikeTransaction extends BaseBitcoinLikeTransactionBuilderCommon
             for (let i in inputs) {
                 let { address, publicKey, derivationPath, masterFingerprint, addressType } = inputs[i].signerInfo;
                 let addressObject = this.createAddressObject({
-                    address,
-                    publicKey: publicKey ? Buffer.from(publicKey, "hex") : null,
+                    publicKey: Buffer.from(publicKey, "hex"),
                     addressType,
                 });
-                if (derivationPath && masterFingerprint && publicKey && true) {
+                if (derivationPath && masterFingerprint && addressObject.pubkey) {
                     inputs[i].bip32Derivation = [
                         {
                             path: derivationPath,
@@ -33,27 +201,74 @@ class BaseBitcoinLikeTransaction extends BaseBitcoinLikeTransactionBuilderCommon
                     ];
                 }
                 if (addressType === "p2pkh") {
-                    if (transactionId === inputs[i].hash) {
+                    if (transactionHex && transactionId === inputs[i].hash) {
                         inputs[i].nonWitnessUtxo = Buffer.from(transactionHex, "hex");
                     }
                     else {
                         transactionHex = yield this._getTransactionHex(inputs[i].hash);
-                        inputs[i].nonWitnessUtxo = Buffer.from(transactionHex, "hex");
                         transactionId = inputs[i].hash;
+                        inputs[i].nonWitnessUtxo = Buffer.from(transactionHex, "hex");
                     }
                 }
                 else if (addressType === "p2wpkh") {
+                    if (!addressObject.output)
+                        throw new Error("invalid signer info");
                     inputs[i].witnessUtxo = {
                         script: addressObject.output,
                         value: inputs[i].value,
                     };
+                    if (inputs[i].signerInfo.includeHex) {
+                        if (transactionHex && transactionId === inputs[i].hash) {
+                            inputs[i].nonWitnessUtxo = Buffer.from(transactionHex, "hex");
+                        }
+                        else {
+                            transactionHex = yield this._getTransactionHex(inputs[i].hash);
+                            transactionId = inputs[i].hash;
+                            inputs[i].nonWitnessUtxo = Buffer.from(transactionHex, "hex");
+                        }
+                    }
                 }
                 else if (addressType === "p2sh-p2wpkh") {
+                    if (!addressObject.output)
+                        throw new Error("invalid signer info");
                     inputs[i].witnessUtxo = {
                         script: addressObject.output,
                         value: inputs[i].value,
                     };
+                    if (!((_a = addressObject === null || addressObject === void 0 ? void 0 : addressObject.redeem) === null || _a === void 0 ? void 0 : _a.output))
+                        throw new Error("invalid signer info for p2sh address");
                     inputs[i].redeemScript = addressObject.redeem.output;
+                    if (inputs[i].signerInfo.includeHex) {
+                        if (transactionHex && transactionId === inputs[i].hash) {
+                            inputs[i].nonWitnessUtxo = Buffer.from(transactionHex, "hex");
+                        }
+                        else {
+                            transactionHex = yield this._getTransactionHex(inputs[i].hash);
+                            transactionId = inputs[i].hash;
+                            inputs[i].nonWitnessUtxo = Buffer.from(transactionHex, "hex");
+                        }
+                    }
+                }
+                else if (addressType === "p2tr") {
+                    if (!addressObject.output)
+                        throw new Error("invalid signer info");
+                    inputs[i].witnessUtxo = {
+                        script: addressObject.output,
+                        value: inputs[i].value,
+                    };
+                    if (!addressObject.pubkey)
+                        throw new Error("invalid signer info for p2tr address (pubkey)");
+                    inputs[i].tapInternalKey = Buffer.from(publicKey, "hex");
+                    if (inputs[i].signerInfo.includeHex) {
+                        if (transactionHex && transactionId === inputs[i].hash) {
+                            inputs[i].nonWitnessUtxo = Buffer.from(transactionHex, "hex");
+                        }
+                        else {
+                            transactionHex = yield this._getTransactionHex(inputs[i].hash);
+                            transactionId = inputs[i].hash;
+                            inputs[i].nonWitnessUtxo = Buffer.from(transactionHex, "hex");
+                        }
+                    }
                 }
             }
             return inputs;
@@ -62,7 +277,7 @@ class BaseBitcoinLikeTransaction extends BaseBitcoinLikeTransactionBuilderCommon
     createUnsignedTransaction({ inputs, outputs, change, fee, feeRate, }) {
         const { network } = this;
         const newPsbt = new bitcoin.Psbt({ network });
-        newPsbt.setMaximumFeeRate = feeRate + feeRate / 100;
+        newPsbt.setMaximumFeeRate(+(feeRate + feeRate / 100).toFixed());
         for (const input of inputs) {
             let { addressType } = input.signerInfo;
             switch (addressType) {
@@ -72,9 +287,10 @@ class BaseBitcoinLikeTransaction extends BaseBitcoinLikeTransactionBuilderCommon
                         index: Number(input.index),
                         nonWitnessUtxo: input.nonWitnessUtxo,
                         sequence: 0xffffffff - 1,
+                        bip32Derivation: input.bip32Derivation,
                     };
-                    if (input.bip32Derivation)
-                        i.bip32Derivation = input.bip32Derivation;
+                    if (!i.bip32Derivation)
+                        delete i.bip32Derivation;
                     newPsbt.addInput(i);
                     break;
                 }
@@ -83,10 +299,14 @@ class BaseBitcoinLikeTransaction extends BaseBitcoinLikeTransactionBuilderCommon
                         hash: input.hash,
                         index: Number(input.index),
                         witnessUtxo: input.witnessUtxo,
+                        nonWitnessUtxo: input.nonWitnessUtxo,
                         sequence: 0xffffffff - 1,
+                        bip32Derivation: input.bip32Derivation,
                     };
-                    if (input.bip32Derivation)
-                        i.bip32Derivation = input.bip32Derivation;
+                    if (!i.bip32Derivation)
+                        delete i.bip32Derivation;
+                    if (!i.nonWitnessUtxo)
+                        delete i.nonWitnessUtxo;
                     newPsbt.addInput(i);
                     break;
                 }
@@ -95,11 +315,32 @@ class BaseBitcoinLikeTransaction extends BaseBitcoinLikeTransactionBuilderCommon
                         hash: input.hash,
                         index: Number(input.index),
                         witnessUtxo: input.witnessUtxo,
+                        nonWitnessUtxo: input.nonWitnessUtxo,
                         redeemScript: input.redeemScript,
                         sequence: 0xffffffff - 1,
+                        bip32Derivation: input.bip32Derivation,
+                    };
+                    if (!i.bip32Derivation)
+                        delete i.bip32Derivation;
+                    if (!i.nonWitnessUtxo)
+                        delete i.nonWitnessUtxo;
+                    newPsbt.addInput(i);
+                    break;
+                }
+                case "p2tr": {
+                    let i = {
+                        hash: input.hash,
+                        index: Number(input.index),
+                        witnessUtxo: input.witnessUtxo,
+                        nonWitnessUtxo: input.nonWitnessUtxo,
+                        tapInternalKey: input.tapInternalKey,
+                        sequence: 0xffffffff - 1,
+                        bip32Derivation: input.bip32Derivation,
                     };
-                    if (input.bip32Derivation)
-                        i.bip32Derivation = input.bip32Derivation;
+                    if (!i.bip32Derivation)
+                        delete i.bip32Derivation;
+                    if (!i.nonWitnessUtxo)
+                        delete i.nonWitnessUtxo;
                     newPsbt.addInput(i);
                     break;
                 }
@@ -108,44 +349,56 @@ class BaseBitcoinLikeTransaction extends BaseBitcoinLikeTransactionBuilderCommon
             }
         }
         for (const target of outputs) {
-            newPsbt.addOutput(target);
+            newPsbt.addOutput(Object.assign({}, target));
         }
         if (change && Object.keys(change).length !== 0) {
-            newPsbt.addOutput({
-                address: change.address,
-                value: Number(change.value),
-            });
-        }
-        for (let i in outputs) {
-            if (newPsbt.txOutputs[i].address !== outputs[i].address) {
-                throw new Error("error address");
-            }
-            if (newPsbt.txOutputs[i].value !== outputs[i].value) {
-                throw new Error("error value");
-            }
+            newPsbt.addOutput(change);
         }
         if (change && Object.keys(change).length !== 0) {
             if (newPsbt.txOutputs[outputs.length].address !== change.address) {
                 throw new Error("error change address");
             }
-            if (newPsbt.txOutputs[outputs.length].value !== change.value) {
-                throw new Error("error change value");
-            }
         }
         const unsignedPsbtBaseText = newPsbt.toBase64();
         return {
             unsignedTransaction: unsignedPsbtBaseText,
             outputs,
-            inputs: inputs.map((tx) => ({
-                hash: tx.hash,
-                value: Number(tx.value),
-                index: tx.index,
-                signerInfo: tx.signerInfo,
+            inputs: inputs.map((utx) => ({
+                hash: utx.hash,
+                value: Number(utx.value),
+                index: utx.index,
+                signerInfo: utx.signerInfo,
             })),
             fee,
             change,
         };
     }
+    processUnsignedTransaction({ extendedUtxo, targets = [], changeAddress = undefined, fullAmount = false, feeRate, selfTransaction = false, selectType = "normal", }) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (!selfTransaction && targets.length === 0)
+                throw new Error("no target");
+            let changeObject = typeof changeAddress === "string"
+                ? {
+                    address: changeAddress,
+                }
+                : changeAddress;
+            const { inputs, outputs, change, fee } = yield this.filterAndConvertTxDataToStandardFormat({
+                extendedUtxo,
+                targets,
+                changeObject,
+                feeRate,
+                selectType: fullAmount ? "full" : selectType,
+            });
+            let unsignedTransaction = this.createUnsignedTransaction({
+                inputs,
+                outputs,
+                change,
+                fee,
+                feeRate,
+            });
+            return unsignedTransaction;
+        });
+    }
 }
-module.exports = BaseBitcoinLikeTransaction;
+exports.default = BaseBitcoinLikeTransaction;
 //# sourceMappingURL=transaction-builder.js.map