diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2016-08-04 11:55:25 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2016-08-04 12:20:35 +0200 |
| commit | 37d83bb0a980996338d9bc9dbdbf0175eeaba9a2 (patch) | |
| tree | 597d0a22c003d9e8dac39ead346b98e3ad2bcf91 /src/consensus/params.h | |
| parent | 5c7a5e1f66d8611d84d66c7e0295bd41c71f85bf (diff) | |
| parent | 122786d0e0170c73536360b705af711e1338adbf (diff) | |
| download | bitcoin-37d83bb0a980996338d9bc9dbdbf0175eeaba9a2.tar.xz | |
Merge #8391: Consensus: Remove ISM
122786d Consensus: Remove ISM (NicolasDorier)
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 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. |