From f603de62703b4a0af3ef963eb291e0b61d00c579 Mon Sep 17 00:00:00 2001 From: Peter Shugalev Date: Sun, 18 Aug 2024 18:21:51 +0200 Subject: [PATCH] Fixed coincontrol logic (thus fixing many tests behaviour) --- src/wallet/wallet.cpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp index a8d68d39fd..d47132a062 100644 --- a/src/wallet/wallet.cpp +++ b/src/wallet/wallet.cpp @@ -215,7 +215,7 @@ bool CTransparentTxout::IsCoinTypeCompatible(const CCoinControl* coinControl) co assert(!txout.IsNull()); if (!coinControl) - return GetValue() != 1000 * COIN; + return true; else if (coinControl->nCoinType == CoinType::ONLY_MINTS) return false; else if (coinControl->nCoinType == CoinType::ONLY_NONDENOMINATED_NOT1000IFMN) @@ -224,10 +224,8 @@ bool CTransparentTxout::IsCoinTypeCompatible(const CCoinControl* coinControl) co return !fMasternodeMode || GetValue() != 1000 * COIN; else if (coinControl->nCoinType == CoinType::ONLY_1000) return GetValue() == 1000 * COIN; - else if (coinControl->nCoinType == CoinType::WITH_1000) - return true; else - return GetValue() != 1000 * COIN; + return true; } bool CTransparentTxout::IsLLMQInstantSendLocked() const {