From e8ab599bae7b5d0af356fdeca3f2e31f502d45bb Mon Sep 17 00:00:00 2001
From: Tyera Eulberg <teulberg@gmail.com>
Date: Mon, 2 Sep 2019 12:53:13 -0700
Subject: [PATCH] Add keypair print (#5766)

automerge
---
 cli/src/main.rs   | 1 +
 cli/src/wallet.rs | 5 ++++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/cli/src/main.rs b/cli/src/main.rs
index c1501d1d0..569b18055 100644
--- a/cli/src/main.rs
+++ b/cli/src/main.rs
@@ -99,6 +99,7 @@ pub fn parse_args(matches: &ArgMatches<'_>) -> Result<WalletConfig, Box<dyn erro
         command,
         json_rpc_url,
         keypair,
+        keypair_path: id_path.to_string(),
         rpc_client: None,
     })
 }
diff --git a/cli/src/wallet.rs b/cli/src/wallet.rs
index 414a616e2..2caae8427 100644
--- a/cli/src/wallet.rs
+++ b/cli/src/wallet.rs
@@ -125,6 +125,7 @@ pub struct WalletConfig {
     pub command: WalletCommand,
     pub json_rpc_url: String,
     pub keypair: Keypair,
+    pub keypair_path: String,
     pub rpc_client: Option<RpcClient>,
 }
 
@@ -134,6 +135,7 @@ impl Default for WalletConfig {
             command: WalletCommand::Balance(Pubkey::default()),
             json_rpc_url: "http://127.0.0.1:8899".to_string(),
             keypair: Keypair::new(),
+            keypair_path: "".to_string(),
             rpc_client: None,
         }
     }
@@ -1348,11 +1350,12 @@ fn process_ping(
 }
 
 pub fn process_command(config: &WalletConfig) -> ProcessResult {
+    println_name_value("Keypair:", &config.keypair_path);
     if let WalletCommand::Address = config.command {
         // Get address of this client
         return Ok(format!("{}", config.keypair.pubkey()));
     }
-    println_name_value("Using RPC Endpoint:", &config.json_rpc_url);
+    println_name_value("RPC Endpoint:", &config.json_rpc_url);
 
     let mut _rpc_client;
     let rpc_client = if config.rpc_client.is_none() {