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.2.0",
+  version := "3.2.1",
   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/chains/testnet-internal-nomad-chain.conf

@@ -141,11 +141,11 @@
 
     # Set of initial nodes
     bootstrap-nodes = [
-        "enode://ff86741b7b35087b2b53f44a612b233336490d5fae10b1434619b7714fe2d5346c71427a5e126cd27b9422a4d4376c1534ef66e88c5e62d6441d2541f63de0cf@mantis-4.mantis.ws:9004",
-        "enode://f92aa66337ab1993cc7269d4295d296aefe6199b34e900eac08c514c947ec7340d46a5648ffc2da10325dbaba16bdf92aa9c0b5e51d97a7818c3f495d478ddad@mantis-1.mantis.ws:9001",
-        "enode://442e2bd50eece65f90dee0d5c6075da4e1b4bc62e36b261a52e7f393dae6a68241e4dbad868c7ecc14fed277ed72e99a289a811b6172f35fb18bdca0b7a5602c@mantis-3.mantis.ws:9003",
-        "enode://af97643f364b805d5b0e32b5356578a16afcc4fb9d1b6622998e9441eeb7795e8daf8e6b0ff3330da9879034112be56954f9269164513ece0f7394b805be3633@mantis-5.mantis.ws:9005",
-        "enode://d8a010f019db37dcaf2e1fb98d4fcbf1f57dbd7e2a7f065e92fbe77dca8b9120d6e79f1617e98fa6134e6af8858ac8f3735b1e70a5708eb14f228080356eb0a7@mantis-2.mantis.ws:9002"
+        "enode://ff86741b7b35087b2b53f44a612b233336490d5fae10b1434619b7714fe2d5346c71427a5e126cd27b9422a4d4376c1534ef66e88c5e62d6441d2541f63de0cf@mantis-4.mantis.ws:9004?discport=9504",
+        "enode://f92aa66337ab1993cc7269d4295d296aefe6199b34e900eac08c514c947ec7340d46a5648ffc2da10325dbaba16bdf92aa9c0b5e51d97a7818c3f495d478ddad@mantis-1.mantis.ws:9001?discport=9501",
+        "enode://442e2bd50eece65f90dee0d5c6075da4e1b4bc62e36b261a52e7f393dae6a68241e4dbad868c7ecc14fed277ed72e99a289a811b6172f35fb18bdca0b7a5602c@mantis-3.mantis.ws:9003?discport=9503",
+        "enode://af97643f364b805d5b0e32b5356578a16afcc4fb9d1b6622998e9441eeb7795e8daf8e6b0ff3330da9879034112be56954f9269164513ece0f7394b805be3633@mantis-5.mantis.ws:9005?discport=9505",
+        "enode://d8a010f019db37dcaf2e1fb98d4fcbf1f57dbd7e2a7f065e92fbe77dca8b9120d6e79f1617e98fa6134e6af8858ac8f3735b1e70a5708eb14f228080356eb0a7@mantis-2.mantis.ws:9002?discport=9502"
     ]
 
     # List of hex encoded public keys of Checkpoint Authorities

src/main/scala/io/iohk/ethereum/domain/Address.scala

