From e56117f894b0e8f1ff8c52b89c3bcf72cf521499 Mon Sep 17 00:00:00 2001 From: Simon Date: Fri, 22 Jun 2018 09:07:12 -0700 Subject: [PATCH] Closes #3328. Send alert to put non-Overwinter nodes into safe mode. The alert targets nodes running protocol version <= 170004. Overwinter compatible nodes run protocol version >= 170005. --- src/sendalert.cpp | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/src/sendalert.cpp b/src/sendalert.cpp index 3b7b53734..3f09bdb57 100644 --- a/src/sendalert.cpp +++ b/src/sendalert.cpp @@ -71,14 +71,14 @@ void ThreadSendAlert() // CAlert alert; alert.nRelayUntil = GetTime() + 15 * 60; - alert.nExpiration = GetTime() + 12 * 30 * 24 * 60 * 60; - alert.nID = 1004; // use https://github.com/zcash/zcash/wiki/specification#assigned-numbers to keep track of alert IDs - alert.nCancel = 1001; // cancels previous messages up to this ID number + alert.nExpiration = GetTime() + 10 * 365 * 24 * 60 * 60; + alert.nID = 1005; // use https://github.com/zcash/zcash/wiki/specification#assigned-numbers to keep track of alert IDs + alert.nCancel = 1004; // cancels previous messages up to this ID number // These versions are protocol versions // 170002 : 1.0.0 alert.nMinVer = 170002; - alert.nMaxVer = 170002; + alert.nMaxVer = 170004; // // main.cpp: @@ -88,15 +88,14 @@ void ThreadSendAlert() // 4000 or higher will put the RPC into safe mode alert.nPriority = 4000; alert.strComment = ""; - alert.strStatusBar = "Your client version 1.0.10 has degraded networking behavior. Please update to the most recent version of Zcash (1.0.10-1 or later)."; + alert.strStatusBar = "Your client is out of date and incompatible with the Overwinter network upgrade. Please update to a recent version of Zcash (1.1.0 or later)."; alert.strRPCError = alert.strStatusBar; // Set specific client version/versions here. If setSubVer is empty, no filtering on subver is done: // alert.setSubVer.insert(std::string("/MagicBean:0.7.2/")); - const std::vector useragents = {"MagicBean", "BeanStalk", "AppleSeed", "EleosZcash"}; + const std::vector useragents = {}; //{"MagicBean", "BeanStalk", "AppleSeed", "EleosZcash"}; BOOST_FOREACH(const std::string& useragent, useragents) { - alert.setSubVer.insert(std::string("/"+useragent+":1.0.10/")); } // Sanity check