Skip to content

net: Clean up mandatory protocol version transition #2080

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jamescowens merged 1 commit into from
Mar 28, 2021
Merged

net: Clean up mandatory protocol version transition #2080

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 0 additions & 17 deletions src/main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion src/version.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 //
Expand Down