Merge branch 'iroha2-dev' into iroha2-dev

Signed-off-by: Asem Abdelhady <[email protected]>
Signed-off-by: Asem-Abdelhady <[email protected]>

.github/workflows/iroha2-dev-pr.yml

@@ -66,8 +66,7 @@ jobs:
         uses: coverallsapp/github-action@v2
         with:
           file: lcov.info
-          compare-ref: ${{ github.base_ref }}
-          compare-sha: ${{ github.event.pull_request.base.sha}}
+          git-branch: ${{ github.base_ref }}
           github-token: ${{ secrets.GITHUB_TOKEN }}
           allow-empty: true
           fail_ci_if_error: true

README.md

@@ -157,7 +157,18 @@ A brief overview on how to configure and maintain an Iroha instance:
 
 ### Configuration
 
-**Note:** this section is under development. You can track it in the [issue](https://github.com/hyperledger/iroha-2-docs/issues/392).
+There is a set of configuration parameters that could be passed either through a configuration file or environment variables.
+
+```shell
+# look for `config.json` or `config.json5` (won't fail if files are not found)
+iroha 
+
+# Override default config path through CLI or ENV
+iroha --config /path/to/config.json
+IROHA_CONFIG=/path/to/config.json iroha
+```
+
+**Note:** detailed configuration reference is [work in progress](https://github.com/hyperledger/iroha-2-docs/issues/392).
 
 ### Endpoints
 
@@ -198,9 +209,9 @@ prometheus --config.file=configs/prometheus.yml
 
 ### Storage
 
-The blocks are written to the `blocks` sub-folder, which is created automatically by Iroha in the working directory of the peer. Additionally, if specified, the logging file must also be stored in a user-specified directory.
+Iroha stores blocks and snapshots in the `storage` directory, which is created automatically by Iroha in the working directory of the peer. If `kura.block_store_path` is specified in the config file, it overrides the default one and is resolved relative to the config file location.
 
-No additional storage is necessary.
+**Note:** detailed configuration reference is [work in progress](https://github.com/hyperledger/iroha-2-docs/issues/392).
 
 ### Scalability
 

cli/Cargo.toml

@@ -55,6 +55,7 @@ iroha_torii = { workspace = true }
 iroha_genesis = { workspace = true }
 iroha_wasm_builder = { workspace = true }
 
+clap = { workspace = true, features = ["derive", "env", "string"] }
 color-eyre = { workspace = true }
 eyre = { workspace = true }
 tracing = { workspace = true }
@@ -67,6 +68,11 @@ thread-local-panic-hook = { version = "0.1.0", optional = true }
 
 [dev-dependencies]
 serial_test = "2.0.0"
+tempfile = { workspace = true }
+serde_json = { workspace = true }
+futures = { workspace = true }
+path-absolutize = { workspace = true }
+assertables = "7"
 
 [build-dependencies]
 iroha_wasm_builder = { workspace = true }