zcash-hackworks
/
zcash-patched-for-explorer
mirror of https://github.com/zcash-hackworks/zcash-patched-for-explorer.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #3720 

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
parent 76a77059f3 b96f6a77f8
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

10
src/rpcwallet.cpp
View File

@ -1114,10 +1114,7 @@ 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", "send"));
entry.push_back(Pair("category", "conflicted"));
else
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)));
if (fLong) if (fLong)
@ -1150,10 +1147,7 @@ void ListTransactions(const CWalletTx& wtx, const string& strAccount, int nMinDe
} }
else else
{ {
if (wtx.GetDepthInMainChain() < 0) entry.push_back(Pair("category", "receive"));
entry.push_back(Pair("category", "conflicted"));
else
entry.push_back(Pair("category", "receive"));
} }
entry.push_back(Pair("amount", ValueFromAmount(r.second))); entry.push_back(Pair("amount", ValueFromAmount(r.second)));
if (fLong) if (fLong)