Add --ledger to stellar keys fund (#2558)

Author: fnando

FULL_HELP_DOCS.md

@@ -1169,15 +1169,16 @@ Given an identity return its address (public key)
 
 Fund an identity on a test network
 
-**Usage:** `stellar keys fund [OPTIONS] <NAME>`
+**Usage:** `stellar keys fund [OPTIONS] [NAME]`
 
 ###### **Arguments:**
 
-- `<NAME>` — Name of identity to lookup, default test identity used if not provided
+- `<NAME>` — Name of identity to lookup. Required unless `--ledger` is provided
 
 ###### **Options:**
 
-- `--hd-path <HD_PATH>` — If identity is a seed phrase use this hd path, default is 0
+- `--hd-path <HD_PATH>` — If identity is a seed phrase use this hd path, default is 0. With --ledger this is the Ledger account index (default 0)
+- `--ledger` — Derive the address from a connected Ledger hardware wallet at `m/44'/148'/N'`, where `N` defaults to 0 and can be set with `--hd-path`
 
 ###### **Options (Global):**
 

cmd/soroban-cli/src/commands/keys/fund.rs

@@ -17,19 +17,23 @@ pub struct Cmd {
     pub network: network::Args,
     /// Address to fund
     #[command(flatten)]
-    pub address: public_key::Args,
+    pub address: public_key::Cmd,
 }
 
 impl Cmd {
     pub async fn run(&self, global_args: &global::Args) -> Result<(), Error> {
         let print = Print::new(global_args.quiet);
         let addr = self.address.public_key().await?;
         let network = self.network.get(&self.address.locator)?;
-        let formatted_name = self.address.name.to_string();
+        let label = self
+            .address
+            .name
+            .as_ref()
+            .map_or_else(|| addr.to_string(), ToString::to_string);
         network.fund_address(&addr).await?;
         print.checkln(format!(
             "Account {} funded on {:?}",
-            formatted_name, network.network_passphrase
+            label, network.network_passphrase
         ));
         Ok(())
     }
@@ -43,9 +47,29 @@ mod tests {
     const PUBLIC_KEY: &str = "GAKSH6AD2IPJQELTHIOWDAPYX74YELUOWJLI2L4RIPIPZH6YQIFNUSDC";
 
     #[test]
-    fn fund_does_not_accept_ledger_flag() {
+    fn ledger_flag_parses_without_name() {
+        let cmd = Cmd::try_parse_from(["fund", "--ledger"]).expect("--ledger alone parses");
+        assert!(cmd.address.ledger);
+        assert!(cmd.address.name.is_none());
+    }
+
+    #[test]
+    fn ledger_flag_with_hd_path_parses() {
+        let cmd = Cmd::try_parse_from(["fund", "--ledger", "--hd-path", "5"]).unwrap();
+        assert!(cmd.address.ledger);
+        assert_eq!(cmd.address.hd_path, Some(5));
+    }
+
+    #[test]
+    fn ledger_flag_conflicts_with_name() {
         let err = Cmd::try_parse_from(["fund", PUBLIC_KEY, "--ledger"])
-            .expect_err("`--ledger` belongs to `keys address` only");
-        assert_eq!(err.kind(), clap::error::ErrorKind::UnknownArgument);
+            .expect_err("--ledger + name must conflict");
+        assert_eq!(err.kind(), clap::error::ErrorKind::ArgumentConflict);
+    }
+
+    #[test]
+    fn missing_name_without_ledger_is_rejected() {
+        let err = Cmd::try_parse_from(["fund"]).expect_err("name is required without --ledger");
+        assert_eq!(err.kind(), clap::error::ErrorKind::MissingRequiredArgument);
     }
 }

cmd/soroban-cli/src/commands/keys/public_key.rs

@@ -12,34 +12,6 @@ pub enum Error {
     HdPathOutOfRange(usize),
 }
 
-/// The fields shared by every command that resolves an identity to a public
-/// key. Embed this with `#[command(flatten)]` to inherit `name`, `hd_path`,
-/// and the config locator without picking up `keys address`'s `--ledger`
-/// flag.
-#[derive(Debug, clap::Parser, Clone)]
-#[group(skip)]
-pub struct Args {
-    /// Name of identity to lookup, default test identity used if not provided
-    pub name: UnresolvedMuxedAccount,
-
-    /// If identity is a seed phrase use this hd path, default is 0
-    #[arg(long)]
-    pub hd_path: Option<usize>,
-
-    #[command(flatten)]
-    pub locator: locator::Args,
-}
-
-impl Args {
-    pub async fn public_key(&self) -> Result<stellar_strkey::ed25519::PublicKey, Error> {
-        Ok(public_key_from_muxed(
-            self.name
-                .resolve_muxed_account(&self.locator, self.hd_path)
-                .await?,
-        ))
-    }
-}
-
 #[derive(Debug, clap::Parser, Clone)]
 #[group(skip)]
 pub struct Cmd {