diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2017-07-31 08:49:07 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2017-07-31 10:46:22 +0200 |
| commit | 2a50b11586a2d551a577da109374dc3ec94825e6 (patch) | |
| tree | 72f246828b80d7a12cc9798d9032a157acce9c31 /src | |
| parent | 70888a39c43a8e680be6b1baecbc9f7c9b63b183 (diff) | |
| parent | 9a8b054185eccd6d33395472b35fc70dad85b1a6 (diff) | |
| download | bitcoin-2a50b11586a2d551a577da109374dc3ec94825e6.tar.xz | |
Merge #10945: Update defaultAssumeValid according to release-process.md.
9a8b054 Update defaultAssumeValid according to release-process.md. (Gregory Maxwell)
Pull request description:
Updated for block 477890.
Tree-SHA512: 70bca3d81ac170506fba984a97cd44fccaae7da2e709925747fed0e3f763a799b0e89f0b9ed8869b1a55892580594be7b648d3b3635faaee6d85ef6db468dee5
Diffstat (limited to 'src')
| -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 dc4d2621ee..02c8abb100 100644 --- a/src/chainparams.cpp +++ b/src/chainparams.cpp @@ -101,10 +101,10 @@ public: consensus.vDeployments[Consensus::DEPLOYMENT_SEGWIT].nTimeout = 1510704000; // November 15th, 2017. // The best chain should have at least this much work. - consensus.nMinimumChainWork = uint256S("0x0000000000000000000000000000000000000000003f94d1ad391682fe038bf5"); + consensus.nMinimumChainWork = uint256S("0x000000000000000000000000000000000000000000723d3581fe1bd55373540a"); // By default assume that the signatures in ancestors of this block are valid. - consensus.defaultAssumeValid = uint256S("0x00000000000000000013176bf8d7dfeab4e1db31dc93bc311b436e82ab226b90"); //453354 + consensus.defaultAssumeValid = uint256S("0x0000000000000000003b9ce759c2a087d52abc4266f8f4ebd6d768b89defa50a"); //477890 /** * The message start string is designed to be unlikely to occur in normal data. @@ -205,10 +205,10 @@ public: consensus.vDeployments[Consensus::DEPLOYMENT_SEGWIT].nTimeout = 1493596800; // May 1st 2017 // The best chain should have at least this much work. - consensus.nMinimumChainWork = uint256S("0x00000000000000000000000000000000000000000000001f057509eba81aed91"); + consensus.nMinimumChainWork = uint256S("0x00000000000000000000000000000000000000000000002830dab7f76dbb7d63"); // By default assume that the signatures in ancestors of this block are valid. - consensus.defaultAssumeValid = uint256S("0x00000000000128796ee387cf110ccb9d2f36cffaf7f73079c995377c65ac0dcc"); //1079274 + consensus.defaultAssumeValid = uint256S("0x0000000002e9e7b00e1f6dc5123a04aad68dd0f0968d8c7aa45f6640795c37b1"); //1135275 pchMessageStart[0] = 0x0b; pchMessageStart[1] = 0x11; |