Merge remote-tracking branch 'origin/feature/eckeygen' into phase/iele_testnet

Author: rtkaczyk

.gitignore

@@ -5,7 +5,6 @@ project/boot/
 project/plugins/project/
 .ensime
 .ensime_cache/
-nodeId.keys
 
 # intellij scala worksheet
 *.sc

src/main/resources/application.conf

@@ -9,7 +9,7 @@ mantis {
   datadir = ${user.home}"/.mantis"
 
   # The unencrypted private key of this node
-  node-key-file = ${mantis.datadir}"/nodeId.keys"
+  node-key-file = ${mantis.datadir}"/node.key"
 
   # Keystore directory: stores encrypted private keys of accounts managed by this node
   keystore-dir = ${mantis.datadir}"/keystore"

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

@@ -1,5 +1,6 @@
 package io.iohk.ethereum
 
+import io.iohk.ethereum.crypto.EcKeyGen
 import io.iohk.ethereum.extvm.VmServerApp
 import io.iohk.ethereum.faucet.Faucet
 import io.iohk.ethereum.mallet.main.Mallet
@@ -16,6 +17,7 @@ object App extends Logger {
     val vmServer = "vm-server"
     val mallet = "mallet"
     val faucet = "faucet"
+    val ecKeyGen = "eckeygen"
 
       args.headOption match {
         case None => Mantis.main(args)
@@ -25,9 +27,11 @@ object App extends Logger {
         case Some(`vmServer`) => VmServerApp.main(args.tail)
         case Some(`mallet`) => Mallet.main(args.tail)
         case Some(`faucet`) => Faucet.main(args.tail)
+        case Some(`ecKeyGen`) => EcKeyGen.main(args.tail)
         case Some(unknown) =>
           log.error(s"Unrecognised launcher option, " +
-            s"first parameter must be $launchKeytool, $downloadBootstrap, $launchMantis, $mallet, $faucet or $vmServer")
+            s"first parameter must be $launchKeytool, $downloadBootstrap, $launchMantis, " +
+            s"$mallet, $faucet, $vmServer or $ecKeyGen")
       }
 
 

src/main/scala/io/iohk/ethereum/crypto/EcKeyGen.scala

@@ -0,0 +1,21 @@
+package io.iohk.ethereum.crypto
+
+import io.iohk.ethereum.nodebuilder.SecureRandomBuilder
+
+/**
+  * A simple tool to generate and ECDSA key pair. The key pair will be printed in the format:
+  *   priv-key-hex (32 bytes)
+  *   pub-key-hex (64 bytes)
+  *
+  * Run:
+  *   ./eckeygen > mantis-datadir/node.key
+  *
+  * to generate the private key for the node. Note that only the private key will be read upon Mantis boot,
+  * and the second line is equivalent to node ID.
+  * The tool can also be used to generate keys for an Ethereum account.
+  */
+object EcKeyGen extends App with SecureRandomBuilder {
+  val (prv, pub) = newRandomKeyPairAsStrings(secureRandom)
+  //scalastyle:off
+  println(prv + "\n" + pub)
+}

src/main/scala/io/iohk/ethereum/crypto/package.scala

@@ -11,6 +11,7 @@ import org.spongycastle.crypto.AsymmetricCipherKeyPair
 import org.spongycastle.crypto.digests.{RIPEMD160Digest, SHA256Digest}
 import org.spongycastle.crypto.generators.{ECKeyPairGenerator, PKCS5S2ParametersGenerator, SCrypt}
 import org.spongycastle.crypto.params._
+import org.spongycastle.util.encoders.Hex
 
 package object crypto {
 
@@ -82,6 +83,12 @@ package object crypto {
   def pubKeyFromPrvKey(prvKey: ByteString): ByteString =
     ByteString(pubKeyFromPrvKey(prvKey.toArray))
 
+  def newRandomKeyPairAsStrings(secureRandom: SecureRandom = new SecureRandom): (String, String) = {
+    val keyPair = generateKeyPair(secureRandom)
+    val (prv, pub) = keyPairToByteArrays(keyPair)
+    (Hex.toHexString(prv), Hex.toHexString(pub))
+  }
+
   def ripemd160(input: Array[Byte]): Array[Byte] = {
     val digest = new RIPEMD160Digest
     digest.update(input, 0, input.length)

src/main/scala/io/iohk/ethereum/network/package.scala

@@ -34,11 +34,11 @@ package object network {
       val keysValuePair = generateKeyPair(secureRandom)
 
       //Write keys to file
-      val (priv, _) = keyPairToByteArrays(keysValuePair)
+      val (priv, pub) = keyPairToByteArrays(keysValuePair)
       require(file.getParentFile.exists() || file.getParentFile.mkdirs(), "Key's file parent directory creation failed")
       val writer = new PrintWriter(filePath)
       try {
-        writer.write(Hex.toHexString(priv))
+        writer.write(Hex.toHexString(priv) + "\n" + Hex.toHexString(pub))
       } finally {
         writer.close()
       }
@@ -47,7 +47,7 @@ package object network {
     } else {
       val reader = Source.fromFile(filePath)
       try {
-        val privHex = reader.mkString
+        val privHex = reader.getLines().next()
         keyPairFromPrvKey(Hex.decode(privHex))
       } finally {
         reader.close()

src/universal/bin/eckeygen

@@ -0,0 +1,5 @@
+#!/bin/bash
+
+DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+cd $DIR/..
+./bin/mantis -- eckeygen "$@"

src/universal/conf/storage.conf

@@ -1,34 +1,34 @@
-mantis {
-
-  # Base directory where all the data used by the node is stored, including blockchain data and private keys
-  # datadir = ${user.home}"/.mantis"
-
-  # The unencrypted private key of this node
-  # node-key-file = ${mantis.datadir}"/nodeId.key"
-
-  # Keystore directory: stores encrypted private keys of accounts managed by this node
-  # keystore-dir = ${mantis.datadir}"/keystore"
-
-  db {
-    leveldb {
-      # LevelDB data directory
-      # path = ${mantis.datadir}"/leveldb/"
-    }
-  }
-
-  pruning {
-    # Pruning mode that the application will use.
-    #
-    # - archive: No pruning is performed
-    # - basic: reference count based pruning
-    #
-    # After changing, please delete previous db before starting the client:
-    #
-    # mode = "basic"
-
-    # The amount of block history kept before pruning
-    # Note: if fast-sync clients choose target block offset greater than this value, mantis may not be able to
-    # correctly act as a fast-sync server
-    # history = 1000
-  }
-}
+mantis {
+
+  # Base directory where all the data used by the node is stored, including blockchain data and private keys
+  # datadir = ${user.home}"/.mantis"
+
+  # The unencrypted private key of this node
+  # node-key-file = ${mantis.datadir}"/node.key"
+
+  # Keystore directory: stores encrypted private keys of accounts managed by this node
+  # keystore-dir = ${mantis.datadir}"/keystore"
+
+  db {
+    leveldb {
+      # LevelDB data directory
+      # path = ${mantis.datadir}"/leveldb/"
+    }
+  }
+
+  pruning {
+    # Pruning mode that the application will use.
+    #
+    # - archive: No pruning is performed
+    # - basic: reference count based pruning
+    #
+    # After changing, please delete previous db before starting the client:
+    #
+    # mode = "basic"
+
+    # The amount of block history kept before pruning
+    # Note: if fast-sync clients choose target block offset greater than this value, mantis may not be able to
+    # correctly act as a fast-sync server
+    # history = 1000
+  }
+}