Merge c0224bc962 into merged_master (Bitcoin PR bitcoin/bitcoin#22415)

This commit is contained in:
Andrew Poelstra 2021-08-02 16:39:39 +00:00
commit 40d1f3ffc5
7 changed files with 121 additions and 89 deletions

View file

@ -1409,7 +1409,7 @@ bool AppInitMain(NodeContext& node, interfaces::BlockAndHeaderTipInfo* tip_info)
const int64_t load_block_index_start_time = GetTimeMillis();
try {
LOCK(cs_main);
chainman.InitializeChainstate(*Assert(node.mempool));
chainman.InitializeChainstate(Assert(node.mempool.get()));
chainman.m_total_coinstip_cache = nCoinCacheUsage;
chainman.m_total_coinsdb_cache = nCoinDBCache;