Trivial: Segwit: Don't call IsWitnessEnabled from ContextualCheckBlock

2016-07-17 02:34:06 +02:00 · 2016-07-17 02:34:06 +02:00 · 38c4c8b701
parent bc94b87487
commit 38c4c8b701
1 changed files with 1 additions and 1 deletions
--- a/src/main.cpp
+++ b/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
    //   multiple, the last one is used.
    bool fHaveWitness = false;
-    if (IsWitnessEnabled(pindexPrev, consensusParams)) {
+    if (VersionBitsState(pindexPrev, consensusParams, Consensus::DEPLOYMENT_SEGWIT, versionbitscache) == THRESHOLD_ACTIVE) {
        int commitpos = GetWitnessCommitmentIndex(block);
        if (commitpos != -1) {
            bool malleated = false;