GlcoinCore/elements
1
0
Fork 0
mirror of https://github.com/ElementsProject/elements.git synced 2026-08-18 13:17:55 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into elem-23.3.1-rc2

Browse source
This commit is contained in:
Pablo Greco 2025-10-07 07:53:22 -07:00
commit afb63a43a6
63 changed files with 714 additions and 359 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/wallet/wallet.cpp
View file

@ -3029,7 +3029,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) {