Merge pull request #189 from TheLindaProjectInc/net-peer-upgrade-fix

Fix network version check bug
TheLindaProjectInc · Sep 8, 2022 · 5b47203 · 5b47203
2 parents 846277d + ee6d3c3
commit 5b47203
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/configure.ac b/configure.ac
@@ -3,7 +3,7 @@ AC_PREREQ([2.60])
 define(_CLIENT_VERSION_MAJOR, 4)
 define(_CLIENT_VERSION_MINOR, 0)
 define(_CLIENT_VERSION_REVISION, 9)
-define(_CLIENT_VERSION_BUILD, 0)
+define(_CLIENT_VERSION_BUILD, 1)
 define(_CLIENT_VERSION_RC, 0)
 define(_CLIENT_VERSION_IS_RELEASE, true)
 define(_COPYRIGHT_YEAR, 2022)

diff --git a/src/net_processing.cpp b/src/net_processing.cpp
@@ -2141,13 +2141,13 @@ bool static ProcessMessage(CNode* pfrom, const std::string& strCommand, CDataStr
  }
  }
 
- if(::ChainActive().Tip()->nHeight >= chainparams.GetConsensus().MIP2Height){
- if (nVersion < MIN_PEER_PROTO_VERSION_AFTER_MIP2 + 15000) {
+ if(::ChainActive().Tip()->nHeight >= chainparams.GetConsensus().MIP2Height + 15000){
+ if (nVersion < MIN_PEER_PROTO_VERSION_AFTER_MIP2) {
  // disconnect from peers older than this proto version
  LogPrint(BCLog::NET, "peer=%d using obsolete version after MIP2 fork %i; disconnecting\n", pfrom->GetId(), nVersion);
  if (enable_bip61) {
  connman->PushMessage(pfrom, CNetMsgMaker(INIT_PROTO_VERSION).Make(NetMsgType::REJECT, strCommand, REJECT_OBSOLETE,
- strprintf("Version must be %d or greater after MIP2 fork", MIN_PEER_PROTO_VERSION_AFTER_MIP1)));
+ strprintf("Version must be %d or greater after MIP2 fork", MIN_PEER_PROTO_VERSION_AFTER_MIP2)));
  }
  pfrom->fDisconnect = true;
  return false;