From b908bf48a1694b4e6efb6a990dec4df226c6bbea Mon Sep 17 00:00:00 2001 From: Brannon King Date: Fri, 30 Aug 2019 13:51:29 -0600 Subject: [PATCH] setting go-live heights --- .travis.yml | 4 ++-- src/chainparams.cpp | 14 +++++++------- src/test/claimtriebranching_tests.cpp | 2 +- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.travis.yml b/.travis.yml index 51c33402d..db86f4574 100644 --- a/.travis.yml +++ b/.travis.yml @@ -68,7 +68,7 @@ jobs: - mkdir -p testrun && cd testrun - curl http://build.lbry.io/lbrycrd/${TRAVIS_BRANCH}/lbrycrd-${NAME}-test.zip -o temp.zip - unzip temp.zip - script: ./test_lbrycrd + script: TRIEHASH_FUZZER_BLOCKS=1000 ./test_lbrycrd - <<: *test-template # os: windows # doesn't support secrets at the moment @@ -79,7 +79,7 @@ jobs: - docker script: - docker pull $DOCKER_WINE_IMAGE - - docker run -v "$(pwd):/test" -e "WINEDEBUG=-all" -it $DOCKER_WINE_IMAGE wine "/test/test_lbrycrd.exe" + - docker run -v "$(pwd):/test" -e "WINEDEBUG=-all" -e "TRIEHASH_FUZZER_BLOCKS=1000" -it $DOCKER_WINE_IMAGE wine "/test/test_lbrycrd.exe" - <<: *test-template os: osx diff --git a/src/chainparams.cpp b/src/chainparams.cpp index a81aee224..358bcdb53 100644 --- a/src/chainparams.cpp +++ b/src/chainparams.cpp @@ -136,9 +136,9 @@ public: consensus.nAllowMinDiffMaxHeight = -1; consensus.nNormalizedNameForkHeight = 539940; // targeting 21 March 2019 consensus.nMinTakeoverWorkaroundHeight = 496850; - consensus.nMaxTakeoverWorkaroundHeight = 10000000; - consensus.nWitnessForkHeight = 700000; - consensus.nAllClaimsInMerkleForkHeight = 10000000; // pick real height + consensus.nMaxTakeoverWorkaroundHeight = 654400; // targeting 30 Oct 2019 + consensus.nWitnessForkHeight = 676900; // targeting 11 Dec 2019 + consensus.nAllClaimsInMerkleForkHeight = 654400; // targeting 30 Oct 2019 consensus.fPowAllowMinDifficultyBlocks = false; consensus.fPowNoRetargeting = false; consensus.nRuleChangeActivationThreshold = 1916; // 95% of a half week @@ -247,9 +247,9 @@ public: consensus.nAllowMinDiffMaxHeight = 1100000; consensus.nNormalizedNameForkHeight = 993380; // targeting, 21 Feb 2019 consensus.nMinTakeoverWorkaroundHeight = 99; - consensus.nMaxTakeoverWorkaroundHeight = 10000000; - consensus.nWitnessForkHeight = 1600000; - consensus.nAllClaimsInMerkleForkHeight = 10000000; // pick real height + consensus.nMaxTakeoverWorkaroundHeight = 1181920; // targeting 29 Sep 2019 + consensus.nWitnessForkHeight = 1181950; + consensus.nAllClaimsInMerkleForkHeight = 1181920; // targeting 29 Sep 2019 consensus.fPowAllowMinDifficultyBlocks = true; consensus.fPowNoRetargeting = false; consensus.nRuleChangeActivationThreshold = 1512; // 75% for testchains @@ -348,7 +348,7 @@ public: consensus.nMinTakeoverWorkaroundHeight = -1; consensus.nMaxTakeoverWorkaroundHeight = -1; consensus.nWitnessForkHeight = 150; - consensus.nAllClaimsInMerkleForkHeight = 1000; + consensus.nAllClaimsInMerkleForkHeight = 350; consensus.fPowAllowMinDifficultyBlocks = false; consensus.fPowNoRetargeting = false; consensus.nRuleChangeActivationThreshold = 108; // 75% for testchains diff --git a/src/test/claimtriebranching_tests.cpp b/src/test/claimtriebranching_tests.cpp index b14daa871..385ce52f3 100644 --- a/src/test/claimtriebranching_tests.cpp +++ b/src/test/claimtriebranching_tests.cpp @@ -515,7 +515,7 @@ BOOST_AUTO_TEST_CASE(triehash_fuzzer_test) } if (blocks == 1000 && claimsPerBlock == 100) - BOOST_CHECK_EQUAL(fixture.getMerkleHash().GetHex(), "21b25760f8e0f3e95514ff90b8ef3758b270e50fe17f747ba29f99dd1874bf41"); + BOOST_CHECK_EQUAL(fixture.getMerkleHash().GetHex(), "28825257a129eef69cab87d6255c8359fc6dc083ca7f09222526e3a7971f382d"); else if (blocks == 13 && claimsPerBlock == 100) BOOST_CHECK_EQUAL(fixture.getMerkleHash().GetHex(), "4e5984d6984f5f05d50e821e6228d56bcfbd16ca2093cd0308f6ff1c2bc8689a"); else