cryptogera/litecoin
cryptogera/litecoin
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove "conflicted" as transaction category.

Browse Source 
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
This commit is contained in:
Wladimir J. van der Laan 2014-02-21 16:31:49 +01:00 committed by Warren Togami
parent fc1426bc0a
commit 55929d483b
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

@ -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)