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

Fix account_tx

Browse Source
This commit is contained in:
JoelKatz
2013-09-05 20:05:22 -07:00
parent abcb1dce57
commit aa64bdc41c
1 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
modules/ripple_app/misc/NetworkOPs.cpp
View File

@@ -1730,7 +1730,7 @@ NetworkOPsImp::getAccountTxs (const RippleAddress& account, int32 minLedger, int
if (rawMeta.getLength() == 0)
{ // Work around a bug that could leave the metadata missing
uint32 seq = static_cast<uint32>(db->getBigInt("AccountTransactions.LedgerSeq"));
uint32 seq = static_cast<uint32>(db->getBigInt("LedgerSeq"));
WriteLog(lsWARNING, NetworkOPs) << "Recovering ledger " << seq << ", txn " << txn->getID();
Ledger::pointer ledger = getLedgerBySeq(seq);
if (ledger)
@@ -1833,7 +1833,7 @@ NetworkOPsImp::getTxsAccount (const RippleAddress& account, int32 minLedger, int
numberOfResults = NONBINARY_PAGE_LENGTH;
else
numberOfResults = limit;
queryLimit = numberOfResults + (foundResume ? 0 : EXTRA_LENGTH);
queryLimit = numberOfResults + 1 + (foundResume ? 0 : EXTRA_LENGTH);
uint32 findLedger = 0, findSeq = 0;
if (!foundResume)
@@ -1872,14 +1872,14 @@ NetworkOPsImp::getTxsAccount (const RippleAddress& account, int32 minLedger, int
{
if (!foundResume)
{
if ((findLedger == db->getInt("AccountTransactions.LedgerSeq")) && (findSeq == db->getInt("AccountTransactions.TxnSeq")))
if ((findLedger == db->getInt("LedgerSeq")) && (findSeq == db->getInt("TxnSeq")))
foundResume = true;
}
else if (numberOfResults == 0)
{
token = Json::objectValue;
token["ledger"] = db->getInt("AccountTransactions.LedgerSeq");
token["seq"] = db->getInt("AccountTransactions.TxnSeq");
token["ledger"] = db->getInt("LedgerSeq");
token["seq"] = db->getInt("TxnSeq");
break;
}
@@ -1902,13 +1902,14 @@ NetworkOPsImp::getTxsAccount (const RippleAddress& account, int32 minLedger, int
if (rawMeta.getLength() == 0)
{ // Work around a bug that could leave the metadata missing
uint32 seq = static_cast<uint32>(db->getBigInt("AccountTransactions.LedgerSeq"));
uint32 seq = static_cast<uint32>(db->getBigInt("LedgerSeq"));
WriteLog(lsWARNING, NetworkOPs) << "Recovering ledger " << seq << ", txn " << txn->getID();
Ledger::pointer ledger = getLedgerBySeq(seq);
if (ledger)
ledger->pendSaveValidated(false, false);
}
--numberOfResults;
TransactionMetaSet::pointer meta = boost::make_shared<TransactionMetaSet> (txn->getID (), txn->getLedger (), rawMeta.getData ());
#ifdef C11X
@@ -1940,7 +1941,7 @@ NetworkOPsImp::getTxsAccountB (const RippleAddress& account, int32 minLedger, in
numberOfResults = BINARY_PAGE_LENGTH;
else
numberOfResults = limit;
queryLimit = numberOfResults + (foundResume ? 0 : EXTRA_LENGTH);
queryLimit = numberOfResults + 1 + (foundResume ? 0 : EXTRA_LENGTH);
uint32 findLedger = 0, findSeq = 0;
if (!foundResume)
@@ -1979,14 +1980,14 @@ NetworkOPsImp::getTxsAccountB (const RippleAddress& account, int32 minLedger, in
{
if (!foundResume)
{
if ((findLedger == db->getInt("AccountTransactions.LedgerSeq")) && (findSeq == db->getInt("AccountTransactions.TxnSeq")))
if ((findLedger == db->getInt("LedgerSeq")) && (findSeq == db->getInt("TxnSeq")))
foundResume = true;
}
else if (numberOfResults == 0)
{
token = Json::objectValue;
token["ledger"] = db->getInt("AccountTransactions.LedgerSeq");
token["seq"] = db->getInt("AccountTransactions.TxnSeq");
token["ledger"] = db->getInt("LedgerSeq");
token["seq"] = db->getInt("TxnSeq");
break;
}
@@ -2017,6 +2018,7 @@ NetworkOPsImp::getTxsAccountB (const RippleAddress& account, int32 minLedger, in
rawMeta.resize (metaSize);
ret.push_back (boost::make_tuple (strHex (rawTxn), strHex (rawMeta), db->getInt ("LedgerSeq")));
--numberOfResults;
}
}
}