mirror of
https://github.com/XRPLF/rippled.git
synced 2025-11-24 21:15:58 +00:00
Merge branch 'feature' into develop
This commit is contained in:
@@ -206,6 +206,8 @@ void Application::setup()
|
||||
if (!theConfig.RUN_STANDALONE)
|
||||
updateTables(theConfig.LDB_IMPORT);
|
||||
|
||||
mFeatureTable.addInitialFeatures();
|
||||
|
||||
if (theConfig.START_UP == Config::FRESH)
|
||||
{
|
||||
WriteLog (lsINFO, Application) << "Starting new Ledger";
|
||||
@@ -437,6 +439,8 @@ void Application::startNewLedger()
|
||||
{
|
||||
Ledger::pointer firstLedger = boost::make_shared<Ledger>(rootAddress, SYSTEM_CURRENCY_START);
|
||||
assert(!!firstLedger->getAccountState(rootAddress));
|
||||
// WRITEME: Add any default features
|
||||
// WRITEME: Set default fee/reserve
|
||||
firstLedger->updateHash();
|
||||
firstLedger->setClosed();
|
||||
firstLedger->setAccepted();
|
||||
@@ -548,6 +552,12 @@ bool serverOkay(std::string& reason)
|
||||
return false;
|
||||
}
|
||||
|
||||
if (theApp->getOPs().isFeatureBlocked())
|
||||
{
|
||||
reason = "Server version too old";
|
||||
return false;
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user