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/chainparams.cpp b/src/chainparams.cpp index 492736daf..711b0c8b6 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 @@ -118,10 +118,10 @@ 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("0x000000000007ca4edd8c5baf04994cf8dea37f94f98239e50f6e71ec4dc45c60"); // 25000 + consensus.defaultAssumeValid = uint256S("0x00000000001bd560d1c5df9ff89fb82df4f3a11d27bf1f4ee349ef4822dce563"); // 25000 /** * The message start string is designed to be unlikely to occur in normal data. @@ -190,10 +190,13 @@ class CMainParams : public CChainParams { ( 27119, uint256S("0x00000000000f139246bbe4022bec06387527d55972fd1a2619aaee5ed43b36c0")) ( 29425, uint256S("0x0000000000033abb70490884e1bc0eac1d36341f1afe2e66a148b4ff6feec6bf")) ( 32749, uint256S("0x00000000000c74050c24bdef66854a6489021316dd0bce146c9b1aba2755381c")) - ( 40282, uint256S("0x000000000018ea87170b4590c45b67624512125e45bd1711f8f89746d8af2904")), + ( 40282, uint256S("0x000000000018ea87170b4590c45b67624512125e45bd1711f8f89746d8af2904")) + ( 52509, uint256S("0x0000000000030ef66793b68d55e161dd7b8dc94c59a8c9ae42f757e38a1fa479")) + ( 65392, uint256S("0x000000000005668c10dc846ba6859cafe052ffa8b6d8a6888272fd84b45a95f0")) + ( 71723, uint256S("0x000000000021d50c7f8d564aa446e56c9ca63dacebdca74218c78dad73a1ea53")), - 1523419384, // * UNIX timestamp of last checkpoint block - 27036, // * total number of transactions between genesis and last checkpoint + 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 }; 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 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)