Merge branch 'main' into feat/add_stellar_ledger

cmd/soroban-cli/src/commands/container/logs.rs

@@ -22,6 +22,7 @@ pub struct Cmd {
     pub container_args: Args,
 
     /// Container to get logs from
+    #[arg(default_value = "local")]
     pub name: String,
 }
 

cmd/soroban-cli/src/commands/container/start.rs

@@ -34,8 +34,8 @@ pub struct Cmd {
     #[command(flatten)]
     pub container_args: Args,
 
-    /// Network to start
-    pub network: Network,
+    /// Network to start. Default is `local`
+    pub network: Option<Network>,
 
     /// Optional argument to specify the container name
     #[arg(long)]
@@ -62,6 +62,7 @@ impl Cmd {
     pub async fn run(&self, global_args: &global::Args) -> Result<(), Error> {
         let runner = Runner {
             args: self.clone(),
+            network: self.network.unwrap_or(Network::Local),
             print: print::Print::new(global_args.quiet),
         };
 
@@ -71,13 +72,14 @@ impl Cmd {
 
 struct Runner {
     args: Cmd,
+    network: Network,
     print: print::Print,
 }
 
 impl Runner {
     async fn run_docker_command(&self) -> Result<(), Error> {
         self.print
-            .infoln(format!("Starting {} network", &self.args.network));
+            .infoln(format!("Starting {} network", &self.network));
 
         let docker = self
             .args
@@ -151,7 +153,7 @@ impl Runner {
 
     fn get_image_name(&self) -> String {
         // this can be overriden with the `-t` flag
-        let mut image_tag = match &self.args.network {
+        let mut image_tag = match &self.network {
             Network::Pubnet => "latest",
             Network::Futurenet => "future",
             _ => "testing", // default to testing for local and testnet
@@ -169,7 +171,7 @@ impl Runner {
 
     fn get_container_args(&self) -> Vec<String> {
         [
-            format!("--{}", self.args.network),
+            format!("--{}", self.network),
             "--enable rpc,horizon".to_string(),
             self.get_protocol_version_arg(),
             self.get_limits_arg(),
@@ -201,12 +203,7 @@ impl Runner {
     }
 
     fn container_name(&self) -> Name {
-        Name(
-            self.args
-                .name
-                .clone()
-                .unwrap_or(self.args.network.to_string()),
-        )
+        Name(self.args.name.clone().unwrap_or(self.network.to_string()))
     }
 
     fn print_instructions(&self) {
@@ -226,7 +223,7 @@ impl Runner {
     }
 
     fn get_protocol_version_arg(&self) -> String {
-        if self.args.network == Network::Local && self.args.protocol_version.is_some() {
+        if self.network == Network::Local && self.args.protocol_version.is_some() {
             let version = self.args.protocol_version.as_ref().unwrap();
             format!("--protocol-version {version}")
         } else {
@@ -235,7 +232,7 @@ impl Runner {
     }
 
     fn get_limits_arg(&self) -> String {
-        if self.args.network == Network::Local && self.args.limits.is_some() {
+        if self.network == Network::Local && self.args.limits.is_some() {
             let limits = self.args.limits.as_ref().unwrap();
             format!("--limits {limits}")
         } else {

cmd/soroban-cli/src/commands/container/stop.rs

@@ -27,6 +27,7 @@ pub struct Cmd {
     pub container_args: Args,
 
     /// Container to stop
+    #[arg(default_value = "local")]
     pub name: String,
 }
 

cmd/soroban-cli/src/commands/contract/deploy/wasm.rs

@@ -287,11 +287,12 @@ impl NetworkRunnable for Cmd {
             return Ok(TxnResult::Txn(txn));
         }
 
-        print.globeln("Submitting deploy transaction…");
         print.log_transaction(&txn, &network, true)?;
+        let signed_txn = &config.sign_with_local_key(*txn).await?;
+        print.globeln("Submitting deploy transaction…");
 
         let get_txn_resp = client
-            .send_transaction_polling(&config.sign_with_local_key(*txn).await?)
+            .send_transaction_polling(signed_txn)
             .await?
             .try_into()?;
 

cmd/soroban-cli/src/commands/contract/upload.rs

@@ -192,11 +192,10 @@ impl NetworkRunnable for Cmd {
             return Ok(TxnResult::Txn(txn));
         }
 
-        print.globeln("Submitting install transaction…");
+        let signed_txn = &self.config.sign_with_local_key(*txn).await?;
 
-        let txn_resp = client
-            .send_transaction_polling(&self.config.sign_with_local_key(*txn).await?)
-            .await?;
+        print.globeln("Submitting install transaction…");
+        let txn_resp = client.send_transaction_polling(signed_txn).await?;
 
         if args.map_or(true, |a| !a.no_cache) {
             data::write(txn_resp.clone().try_into().unwrap(), &network.rpc_uri()?)?;

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

@@ -1,6 +1,10 @@
 use clap::arg;
 
-use crate::config::{key, locator};
+use crate::config::{
+    key::{self, Key},
+    locator,
+    secret::Secret,
+};
 
 #[derive(thiserror::Error, Debug)]
 pub enum Error {
@@ -9,6 +13,9 @@ pub enum Error {
 
     #[error(transparent)]
     Key(#[from] key::Error),
+
+    #[error("identity is not tied to a seed phrase")]
+    UnknownSeedPhrase,
 }
 
 #[derive(Debug, clap::Parser, Clone)]
@@ -18,8 +25,12 @@ pub struct Cmd {
     /// Name of identity to lookup, default is test identity
     pub name: String,
 
+    /// Output seed phrase instead of private key
+    #[arg(long, conflicts_with = "hd_path")]
+    pub phrase: bool,
+
     /// If identity is a seed phrase use this hd path, default is 0
-    #[arg(long)]
+    #[arg(long, conflicts_with = "phrase")]
     pub hd_path: Option<usize>,
 
     #[command(flatten)]
@@ -28,10 +39,25 @@ pub struct Cmd {
 
 impl Cmd {
     pub fn run(&self) -> Result<(), Error> {
-        println!("{}", self.private_key()?.to_string());
+        if self.phrase {
+            println!("{}", self.seed_phrase()?);
+        } else {
+            println!("{}", self.private_key()?);
+        }
+
         Ok(())
     }
 
+    pub fn seed_phrase(&self) -> Result<String, Error> {
+        let key = self.locator.read_identity(&self.name)?;
+
+        if let Key::Secret(Secret::SeedPhrase { seed_phrase }) = key {
+            Ok(seed_phrase)
+        } else {
+            Err(Error::UnknownSeedPhrase)
+        }
+    }
+
     pub fn private_key(&self) -> Result<stellar_strkey::ed25519::PrivateKey, Error> {
         Ok(self
             .locator

cmd/soroban-cli/src/config/mod.rs

@@ -52,7 +52,7 @@ pub struct Args {
     #[command(flatten)]
     pub network: network::Args,
 
-    #[arg(long, visible_alias = "source", env = "STELLAR_ACCOUNT")]
+    #[arg(long, short = 's', visible_alias = "source", env = "STELLAR_ACCOUNT")]
     /// Account that where transaction originates from. Alias `source`.
     /// Can be an identity (--source alice), a public key (--source GDKW...),
     /// a muxed account (--source MDA…), a secret key (--source SC36…),

cmd/soroban-cli/src/config/network.rs

@@ -88,6 +88,7 @@ pub struct Args {
     /// Name of network to use from config
     #[arg(
         long,
+        short = 'n',
         env = "STELLAR_NETWORK",
         help_heading = HEADING_RPC,
     )]