GlcoinCore/elements
1
0
Fork 0
mirror of https://github.com/ElementsProject/elements.git synced 2026-08-20 13:37:28 +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.h
View file

@ -817,7 +817,7 @@ private:
//! Internal helper for ActivateSnapshot().
[[nodiscard]] bool PopulateAndValidateSnapshot(
CChainState& snapshot_chainstate,
CAutoFile& coins_file,
AutoFile& coins_file,
const node::SnapshotMetadata& metadata);
/**
@ -907,7 +907,7 @@ public:
//! - Move the new chainstate to `m_snapshot_chainstate` and make it our
//! ChainstateActive().
[[nodiscard]] bool ActivateSnapshot(
CAutoFile& coins_file, const node::SnapshotMetadata& metadata, bool in_memory);
AutoFile& coins_file, const node::SnapshotMetadata& metadata, bool in_memory);
//! The most-work chain.
CChainState& ActiveChainstate() const;