From a36c10159b684d5afb3b5c7a36edd1391d247e73 Mon Sep 17 00:00:00 2001
From: Leigh McCulloch <351529+leighmcculloch@users.noreply.github.com>
Date: Thu, 19 Dec 2024 15:37:24 +1000
Subject: [PATCH] fund and generate too

---
 cmd/soroban-cli/src/commands/keys/fund.rs     | 9 +++++++--
 cmd/soroban-cli/src/commands/keys/generate.rs | 7 ++++++-
 cmd/soroban-cli/src/commands/keys/mod.rs      | 2 +-
 3 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/cmd/soroban-cli/src/commands/keys/fund.rs b/cmd/soroban-cli/src/commands/keys/fund.rs
index d7100c6cb..38db755f6 100644
--- a/cmd/soroban-cli/src/commands/keys/fund.rs
+++ b/cmd/soroban-cli/src/commands/keys/fund.rs
@@ -1,6 +1,6 @@
 use clap::command;
 
-use crate::config::network;
+use crate::{commands::global, config::network, print::Print};
 
 use super::address;
 
@@ -23,12 +23,17 @@ pub struct Cmd {
 }
 
 impl Cmd {
-    pub async fn run(&self) -> Result<(), Error> {
+    pub async fn run(&self, global_args: &global::Args) -> Result<(), Error> {
+        let print = Print::new(global_args.quiet);
         let addr = self.address.public_key()?;
         self.network
             .get(&self.address.locator)?
             .fund_address(&addr)
             .await?;
+        print.checkln(format!(
+            "Account {:?} funded on {:?}",
+            self.address.name, self.network.network_passphrase
+        ));
         Ok(())
     }
 }
diff --git a/cmd/soroban-cli/src/commands/keys/generate.rs b/cmd/soroban-cli/src/commands/keys/generate.rs
index c6623386c..fda6a3d98 100644
--- a/cmd/soroban-cli/src/commands/keys/generate.rs
+++ b/cmd/soroban-cli/src/commands/keys/generate.rs
@@ -96,7 +96,8 @@ impl Cmd {
             seed_phrase
         };
 
-        self.config_locator.write_identity(&self.name, &secret)?;
+        let path = self.config_locator.write_identity(&self.name, &secret)?;
+        print.checkln(format!("Key saved with alias {:?} in {path:?}", self.name));
 
         if !self.no_fund {
             let addr = secret.public_key(self.hd_path)?;
@@ -108,6 +109,10 @@ impl Cmd {
                     tracing::warn!("fund_address failed: {e}");
                 })
                 .unwrap_or_default();
+            print.checkln(format!(
+                "Account {:?} funded on {:?}",
+                self.name, network.network_passphrase
+            ));
         }
 
         Ok(())
diff --git a/cmd/soroban-cli/src/commands/keys/mod.rs b/cmd/soroban-cli/src/commands/keys/mod.rs
index 8729ee9af..fb933bed3 100644
--- a/cmd/soroban-cli/src/commands/keys/mod.rs
+++ b/cmd/soroban-cli/src/commands/keys/mod.rs
@@ -72,7 +72,7 @@ impl Cmd {
         match self {
             Cmd::Add(cmd) => cmd.run()?,
             Cmd::Address(cmd) => cmd.run()?,
-            Cmd::Fund(cmd) => cmd.run().await?,
+            Cmd::Fund(cmd) => cmd.run(global_args).await?,
             Cmd::Generate(cmd) => cmd.run(global_args).await?,
             Cmd::Ls(cmd) => cmd.run()?,
             Cmd::Rm(cmd) => cmd.run()?,