DragonX/dragonx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

Added new categories to transactions in listtransactions

Browse Source
This commit is contained in:
miketout
2018-10-31 21:32:12 -07:00
parent 8776c56085
commit a9774a32f7
2 changed files with 21 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/net.cpp
View File

@@ -1861,12 +1861,6 @@ public:
} }
instance_of_cnetcleanup; instance_of_cnetcleanup;
void RelayTransaction(const CTransaction& tx) void RelayTransaction(const CTransaction& tx)
{ {
CDataStream ss(SER_NETWORK, PROTOCOL_VERSION); CDataStream ss(SER_NETWORK, PROTOCOL_VERSION);

25
src/wallet/rpcwallet.cpp
View File

@@ -1613,6 +1613,8 @@ static void MaybePushAddress(UniValue & entry, const CTxDestination &dest)
} }
} }
bool ValidateStakeTransaction(const CTransaction &stakeTx, CStakeParams &stakeParams, bool validateSig = true);
void ListTransactions(const CWalletTx& wtx, const string& strAccount, int nMinDepth, bool fLong, UniValue& ret, const isminefilter& filter) void ListTransactions(const CWalletTx& wtx, const string& strAccount, int nMinDepth, bool fLong, UniValue& ret, const isminefilter& filter)
{ {
CAmount nFee; CAmount nFee;
@@ -1622,6 +1624,20 @@ void ListTransactions(const CWalletTx& wtx, const string& strAccount, int nMinDe
wtx.GetAmounts(listReceived, listSent, nFee, strSentAccount, filter); wtx.GetAmounts(listReceived, listSent, nFee, strSentAccount, filter);
CStakeParams p;
bool bIsStake = false;
bool bIsCoinbase = false;
bool bIsMint = false;
if (ValidateStakeTransaction(wtx, p, false))
{
bIsStake = true;
}
else
{
bIsCoinbase = wtx.IsCoinBase();
bIsMint = bIsCoinbase && wtx.vout.size() > 0 && wtx.vout[0].scriptPubKey.IsPayToCryptoCondition();
}
bool fAllAccounts = (strAccount == string("*")); bool fAllAccounts = (strAccount == string("*"));
bool involvesWatchonly = wtx.IsFromMe(ISMINE_WATCH_ONLY); bool involvesWatchonly = wtx.IsFromMe(ISMINE_WATCH_ONLY);
@@ -1635,7 +1651,7 @@ void ListTransactions(const CWalletTx& wtx, const string& strAccount, int nMinDe
entry.push_back(Pair("involvesWatchonly", true)); entry.push_back(Pair("involvesWatchonly", true));
entry.push_back(Pair("account", strSentAccount)); entry.push_back(Pair("account", strSentAccount));
MaybePushAddress(entry, s.destination); MaybePushAddress(entry, s.destination);
entry.push_back(Pair("category", "send")); entry.push_back(Pair("category", bIsStake ? "stake" : "send"));
entry.push_back(Pair("amount", ValueFromAmount(-s.amount))); entry.push_back(Pair("amount", ValueFromAmount(-s.amount)));
entry.push_back(Pair("vout", s.vout)); entry.push_back(Pair("vout", s.vout));
entry.push_back(Pair("fee", ValueFromAmount(-nFee))); entry.push_back(Pair("fee", ValueFromAmount(-nFee)));
@@ -1667,7 +1683,7 @@ void ListTransactions(const CWalletTx& wtx, const string& strAccount, int nMinDe
else else
MaybePushAddress(entry, r.destination); MaybePushAddress(entry, r.destination);
if (wtx.IsCoinBase()) if (bIsCoinbase)
{ {
int btm; int btm;
if (wtx.GetDepthInMainChain() < 1) if (wtx.GetDepthInMainChain() < 1)
@@ -1678,12 +1694,13 @@ void ListTransactions(const CWalletTx& wtx, const string& strAccount, int nMinDe
entry.push_back(Pair("blockstomaturity", btm)); entry.push_back(Pair("blockstomaturity", btm));
} }
else else
entry.push_back(Pair("category", "generate")); entry.push_back(Pair("category", bIsMint ? "mint" : "generate"));
} }
else else
{ {
entry.push_back(Pair("category", "receive")); entry.push_back(Pair("category", bIsStake ? "stake" : "receive"));
} }
entry.push_back(Pair("amount", ValueFromAmount(r.amount))); entry.push_back(Pair("amount", ValueFromAmount(r.amount)));
entry.push_back(Pair("vout", r.vout)); entry.push_back(Pair("vout", r.vout));
if (fLong) if (fLong)