diff options
| author | MarcoFalke <falke.marco@gmail.com> | 2018-12-29 18:19:10 +0100 |
|---|---|---|
| committer | MarcoFalke <falke.marco@gmail.com> | 2018-12-29 19:39:37 +0100 |
| commit | fab17e8272f5f70213f186809479ee7a75898b1d (patch) | |
| tree | e4f60bbd80436dcd89b724cfa232f28c4b3846cb /src/chainparams.cpp | |
| parent | cbb91cd0ec8e858b986776723ed4dc25df4b74ee (diff) | |
| download | bitcoin-fab17e8272f5f70213f186809479ee7a75898b1d.tar.xz | |
test: Add basic test for BIP34
Diffstat (limited to 'src/chainparams.cpp')
| -rw-r--r-- | src/chainparams.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/chainparams.cpp b/src/chainparams.cpp index 4ce1b53880..d334233224 100644 --- a/src/chainparams.cpp +++ b/src/chainparams.cpp @@ -272,10 +272,10 @@ public: strNetworkID = "regtest"; consensus.nSubsidyHalvingInterval = 150; consensus.BIP16Exception = uint256(); - consensus.BIP34Height = 100000000; // BIP34 has not activated on regtest (far in the future so block v1 are not rejected in tests) + consensus.BIP34Height = 500; // BIP34 activated on regtest (Used in functional tests) consensus.BIP34Hash = uint256(); - consensus.BIP65Height = 1351; // BIP65 activated on regtest (Used in rpc activation tests) - consensus.BIP66Height = 1251; // BIP66 activated on regtest (Used in rpc activation tests) + consensus.BIP65Height = 1351; // BIP65 activated on regtest (Used in functional tests) + consensus.BIP66Height = 1251; // BIP66 activated on regtest (Used in functional tests) consensus.powLimit = uint256S("7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"); consensus.nPowTargetTimespan = 14 * 24 * 60 * 60; // two weeks consensus.nPowTargetSpacing = 10 * 60; |