diff options
| author | Pieter Wuille <pieter.wuille@gmail.com> | 2015-11-12 14:31:35 +0100 |
|---|---|---|
| committer | Pieter Wuille <pieter.wuille@gmail.com> | 2015-11-12 14:37:10 +0100 |
| commit | 54e8bfec8387ee154f8b15b41ae0b29bc2cd9bbc (patch) | |
| tree | b61a5b9472c87b2f0baf30d046c63d171f66776f /src/consensus | |
| parent | 5fcc14ee0562faff2ace17082f664e60c375b334 (diff) | |
| parent | 33c90cf197223fb95f858db80d090d570d70498a (diff) | |
| download | bitcoin-54e8bfec8387ee154f8b15b41ae0b29bc2cd9bbc.tar.xz | |
Merge pull request #6931
33c90cf Make skipping BIP30 check chain agnostic (Alex Morcos)
06d81ad Skip BIP30 check after BIP34 activation (Alex Morcos)
Diffstat (limited to 'src/consensus')
| -rw-r--r-- | src/consensus/params.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/consensus/params.h b/src/consensus/params.h index efbbbed352..5ebc48a8df 100644 --- a/src/consensus/params.h +++ b/src/consensus/params.h @@ -19,6 +19,9 @@ struct Params { int nMajorityEnforceBlockUpgrade; int nMajorityRejectBlockOutdated; int nMajorityWindow; + /** Block height and hash at which BIP34 becomes active */ + int BIP34Height; + uint256 BIP34Hash; /** Proof of work parameters */ uint256 powLimit; bool fPowAllowMinDifficultyBlocks; |