diff options
author | Sebastian Falbesoner <sebastian.falbesoner@gmail.com> | 2022-05-19 16:10:59 +0200 |
---|---|---|
committer | Sebastian Falbesoner <sebastian.falbesoner@gmail.com> | 2022-05-19 16:10:59 +0200 |
commit | ef0aa74836c4339aa7f14fc1c9583d86dd5c388a (patch) | |
tree | 9e955bd3bf0f68cfccb8eceaa3bcb915969328a1 /src/wallet/rpc/transactions.cpp | |
parent | e18fd4763e77d1e19208effa9f1a08c5b29fea8e (diff) | |
download | bitcoin-ef0aa74836c4339aa7f14fc1c9583d86dd5c388a.tar.xz |
rpc: wallet: remove `-deprecatedrpc=exclude_coinbase` logic
Diffstat (limited to 'src/wallet/rpc/transactions.cpp')
-rw-r--r-- | src/wallet/rpc/transactions.cpp | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/src/wallet/rpc/transactions.cpp b/src/wallet/rpc/transactions.cpp index 7dddc4e4bb..25eaf72da7 100644 --- a/src/wallet/rpc/transactions.cpp +++ b/src/wallet/rpc/transactions.cpp @@ -95,14 +95,6 @@ static UniValue ListReceived(const CWallet& wallet, const UniValue& params, cons has_filtered_address = true; } - // Excluding coinbase outputs is deprecated - // It can be enabled by setting deprecatedrpc=exclude_coinbase - const bool include_coinbase{!wallet.chain().rpcEnableDeprecated("exclude_coinbase")}; - - if (include_immature_coinbase && !include_coinbase) { - throw JSONRPCError(RPC_INVALID_PARAMETER, "include_immature_coinbase is incompatible with deprecated exclude_coinbase"); - } - // Tally std::map<CTxDestination, tallyitem> mapTally; for (const std::pair<const uint256, CWalletTx>& pairWtx : wallet.mapWallet) { @@ -113,7 +105,7 @@ static UniValue ListReceived(const CWallet& wallet, const UniValue& params, cons continue; // Coinbase with less than 1 confirmation is no longer in the main chain - if ((wtx.IsCoinBase() && (nDepth < 1 || !include_coinbase)) + if ((wtx.IsCoinBase() && (nDepth < 1)) || (wallet.IsTxImmatureCoinBase(wtx) && !include_immature_coinbase)) { continue; |