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

Clean up the checkAccept path to use the ledger sequence

Browse Source
This commit is contained in:
JoelKatz
2014-01-22 17:09:52 -08:00
parent f88ddc947c
commit 07d16f280c
3 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/ripple_app/ledger/LedgerMaster.cpp
View File

@@ -614,12 +614,18 @@ public:
getApp().getInboundLedgers().findCreate(hash, seq, true);
}
void checkAccept (uint256 const& hash)
void checkAccept (uint256 const& hash, uint32 seq)
{
if ((seq == 0) && (seq <= mValidLedgerSeq))
return;
Ledger::pointer ledger = mLedgerHistory.getLedgerByHash (hash);
if (!ledger)
{
// FIXME: We should really only fetch if the ledger
//has sufficient validations to accept it
InboundLedger::pointer l = getApp().getInboundLedgers().findCreateValidationLedger(hash);
if (l && l->isComplete() && !l->isFailed())
ledger = l->getLedger();

2
src/ripple_app/ledger/LedgerMaster.h
View File

@@ -122,7 +122,7 @@ public:
virtual void addValidateCallback (callback& c) = 0;
virtual void checkAccept (Ledger::ref ledger) = 0;
virtual void checkAccept (uint256 const& hash) = 0;
virtual void checkAccept (uint256 const& hash, uint32 seq) = 0;
virtual void tryAdvance () = 0;
virtual void newPathRequest () = 0;

2
src/ripple_app/misc/Validations.cpp
View File

@@ -126,7 +126,7 @@ private:
<< " added " << (val->isTrusted () ? "trusted/" : "UNtrusted/") << (isCurrent ? "current" : "stale");
if (val->isTrusted () && isCurrent)
getApp().getLedgerMaster ().checkAccept (hash);
getApp().getLedgerMaster ().checkAccept (hash, val->getFieldU32 (sfLedgerSequence));
// FIXME: This never forwards untrusted validations
return isCurrent;