Merge remote-tracking branch 'origin/develop' into ETCM-165-separate-rlp-sbt-project

Author: aakoshh

build.sbt

@@ -12,7 +12,7 @@ val mantisDev = sys.props.get("mantisDev").contains("true") || sys.env.get("MANT
 def commonSettings(projectName: String): Seq[sbt.Def.Setting[_]] = Seq(
   name := projectName,
   organization := "io.iohk",
-  version := "3.1.0",
+  version := "3.2.0",
   scalaVersion := "2.12.12",
   // Scalanet snapshots are published to Sonatype after each build.
   resolvers += "Sonatype OSS Snapshots" at "https://oss.sonatype.org/content/repositories/snapshots",

src/main/resources/application.conf

@@ -328,6 +328,9 @@ mantis {
     # are controlled by a single party, eg. private networks)
     blacklist-duration = 200.seconds
 
+    # Duration for high offense blacklisting of a peer. Blacklisting reason include: header validation failure.
+    critical-blacklist-duration = 240.minutes
+
     # Retry interval when not having enough peers to start fast-sync
     start-retry-interval = 5.seconds
 

src/main/resources/chains/etc-chain.conf

@@ -186,6 +186,10 @@
   "enode://c7ec057ad9450d2d5c4002e49e53e1d90142acd54128c89e794d11401de026b91aa0e84e3f679fb6b47f7940e08b5e7d21d8178c5fa6ba0f36971098cb566ea6@101.133.229.66:30303", //ETC Labs
   "enode://70b74fef51aa4f36330cc52ac04f16d38e1838f531f58bbc88365ca5fd4a3da6e8ec32316c43f79b157d0575faf53064fd925644d0f620b2b201b028c2b410d0@47.115.150.90:30303",  //ETC Labs
   "enode://fa64d1fcb2d4cd1d1606cb940ea2b69fee7dc6c7a85ac4ad05154df1e9ae9616a6a0fa67a59cb15f79346408efa5a4efeba1e5993ddbf4b5cedbda27644a61cf@47.91.30.48:30303",    //ETC Labs
+
+  "enode://a7219ff608bdca40174d005610f80a8d216aa9695e34542d27d69cfd6bf5478fd3b5c83c08ad537a06425cce9cda975571053dcb174d44f109b7362d26798256@52.29.180.62:9076?discport=30303", // bootstrap3.mantis.pw
+  "enode://fbcd6fc04fa7ea897558c3f5edf1cd192e3b2c3b5b9b3d00be179b2e9d04e623e017ed6ce6a1369fff126661afa1c5caa12febce92dcb70ff1352b86e9ebb44f@18.193.251.235:9076?discport=30303", // bootstrap1.mantis.pw
+  "enode://1619217a01fb87745bb104872aa84314a2d42d99c7b915cd187245bfd898d679cbf78b3ea950c32051db860e2c4e3fe7d6329107587be33ab37541ca65046f91@18.198.165.189:9076?discport=30303", // bootstrap2.mantis.pw
   ]
 
   # List of hex encoded public keys of Checkpoint Authorities

src/main/resources/chains/testnet-internal-nomad-chain.conf

@@ -149,7 +149,13 @@
     ]
 
     # List of hex encoded public keys of Checkpoint Authorities
-    checkpoint-public-keys = []
+    checkpoint-public-keys = [
+        "c3df1dc09a6cc56b94dd9044f087634f06a2cf6f671204d5ffefd062e6c34e272a0699af50bd17f03b7d4926d02cfe6a457915dee95d9b85ea3483b3fa14bc38",
+        "4e846daa19e0dd2da56237475a24ceb9807e76e0c1952b880d963b8afd2aba4251b517641f89a5c214677cceda795d1ea7c4d5a044baf0d1852b87fb87ce40ce",
+        "c1e2c120ecf251b7144813786307b62725c13e4c23197aca9199cc81f1a7a042b8f68b552f5f92963b040703fb3ce0c62d860fb5ddfc272b6feba56713123abd",
+        "faa7718b649fa4713897fcd4331b4f3e26261c1d9d35061cecf414b78a090f76e805e773eaf3e22e2f79d7d7268f38df14f40b72de4f16da0a7066959febb1b8",
+        "5355fc1bba22b121c3954b0174c8ebfd52efe95e3d062980a916770aec1316c6116a46af591f47f07074f48564cb31c15c90498f2ff9fadf86639e60f3cb2c0d"
+    ]
 
     # List of hex encoded public keys of miners which can extend chain (only used when using restricted-ethash consensus)
     # empty means that everybody can mine

src/main/scala/io/iohk/ethereum/blockchain/sync/fast/FastSync.scala

@@ -408,8 +408,8 @@ class FastSync(
       blockchain.getChainWeightByHash(header.parentHash).toRight(ParentChainWeightNotFound(header))
     }
 
-    private def handleRewind(header: BlockHeader, peer: Peer, N: Int): Unit = {
-      blacklist(peer.id, blacklistDuration, "block header validation failed")
+    private def handleRewind(header: BlockHeader, peer: Peer, N: Int, duration: FiniteDuration): Unit = {
+      blacklist(peer.id, duration, "block header validation failed")
       if (header.number <= syncState.safeDownloadTarget) {
         discardLastBlocks(header.number, N)
         syncState = syncState.updateDiscardedBlocks(header, N)
@@ -431,14 +431,20 @@ class FastSync(
             // we blacklist peer just in case we got malicious peer which would send us bad blocks, forcing us to rollback
             // to genesis
             log.warning("Parent chain weight not found for block {}, not processing rest of headers", header.idTag)
-            handleRewind(header, peer, syncConfig.fastSyncBlockValidationN)
+            handleRewind(header, peer, syncConfig.fastSyncBlockValidationN, syncConfig.blacklistDuration)
           case HeadersProcessingFinished =>
             processSyncing()
           case ImportedPivotBlock =>
             updatePivotBlock(ImportedLastBlock)
           case ValidationFailed(header, peerToBlackList) =>
-            log.warning(s"validation fo header ${header.idTag} failed")
-            handleRewind(header, peerToBlackList, syncConfig.fastSyncBlockValidationN)
+            log.warning(s"validation of header ${header.idTag} failed")
+            // pow validation failure indicate that either peer is malicious or it is on wrong fork
+            handleRewind(
+              header,
+              peerToBlackList,
+              syncConfig.fastSyncBlockValidationN,
+              syncConfig.criticalBlacklistDuration
+            )
         }
       } else {
         blacklist(peer.id, blacklistDuration, "error in block headers response")

src/main/scala/io/iohk/ethereum/utils/Config.scala

@@ -94,6 +94,7 @@ object Config {
       doFastSync: Boolean,
       peersScanInterval: FiniteDuration,
       blacklistDuration: FiniteDuration,
+      criticalBlacklistDuration: FiniteDuration,
       startRetryInterval: FiniteDuration,
       syncRetryInterval: FiniteDuration,
       peerResponseTimeout: FiniteDuration,
@@ -136,6 +137,7 @@ object Config {
         doFastSync = syncConfig.getBoolean("do-fast-sync"),
         peersScanInterval = syncConfig.getDuration("peers-scan-interval").toMillis.millis,
         blacklistDuration = syncConfig.getDuration("blacklist-duration").toMillis.millis,
+        criticalBlacklistDuration = syncConfig.getDuration("critical-blacklist-duration").toMillis.millis,
         startRetryInterval = syncConfig.getDuration("start-retry-interval").toMillis.millis,
         syncRetryInterval = syncConfig.getDuration("sync-retry-interval").toMillis.millis,
         peerResponseTimeout = syncConfig.getDuration("peer-response-timeout").toMillis.millis,

src/test/scala/io/iohk/ethereum/blockchain/sync/TestSyncConfig.scala

@@ -12,6 +12,7 @@ trait TestSyncConfig extends SyncConfigBuilder {
     pivotBlockOffset = 500,
     branchResolutionRequestSize = 2,
     blacklistDuration = 5.seconds,
+    criticalBlacklistDuration = 10.seconds,
     syncRetryInterval = 1.second,
     checkForNewBlockInterval = 1.milli,
     startRetryInterval = 500.milliseconds,