Remove legacy neural messaging fields from CNode

Author: cyrossignol

src/main.cpp

@@ -4482,13 +4482,20 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
         CAddress addrMe;
         CAddress addrFrom;
         uint64_t nNonce = 1;
-        std::string acid = "";
-        vRecv >> pfrom->nVersion >> pfrom->boinchashnonce >> pfrom->boinchashpw >> pfrom->cpid >> pfrom->enccpid >> acid >> pfrom->nServices >> nTime >> addrMe;
+        std::string legacy_dummy;
+
+        vRecv >> pfrom->nVersion
+            >> legacy_dummy      // pfrom->boinchashnonce
+            >> legacy_dummy      // pfrom->boinchashpw
+            >> legacy_dummy      // pfrom->cpid
+            >> legacy_dummy      // pfrom->enccpid
+            >> legacy_dummy      // acid
+            >> pfrom->nServices
+            >> nTime
+            >> addrMe;
 
         if (fDebug10)
-            LogPrintf("received aries version %i boinchashnonce %s boinchashpw %s cpid %s enccpid %s acid %s ..."
-                      ,pfrom->nVersion, pfrom->boinchashnonce, pfrom->boinchashpw
-                      ,pfrom->cpid.c_str(), pfrom->enccpid, acid);
+            LogPrintf("received aries version %i ...", pfrom->nVersion);
 
         int64_t timedrift = std::abs(GetAdjustedTime() - nTime);
 
@@ -4546,7 +4553,7 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
         // 12-5-2015 - Append Trust fields
         pfrom->nTrust = 0;
 
-        if (!vRecv.empty())         vRecv >> pfrom->sGRCAddress;
+        if (!vRecv.empty())         vRecv >> legacy_dummy; // pfrom->sGRCAddress;
 
 
         // Allow newbies to connect easily with 0 blocks

src/net.cpp

@@ -724,8 +724,8 @@ void CNode::PushVersion()
     std::string sboinchashargs;
     std::string nonce;
     std::string pw1;
-    std::string mycpid = "INVESTOR";
-    std::string acid = GetCommandNonce("aries");
+    std::string mycpid;
+    std::string acid;
 
     PushMessage("aries", PROTOCOL_VERSION, nonce, pw1,
                 mycpid, mycpid, acid, nLocalServices, nTime, addrYou, addrMe,
@@ -809,7 +809,6 @@ void CNode::copyStats(CNodeStats &stats)
     stats.strSubVer = strSubVer;
     stats.fInbound = fInbound;
     stats.nStartingHeight = nStartingHeight;
-    stats.sGRCAddress = sGRCAddress;
     stats.nTrust = nTrust;
     stats.nMisbehavior = GetMisbehavior();
 

src/net.h

@@ -149,8 +149,6 @@ class CNodeStats
     double dPingWait;
 	std::string addrLocal;
 	int nTrust;
-	std::string sGRCAddress;
-	//std::string securityversion;
 };
 
 
@@ -226,13 +224,6 @@ class CNode
     CService addrLocal;
     int nVersion;
     std::string strSubVer;
-	std::string boinchashnonce;
-	std::string boinchashpw;
-	//12-10-2014 CPID Support
-	std::string cpid;
-	std::string enccpid;
-	std::string NeuralHash;
-	std::string sGRCAddress;
 	int nTrust;
 	////////////////////////
 
@@ -307,7 +298,6 @@ class CNode
         addrName = addrNameIn == "" ? addr.ToStringIPPort() : addrNameIn;
         nVersion = 0;
         strSubVer = "";
-		//securityversion = "";
         fOneShot = false;
         fClient = false; // set by version message
         fInbound = fInboundIn;
@@ -326,8 +316,6 @@ class CNode
 		nLastOrphan=0;
 		nOrphanCount=0;
 		nOrphanCountViolations=0;
-		NeuralHash = "";
-		sGRCAddress = "";
 		nTrust = 0;
         hashCheckpointKnown.SetNull();
         setInventoryKnown.max_size(SendBufferSize() / 1000);

src/qt/rpcconsole.cpp

@@ -442,9 +442,6 @@ void RPCConsole::clear()
                 "b { color: #006060; } "
                 );
 
-	//Gridcoin:  Find an open neural node for any neural requests from RPC: (7-23-2015)
-
-
     message(CMD_REPLY, (tr("Welcome to the Gridcoin RPC console! ") + "<br>" +
                         tr("Use up and down arrows to navigate history, and <b>Ctrl-L</b> to clear screen.") + "<br>" +
                         tr("Type <b>help</b> for an overview of available commands.")), true);

src/rpcnet.cpp

@@ -309,22 +309,6 @@ UniValue ping(const UniValue& params, bool fHelp)
     return NullUniValue;
 }
 
-// Moved to CNode static.
-/*
-static void CopyNodeStats(std::vector<CNodeStats>& vstats)
-{
-    vstats.clear();
-
-    LOCK(cs_vNodes);
-    vstats.reserve(vNodes.size());
-    for (auto const& pnode : vNodes) {
-        CNodeStats stats;
-        pnode->copyStats(stats);
-        vstats.push_back(stats);
-    }
-}
-*/
-
 UniValue getpeerinfo(const UniValue& params, bool fHelp)
 {
     if (fHelp || params.size() != 0)
@@ -372,11 +356,7 @@ UniValue getpeerinfo(const UniValue& params, bool fHelp)
         bool bNeural = false;
         bNeural = Contains(stats.strSubVer, "1999");
         obj.pushKV("Neural Network", bNeural);
-        if (bNeural)
-        {
-            obj.pushKV("Neural Participant", IsNeuralNodeParticipant(stats.sGRCAddress, GetAdjustedTime()));
 
-        }
         ret.push_back(obj);
     }