Browse Source

Trivial: Segwit: Don't call IsWitnessEnabled from ContextualCheckBlock

0.14
Jorge Timón 8 years ago
parent
commit
38c4c8b701
  1. 2
      src/main.cpp

2
src/main.cpp

@ -3564,7 +3564,7 @@ bool ContextualCheckBlock(const CBlock& block, CValidationState& state, CBlockIn
// {0xaa, 0x21, 0xa9, 0xed}, and the following 32 bytes are SHA256^2(witness root, witness nonce). In case there are // {0xaa, 0x21, 0xa9, 0xed}, and the following 32 bytes are SHA256^2(witness root, witness nonce). In case there are
// multiple, the last one is used. // multiple, the last one is used.
bool fHaveWitness = false; bool fHaveWitness = false;
if (IsWitnessEnabled(pindexPrev, consensusParams)) { if (VersionBitsState(pindexPrev, consensusParams, Consensus::DEPLOYMENT_SEGWIT, versionbitscache) == THRESHOLD_ACTIVE) {
int commitpos = GetWitnessCommitmentIndex(block); int commitpos = GetWitnessCommitmentIndex(block);
if (commitpos != -1) { if (commitpos != -1) {
bool malleated = false; bool malleated = false;

Loading…
Cancel
Save