Guard longest chain and GetNodeStateStats

src/main.cpp

@@ -532,11 +532,20 @@ namespace {
 
 } // anon namespace
 
-bool GetNodeStateStats(NodeId nodeid, CNodeStateStats &stats) {
+bool GetNodeStateStats(NodeId nodeid, CNodeStateStats &stats)
+{
+    static int32_t depth;
+    if ( depth < 0 )
+        depth = 0;
+    if ( depth == 0 )
+    {
         LOCK(cs_main);
         CNodeState *state = State(nodeid);
         if (state == NULL)
+        {
+            depth--;
             return false;
+        }
         stats.nMisbehavior = state->nMisbehavior;
         stats.nSyncHeight = state->pindexBestKnownBlock ? state->pindexBestKnownBlock->nHeight : -1;
         stats.nCommonHeight = state->pindexLastCommonBlock ? state->pindexLastCommonBlock->nHeight : -1;
@@ -544,6 +553,8 @@ bool GetNodeStateStats(NodeId nodeid, CNodeStateStats &stats) {
             if (queue.pindex)
                 stats.vHeightInFlight.push_back(queue.pindex->nHeight);
         }
+        depth--;
+    }
     return true;
 }
 

src/rpcnet.cpp

@@ -168,7 +168,13 @@ UniValue getpeerinfo(const UniValue& params, bool fHelp)
 int32_t KOMODO_LONGESTCHAIN;
 int32_t komodo_longestchain()
 {
+    static int32_t depth;
     int32_t ht,n=0,num=0,maxheight=0,height = 0;
+    if ( depth < 0 )
+        depth = 0;
+    if ( depth == 0 )
+    {
+        depth++;
         vector<CNodeStats> vstats;
         {
             //LOCK(cs_main);
@@ -195,6 +201,7 @@ int32_t komodo_longestchain()
             if ( ht > height )
                 height = ht;
         }
+        depth--;
         if ( num > (n >> 1) )
         {
             extern char ASSETCHAINS_SYMBOL[];
@@ -204,7 +211,8 @@ int32_t komodo_longestchain()
             return(height);
         }
         KOMODO_LONGESTCHAIN = 0;
-    return(0);
+    }
+    return(KOMODO_LONGESTCHAIN);
 }
 
 UniValue addnode(const UniValue& params, bool fHelp)