aboutsummaryrefslogtreecommitdiff
path: root/src/consensus
diff options
context:
space:
mode:
authorJohn Newbery <john@johnnewbery.com>2019-05-20 14:58:44 -0400
committerJohn Newbery <john@johnnewbery.com>2019-08-14 15:52:52 -0400
commit1c93b9b31c2ab7358f9d55f52dd46340397c906d (patch)
tree968a17c7c72093b56e1d60818f8f4ca8806316ff /src/consensus
parent3862e473f0cb71a762c0306b171b591341d58142 (diff)
downloadbitcoin-1c93b9b31c2ab7358f9d55f52dd46340397c906d.tar.xz
[Consensus] Bury CSV deployment height
Hard code CSV deployment height to 419328 for mainnet.
Diffstat (limited to 'src/consensus')
-rw-r--r--src/consensus/params.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/consensus/params.h b/src/consensus/params.h
index 6c3a201f4f..69881ffdf2 100644
--- a/src/consensus/params.h
+++ b/src/consensus/params.h
@@ -16,7 +16,6 @@ namespace Consensus {
enum DeploymentPos
{
DEPLOYMENT_TESTDUMMY,
- DEPLOYMENT_CSV, // Deployment of BIP68, BIP112, and BIP113.
DEPLOYMENT_SEGWIT, // Deployment of BIP141, BIP143, and BIP147.
// NOTE: Also add new deployments to VersionBitsDeploymentInfo in versionbits.cpp
MAX_VERSION_BITS_DEPLOYMENTS
@@ -58,6 +57,8 @@ struct Params {
int BIP65Height;
/** Block height at which BIP66 becomes active */
int BIP66Height;
+ /** Block height at which CSV (BIP68, BIP112 and BIP113) becomes active */
+ int CSVHeight;
/**
* Minimum blocks including miner confirmation of the total of 2016 blocks in a retargeting period,
* (nPowTargetTimespan / nPowTargetSpacing) which is also used for BIP9 deployments.