mirror of
https://github.com/bitcoin/bitcoin.git
synced 2026-03-01 18:49:15 +01:00
d88997b809
48161f6a05wallet: introduce "tx amount exceeds balance when fees are included" error (stratospher)b7fa609ed1wallet: remove PreSelectedInputs (stratospher)7819da2c16walllet: use CoinsResult instead of PreSelectedInputs (stratospher)e5474079f1wallet: introduce GetAppropriateTotal() in CoinsResult (stratospher)d8ea921d01wallet: correctly reserve in CoinsResult::All() (stratospher)7072d825e3wallet: ensure COutput added in set are unique (stratospher)fefa3be782wallet: fix, make 'total_effective_amount' optional actually optional (stratospher) Pull request description: picks up https://github.com/bitcoin/bitcoin/pull/25269. This PR re-implements the code path so that an error message is thrown when a transaction's total amount (including fees) exceeds the available balance. It also refactors the wallet's coin selection code. 1. the first 3 commits are unrelated to the code but few small bug fixes which are nice to fix. but also kind of impacts the remaining logic. (could PR separately if reviewers wish) 1.c467325aaf: make `total_effective_amount` optional actually optional 2.2202ab5975: ensure `set<shared_ptr<COutput>>` has unique COutput 3.a5ffbbf122: Correctly reserve size when flattening `CoinsResult.coins` map to vector 3. the next 3 commits from4745d5480creplace the `PreSelectedInputs` struct with `CoinsResult` and removes `PreSelectedInputs`. 4. the last commit (e664484a6d) deals with the error message - `AmountWithFeeExceedsBalance` error inside `WalletModel::prepareTransaction` is never thrown and remains an unused code path. This is because `createTransaction` does not retrieve the fee when the process fails. The fee return arg is set only at the end of the process, when the transaction is successfully created. Therefore, if the transaction creation fails, the fee is not available inside `WalletModel::prepareTransaction` to trigger the `AmountWithFeeExceedsBalance` error. This PR re-implements the feature inside `CreateTransactionInternal` and adds test coverage for it. | on master | on PR | |-----------|-------| | <img src="https://github.com/user-attachments/assets/a903e687-2466-42c7-b898-5dec24bfe515" width="750" alt="Insufficient funds" /> | <img src="https://github.com/user-attachments/assets/74bb3c83-6132-4c09-91f0-0a446618b3c8" width="750" alt="AmountWithFeeExceedsBalance" /> | the unreachable code path is removed in https://github.com/bitcoin-core/gui/pull/807 which requires this PR. ACKs for top commit: achow101: ACK48161f6a05furszy: utACK48161f6Tree-SHA512: a963fac8d6714f76571df8cf9aff70601536dc6faa4326fbb5892c3f080dc393f0d7c6e2d21879c7a2c898bf0092adb154376d9b0a8929b31575ce9d1d47dec2