[CHORE] Update akka version

Author: mmrozek

build.sbt

@@ -11,17 +11,18 @@ val commonSettings = Seq(
 resolvers += "rocksDb" at "https://dl.bintray.com/ethereum/maven/"
 
 val dep = {
-  val akkaVersion = "2.5.12"
-  val akkaHttpVersion = "10.1.1"
+  val akkaVersion = "2.5.31"
+  val akkaHttpVersion = "10.1.12"
   val circeVersion = "0.9.3"
   val rocksDb = "5.9.2"
 
   Seq(
     "com.typesafe.akka" %% "akka-actor" % akkaVersion,
     "com.typesafe.akka" %% "akka-slf4j" % akkaVersion,
     "com.typesafe.akka" %% "akka-testkit" % akkaVersion,
+    "com.typesafe.akka" %% "akka-stream" % akkaVersion,
     "com.typesafe.akka" %% "akka-http" % akkaHttpVersion,
-    "ch.megard" %% "akka-http-cors" % "0.3.0",
+    "ch.megard" %% "akka-http-cors" % "1.0.0",
     "org.json4s" %% "json4s-native" % "3.5.4",
     "de.heikoseeberger" %% "akka-http-json4s" % "1.21.0",
     "com.typesafe.akka" %% "akka-http-testkit" % akkaHttpVersion % "it,test",
@@ -39,7 +40,6 @@ val dep = {
     "io.circe" %% "circe-generic-extras" % circeVersion,
     "com.miguno.akka" %% "akka-mock-scheduler" % "0.5.1" % "it,test",
     "commons-io" % "commons-io" % "2.6",
-    "com.typesafe.akka" %% "akka-stream" % akkaVersion,
     "org.scala-sbt.ipcsocket" % "ipcsocket" % "1.0.0",
     "org.bouncycastle" % "bcprov-jdk15on" % "1.59",
     "com.typesafe.scala-logging" %% "scala-logging" % "3.9.0",

src/main/scala/io/iohk/ethereum/faucet/FaucetConfig.scala

@@ -1,10 +1,9 @@
 package io.iohk.ethereum.faucet
 
-import akka.http.scaladsl.model.headers.HttpOriginRange
+import ch.megard.akka.http.cors.scaladsl.model.HttpOriginMatcher
 import com.typesafe.config.{Config => TypesafeConfig}
 import io.iohk.ethereum.domain.Address
 import io.iohk.ethereum.utils.ConfigUtils
-
 import scala.concurrent.duration.{FiniteDuration, _}
 
 case class FaucetConfig(
@@ -13,7 +12,7 @@ case class FaucetConfig(
     txGasPrice: BigInt,
     txGasLimit: BigInt,
     txValue: BigInt,
-    corsAllowedOrigins: HttpOriginRange,
+    corsAllowedOrigins: HttpOriginMatcher,
     rpcAddress: String,
     keyStoreDir: String,
     listenInterface: String,

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

@@ -2,12 +2,11 @@ package io.iohk.ethereum.jsonrpc.server.http
 
 import akka.actor.ActorSystem
 import akka.http.scaladsl.Http
-import akka.http.scaladsl.model.headers.HttpOriginRange
 import akka.stream.ActorMaterializer
+import ch.megard.akka.http.cors.scaladsl.model.HttpOriginMatcher
 import io.iohk.ethereum.jsonrpc._
 import io.iohk.ethereum.jsonrpc.server.http.JsonRpcHttpServer.JsonRpcHttpServerConfig
 import io.iohk.ethereum.utils.Logger
-
 import scala.concurrent.ExecutionContext.Implicits.global
 import scala.util.{Failure, Success}
 
@@ -26,5 +25,5 @@ class BasicJsonRpcHttpServer(val jsonRpcController: JsonRpcController, config: J
     }
   }
 
-  override def corsAllowedOrigins: HttpOriginRange = config.corsAllowedOrigins
+  override def corsAllowedOrigins: HttpOriginMatcher = config.corsAllowedOrigins
 }

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

@@ -1,21 +1,19 @@
 package io.iohk.ethereum.jsonrpc.server.http
 
-import java.security.SecureRandom
-
 import akka.actor.ActorSystem
 import akka.http.scaladsl.model.StatusCodes
-import akka.http.scaladsl.model.headers.HttpOriginRange
 import akka.http.scaladsl.server.Directives._
 import akka.http.scaladsl.server.{MalformedRequestContentRejection, RejectionHandler, Route}
 import ch.megard.akka.http.cors.javadsl.CorsRejection
 import ch.megard.akka.http.cors.scaladsl.CorsDirectives._
+import ch.megard.akka.http.cors.scaladsl.model.HttpOriginMatcher
 import ch.megard.akka.http.cors.scaladsl.settings.CorsSettings
 import de.heikoseeberger.akkahttpjson4s.Json4sSupport
 import io.iohk.ethereum.jsonrpc.{JsonRpcController, JsonRpcErrors, JsonRpcRequest, JsonRpcResponse}
 import io.iohk.ethereum.utils.{ConfigUtils, Logger}
+import java.security.SecureRandom
 import org.json4s.JsonAST.JInt
 import org.json4s.{DefaultFormats, native}
-
 import scala.concurrent.ExecutionContext.Implicits.global
 import scala.concurrent.Future
 import scala.util.Try
@@ -27,7 +25,7 @@ trait JsonRpcHttpServer extends Json4sSupport {
 
   implicit val formats = DefaultFormats
 
-  def corsAllowedOrigins: HttpOriginRange
+  def corsAllowedOrigins: HttpOriginMatcher
 
   val corsSettings = CorsSettings.defaultSettings
     .withAllowGenericHttpRequests(true)
@@ -84,7 +82,7 @@ object JsonRpcHttpServer extends Logger {
     val certificateKeyStorePath: Option[String]
     val certificateKeyStoreType: Option[String]
     val certificatePasswordFile: Option[String]
-    val corsAllowedOrigins: HttpOriginRange
+    val corsAllowedOrigins: HttpOriginMatcher
   }
 
   object JsonRpcHttpServerConfig {

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

@@ -1,18 +1,16 @@
 package io.iohk.ethereum.jsonrpc.server.http
 
-import java.io.{File, FileInputStream}
-import java.security.{KeyStore, SecureRandom}
-import javax.net.ssl.{KeyManagerFactory, SSLContext, TrustManagerFactory}
-
 import akka.actor.ActorSystem
-import akka.http.scaladsl.model.headers.HttpOriginRange
 import akka.http.scaladsl.{ConnectionContext, Http}
 import akka.stream.ActorMaterializer
+import ch.megard.akka.http.cors.scaladsl.model.HttpOriginMatcher
 import io.iohk.ethereum.jsonrpc.JsonRpcController
 import io.iohk.ethereum.jsonrpc.server.http.JsonRpcHttpServer.JsonRpcHttpServerConfig
 import io.iohk.ethereum.jsonrpc.server.http.JsonRpcHttpsServer.HttpsSetupResult
 import io.iohk.ethereum.utils.Logger
-
+import java.io.{File, FileInputStream}
+import java.security.{KeyStore, SecureRandom}
+import javax.net.ssl.{KeyManagerFactory, SSLContext, TrustManagerFactory}
 import scala.concurrent.ExecutionContext.Implicits.global
 import scala.io.Source
 import scala.util.{Failure, Success, Try}
@@ -113,7 +111,7 @@ class JsonRpcHttpsServer(val jsonRpcController: JsonRpcController, config: JsonR
         Left("HTTPS requires: certificate-keystore-path, certificate-keystore-type and certificate-password-file to be configured")
     }
 
-  override def corsAllowedOrigins: HttpOriginRange = config.corsAllowedOrigins
+  override def corsAllowedOrigins: HttpOriginMatcher = config.corsAllowedOrigins
 }
 
 object JsonRpcHttpsServer {

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

@@ -1,26 +1,25 @@
 package io.iohk.ethereum.utils
 
-import java.util.Map.Entry
-
-import akka.http.scaladsl.model.headers.{HttpOrigin, HttpOriginRange}
+import akka.http.scaladsl.model.headers.HttpOrigin
+import ch.megard.akka.http.cors.scaladsl.model.HttpOriginMatcher
 import com.typesafe.config.{ConfigValue, Config => TypesafeConfig}
-
+import java.util.Map.Entry
 import scala.collection.JavaConverters._
 import scala.util.Try
 
 object ConfigUtils {
 
-  def parseCorsAllowedOrigins(config: TypesafeConfig, key: String): HttpOriginRange = {
+  def parseCorsAllowedOrigins(config: TypesafeConfig, key: String): HttpOriginMatcher = {
     (Try(parseMultipleOrigins(config.getStringList(key).asScala)) recoverWith {
       case _ => Try(parseSingleOrigin(config.getString(key)))
     }).get
   }
 
-  def parseMultipleOrigins(origins: Seq[String]): HttpOriginRange = HttpOriginRange(origins.map(HttpOrigin(_)): _*)
+  def parseMultipleOrigins(origins: Seq[String]): HttpOriginMatcher = HttpOriginMatcher(origins.map(HttpOrigin(_)): _*)
 
-  def parseSingleOrigin(origin: String): HttpOriginRange = origin match {
-    case "*" => HttpOriginRange.*
-    case s => HttpOriginRange.Default(HttpOrigin(s) :: Nil)
+  def parseSingleOrigin(origin: String): HttpOriginMatcher = origin match {
+    case "*" => HttpOriginMatcher.*
+    case s => HttpOriginMatcher.Default(HttpOrigin(s) :: Nil)
   }
 
   def keys(config: TypesafeConfig): Set[String] = config.entrySet().asScala.toSet

src/test/scala/io/iohk/ethereum/faucet/FaucetApiSpec.scala

@@ -1,26 +1,23 @@
 package io.iohk.ethereum.faucet
 
-import java.net.InetAddress
-import java.security.SecureRandom
-import java.time.{Clock, Instant}
-
 import akka.http.scaladsl.model._
-import akka.http.scaladsl.model.headers.HttpOriginRange
+import akka.http.scaladsl.model.headers._
 import akka.http.scaladsl.server.Route
 import akka.http.scaladsl.testkit.ScalatestRouteTest
-import headers._
 import akka.util.ByteString
-import io.iohk.ethereum.crypto
+import ch.megard.akka.http.cors.scaladsl.model.HttpOriginMatcher
+import io.iohk.ethereum.crypto._
 import io.iohk.ethereum.domain.{Address, Transaction}
 import io.iohk.ethereum.keystore.{KeyStore, Wallet}
 import io.iohk.ethereum.mallet.service.RpcClient
-import io.iohk.ethereum.crypto._
-import org.scalatest.{FlatSpec, Matchers}
-import org.scalamock.scalatest.MockFactory
-import io.iohk.ethereum.rlp
 import io.iohk.ethereum.network.p2p.messages.CommonMessages.SignedTransactions.SignedTransactionEnc
+import io.iohk.ethereum.{crypto, rlp}
+import java.net.InetAddress
+import java.security.SecureRandom
+import java.time.{Clock, Instant}
 import org.bouncycastle.util.encoders.Hex
-
+import org.scalamock.scalatest.MockFactory
+import org.scalatest.{FlatSpec, Matchers}
 import scala.concurrent.duration._
 
 class FaucetApiSpec extends FlatSpec with Matchers with MockFactory with ScalatestRouteTest {
@@ -30,7 +27,7 @@ class FaucetApiSpec extends FlatSpec with Matchers with MockFactory with Scalate
     val (prvKey, pubKey) = keyPairToByteStrings(walletKeyPair)
     val wallet = Wallet(Address(crypto.kec256(pubKey)), prvKey)
 
-    val config = FaucetConfig(wallet.address, "", 10, 20, 1, HttpOriginRange.*, "", "", "", 0, 10.seconds, 1024)
+    val config = FaucetConfig(wallet.address, "", 10, 20, 1, HttpOriginMatcher.*, "", "", "", 0, 10.seconds, 1024)
 
     val mockRpcClient = mock[RpcClient]
     val mockKeyStore = mock[KeyStore]
@@ -64,7 +61,7 @@ class FaucetApiSpec extends FlatSpec with Matchers with MockFactory with Scalate
     val (prvKey, pubKey) = keyPairToByteStrings(walletKeyPair)
     val wallet = Wallet(Address(crypto.kec256(pubKey)), prvKey)
 
-    val config = FaucetConfig(wallet.address, "", 10, 20, 1, HttpOriginRange.*, "", "", "", 0, 10.seconds, 1024)
+    val config = FaucetConfig(wallet.address, "", 10, 20, 1, HttpOriginMatcher.*, "", "", "", 0, 10.seconds, 1024)
 
     val mockRpcClient = mock[RpcClient]
     val mockKeyStore = mock[KeyStore]

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

@@ -1,16 +1,16 @@
 package io.iohk.ethereum.jsonrpc.server.http
 
 import akka.http.scaladsl.model._
-import akka.http.scaladsl.model.headers.{HttpOrigin, HttpOriginRange, Origin}
+import akka.http.scaladsl.model.headers.{HttpOrigin, Origin}
 import akka.http.scaladsl.server.Route
 import akka.http.scaladsl.testkit.ScalatestRouteTest
 import akka.util.ByteString
+import ch.megard.akka.http.cors.scaladsl.model.HttpOriginMatcher
 import io.iohk.ethereum.jsonrpc.server.http.JsonRpcHttpServer.JsonRpcHttpServerConfig
 import io.iohk.ethereum.jsonrpc.{JsonRpcController, JsonRpcResponse}
 import org.json4s.JsonAST.{JInt, JString}
 import org.scalamock.scalatest.MockFactory
 import org.scalatest.{FlatSpec, Matchers}
-
 import scala.concurrent.Future
 
 class JsonRpcHttpServerSpec extends FlatSpec with Matchers with ScalatestRouteTest {
@@ -89,7 +89,7 @@ class JsonRpcHttpServerSpec extends FlatSpec with Matchers with ScalatestRouteTe
       override val certificateKeyStorePath = None
       override val certificateKeyStoreType = None
       override val certificatePasswordFile = None
-      override val corsAllowedOrigins = HttpOriginRange.*
+      override val corsAllowedOrigins = HttpOriginMatcher.*
     }
 
     val mockJsonRpcController = mock[JsonRpcController]
@@ -98,7 +98,7 @@ class JsonRpcHttpServerSpec extends FlatSpec with Matchers with ScalatestRouteTe
 
       def run(): Unit = ()
 
-      override def corsAllowedOrigins = config.corsAllowedOrigins
+      override def corsAllowedOrigins: HttpOriginMatcher = config.corsAllowedOrigins
     }
 
     val corsAllowedOrigin = HttpOrigin("http://localhost:3333")
@@ -108,7 +108,7 @@ class JsonRpcHttpServerSpec extends FlatSpec with Matchers with ScalatestRouteTe
 
       def run(): Unit = ()
 
-      override def corsAllowedOrigins = HttpOriginRange(corsAllowedOrigin)
+      override def corsAllowedOrigins: HttpOriginMatcher = HttpOriginMatcher(corsAllowedOrigin)
     }
   }