monacoin_test
Fork

提交

修订版	5ac49c81884016689a3da0a1ccadd3021b5fe5e3 (tree)
时间	2014-04-07 02:17:01
作者	monacoinproject <monacoinproject@gmai...>
Commiter	monacoinproject

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.

--- a/src/rpcwallet.cpp

+++ b/src/rpcwallet.cpp

		@@ -1002,10 +1002,7 @@ void ListTransactions(const CWalletTx& wtx, const string& strAccount, int nMinDe
1002	1002	Object entry;
1003	1003	entry.push_back(Pair("account", strSentAccount));
1004	1004	MaybePushAddress(entry, s.first);
1005		- if (wtx.GetDepthInMainChain() < 0)
1006		- entry.push_back(Pair("category", "conflicted"));
1007		- else
1008		- entry.push_back(Pair("category", "send"));
	1005	+ entry.push_back(Pair("category", "send"));
1009	1006	entry.push_back(Pair("amount", ValueFromAmount(-s.second)));
1010	1007	entry.push_back(Pair("fee", ValueFromAmount(-nFee)));
1011	1008	if (fLong)

		@@ -1038,10 +1035,7 @@ void ListTransactions(const CWalletTx& wtx, const string& strAccount, int nMinDe
1038	1035	}
1039	1036	else
1040	1037	{
1041		- if (wtx.GetDepthInMainChain() < 0)
1042		- entry.push_back(Pair("category", "conflicted"));
1043		- else
1044		- entry.push_back(Pair("category", "receive"));
	1038	+ entry.push_back(Pair("category", "receive"));
1045	1039	}
1046	1040	entry.push_back(Pair("amount", ValueFromAmount(r.second)));
1047	1041	if (fLong)