From 993ad0ca9c961d6b551dbf29e475aa7156887bae Mon Sep 17 00:00:00 2001 From: tecnovert Date: Thu, 9 Nov 2017 11:26:24 +0200 Subject: [PATCH] Raised MIN_PEER_PROTO_VERSION. --- src/policy/policy.cpp | 1 - src/smsg/smessage.cpp | 2 +- src/version.h | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/policy/policy.cpp b/src/policy/policy.cpp index ac5ab117dfe7b..9827699153df8 100644 --- a/src/policy/policy.cpp +++ b/src/policy/policy.cpp @@ -136,7 +136,6 @@ bool IsStandard(const CScript& scriptPubKey, txnouttype& whichType, const bool w if (!Solver(scriptPubKey, whichType, vSolutions)) return false; - if (whichType == TX_MULTISIG) { unsigned char m = vSolutions.front()[0]; diff --git a/src/smsg/smessage.cpp b/src/smsg/smessage.cpp index 449f71e688c8a..da96b092b5df3 100644 --- a/src/smsg/smessage.cpp +++ b/src/smsg/smessage.cpp @@ -431,7 +431,7 @@ std::string SecureMsgGetHelpString(bool showDebug) strUsage += HelpMessageOpt("-smsgscanchain", _("Scan the block chain for public key addresses on startup. (default: false)")); strUsage += HelpMessageOpt("-smsgscanincoming", _("Scan incoming blocks for public key addresses. (default: false)")); strUsage += HelpMessageOpt("-smsgnotify=", _("Execute command when a message is received. (%s in cmd is replaced by receiving address)")); - strUsage += HelpMessageOpt("-smsgsaddnewkeys", _("Scan for incoming transactions on new wallet keys. (default: false)")); + strUsage += HelpMessageOpt("-smsgsaddnewkeys", _("Scan for incoming messages on new wallet keys. (default: false)")); return strUsage; }; diff --git a/src/version.h b/src/version.h index f48dcfe0e408a..41b64e3146be8 100644 --- a/src/version.h +++ b/src/version.h @@ -19,7 +19,7 @@ static const int INIT_PROTO_VERSION = 209; static const int GETHEADERS_VERSION = 31800; //! disconnect from peers older than this proto version -static const int MIN_PEER_PROTO_VERSION = MIN_PARTICL_VERSION; +static const int MIN_PEER_PROTO_VERSION = 90005; //! nTime field added to CAddress, starting with this version; //! if possible, avoid requesting addresses nodes older than this