Merge remote-tracking branch 'origin/develop' into etcm-213/relad-bloom-after-restart

Author: KonradStaniec

src/it/scala/io/iohk/ethereum/sync/util/CommonFakePeer.scala

@@ -18,7 +18,7 @@ import io.iohk.ethereum.ledger.InMemoryWorldStateProxy
 import io.iohk.ethereum.mpt.MerklePatriciaTrie
 import io.iohk.ethereum.network.EtcPeerManagerActor.PeerInfo
 import io.iohk.ethereum.network.PeerManagerActor.{FastSyncHostConfiguration, PeerConfiguration}
-import io.iohk.ethereum.network.discovery.Node
+import io.iohk.ethereum.network.discovery.{DiscoveryConfig, Node}
 import io.iohk.ethereum.network.discovery.PeerDiscoveryManager.{DiscoveredNodesInfo, DiscoveryNodeInfo}
 import io.iohk.ethereum.network.handshaker.{EtcHandshaker, EtcHandshakerConfiguration, Handshaker}
 import io.iohk.ethereum.network.p2p.EthereumMessageDecoder
@@ -94,6 +94,7 @@ abstract class CommonFakePeer(peerName: String, fakePeerCustomConfig: FakePeerCu
       RocksDbDataSource(getRockDbTestConfig(tempDir.toAbsolutePath.toString), Namespaces.nsSeq)
   }
   lazy val blockchainConfig = Config.blockchains.blockchainConfig
+  lazy val discoveryConfig = DiscoveryConfig(Config.config, blockchainConfig.bootstrapNodes)
 
   /**
     * Default persist interval is 20s, which is too long for tests. As in all tests we treat peer as connected when
@@ -171,7 +172,8 @@ abstract class CommonFakePeer(peerName: String, fakePeerCustomConfig: FakePeerCu
       knownNodesManager,
       handshaker,
       authHandshaker,
-      EthereumMessageDecoder
+      EthereumMessageDecoder,
+      discoveryConfig
     ),
     "peer-manager"
   )

src/it/scala/io/iohk/ethereum/txExecTest/util/DumpChainApp.scala

@@ -27,6 +27,7 @@ import org.bouncycastle.util.encoders.Hex
 
 import scala.concurrent.duration._
 import io.iohk.ethereum.domain.BlockHeader.HeaderExtraFields.HefEmpty
+import io.iohk.ethereum.network.discovery.DiscoveryConfig
 import monix.reactive.Observable
 
 object DumpChainApp extends App with NodeKeyBuilder with SecureRandomBuilder with AuthHandshakerBuilder {
@@ -38,6 +39,7 @@ object DumpChainApp extends App with NodeKeyBuilder with SecureRandomBuilder wit
   val maxBlocks = conf.getInt("maxBlocks")
 
   val blockchainConfig = Config.blockchains.blockchainConfig
+  val discoveryConfig = DiscoveryConfig(Config.config, blockchainConfig.bootstrapNodes)
 
   val peerConfig = new PeerConfiguration {
     override val rlpxConfiguration: RLPxConfiguration = Config.Network.peer.rlpxConfiguration
@@ -95,7 +97,8 @@ object DumpChainApp extends App with NodeKeyBuilder with SecureRandomBuilder wit
       knownNodesManager = actorSystem.deadLetters, // TODO: fixme
       handshaker = handshaker,
       authHandshaker = authHandshaker,
-      messageDecoder = EthereumMessageDecoder
+      messageDecoder = EthereumMessageDecoder,
+      discoveryConfig
     ),
     "peer-manager"
   )

src/main/resources/application.conf

@@ -60,7 +60,7 @@ mantis {
       port = 30303
 
       # Maximum discovered nodes stored (TODO: remove me once full protocol is in place)
-      nodes-limit = 1000
+      nodes-limit = 5000
 
       # Initial delay for discovery scan
       scan-initial-delay = 20.seconds

src/main/scala/io/iohk/ethereum/blockchain/sync/BlacklistSupport.scala

@@ -12,17 +12,17 @@ trait BlacklistSupport {
 
   def scheduler: Scheduler
 
-  private val maxSize = 1000
+  protected val maxBlacklistedNodes = 1000
 
   val blacklistedPeers = mutable.LinkedHashMap.empty[BlackListId, Cancellable]
 
   def blacklist(blacklistId: BlackListId, duration: FiniteDuration, reason: String): Unit = {
     if (duration > Duration.Zero) {
-      if (blacklistedPeers.size >= maxSize) {
+      if (blacklistedPeers.size >= maxBlacklistedNodes) {
         removeOldestPeer()
       }
       undoBlacklist(blacklistId)
-      log.warning(s"Blacklisting peer ($blacklistId), $reason")
+      log.debug(s"Blacklisting peer ($blacklistId), $reason")
       val unblacklistCancellable = scheduler.scheduleOnce(duration, self, UnblacklistPeer(blacklistId))
       blacklistedPeers.put(blacklistId, unblacklistCancellable)
     } else {

src/main/scala/io/iohk/ethereum/network/PeerManagerActor.scala

@@ -11,7 +11,7 @@ import io.iohk.ethereum.network.PeerActor.PeerClosedConnection
 import io.iohk.ethereum.network.PeerActor.Status.Handshaked
 import io.iohk.ethereum.network.PeerEventBusActor._
 import io.iohk.ethereum.network.PeerManagerActor.PeerConfiguration
-import io.iohk.ethereum.network.discovery.PeerDiscoveryManager
+import io.iohk.ethereum.network.discovery.{DiscoveryConfig, PeerDiscoveryManager}
 import io.iohk.ethereum.network.handshaker.Handshaker
 import io.iohk.ethereum.network.handshaker.Handshaker.HandshakeResult
 import io.iohk.ethereum.network.p2p.messages.WireProtocol.Disconnect
@@ -30,12 +30,20 @@ class PeerManagerActor(
     peerConfiguration: PeerConfiguration,
     knownNodesManager: ActorRef,
     peerFactory: (ActorContext, InetSocketAddress, Boolean) => ActorRef,
+    discoveryConfig: DiscoveryConfig,
     externalSchedulerOpt: Option[Scheduler] = None
 ) extends Actor
     with ActorLogging
     with Stash
     with BlacklistSupport {
 
+  /**
+    * Maximum number of blacklisted nodes will never be larger than number of peers provided by discovery
+    * Discovery provides remote nodes from all networks (ETC,ETH, Mordor etc.) only during handshake we learn that some
+    * of the remote nodes are not compatible that's why we mark them as useless (blacklist them)
+    */
+  override val maxBlacklistedNodes: Int = discoveryConfig.nodesLimit
+
   import PeerManagerActor._
   import akka.pattern.{ask, pipe}
 
