doc update, small fixes

README.md

@@ -32,7 +32,7 @@ with an another with just one line of code edited (in PermaConstants.scala)
 * Asynchronous network layer on top of TCP
 * JSON API
 * Command line client for the JSON API
-* Curve25519 for signatures
+* Cryptographic primitives externalized into [separate scrypto framework](https://github.com/ScorexProject/scrypto)
 
 
 **This is the pretty buggy initial release version! Please report bugs found, and contribute with
@@ -71,10 +71,12 @@ Run one or two peers on the local machine:
 
 * run "sbt recompile" to (re-)build .jar file
 * run "sbt startLocal1" to run first local peer binded to 127.0.0.1:9084 . Edit settings in settings-local1.json
-   if needed
-* run "sbt startLocal2" to run second local peer binded to 127.0.0.2:9084 . Edit settings in settings-local2.json
-   if needed
-* You can run both peers simultaneously by running "sbt startLocal"
+   if needed. Access UI via localhost:9085
+* run "sbt startLocal2" to run second local peer binded to 127.0.0.2:9088 . Edit settings in settings-local2.json
+   if needed. Access UI via localhost:9086
+* run "sbt startLocal3" to run second local peer binded to 127.0.0.3:9084 . Edit settings in settings-local2.json
+   if needed. Access UI via localhost:9087
+* You can run first & second peers simultaneously by running "sbt startLocal"
 
 
 You can also run "sbt start" script to connect to the network, but network is down now :)
@@ -121,8 +123,8 @@ Current Limitations
 todo: current glitches / limitations list
 
 
-Documentation
---------------
+Documentation and Resources
+---------------------------
 
 Articles:
 
@@ -143,6 +145,8 @@ Others:
 [API Description](docs/API.md)
 
 
+Please join our mail-list: [https://groups.io/g/scorex-dev](https://groups.io/g/scorex-dev) .
+
 
 Contributions
 -------------

lock.sbt

@@ -2,8 +2,8 @@
 // This file is auto generated by sbt-lock 0.2.3.
 // https://github.com/tkawachi/sbt-lock/
 dependencyOverrides in ThisBuild ++= Set(
-  "ch.qos.logback" % "logback-classic" % "1.1.3",
-  "ch.qos.logback" % "logback-core" % "1.1.3",
+  "ch.qos.logback" % "logback-classic" % "1.1.5",
+  "ch.qos.logback" % "logback-core" % "1.1.5",
   "com.chuusai" % "shapeless_2.11" % "1.2.4",
   "com.fasterxml.jackson.core" % "jackson-annotations" % "2.5.4",
   "com.fasterxml.jackson.core" % "jackson-core" % "2.5.4",
@@ -22,7 +22,7 @@ dependencyOverrides in ThisBuild ++= Set(
   "com.ning" % "async-http-client" % "1.9.11",
   "com.thoughtworks.paranamer" % "paranamer" % "2.6",
   "com.typesafe" % "config" % "1.3.0",
-  "com.typesafe.akka" % "akka-actor_2.11" % "2.4.2-RC2",
+  "com.typesafe.akka" % "akka-actor_2.11" % "2.4.2-RC3",
   "com.typesafe.akka" % "akka-testkit_2.11" % "2.3.9",
   "com.typesafe.play" % "play-datacommons_2.11" % "2.4.6",
   "com.typesafe.play" % "play-functional_2.11" % "2.4.6",
@@ -44,7 +44,7 @@ dependencyOverrides in ThisBuild ++= Set(
   "joda-time" % "joda-time" % "2.8.1",
   "net.databinder.dispatch" % "dispatch-core_2.11" % "0.11.3",
   "org.bitlet" % "weupnp" % "0.1.4",
-  "org.consensusresearch" % "scrypto_2.11" % "1.0.3",
+  "org.consensusresearch" % "scrypto_2.11" % "1.0.4",
   "org.joda" % "joda-convert" % "1.7",
   "org.json4s" % "json4s-ast_2.11" % "3.2.11",
   "org.json4s" % "json4s-core_2.11" % "3.2.11",
@@ -63,7 +63,7 @@ dependencyOverrides in ThisBuild ++= Set(
   "org.scalacheck" % "scalacheck_2.11" % "1.12.5",
   "org.scalactic" % "scalactic_2.11" % "2.3.0-SNAP2",
   "org.scalatest" % "scalatest_2.11" % "2.3.0-SNAP2",
-  "org.slf4j" % "slf4j-api" % "1.7.13",
+  "org.slf4j" % "slf4j-api" % "1.7.16",
   "org.whispersystems" % "curve25519-java" % "0.2.4"
 )
-// LIBRARY_DEPENDENCIES_HASH 2fa9f7b1c79f987c540fe9b9c69c5d93511ec365
+// LIBRARY_DEPENDENCIES_HASH a402d36f6f8303d8aa5de0fcd4c6421942ec14e5

project/Dependencies.scala

@@ -6,7 +6,7 @@ object Dependencies {
     "io.spray" %% "spray-testkit" % "1.+" % "test",
     "org.scalatest" %% "scalatest" % "2.+" % "test",
     "org.scalactic" %% "scalactic" % "2.+" % "test",
-    "org.scalacheck" %% "scalacheck" % "1.+" % "test",
+    "org.scalacheck" %% "scalacheck" % "1.12.+" % "test",
     "net.databinder.dispatch" %% "dispatch-core" % "+" % "test"
   )
 

scorex-basics/src/main/scala/scorex/network/Handshake.scala

@@ -72,8 +72,5 @@ object Handshake extends ScorexLogging {
     val time = Longs.fromByteArray(bytes.slice(position, position + 8))
 
     Handshake(an, av, nodeName, nonce, isaOpt, time)
-  }.recoverWith { case t: Throwable =>
-    log.info("Error during handshake parsing:", t)
-    Failure(t)
   }
 }

scorex-basics/src/main/scala/scorex/network/ScoreObserver.scala

@@ -4,8 +4,8 @@ import akka.actor.{Actor, ActorRef}
 import scorex.transaction.History._
 import scorex.utils.ScorexLogging
 
-import scala.concurrent.duration._
 import scala.concurrent.ExecutionContext.Implicits.global
+import scala.concurrent.duration._
 
 //todo: break a connection if no score message from remote for some time?
 
@@ -59,14 +59,19 @@ class ScoreObserver(historySynchronizer: ActorRef) extends Actor with ScorexLogg
 
     case GetScore =>
       candidates = clearOld(candidates)
-      sender() ! ConsideredValue(candidates.headOption.map(_.score), candidates.map(_.peer))
+      candidates.headOption.map(_.score) match {
+        case None => context.system.scheduler.scheduleOnce(1.second, sender(), ConsideredValue(None, Seq()))
+        case score => sender() ! ConsideredValue(score, candidates.map(_.peer))
+      }
   }
 }
 
 object ScoreObserver {
+
   case class UpdateScore(scoreToAdd: Option[(ConnectedPeer, BlockchainScore)])
 
   case object GetScore
 
   case class ConsideredValue(value: Option[BlockchainScore], witnesses: Seq[ConnectedPeer])
+
 }

src/main/resources/application.conf

@@ -1,7 +1,7 @@
 app {
   product = "Scorex"
   release = "Lagonaki"
-  version = "1.2.0-RC2"
+  version = "1.2.0-RC3"
   consensusAlgo = "perma"
 }
 

src/test/resources/application.conf

@@ -1,6 +1,6 @@
 app {
   product = "Scorex"
   release = "Lagonaki"
-  version = "1.2.0-RC2"
+  version = "1.2.0-RC3"
   consensusAlgo = "nxt"
 }