[ETCM-121] Refactor configs

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"
 )

src/main/resources/application.conf

@@ -255,17 +255,17 @@ mantis {
   blockchains {
     network = "etc"
 
-    etc { include "chains/etc.conf" }
+    etc { include "chains/etc-chain.conf"}
 
-    eth { include "chains/eth.conf" }
+    eth { include "chains/eth-chain.conf"}
 
-    mordor { include "chains/mordor.conf"}
+    mordor { include "chains/mordor-chain.conf"}
 
-    ropsten { include "chains/ropsten.conf" }
+    ropsten { include "chains/ropsten-chain.conf"}
 
-    test { include "chains/test.conf" }
+    test { include "chains/test-chain.conf"}
 
-    private { include "chains/private.conf" }
+    testnet-internal { include "chains/testnet-internal-chain.conf"}
   }
 
   sync {

src/main/resources/chains/etc-chain.conf

@@ -0,0 +1 @@
+{ include "base-chain.conf"}

src/main/resources/chains/eth.conf → src/main/resources/chains/eth-chain.conf

@@ -1,5 +1,5 @@
 {
-  include "etc.conf"
+  include "base-chain.conf"
 
   eip150-block-number = "2463000"
   eip155-block-number = "2675000"

src/main/resources/chains/mordor.conf → src/main/resources/chains/mordor-chain.conf

@@ -90,7 +90,7 @@
 
   # Custom genesis JSON file path
   # null value indicates using default genesis definition that matches the main network
-  custom-genesis-file = "chains/mordor.json"
+  custom-genesis-file = "chains/mordor-genesis.json"
 
   # Monetary policy parameters
   # Doc: https://github.com/ethereumproject/ECIPs/blob/master/ECIPs/ECIP-1017.md

src/main/resources/chains/ropsten.conf → src/main/resources/chains/ropsten-chain.conf

@@ -1,5 +1,5 @@
 {
-  include "base.conf"
+  include "base-chain.conf"
 
   frontier-block-number = "0"
   homestead-block-number = "0"
@@ -48,7 +48,7 @@
 
   network-id = 3
 
-  custom-genesis-file = "chains/ropsten.json"
+  custom-genesis-file = "chains/ropsten-genesis.json"
 
   bootstrap-nodes = [
     "enode://20c9ad97c081d63397d7b685a412227a40e23c8bdc6688c6f37e97cfbc22d2b4d1db1510d8f61e6a8866ad7f0e17c02b14182d37ea7c3c8b9c2683aeb6b733a1@52.169.14.227:30303",

src/main/resources/chains/test.conf → src/main/resources/chains/test-chain.conf

@@ -1,5 +1,5 @@
 {
-  include "base.conf"
+  include "base-chain.conf"
   eip160-block-number = "0"
   bootstrap-nodes = []
 }

src/main/resources/chains/private.conf → src/main/resources/chains/testnet-internal-chain.conf

@@ -1,5 +1,5 @@
 {
-    include "base.conf"
+    include "base-chain.conf"
     frontier-block-number = "0"
     homestead-block-number = "0"
     eip150-block-number = "0"
@@ -14,7 +14,7 @@
 
     chain-id = "0x2A"
     network-id = 42
-    custom-genesis-file = "chains/private.json"
+    custom-genesis-file = "chains/testnet-internal-genesis.json"
     dao = null
     bootstrap-nodes = []
 }

src/rpcTest/resources/privateNetConfig/conf/rpc-test-private.conf

@@ -1,4 +1,4 @@
-include "mantis.conf"
+include "app.conf"
 
 mantis {
 

src/universal/bin/mantis-etc

@@ -1,3 +1,3 @@
 #!/bin/bash
 
-./bin/mantis -Dmantis.blockchains.network=etc "$@"
+./bin/mantis -Dconfig.file=./conf/etc.conf "$@"

src/universal/bin/mantis-eth

@@ -1,3 +1,3 @@
 #!/bin/bash
 
-./bin/mantis -Dmantis.blockchains.network=eth -Dmantis.pruning.mode=inmemory -Dmantis.pruning.history=64 "$@"
+./bin/mantis -Dconfig.file=./conf/eth.conf "$@"

src/universal/bin/mantis-mordor

@@ -0,0 +1,3 @@
+#!/bin/bash
+
+./bin/mantis -Dconfig.file=./conf/mordor.conf "$@"

src/universal/bin/mantis-testnet-internal

@@ -0,0 +1,3 @@
+#!/bin/bash
+
+./bin/mantis -Dconfig.file=./conf/testnet-internal.conf "$@"

src/universal/conf/app.conf

@@ -0,0 +1,23 @@
+# This is the base configuration file for the Mantis ETC client.
+
+# This where all the default settings are defined (this file is packaged within the executable).
+# It should always go at the top.
+include "application.conf"
+
+# Enable HTTPS
+mantis {
+  network {
+    rpc {
+      http {
+        mode = "https"
+
+        certificate-keystore-path = "conf/mantis.jks"
+
+        certificate-keystore-type = "jks"
+
+        certificate-password-file = "conf/nopassword"
+
+      }
+    }
+  }
+}

src/universal/conf/application.ini

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

src/universal/conf/etc.conf

@@ -0,0 +1,7 @@
+include "app.conf"
+
+mantis {
+  blockchains {
+    network = "etc"
+  }
+}

src/universal/conf/eth.conf

@@ -0,0 +1,14 @@
+include "app.conf"
+
+mantis {
+  blockchains {
+    network = "eth"
+  }
+
+
+  pruning {
+    mode = "inmemory"
+
+    history = 64
+  }
+}

src/universal/conf/mordor.conf

@@ -0,0 +1,7 @@
+include "app.conf"
+
+mantis {
+  blockchains {
+    network = "mordor"
+  }
+}