diff options
| author | NicolasDorier <[email protected]> | 2016-07-22 08:27:55 +0900 |
|---|---|---|
| committer | NicolasDorier <[email protected]> | 2016-07-23 01:02:53 +0900 |
| commit | 122786d0e0170c73536360b705af711e1338adbf (patch) | |
| tree | 025090542ab4e14b665a4ee852cd0344ce243ee8 /src/consensus/params.h | |
| parent | Merge #8347: Trivial: Make CBlockIndex param const in ContextualCheckBlockHea... (diff) | |
| download | discoin-122786d0e0170c73536360b705af711e1338adbf.tar.xz discoin-122786d0e0170c73536360b705af711e1338adbf.zip | |
Consensus: Remove ISM
Diffstat (limited to 'src/consensus/params.h')
| -rw-r--r-- | src/consensus/params.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/consensus/params.h b/src/consensus/params.h index 822ec87d6..5b2f49184 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. |