From 0328dcdcfcb56dc8918697716d7686be048ad0b3 Mon Sep 17 00:00:00 2001 From: John Newbery Date: Mon, 20 May 2019 14:59:07 -0400 Subject: [Consensus] Bury segwit deployment Hardcode segwit deployment height to 481824 for mainnet. --- src/consensus/params.h | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'src/consensus/params.h') diff --git a/src/consensus/params.h b/src/consensus/params.h index 69881ffdf2..8263b0fef4 100644 --- a/src/consensus/params.h +++ b/src/consensus/params.h @@ -16,7 +16,6 @@ namespace Consensus { enum DeploymentPos { DEPLOYMENT_TESTDUMMY, - DEPLOYMENT_SEGWIT, // Deployment of BIP141, BIP143, and BIP147. // NOTE: Also add new deployments to VersionBitsDeploymentInfo in versionbits.cpp MAX_VERSION_BITS_DEPLOYMENTS }; @@ -59,6 +58,10 @@ struct Params { int BIP66Height; /** Block height at which CSV (BIP68, BIP112 and BIP113) becomes active */ int CSVHeight; + /** Block height at which Segwit (BIP141, BIP143 and BIP147) becomes active. + * Note that segwit v0 script rules are enforced on all blocks except the + * BIP 16 exception blocks. */ + int SegwitHeight; /** * Minimum blocks including miner confirmation of the total of 2016 blocks in a retargeting period, * (nPowTargetTimespan / nPowTargetSpacing) which is also used for BIP9 deployments. -- cgit v1.2.3