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

Merge 821f5c824f into merged_master (Bitcoin PR bitcoin/bitcoin#25487)

Browse source
This commit is contained in:
Byron Hambly 2024-10-17 09:16:23 +02:00
commit 076e809b74
23 changed files with 373 additions and 195 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/node/blockstorage.cpp
View file

@ -834,7 +834,7 @@ struct CImportingNow {
}
};
void ThreadImport(ChainstateManager& chainman, std::vector<fs::path> vImportFiles, const ArgsManager& args)
void ThreadImport(ChainstateManager& chainman, std::vector<fs::path> vImportFiles, const ArgsManager& args, const fs::path& mempool_path)
{
SetSyscallSandboxPolicy(SyscallSandboxPolicy::INITIALIZATION_LOAD_BLOCKS);
ScheduleBatchPriority();
@ -904,6 +904,6 @@ void ThreadImport(ChainstateManager& chainman, std::vector<fs::path> vImportFile
return;
}
} // End scope of CImportingNow
chainman.ActiveChainstate().LoadMempool(args);
chainman.ActiveChainstate().LoadMempool(mempool_path);
}
} // namespace node