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

Improve transaction fee and execution logic (RIPD-323):

Browse Source 
* tecINSUFF_FEE if balance doesn't cover fee
* Ensure transaction recovery is deterministic
* Reduce transaction retries
This commit is contained in:
JoelKatz
2014-07-14 12:43:56 -07:00
committed by David Schwartz
parent d791fe3013
commit f1bb0afc4e
6 changed files with 55 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/ripple/module/app/consensus/DisputedTx.h
View File

@@ -82,8 +82,13 @@ private:
ripple::unordered_map <NodeID, bool> mVotes;
};
#define LEDGER_TOTAL_PASSES 8
#define LEDGER_RETRY_PASSES 5
// How many total extra passes we make
// We must ensure we make at least one non-retriable pass
#define LEDGER_TOTAL_PASSES 3
// How many extra retry passes we
// make if the previous retry pass made changes
#define LEDGER_RETRY_PASSES 1
} // ripple

32
src/ripple/module/app/consensus/LedgerConsensus.cpp
View File

@@ -972,6 +972,7 @@ private:
// Apply disputed transactions that didn't get in
TransactionEngine engine (newOL);
bool anyDisputes = false;
for (auto& it : mDisputes)
{
if (!it.second->getOurVote ())
@@ -986,10 +987,8 @@ private:
SerializedTransaction::pointer txn
= std::make_shared<SerializedTransaction>(sit);
if (applyTransaction (engine, txn, newOL, true, false))
{
failedTransactions.push_back (txn);
}
failedTransactions.push_back (txn);
anyDisputes = true;
}
catch (...)
{
@@ -998,12 +997,22 @@ private:
}
}
}
if (anyDisputes)
{
applyTransactions (std::shared_ptr<SHAMap>(),
newOL, newLCL, failedTransactions, true);
}
WriteLog (lsDEBUG, LedgerConsensus)
<< "Applying transactions from current open ledger";
applyTransactions (getApp().getLedgerMaster ().getCurrentLedger
()->peekTransactionMap (), newOL, newLCL,
failedTransactions, true);
{
Ledger::pointer oldOL = getApp().getLedgerMaster().getCurrentLedger();
if (oldOL->peekTransactionMap()->getHash().isNonZero ())
{
WriteLog (lsDEBUG, LedgerConsensus)
<< "Applying transactions from current open ledger";
applyTransactions (oldOL->peekTransactionMap (),
newOL, newLCL, failedTransactions, true);
}
}
{
TransactionEngine engine (newOL);
@@ -1252,6 +1261,7 @@ private:
{
TransactionEngine engine (applyLedger);
if (set)
for (SHAMapItem::pointer item = set->peekFirstItem (); !!item;
item = set->peekNextItem (item->getTag ()))
if (!checkLedger->hasTransaction (item->getTag ()))
@@ -1334,6 +1344,10 @@ private:
if ((!changes) || (pass >= LEDGER_RETRY_PASSES))
certainRetry = false;
}
// If there are any transactions left, we must have
// tried them in at least one final pass
assert (failedTransactions.empty() || !certainRetry);
}
/** Apply a transaction to a ledger