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

Merge 6b2210f101 into merged_master (Bitcoin PR #16713)

Browse source
This commit is contained in:
Andrew Poelstra 2020-11-09 21:20:29 +00:00
commit d1ed1db7fc
3 changed files with 8 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/validation.cpp
View file

@ -1944,7 +1944,8 @@ public:
bool Condition(const CBlockIndex* pindex, const Consensus::Params& params) const override
{
return ((pindex->nVersion & VERSIONBITS_TOP_MASK) == VERSIONBITS_TOP_BITS) &&
return pindex->nHeight >= params.MinBIP9WarningHeight &&
((pindex->nVersion & VERSIONBITS_TOP_MASK) == VERSIONBITS_TOP_BITS) &&
((pindex->nVersion >> bit) & 1) != 0 &&
((ComputeBlockVersion(pindex->pprev, params) >> bit) & 1) == 0;
}