diff options
| author | Pieter Wuille <pieter.wuille@gmail.com> | 2016-10-17 13:24:37 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2016-10-17 16:52:31 +0200 |
| commit | 8b66659921e6170831f3a043e9a54fa45776aa68 (patch) | |
| tree | 66213db3f538875983945e180e344f87d20caab8 /src/chainparams.cpp | |
| parent | cb8887e87df315dbc6c560149b3a97b704a676aa (diff) | |
| download | bitcoin-8b66659921e6170831f3a043e9a54fa45776aa68.tar.xz | |
Define start and end time for segwit deployment
Github-Pull: #8937
Rebased-From: f9c23dea976465c51b9fe2cead81b707678c16bb
Diffstat (limited to 'src/chainparams.cpp')
| -rw-r--r-- | src/chainparams.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/chainparams.cpp b/src/chainparams.cpp index 7b493ed8a7..3be2d2ff80 100644 --- a/src/chainparams.cpp +++ b/src/chainparams.cpp @@ -92,10 +92,10 @@ public: consensus.vDeployments[Consensus::DEPLOYMENT_CSV].nStartTime = 1462060800; // May 1st, 2016 consensus.vDeployments[Consensus::DEPLOYMENT_CSV].nTimeout = 1493596800; // May 1st, 2017 - // Deployment of SegWit (BIP141 and BIP143) + // Deployment of SegWit (BIP141, BIP143, and BIP147) consensus.vDeployments[Consensus::DEPLOYMENT_SEGWIT].bit = 1; - consensus.vDeployments[Consensus::DEPLOYMENT_SEGWIT].nStartTime = 0; - consensus.vDeployments[Consensus::DEPLOYMENT_SEGWIT].nTimeout = 0; // Never / undefined + consensus.vDeployments[Consensus::DEPLOYMENT_SEGWIT].nStartTime = 1479168000; // November 15th, 2016. + consensus.vDeployments[Consensus::DEPLOYMENT_SEGWIT].nTimeout = 1510704000; // November 15th, 2017. /** * The message start string is designed to be unlikely to occur in normal data. @@ -188,7 +188,7 @@ public: consensus.vDeployments[Consensus::DEPLOYMENT_CSV].nStartTime = 1456790400; // March 1st, 2016 consensus.vDeployments[Consensus::DEPLOYMENT_CSV].nTimeout = 1493596800; // May 1st, 2017 - // Deployment of SegWit (BIP141 and BIP143) + // Deployment of SegWit (BIP141, BIP143, and BIP147) consensus.vDeployments[Consensus::DEPLOYMENT_SEGWIT].bit = 1; consensus.vDeployments[Consensus::DEPLOYMENT_SEGWIT].nStartTime = 1462060800; // May 1st 2016 consensus.vDeployments[Consensus::DEPLOYMENT_SEGWIT].nTimeout = 1493596800; // May 1st 2017 |