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

fix WalletListTransactions().

This commit is contained in:
Christopher Jeffrey 2014-11-13 12:28:31 -08:00
parent 4692d4a034
commit ebf3c6c13d
1 changed files with 13 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/bitcoindjs.cc
View File

@ -414,7 +414,7 @@ process_packet(CNode* pfrom, string strCommand, CDataStream& vRecv, int64_t nTim
static void static void
AcentryToJSON_V8(const CAccountingEntry& acentry, AcentryToJSON_V8(const CAccountingEntry& acentry,
const string& strAccount, Local<Array>& ret, int a_count); const string& strAccount, Local<Array>& ret, int *a_count);
static void static void
WalletTxToJSON_V8(const CWalletTx& wtx, Local<Object>& entry); WalletTxToJSON_V8(const CWalletTx& wtx, Local<Object>& entry);
@ -425,7 +425,7 @@ MaybePushAddress_V8(Local<Object>& entry, const CTxDestination &dest);
static void static void
ListTransactions_V8(const CWalletTx& wtx, const string& strAccount, ListTransactions_V8(const CWalletTx& wtx, const string& strAccount,
int nMinDepth, bool fLong, Local<Array> ret, int nMinDepth, bool fLong, Local<Array> ret,
const isminefilter& filter); const isminefilter& filter, int *a_count);
static int64_t static int64_t
SatoshiFromAmount(const CAmount& amount); SatoshiFromAmount(const CAmount& amount);
@ -4072,12 +4072,11 @@ NAN_METHOD(WalletListTransactions) {
++it) { ++it) {
CWalletTx *const pwtx = (*it).second.first; CWalletTx *const pwtx = (*it).second.first;
if (pwtx != 0) { if (pwtx != 0) {
ListTransactions_V8(*pwtx, strAccount, 0, true, ret, filter); ListTransactions_V8(*pwtx, strAccount, 0, true, ret, filter, &a_count);
} }
CAccountingEntry *const pacentry = (*it).second.second; CAccountingEntry *const pacentry = (*it).second.second;
if (pacentry != 0) { if (pacentry != 0) {
AcentryToJSON_V8(*pacentry, strAccount, ret, a_count); AcentryToJSON_V8(*pacentry, strAccount, ret, &a_count);
a_count++;
} }
if ((int)ret->Length() >= (nCount+nFrom)) { if ((int)ret->Length() >= (nCount+nFrom)) {
break; break;
@ -4092,28 +4091,15 @@ NAN_METHOD(WalletListTransactions) {
nCount = ret->Length() - nFrom; nCount = ret->Length() - nFrom;
} }
// Array::iterator first = ret.begin();
// std::advance(first, nFrom);
// Array::iterator last = ret.begin();
// std::advance(last, nFrom+nCount);
//
// if (last != ret.end()) {
// ret.erase(last, ret.end());
// }
// if (first != ret.begin()) {
// ret.erase(ret.begin(), first);
// }
//
// std::reverse(ret.begin(), ret.end()); // Return oldest to newest
NanReturnValue(ret); NanReturnValue(ret);
} }
static void static void
AcentryToJSON_V8(const CAccountingEntry& acentry, AcentryToJSON_V8(const CAccountingEntry& acentry,
const string& strAccount, Local<Array>& ret, int a_count) { const string& strAccount, Local<Array>& ret, int *a_count) {
bool fAllAccounts = (strAccount == string("*")); bool fAllAccounts = (strAccount == string("*"));
int i = *a_count;
if (fAllAccounts || acentry.strAccount == strAccount) { if (fAllAccounts || acentry.strAccount == strAccount) {
Local<Object> entry = NanNew<Object>(); Local<Object> entry = NanNew<Object>();
entry->Set(NanNew<String>("account"), NanNew<String>(acentry.strAccount)); entry->Set(NanNew<String>("account"), NanNew<String>(acentry.strAccount));
@ -4122,8 +4108,10 @@ AcentryToJSON_V8(const CAccountingEntry& acentry,
entry->Set(NanNew<String>("amount"), NanNew<Number>(acentry.nCreditDebit)); entry->Set(NanNew<String>("amount"), NanNew<Number>(acentry.nCreditDebit));
entry->Set(NanNew<String>("otheraccount"), NanNew<String>(acentry.strOtherAccount)); entry->Set(NanNew<String>("otheraccount"), NanNew<String>(acentry.strOtherAccount));
entry->Set(NanNew<String>("comment"), NanNew<String>(acentry.strComment)); entry->Set(NanNew<String>("comment"), NanNew<String>(acentry.strComment));
ret->Set(a_count, entry); ret->Set(i, entry);
i++;
} }
*a_count = i;
} }
static void static void
@ -4165,7 +4153,7 @@ MaybePushAddress_V8(Local<Object>& entry, const CTxDestination &dest) {
static void static void
ListTransactions_V8(const CWalletTx& wtx, const string& strAccount, ListTransactions_V8(const CWalletTx& wtx, const string& strAccount,
int nMinDepth, bool fLong, Local<Array> ret, int nMinDepth, bool fLong, Local<Array> ret,
const isminefilter& filter) { const isminefilter& filter, int *a_count) {
CAmount nFee; CAmount nFee;
string strSentAccount; string strSentAccount;
list<COutputEntry> listReceived; list<COutputEntry> listReceived;
@ -4176,7 +4164,7 @@ ListTransactions_V8(const CWalletTx& wtx, const string& strAccount,
bool fAllAccounts = (strAccount == string("*")); bool fAllAccounts = (strAccount == string("*"));
bool involvesWatchonly = wtx.IsFromMe(ISMINE_WATCH_ONLY); bool involvesWatchonly = wtx.IsFromMe(ISMINE_WATCH_ONLY);
int i = 0; int i = *a_count;
// Sent // Sent
if ((!listSent.empty() || nFee != 0) && (fAllAccounts || strAccount == strSentAccount)) { if ((!listSent.empty() || nFee != 0) && (fAllAccounts || strAccount == strSentAccount)) {
BOOST_FOREACH(const COutputEntry& s, listSent) { BOOST_FOREACH(const COutputEntry& s, listSent) {
@ -4198,7 +4186,6 @@ ListTransactions_V8(const CWalletTx& wtx, const string& strAccount,
} }
} }
i = 0;
// Received // Received
if (listReceived.size() > 0 && wtx.GetDepthInMainChain() >= nMinDepth) { if (listReceived.size() > 0 && wtx.GetDepthInMainChain() >= nMinDepth) {
BOOST_FOREACH(const COutputEntry& r, listReceived) { BOOST_FOREACH(const COutputEntry& r, listReceived) {
@ -4235,6 +4222,8 @@ ListTransactions_V8(const CWalletTx& wtx, const string& strAccount,
} }
} }
} }
*a_count = i;
} }
/** /**