Skip to content

Commit f1b5d6b

Browse files
committed
Merge bitcoin/bitcoin#26955: wallet: permit mintxfee=0
f11eb1f wallet: permit mintxfee=0 (willcl-ark) Pull request description: Fixes #26797 Permit nodes to use `-mintxfee=0`. Values below 0 are handled by the ParseMoney() check. ACKs for top commit: MarcoFalke: review ACK f11eb1f john-moffett: ACK f11eb1f Tree-SHA512: 3bf50362bced4fee8e3a846cfb46f1c65dd607c9c824aa3f8c52294371b0646d167a04772d5302bdbee35bbaf407ef0aa634228f70e522c3e423f4213b4ae071
2 parents 837e9ed + f11eb1f commit f1b5d6b

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

src/wallet/wallet.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -2995,7 +2995,7 @@ std::shared_ptr<CWallet> CWallet::Create(WalletContext& context, const std::stri
29952995

29962996
if (args.IsArgSet("-mintxfee")) {
29972997
std::optional<CAmount> min_tx_fee = ParseMoney(args.GetArg("-mintxfee", ""));
2998-
if (!min_tx_fee || min_tx_fee.value() == 0) {
2998+
if (!min_tx_fee) {
29992999
error = AmountErrMsg("mintxfee", args.GetArg("-mintxfee", ""));
30003000
return nullptr;
30013001
} else if (min_tx_fee.value() > HIGH_TX_FEE_PER_KB) {

0 commit comments

Comments
 (0)