[ETCM-202] PR remarks + update README

Author: Michal Mrozek

README.md

@@ -41,10 +41,9 @@ Possible networks: `etc`, `eth`, `mordor`, `testnet-internal`
 ```
 ./bin/mantis cli derive-address 00b11c32957057651d56cd83085ef3b259319057e0e887bd0fdaee657e6f75d0
 ```
- - generate genesis allocs (using private keys or addresses)
+ - generate genesis allocs (using private keys and/or addresses)
 ```
-(private keys) `./bin/mantis cli generate-alloc --balance=42 00b11c32957057651d56cd83085ef3b259319057e0e887bd0fdaee657e6f75d0 00b11c32957057651d56cd83085ef3b259319057e0e887bd0fdaee657e6f75d1`
-(addresses) `./bin/mantis cli generate-alloc --balance=42 --useAddresses 8b196738d90cf3d9fc299e0ec28e15ebdcbb0bdcb281d9d5084182c9c66d5d12`
+`./bin/mantis cli generate-alloc --balance=42 --address=8b196738d90cf3d9fc299e0ec28e15ebdcbb0bdcb281d9d5084182c9c66d5d12 --key=00b11c32957057651d56cd83085ef3b259319057e0e887bd0fdaee657e6f75d1`
 ```
 
 ### Building the client

src/main/scala/io/iohk/ethereum/App.scala

@@ -18,7 +18,7 @@ object App extends Logger {
     val mallet = "mallet"
     val faucet = "faucet"
     val ecKeyGen = "eckeygen"
-    val cli = "mantis-cli"
+    val cli = "cli"
 
     args.headOption match {
       case None => Mantis.main(args)

src/main/scala/io/iohk/ethereum/cli/CliCommands.scala

@@ -1,7 +1,6 @@
 package io.iohk.ethereum.cli
 
 import cats.implicits._
-import cats.data.NonEmptyList
 import com.monovore.decline.{Command, Opts}
 import io.iohk.ethereum.crypto
 import io.iohk.ethereum.crypto._
@@ -39,18 +38,20 @@ object CliCommands {
   private val GenerateAllocs: Command[String] =
     Command(name = generateAllocsCommand, header = "Generate genesis allocs") {
 
-      val keysOpt: Opts[NonEmptyList[String]] =
+      val keysOpt: Opts[List[String]] =
         Opts
           .options[String](long = keyOption, help = "Private key")
           .map(_.map(key => privKeyToAddress(Hex.decode(key))))
+          .orEmpty
 
-      val addressesOpt: Opts[NonEmptyList[String]] = Opts.options[String](long = addressOption, help = "Address")
+      val addressesOpt: Opts[List[String]] =
+        Opts.options[String](long = addressOption, help = "Address").orEmpty
 
       val balanceOpt =
         Opts.option[BigInt](long = balanceOption, help = "Initial balance for account", metavar = "balance")
 
-      (keysOpt.orElse(addressesOpt), balanceOpt).mapN { (addresses, balance) =>
-        allocs(addresses.toList, balance)
+      (keysOpt, addressesOpt, balanceOpt).mapN { (addressesFromKeys, addresses, balance) =>
+        allocs(addresses ++ addressesFromKeys, balance)
       }
     }
 

src/test/scala/io/iohk/ethereum/cli/CliCommandsSpec.scala

@@ -65,6 +65,21 @@ class CliCommandsSpec extends AnyFlatSpec with Matchers with EitherValues {
       .value shouldBe s""""alloc": {$address: { "balance": $requestedBalance }, $address2: { "balance": $requestedBalance }}"""
   }
 
+  it should "generate allocs using both keys and addresses" in {
+    api
+      .parse(
+        Seq(
+          generateAllocsCommand,
+          argument(addressOption, Some(address)),
+          argument(keyOption, Some(privateKey2)),
+          argument(addressOption, Some(address3)),
+          argument(balanceOption, Some(requestedBalance))
+        )
+      )
+      .right
+      .value shouldBe s""""alloc": {$address: { "balance": $requestedBalance }, $address3: { "balance": $requestedBalance }, $address2: { "balance": $requestedBalance }}"""
+  }
+
 }
 
 object Fixture {
@@ -73,9 +88,11 @@ object Fixture {
 
   val privateKey = "00b11c32957057651d56cd83085ef3b259319057e0e887bd0fdaee657e6f75d0"
   val privateKey2 = "00b11c32957057651d56cd83085ef3b259319057e0e887bd0fdaee657e6f75d1"
+  val privateKey3 = "00b11c32957057651d56cd83085ef3b259319057e0e887bd0fdaee657e6f75d2"
 
   val address = "8b196738d90cf3d9fc299e0ec28e15ebdcbb0bdcb281d9d5084182c9c66d5d12"
   val address2 = "add8c627e14480b36b30811758240d8acb282aae883043990d8a2d7e2e75cf3b"
+  val address3 = "1e9cd60cf3b2c902e60f809e604542f9a9fb55d3e8004ff122f662f88eb32b4a"
 
   val requestedBalance = 42