From 189128c220190a588500b8e74ee7ae47671b9558 Mon Sep 17 00:00:00 2001
From: Dhruv Mehta <856960+dhruv@users.noreply.github.com>
Date: Sun, 20 Jun 2021 11:15:57 -0700
Subject: [PATCH] [validation] Set witness script flag with p2sh for blocks

---
 src/validation.cpp | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/src/validation.cpp b/src/validation.cpp
index 65d2dfa3b7a..863483bcfb6 100644
--- a/src/validation.cpp
+++ b/src/validation.cpp
@@ -1646,13 +1646,8 @@ static unsigned int GetBlockScriptFlags(const CBlockIndex* pindex, const Consens
         pindex->phashBlock == nullptr || // this is a new candidate block, eg from TestBlockValidity()
         *pindex->phashBlock != consensusparams.BIP16Exception) // this block isn't the historical exception
     {
-        flags |= SCRIPT_VERIFY_P2SH;
-    }
-
-    // Enforce WITNESS rules whenever P2SH is in effect (and the segwit
-    // deployment is defined).
-    if (flags & SCRIPT_VERIFY_P2SH && DeploymentEnabled(consensusparams, Consensus::DEPLOYMENT_SEGWIT)) {
-        flags |= SCRIPT_VERIFY_WITNESS;
+        // Enforce WITNESS rules whenever P2SH is in effect
+        flags |= SCRIPT_VERIFY_P2SH | SCRIPT_VERIFY_WITNESS;
     }
 
     // Enforce the DERSIG (BIP66) rule