From 8606595a6d455df895248d2fd1a2200f7bb27b7f Mon Sep 17 00:00:00 2001
From: Simon Warta <2603011+webmaster128@users.noreply.github.com>
Date: Wed, 12 Dec 2018 15:32:00 +0100
Subject: [PATCH] Add simple keygen command to subkey (#1250)

* Remove _ prefix from variable

* Handle empty pattern in vanity tool

* Deduplicate and fix account printing

* Add comment on restore subcommand

* Add simple keygen command
---
 substrate/subkey/src/cli.yml   |  2 ++
 substrate/subkey/src/main.rs   | 33 +++++++++++++++++++++------------
 substrate/subkey/src/vanity.rs | 14 +++++++++-----
 3 files changed, 32 insertions(+), 17 deletions(-)

diff --git a/substrate/subkey/src/cli.yml b/substrate/subkey/src/cli.yml
index 6e1a13dca8..57cf98bdf2 100644
--- a/substrate/subkey/src/cli.yml
+++ b/substrate/subkey/src/cli.yml
@@ -2,6 +2,8 @@ name: subkey
 author: "Parity Team <admin@parity.io>"
 about: A substrate key utility
 subcommands:
+  - generate:
+      about: Generate a random account
   - restore:
       about: Gets a public key and a SS58 address from the provided seed phrase
       args:
diff --git a/substrate/subkey/src/main.rs b/substrate/subkey/src/main.rs
index 190921d750..48b9a67654 100644
--- a/substrate/subkey/src/main.rs
+++ b/substrate/subkey/src/main.rs
@@ -23,25 +23,40 @@ extern crate rand;
 #[macro_use]
 extern crate clap;
 
+use rand::{OsRng, Rng};
 use substrate_primitives::{ed25519::Pair, hexdisplay::HexDisplay};
 
 mod vanity;
 
+fn print_account(seed: &[u8; 32]) {
+	let pair = Pair::from_seed(seed);
+	println!("Seed 0x{} is account:\n  Public key (hex): 0x{}\n  Address (SS58): {}",
+		HexDisplay::from(seed),
+		HexDisplay::from(&pair.public().0),
+		pair.public().to_ss58check()
+	);
+}
+
 fn main() {
 	let yaml = load_yaml!("cli.yml");
 	let matches = clap::App::from_yaml(yaml).get_matches();
 
 	match matches.subcommand() {
+		("generate", Some(_matches)) => {
+			let mut seed = [0u8; 32];
+			OsRng::new().unwrap().fill_bytes(&mut seed[..]);
+			print_account(&seed);
+		}
 		("vanity", Some(matches)) => {
 			let desired: String = matches.value_of("pattern").map(str::to_string).unwrap_or_default();
 			let key = vanity::generate_key(&desired).expect("Key generation failed");
-			println!("Seed {} (hex: 0x{}) - {} ({}%)",
-				key.pair.public().to_ss58check(),
-				HexDisplay::from(&key.pair.public().0),
-				HexDisplay::from(&key.seed),
-				key.score);
+			println!("Found account with score {}%", key.score);
+			print_account(&key.seed);
 		}
 		("restore", Some(matches)) => {
+			// This subcommand is probably obsolete, see
+			// https://github.com/paritytech/substrate/issues/1063
+
 			let mut raw_seed = matches.value_of("seed")
 				.map(str::as_bytes)
 				.expect("seed parameter is required; thus it can't be None; qed");
@@ -56,13 +71,7 @@ fn main() {
 			let mut seed = [' ' as u8; 32];
 			let len = raw_seed.len().min(32);
 			seed[..len].copy_from_slice(&raw_seed[..len]);
-			let pair = Pair::from_seed(&seed);
-
-			println!("Seed 0x{} is account:\n    Public key (hex): 0x{}\n    Address (SS58): {}",
-				HexDisplay::from(&seed),
-				HexDisplay::from(&pair.public().0),
-				pair.public().to_ss58check()
-			);
+			print_account(&seed);
 		},
 		_ => print_usage(&matches),
 	}
diff --git a/substrate/subkey/src/vanity.rs b/substrate/subkey/src/vanity.rs
index fea1066e2d..9eb621cc55 100644
--- a/substrate/subkey/src/vanity.rs
+++ b/substrate/subkey/src/vanity.rs
@@ -57,10 +57,14 @@ fn calculate_score(_desired: &str, key: &str) -> usize {
 	0
 }
 
-pub fn generate_key(_desired: &str) -> Result<KeyPair, &str> {
-	println!("Generating key containing pattern '{}'", _desired);
+pub fn generate_key(desired: &str) -> Result<KeyPair, &str> {
+	if desired.is_empty() {
+		return Err("Pattern must not be empty");
+	}
 
-	let top = 45 + (_desired.len() * 48);
+	println!("Generating key containing pattern '{}'", desired);
+
+	let top = 45 + (desired.len() * 48);
 	let mut best = 0;
 	let mut seed = [0u8; 32];
 	let mut done = 0;
@@ -75,8 +79,8 @@ pub fn generate_key(_desired: &str) -> Result<KeyPair, &str> {
 
 		let p = Pair::from_seed(&seed);
 		let ss58 = p.public().to_ss58check();
-		let score = calculate_score(&_desired, &ss58);
-		if score > best || _desired.len() < 2 {
+		let score = calculate_score(&desired, &ss58);
+		if score > best || desired.len() < 2 {
 			best = score;
 			let keypair = KeyPair {
 				pair: p,