GlcoinCore/elements
1
0
Fork 0
mirror of https://github.com/ElementsProject/elements.git synced 2026-08-15 12:51:00 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge 3a7e0a210c into merged_master (Bitcoin PR bitcoin/bitcoin#24513)

Browse source
This commit is contained in:
Byron Hambly 2024-11-26 14:11:12 +02:00
commit b80b3aeff4
33 changed files with 154 additions and 154 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/node/blockstorage.cpp
View file

@ -893,7 +893,7 @@ void ThreadImport(ChainstateManager& chainman, std::vector<fs::path> vImportFile
// We can't hold cs_main during ActivateBestChain even though we're accessing
// the chainman unique_ptrs since ABC requires us not to be holding cs_main, so retrieve
// the relevant pointers before the ABC call.
for (CChainState* chainstate : WITH_LOCK(::cs_main, return chainman.GetAll())) {
for (Chainstate* chainstate : WITH_LOCK(::cs_main, return chainman.GetAll())) {
BlockValidationState state;
if (!chainstate->ActivateBestChain(state, nullptr)) {
LogPrintf("Failed to connect best block (%s)\n", state.ToString());