From cb041141437e1cd1fdf843001d8bd5809992ef4a Mon Sep 17 00:00:00 2001 From: pasta Date: Tue, 3 Dec 2024 08:34:30 -0600 Subject: [PATCH] Merge #6442: fix: coin selection with `include_unsafe` option should respect `nCoinType` e5114da32536f977e69f6a0d531c3ca45dafdf07 fix: coin selection with `include_unsafe` option should respect `nCoinType` (UdjinM6) Pull request description: ## Issue being fixed or feature implemented The issue was introduced in #6074 via https://github.com/dashpay/dash/commit/69c5aa89479af20c2bdb0c02191617140efdae5e ## What was done? ## How Has This Been Tested? ## Breaking Changes ## Checklist: - [ ] I have performed a self-review of my own code - [ ] I have commented my code, particularly in hard-to-understand areas - [ ] I have added or updated relevant unit/integration/functional/e2e tests - [ ] I have made corresponding changes to the documentation - [ ] I have assigned this pull request to a milestone _(for repository code-owners and collaborators only)_ ACKs for top commit: PastaPastaPasta: utACK e5114da32536f977e69f6a0d531c3ca45dafdf07 kwvg: utACK e5114da32536f977e69f6a0d531c3ca45dafdf07 Tree-SHA512: 5d4e22f9d2cecf2239185e0f4c9d8b29b995b25b4f53a74d6c9b7929aac6ec918ebfb4029a83b72a003fe42fe82619f7ab4892d620bf5846cadf99f1f0cb0969 --- src/wallet/wallet.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp index 3449332970180..0bc08a4c3ea3f 100644 --- a/src/wallet/wallet.cpp +++ b/src/wallet/wallet.cpp @@ -3041,7 +3041,7 @@ bool CWallet::SelectCoins(const std::vector& vAvailableCoins, const CAm if (coin_control.m_include_unsafe_inputs && SelectCoinsMinConf(value_to_select, CoinEligibilityFilter(0 /* conf_mine */, 0 /* conf_theirs */, max_ancestors-1, max_descendants-1, true /* include_partial_groups */), - vCoins, setCoinsRet, nValueRet, coin_selection_params, bnb_used)) { + vCoins, setCoinsRet, nValueRet, coin_selection_params, bnb_used, nCoinType)) { return true; } // Try with unlimited ancestors/descendants. The transaction will still need to meet