Merge pull request #89 from ch4ot1c/feature/bip34-oddity

Activate BIP34 for testnet and regtest
This commit is contained in:
Jon Layton 2018-10-14 22:20:05 -05:00 committed by GitHub
commit e8c510915d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions

View File

@ -213,7 +213,7 @@ public:
consensus.nSubsidyHalvingInterval = 840000;
// P2SH, height in coinbase, CLTV and DERSIG all enforced from genesis
consensus.BIP34Height = 0;
consensus.BIP34Height = 17;
consensus.BIP65Height = 0;
consensus.BIP66Height = 0;
@ -318,7 +318,7 @@ public:
consensus.nSubsidyHalvingInterval = 840000;
// P2SH, height in coinbase, CLTV and DERSIG all enforced from genesis
consensus.BIP34Height = 0;
consensus.BIP34Height = 17;
consensus.BIP65Height = 0;
consensus.BIP66Height = 0;