Old blocks are ignored when processed

rskj-core/src/main/java/co/rsk/core/RskFactory.java

@@ -119,11 +119,12 @@ public SyncProcessor getSyncProcessor(RskSystemProperties config,
     }
 
     @Bean
-    public BlockSyncService getBlockSyncService(Blockchain blockchain,
+    public BlockSyncService getBlockSyncService(RskSystemProperties config,
+                                                Blockchain blockchain,
                                                 BlockStore store,
                                                 BlockNodeInformation nodeInformation,
                                                 SyncConfiguration syncConfiguration) {
-            return new BlockSyncService(store, blockchain, nodeInformation, syncConfiguration);
+            return new BlockSyncService(config, store, blockchain, nodeInformation, syncConfiguration);
     }
 
     @Bean

rskj-core/src/main/java/co/rsk/net/BlockProcessor.java

@@ -64,4 +64,6 @@ public interface BlockProcessor {
     void processBlockHashRequest(MessageChannel sender, long requestId, long height);
 
     void processSkeletonRequest(MessageChannel sender, long requestId, long startNumber);
+
+    boolean canBeIgnoredForUnclesRewards(long blockNumber);
 }

rskj-core/src/main/java/co/rsk/net/BlockSyncService.java

@@ -18,6 +18,7 @@
 
 package co.rsk.net;
 
+import co.rsk.config.RskSystemProperties;
 import co.rsk.core.bc.BlockUtils;
 import co.rsk.crypto.Keccak256;
 import co.rsk.net.messages.GetBlockMessage;
@@ -52,10 +53,12 @@ public class BlockSyncService {
     private final Blockchain blockchain;
     private final SyncConfiguration syncConfiguration;
     private final BlockNodeInformation nodeInformation; // keep tabs on which nodes know which blocks.
+    private final RskSystemProperties config;
 
     // this is tightly coupled with NodeProcessorService and SyncProcessor,
     // and we should use the same objects everywhere to ensure consistency
     public BlockSyncService(
+            @Nonnull final RskSystemProperties config,
             @Nonnull final BlockStore store,
             @Nonnull final Blockchain blockchain,
             @Nonnull final BlockNodeInformation nodeInformation,
@@ -65,6 +68,7 @@ public BlockSyncService(
         this.syncConfiguration = syncConfiguration;
         this.nodeInformation = nodeInformation;
         this.unknownBlockHashes = new HashMap<>();
+        this.config = config;
     }
 
     public BlockProcessResult processBlock(@Nonnull Block block, MessageChannel sender, boolean ignoreMissingHashes) {
@@ -134,6 +138,11 @@ public boolean hasBetterBlockToSync() {
         return getLastKnownBlockNumber() >= getBestBlockNumber() + blocksDistance;
     }
 
+    public boolean canBeIgnoredForUnclesRewards(long blockNumber) {
+        int blockDistance = config.getBlockchainConfig().getCommonConstants().getUncleGenerationLimit();
+        return blockNumber < getBestBlockNumber() - blockDistance;
+    }
+
     public long getLastKnownBlockNumber() {
         return this.lastKnownBlockNumber;
     }

rskj-core/src/main/java/co/rsk/net/NodeBlockProcessor.java

@@ -293,6 +293,11 @@ public void processSkeletonRequest(@Nonnull final MessageChannel sender, long re
         sender.sendMessage(responseMessage);
     }
 
+    @Override
+    public boolean canBeIgnoredForUnclesRewards(long blockNumber) {
+        return blockSyncService.canBeIgnoredForUnclesRewards(blockNumber);
+    }
+
     /**
      *
      * @param skeletonBlockNumber a block number that belongs to the skeleton

rskj-core/src/main/java/co/rsk/net/NodeMessageHandler.java

@@ -308,20 +308,28 @@ private void processBlockMessage(@Nonnull final MessageChannel sender, @Nonnull
             return;
         }
 
-        boolean wasOrphan = !this.blockProcessor.hasBlockInSomeBlockchain(block.getHash().getBytes());
-        BlockProcessResult result = this.blockProcessor.processBlock(sender, block);
+        if (blockProcessor.canBeIgnoredForUnclesRewards(block.getNumber())){
+            logger.trace("Block ignored: too far from best block {} {}", blockNumber, block.getShortHash());
+            Metrics.processBlockMessage("blockIgnored", block, sender.getPeerNodeID());
+            return;
+        }
 
-        Metrics.processBlockMessage("blockProcessed", block, sender.getPeerNodeID());
+        if (blockProcessor.hasBlockInSomeBlockchain(block.getHash().getBytes())){
+            logger.trace("Block ignored: it's included in blockchain {} {}", blockNumber, block.getShortHash());
+            Metrics.processBlockMessage("blockIgnored", block, sender.getPeerNodeID());
+            return;
+        }
 
+        BlockProcessResult result = this.blockProcessor.processBlock(sender, block);
+        Metrics.processBlockMessage("blockProcessed", block, sender.getPeerNodeID());
+        tryRelayBlock(sender, block, result);
         recordEvent(sender, EventType.VALID_BLOCK);
-        tryRelayBlock(sender, block, wasOrphan, result);
-
         Metrics.processBlockMessage("finish", block, sender.getPeerNodeID());
     }
 
-    private void tryRelayBlock(@Nonnull MessageChannel sender, Block block, boolean wasOrphan, BlockProcessResult result) {
+    private void tryRelayBlock(@Nonnull MessageChannel sender, Block block, BlockProcessResult result) {
         // is new block and it is not orphan, it is in some blockchain
-        if (wasOrphan && result.wasBlockAdded(block) && !this.blockProcessor.hasBetterBlockToSync()) {
+        if (result.wasBlockAdded(block) && !this.blockProcessor.hasBetterBlockToSync()) {
             relayBlock(sender, block);
         }
     }

rskj-core/src/test/java/co/rsk/net/BlockSyncServiceTest.java

@@ -19,6 +19,7 @@
 package co.rsk.net;
 
 import co.rsk.blockchain.utils.BlockGenerator;
+import co.rsk.config.RskSystemProperties;
 import co.rsk.net.sync.SyncConfiguration;
 import co.rsk.test.builders.BlockChainBuilder;
 import org.ethereum.core.Block;
@@ -36,7 +37,8 @@ public void sendBlockMessagesAndAddThemToBlockchain() {
             Blockchain blockchain = BlockChainBuilder.ofSize(10 * i);
             BlockStore store = new BlockStore();
             BlockNodeInformation nodeInformation = new BlockNodeInformation();
-            BlockSyncService blockSyncService = new BlockSyncService(store, blockchain, nodeInformation, SyncConfiguration.IMMEDIATE_FOR_TESTING);
+            RskSystemProperties config = new RskSystemProperties();
+            BlockSyncService blockSyncService = new BlockSyncService(config, store, blockchain, nodeInformation, SyncConfiguration.IMMEDIATE_FOR_TESTING);
             Assert.assertEquals(10 * i, blockchain.getBestBlock().getNumber());
 
             List<Block> extendedChain = new BlockGenerator().getBlockChain(blockchain.getBestBlock(), i);
@@ -54,7 +56,8 @@ public void sendBlockMessagesAndAddThemToBlockchainInReverseOrder() {
             Blockchain blockchain = BlockChainBuilder.ofSize(10 * i);
             BlockStore store = new BlockStore();
             BlockNodeInformation nodeInformation = new BlockNodeInformation();
-            BlockSyncService blockSyncService = new BlockSyncService(store, blockchain, nodeInformation, SyncConfiguration.IMMEDIATE_FOR_TESTING);
+            RskSystemProperties config = new RskSystemProperties();
+            BlockSyncService blockSyncService = new BlockSyncService(config, store, blockchain, nodeInformation, SyncConfiguration.IMMEDIATE_FOR_TESTING);
             Assert.assertEquals(10 * i, blockchain.getBestBlock().getNumber());
 
             Block initialBestBlock = blockchain.getBestBlock();
@@ -82,7 +85,8 @@ public void sendBlockMessageAndAddItToBlockchainWithCommonAncestors() {
         Blockchain blockchain = BlockChainBuilder.ofSize(10);
         BlockStore store = new BlockStore();
         BlockNodeInformation nodeInformation = new BlockNodeInformation();
-        BlockSyncService blockSyncService = new BlockSyncService(store, blockchain, nodeInformation, SyncConfiguration.IMMEDIATE_FOR_TESTING);
+        RskSystemProperties config = new RskSystemProperties();
+        BlockSyncService blockSyncService = new BlockSyncService(config, store, blockchain, nodeInformation, SyncConfiguration.IMMEDIATE_FOR_TESTING);
 
         Block initialBestBlock = blockchain.getBestBlock();
         Assert.assertEquals(10, initialBestBlock.getNumber());