From 8d7234bf220b2bb521a4e0445ead6ceab8064b0b Mon Sep 17 00:00:00 2001
From: blackjok3r <blackjok3r@gmail.com>
Date: Mon, 11 Feb 2019 01:10:27 +0800
Subject: [PATCH] Test fix to stop nodes forceing an attacking chain onto
 others.

---
 src/main.cpp | 36 +++++++++++++++++++-----------------
 src/net.h    |  3 +++
 2 files changed, 22 insertions(+), 17 deletions(-)

diff --git a/src/main.cpp b/src/main.cpp
index 30b569c3e..054313a21 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -282,9 +282,6 @@ namespace {
         bool fCurrentlyConnected;
         //! Accumulated misbehaviour score for this peer.
         int nMisbehavior;
-        // count blocks seen.
-        //int8_t nBlocksinARow;
-        //int8_t nBlocksinARow2;
         //! Whether this peer should be disconnected and banned (unless whitelisted).
         bool fShouldBan;
         //! String name of this peer (debugging/logging purposes).
@@ -5472,20 +5469,6 @@ bool ProcessNewBlock(bool from_miner,int32_t height,CValidationState &state, CNo
     bool checked; uint256 hash; int32_t futureblock=0;
     auto verifier = libzcash::ProofVerifier::Disabled();
     hash = pblock->GetHash();
-    /*pfrom->nBlocksinARow += 1;
-    if ( pfrom->nBlocksinARow >= 6 )
-    {
-        pfrom->nBlocksinARow2 += 1;
-        if ( pfrom->nBlocksinARow2 > 3 )
-        {
-            pfrom->nBlocksinARow = 0;
-            pfrom->nBlocksinARow2 = 0;
-        }
-        else 
-        {
-            return(false);
-        }
-    }*/
     //fprintf(stderr,"ProcessBlock %d\n",(int32_t)chainActive.LastTip()->GetHeight());
     {
         LOCK(cs_main);
@@ -5493,6 +5476,25 @@ bool ProcessNewBlock(bool from_miner,int32_t height,CValidationState &state, CNo
             komodo_currentheight_set(chainActive.LastTip()->GetHeight());
         checked = CheckBlock(&futureblock,height!=0?height:komodo_block2height(pblock),0,*pblock, state, verifier,0);
         bool fRequested = MarkBlockAsReceived(hash);
+        if ( pfrom && !fRequested && vNodes.size() > 1 )
+        {
+            pfrom->nBlocksinARow += 1;
+            if ( pfrom->nBlocksinARow >= 10 )
+            {
+                pfrom->nBlocksinARow2 += 1;
+                if ( pfrom->nBlocksinARow2 > 5 )
+                {
+                    pfrom->nBlocksinARow = 0;
+                    pfrom->nBlocksinARow2 = 0;
+                    //fprintf(stderr, "reset node.%i\n",(int32_t)pfrom->GetId());
+                }
+                else 
+                {
+                    //fprintf(stderr, "Requesting new peer node.%i blocksinrow.%i blocsinrow2.%i\n",(int32_t)pfrom->GetId(),pfrom->nBlocksinARow,pfrom->nBlocksinARow2);
+                    return(false);
+                }
+            }
+        }
         fRequested |= fForceProcessing;
         if ( checked != 0 && komodo_checkPOW(0,pblock,height) < 0 ) //from_miner && ASSETCHAINS_STAKED == 0
         {
diff --git a/src/net.h b/src/net.h
index 3e06e9831..b7975bfec 100644
--- a/src/net.h
+++ b/src/net.h
@@ -293,6 +293,9 @@ public:
     bool fNetworkNode;
     bool fSuccessfullyConnected;
     bool fDisconnect;
+    // count blocks seen.
+    int8_t nBlocksinARow;
+    int8_t nBlocksinARow2;
     // We use fRelayTxes for two purposes -
     // a) it allows us to not relay tx invs before receiving the peer's version message
     // b) the peer may tell us in its version message that we should not relay tx invs