wallet: handle MiniMiner bump fee calculation failures #34698

pull shuv-amp wants to merge 1 commits into bitcoin:master from shuv-amp:fix-wallet-bump-fee-error changing 6 files +93 −13

shuv-amp commented at 9:12 AM on February 28, 2026: none
Fixes #29711.

When MiniMiner cannot calculate individual bump fees, wallet funding can index missing bump-fee entries and surface map::at to users.

Treat an empty bump-fee map for non-empty requested outpoints as calculation failure, and return the existing descriptive wallet error instead of leaking an internal exception.

Handle the same condition in sendall, which calls AvailableCoins directly, so send and sendall report consistent errors.

Add a functional regression test in wallet_spend_unconfirmed.py covering the large unconfirmed-set scenario from #29711, and checking that spending succeeds again after mining a block.

Tested:
- build-local/bin/test_bitcoin --run_test=miniminer_tests --catch_system_errors=no
- build-local/bin/test_bitcoin --run_test=spend_tests --catch_system_errors=no
- build-local/bin/test_bitcoin --run_test=coinselector_tests/bump_fee_test --catch_system_errors=no
- python3 build-local/test/functional/test_runner.py wallet_spend_unconfirmed.py
- python3 build-local/test/functional/test_runner.py wallet_sendall.py
DrahtBot added the label Wallet on Feb 28, 2026
DrahtBot commented at 9:12 AM on February 28, 2026: contributor


The following sections might be updated with supplementary metadata relevant to reviewers and maintainers.



Reviews

See the guideline for information on the review process. A summary of reviews will appear here.



Conflicts

Reviewers, this pull request conflicts with the following ones:
- #34962 (wallet: fix crash in coin selection with enormous unconfirmed clusters by cprkrn)
If you consider this pull request important, please also help to review the conflicting pull requests. Ideally, start with the one that should be merged first.
in src/node/mini_miner.cpp:309 in 5f94606927
```
 305 | @@ -306,9 +306,9 @@ std::map<Txid, uint32_t> MiniMiner::Linearize()
 306 |      return m_inclusion_order;
 307 |  }
 308 |  
 309 | -std::map<COutPoint, CAmount> MiniMiner::CalculateBumpFees(const CFeeRate& target_feerate)
 310 | +std::optional<std::map<COutPoint, CAmount>> MiniMiner::CalculateBumpFees(const CFeeRate& target_feerate)
```
achow101 commented at 10:43 PM on March 24, 2026:

Changing this to be std::optional seems a bit unnecessary to me as it's equivalently easy to check for !empty(). That probably reduces the diff by half.

shuv-amp commented at 2:05 AM on March 25, 2026:

Makes sense. I'll simplify this by keeping the map return type and detecting failure based on whether entries were produced for all requested outpoints, rather than changing the interface to return std::optional.
shuv-amp force-pushed on Mar 25, 2026

wallet: handle MiniMiner bump fee calculation failures

When MiniMiner cannot calculate individual bump fees, wallet funding can
index missing bump-fee entries and surface `map::at` to users.

Keep individual bump-fee calculation returning a map, and treat an empty
map for non-empty requested outpoints as calculation failure. Return the
existing descriptive wallet error instead of leaking an internal
exception.

Handle the same condition in `sendall`, which calls `AvailableCoins`
directly, so `send` and `sendall` report consistent errors.

Add a functional regression test in `wallet_spend_unconfirmed.py`
covering the large unconfirmed-set scenario from #29711, and checking
that spending succeeds again after mining a block.

69b9601da8

shuv-amp force-pushed on Mar 25, 2026

Contributors

Labels

Linked (view graph)

#29711 Wallet: Nondescript error message for 502nd unconfirmed transaction

wallet: handle MiniMiner bump fee calculation failures #34698

Reviews

Conflicts