From 15c2a6022648fc46c0c3b01b1a268131fb84ea46 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/main.cpp | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/main.cpp b/src/main.cpp index bfc6d79a10..97c975cbef 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -2868,11 +2868,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) rules, for block.nVersion=3 blocks, // when 75% of the network has upgraded: