From a5f02595a434e168c443fbb7147264a6e180821b Mon Sep 17 00:00:00 2001
From: Leigh McCulloch <351529+leighmcculloch@users.noreply.github.com>
Date: Fri, 20 Dec 2024 18:39:35 +1000
Subject: [PATCH] keys: valid keys when added (#1812)

Co-authored-by: Willem Wyndham <willem@ahalabs.dev>
Co-authored-by: Elizabeth Engelman <4752801+elizabethengelman@users.noreply.github.com>
---
 FULL_HELP_DOCS.md                    |  4 +--
 cmd/soroban-cli/src/config/secret.rs | 45 ++++++++--------------------
 2 files changed, 14 insertions(+), 35 deletions(-)

diff --git a/FULL_HELP_DOCS.md b/FULL_HELP_DOCS.md
index 208ec1e84..6b67e32a0 100644
--- a/FULL_HELP_DOCS.md
+++ b/FULL_HELP_DOCS.md
@@ -961,8 +961,8 @@ Add a new identity (keypair, ledger, macOS keychain)
 
 ###### **Options:**
 
-* `--secret-key` — Add using `secret_key` Can provide with `SOROBAN_SECRET_KEY`
-* `--seed-phrase` — Add using 12 word seed phrase to generate `secret_key`
+* `--secret-key` — (deprecated) Enter secret (S) key when prompted
+* `--seed-phrase` — (deprecated) Enter key using 12-24 word seed phrase
 * `--global` — Use global config
 * `--config-dir <CONFIG_DIR>` — Location of config directory, default is "."
 
diff --git a/cmd/soroban-cli/src/config/secret.rs b/cmd/soroban-cli/src/config/secret.rs
index d6de1b6ea..00cec12f6 100644
--- a/cmd/soroban-cli/src/config/secret.rs
+++ b/cmd/soroban-cli/src/config/secret.rs
@@ -11,8 +11,6 @@ use crate::{
 
 #[derive(thiserror::Error, Debug)]
 pub enum Error {
-    #[error("invalid secret key")]
-    InvalidSecretKey,
     // #[error("seed_phrase must be 12 words long, found {len}")]
     // InvalidSeedPhrase { len: usize },
     #[error("secret input error")]
@@ -23,8 +21,8 @@ pub enum Error {
     SeedPhrase(#[from] sep5::error::Error),
     #[error(transparent)]
     Ed25519(#[from] ed25519_dalek::SignatureError),
-    #[error("Invalid address {0}")]
-    InvalidAddress(String),
+    #[error("cannot parse secret (S) or seed phrase (12 or 24 word)")]
+    InvalidSecretOrSeedPhrase,
     #[error(transparent)]
     Signer(#[from] signer::Error),
 }
@@ -32,12 +30,11 @@ pub enum Error {
 #[derive(Debug, clap::Args, Clone)]
 #[group(skip)]
 pub struct Args {
-    /// Add using `secret_key`
-    /// Can provide with `SOROBAN_SECRET_KEY`
-    #[arg(long, conflicts_with = "seed_phrase")]
+    /// (deprecated) Enter secret (S) key when prompted
+    #[arg(long)]
     pub secret_key: bool,
-    /// Add using 12 word seed phrase to generate `secret_key`
-    #[arg(long, conflicts_with = "secret_key")]
+    /// (deprecated) Enter key using 12-24 word seed phrase
+    #[arg(long)]
     pub seed_phrase: bool,
 }
 
@@ -45,30 +42,12 @@ impl Args {
     pub fn read_secret(&self) -> Result<Secret, Error> {
         if let Ok(secret_key) = std::env::var("SOROBAN_SECRET_KEY") {
             Ok(Secret::SecretKey { secret_key })
-        } else if self.secret_key {
-            println!("Type a secret key: ");
-            let secret_key = read_password()?;
-            let secret_key = PrivateKey::from_string(&secret_key)
-                .map_err(|_| Error::InvalidSecretKey)?
-                .to_string();
-            Ok(Secret::SecretKey { secret_key })
-        } else if self.seed_phrase {
-            println!("Type a 12 word seed phrase: ");
-            let seed_phrase = read_password()?;
-            let seed_phrase: Vec<&str> = seed_phrase.split_whitespace().collect();
-            // if seed_phrase.len() != 12 {
-            //     let len = seed_phrase.len();
-            //     return Err(Error::InvalidSeedPhrase { len });
-            // }
-            Ok(Secret::SeedPhrase {
-                seed_phrase: seed_phrase
-                    .into_iter()
-                    .map(ToString::to_string)
-                    .collect::<Vec<_>>()
-                    .join(" "),
-            })
         } else {
-            Err(Error::PasswordRead {})
+            println!("Type a secret key or 12/24 word seed phrase:");
+            let secret_key = read_password()?;
+            secret_key
+                .parse()
+                .map_err(|_| Error::InvalidSecretOrSeedPhrase)
         }
     }
 }
@@ -93,7 +72,7 @@ impl FromStr for Secret {
                 seed_phrase: s.to_string(),
             })
         } else {
-            Err(Error::InvalidAddress(s.to_string()))
+            Err(Error::InvalidSecretOrSeedPhrase)
         }
     }
 }