Merge f1b5d6be57 into merged_master (Bitcoin PR bitcoin/bitcoin#26955)

This commit is contained in:
Byron Hambly 2025-04-04 10:35:44 +02:00
commit 0bb52bcc79

View file

@ -3226,7 +3226,7 @@ std::shared_ptr<CWallet> CWallet::Create(WalletContext& context, const std::stri
if (args.IsArgSet("-mintxfee")) {
std::optional<CAmount> min_tx_fee = ParseMoney(args.GetArg("-mintxfee", ""));
if (!min_tx_fee || min_tx_fee.value() == 0) {
if (!min_tx_fee) {
error = AmountErrMsg("mintxfee", args.GetArg("-mintxfee", ""));
return nullptr;
} else if (min_tx_fee.value() > HIGH_TX_FEE_PER_KB) {