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

Merge 895937edb2 into merged_master (Bitcoin PR bitcoin/bitcoin#25285)

Browse source
This commit is contained in:
Byron Hambly 2024-10-17 17:33:20 +02:00
commit ad4ecee6c0
19 changed files with 89 additions and 77 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/validation.cpp
View file

@ -5190,7 +5190,7 @@ const AssumeutxoData* ExpectedAssumeutxo(
}
bool ChainstateManager::ActivateSnapshot(
CAutoFile& coins_file,
AutoFile& coins_file,
const SnapshotMetadata& metadata,
bool in_memory)
{
@ -5285,7 +5285,7 @@ static void FlushSnapshotToDisk(CCoinsViewCache& coins_cache, bool snapshot_load
bool ChainstateManager::PopulateAndValidateSnapshot(
CChainState& snapshot_chainstate,
CAutoFile& coins_file,
AutoFile& coins_file,
const SnapshotMetadata& metadata)
{
// It's okay to release cs_main before we're done using `coins_cache` because we know