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

Change how fail_hard transactions are handled.

Browse Source 
FIXES: #2847

* Transactions that are submitted with the fail_hard flag
  and that result in any TER code besides tesSUCCESS shall
  be neither queued nor held.

[FOLD] Keep tec results out of the open ledger when fail_hard:

* Improve TransactionStatus const correctness, and remove redundant
  `local` check
* Check open ledger tx count in fail_hard tests
* Fix some wrapping
* Remove duplicate test
This commit is contained in:
Devon White
2019-11-15 13:34:02 -05:00
committed by CJ Cobb
parent 7d867b806d
commit cd9732b47a
7 changed files with 120 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/ripple/app/misc/impl/TxQ.cpp
View File

@@ -360,16 +360,18 @@ TxQ::isFull() const
}
bool
TxQ::canBeHeld(STTx const& tx, OpenView const& view,
TxQ::canBeHeld(STTx const& tx, ApplyFlags const flags, OpenView const& view,
AccountMap::iterator accountIter,
boost::optional<FeeMultiSet::iterator> replacementIter)
{
// PreviousTxnID is deprecated and should never be used
// AccountTxnID is not supported by the transaction
// queue yet, but should be added in the future
// tapFAIL_HARD transactions are never held
bool canBeHeld =
! tx.isFieldPresent(sfPreviousTxnID) &&
! tx.isFieldPresent(sfAccountTxnID);
! tx.isFieldPresent(sfAccountTxnID) &&
! (flags & tapFAIL_HARD);
if (canBeHeld)
{
/* To be queued and relayed, the transaction needs to
@@ -798,7 +800,7 @@ TxQ::apply(Application& app, OpenView& view,
// object to hold the info we need to adjust for
// prior txns. Otherwise, let preclaim fail as if
// we didn't have the queue at all.
if (canBeHeld(*tx, view, accountIter, replacedItemDeleteIter))
if (canBeHeld(*tx, flags, view, accountIter, replacedItemDeleteIter))
multiTxn.emplace();
}
@@ -1048,7 +1050,7 @@ TxQ::apply(Application& app, OpenView& view,
// If `multiTxn` has a value, then `canBeHeld` has already been verified
if (! multiTxn &&
! canBeHeld(*tx, view, accountIter, replacedItemDeleteIter))
! canBeHeld(*tx, flags, view, accountIter, replacedItemDeleteIter))
{
// Bail, transaction cannot be held
JLOG(j_.trace()) << "Transaction " <<