diff options
| author | John Newbery <john@johnnewbery.com> | 2019-05-20 14:59:07 -0400 |
|---|---|---|
| committer | John Newbery <john@johnnewbery.com> | 2019-08-14 15:52:52 -0400 |
| commit | 0328dcdcfcb56dc8918697716d7686be048ad0b3 (patch) | |
| tree | c4c4bed225e5d08d9af5f007941ab5261147e256 /src/consensus | |
| parent | 1c93b9b31c2ab7358f9d55f52dd46340397c906d (diff) | |
| download | bitcoin-0328dcdcfcb56dc8918697716d7686be048ad0b3.tar.xz | |
[Consensus] Bury segwit deployment
Hardcode segwit deployment height to 481824 for mainnet.
Diffstat (limited to 'src/consensus')
| -rw-r--r-- | src/consensus/params.h | 5 |
1 files changed, 4 insertions, 1 deletions
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. |