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

Disable compatible ledger safety if quorum is strict

Browse Source
This commit is contained in:
JoelKatz
2015-09-25 13:22:40 -07:00
committed by Vinnie Falco
parent f9a65e4966
commit e03effd63b
2 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/ripple/app/ledger/impl/LedgerMaster.cpp
View File

@@ -194,6 +194,13 @@ public:
bool isCompatible (Ledger::pointer ledger, bool isCompatible (Ledger::pointer ledger,
beast::Journal::Stream s, const char* reason) override beast::Journal::Stream s, const char* reason) override
{ {
if (mStrictValCount)
{
// If we're only using validation count, then we can't
// reject a ledger even if it's ioncompatible
return true;
}
auto validLedger = getValidatedLedger(); auto validLedger = getValidatedLedger();
if (validLedger && if (validLedger &&

3
src/ripple/app/misc/NetworkOPs.cpp
View File

@@ -1087,8 +1087,9 @@ void NetworkOPsImp::tryStartConsensus ()
// check if the ledger is good enough to go to omFULL // check if the ledger is good enough to go to omFULL
// Note: Do not go to omFULL if we don't have the previous ledger // Note: Do not go to omFULL if we don't have the previous ledger
// check if the ledger is bad enough to go to omCONNECTED -- TODO // check if the ledger is bad enough to go to omCONNECTED -- TODO
auto current = m_ledgerMaster.getCurrentLedger();
if (app_.timeKeeper().now().time_since_epoch().count() < if (app_.timeKeeper().now().time_since_epoch().count() <
m_ledgerMaster.getCurrentLedger ()->info().closeTime) (current->info().parentCloseTime + 2* current->info().closeTimeResolution))
{ {
setMode (omFULL); setMode (omFULL);
} }