DragonX/dragonx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

update some deprecation stuff

Browse Source
This commit is contained in:
Duke Leto
2019-12-22 02:57:51 -05:00
parent 02fefe0734
commit 750220a373
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/deprecation.cpp
View File

@@ -1,5 +1,5 @@
// Copyright (c) 2017 The Zcash developers // Copyright (c) 2017 The Zcash developers
// Copyright (c) 2018-2019 The Hush developers // Copyright (c) 2019 The Hush developers
// Distributed under the MIT software license, see the accompanying // Distributed under the MIT software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php. // file COPYING or http://www.opensource.org/licenses/mit-license.php.
@@ -49,7 +49,7 @@ void EnforceNodeDeprecation(int nHeight, bool forceLogging, bool fThread) {
if (blocksToDeprecation == 0 || forceLogging) { if (blocksToDeprecation == 0 || forceLogging) {
msg = strprintf(_("This version has been deprecated as of block height %d."), msg = strprintf(_("This version has been deprecated as of block height %d."),
DEPRECATION_HEIGHT) + " " + DEPRECATION_HEIGHT) + " " +
_("You should upgrade to the latest version of Hush! See Discord for more info: https://myhush.org/discord"); _("You should upgrade to the latest version of Hush.");
LogPrintf("*** %s\n", msg); LogPrintf("*** %s\n", msg);
CAlert::Notify(msg, fThread); CAlert::Notify(msg, fThread);
uiInterface.ThreadSafeMessageBox(msg, "", CClientUIInterface::MSG_ERROR); uiInterface.ThreadSafeMessageBox(msg, "", CClientUIInterface::MSG_ERROR);
@@ -58,7 +58,7 @@ void EnforceNodeDeprecation(int nHeight, bool forceLogging, bool fThread) {
} else if (blocksToDeprecation == DEPRECATION_WARN_LIMIT || (blocksToDeprecation < DEPRECATION_WARN_LIMIT && forceLogging)) { } else if (blocksToDeprecation == DEPRECATION_WARN_LIMIT || (blocksToDeprecation < DEPRECATION_WARN_LIMIT && forceLogging)) {
msg = strprintf(_("This version will be deprecated at block height %d, and will automatically shut down."), msg = strprintf(_("This version will be deprecated at block height %d, and will automatically shut down."),
DEPRECATION_HEIGHT) + " " + DEPRECATION_HEIGHT) + " " +
_("You should upgrade to the latest version of Hush! See Discord for more info: https://myhush.org/discord"); _("You should upgrade to the latest version of Hush.");
LogPrintf("*** %s\n", msg); LogPrintf("*** %s\n", msg);
CAlert::Notify(msg, fThread); CAlert::Notify(msg, fThread);
uiInterface.ThreadSafeMessageBox(msg, "", CClientUIInterface::MSG_WARNING); uiInterface.ThreadSafeMessageBox(msg, "", CClientUIInterface::MSG_WARNING);

5
src/deprecation.h
View File

@@ -1,4 +1,5 @@
// Copyright (c) 2017 The Zcash developers // Copyright (c) 2017 The Zcash developers
// Copyright (c) 2019 The Hush developers
// Distributed under the MIT software license, see the accompanying // Distributed under the MIT software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php. // file COPYING or http://www.opensource.org/licenses/mit-license.php.
@@ -24,8 +25,8 @@
// * Shut down WEEKS_UNTIL_DEPRECATION weeks' worth of blocks after the estimated release block height. // * Shut down WEEKS_UNTIL_DEPRECATION weeks' worth of blocks after the estimated release block height.
// * A warning is shown during the DEPRECATION_WARN_LIMIT worth of blocks prior to shut down. // * A warning is shown during the DEPRECATION_WARN_LIMIT worth of blocks prior to shut down.
static const int WEEKS_UNTIL_DEPRECATION = 52; static const int WEEKS_UNTIL_DEPRECATION = 52;
static const int DEPRECATION_HEIGHT = 2200000; static const int DEPRECATION_HEIGHT = 5555555;
static const int APPROX_RELEASE_HEIGHT = DEPRECATION_HEIGHT - (WEEKS_UNTIL_DEPRECATION * 7 * 24 * 60); static const int APPROX_RELEASE_HEIGHT = DEPRECATION_HEIGHT - (WEEKS_UNTIL_DEPRECATION * 7 * 24 * 60);
// Number of blocks before deprecation to warn users // Number of blocks before deprecation to warn users
static const int DEPRECATION_WARN_LIMIT = 60 * 24 * 60; // 2 months static const int DEPRECATION_WARN_LIMIT = 60 * 24 * 60; // 2 months