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 38941045c5 into merged_master (Bitcoin PR bitcoin/bitcoin#29361)

Browse source
This commit is contained in:
Byron Hambly 2025-11-29 14:38:05 +02:00
commit cffb3d4646
No known key found for this signature in database
GPG key ID: DE8F6EA20A661697
10 changed files with 11 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/validation.cpp
View file

@ -2388,7 +2388,7 @@ bool Chainstate::ConnectBlock(const CBlock& block, BlockValidationState& state,
// Also, currently the rule against blocks more than 2 hours in the future
// is enforced in ContextualCheckBlockHeader(); we wouldn't want to
// re-enforce that rule here (at least until we make it impossible for
// m_adjusted_time_callback() to go backward).
// the clock to go backward).
if (!CheckBlock(block, state, params.GetConsensus(), !fJustCheck, !fJustCheck)) {
if (state.GetResult() == BlockValidationResult::BLOCK_MUTATED) {
// We don't write down blocks to disk if they may have been