From 3c055bf79ec00ba75e7cf71803407e3b8ca5b04c Mon Sep 17 00:00:00 2001 From: Alexander Block Date: Tue, 18 Feb 2020 10:34:18 +0100 Subject: [PATCH 1/2] Bump nMinimumChainWork and defaultAssumeValid (#3336) --- src/chainparams.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/chainparams.cpp b/src/chainparams.cpp index 9624c40c83..ba19f5fa90 100644 --- a/src/chainparams.cpp +++ b/src/chainparams.cpp @@ -302,10 +302,10 @@ public: consensus.vDeployments[Consensus::DEPLOYMENT_DIP0008].nThreshold = 3226; // 80% of 4032 // The best chain should have at least this much work. - consensus.nMinimumChainWork = uint256S("0x0000000000000000000000000000000000000000000020a5cd0e7d1481a5f8d5"); // 1167570 + consensus.nMinimumChainWork = uint256S("0x0000000000000000000000000000000000000000000027b81f49774e9f7fc93f"); // 1215000 // By default assume that the signatures in ancestors of this block are valid. - consensus.defaultAssumeValid = uint256S("0x000000000000000fb7b1e9b81700283dff0f7d87cf458e5edfdae00c669de661"); // 1167570 + consensus.defaultAssumeValid = uint256S("0x0000000000000009a563e41afbafa4044861f32feb871de41f4c6e401dac1dac"); // 1215000 /** * The message start string is designed to be unlikely to occur in normal data. @@ -481,10 +481,10 @@ public: consensus.vDeployments[Consensus::DEPLOYMENT_DIP0008].nThreshold = 50; // 50% of 100 // The best chain should have at least this much work. - consensus.nMinimumChainWork = uint256S("0x0000000000000000000000000000000000000000000000000098ebee572c3cd1"); // 200000 + consensus.nMinimumChainWork = uint256S("0x00000000000000000000000000000000000000000000000000ac720e0b2ed13d"); // 260000 // By default assume that the signatures in ancestors of this block are valid. - consensus.defaultAssumeValid = uint256S("0x000000001015eb5ef86a8fe2b3074d947bc972c5befe32b28dd5ce915dc0d029"); // 200000 + consensus.defaultAssumeValid = uint256S("0x000002bbe0f404f22f0aff8032e2a87cef6a32f0840e9199aa0b79ba3870b33c"); // 260000 pchMessageStart[0] = 0xce; pchMessageStart[1] = 0xe2; From f5b08c2c8be6e0c976e10f3cb7ef6e15caa93d8f Mon Sep 17 00:00:00 2001 From: Alexander Block Date: Tue, 18 Feb 2020 10:36:54 +0100 Subject: [PATCH 2/2] Update release-notes --- doc/release-notes.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/doc/release-notes.md b/doc/release-notes.md index a47b0e11bd..fbb7448ce5 100644 --- a/doc/release-notes.md +++ b/doc/release-notes.md @@ -233,6 +233,8 @@ modules were reorganized in separate folders to make navigation through code a b See detailed [set of changes](https://github.com/dashpay/dash/compare/v0.14.0.5...dashpay:v0.15.0.0). +- [`3c055bf79`](https://github.com/dashpay/dash/commit/3c055bf79) Bump nMinimumChainWork and defaultAssumeValid (#3336) +- [`818e7a6f7`](https://github.com/dashpay/dash/commit/818e7a6f7) Update release notes - [`9d5c3d12e`](https://github.com/dashpay/dash/commit/9d5c3d12e) Try to actually accept newly created dstx-es into masternode's mempool (#3332) - [`f23e722da`](https://github.com/dashpay/dash/commit/f23e722da) Switch CLIENT_VERSION_IS_RELEASE to `true` for v0.15 (#3306) - [`b57f1dac8`](https://github.com/dashpay/dash/commit/b57f1dac8) Update release notes