Merge branch 'develop' into fix/fix-block-fetcher-bug

Author: Nicolás Tallar

.circleci/Dockerfile

@@ -26,8 +26,3 @@ RUN useradd --create-home -s /bin/bash circleci
 WORKDIR /home/circleci
 
 USER circleci
-
-RUN \
-  git clone --branch v0.4.1 --depth=1 https://github.com/input-output-hk/sbt-verify.git &&\
-  cd sbt-verify &&\
-  sbt publishLocal

.circleci/config.yml

@@ -2,7 +2,7 @@ version: 2
 jobs:
   build:
     environment:
-      - SBT: "sbt -v -mem 1024"
+      - SBT: "sbt -v -mem 2048"
     docker:
       - image: rtkaczyk/mantis-circleci:v6
     steps:
@@ -27,7 +27,6 @@ jobs:
 
       - run:
           name: EVM tests
-          # coverage ???
           command: $SBT coverage evm:test
 
       - run:
@@ -36,7 +35,7 @@ jobs:
 
       - run:
           name: coverage report
-          command: $SBT coverageReport coverageAggregate coveralls
+          command: $SBT coverageReport coverageAggregate
 
       - store_artifacts:
           path: target/scala-2.12/coverage-report

.travis.yml

@@ -1,27 +1,14 @@
-# Mantis - Scala Client for Ethereum Classic and Ethereum, The 2.0 Release
+# Mantis
 