@@ -31,7 +31,7 @@ object Address {
 
   def apply(hexString: String): Address = {
     val bytes = Hex.decode(hexString.replaceFirst("^0x", ""))
-    require(bytes.length <= Length, s"Invalid address: $hexString")
+    require(bytes.nonEmpty && bytes.length <= Length, s"Invalid address: $hexString")
     Address(bytes)
   }
 

src/main/scala/io/iohk/ethereum/jsonrpc/JsonMethodsImplicits.scala

@@ -94,15 +94,14 @@ trait JsonMethodsImplicits {
 
     for {
       from <- input.get("from") match {
-        case Some(JString(s)) => extractAddress(s)
+        case Some(JString(s)) if s.nonEmpty => extractAddress(s)
         case Some(_) => Left(InvalidAddress)
         case _ => Left(InvalidParams("TX 'from' is required"))
       }
 
       to <- input.get("to") match {
-        case Some(JString(s)) =>
-          extractAddress(s).map(Some(_))
-
+        case Some(JString(s)) if s.nonEmpty => extractAddress(s).map(Option.apply)
+        case Some(JString(_)) => extractAddress("0x0").map(Option.apply)
         case Some(_) => Left(InvalidAddress)
         case None => Right(None)
       }

src/main/scala/io/iohk/ethereum/jsonrpc/server/http/JsonRpcHttpServer.scala

@@ -103,7 +103,7 @@ trait JsonRpcHttpServer extends Json4sSupport with RateLimit with Logger {
             entity = HttpEntity(ContentTypes.`application/json`, serialization.writePretty(response))
           )
       }
-    complete(httpResponseF)
+    complete(httpResponseF.runToFuture)
   }
 
   private def handleRequest(request: JsonRpcRequest) = {

src/test/scala/io/iohk/ethereum/blockchain/sync/regular/BlockFetcherSpec.scala

@@ -6,7 +6,7 @@ import akka.actor.ActorSystem
 import akka.testkit.{TestKit, TestProbe}
 import com.miguno.akka.testing.VirtualTime
 import io.iohk.ethereum.Mocks.{MockValidatorsAlwaysSucceed, MockValidatorsFailingOnBlockBodies}
-import io.iohk.ethereum.{BlockHelpers, Timeouts}
+import io.iohk.ethereum.{BlockHelpers, Timeouts, WithActorSystemShutDown}
 import io.iohk.ethereum.Fixtures.{Blocks => FixtureBlocks}
 import io.iohk.ethereum.blockchain.sync.PeersClient.BlacklistPeer
 import io.iohk.ethereum.blockchain.sync.regular.BlockFetcher.{InternalLastBlockImport, InvalidateBlocksFrom, PickBlocks}
@@ -24,7 +24,11 @@ import org.scalatest.matchers.should.Matchers
 
 import scala.concurrent.duration._
 
-class BlockFetcherSpec extends TestKit(ActorSystem("BlockFetcherSpec_System")) with AnyFreeSpecLike with Matchers {
+class BlockFetcherSpec
+    extends TestKit(ActorSystem("BlockFetcherSpec_System"))
+    with AnyFreeSpecLike
+    with WithActorSystemShutDown
+    with Matchers {
 
   "BlockFetcher" - {
 

src/test/scala/io/iohk/ethereum/blockchain/sync/regular/BlockFetcherStateSpec.scala

@@ -3,14 +3,18 @@ package io.iohk.ethereum.blockchain.sync.regular
 import akka.actor.ActorSystem
 import akka.testkit.{TestKit, TestProbe}
 import io.iohk.ethereum.Mocks.MockValidatorsAlwaysSucceed
-import io.iohk.ethereum.BlockHelpers
+import io.iohk.ethereum.{BlockHelpers, WithActorSystemShutDown}
 import io.iohk.ethereum.network.PeerId
 import org.scalatest.matchers.should.Matchers
 import org.scalatest.wordspec.AnyWordSpecLike
 
 import scala.collection.immutable.Queue
 
-class BlockFetcherStateSpec extends TestKit(ActorSystem()) with AnyWordSpecLike with Matchers {
+class BlockFetcherStateSpec
+    extends TestKit(ActorSystem("BlockFetcherStateSpec_System"))
+    with AnyWordSpecLike
+    with WithActorSystemShutDown
+    with Matchers {
 
   lazy val validators = new MockValidatorsAlwaysSucceed
 

src/test/scala/io/iohk/ethereum/consensus/ethash/EthashMinerSpec.scala

@@ -3,7 +3,7 @@ package ethash
 
 import akka.actor.{ActorRef, ActorSystem}
 import akka.testkit.{TestActor, TestActorRef, TestKit, TestProbe}
-import io.iohk.ethereum.Fixtures
+import io.iohk.ethereum.{Fixtures, WithActorSystemShutDown}
 import io.iohk.ethereum.consensus.blocks.{PendingBlock, PendingBlockAndState}
 import io.iohk.ethereum.consensus.ethash.validators.EthashBlockHeaderValidator
 import io.iohk.ethereum.consensus.validators.BlockHeaderValid
@@ -16,11 +16,17 @@ import monix.eval.Task
 import org.bouncycastle.util.encoders.Hex
 import org.scalamock.scalatest.MockFactory
 import org.scalatest.Tag
+
 import scala.concurrent.duration._
 import org.scalatest.flatspec.AnyFlatSpecLike
 import org.scalatest.matchers.should.Matchers
 
-class EthashMinerSpec extends TestKit(ActorSystem("EthashMinerSpec_System")) with AnyFlatSpecLike with Matchers {
+class EthashMinerSpec
+    extends TestKit(ActorSystem("EthashMinerSpec_System"))
+    with AnyFlatSpecLike
+    with WithActorSystemShutDown
+    with Matchers {
+
   final val EthashMinerSpecTag = Tag("EthashMinerSpec")
 
   private implicit val timeout: Duration = 10.minutes

src/test/scala/io/iohk/ethereum/jsonrpc/server/http/JsonRpcHttpServerSpec.scala

@@ -3,7 +3,6 @@ package io.iohk.ethereum.jsonrpc.server.http
 import java.net.InetAddress
 import java.time.{Clock, Instant, ZoneId}
 import java.util.concurrent.TimeUnit
-
 import akka.actor.ActorSystem
 import akka.http.scaladsl.model._
 import akka.http.scaladsl.model.headers.{HttpOrigin, Origin}
@@ -19,13 +18,33 @@ import org.scalamock.scalatest.MockFactory
 import org.scalatest.flatspec.AnyFlatSpec
 import org.scalatest.matchers.should.Matchers
 import akka.http.scaladsl.model.headers._
+import io.iohk.ethereum.healthcheck.{HealthcheckResponse, HealthcheckResult}
 import io.iohk.ethereum.utils.Logger
 import io.iohk.ethereum.jsonrpc.server.controllers.JsonRpcBaseController
-
 import scala.concurrent.duration.FiniteDuration
 
 class JsonRpcHttpServerSpec extends AnyFlatSpec with Matchers with ScalatestRouteTest {
 
+  it should "respond to healthcheck" in new TestSetup {
+    (mockJsonRpcHealthChecker.healthCheck _)
+      .expects()
+      .returning(Task.now(HealthcheckResponse(List(HealthcheckResult("listening", "OK", None)))))
+
+    val getRequest = HttpRequest(HttpMethods.GET, uri = "/healthcheck")
+
+    getRequest ~> Route.seal(mockJsonRpcHttpServer.route) ~> check {
+      status shouldEqual StatusCodes.OK
+      responseAs[String] shouldEqual """{
+                                       |  "checks":[
+                                       |    {
+                                       |      "description":"listening",
+                                       |      "status":"OK"
+                                       |    }
+                                       |  ]
+                                       |}""".stripMargin
+    }
+  }
+
   it should "pass valid json request to controller" in new TestSetup {
     (mockJsonRpcController.handleRequest _)
       .expects(*)

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

@@ -18,7 +18,7 @@ import io.iohk.ethereum.network.p2p.messages.CommonMessages.NewBlock
 import io.iohk.ethereum.network.p2p.messages.ProtocolVersions
 import io.iohk.ethereum.network.p2p.messages.WireProtocol.Disconnect
 import io.iohk.ethereum.utils.Config
-import io.iohk.ethereum.{Fixtures, NormalPatience}
+import io.iohk.ethereum.{Fixtures, NormalPatience, WithActorSystemShutDown}
 import org.bouncycastle.util.encoders.Hex
 import org.scalatest.concurrent.Eventually
 import org.scalatest.flatspec.AnyFlatSpecLike
@@ -28,6 +28,7 @@ import org.scalatest.matchers.should.Matchers
 class PeerManagerSpec
     extends TestKit(ActorSystem("PeerManagerSpec_System"))
     with AnyFlatSpecLike
+    with WithActorSystemShutDown
     with Matchers
     with Eventually
     with NormalPatience {

src/test/scala/io/iohk/ethereum/network/discovery/PeerDiscoveryManagerSpec.scala

@@ -1,33 +1,33 @@
 package io.iohk.ethereum.network.discovery
 
-import akka.pattern.ask
 import akka.actor.ActorSystem
+import akka.pattern.{AskTimeoutException, ask}
 import akka.testkit.{TestActorRef, TestKit}
 import akka.util.{ByteString, Timeout}
 import cats.effect.Resource
-import io.iohk.ethereum.NormalPatience
-import io.iohk.ethereum.utils.Config
 import io.iohk.ethereum.db.storage.KnownNodesStorage
+import io.iohk.ethereum.utils.Config
+import io.iohk.ethereum.{NormalPatience, WithActorSystemShutDown}
 import io.iohk.scalanet.discovery.crypto.PublicKey
 import io.iohk.scalanet.discovery.ethereum.v4.DiscoveryService
 import io.iohk.scalanet.discovery.ethereum.{Node => ENode}
 import monix.eval.Task
 import monix.execution.Scheduler
 import monix.execution.atomic.AtomicInt
-import org.scalatest.concurrent.Eventually
+import org.scalamock.scalatest.MockFactory
+import org.scalatest.concurrent.{Eventually, ScalaFutures}
 import org.scalatest.flatspec.AnyFlatSpecLike
 import org.scalatest.matchers.should.Matchers
-import org.scalatest.concurrent.ScalaFutures
-import org.scalamock.scalatest.MockFactory
-import scala.concurrent.duration._
 import scodec.bits.BitVector
-import scala.util.control.NoStackTrace
+
 import scala.collection.immutable.SortedSet
-import akka.pattern.AskTimeoutException
+import scala.concurrent.duration._
+import scala.util.control.NoStackTrace
 
 class PeerDiscoveryManagerSpec
     extends TestKit(ActorSystem("PeerDiscoveryManagerSpec_System"))
     with AnyFlatSpecLike
+    with WithActorSystemShutDown
     with Matchers
     with Eventually
     with MockFactory

src/universal/conf/testnet-internal-nomad.conf

@@ -7,6 +7,10 @@ mantis {
 
   network {
     protocol-version = 64
+
+    discovery {
+      discovery-enabled = true
+    }
   }
 
 }