diff options
| author | Suhas Daftuar <[email protected]> | 2017-09-12 11:38:20 -0400 |
|---|---|---|
| committer | Suhas Daftuar <[email protected]> | 2018-04-13 09:52:50 -0400 |
| commit | ce650182f4d9847423202789856e6e5f499151f8 (patch) | |
| tree | 8c8d4fb1e83bb6b8ebb1955f646720a54272158c /src/consensus | |
| parent | Merge #12969: Drop dead code CScript::Find (diff) | |
| download | discoin-ce650182f4d9847423202789856e6e5f499151f8.tar.xz discoin-ce650182f4d9847423202789856e6e5f499151f8.zip | |
Use P2SH consensus rules for all blocks
This commit moves P2SH activation back to the genesis block, with
a hardcoded exception for the one historical block in the chain that
violated this rule.
Diffstat (limited to 'src/consensus')
| -rw-r--r-- | src/consensus/params.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/consensus/params.h b/src/consensus/params.h index 4ef808c85..0559304fc 100644 --- a/src/consensus/params.h +++ b/src/consensus/params.h @@ -49,8 +49,8 @@ struct BIP9Deployment { struct Params { uint256 hashGenesisBlock; int nSubsidyHalvingInterval; - /** Block height at which BIP16 becomes active */ - int BIP16Height; + /* Block hash that is excepted from BIP16 enforcement */ + uint256 BIP16Exception; /** Block height and hash at which BIP34 becomes active */ int BIP34Height; uint256 BIP34Hash; |