-This release of *Mantis*, the new Ethereum Classic and Ethereum client produced by the [Grothendieck Team](https://iohk.io/projects/ethereum-classic/),
-has been focused on improving general performance and introducing full Ethereum network support.
+Ethereum-like Blockchain Scala client built by IOHK's Team Grothendieck.
 
-This version has been tested on recent versions of Windows and macOS
+### Status
 
-### Status - CLI 2.0 Release
+Continuous Integration Build Status [FIXME]
 
-Continuous Integration Build Status [![CircleCI](https://circleci.com/gh/input-output-hk/mantis/tree/phase%2Frelease2_0.svg?style=svg)](https://circleci.com/gh/input-output-hk/mantis/tree/phase%2Frelease2_0)
-
-Unit Test Code Coverage Status [![Coverage Status](https://coveralls.io/repos/github/input-output-hk/mantis/badge.svg?branch=phase%2Frelease2_0)](https://coveralls.io/github/input-output-hk/mantis?branch=phase%2Frelease2_0)
-
-This version of the code supports
-
-  - CPU mining
-  - peer discovery
-  - fast sync (download a recent state trie snapshot and all blocks, this is the default behaviour)
-  - regular sync (download and execute every transaction in every block in the chain)
-  - JSON RPC API (useful for console and Mist integration)
-  - Morden and Ropsten testnets and private network
-  - Ethereum classic and Ethereum networks
-  - `ethminer` miner integration (allows *mantis* to mine blocks with [ethminer](https://github.com/Genoil/cpp-ethereum))
+Unit Test Code Coverage Status [FIXME]
 
+// FIXME: Should we continue using this? or should we migrate to atlassian wiki?
 For more details on configuration and functionality check out our [wiki](http://mantis.readthedocs.io) (also at [wiki](https://github.com/input-output-hk/mantis/wiki))
 
 ### Download the client
@@ -46,24 +33,6 @@ Depending on network you want to join you can use appropriate launcher, all can
 
 As an alternative to downloading the client build the client from source.
 
-First of all `sbt-verify` is used in order to check the validity of the downloaded libraries checksums.
-
-`sbt-verify` can be downloaded from our read only repository by typing
-
-```
-git clone  https://github.com/input-output-hk/sbt-verify
-```
-
- Then in order to make `sbt-verify` available to our build type
-
-```
-cd sbt-verify
-sbt publishLocal
-```
-
-This installs the `sbt-verify` library to your local repository.
-
-After installing the `sbt-verify` library to your local repository checkout this repository from github and then type
 
 ```
 git submodule update --recursive --init

README.md

@@ -2,28 +2,29 @@ enablePlugins(JDKPackagerPlugin, JavaAppPackaging, SolidityPlugin)
 
 val commonSettings = Seq(
   name := "mantis",
-  version := "2.0",
-  scalaVersion := "2.12.5",
+  version := "3.0",
+  scalaVersion := "2.12.12",
   testOptions in Test += Tests.Argument(TestFrameworks.ScalaTest, "-l", "EthashMinerSpec") // miner tests disabled by default
 )
 
 // Resolver for rocksDb
 resolvers += "rocksDb" at "https://dl.bintray.com/ethereum/maven/"
 
 val dep = {
-  val akkaVersion = "2.5.12"
-  val akkaHttpVersion = "10.1.1"
+  val akkaVersion = "2.6.9"
+  val akkaHttpVersion = "10.2.0"
   val circeVersion = "0.9.3"
   val rocksDb = "5.9.2"
 
   Seq(
     "com.typesafe.akka" %% "akka-actor" % akkaVersion,
     "com.typesafe.akka" %% "akka-slf4j" % akkaVersion,
     "com.typesafe.akka" %% "akka-testkit" % akkaVersion,
+    "com.typesafe.akka" %% "akka-stream" % akkaVersion,
     "com.typesafe.akka" %% "akka-http" % akkaHttpVersion,
-    "ch.megard" %% "akka-http-cors" % "0.3.0",
+    "ch.megard" %% "akka-http-cors" % "1.1.0",
     "org.json4s" %% "json4s-native" % "3.5.4",
-    "de.heikoseeberger" %% "akka-http-json4s" % "1.21.0",
+    "de.heikoseeberger" %% "akka-http-json4s" % "1.34.0",
     "com.typesafe.akka" %% "akka-http-testkit" % akkaHttpVersion % "it,test",
     "io.suzaku" %% "boopickle" % "1.3.0",
     "org.ethereum" % "rocksdbjni" % rocksDb,
@@ -37,9 +38,8 @@ val dep = {
     "io.circe" %% "circe-generic" % circeVersion,
     "io.circe" %% "circe-parser" % circeVersion,
     "io.circe" %% "circe-generic-extras" % circeVersion,
-    "com.miguno.akka" %% "akka-mock-scheduler" % "0.5.1" % "it,test",
+    "com.miguno.akka" %% "akka-mock-scheduler" % "0.5.5" % "it,test",
     "commons-io" % "commons-io" % "2.6",
-    "com.typesafe.akka" %% "akka-stream" % akkaVersion,
     "org.scala-sbt.ipcsocket" % "ipcsocket" % "1.0.0",
     "org.bouncycastle" % "bcprov-jdk15on" % "1.59",
     "com.typesafe.scala-logging" %% "scala-logging" % "3.9.0",
@@ -50,7 +50,6 @@ val dep = {
     // mallet deps
     "org.jline" % "jline" % "3.1.2",
     "net.java.dev.jna" % "jna" % "4.5.1",
-    "org.scala-lang.modules" %% "scala-parser-combinators" % "1.0.5",
     "com.github.scopt" %% "scopt" % "3.7.0",
 
     // Metrics (https://github.com/DataDog/java-dogstatsd-client)
@@ -77,17 +76,7 @@ val root = project.in(file("."))
     .settings(commonSettings: _*)
     .settings(
       libraryDependencies ++= dep,
-      verifyOutputFile in verifyGenerate := baseDirectory.value / "verify.sbt",
-      verifyOptions in verify := VerifyOptions(
-        includeBin = true,
-        includeScala = true,
-        includeDependency = true,
-        excludedJars = Nil,
-        warnOnUnverifiedFiles = false,
-        warnOnUnusedVerifications = false
-      ),
-      executableScriptName := name.value,
-      dist in Universal := ((dist in Universal) dependsOn verify).value
+      executableScriptName := name.value
     )
     .settings(inConfig(Integration)(Defaults.testSettings) : _*)
     .settings(inConfig(Benchmark)(Defaults.testSettings) : _*)
@@ -114,7 +103,7 @@ scalacOptions in (Compile, console) ~= (_.filterNot(Set(
 
 parallelExecution in Test := false
 
-testOptions in Test += Tests.Argument("-oDT")
+testOptions in Test += Tests.Argument("-oDG")
 
 // protobuf compilation
 PB.targets in Compile := Seq(

build.sbt

@@ -10,13 +10,6 @@ HERE=$(readlink -m $(dirname ${BASH_SOURCE[0]}))
 
 mkdir ~/repos
 
-cd ~/repos
-git clone https://github.com/input-output-hk/sbt-verify.git
-cd sbt-verify
-git checkout $SBT_VERIFY_TAG
-# This is needed, since the library is not published in binary form. 
-sbt publishLocal
-
 cd ~/repos
 git clone https://github.com/input-output-hk/mantis.git
 cd mantis