ARCHIVE/xahaud
3
0
Fork 0
mirror of https://github.com/Xahau/xahaud.git synced 2025-12-06 17:27:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:jedmccaleb/NewCoin

Browse Source
This commit is contained in:
JoelKatz
2013-03-27 18:15:25 -07:00
parent 878caf1989 15c03a0a68
commit 077abbe873
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/cpp/ripple/RPCHandler.cpp
View File

@@ -1670,9 +1670,10 @@ Json::Value RPCHandler::doAccountTransactions(Json::Value jvRequest, int& cost)
{
RippleAddress raAccount;
uint32 offset = jvRequest.isMember("offset") ? jvRequest["offset"].asUInt() : 0;
int limit = jvRequest.isMember("limit") ? jvRequest["limit"].asUInt() : -1;
bool descending = jvRequest.isMember("descending") && jvRequest["descending"].asBool();
bool count = jvRequest.isMember("count") && jvRequest["count"].asBool();
int limit = jvRequest.isMember("limit") ? jvRequest["limit"].asUInt() : -1;
bool bBinary = jvRequest.isMember("binary") && jvRequest["binary"].asBool();
bool bDescending = jvRequest.isMember("descending") && jvRequest["descending"].asBool();
bool bCount = jvRequest.isMember("count") && jvRequest["count"].asBool();
uint32 uLedgerMin;
uint32 uLedgerMax;
uint32 uValidatedMin;
@@ -1722,10 +1723,10 @@ Json::Value RPCHandler::doAccountTransactions(Json::Value jvRequest, int& cost)
ret["account"] = raAccount.humanAccountID();
if (jvRequest.isMember("binary") && jvRequest["binary"].asBool())
if (bBinary)
{
std::vector<NetworkOPs::txnMetaLedgerType> txns =
mNetOps->getAccountTxsB(raAccount, uLedgerMin, uLedgerMax, descending, offset, limit, mRole == ADMIN);
mNetOps->getAccountTxsB(raAccount, uLedgerMin, uLedgerMax, bDescending, offset, limit, mRole == ADMIN);
for (std::vector<NetworkOPs::txnMetaLedgerType>::const_iterator it = txns.begin(), end = txns.end();
it != end; ++it)
@@ -1743,7 +1744,7 @@ Json::Value RPCHandler::doAccountTransactions(Json::Value jvRequest, int& cost)
}
else
{
std::vector< std::pair<Transaction::pointer, TransactionMetaSet::pointer> > txns = mNetOps->getAccountTxs(raAccount, uLedgerMin, uLedgerMax, descending, offset, limit, mRole == ADMIN);
std::vector< std::pair<Transaction::pointer, TransactionMetaSet::pointer> > txns = mNetOps->getAccountTxs(raAccount, uLedgerMin, uLedgerMax, bDescending, offset, limit, mRole == ADMIN);
for (std::vector< std::pair<Transaction::pointer, TransactionMetaSet::pointer> >::iterator it = txns.begin(), end = txns.end(); it != end; ++it)
{
@@ -1770,7 +1771,7 @@ Json::Value RPCHandler::doAccountTransactions(Json::Value jvRequest, int& cost)
ret["validated"] = bValidated && uValidatedMin <= uLedgerMin && uValidatedMax >= uLedgerMax;
ret["offset"] = offset;
if (count)
if (bCount)
ret["count"] = mNetOps->countAccountTxs(raAccount, uLedgerMin, uLedgerMax);
if (jvRequest.isMember("limit"))