Merge ETCM-311 into branch

Author: 1015bit

.buildkite/pipeline.nix

@@ -1,14 +1,12 @@
 { cfg, pkgs, ... }:
 
 with cfg.steps.commands;
-
 let
   commonAttrs = {
     retry.automatic = true;
     agents.queue = "project42";
   };
 in
-
 {
   steps.commands = {
     nixExpr = commonAttrs // {
@@ -97,6 +95,19 @@ in
       ];
     };
 
+    annotate-test-reports = commonAttrs // {
+      dependsOn = [ test-unit ];
+      label = "annotate test reports";
+      command = "junit-annotate";
+      allowDependencyFailure = true;
+      plugins = [{
+        "junit-annotate#1.9.0" = {
+          artifacts = "target/test-reports/*.xml";
+          report-slowest = 50;
+        };
+      }];
+    };
+
     test-evm = commonAttrs // {
       dependsOn = [ compile ];
       label = "EVM tests";

.gitignore

@@ -24,3 +24,6 @@ metals.sbt
 # Nix
 result
 .nix/
+
+# sonarScan
+.scannerwork/

README.md

@@ -14,15 +14,15 @@ Unit Test Code Coverage Status - TBD
 
 ### Docs - FIXME: Update docs!
 
-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))
+For more details on configuration and functionality check out our [website](https://docs.mantisclient.io/first-steps/getting-started) and [documentation](https://docs.mantisclient.io/first-steps/getting-started)
 
 ### Download the client
 
 The latest release can be downloaded from [here](https://github.com/input-output-hk/mantis/releases)
 
 ### Command line version
 
-You can use generic launcher with appropriate parameter to connect with pre-configured network, it can be found in `bin` directory.
+In the `bin` directory, you can find the generic launcher. To connect to a pre-configured network just pass the network name as a parameter.
 
 Example:
   - `./bin/mantis-launcher etc` - for joining Ethereum Classic network
@@ -55,7 +55,7 @@ Possible networks: `etc`, `eth`, `mordor`, `testnet-internal`
 ./bin/mantis cli encrypt-key --passphrase=pass 00b11c32957057651d56cd83085ef3b259319057e0e887bd0fdaee657e6f75d0
 ```
 
-Command output uses the same format as keystore so it could be used ex. to setup private faucet
+The command output uses the same format as the keystore so it could be used ex. to setup private faucet
 
 ex.
 ```
@@ -135,20 +135,20 @@ git commit -m "Update nix-sbt sha"
 
 #### Locally build & run monitoring client
 
-Setup a dashboard using Prometheus and Grafana, popular choice of monitoring stack.
-Before that you need enable the metrics in the file “metrics.conf”, setting mantis.metrics.enabled=true.
+A docker-compose setup using Prometheus and Grafana, and a preconfigured dashboard, is available.
+As a precondition you need to have docker and sbt installed.
+Before running the script, you need to enable metrics by editing the file `metrics.conf` and setting `mantis.metrics.enabled=true`
 
-You can start Docker Compose initializing Prometheus and Grafana with a preconfigured dashboard.
-For build the monitoring, you need to run the  following script: `./docker/monitoring/build.sh`
-This script prepares a docker image of mantis. And as a precondition you need to have installed docker-compose and sbt.
+To build the monitoring, run the following script at `./docker/mantis/build.sh`.
+This script builds a docker image of mantis using the local sources and starts the docker-compose.
 
-We can see the dashboard called "Mantis" at URL: http://localhost:3000 using user and password: admin and admin
+Grafana will be available at http://localhost:3000 (using user and password: admin and admin) with a dashboard called `Mantis`.
 
 
 ### TLS setup
 
 Both the JSON RPC (on the node and faucet) can be additionally protected using TLS.
-On the development environment it's already properly configured with a development certificate.
+The development environment it already properly configured with a development certificate.
 
 #### Generating a new certificate
 
@@ -159,7 +159,9 @@ If a new certificate is required, create a new keystore with a certificate by ru
 1. Configure the certificate and password file to be used at `mantis.network.rpc.http.certificate` key on the `application.conf` file:
 
     keystore-path: path to the keystore storing the certificates (if generated through our script they are by default located in "./tls/mantisCA.p12")
+   
     keystore-type: type of certificate keystore being used (if generated through our script use "pkcs12")
+   
     password-file: path to the file with the password used for accessing the certificate keystore (if generated through our script they are by default located in "./tls/password")
 2. Enable TLS in specific config:
     - For JSON RPC: `mantis.network.rpc.http.mode=https`
@@ -168,18 +170,90 @@ If a new certificate is required, create a new keystore with a certificate by ru
 
 1. Configure the certificate and password file to be used at `mantis.network.rpc.http.certificate` key on the `faucet.conf` file:
 
-    keystore-path: path to the keystore storing the certificates (if generated through our script they are by default located in "./tls/mantisCA.p12")
-    keystore-type: type of certificate keystore being used (if generated through our script use "pkcs12")
-    password-file: path to the file with the password used for accessing the certificate keystore (if generated through our script they are by default located in "./tls/password")
+   keystore-path: path to the keystore storing the certificates (if generated through our script they are by default located in "./tls/mantisCA.p12")
+   
+   keystore-type: type of certificate keystore being used (if generated through our script use "pkcs12")
+   
+   password-file: path to the file with the password used for accessing the certificate keystore (if generated through our script they are by default located in "./tls/password")
 2. Enable TLS in specific config:
-    - For JSON RPC: `mantis.network.rpc.http.mode=https`
-3. Configure the certificate used from RpcClient to connect with the node. Necessary if the node uses http secure. 
+   - For JSON RPC: `mantis.network.rpc.http.mode=https`
+3. Configure the certificate used from RpcClient to connect with the node. Necessary if the node uses http secure.
    This certificate and password file to be used at `faucet.rpc-client.certificate` key on the `faucet.conf` file:
 
-    keystore-path: path to the keystore storing the certificates
-    keystore-type: type of certificate keystore being used (if generated through our script use "pkcs12")
-    password-file: path to the file with the password used for accessing the certificate keystore
+   keystore-path: path to the keystore storing the certificates
+   keystore-type: type of certificate keystore being used (if generated through our script use "pkcs12")
+   password-file: path to the file with the password used for accessing the certificate keystore
+
+### Faucet setup and testing
+1. First start a client node using the docker-compose, by running the script found at `./docker/mantis/build.sh`
+Modify the script before running it by adding the `volumes` and `command` sections to mantis configuration:
+```
+mantis:
+image: mantis:latest
+ports:
+- 8546:8546
+- 13798:13798
+- 9095:9095
+networks:
+- mantis-net
+volumes:
+- $HOME/.mantis:/home/demiourgos728/.mantis/
+command: -Dconfig.file=./conf/sagano.conf
+```
+   
+2. Create a wallet address. Run the following curl command, replacing `<password>` by a password of your choice:
+```
+curl --request POST \
+  --url http://127.0.0.1:8546/ \
+  --header 'Cache-Control: no-cache' \
+  --header 'Content-Type: application/json' \
+  --data '{
+	"jsonrpc": "2.0",
+  "method": "personal_newAccount", 
+  "params": ["<password>"],
+  "id": 1
+}'
+```
+
+You will receive a response like this:
+```
+{"jsonrpc":"2.0","result":"<address>","id":1}
+```
+
+3. Modify `src/universal/conf/faucet.conf` file, config your account address created in the previous step. with the password choosen by you:
+```
+wallet-address = "<address>"
+wallet-password = "<password>"
+```
+
+4. Now check the `keystore` folder in `~/.mantis/testnet-internal-nomad/keystore`.
+Inside you will find a key generate with the curl request sent in step `2.`. Copy that file to `~/.mantis-faucet/keystore/`:
+```
+cp UTC--<date>--<key> ~/.mantis-faucet/keystore/
+```
+
+5. Start the faucet in command line:
+```
+sbt -Dconfig.file=src/universal/conf/faucet.conf "run faucet"
+```
+
+6. Run the following curl command to send tokens from your faucet to a wallet address:
+```
+curl --request POST \
+  --url http://127.0.0.1:8099/ \
+  --header 'Content-Type: application/json' \
+  --data '{
+	"jsonrpc": "2.0",
+  "method": "faucet_sendFunds", 
+  "params": ["<address>"],
+  "id": 1
+}'
+```
+
+Happy transfer!
 
+Note: In order for the transfer transaction be persisted, a faucet needs sufficient founds in its account and in this test
+case a new faucet, without ETC tokens, is being created.
 
 ### Feedback
 

build.sbt

@@ -111,24 +111,26 @@ lazy val node = {
     Seq(
       Dependencies.akka,
       Dependencies.akkaHttp,
-      Dependencies.json4s,
-      Dependencies.circe,
+      Dependencies.apacheCommons,
       Dependencies.boopickle,
-      Dependencies.rocksDb,
-      Dependencies.enumeratum,
-      Dependencies.testing,
       Dependencies.cats,
-      Dependencies.monix,
-      Dependencies.network,
+      Dependencies.circe,
+      Dependencies.cli,
       Dependencies.crypto,
-      Dependencies.scopt,
+      Dependencies.dependencies,
+      Dependencies.enumeratum,
+      Dependencies.guava,
+      Dependencies.json4s,
+      Dependencies.kamon,
       Dependencies.logging,
-      Dependencies.apacheCommons,
       Dependencies.micrometer,
-      Dependencies.kamon,
+      Dependencies.monix,
+      Dependencies.network,
       Dependencies.prometheus,
-      Dependencies.cli,
-      Dependencies.dependencies
+      Dependencies.rocksDb,
+      Dependencies.scaffeine,
+      Dependencies.scopt,
+      Dependencies.testing
     ).flatten ++ malletDeps
   }
 
@@ -253,3 +255,6 @@ addCommandAlias(
     |;it:test
     |""".stripMargin
 )
+
+scapegoatVersion in ThisBuild := "1.4.7"
+scapegoatReports := Seq("xml")

ci-like/Dockerfile

@@ -0,0 +1,11 @@
+FROM nixos/nix
+
+RUN apk --update add git less openssh && \
+    rm -rf /var/lib/apt/lists/* && \
+    rm /var/cache/apk/*
+
+RUN nix-channel --add https://nixos.org/channels/nixpkgs-unstable nixpkgs
+RUN nix-channel --update
+
+RUN nix-build -A pythonFull '<nixpkgs>'
+

ci-like/nix.conf

@@ -0,0 +1,4 @@
+sandbox = false
+experimental-features = nix-command flakes ca-references
+substituters = https://hydra.iohk.io https://cache.nixos.org https://mantis-ops.cachix.org
+trusted-public-keys = hydra.iohk.io:f/Ea+s+dFdN+3Y/G+FDgSq+a5NEWhJGzdjvKNGv0/EQ= cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY= mantis-ops.cachix.org-1:SornDcX8/9rFrpTjU+mAAb26sF8mUpnxgXNjmKGcglQ=