Merge branch 'master' into more-props

Author: kushti

build.sbt

@@ -4,7 +4,7 @@ name := "scorex-core"
 lazy val commonSettings = Seq(
   scalaVersion := "2.12.3",
   organization := "org.scorexfoundation",
-  version := "2.0.0-RC3-SNAPSHOT",
+  version := "2.0.0-RC4-SNAPSHOT",
   licenses := Seq("CC0" -> url("https://creativecommons.org/publicdomain/zero/1.0/legalcode")),
   homepage := Some(url("https://github.com/ScorexFoundation/Scorex")),
   pomExtra := (
@@ -18,12 +18,16 @@ lazy val commonSettings = Seq(
           <name>Alexander Chepurnoy</name>
           <url>http://chepurnoy.org/</url>
         </developer>
-      </developers>)
+      </developers>),
+    git.useGitDescribe := true,
+    git.uncommittedSignifier := Some("SNAPSHOT")
 )
 
+enablePlugins(GitVersioning)
+
 scalaVersion := "2.12.3"
 organization := "org.scorexfoundation"
-version := "2.0.0-RC3-SNAPSHOT"
+version := "2.0.0-RC4-SNAPSHOT"
 
 resolvers += "Sonatype Releases" at "https://oss.sonatype.org/content/repositories/releases/"
 
@@ -58,6 +62,7 @@ val testingDependencies = Seq(
 )
 
 libraryDependencies ++= Seq(
+  "com.iheart" %% "ficus" % "1.4.1",
   "org.scorexfoundation" %% "scrypto" % "2.+"
 ) ++ networkDependencies ++ apiDependencies ++ loggingDependencies ++ testingDependencies
 
@@ -148,4 +153,4 @@ pomExtra in ThisBuild :=
         <name>catena</name>
         <url>https://github.com/catena2w</url>
       </developer>
-    </developers>
+    </developers>

examples/src/main/resources/application.conf

@@ -0,0 +1,3 @@
+app {
+  modifierIdSize = 32
+}

examples/src/main/resources/reference.conf

@@ -0,0 +1,34 @@
+scorex {
+  dataDir = /tmp/scorex/data/blockchain
+  logDir = /tmp/scorex/data/log
+
+  restApi {
+    bindAddress = "127.0.0.1"
+    port = 9085
+    api-key-hash = ""
+  }
+
+  network {
+    nodeName = "node1"
+    bindAddress = "127.0.0.1"
+    port = 9084
+    nodeNonce = 1
+    knownPeers = ["127.0.0.2:9088"]
+    agentName = "2-Hop"
+  }
+
+  miner {
+    offlineGeneration = true
+    targetBlockDelay = 100s
+    blockGenerationDelay = 100ms
+    rParamX10 = 8
+    initialDifficulty = 1
+    posAttachmentSize = 100
+  }
+
+  wallet {
+    seed = "genesisoo"
+    password = "cookies"
+    walletDir = "/tmp/scorex/data/wallet"
+  }
+}

examples/src/main/resources/settings.conf

@@ -0,0 +1,35 @@
+scorex {
+  dataDir = /tmp/scorex/data10/blockchain
+  logDir = /tmp/scorex/data10/log
+
+  api {
+    bindAddress = "127.0.0.10"
+    port = 9495
+    api-key-hash = ""
+  }
+
+  network {
+    nodeName = "node10"
+    bindAddress = "127.0.0.10"
+    port = 9494
+    nodeNonce = 10
+    knownPeers = ["127.0.0.1:9084","127.0.0.9:9303"]
+    agentName = "2-Hop"
+    addedMaxDelay = 2s
+  }
+
+  miner {
+    offlineGeneration = false
+    targetBlockDelay = 100s
+    blockGenerationDelay = 100ms
+    rParamX10 = 8
+    initialDifficulty = 1
+    posAttachmentSize = 100
+  }
+
+  wallet {
+    seed = "genesisoo9"
+    password = "cookies10"
+    walletDir = "/tmp/scorex/data10/wallet"
+  }
+}

examples/src/main/resources/settings.json

@@ -0,0 +1,34 @@
+scorex {
+  dataDir = /tmp/scorex/data2/blockchain
+  logDir = /tmp/scorex/data2/log
+
+  api {
+    bindAddress = "127.0.0.2"
+    port = 9089
+    api-key-hash = ""
+  }
+
+  network {
+    nodeName = "node2"
+    bindAddress = "127.0.0.2"
+    port = 9088
+    nodeNonce = 2
+    knownPeers = ["127.0.0.1:9084"]
+    agentName = "2-Hop"
+  }
+
+  miner {
+    offlineGeneration = false
+    targetBlockDelay = 100s
+    blockGenerationDelay = 100ms
+    rParamX10 = 8
+    initialDifficulty = 1
+    posAttachmentSize = 100
+  }
+
+  wallet {
+    seed = "genesisoo1"
+    password = "cookies2"
+    walletDir = "/tmp/scorex/data2/wallet"
+  }
+}

examples/src/main/resources/settings10.conf

@@ -0,0 +1,34 @@
+scorex {
+  dataDir = /tmp/scorex/data3/blockchain
+  logDir = /tmp/scorex/data3/log
+
+  api {
+    bindAddress = "127.0.0.3"
+    port = 9093
+    api-key-hash = ""
+  }
+
+  network {
+    nodeName = "node3"
+    bindAddress = "127.0.0.3"
+    port = 9092
+    nodeNonce = 3
+    knownPeers = ["127.0.0.1:9088"]
+    agentName = "2-Hop"
+  }
+
+  miner {
+    offlineGeneration = false
+    targetBlockDelay = 100s
+    blockGenerationDelay = 100ms
+    rParamX10 = 8
+    initialDifficulty = 1
+    posAttachmentSize = 100
+  }
+
+  wallet {
+    seed = "genesisoo2"
+    password = "cookies3"
+    walletDir = "/tmp/scorex/data3/wallet"
+  }
+}