Use scorex 1.2.2

build.sbt

@@ -9,7 +9,10 @@ scalaVersion := "2.11.8"
 resolvers += "SonaType" at "https://oss.sonatype.org/content/groups/public"
 
 libraryDependencies ++= Seq(
-  "org.consensusresearch" %% "scorex" % "1.+"
+  "org.consensusresearch" %% "scorex-basics" % "1.2.+",
+  "org.consensusresearch" %% "scorex-consensus" % "1.2.+",
+  "org.consensusresearch" %% "scorex-perma" % "1.2.+",
+  "org.consensusresearch" %% "scorex-transaction" % "1.2.+"
 )
 
 mainClass in assembly := Some("scorex.perma.Application")

lock.sbt

@@ -39,11 +39,10 @@ dependencyOverrides in ThisBuild ++= Set(
   "javax.ws.rs" % "jsr311-api" % "1.1.1",
   "joda-time" % "joda-time" % "2.8.1",
   "org.bitlet" % "weupnp" % "0.1.4",
-  "org.consensusresearch" % "scorex-basics_2.11" % "1.2.1",
-  "org.consensusresearch" % "scorex-consensus_2.11" % "1.2.1",
-  "org.consensusresearch" % "scorex-perma_2.11" % "1.2.1",
-  "org.consensusresearch" % "scorex-transaction_2.11" % "1.2.1",
-  "org.consensusresearch" % "scorex_2.11" % "1.2.1",
+  "org.consensusresearch" % "scorex-basics_2.11" % "1.2.2",
+  "org.consensusresearch" % "scorex-consensus_2.11" % "1.2.2",
+  "org.consensusresearch" % "scorex-perma_2.11" % "1.2.2",
+  "org.consensusresearch" % "scorex-transaction_2.11" % "1.2.2",
   "org.consensusresearch" % "scrypto_2.11" % "1.0.4",
   "org.joda" % "joda-convert" % "1.7",
   "org.json4s" % "json4s-ast_2.11" % "3.2.11",
@@ -62,4 +61,4 @@ dependencyOverrides in ThisBuild ++= Set(
   "org.slf4j" % "slf4j-api" % "1.7.18",
   "org.whispersystems" % "curve25519-java" % "0.2.4"
 )
-// LIBRARY_DEPENDENCIES_HASH 011cd9994bdbf98994a54c73e5e7423f83a91480
+// LIBRARY_DEPENDENCIES_HASH 111038646dc7c922ca4f2f8b646d0e96e0d35c99

src/main/resources/application.conf

@@ -1,9 +1,6 @@
-
-akka {
-  io {
-    tcp {
-      direct-buffer-size = 1536 KiB
-      trace-logging = off
-    }
-  }
+app {
+  product = "Scorex"
+  release = "Lagonaki"
+  version = "1.2.2"
+  consensusAlgo = "perma"
 }

src/main/scala/scorex/lagonaki/Application.scala

@@ -8,8 +8,8 @@ import scorex.account.Account
 import scorex.api.http._
 import scorex.app.ApplicationVersion
 import scorex.crypto.ads.merkle.AuthDataBlock
-import scorex.lagonaki.api.http.{DebugApiRoute, PaymentApiRoute, PeersHttpService, ScorexApiRoute}
-import scorex.lagonaki.server.{LagonakiApplication, LagonakiSettings}
+import scorex.lagonaki.http.{ScorexApiRoute, DebugApiRoute}
+import scorex.lagonaki.settings.LagonakiSettings
 import scorex.network.{TransactionalMessagesRepo, UnconfirmedPoolSynchronizer}
 import scorex.perma.api.http.PermaConsensusApiRoute
 import scorex.perma.consensus.PermaConsensusModule
@@ -40,7 +40,7 @@ class Application(val settingsFilename: String) extends scorex.app.Application {
 
   override implicit lazy val consensusModule = {
     new File(settings.treeDir).mkdirs()
-    val authDataStorage: Storage[Long, AuthDataBlock[DataSegment]] = new AuthDataStorage(settings.authDataStorage)
+    val authDataStorage: Storage[Long, AuthDataBlock[DataSegment]] = new AuthDataStorage(Some(settings.authDataStorage))
     val rootHash = settings.rootHash
     actorSystem.actorOf(Props(classOf[SegmentsSynchronizer], this, rootHash, authDataStorage))
     new PermaConsensusModule(rootHash, Some(networkController))(authDataStorage)
@@ -100,7 +100,7 @@ object Application extends App with ScorexLogging {
 
   if (application.wallet.privateKeyAccounts().isEmpty) application.wallet.generateNewAccounts(1)
 
-  def testingScript(application: LagonakiApplication): Unit = {
+  def testingScript(application: Application): Unit = {
     log.info("Going to execute testing scenario")
     log.info("Current state is:" + application.blockStorage.state)
     val wallet = application.wallet

src/main/scala/scorex/lagonaki/http/ScorexApiRoute.scala

@@ -9,14 +9,12 @@ import play.api.libs.json.Json
 import scorex.api.http.{ApiRoute, CommonApiFunctions}
 import scorex.app.Application
 import scorex.consensus.mining.BlockGeneratorController._
-import scorex.lagonaki.server.settings.Constants
+import scorex.lagonaki.settings.Constants
 import scorex.network.HistorySynchronizer
-import spray.http.MediaTypes._
 import spray.routing.Route
 
 import scala.concurrent.ExecutionContext.Implicits.global
 import scala.concurrent.Future
-import scala.util.{Failure, Success}
 
 @Api(value = "scorex", description = "General commands & information", position = 0)
 case class ScorexApiRoute(override val application: Application)(implicit val context: ActorRefFactory)

src/main/scala/scorex/lagonaki/settings/LagonakiSettings.scala

@@ -0,0 +1,7 @@
+package scorex.lagonaki.settings
+
+import scorex.perma.settings.PermaSettings
+import scorex.settings.Settings
+import scorex.transaction.TransactionSettings
+
+class LagonakiSettings(override val filename: String) extends Settings with TransactionSettings with PermaSettings