Merge branch 'develop' into feature/ETCM-129-scala-point-13

Author: Dmitry Voronov

build.sbt

@@ -195,11 +195,10 @@ lazy val node = {
       mappings in Universal ++= directory((resourceDirectory in Compile).value / "chains").map { case (f, name) =>
         f -> s"conf/$name"
       },
-      jdkPackagerJVMArgs := Seq(
-        "-Dconfig.file=." + sep + "conf" + sep + "app.conf",
-        "-Dlogback.configurationFile=." + sep + "conf" + sep + "logback.xml",
-        "-Xss10M"
-      )
+      bashScriptExtraDefines += """addJava "-Dconfig.file=${app_home}/../conf/app.conf"""",
+      bashScriptExtraDefines += """addJava "-Dlogback.configurationFile=${app_home}/../conf/logback.xml"""",
+      batScriptExtraDefines += """call :add_java "-Dconfig.file=%APP_HOME%\conf\app.conf"""",
+      batScriptExtraDefines += """call :add_java "-Dlogback.configurationFile=%APP_HOME%\conf\logback.xml""""
     )
 
   if (!nixBuild)

src/main/resources/application.conf

@@ -597,7 +597,7 @@ mantis {
   }
 
   async {
-    ask-timeout = 100.millis
+    ask-timeout = 1.second
 
     dispatchers {
       block-forger {

src/main/scala/io/iohk/ethereum/App.scala

@@ -35,7 +35,7 @@ object App extends Logger {
       case Some(`cli`) => CliLauncher.main(args.tail)
       case Some(unknown) =>
         log.error(
-          s"Unrecognised launcher option, " +
+          s"Unrecognised launcher option $unknown, " +
             s"first parameter must be $launchKeytool, $downloadBootstrap, $launchMantis, " +
             s"$faucet, $vmServer, $ecKeyGen, $sigValidator or $cli"
         )

src/main/scala/io/iohk/ethereum/consensus/Consensus.scala

@@ -60,10 +60,15 @@ trait Consensus {
     */
   def stopProtocol(): Unit
 
+  /**
+    * Sends msg to the internal miner and waits for the response
+    */
+  def askMiner(msg: MinerProtocol): Task[MinerResponse]
+
   /**
     * Sends msg to the internal miner
     */
-  def sendMiner(msg: MinerProtocol): Task[MinerResponse]
+  def sendMiner(msg: MinerProtocol): Unit
 }
 
 /**

src/main/scala/io/iohk/ethereum/consensus/ethash/EthashConsensus.scala

@@ -52,7 +52,13 @@ class EthashConsensus private (
 
   private implicit val timeout: Timeout = 5.seconds
 
-  override def sendMiner(msg: MinerProtocol): Task[MinerResponse] = {
+  override def sendMiner(msg: MinerProtocol): Unit = {
+    atomicMiner
+      .get()
+      .foreach(_ ! msg)
+  }
+
+  override def askMiner(msg: MinerProtocol): Task[MinerResponse] = {
     atomicMiner
       .get()
       .map(_.askFor[MinerResponse](msg))
@@ -67,8 +73,6 @@ class EthashConsensus private (
           case MockedPow => MockedMiner(node)
         }
         atomicMiner.set(Some(miner))
-        // Just create the Task which comes fromFuture (will start executing eagerly)
-        // Should runAsyncAndForget to be more explicit, but don't want to add a Scheduler dependency
         sendMiner(MinerProtocol.StartMining)
 
       case _ =>

src/main/scala/io/iohk/ethereum/jsonrpc/QAService.scala

@@ -33,7 +33,7 @@ class QAService(
     */
   def mineBlocks(req: MineBlocksRequest): ServiceResponse[MineBlocksResponse] = {
     consensus
-      .sendMiner(MineBlocks(req.numBlocks, req.withTransactions, req.parentBlock))
+      .askMiner(MineBlocks(req.numBlocks, req.withTransactions, req.parentBlock))
       .map(_ |> (MineBlocksResponse(_)) |> (_.asRight))
       .onErrorHandle { throwable =>
         log.warn("Unable to mine requested blocks", throwable)

src/main/scala/io/iohk/ethereum/testmode/TestmodeConsensus.scala

@@ -83,10 +83,15 @@ class TestmodeConsensus(
   override def startProtocol(node: Node): Unit = {}
   override def stopProtocol(): Unit = {}
 
+  /**
+    * Sends msg to the internal miner and waits for the response
+    */
+  override def askMiner(msg: MinerProtocol): Task[MinerResponse] = Task.now(MinerNotExist)
+
   /**
     * Sends msg to the internal miner
     */
-  override def sendMiner(msg: MinerProtocol): Task[MinerResponse] = Task.now(MinerNotExist)
+  override def sendMiner(msg: MinerProtocol): Unit = {}
 }
 
 trait TestmodeConsensusBuilder extends ConsensusBuilder {

src/test/scala/io/iohk/ethereum/jsonrpc/QAServiceSpec.scala

@@ -25,7 +25,7 @@ class QAServiceSpec
 
   "QAService" should "send msg to miner and return miner's response" in testCaseM { fixture =>
     import fixture._
-    (testConsensus.sendMiner _)
+    (testConsensus.askMiner _)
       .expects(mineBlocksMsg)
       .returning(Task.now(MiningOrdered))
       .atLeastOnce()
@@ -35,7 +35,7 @@ class QAServiceSpec
 
   it should "send msg to miner and return InternalError in case of problems" in testCaseM { fixture =>
     import fixture._
-    (testConsensus.sendMiner _)
+    (testConsensus.askMiner _)
       .expects(mineBlocksMsg)
       .returning(Task.raiseError(new ClassCastException("error")))
       .atLeastOnce()

src/universal/bin/eckeygen.bat

@@ -0,0 +1,5 @@
+@echo off
+
+cd "%~dp0\.."
+
+call bin\mantis.bat eckeygen %*

src/universal/bin/faucet-server.bat

@@ -0,0 +1,5 @@
+@echo off
+
+cd "%~dp0\.."
+
+call bin\mantis.bat faucet %*

src/universal/bin/mantis-launcher

@@ -3,11 +3,10 @@
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 cd $DIR/..
 
-chain="$1"
-if [ -z "$chain" ]
-then
-  echo "You need to choose chain"
-else
+CONFIG_FILE="./conf/$1.conf"
+if [ -f "$CONFIG_FILE" ]; then
   shift
-  ./bin/mantis -Dconfig.file=./conf/"$chain".conf "$@"
+  CHAIN_PARAM="-Dconfig.file=$CONFIG_FILE"
 fi
+
+./bin/mantis ${CHAIN_PARAM:+"$CHAIN_PARAM"} "$@"

src/universal/bin/mantis-launcher.bat

@@ -0,0 +1,19 @@
+@echo off
+
+cd "%~dp0\.."
+
+set "CONFIG_FILE=conf\%1.conf"
+set "RESTVAR=%*"
+
+if not exist %CONFIG_FILE% goto :skip
+    set "CHAIN_PARAM=-Dconfig.file=%CONFIG_FILE%"
+    set RESTVAR=
+    shift
+    :loop
+    if "%1"=="" goto skip
+        set RESTVAR=%RESTVAR% %1
+        shift
+        goto loop
+
+:skip
+call bin\mantis.bat %CHAIN_PARAM% %RESTVAR%

src/universal/bin/mantis-vm.bat

@@ -0,0 +1,5 @@
+@echo off
+
+cd "%~dp0\.."
+
+call bin\mantis.bat vm-server %*

src/universal/bin/signatureValidator.bat

@@ -0,0 +1,5 @@
+@echo off
+
+cd "%~dp0\.."
+
+call bin\mantis.bat signature-validator %*

src/universal/conf/application.ini

@@ -1 +1 @@
--Dconfig.file=./conf/app.conf -Dlogback.configurationFile=./conf/logback.xml -J-Xmx4g -J-Xss10M
+-J-Xmx4g -J-Xss10M