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 11 files +136 −34

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 return map::at to users.

Treat an empty bump-fee map for non-empty requested outpoints as a calculation failure. Make AvailableCoins return util::Result<CoinsResult> so transaction creation and sendall can propagate the wallet error instead of leaking an internal exception.

Add a functional regression test in wallet_spend_unconfirmed.py covering the large unconfirmed set scenario from #29711. The test checks auto-selected inputs, manually selected inputs, and sendall, and verifies that spending succeeds again after mining a block.

Tested:
- cmake --build build
- build/bin/test_bitcoin --catch_system_errors=no
- build/bin/test_bitcoin --run_test=miniminer_tests --catch_system_errors=no
- build/bin/test_bitcoin --run_test=spend_tests --catch_system_errors=no
- build/bin/test_bitcoin --run_test=coinselector_tests/bump_fee_test --catch_system_errors=no
- build/bin/test_bitcoin --run_test=wallet_tests/ListCoinsTest --catch_system_errors=no
- build/bin/test_bitcoin --run_test=wallet_tests/BasicOutputTypesTest --catch_system_errors=no
- python3 build/test/functional/test_runner.py wallet_spend_unconfirmed.py wallet_sendall.py wallet_send.py wallet_fundrawtransaction.py wallet_bumpfee.py wallet_create_tx.py wallet_basic.py
- build/bin/bench_bitcoin -filter='WalletAvailableCoins|WalletCreateTxUseOnlyPresetInputs|WalletCreateTxUsePresetInputsAndCoinSelection' -sanity-check
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

No conflicts as of last run.
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
shuv-amp force-pushed on Mar 25, 2026
in src/wallet/spend.cpp:336 in 69b9601da8
```
 331 | +
 332 | +CoinsResult AvailableCoins(const CWallet& wallet,
 333 | +                           const CCoinControl* coinControl,
 334 | +                           std::optional<CFeeRate> feerate,
 335 | +                           const CoinFilterParams& params,
 336 | +                           bool& bump_fee_calculation_failed)
```
achow101 commented at 9:32 PM on April 30, 2026:

I don't think this is the right way to propagate errors out of AvailableCoins. This is already returning CoinsResult which can be extended to include error codes/states, a la ValidationState. Or this could return a util::Result<CoinsResult> to contain the error message on error.
shuv-amp force-pushed on May 1, 2026
DrahtBot added the label CI failed on May 1, 2026

wallet: handle MiniMiner bump fee calculation failures

calculateIndividualBumpFees returns an empty map when MiniMiner cannot
calculate fees for requested unconfirmed outpoints, such as when
GatherClusters hits its transaction limit. FetchSelectedInputs and
AvailableCoins then index the map and can surface map::at to users.

Return an error when the map is empty for non-empty requested outpoints.
Make AvailableCoins return util::Result<CoinsResult> so transaction creation
and sendall can propagate this error. No-feerate callers keep the existing
behavior by unwrapping the result.

Add a functional regression test for the #29711 scenario. Cover
auto-selected inputs, manually selected inputs, and sendall, and check that
spending succeeds again after mining a block.

119c28b0cb

shuv-amp force-pushed on May 2, 2026
DrahtBot removed the label CI failed on May 5, 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