Merge pull request #39 from MrSlosh/master

Implement more aggressive node filtering.
NewYorkCoin-NYC · Nov 4, 2018 · 3b9a251 · 3b9a251
2 parents 68edab1 + 82d00b8
commit 3b9a251
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/configure.ac b/configure.ac
@@ -3,7 +3,7 @@ AC_PREREQ([2.60])
 define(_CLIENT_VERSION_MAJOR, 1)
 define(_CLIENT_VERSION_MINOR, 3)
 define(_CLIENT_VERSION_REVISION, 1)
-define(_CLIENT_VERSION_BUILD, 17)
+define(_CLIENT_VERSION_BUILD, 18)
 define(_CLIENT_VERSION_IS_RELEASE, true)
 define(_COPYRIGHT_YEAR, 2018)
 AC_INIT([NewYorkCoin],[_CLIENT_VERSION_MAJOR._CLIENT_VERSION_MINOR._CLIENT_VERSION_REVISION],[https://github.com/NewYorkCoin-NYC/nycoin/issues],[newyorkcoin])

diff --git a/src/main.cpp b/src/main.cpp
@@ -4033,7 +4033,7 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
         }
 
 #ifndef ENABLE_PEERS
-        if(pfrom->cleanSubVer != "/Satoshi:1.0.0.1/" && pfrom->cleanSubVer != "/Satoshi:1.0.1.1/" && strstr(pfrom->cleanSubVer.c_str(), "NewYorkCoin") == NULL)
+        if(strstr(pfrom->cleanSubVer.c_str(), "NewYorkCoin") == NULL)
         {
             LogPrintf("%s using version %i %s from other client; disconnecting\n", pfrom->addr.ToString().c_str(), pfrom->nVersion, pfrom->cleanSubVer.c_str());
             pfrom->fDisconnect = true;

diff --git a/src/version.h b/src/version.h
@@ -18,7 +18,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 = 60003;
+static const int MIN_PEER_PROTO_VERSION = 70005;
 
 //! nTime field added to CAddress, starting with this version;
 //! if possible, avoid requesting addresses nodes older than this