Skip to content

Commit 03f9b30

Browse files
committed
fix: simplicity activation when dynafed active
1 parent e490dcc commit 03f9b30

File tree

1 file changed

+1
-3
lines changed

1 file changed

+1
-3
lines changed

src/validation.cpp

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3704,8 +3704,6 @@ std::vector<unsigned char> GenerateCoinbaseCommitment(CBlock& block, const CBloc
37043704
}
37053705

37063706
// ELEMENTS
3707-
3708-
37093707
static bool ContextualCheckDynaFedHeader(const CBlockHeader& block, BlockValidationState& state, const CChainParams& params, const CBlockIndex* pindexPrev)
37103708
{
37113709
// When not active, it's a NOP
@@ -3721,7 +3719,7 @@ static bool ContextualCheckDynaFedHeader(const CBlockHeader& block, BlockValidat
37213719
}
37223720

37233721
// Make sure extension bits aren't active, reserved for future HF
3724-
uint32_t reserved_mask = (1<<23) | (1<<24) | (1<<25) | (1<<26);
3722+
uint32_t reserved_mask = (1<<23) | (1<<25) | (1<<26); // bit 24 used for Simplicity soft fork
37253723
if ((block.nVersion & reserved_mask) != 0) {
37263724
return state.Invalid(BlockValidationResult::BLOCK_CONSENSUS, "invalid-dyna-fed", "dynamic block header has unknown HF extension bits set");
37273725
}

0 commit comments

Comments
 (0)