@@ -103,7 +111,7 @@ class PeerManagerActor(
       NetworkMetrics.BlacklistedPeersSize.set(blacklistedPeers.size)
       NetworkMetrics.PendingPeersSize.set(pendingPeers.size)
 
-      log.debug(
+      log.info(
         s"Discovered ${nodesInfo.size} nodes, " +
           s"Blacklisted ${blacklistedPeers.size} nodes, " +
           s"connected to ${peers.size}/${peerConfiguration.maxOutgoingPeers + peerConfiguration.maxIncomingPeers}. " +
@@ -297,7 +305,8 @@ object PeerManagerActor {
       knownNodesManager: ActorRef,
       handshaker: Handshaker[R],
       authHandshaker: AuthHandshaker,
-      messageDecoder: MessageDecoder
+      messageDecoder: MessageDecoder,
+      discoveryConfig: DiscoveryConfig
   ): Props = {
     val factory: (ActorContext, InetSocketAddress, Boolean) => ActorRef =
       peerFactory(peerConfiguration, peerMessageBus, knownNodesManager, handshaker, authHandshaker, messageDecoder)
@@ -308,7 +317,8 @@ object PeerManagerActor {
         peerDiscoveryManager,
         peerConfiguration,
         knownNodesManager,
-        peerFactory = factory
+        peerFactory = factory,
+        discoveryConfig
       )
     )
   }

src/main/scala/io/iohk/ethereum/nodebuilder/NodeBuilder.scala

@@ -189,6 +189,7 @@ trait PeerManagerActorBuilder {
     with PeerEventBusBuilder
     with AuthHandshakerBuilder
     with PeerDiscoveryManagerBuilder
+    with DiscoveryConfigBuilder
     with StorageBuilder
     with KnownNodesManagerBuilder =>
 
@@ -202,7 +203,8 @@ trait PeerManagerActorBuilder {
       knownNodesManager,
       handshaker,
       authHandshaker,
-      EthereumMessageDecoder
+      EthereumMessageDecoder,
+      discoveryConfig
     ),
     "peer-manager"
   )

src/test/scala/io/iohk/ethereum/network/PeerManagerSpec.scala

@@ -176,6 +176,8 @@ class PeerManagerSpec extends AnyFlatSpec with Matchers with Eventually with Nor
     var createdPeers: Seq[TestProbe] = Seq.empty
 
     val peerConfiguration: PeerConfiguration = Config.Network.peer
+    val discoveryConfig = DiscoveryConfig(Config.config, Config.blockchains.blockchainConfig.bootstrapNodes)
+
     val peerDiscoveryManager = TestProbe()
     val peerEventBus = TestProbe()
     val knownNodesManager = TestProbe()
@@ -222,6 +224,7 @@ class PeerManagerSpec extends AnyFlatSpec with Matchers with Eventually with Nor
           peerConfiguration,
           knownNodesManager.ref,
           peerFactory,
+          discoveryConfig,
           Some(time.scheduler)
         )
       )