ARCHIVE/rippled
1
0
Fork 0
mirror of https://github.com/XRPLF/rippled.git synced 2025-12-06 17:27:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

New canonical transaction order code. Tested and working.

Browse Source 
CanonicalTXSet acts much like a map, but sorts the transactions in a simple
order that makes them take fewer passed.
This commit is contained in:
JoelKatz
2012-06-08 05:09:23 -07:00
parent 261b34e0c3
commit 4b79e7dca8
4 changed files with 116 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/LedgerConsensus.cpp
View File

@@ -577,7 +577,7 @@ void LedgerConsensus::Saccept(boost::shared_ptr<LedgerConsensus> This, SHAMap::p
}
void LedgerConsensus::applyTransactions(SHAMap::pointer set, Ledger::pointer ledger,
std::list<SerializedTransaction::pointer>& failedTransactions)
CanonicalTXSet& failedTransactions)
{
TransactionEngine engine(ledger);
@@ -620,16 +620,17 @@ void LedgerConsensus::applyTransactions(SHAMap::pointer set, Ledger::pointer led
do
{
successes = 0;
std::list<SerializedTransaction::pointer>::iterator it = failedTransactions.begin();
CanonicalTXSet::iterator it = failedTransactions.begin();
while (it != failedTransactions.end())
{
try
{
TransactionEngineResult result = engine.applyTransaction(**it, tepNO_CHECK_FEE | tepUPDATE_TOTAL, 0);
TransactionEngineResult result =
engine.applyTransaction(*it->second, tepNO_CHECK_FEE | tepUPDATE_TOTAL, 0);
if (result <= 0)
{
if (result == 0) ++successes;
failedTransactions.erase(it++);
failedTransactions.eraseInc(it);
}
else
{
@@ -639,7 +640,7 @@ void LedgerConsensus::applyTransactions(SHAMap::pointer set, Ledger::pointer led
catch (...)
{
Log(lsWARNING) << " Throws";
failedTransactions.erase(it++);
failedTransactions.eraseInc(it);
}
}
} while (successes > 0);
@@ -665,7 +666,7 @@ void LedgerConsensus::accept(SHAMap::pointer set)
}
#endif
std::list<SerializedTransaction::pointer> failedTransactions;
CanonicalTXSet failedTransactions(set->getHash());
applyTransactions(set, newLCL, failedTransactions);
newLCL->setClosed();
newLCL->setAccepted();
@@ -703,8 +704,7 @@ void LedgerConsensus::accept(SHAMap::pointer set)
ScopedLock sl = theApp->getMasterLedger().getLock();
applyTransactions(theApp->getMasterLedger().getCurrentLedger()->peekTransactionMap(),
newOL, failedTransactions);
applyTransactions(theApp->getMasterLedger().getCurrentLedger()->peekTransactionMap(), newOL, failedTransactions);
theApp->getMasterLedger().pushLedger(newLCL, newOL);
mState = lcsACCEPTED;