diff --git a/src/main.cpp b/src/main.cpp index 1395ff6d22..2a4035ad05 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -3890,8 +3890,6 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv, return false; } - int post_newbie_height_disconnect_grace = fTestNet ? 26000 : 2000; - if (pfrom->nVersion < MIN_PEER_PROTO_VERSION) { // disconnect from peers older than this proto version @@ -3901,21 +3899,6 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv, pfrom->fDisconnect = true; return false; } - else if (pfrom->nVersion < PROTOCOL_VERSION - && nBestHeight > GetNewbieSnapshotFixHeight() + post_newbie_height_disconnect_grace) - { - // Immediately disconnect peers running a protocol version lower than - // the latest hard-fork after a grace period for the transition. - // - // TODO: increment MIN_PEER_PROTO_VERSION and remove this condition in - // the release that follows the mandatory version: - // - LogPrint(BCLog::LogFlags::NOISY, "Disconnecting forked peer protocol version %i: %s", - pfrom->nVersion, pfrom->addr.ToString()); - - pfrom->fDisconnect = true; - return false; - } if (!vRecv.empty()) vRecv >> addrFrom >> nNonce; diff --git a/src/version.h b/src/version.h index f9cca8fa02..dc27b8cbb8 100644 --- a/src/version.h +++ b/src/version.h @@ -45,7 +45,7 @@ std::string FormatSubVersion(const std::string& name, int nClientVersion, const // // static const int PROTOCOL_VERSION = 180326; // // disconnect from peers older than this proto version // -static const int MIN_PEER_PROTO_VERSION = 180325; // +static const int MIN_PEER_PROTO_VERSION = 180326; // /////////////////////////////////////////////////////////// // initial proto version, to be increased after // // version/verack negotiation //