aboutsummaryrefslogtreecommitdiff
path: root/src/consensus
diff options
context:
space:
mode:
authorNicolasDorier <nicolas.dorier@gmail.com>2016-07-22 08:27:55 +0900
committerNicolasDorier <nicolas.dorier@gmail.com>2016-07-23 01:02:53 +0900
commit122786d0e0170c73536360b705af711e1338adbf (patch)
tree025090542ab4e14b665a4ee852cd0344ce243ee8 /src/consensus
parent381917f610e3c770acb5e323884e7eef6fd25841 (diff)
downloadbitcoin-122786d0e0170c73536360b705af711e1338adbf.tar.xz
Consensus: Remove ISM
Diffstat (limited to 'src/consensus')
-rw-r--r--src/consensus/params.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/consensus/params.h b/src/consensus/params.h
index 822ec87d69..5b2f49184f 100644
--- a/src/consensus/params.h
+++ b/src/consensus/params.h
@@ -39,13 +39,13 @@ struct BIP9Deployment {
struct Params {
uint256 hashGenesisBlock;
int nSubsidyHalvingInterval;
- /** Used to check majorities for block version upgrade */
- int nMajorityEnforceBlockUpgrade;
- int nMajorityRejectBlockOutdated;
- int nMajorityWindow;
/** Block height and hash at which BIP34 becomes active */
int BIP34Height;
uint256 BIP34Hash;
+ /** Block height at which BIP65 becomes active */
+ int BIP65Height;
+ /** Block height at which BIP66 becomes active */
+ int BIP66Height;
/**
* Minimum blocks including miner confirmation of the total of 2016 blocks in a retargetting period,
* (nPowTargetTimespan / nPowTargetSpacing) which is also used for BIP9 deployments.