Merge pull request #847 from input-output-hk/release/3.2.1

Release 3.2.1

Author: jmendiola222

build.sbt

@@ -11,7 +11,7 @@ val mantisDev = sys.props.get("mantisDev").contains("true") || sys.env.get("MANT
 
 val commonSettings = Seq(
   name := "mantis",
-  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/universal/conf/testnet-internal-nomad.conf

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