Merge remote-tracking branch 'origin/develop' into tweak/tweak-fast-sync-config-params

Author: KonradStaniec

.gitignore

@@ -5,6 +5,7 @@ project/plugins/project/
 .ensime
 .ensime_cache/
 .bloop
+out/
 
 # IDE folders
 .idea/
@@ -20,4 +21,4 @@ metals.sbt
 .evm-runner_history
 
 # Nix
-result
+result

build.sbt

@@ -126,7 +126,7 @@ Universal / mappings += (resourceDirectory in Compile).value / "logback.xml" ->
 
 val sep = java.io.File.separator
 jdkPackagerJVMArgs := Seq(
-  "-Dconfig.file=." + sep + "conf" + sep + "mantis.conf",
+  "-Dconfig.file=." + sep + "conf" + sep + "app.conf",
   "-Dlogback.configurationFile=." + sep + "conf" + sep + "logback.xml",
   "-Xss10M"
 )

insomnia_workspace.json

@@ -1,7 +1,7 @@
 {
   "_type": "export",
   "__export_format": 4,
-  "__export_date": "2020-09-16T09:48:00.794Z",
+  "__export_date": "2020-09-21T12:39:47.334Z",
   "__export_source": "insomnia.desktop.app:v2020.3.3",
   "resources": [
     {
@@ -198,6 +198,50 @@
       "parentId": "wrk_097d43914a4d4aea8b6f73f647921182",
       "_type": "request_group"
     },
+    {
+      "_id": "req_0ff71c4f648c4d3782612e9c53179321",
+      "authentication": {},
+      "body": {
+        "mimeType": "application/json",
+        "text": "{\n\t\"jsonrpc\": \"2.0\",\n  \"method\": \"eth_chainId\", \n\t\"params\": [],\n  \"id\": 1\n}"
+      },
+      "created": 1600691926224,
+      "description": "",
+      "headers": [
+        {
+          "id": "pair_c33a6ada19dd4aa8b75527639519f427",
+          "name": "Content-Type",
+          "value": "application/json"
+        }
+      ],
+      "isPrivate": false,
+      "metaSortKey": -1600691926224,
+      "method": "POST",
+      "modified": 1600691932451,
+      "name": "eth_chainId",
+      "parameters": [],
+      "parentId": "fld_a06eb77e183c4727800eb7dc43ceabe1",
+      "settingDisableRenderRequestBody": false,
+      "settingEncodeUrl": true,
+      "settingFollowRedirects": "global",
+      "settingRebuildPath": true,
+      "settingSendCookies": true,
+      "settingStoreCookies": true,
+      "url": "{{node_url}}",
+      "_type": "request"
+    },
+    {
+      "_id": "fld_a06eb77e183c4727800eb7dc43ceabe1",
+      "created": 1552939140291,
+      "description": "",
+      "environment": {},
+      "environmentPropertyOrder": null,
+      "metaSortKey": -1552939140292,
+      "modified": 1599825661277,
+      "name": "Eth",
+      "parentId": "wrk_097d43914a4d4aea8b6f73f647921182",
+      "_type": "request_group"
+    },
     {
       "_id": "req_b60c1a4f9d604d868910f967c6a070d7",
       "authentication": {},
@@ -235,18 +279,6 @@
       "url": "{{ node_url }}",
       "_type": "request"
     },
-    {
-      "_id": "fld_a06eb77e183c4727800eb7dc43ceabe1",
-      "created": 1552939140291,
-      "description": "",
-      "environment": {},
-      "environmentPropertyOrder": null,
-      "metaSortKey": -1552939140292,
-      "modified": 1599825661277,
-      "name": "Eth",
-      "parentId": "wrk_097d43914a4d4aea8b6f73f647921182",
-      "_type": "request_group"
-    },
     {
       "_id": "req_97fa82439e3e46bfb8ee26400af6215d",
       "authentication": {},
@@ -797,4 +829,4 @@
       "_type": "environment"
     }
   ]
-}
+}

project/Dependencies.scala

@@ -25,10 +25,10 @@ object Dependencies {
     )
   }
 
-  val json4s = Seq("org.json4s" %% "json4s-native" % "3.5.4")
+  val json4s = Seq("org.json4s" %% "json4s-native" % "3.6.9")
 
   val circe: Seq[ModuleID] = {
-    val circeVersion = "0.12.1" //0.9.3
+    val circeVersion = "0.13.0"
 
     Seq(
       "io.circe" %% "circe-core" % circeVersion,
@@ -45,28 +45,29 @@ object Dependencies {
   )
 
   val enumeratum: Seq[ModuleID] = Seq(
-    "com.beachape" %% "enumeratum" % "1.5.13",
-    "com.beachape" %% "enumeratum-cats" % "1.5.15",
-    "com.beachape" %% "enumeratum-scalacheck" % "1.5.16" % Test
+    "com.beachape" %% "enumeratum" % "1.6.1",
+    "com.beachape" %% "enumeratum-cats" % "1.6.1",
+    "com.beachape" %% "enumeratum-scalacheck" % "1.6.1" % Test
   )
 
   val testing: Seq[ModuleID] = Seq(
-    "org.scalatest" %% "scalatest" % "3.0.8" % "it,test",
-    "org.scalamock" %% "scalamock-scalatest-support" % "3.6.0" % "test",
+    "org.scalatest" %% "scalatest" % "3.2.2" % "it,test",
+    "org.scalamock" %% "scalamock" % "5.0.0" % "test",
+    "org.scalatestplus" %% "scalacheck-1-14" % "3.2.2.0" % "test",
     "org.scalacheck" %% "scalacheck" % "1.14.1" % "it,test"
   )
 
   val cats: Seq[ModuleID] = {
-    val catsVersion = "2.0.0"
+    val catsVersion = "2.2.0"
     Seq(
-      "org.typelevel" %% "mouse" % "0.23",
+      "org.typelevel" %% "mouse" % "0.25",
       "org.typelevel" %% "cats-core" % catsVersion,
       "org.typelevel" %% "cats-effect" % catsVersion
     )
   }
 
   val monix = Seq(
-    "io.monix" %% "monix" % "3.1.0"
+    "io.monix" %% "monix" % "3.2.2"
   )
 
   val logging = Seq(