kvazar/kevacoin
1
0
Fork 0
mirror of https://github.com/kvazar-network/kevacoin.git synced 2025-01-13 00:28:03 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #3720

Browse Source 
b96f6a7 Remove "conflicted" as transaction category. (Wladimir J. van der Laan)
This commit is contained in:
Wladimir J. van der Laan 2014-02-22 08:30:54 +01:00
commit 39fae6cfdd
No known key found for this signature in database
GPG Key ID: 74810B012346C9A6
1 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/rpcwallet.cpp
View File

@ -1114,9 +1114,6 @@ void ListTransactions(const CWalletTx& wtx, const string& strAccount, int nMinDe
Object entry; Object entry;
entry.push_back(Pair("account", strSentAccount)); entry.push_back(Pair("account", strSentAccount));
MaybePushAddress(entry, s.first); 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("amount", ValueFromAmount(-s.second)));
entry.push_back(Pair("fee", ValueFromAmount(-nFee))); entry.push_back(Pair("fee", ValueFromAmount(-nFee)));
@ -1150,9 +1147,6 @@ void ListTransactions(const CWalletTx& wtx, const string& strAccount, int nMinDe
} }
else 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))); entry.push_back(Pair("amount", ValueFromAmount(r.second)));