From 420bdf211decc41d4f3c3d3a9f7c0e4235866b6d Mon Sep 17 00:00:00 2001 From: instagibbs Date: Thu, 21 Jul 2016 16:34:25 -0400 Subject: [PATCH] Enable P2SH in ConnectBlock regardless of timestamp --- src/validation.cpp | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/validation.cpp b/src/validation.cpp index e19084724d..4477b0bbea 100644 --- a/src/validation.cpp +++ b/src/validation.cpp @@ -2311,11 +2311,8 @@ bool ConnectBlock(const CBlock& block, CValidationState& state, CBlockIndex* pin } } - // BIP16 didn't become active until Apr 1 2012 - int64_t nBIP16SwitchTime = 1333238400; - bool fStrictPayToScriptHash = (pindex->GetBlockTime() >= nBIP16SwitchTime); - - unsigned int flags = fStrictPayToScriptHash ? SCRIPT_VERIFY_P2SH : SCRIPT_VERIFY_NONE; + //P2SH is a requirement for segwit + CT + unsigned int flags = SCRIPT_VERIFY_P2SH; // Start enforcing the DERSIG (BIP66) rule if (pindex->nHeight >= chainparams.GetConsensus().BIP66Height) {