Merge remote-tracking branch 'origin/devel' into devel

Author: catena2w

scorex-basics/src/main/scala/scorex/app/Application.scala

@@ -77,7 +77,7 @@ trait Application extends ScorexLogging {
 
     checkGenesis()
 
-    Http().bindAndHandle(combinedRoute, "0.0.0.0", settings.rpcPort)
+    Http().bindAndHandle(combinedRoute, settings.rpcAddress, settings.rpcPort)
 
     historySynchronizer ! Unit
     historyReplier ! Unit

scorex-basics/src/main/scala/scorex/settings/Settings.scala

@@ -79,6 +79,7 @@ trait Settings extends ScorexLogging {
   //todo: localOnly & declaredAddress
 
   lazy val rpcPort = (settingsJSON \ "rpcPort").asOpt[Int].getOrElse(DefaultRpcPort)
+  lazy val rpcAddress = (settingsJSON \ "rpcAddress").asOpt[String].getOrElse(DefaultRpcAddress)
   lazy val rpcAllowed: Seq[String] = (settingsJSON \ "rpcAllowed").asOpt[List[String]].getOrElse(DefaultRpcAllowed.split(""))
 
   lazy val offlineGeneration = (settingsJSON \ "offlineGeneration").asOpt[Boolean].getOrElse(false)
@@ -113,6 +114,7 @@ trait Settings extends ScorexLogging {
   lazy val corsAllowed = (settingsJSON \ "cors").asOpt[Boolean].getOrElse(false)
 
   private val DefaultRpcPort = 9085
+  private val DefaultRpcAddress = "0.0.0.0"
   private val DefaultRpcAllowed = "127.0.0.1"
 
   private val DefaultBlockGenerationDelay: FiniteDuration = 1.second

scorex-transaction/src/main/scala/scorex/transaction/TransactionSettings.scala

@@ -9,6 +9,6 @@ trait TransactionSettings {
   lazy val history = (settingsJSON \ "history").asOpt[String].getOrElse(DefaultHistory)
 
   private val DefaultMaxRollback = 100
-  lazy val MaxRollback = (settingsJSON \ "max-rollback").asOpt[Int].getOrElse(DefaultMaxRollback)
+  lazy val MaxRollback = (settingsJSON \ "maxRollback").asOpt[Int].getOrElse(DefaultMaxRollback)
 
 }