From af9b536dd97a095b7c3c98cedbaf14af4ecc0f7a Mon Sep 17 00:00:00 2001 From: CalDescent Date: Sun, 9 May 2021 23:00:51 +0100 Subject: [PATCH] Moved version check above getMinBlockchainPeers() check, so that nodes with old versions aren't counted. --- src/main/java/org/qortal/controller/Controller.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/main/java/org/qortal/controller/Controller.java b/src/main/java/org/qortal/controller/Controller.java index c1386f53..9123a130 100644 --- a/src/main/java/org/qortal/controller/Controller.java +++ b/src/main/java/org/qortal/controller/Controller.java @@ -644,11 +644,15 @@ public class Controller extends Thread { // Disregard peers that don't have a recent block peers.removeIf(hasNoRecentBlock); + // Disregard peers that are on an old version + peers.removeIf(hasOldVersion); + checkRecoveryModeForPeers(peers); if (recoveryMode) { peers = Network.getInstance().getHandshakedPeers(); peers.removeIf(hasOnlyGenesisBlock); peers.removeIf(hasMisbehaved); + peers.removeIf(hasOldVersion); } // Check we have enough peers to potentially synchronize @@ -661,9 +665,6 @@ public class Controller extends Thread { // Disregard peers that are on the same block as last sync attempt and we didn't like their chain peers.removeIf(hasInferiorChainTip); - // Disregard peers that are on an old version - peers.removeIf(hasOldVersion); - final int peersBeforeComparison = peers.size(); // Request recent block summaries from the remaining peers, and locate our common block with each