|
|
|
@ -976,6 +976,13 @@ Value listreceivedbyaccount(const Array& params, bool fHelp)
@@ -976,6 +976,13 @@ Value listreceivedbyaccount(const Array& params, bool fHelp)
|
|
|
|
|
return ListReceived(params, true); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
static void MaybePushAddress(Object & entry, const CTxDestination &dest) |
|
|
|
|
{ |
|
|
|
|
CBitcoinAddress addr; |
|
|
|
|
if (addr.Set(dest)) |
|
|
|
|
entry.push_back(Pair("address", addr.ToString())); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
void ListTransactions(const CWalletTx& wtx, const string& strAccount, int nMinDepth, bool fLong, Array& ret) |
|
|
|
|
{ |
|
|
|
|
int64 nFee; |
|
|
|
@ -994,7 +1001,7 @@ void ListTransactions(const CWalletTx& wtx, const string& strAccount, int nMinDe
@@ -994,7 +1001,7 @@ void ListTransactions(const CWalletTx& wtx, const string& strAccount, int nMinDe
|
|
|
|
|
{ |
|
|
|
|
Object entry; |
|
|
|
|
entry.push_back(Pair("account", strSentAccount)); |
|
|
|
|
entry.push_back(Pair("address", CBitcoinAddress(s.first).ToString())); |
|
|
|
|
MaybePushAddress(entry, s.first); |
|
|
|
|
entry.push_back(Pair("category", "send")); |
|
|
|
|
entry.push_back(Pair("amount", ValueFromAmount(-s.second))); |
|
|
|
|
entry.push_back(Pair("fee", ValueFromAmount(-nFee))); |
|
|
|
@ -1016,7 +1023,7 @@ void ListTransactions(const CWalletTx& wtx, const string& strAccount, int nMinDe
@@ -1016,7 +1023,7 @@ void ListTransactions(const CWalletTx& wtx, const string& strAccount, int nMinDe
|
|
|
|
|
{ |
|
|
|
|
Object entry; |
|
|
|
|
entry.push_back(Pair("account", account)); |
|
|
|
|
entry.push_back(Pair("address", CBitcoinAddress(r.first).ToString())); |
|
|
|
|
MaybePushAddress(entry, r.first); |
|
|
|
|
if (wtx.IsCoinBase()) |
|
|
|
|
{ |
|
|
|
|
if (wtx.GetDepthInMainChain() < 1) |
|
|
|
|