From 55929d483b2afb8eea268472a5fdbaea71b6dfcd Mon Sep 17 00:00:00 2001 From: "Wladimir J. van der Laan" Date: Fri, 21 Feb 2014 16:31:49 +0100 Subject: [PATCH] Remove "conflicted" as transaction category. We were losing information about sent/received by overriding the category in case of a conflicted transaction. Hence, remove the "conflicted" category. Conflicted status of a transaction can still be determined by looking for confirmations<0. Rebased-from: b77ecd66b6b19921c98422bf70a39c4338c2f8b9 0.8.x --- src/rpcwallet.cpp | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/src/rpcwallet.cpp b/src/rpcwallet.cpp index c769989b6..dab5b440c 100644 --- a/src/rpcwallet.cpp +++ b/src/rpcwallet.cpp @@ -1002,10 +1002,7 @@ void ListTransactions(const CWalletTx& wtx, const string& strAccount, int nMinDe Object entry; entry.push_back(Pair("account", strSentAccount)); MaybePushAddress(entry, s.first); - if (wtx.GetDepthInMainChain() < 0) - entry.push_back(Pair("category", "conflicted")); - else - entry.push_back(Pair("category", "send")); + entry.push_back(Pair("category", "send")); entry.push_back(Pair("amount", ValueFromAmount(-s.second))); entry.push_back(Pair("fee", ValueFromAmount(-nFee))); if (fLong) @@ -1038,10 +1035,7 @@ void ListTransactions(const CWalletTx& wtx, const string& strAccount, int nMinDe } else { - if (wtx.GetDepthInMainChain() < 0) - entry.push_back(Pair("category", "conflicted")); - else - entry.push_back(Pair("category", "receive")); + entry.push_back(Pair("category", "receive")); } entry.push_back(Pair("amount", ValueFromAmount(r.second))); if (fLong)