From da38fafd1e6f779b24bd62b37ac972b635b0f905 Mon Sep 17 00:00:00 2001 From: -k Date: Tue, 24 Apr 2018 21:20:18 -0400 Subject: [PATCH 01/10] bump to version 1.1.4 --- configure.ac | 2 +- src/clientversion.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index 92a2a4d95..ef9ef1c48 100644 --- a/configure.ac +++ b/configure.ac @@ -2,7 +2,7 @@ dnl require autoconf 2.60 (AS_ECHO/AS_ECHO_N) AC_PREREQ([2.60]) define(_CLIENT_VERSION_MAJOR, 1) define(_CLIENT_VERSION_MINOR, 1) -define(_CLIENT_VERSION_REVISION, 3) +define(_CLIENT_VERSION_REVISION, 4) define(_CLIENT_VERSION_BUILD, 0) define(_CLIENT_VERSION_IS_RELEASE, true) define(_COPYRIGHT_YEAR, 2018) diff --git a/src/clientversion.h b/src/clientversion.h index 587d68721..36df56174 100644 --- a/src/clientversion.h +++ b/src/clientversion.h @@ -16,7 +16,7 @@ //! These need to be macros, as clientversion.cpp's and axe*-res.rc's voodoo requires it #define CLIENT_VERSION_MAJOR 1 #define CLIENT_VERSION_MINOR 1 -#define CLIENT_VERSION_REVISION 3 +#define CLIENT_VERSION_REVISION 4 #define CLIENT_VERSION_BUILD 0 //! Set to true for release, false for prerelease or test build From 62609867e80b85e252f7365da164a031608ecf18 Mon Sep 17 00:00:00 2001 From: -k Date: Sat, 26 May 2018 04:52:51 -0400 Subject: [PATCH 02/10] change text color --- src/qt/splashscreen.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/qt/splashscreen.cpp b/src/qt/splashscreen.cpp index 2b9667376..173be4d41 100644 --- a/src/qt/splashscreen.cpp +++ b/src/qt/splashscreen.cpp @@ -139,7 +139,7 @@ static void InitMessage(SplashScreen *splash, const std::string &message) Qt::QueuedConnection, Q_ARG(QString, QString::fromStdString(message)), Q_ARG(int, Qt::AlignBottom|Qt::AlignHCenter), - Q_ARG(QColor, QColor(55,55,55))); + Q_ARG(QColor, QColor(255,26,26))); } static void ShowProgress(SplashScreen *splash, const std::string &title, int nProgress) From cbf1c0af6fc74e28dedcc6dc271d3359de7634d6 Mon Sep 17 00:00:00 2001 From: -k Date: Thu, 7 Jun 2018 13:01:31 -0400 Subject: [PATCH 03/10] add checkpoint 71693 --- src/chainparams.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/chainparams.cpp b/src/chainparams.cpp index 492736daf..1a077174b 100644 --- a/src/chainparams.cpp +++ b/src/chainparams.cpp @@ -190,7 +190,8 @@ class CMainParams : public CChainParams { ( 27119, uint256S("0x00000000000f139246bbe4022bec06387527d55972fd1a2619aaee5ed43b36c0")) ( 29425, uint256S("0x0000000000033abb70490884e1bc0eac1d36341f1afe2e66a148b4ff6feec6bf")) ( 32749, uint256S("0x00000000000c74050c24bdef66854a6489021316dd0bce146c9b1aba2755381c")) - ( 40282, uint256S("0x000000000018ea87170b4590c45b67624512125e45bd1711f8f89746d8af2904")), + ( 40282, uint256S("0x000000000018ea87170b4590c45b67624512125e45bd1711f8f89746d8af2904")) + ( 71693, uint256S("0x00000000001bd560d1c5df9ff89fb82df4f3a11d27bf1f4ee349ef4822dce563")), 1523419384, // * UNIX timestamp of last checkpoint block 27036, // * total number of transactions between genesis and last checkpoint From 50bccff42b15e31c38422a16fc66bddeb5af6f57 Mon Sep 17 00:00:00 2001 From: -k Date: Thu, 7 Jun 2018 13:05:54 -0400 Subject: [PATCH 04/10] edit checkpoint data --- src/chainparams.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/chainparams.cpp b/src/chainparams.cpp index 1a077174b..eb4e1cfbc 100644 --- a/src/chainparams.cpp +++ b/src/chainparams.cpp @@ -193,8 +193,8 @@ class CMainParams : public CChainParams { ( 40282, uint256S("0x000000000018ea87170b4590c45b67624512125e45bd1711f8f89746d8af2904")) ( 71693, uint256S("0x00000000001bd560d1c5df9ff89fb82df4f3a11d27bf1f4ee349ef4822dce563")), - 1523419384, // * UNIX timestamp of last checkpoint block - 27036, // * total number of transactions between genesis and last checkpoint + 1528390439, // * UNIX timestamp of last checkpoint block + 53952, // * total number of transactions between genesis and last checkpoint // (the tx=... number in the SetBestChain debug.log lines) 500 // * estimated number of transactions per day after checkpoint }; From 4327c41b4f86c82e10bf3b31145ea7e87e78536e Mon Sep 17 00:00:00 2001 From: -k Date: Thu, 7 Jun 2018 13:09:24 -0400 Subject: [PATCH 05/10] bump b block --- src/chainparams.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/chainparams.cpp b/src/chainparams.cpp index eb4e1cfbc..af2c684b4 100644 --- a/src/chainparams.cpp +++ b/src/chainparams.cpp @@ -121,7 +121,7 @@ class CMainParams : public CChainParams { consensus.nMinimumChainWork = uint256S("0x00000000000000000000000000000000000000000000000003d42635fb7cfa65"); // 25000 // By default assume that the signatures in ancestors of this block are valid. - consensus.defaultAssumeValid = uint256S("0x000000000007ca4edd8c5baf04994cf8dea37f94f98239e50f6e71ec4dc45c60"); // 25000 + consensus.defaultAssumeValid = uint256S("0x00000000001bd560d1c5df9ff89fb82df4f3a11d27bf1f4ee349ef4822dce563"); // 25000 /** * The message start string is designed to be unlikely to occur in normal data. From 33958df05a96f0637e1737dc468e307ef3952142 Mon Sep 17 00:00:00 2001 From: -k Date: Thu, 7 Jun 2018 13:15:56 -0400 Subject: [PATCH 06/10] bump best chain work --- src/chainparams.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/chainparams.cpp b/src/chainparams.cpp index af2c684b4..d05f2694c 100644 --- a/src/chainparams.cpp +++ b/src/chainparams.cpp @@ -118,7 +118,7 @@ class CMainParams : public CChainParams { consensus.vDeployments[Consensus::DEPLOYMENT_DIP0001].nThreshold = 3226; // 80% of 4032 // The best chain should have at least this much work. - consensus.nMinimumChainWork = uint256S("0x00000000000000000000000000000000000000000000000003d42635fb7cfa65"); // 25000 + consensus.nMinimumChainWork = uint256S("0x00000000000000000000000000000000000000000000000009a08bcf55aaf7af"); // 25000 // By default assume that the signatures in ancestors of this block are valid. consensus.defaultAssumeValid = uint256S("0x00000000001bd560d1c5df9ff89fb82df4f3a11d27bf1f4ee349ef4822dce563"); // 25000 From 1d27a738ab5d1f786607741e85fe750ec58de041 Mon Sep 17 00:00:00 2001 From: -k Date: Thu, 7 Jun 2018 13:20:52 -0400 Subject: [PATCH 07/10] cleanup --- src/chainparams.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/chainparams.cpp b/src/chainparams.cpp index d05f2694c..6a83cd4b7 100644 --- a/src/chainparams.cpp +++ b/src/chainparams.cpp @@ -73,10 +73,10 @@ class CMainParams : public CChainParams { public: CMainParams() { strNetworkID = "main"; - consensus.nSubsidyHalvingInterval = 210240; // Note: actual number of blocks per calendar year with DGW v3 is ~200700 (for example 449750 - 249050) - consensus.nMasternodePaymentsStartBlock = 5230; // not true, but it's ok as long as it's less then nMasternodePaymentsIncreaseBlock - consensus.nMasternodePaymentsIncreaseBlock = 100000; // actual historical value - consensus.nMasternodePaymentsIncreasePeriod = 576*30; // 17280 - actual historical value + consensus.nSubsidyHalvingInterval = 210240; // + consensus.nMasternodePaymentsStartBlock = 5230; + consensus.nMasternodePaymentsIncreaseBlock = 100000; + consensus.nMasternodePaymentsIncreasePeriod = 576*30; consensus.nInstantSendKeepLock = 24; consensus.nBudgetPaymentsStartBlock = 1000000; consensus.nBudgetPaymentsCycleBlocks = 16616; // ~(60*24*30)/2.6, actual number of blocks per month is 200700 / 12 = 16725 From a178c104be65d2ffea4094224b9b3365e73cc004 Mon Sep 17 00:00:00 2001 From: -k Date: Thu, 7 Jun 2018 13:55:16 -0400 Subject: [PATCH 08/10] add mid checkpoints --- src/chainparams.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/chainparams.cpp b/src/chainparams.cpp index 6a83cd4b7..8ba717318 100644 --- a/src/chainparams.cpp +++ b/src/chainparams.cpp @@ -76,7 +76,7 @@ class CMainParams : public CChainParams { consensus.nSubsidyHalvingInterval = 210240; // consensus.nMasternodePaymentsStartBlock = 5230; consensus.nMasternodePaymentsIncreaseBlock = 100000; - consensus.nMasternodePaymentsIncreasePeriod = 576*30; + consensus.nMasternodePaymentsIncreasePeriod = 576*30; consensus.nInstantSendKeepLock = 24; consensus.nBudgetPaymentsStartBlock = 1000000; consensus.nBudgetPaymentsCycleBlocks = 16616; // ~(60*24*30)/2.6, actual number of blocks per month is 200700 / 12 = 16725 @@ -191,6 +191,8 @@ class CMainParams : public CChainParams { ( 29425, uint256S("0x0000000000033abb70490884e1bc0eac1d36341f1afe2e66a148b4ff6feec6bf")) ( 32749, uint256S("0x00000000000c74050c24bdef66854a6489021316dd0bce146c9b1aba2755381c")) ( 40282, uint256S("0x000000000018ea87170b4590c45b67624512125e45bd1711f8f89746d8af2904")) + ( 52509, uint256S("0x0000000000030ef66793b68d55e161dd7b8dc94c59a8c9ae42f757e38a1fa479")) + ( 65392, uint256S("0x000000000005668c10dc846ba6859cafe052ffa8b6d8a6888272fd84b45a95f0")) ( 71693, uint256S("0x00000000001bd560d1c5df9ff89fb82df4f3a11d27bf1f4ee349ef4822dce563")), 1528390439, // * UNIX timestamp of last checkpoint block From 918e6535fb43ff05c8cc2eac8205f6787a065137 Mon Sep 17 00:00:00 2001 From: -k Date: Thu, 7 Jun 2018 14:03:40 -0400 Subject: [PATCH 09/10] checkpoint on 71723 --- src/chainparams.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/chainparams.cpp b/src/chainparams.cpp index 8ba717318..26e695282 100644 --- a/src/chainparams.cpp +++ b/src/chainparams.cpp @@ -193,10 +193,10 @@ class CMainParams : public CChainParams { ( 40282, uint256S("0x000000000018ea87170b4590c45b67624512125e45bd1711f8f89746d8af2904")) ( 52509, uint256S("0x0000000000030ef66793b68d55e161dd7b8dc94c59a8c9ae42f757e38a1fa479")) ( 65392, uint256S("0x000000000005668c10dc846ba6859cafe052ffa8b6d8a6888272fd84b45a95f0")) - ( 71693, uint256S("0x00000000001bd560d1c5df9ff89fb82df4f3a11d27bf1f4ee349ef4822dce563")), + ( 71723, uint256S("0x000000000021d50c7f8d564aa446e56c9ca63dacebdca74218c78dad73a1ea53")), 1528390439, // * UNIX timestamp of last checkpoint block - 53952, // * total number of transactions between genesis and last checkpoint + 53984, // * total number of transactions between genesis and last checkpoint // (the tx=... number in the SetBestChain debug.log lines) 500 // * estimated number of transactions per day after checkpoint }; From 3ba31c53194787db87bff9de0946431c6a8aa27b Mon Sep 17 00:00:00 2001 From: -k Date: Thu, 7 Jun 2018 14:05:19 -0400 Subject: [PATCH 10/10] update unix time --- src/chainparams.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/chainparams.cpp b/src/chainparams.cpp index 26e695282..711b0c8b6 100644 --- a/src/chainparams.cpp +++ b/src/chainparams.cpp @@ -195,7 +195,7 @@ class CMainParams : public CChainParams { ( 65392, uint256S("0x000000000005668c10dc846ba6859cafe052ffa8b6d8a6888272fd84b45a95f0")) ( 71723, uint256S("0x000000000021d50c7f8d564aa446e56c9ca63dacebdca74218c78dad73a1ea53")), - 1528390439, // * UNIX timestamp of last checkpoint block + 1528394382, // * UNIX timestamp of last checkpoint block 53984, // * total number of transactions between genesis and last checkpoint // (the tx=... number in the SetBestChain debug.log lines) 500 // * estimated number of transactions per day after checkpoint