@leather.io/bitcoin 0.36.6 → 0.37.1

package/dist/index.js

@@ -430,6 +430,9 @@ function isTaprootDerivationPath(path) {
 function isNativeSegwitDerivationPath(path) {
 	return extractPurposeFromPath(path) === 84;
 }
+function isP2TROut(signer) {
+	return !!signer && isTaprootDerivationPath(signer.derivationPath);
+}
 
 //#endregion
 //#region src/bip322/bip322-utils.ts
@@ -692,6 +695,26 @@ var BtcSizeFeeEstimator = class {
 			txWeight: txVBytes * 4
 		};
 	}
+	calcMixedInputTxSize(opts) {
+		const { p2wpkh_input_count, p2tr_input_count } = opts;
+		const totalInputCount = p2wpkh_input_count + p2tr_input_count;
+		const p2pkh_output_count = opts.p2pkh_output_count ?? 0;
+		const p2sh_output_count = opts.p2sh_output_count ?? 0;
+		const p2sh_p2wpkh_output_count = opts.p2sh_p2wpkh_output_count ?? 0;
+		const p2sh_p2wsh_output_count = opts.p2sh_p2wsh_output_count ?? 0;
+		const p2wpkh_output_count = opts.p2wpkh_output_count ?? 0;
+		const p2wsh_output_count = opts.p2wsh_output_count ?? 0;
+		const p2tr_output_count = opts.p2tr_output_count ?? 0;
+		const output_count = p2pkh_output_count + p2sh_output_count + p2sh_p2wpkh_output_count + p2sh_p2wsh_output_count + p2wpkh_output_count + p2wsh_output_count + p2tr_output_count;
+		const inputVBytes = p2wpkh_input_count * this.P2WPKH_IN_SIZE + p2tr_input_count * this.P2TR_IN_SIZE;
+		const inputWitnessBytes = p2wpkh_input_count * 107 + p2tr_input_count * 65;
+		const txVBytes = this.getTxOverheadVBytes("p2wpkh", totalInputCount, output_count) + inputVBytes + this.P2PKH_OUT_SIZE * p2pkh_output_count + this.P2SH_OUT_SIZE * p2sh_output_count + this.P2SH_P2WPKH_OUT_SIZE * p2sh_p2wpkh_output_count + this.P2SH_P2WSH_OUT_SIZE * p2sh_p2wsh_output_count + this.P2WPKH_OUT_SIZE * p2wpkh_output_count + this.P2WSH_OUT_SIZE * p2wsh_output_count + this.P2TR_OUT_SIZE * p2tr_output_count;
+		return {
+			txVBytes,
+			txBytes: this.getTxOverheadExtraRawBytes("p2wpkh", totalInputCount) + txVBytes + inputWitnessBytes,
+			txWeight: txVBytes * 4
+		};
+	}
 	estimateFee(vbyte, satVb) {
 		if (isNaN(vbyte) || isNaN(satVb)) throw new Error("Parameters should be numbers");
 		return vbyte * satVb;
@@ -709,8 +732,20 @@ var BtcSizeFeeEstimator = class {
 function getUtxoTotal(utxos) {
 	return sumNumbers(utxos.map((utxo) => utxo.value));
 }
+function countInputsByScriptType(utxos) {
+	return utxos.reduce((acc, utxo) => {
+		const paymentType = inferPaymentTypeFromAddress(createBitcoinAddress(utxo.address));
+		return {
+			...acc,
+			[paymentType]: acc[paymentType] + 1
+		};
+	}, {
+		p2tr: 0,
+		p2wpkh: 0
+	});
+}
 function getSizeInfo(payload) {
-	const { inputLength, recipients, isSendMax } = payload;
+	const { utxos, recipients, isSendMax } = payload;
 	const validAddressesInfo = recipients.map((recipient) => validate$1(recipient.address) && getAddressInfo(recipient.address)).filter(Boolean);
 	function getTxOutputsLengthByPaymentType() {
 		return validAddressesInfo.reduce((acc, { type }) => {
@@ -724,17 +759,19 @@ function getSizeInfo(payload) {
 		acc[type + "_output_count"] = count;
 		return acc;
 	}, {});
-	return new BtcSizeFeeEstimator().calcTxSize({
-		input_script: "p2wpkh",
-		input_count: inputLength,
+	const { p2wpkh, p2tr } = countInputsByScriptType(utxos);
+	return new BtcSizeFeeEstimator().calcMixedInputTxSize({
+		p2wpkh_input_count: p2wpkh,
+		p2tr_input_count: p2tr,
 		...outputsData
 	});
 }
-function getSpendableAmount({ utxos, feeRate, recipients }) {
+function getSpendableAmount({ utxos, feeRate, recipients, isSendMax }) {
 	const balance = utxos.map((utxo) => utxo.value).reduce((prevVal, curVal) => prevVal + curVal, 0);
 	const size = getSizeInfo({
-		inputLength: utxos.length,
-		recipients
+		utxos,
+		recipients,
+		isSendMax
 	});
 	const fee = Math.ceil(size.txVBytes * feeRate);
 	const bigNumberBalance = BigNumber(balance);
@@ -803,7 +840,7 @@ function determineUtxosForSpendAll({ feeRate, recipients, utxos }) {
 	});
 	if (!filteredUtxos.length) throw new BitcoinError("InsufficientFunds");
 	const sizeInfo = getSizeInfo({
-		inputLength: filteredUtxos.length,
+		utxos: filteredUtxos,
 		isSendMax: true,
 		recipients
 	});
@@ -833,7 +870,7 @@ function determineUtxosForSpend({ feeRate, recipients, utxos }) {
 	const neededUtxos = [filteredUtxos[0]];
 	function estimateTransactionSize() {
 		return getSizeInfo({
-			inputLength: neededUtxos.length,
+			utxos: neededUtxos,
 			recipients
 		});
 	}
@@ -1443,5 +1480,5 @@ function deconstructBtcAddress(address) {
 }
 
 //#endregion
-export { BitcoinError, TEST_ACCOUNT_1_NATIVE_SEGWIT_ADDRESS, TEST_ACCOUNT_1_TAPROOT_ADDRESS, TEST_ACCOUNT_2_TAPROOT_ADDRESS, TEST_TESNET_ACCOUNT_1_NATIVE_SEGWIT_ADDRESS, TEST_TESTNET_ACCOUNT_2_BTC_ADDRESS, TEST_TESTNET_ACCOUNT_2_TAPROOT_ADDRESS, bip21, bip322TransactionToSignValues, bitcoinNetworkModeToCoreNetworkMode, bitcoinNetworkToCoreNetworkMap, btcAddressNetworkValidator, btcAddressValidator, btcSignerLibPaymentTypeToPaymentTypeMap, calculateMaxSpend, coinTypeMap, createBitcoinAddress, createNativeSegwitBitcoinJsSigner, createTaprootBitcoinJsSigner, createToSpendTx, createWalletIdDecoratedPath, decodeBitcoinTx, decodeCompressedWifPrivateKey, deconstructBtcAddress, deriveAddressIndexKeychainFromAccount, deriveAddressIndexZeroFromAccount, deriveAddressesFromDescriptor, deriveBitcoinPayerFromAccount, deriveBtcBip49SeedFromMnemonic, deriveNativeSegwitAccountFromRootKeychain, deriveNativeSegwitReceiveAddressIndexZero, deriveRootBtcKeychain, deriveTaprootAccount, deriveTaprootReceiveAddressIndexZero, determineUtxosForSpend, determineUtxosForSpendAll, ecPairFromPrivateKey, ecdsaPublicKeyLength, ecdsaPublicKeyToSchnorr, encodeMessageWitnessData, extractExtendedPublicKeyFromPolicy, extractPayerInfoFromDerivationPath, extractRequiredKeyOrigins, extractXpubFromDescriptor, filterUneconomicalUtxos, generateBitcoinUnsignedTransaction, getAddressFromOutScript, getBitcoinAddressNetworkType, getBitcoinCoinTypeIndexByNetwork, getBitcoinFees, getBitcoinInputAddress, getBitcoinInputValue, getBitcoinJsLibNetworkConfigByMode, getBitcoinTransactionFee, getBtcSignerLibNetworkConfigByMode, getDescriptorFromKeychain, getHdKeyVersionsFromNetwork, getInputPaymentType, getNativeSegwitAccountDerivationPath, getNativeSegwitAddress, getNativeSegwitAddressIndexDerivationPath, getNativeSegwitPaymentFromAddressIndex, getNetworkTypeFromAddress, getParsedInputs, getParsedOutputs, getPsbtAsTransaction, getPsbtDetails, getPsbtTotals, getPsbtTxInputs, getPsbtTxOutputs, getRawPsbt, getSizeInfo, getSpendableAmount, getTaprootAccountDerivationPath, getTaprootAddress, getTaprootAddressIndexDerivationPath, getTaprootPayment, getTaprootPaymentFromAddressIndex, getUtxoTotal, hashBip322Message, inValidCharactersAddress, inValidLengthAddress, inferNetworkFromAddress, inferNetworkFromPath, inferPaymentTypeFromAddress, inferPaymentTypeFromDescriptor, inferPaymentTypeFromPath, initBitcoinAccount, initializeBitcoinAccountKeychainFromDescriptor, invalidAddress, isBitcoinAddress, isBtcBalanceSufficient, isBtcMinimumSpend, isBtcSignerLibPaymentType, isNativeSegwitDerivationPath, isSupportedMessageSigningPaymentType, isTaprootDerivationPath, isValidBitcoinAddress, isValidBitcoinNetworkAddress, legacyAddress, lookUpLedgerKeysByPath, lookupDerivationByAddress, makeNativeSegwitAccountDerivationPath, makeNativeSegwitAddressIndexDerivationPath, makePayToScriptHashAddress, makePayToScriptHashAddressBytes, makePayToScriptHashKeyHash, makeTaprootAccountDerivationPath, makeTaprootAddressIndexDerivationPath, mnemonicToRootNode, nonEmptyStringValidator, parseKnownPaymentType, payToScriptHashTestnetPrefix, payerToBip32Derivation, payerToBip32DerivationBitcoinJsLib, payerToTapBip32Derivation, payerToTapBip32DerivationBitcoinJsLib, paymentTypeMap, publicKeyToPayToScriptHashAddress, recipientAddress, segwitAddress, serializeKeyOrigin, signBip322MessageSimple, taprootAddress, toXOnly, tweakSigner, whenBitcoinNetwork, whenPaymentType, whenSupportedPaymentType };
+export { BitcoinError, BtcSizeFeeEstimator, TEST_ACCOUNT_1_NATIVE_SEGWIT_ADDRESS, TEST_ACCOUNT_1_TAPROOT_ADDRESS, TEST_ACCOUNT_2_TAPROOT_ADDRESS, TEST_TESNET_ACCOUNT_1_NATIVE_SEGWIT_ADDRESS, TEST_TESTNET_ACCOUNT_2_BTC_ADDRESS, TEST_TESTNET_ACCOUNT_2_TAPROOT_ADDRESS, bip21, bip322TransactionToSignValues, bitcoinNetworkModeToCoreNetworkMode, bitcoinNetworkToCoreNetworkMap, btcAddressNetworkValidator, btcAddressValidator, btcSignerLibPaymentTypeToPaymentTypeMap, calculateMaxSpend, coinTypeMap, countInputsByScriptType, createBitcoinAddress, createNativeSegwitBitcoinJsSigner, createTaprootBitcoinJsSigner, createToSpendTx, createWalletIdDecoratedPath, decodeBitcoinTx, decodeCompressedWifPrivateKey, deconstructBtcAddress, deriveAddressIndexKeychainFromAccount, deriveAddressIndexZeroFromAccount, deriveAddressesFromDescriptor, deriveBitcoinPayerFromAccount, deriveBtcBip49SeedFromMnemonic, deriveNativeSegwitAccountFromRootKeychain, deriveNativeSegwitReceiveAddressIndexZero, deriveRootBtcKeychain, deriveTaprootAccount, deriveTaprootReceiveAddressIndexZero, determineUtxosForSpend, determineUtxosForSpendAll, ecPairFromPrivateKey, ecdsaPublicKeyLength, ecdsaPublicKeyToSchnorr, encodeMessageWitnessData, extractExtendedPublicKeyFromPolicy, extractPayerInfoFromDerivationPath, extractRequiredKeyOrigins, extractXpubFromDescriptor, filterUneconomicalUtxos, generateBitcoinUnsignedTransaction, getAddressFromOutScript, getBitcoinAddressNetworkType, getBitcoinCoinTypeIndexByNetwork, getBitcoinFees, getBitcoinInputAddress, getBitcoinInputValue, getBitcoinJsLibNetworkConfigByMode, getBitcoinTransactionFee, getBtcSignerLibNetworkConfigByMode, getDescriptorFromKeychain, getHdKeyVersionsFromNetwork, getInputPaymentType, getNativeSegwitAccountDerivationPath, getNativeSegwitAddress, getNativeSegwitAddressIndexDerivationPath, getNativeSegwitPaymentFromAddressIndex, getNetworkTypeFromAddress, getParsedInputs, getParsedOutputs, getPsbtAsTransaction, getPsbtDetails, getPsbtTotals, getPsbtTxInputs, getPsbtTxOutputs, getRawPsbt, getSizeInfo, getSpendableAmount, getTaprootAccountDerivationPath, getTaprootAddress, getTaprootAddressIndexDerivationPath, getTaprootPayment, getTaprootPaymentFromAddressIndex, getUtxoTotal, hashBip322Message, inValidCharactersAddress, inValidLengthAddress, inferNetworkFromAddress, inferNetworkFromPath, inferPaymentTypeFromAddress, inferPaymentTypeFromDescriptor, inferPaymentTypeFromPath, initBitcoinAccount, initializeBitcoinAccountKeychainFromDescriptor, invalidAddress, isBitcoinAddress, isBtcBalanceSufficient, isBtcMinimumSpend, isBtcSignerLibPaymentType, isNativeSegwitDerivationPath, isP2TROut, isSupportedMessageSigningPaymentType, isTaprootDerivationPath, isValidBitcoinAddress, isValidBitcoinNetworkAddress, legacyAddress, lookUpLedgerKeysByPath, lookupDerivationByAddress, makeNativeSegwitAccountDerivationPath, makeNativeSegwitAddressIndexDerivationPath, makePayToScriptHashAddress, makePayToScriptHashAddressBytes, makePayToScriptHashKeyHash, makeTaprootAccountDerivationPath, makeTaprootAddressIndexDerivationPath, mnemonicToRootNode, nonEmptyStringValidator, parseKnownPaymentType, payToScriptHashTestnetPrefix, payerToBip32Derivation, payerToBip32DerivationBitcoinJsLib, payerToTapBip32Derivation, payerToTapBip32DerivationBitcoinJsLib, paymentTypeMap, publicKeyToPayToScriptHashAddress, recipientAddress, segwitAddress, serializeKeyOrigin, signBip322MessageSimple, taprootAddress, toXOnly, tweakSigner, whenBitcoinNetwork, whenPaymentType, whenSupportedPaymentType };
 //# sourceMappingURL=index.js.map