From 0ab26a9c4f09ace6b2a2b63866971789a2f04147 Mon Sep 17 00:00:00 2001
From: Simon Warta <2603011+webmaster128@users.noreply.github.com>
Date: Fri, 9 Nov 2018 14:30:07 +0100
Subject: [PATCH] Simplify onboarding when using `subkey restore` (#1079)

* Switch order of `subkey restore` output

to macht the derivation chain: seed -> keypair -> pubkey -> address

* Use terms public key and address explicitly `subkey restore`
---
 substrate/subkey/src/cli.yml | 2 +-
 substrate/subkey/src/main.rs | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/substrate/subkey/src/cli.yml b/substrate/subkey/src/cli.yml
index 30e6be06262..6e1a13dca8c 100644
--- a/substrate/subkey/src/cli.yml
+++ b/substrate/subkey/src/cli.yml
@@ -3,7 +3,7 @@ author: "Parity Team <admin@parity.io>"
 about: A substrate key utility
 subcommands:
   - restore:
-      about: Gets a SS58 public key from the provided seed phrase
+      about: Gets a public key and a SS58 address from the provided seed phrase
       args:
         - seed:
             index: 1
diff --git a/substrate/subkey/src/main.rs b/substrate/subkey/src/main.rs
index a89f7911ac3..190921d7500 100644
--- a/substrate/subkey/src/main.rs
+++ b/substrate/subkey/src/main.rs
@@ -58,10 +58,10 @@ fn main() {
 			seed[..len].copy_from_slice(&raw_seed[..len]);
 			let pair = Pair::from_seed(&seed);
 
-			println!("Seed 0x{} is account:\n    SS58: {}\n    Hex: 0x{}",
+			println!("Seed 0x{} is account:\n    Public key (hex): 0x{}\n    Address (SS58): {}",
 				HexDisplay::from(&seed),
-				pair.public().to_ss58check(),
-				HexDisplay::from(&pair.public().0)
+				HexDisplay::from(&pair.public().0),
+				pair.public().to_ss58check()
 			);
 		},
 		_ => print_usage(&matches),
-- 
GitLab