Merge 1052b09031 into merged_master (Bitcoin PR #19011)

This commit is contained in:
Andrew Poelstra 2020-11-27 17:29:41 +00:00
commit b2c4c2b2b4
11 changed files with 50 additions and 24 deletions

View file

@ -80,10 +80,10 @@ public:
return AppInitBasicSetup() && AppInitParameterInteraction() && AppInitSanityChecks() &&
AppInitLockDataDirectory();
}
bool appInitMain() override
bool appInitMain(interfaces::BlockAndHeaderTipInfo* tip_info) override
{
m_context->chain = MakeChain(*m_context);
return AppInitMain(m_context_ref, *m_context);
return AppInitMain(m_context_ref, *m_context, tip_info);
}
void appShutdown() override
{