diff options
| author | Pieter Wuille <pieter.wuille@gmail.com> | 2017-10-11 20:25:18 -0700 |
|---|---|---|
| committer | Pieter Wuille <pieter.wuille@gmail.com> | 2017-11-06 19:29:20 -0800 |
| commit | d618458184742b15a7ab0349127ede7a2946a182 (patch) | |
| tree | 5c08e3162c6ac3f53dd8362fe0ae1b505c5186ad /src | |
| parent | 4bd89210a1484d00abba27c50ac4c07dcc05c2e0 (diff) | |
Have SegWit active by default
Diffstat (limited to 'src')
| -rw-r--r-- | src/chainparams.cpp | 2 | ||||
| -rw-r--r-- | src/test/test_bitcoin.cpp | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/src/chainparams.cpp b/src/chainparams.cpp index 81ebdd4602..950bdd945c 100644 --- a/src/chainparams.cpp +++ b/src/chainparams.cpp @@ -291,7 +291,7 @@ public: consensus.vDeployments[Consensus::DEPLOYMENT_CSV].nStartTime = 0; consensus.vDeployments[Consensus::DEPLOYMENT_CSV].nTimeout = Consensus::BIP9Deployment::NO_TIMEOUT; consensus.vDeployments[Consensus::DEPLOYMENT_SEGWIT].bit = 1; - consensus.vDeployments[Consensus::DEPLOYMENT_SEGWIT].nStartTime = 0; + consensus.vDeployments[Consensus::DEPLOYMENT_SEGWIT].nStartTime = Consensus::BIP9Deployment::ALWAYS_ACTIVE; consensus.vDeployments[Consensus::DEPLOYMENT_SEGWIT].nTimeout = Consensus::BIP9Deployment::NO_TIMEOUT; // The best chain should have at least this much work. diff --git a/src/test/test_bitcoin.cpp b/src/test/test_bitcoin.cpp index 79bc48a118..8a7140d522 100644 --- a/src/test/test_bitcoin.cpp +++ b/src/test/test_bitcoin.cpp @@ -106,6 +106,9 @@ TestingSetup::~TestingSetup() TestChain100Setup::TestChain100Setup() : TestingSetup(CBaseChainParams::REGTEST) { + // CreateAndProcessBlock() does not support building SegWit blocks, so don't activate in these tests. + // TODO: fix the code to support SegWit blocks. + UpdateVersionBitsParameters(Consensus::DEPLOYMENT_SEGWIT, 0, Consensus::BIP9Deployment::NO_TIMEOUT); // Generate a 100-block chain: coinbaseKey.MakeNewKey(true); CScript scriptPubKey = CScript() << ToByteVector(coinbaseKey.GetPubKey()) << OP_CHECKSIG; |