From 3209130957a9f8b6c3385d8430b1b0870cf16e10 Mon Sep 17 00:00:00 2001
From: Dhanraj Avhad <95683132+Dhanraj30@users.noreply.github.com>
Date: Wed, 6 Nov 2024 04:06:14 +0530
Subject: [PATCH 01/31] =?UTF-8?q?Fix:=20stellar=20contract=20info=20*=20co?=
 =?UTF-8?q?mmands=20require=20network=20when=20network=20no=E2=80=A6=20(#1?=
 =?UTF-8?q?676)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Fix: stellar contract info * commands require network when network not required

* Added wasm field to Args struct and updated Cmd::run logic

* fix: prevent network resolution when local wasm is provided in fetch_wasm

* Update cmd/soroban-cli/src/commands/global.rs

Co-authored-by: Willem Wyndham <willem@wyndham.tech>

* Update cmd/soroban-cli/src/commands/network/mod.rs

Co-authored-by: Willem Wyndham <willem@wyndham.tech>

* Update cmd/soroban-cli/src/commands/global.rs

Co-authored-by: Willem Wyndham <willem@wyndham.tech>

* Update cmd/soroban-cli/src/commands/contract/info/shared.rs

Co-authored-by: Willem Wyndham <willem@wyndham.tech>

* fix: make network args optional and postpone error until resolution

---------

Co-authored-by: Willem Wyndham <willem@ahalabs.dev>
Co-authored-by: Willem Wyndham <willem@wyndham.tech>
Co-authored-by: Jane Wang <jane.wang@stellar.org>
---
 .../src/commands/contract/info/shared.rs            | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/cmd/soroban-cli/src/commands/contract/info/shared.rs b/cmd/soroban-cli/src/commands/contract/info/shared.rs
index 0974632ae..b34ec7da8 100644
--- a/cmd/soroban-cli/src/commands/contract/info/shared.rs
+++ b/cmd/soroban-cli/src/commands/contract/info/shared.rs
@@ -59,11 +59,16 @@ pub enum Error {
 }
 
 pub async fn fetch_wasm(args: &Args) -> Result<Option<Vec<u8>>, Error> {
-    let network = &args.network.get(&args.locator)?;
+    // Check if a local WASM file path is provided
+    if let Some(path) = &args.wasm {
+        // Read the WASM file and return its contents
+        let wasm_bytes = wasm::Args { wasm: path.clone() }.read()?;
+        return Ok(Some(wasm_bytes));
+    }
 
-    let wasm = if let Some(path) = &args.wasm {
-        wasm::Args { wasm: path.clone() }.read()?
-    } else if let Some(wasm_hash) = &args.wasm_hash {
+    // If no local wasm, then check for wasm_hash and fetch from the network
+    let network = &args.network.get(&args.locator)?;
+    let wasm = if let Some(wasm_hash) = &args.wasm_hash {
         let hash = hex::decode(wasm_hash)
             .map_err(|_| InvalidWasmHash(wasm_hash.clone()))?
             .try_into()

From 6e645f0109ad9c59fe7ccc87b12cc3a164994c87 Mon Sep 17 00:00:00 2001
From: Nando Vieira <me@fnando.com>
Date: Tue, 5 Nov 2024 21:17:21 -0800
Subject: [PATCH 02/31] Add global config for default network and identity.
 (#1690)

---
 FULL_HELP_DOCS.md                             | 50 +++++++++++++++
 cmd/crates/soroban-test/tests/it/config.rs    | 53 +++++++++++++++
 cmd/soroban-cli/src/commands/env/mod.rs       | 64 +++++++++++++++++++
 cmd/soroban-cli/src/commands/keys/default.rs  | 35 ++++++++++
 cmd/soroban-cli/src/commands/keys/mod.rs      | 20 ++++++
 cmd/soroban-cli/src/commands/mod.rs           | 24 ++++++-
 .../src/commands/network/default.rs           | 34 ++++++++++
 cmd/soroban-cli/src/commands/network/mod.rs   | 15 +++++
 cmd/soroban-cli/src/config/locator.rs         | 28 ++++++--
 cmd/soroban-cli/src/config/mod.rs             | 53 +++++++++++++--
 10 files changed, 365 insertions(+), 11 deletions(-)
 create mode 100644 cmd/soroban-cli/src/commands/env/mod.rs
 create mode 100644 cmd/soroban-cli/src/commands/keys/default.rs
 create mode 100644 cmd/soroban-cli/src/commands/network/default.rs

diff --git a/FULL_HELP_DOCS.md b/FULL_HELP_DOCS.md
index 8c151cb84..aa2c8e865 100644
--- a/FULL_HELP_DOCS.md
+++ b/FULL_HELP_DOCS.md
@@ -45,6 +45,7 @@ Anything after the `--` double dash (the "slop") is parsed as arguments to the c
 
 * `contract` — Tools for smart contract developers
 * `events` — Watch the network for contract events
+* `env` — Prints the current environment variables or defaults to the stdout, in a format that can be used as .env file. Environment variables have precedency over defaults
 * `keys` — Create and manage identities including keys and addresses
 * `network` — Start and configure networks
 * `snapshot` — Download a snapshot of a ledger from an archive
@@ -897,6 +898,19 @@ Watch the network for contract events
 
 
 
+## `stellar env`
+
+Prints the current environment variables or defaults to the stdout, in a format that can be used as .env file. Environment variables have precedency over defaults
+
+**Usage:** `stellar env [OPTIONS]`
+
+###### **Options:**
+
+* `--global` — Use global config
+* `--config-dir <CONFIG_DIR>` — Location of config directory, default is "."
+
+
+
 ## `stellar keys`
 
 Create and manage identities including keys and addresses
@@ -912,6 +926,7 @@ Create and manage identities including keys and addresses
 * `ls` — List identities
 * `rm` — Remove an identity
 * `show` — Given an identity return its private key
+* `use` — Set the default identity that will be used on all commands. This allows you to skip `--source-account` or setting a environment variable, while reusing this value in all commands that require it
 
 
 
@@ -1052,6 +1067,23 @@ Given an identity return its private key
 
 
 
+## `stellar keys use`
+
+Set the default identity that will be used on all commands. This allows you to skip `--source-account` or setting a environment variable, while reusing this value in all commands that require it
+
+**Usage:** `stellar keys use [OPTIONS] <NAME>`
+
+###### **Arguments:**
+
+* `<NAME>` — Set the default network name
+
+###### **Options:**
+
+* `--global` — Use global config
+* `--config-dir <CONFIG_DIR>` — Location of config directory, default is "."
+
+
+
 ## `stellar network`
 
 Start and configure networks
@@ -1065,6 +1097,7 @@ Start and configure networks
 * `ls` — List networks
 * `start` — ⚠️ Deprecated: use `stellar container start` instead
 * `stop` — ⚠️ Deprecated: use `stellar container stop` instead
+* `use` — Set the default network that will be used on all commands. This allows you to skip `--network` or setting a environment variable, while reusing this value in all commands that require it
 * `container` — Commands to start, stop and get logs for a quickstart container
 
 
@@ -1174,6 +1207,23 @@ Stop a network started with `network start`. For example, if you ran `stellar ne
 
 
 
+## `stellar network use`
+
+Set the default network that will be used on all commands. This allows you to skip `--network` or setting a environment variable, while reusing this value in all commands that require it
+
+**Usage:** `stellar network use [OPTIONS] <NAME>`
+
+###### **Arguments:**
+
+* `<NAME>` — Set the default network name
+
+###### **Options:**
+
+* `--global` — Use global config
+* `--config-dir <CONFIG_DIR>` — Location of config directory, default is "."
+
+
+
 ## `stellar network container`
 
 Commands to start, stop and get logs for a quickstart container
diff --git a/cmd/crates/soroban-test/tests/it/config.rs b/cmd/crates/soroban-test/tests/it/config.rs
index 31d60e116..b796910a8 100644
--- a/cmd/crates/soroban-test/tests/it/config.rs
+++ b/cmd/crates/soroban-test/tests/it/config.rs
@@ -340,3 +340,56 @@ fn config_dirs_precedence() {
         ))
         .stdout("SAQMV6P3OWM2SKCK3OEWNXSRYWK5RNNUL5CPHQGIJF2WVT4EI2BZ63GG\n");
 }
+
+#[test]
+fn set_default_identity() {
+    let sandbox = TestEnv::default();
+
+    sandbox
+        .new_assert_cmd("keys")
+        .env(
+            "SOROBAN_SECRET_KEY",
+            "SC4ZPYELVR7S7EE7KZDZN3ETFTNQHHLTUL34NUAAWZG5OK2RGJ4V2U3Z",
+        )
+        .arg("add")
+        .arg("alice")
+        .assert()
+        .success();
+
+    sandbox
+        .new_assert_cmd("keys")
+        .arg("use")
+        .arg("alice")
+        .assert()
+        .stderr(predicate::str::contains(
+            "The default source account is set to `alice`",
+        ))
+        .success();
+
+    sandbox
+        .new_assert_cmd("env")
+        .assert()
+        .stdout(predicate::str::contains("STELLAR_ACCOUNT=alice"))
+        .success();
+}
+
+#[test]
+fn set_default_network() {
+    let sandbox = TestEnv::default();
+
+    sandbox
+        .new_assert_cmd("network")
+        .arg("use")
+        .arg("testnet")
+        .assert()
+        .stderr(predicate::str::contains(
+            "The default network is set to `testnet`",
+        ))
+        .success();
+
+    sandbox
+        .new_assert_cmd("env")
+        .assert()
+        .stdout(predicate::str::contains("STELLAR_NETWORK=testnet"))
+        .success();
+}
diff --git a/cmd/soroban-cli/src/commands/env/mod.rs b/cmd/soroban-cli/src/commands/env/mod.rs
new file mode 100644
index 000000000..4d745400c
--- /dev/null
+++ b/cmd/soroban-cli/src/commands/env/mod.rs
@@ -0,0 +1,64 @@
+use crate::{
+    commands::global,
+    config::{
+        locator::{self},
+        Config,
+    },
+    print::Print,
+};
+use clap::Parser;
+
+#[derive(Debug, Parser)]
+pub struct Cmd {
+    #[command(flatten)]
+    pub config_locator: locator::Args,
+}
+
+#[derive(thiserror::Error, Debug)]
+pub enum Error {
+    #[error(transparent)]
+    Locator(#[from] locator::Error),
+}
+
+impl Cmd {
+    pub fn run(&self, global_args: &global::Args) -> Result<(), Error> {
+        let print = Print::new(global_args.quiet);
+        let config = Config::new()?;
+        let mut lines: Vec<(String, String)> = Vec::new();
+
+        if let Some(data) = get("STELLAR_NETWORK", config.defaults.network) {
+            lines.push(data);
+        }
+
+        if let Some(data) = get("STELLAR_ACCOUNT", config.defaults.identity) {
+            lines.push(data);
+        }
+
+        if lines.is_empty() {
+            print.warnln("No defaults or environment variables set".to_string());
+            return Ok(());
+        }
+
+        let max_len = lines.iter().map(|l| l.0.len()).max().unwrap_or(0);
+
+        lines.sort();
+
+        for (value, source) in lines {
+            println!("{value:max_len$} # {source}");
+        }
+
+        Ok(())
+    }
+}
+
+fn get(env_var: &str, default_value: Option<String>) -> Option<(String, String)> {
+    if let Ok(value) = std::env::var(env_var) {
+        return Some((format!("{env_var}={value}"), "env".to_string()));
+    }
+
+    if let Some(value) = default_value {
+        return Some((format!("{env_var}={value}"), "default".to_string()));
+    }
+
+    None
+}
diff --git a/cmd/soroban-cli/src/commands/keys/default.rs b/cmd/soroban-cli/src/commands/keys/default.rs
new file mode 100644
index 000000000..9aa180b6d
--- /dev/null
+++ b/cmd/soroban-cli/src/commands/keys/default.rs
@@ -0,0 +1,35 @@
+use clap::command;
+
+use crate::{commands::global, config::locator, print::Print};
+
+#[derive(thiserror::Error, Debug)]
+pub enum Error {
+    #[error(transparent)]
+    Config(#[from] locator::Error),
+}
+
+#[derive(Debug, clap::Parser, Clone)]
+#[group(skip)]
+pub struct Cmd {
+    /// Set the default network name.
+    pub name: String,
+
+    #[command(flatten)]
+    pub config_locator: locator::Args,
+}
+
+impl Cmd {
+    pub fn run(&self, global_args: &global::Args) -> Result<(), Error> {
+        let printer = Print::new(global_args.quiet);
+        let _ = self.config_locator.read_identity(&self.name)?;
+
+        self.config_locator.write_default_identity(&self.name)?;
+
+        printer.infoln(format!(
+            "The default source account is set to `{}`",
+            self.name,
+        ));
+
+        Ok(())
+    }
+}
diff --git a/cmd/soroban-cli/src/commands/keys/mod.rs b/cmd/soroban-cli/src/commands/keys/mod.rs
index 30df5ccee..8729ee9af 100644
--- a/cmd/soroban-cli/src/commands/keys/mod.rs
+++ b/cmd/soroban-cli/src/commands/keys/mod.rs
@@ -3,6 +3,7 @@ use clap::Parser;
 
 pub mod add;
 pub mod address;
+pub mod default;
 pub mod fund;
 pub mod generate;
 pub mod ls;
@@ -13,18 +14,30 @@ pub mod show;
 pub enum Cmd {
     /// Add a new identity (keypair, ledger, macOS keychain)
     Add(add::Cmd),
+
     /// Given an identity return its address (public key)
     Address(address::Cmd),
+
     /// Fund an identity on a test network
     Fund(fund::Cmd),
+
     /// Generate a new identity with a seed phrase, currently 12 words
     Generate(generate::Cmd),
+
     /// List identities
     Ls(ls::Cmd),
+
     /// Remove an identity
     Rm(rm::Cmd),
+
     /// Given an identity return its private key
     Show(show::Cmd),
+
+    /// Set the default identity that will be used on all commands.
+    /// This allows you to skip `--source-account` or setting a environment
+    /// variable, while reusing this value in all commands that require it.
+    #[command(name = "use")]
+    Default(default::Cmd),
 }
 
 #[derive(thiserror::Error, Debug)]
@@ -34,18 +47,24 @@ pub enum Error {
 
     #[error(transparent)]
     Address(#[from] address::Error),
+
     #[error(transparent)]
     Fund(#[from] fund::Error),
 
     #[error(transparent)]
     Generate(#[from] generate::Error),
+
     #[error(transparent)]
     Rm(#[from] rm::Error),
+
     #[error(transparent)]
     Ls(#[from] ls::Error),
 
     #[error(transparent)]
     Show(#[from] show::Error),
+
+    #[error(transparent)]
+    Default(#[from] default::Error),
 }
 
 impl Cmd {
@@ -58,6 +77,7 @@ impl Cmd {
             Cmd::Ls(cmd) => cmd.run()?,
             Cmd::Rm(cmd) => cmd.run()?,
             Cmd::Show(cmd) => cmd.run()?,
+            Cmd::Default(cmd) => cmd.run(global_args)?,
         };
         Ok(())
     }
diff --git a/cmd/soroban-cli/src/commands/mod.rs b/cmd/soroban-cli/src/commands/mod.rs
index a6a85e816..f1febae27 100644
--- a/cmd/soroban-cli/src/commands/mod.rs
+++ b/cmd/soroban-cli/src/commands/mod.rs
@@ -8,6 +8,7 @@ use crate::config;
 pub mod cache;
 pub mod completion;
 pub mod contract;
+pub mod env;
 pub mod events;
 pub mod global;
 pub mod keys;
@@ -116,7 +117,8 @@ impl Root {
             Cmd::Version(version) => version.run(),
             Cmd::Keys(id) => id.run(&self.global_args).await?,
             Cmd::Tx(tx) => tx.run(&self.global_args).await?,
-            Cmd::Cache(data) => data.run()?,
+            Cmd::Cache(cache) => cache.run()?,
+            Cmd::Env(env) => env.run(&self.global_args)?,
         };
         Ok(())
     }
@@ -135,9 +137,15 @@ pub enum Cmd {
     /// Tools for smart contract developers
     #[command(subcommand)]
     Contract(contract::Cmd),
+
     /// Watch the network for contract events
     Events(events::Cmd),
 
+    /// Prints the current environment variables or defaults to the stdout, in
+    /// a format that can be used as .env file. Environment variables have
+    /// precedency over defaults.
+    Env(env::Cmd),
+
     /// Create and manage identities including keys and addresses
     #[command(subcommand)]
     Keys(keys::Cmd),
@@ -160,9 +168,11 @@ pub enum Cmd {
     /// Print shell completion code for the specified shell.
     #[command(long_about = completion::LONG_ABOUT)]
     Completion(completion::Cmd),
+
     /// Cache for transactions and contract specs
     #[command(subcommand)]
     Cache(cache::Cmd),
+
     /// Print version information
     Version(version::Cmd),
 }
@@ -172,24 +182,36 @@ pub enum Error {
     // TODO: stop using Debug for displaying errors
     #[error(transparent)]
     Contract(#[from] contract::Error),
+
     #[error(transparent)]
     Events(#[from] events::Error),
+
     #[error(transparent)]
     Keys(#[from] keys::Error),
+
     #[error(transparent)]
     Xdr(#[from] stellar_xdr::cli::Error),
+
     #[error(transparent)]
     Clap(#[from] clap::error::Error),
+
     #[error(transparent)]
     Plugin(#[from] plugin::Error),
+
     #[error(transparent)]
     Network(#[from] network::Error),
+
     #[error(transparent)]
     Snapshot(#[from] snapshot::Error),
+
     #[error(transparent)]
     Tx(#[from] tx::Error),
+
     #[error(transparent)]
     Cache(#[from] cache::Error),
+
+    #[error(transparent)]
+    Env(#[from] env::Error),
 }
 
 #[async_trait]
diff --git a/cmd/soroban-cli/src/commands/network/default.rs b/cmd/soroban-cli/src/commands/network/default.rs
new file mode 100644
index 000000000..337e08a69
--- /dev/null
+++ b/cmd/soroban-cli/src/commands/network/default.rs
@@ -0,0 +1,34 @@
+use clap::command;
+
+use crate::{commands::global, print::Print};
+
+use super::locator;
+
+#[derive(thiserror::Error, Debug)]
+pub enum Error {
+    #[error(transparent)]
+    Config(#[from] locator::Error),
+}
+
+#[derive(Debug, clap::Parser, Clone)]
+#[group(skip)]
+pub struct Cmd {
+    /// Set the default network name.
+    pub name: String,
+
+    #[command(flatten)]
+    pub config_locator: locator::Args,
+}
+
+impl Cmd {
+    pub fn run(&self, global_args: &global::Args) -> Result<(), Error> {
+        let printer = Print::new(global_args.quiet);
+        let _ = self.config_locator.read_network(&self.name)?;
+
+        self.config_locator.write_default_network(&self.name)?;
+
+        printer.infoln(format!("The default network is set to `{}`", self.name));
+
+        Ok(())
+    }
+}
diff --git a/cmd/soroban-cli/src/commands/network/mod.rs b/cmd/soroban-cli/src/commands/network/mod.rs
index 8dd61b394..a7519bc83 100644
--- a/cmd/soroban-cli/src/commands/network/mod.rs
+++ b/cmd/soroban-cli/src/commands/network/mod.rs
@@ -6,6 +6,7 @@ use super::{config::locator, global};
 
 pub mod add;
 pub mod container;
+pub mod default;
 pub mod ls;
 pub mod rm;
 
@@ -13,10 +14,13 @@ pub mod rm;
 pub enum Cmd {
     /// Add a new network
     Add(add::Cmd),
+
     /// Remove a network
     Rm(rm::Cmd),
+
     /// List networks
     Ls(ls::Cmd),
+
     /// ⚠️ Deprecated: use `stellar container start` instead
     ///
     /// Start network
@@ -29,11 +33,18 @@ pub enum Cmd {
     ///
     /// `docker run --rm -p 8000:8000 --name stellar stellar/quickstart:testing --testnet --enable rpc,horizon`
     Start(container::StartCmd),
+
     /// ⚠️ Deprecated: use `stellar container stop` instead
     ///
     /// Stop a network started with `network start`. For example, if you ran `stellar network start local`, you can use `stellar network stop local` to stop it.
     Stop(container::StopCmd),
 
+    /// Set the default network that will be used on all commands.
+    /// This allows you to skip `--network` or setting a environment variable,
+    /// while reusing this value in all commands that require it.
+    #[command(name = "use")]
+    Default(default::Cmd),
+
     /// Commands to start, stop and get logs for a quickstart container
     #[command(subcommand)]
     Container(container::Cmd),
@@ -41,6 +52,9 @@ pub enum Cmd {
 
 #[derive(thiserror::Error, Debug)]
 pub enum Error {
+    #[error(transparent)]
+    Default(#[from] default::Error),
+
     #[error(transparent)]
     Add(#[from] add::Error),
 
@@ -81,6 +95,7 @@ pub enum Error {
 impl Cmd {
     pub async fn run(&self, global_args: &global::Args) -> Result<(), Error> {
         match self {
+            Cmd::Default(cmd) => cmd.run(global_args)?,
             Cmd::Add(cmd) => cmd.run()?,
             Cmd::Rm(new) => new.run()?,
             Cmd::Ls(cmd) => cmd.run()?,
diff --git a/cmd/soroban-cli/src/config/locator.rs b/cmd/soroban-cli/src/config/locator.rs
index 0a13c4cc3..60b7856a6 100644
--- a/cmd/soroban-cli/src/config/locator.rs
+++ b/cmd/soroban-cli/src/config/locator.rs
@@ -5,8 +5,7 @@ use std::{
     ffi::OsStr,
     fmt::Display,
     fs::{self, create_dir_all, OpenOptions},
-    io,
-    io::Write,
+    io::{self, Write},
     path::{Path, PathBuf},
     str::FromStr,
 };
@@ -18,10 +17,13 @@ use super::{
     alias,
     network::{self, Network},
     secret::Secret,
+    Config,
 };
 
 #[derive(thiserror::Error, Debug)]
 pub enum Error {
+    #[error(transparent)]
+    TomlSerialize(#[from] toml::ser::Error),
     #[error("Failed to find home directory")]
     HomeDirNotFound,
     #[error("Failed read current directory")]
@@ -34,6 +36,8 @@ pub enum Error {
     SecretFileRead { path: PathBuf },
     #[error("Failed to read network file: {path};\nProbably need to use `stellar network add`")]
     NetworkFileRead { path: PathBuf },
+    #[error("Failed to read file: {path}")]
+    FileRead { path: PathBuf },
     #[error(transparent)]
     Toml(#[from] toml::de::Error),
     #[error("Secret file failed to deserialize")]
@@ -163,6 +167,14 @@ impl Args {
         KeyType::Network.write(name, network, &self.config_dir()?)
     }
 
+    pub fn write_default_network(&self, name: &str) -> Result<(), Error> {
+        Config::new()?.set_network(name).save()
+    }
+
+    pub fn write_default_identity(&self, name: &str) -> Result<(), Error> {
+        Config::new()?.set_identity(name).save()
+    }
+
     pub fn list_identities(&self) -> Result<Vec<String>, Error> {
         Ok(KeyType::Identity
             .list_paths(&self.local_and_global()?)?
@@ -344,6 +356,12 @@ impl Args {
     }
 }
 
+impl Pwd for Args {
+    fn set_pwd(&mut self, pwd: &Path) {
+        self.config_dir = Some(pwd.to_path_buf());
+    }
+}
+
 pub fn ensure_directory(dir: PathBuf) -> Result<PathBuf, Error> {
     let parent = dir.parent().ok_or(Error::HomeDirNotFound)?;
     std::fs::create_dir_all(parent).map_err(|_| dir_creation_failed(parent))?;
@@ -496,8 +514,6 @@ pub fn global_config_path() -> Result<PathBuf, Error> {
     Ok(stellar_dir)
 }
 
-impl Pwd for Args {
-    fn set_pwd(&mut self, pwd: &Path) {
-        self.config_dir = Some(pwd.to_path_buf());
-    }
+pub fn config_file() -> Result<PathBuf, Error> {
+    Ok(global_config_path()?.join("config.toml"))
 }
diff --git a/cmd/soroban-cli/src/config/mod.rs b/cmd/soroban-cli/src/config/mod.rs
index b961f0f67..21ebb1fe9 100644
--- a/cmd/soroban-cli/src/config/mod.rs
+++ b/cmd/soroban-cli/src/config/mod.rs
@@ -1,6 +1,10 @@
 use address::Address;
 use clap::{arg, command};
 use serde::{Deserialize, Serialize};
+use std::{
+    fs::{self, File},
+    io::Write,
+};
 
 use crate::{
     print::Print,
@@ -8,7 +12,6 @@ use crate::{
     xdr::{self, SequenceNumber, Transaction, TransactionEnvelope},
     Pwd,
 };
-
 use network::Network;
 
 pub mod address;
@@ -125,9 +128,6 @@ impl Pwd for Args {
     }
 }
 
-#[derive(Default, Serialize, Deserialize)]
-pub struct Config {}
-
 #[derive(Debug, clap::Args, Clone, Default)]
 #[group(skip)]
 pub struct ArgsLocatorAndNetwork {
@@ -143,3 +143,48 @@ impl ArgsLocatorAndNetwork {
         Ok(self.network.get(&self.locator)?)
     }
 }
+
+#[derive(Serialize, Deserialize, Debug, Default)]
+pub struct Config {
+    pub defaults: Defaults,
+}
+
+#[derive(Serialize, Deserialize, Debug, Default)]
+pub struct Defaults {
+    pub network: Option<String>,
+    pub identity: Option<String>,
+}
+
+impl Config {
+    pub fn new() -> Result<Config, locator::Error> {
+        let path = locator::config_file()?;
+
+        if path.exists() {
+            let data = fs::read(&path).map_err(|_| locator::Error::FileRead { path })?;
+
+            Ok(toml::from_slice(&data)?)
+        } else {
+            Ok(Config::default())
+        }
+    }
+
+    #[must_use]
+    pub fn set_network(mut self, s: &str) -> Self {
+        self.defaults.network = Some(s.to_string());
+        self
+    }
+
+    #[must_use]
+    pub fn set_identity(mut self, s: &str) -> Self {
+        self.defaults.identity = Some(s.to_string());
+        self
+    }
+
+    pub fn save(&self) -> Result<(), locator::Error> {
+        let toml_string = toml::to_string(&self)?;
+        let mut file = File::create(locator::config_file()?)?;
+        file.write_all(toml_string.as_bytes())?;
+
+        Ok(())
+    }
+}

From 8163f30785d66c83101cc4b4e1064374f57d9356 Mon Sep 17 00:00:00 2001
From: Willem Wyndham <willem@ahalabs.dev>
Date: Wed, 6 Nov 2024 02:42:27 -0500
Subject: [PATCH 03/31] feat: Add parsing to deploy to support new constructor
 feature (#1574)

---
 .github/workflows/rpc-tests.yml               |  35 ++--
 Cargo.lock                                    |  12 ++
 Cargo.toml                                    |  11 +-
 FULL_HELP_DOCS.md                             |   6 +-
 .../test-wasms/constructor/Cargo.toml         |  18 ++
 .../test-wasms/constructor/src/lib.rs         |  18 ++
 .../soroban-test/tests/it/integration.rs      |   1 +
 .../tests/it/integration/constructor.rs       |  73 +++++++++
 .../soroban-test/tests/it/integration/util.rs |   1 +
 .../src/commands/contract/deploy/asset.rs     |   6 +-
 .../src/commands/contract/deploy/wasm.rs      | 154 ++++++++++++------
 .../src/commands/contract/extend.rs           |   9 +-
 .../src/commands/contract/install.rs          |   6 +-
 .../src/commands/contract/restore.rs          |   7 +-
 cmd/soroban-cli/src/commands/tx/args.rs       |   2 +-
 cmd/soroban-cli/src/config/data.rs            |   2 +-
 cmd/soroban-cli/src/config/mod.rs             |  13 +-
 17 files changed, 289 insertions(+), 85 deletions(-)
 create mode 100644 cmd/crates/soroban-test/tests/fixtures/test-wasms/constructor/Cargo.toml
 create mode 100644 cmd/crates/soroban-test/tests/fixtures/test-wasms/constructor/src/lib.rs
 create mode 100644 cmd/crates/soroban-test/tests/it/integration/constructor.rs

diff --git a/.github/workflows/rpc-tests.yml b/.github/workflows/rpc-tests.yml
index 769cd21f7..75b6d7760 100644
--- a/.github/workflows/rpc-tests.yml
+++ b/.github/workflows/rpc-tests.yml
@@ -1,4 +1,3 @@
-
 name: RPC Tests
 on:
   push:
@@ -15,32 +14,32 @@ jobs:
     runs-on: ubuntu-22.04
     services:
       rpc:
-        image: stellar/quickstart:v438-testing
+        image: stellar/quickstart:testing
         ports:
           - 8000:8000
         env:
           ENABLE_LOGS: true
           ENABLE_SOROBAN_DIAGNOSTIC_EVENTS: true
           NETWORK: local
+          PROTOCOL_VERSION: 22
         options: >-
           --health-cmd "curl --no-progress-meter --fail-with-body -X POST \"http://localhost:8000/soroban/rpc\" -H 'Content-Type: application/json' -d '{\"jsonrpc\":\"2.0\",\"id\":8675309,\"method\":\"getNetwork\"}' && curl --no-progress-meter \"http://localhost:8000/friendbot\" | grep '\"invalid_field\": \"addr\"'"
           --health-interval 10s
           --health-timeout 5s
           --health-retries 50
     steps:
-    - uses: actions/checkout@v4
-    - uses: actions/cache@v4
-      with:
-        path: |
-          ~/.cargo/bin/
-          ~/.cargo/registry/index/
-          ~/.cargo/registry/cache/
-          ~/.cargo/git/db/
-          target/
-        key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
-    - run: rustup update
-    - run: cargo build
-    - run: rustup target add wasm32-unknown-unknown
-    - run: make build-test-wasms
-    - run: SOROBAN_PORT=8000 cargo test --features it --package soroban-test --test it -- integration
-
+      - uses: actions/checkout@v4
+      - uses: actions/cache@v4
+        with:
+          path: |
+            ~/.cargo/bin/
+            ~/.cargo/registry/index/
+            ~/.cargo/registry/cache/
+            ~/.cargo/git/db/
+            target/
+          key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
+      - run: rustup update
+      - run: cargo build
+      - run: rustup target add wasm32-unknown-unknown
+      - run: make build-test-wasms
+      - run: SOROBAN_PORT=8000 cargo test --features it --package soroban-test --test it -- integration
diff --git a/Cargo.lock b/Cargo.lock
index 6fdf9ee5b..806e767ec 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -4542,6 +4542,7 @@ version = "22.0.0-rc.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "39b6d2ec8955243394278e1fae88be3b367fcfed9cf74e5044799a90786a8642"
 dependencies = [
+ "arbitrary",
  "crate-git-revision 0.0.6",
  "ethnum",
  "num-derive",
@@ -4731,7 +4732,10 @@ version = "22.0.0-rc.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6d063d0df000aaec20105aab3d743660322bc0269934ea95d79fa19aa8792385"
 dependencies = [
+ "arbitrary",
  "bytes-lit",
+ "ctor",
+ "ed25519-dalek 2.1.1",
  "rand",
  "rustc_version",
  "serde",
@@ -5091,6 +5095,7 @@ version = "22.0.0-rc.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c88dc0e928b9cb65ea43836b52560bb4ead3e32895f5019ca223dc7cd1966cbf"
 dependencies = [
+ "arbitrary",
  "base64 0.13.1",
  "clap",
  "crate-git-revision 0.0.6",
@@ -5347,6 +5352,13 @@ dependencies = [
  "test-case-core",
 ]
 
+[[package]]
+name = "test_constructor"
+version = "21.5.0"
+dependencies = [
+ "soroban-sdk 22.0.0-rc.3",
+]
+
 [[package]]
 name = "test_custom_account"
 version = "21.5.0"
diff --git a/Cargo.toml b/Cargo.toml
index 58caad196..d5f87b38e 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -8,8 +8,15 @@ members = [
     "cmd/crates/soroban-test/tests/fixtures/hello",
     "cmd/crates/soroban-test/tests/fixtures/bye",
 ]
-default-members = ["cmd/soroban-cli", "cmd/crates/soroban-spec-tools", "cmd/crates/soroban-test"]
-exclude = ["cmd/crates/soroban-test/tests/fixtures/hello", "cmd/crates/soroban-test/tests/fixtures/bye"]
+default-members = [
+    "cmd/soroban-cli",
+    "cmd/crates/soroban-spec-tools",
+    "cmd/crates/soroban-test",
+]
+exclude = [
+    "cmd/crates/soroban-test/tests/fixtures/hello",
+    "cmd/crates/soroban-test/tests/fixtures/bye",
+]
 
 [workspace.package]
 version = "21.5.0"
diff --git a/FULL_HELP_DOCS.md b/FULL_HELP_DOCS.md
index aa2c8e865..ae25453c6 100644
--- a/FULL_HELP_DOCS.md
+++ b/FULL_HELP_DOCS.md
@@ -388,7 +388,11 @@ If no keys are specified the contract itself is extended.
 
 Deploy a wasm contract
 
-**Usage:** `stellar contract deploy [OPTIONS] --source-account <SOURCE_ACCOUNT> <--wasm <WASM>|--wasm-hash <WASM_HASH>>`
+**Usage:** `stellar contract deploy [OPTIONS] --source-account <SOURCE_ACCOUNT> <--wasm <WASM>|--wasm-hash <WASM_HASH>> [-- <CONTRACT_CONSTRUCTOR_ARGS>...]`
+
+###### **Arguments:**
+
+* `<CONTRACT_CONSTRUCTOR_ARGS>` — If provided, will be passed to the contract's `__constructor` function with provided arguments for that function as `--arg-name value`
 
 ###### **Options:**
 
diff --git a/cmd/crates/soroban-test/tests/fixtures/test-wasms/constructor/Cargo.toml b/cmd/crates/soroban-test/tests/fixtures/test-wasms/constructor/Cargo.toml
new file mode 100644
index 000000000..ef1dd882c
--- /dev/null
+++ b/cmd/crates/soroban-test/tests/fixtures/test-wasms/constructor/Cargo.toml
@@ -0,0 +1,18 @@
+[package]
+name = "test_constructor"
+version = "21.5.0"
+authors = ["Stellar Development Foundation <info@stellar.org>"]
+license = "Apache-2.0"
+edition = "2021"
+publish = false
+rust-version.workspace = true
+
+[lib]
+crate-type = ["cdylib"]
+doctest = false
+
+[dependencies]
+soroban-sdk = { workspace = true }
+
+[dev-dependencies]
+soroban-sdk = { workspace = true, features = ["testutils"]}
diff --git a/cmd/crates/soroban-test/tests/fixtures/test-wasms/constructor/src/lib.rs b/cmd/crates/soroban-test/tests/fixtures/test-wasms/constructor/src/lib.rs
new file mode 100644
index 000000000..8b867968f
--- /dev/null
+++ b/cmd/crates/soroban-test/tests/fixtures/test-wasms/constructor/src/lib.rs
@@ -0,0 +1,18 @@
+#![no_std]
+use soroban_sdk::{contract, contractimpl, symbol_short, Env, Symbol};
+
+#[contract]
+pub struct Contract;
+const COUNTER: Symbol = symbol_short!("COUNTER");
+
+#[contractimpl]
+impl Contract {
+    /// Example constructor
+    pub fn __constructor(env: Env, counter: u32) {
+        env.storage().persistent().set(&COUNTER, &counter);
+    }
+    /// Counter value
+    pub fn counter(env: Env) -> u32 {
+        env.storage().persistent().get(&COUNTER).unwrap()
+    }
+}
diff --git a/cmd/crates/soroban-test/tests/it/integration.rs b/cmd/crates/soroban-test/tests/it/integration.rs
index 3e8521869..d6db5842b 100644
--- a/cmd/crates/soroban-test/tests/it/integration.rs
+++ b/cmd/crates/soroban-test/tests/it/integration.rs
@@ -1,4 +1,5 @@
 mod bindings;
+mod constructor;
 mod cookbook;
 mod custom_types;
 mod dotenv;
diff --git a/cmd/crates/soroban-test/tests/it/integration/constructor.rs b/cmd/crates/soroban-test/tests/it/integration/constructor.rs
new file mode 100644
index 000000000..1919b56b0
--- /dev/null
+++ b/cmd/crates/soroban-test/tests/it/integration/constructor.rs
@@ -0,0 +1,73 @@
+use assert_cmd::Command;
+
+use soroban_cli::xdr::{
+    self, CreateContractArgsV2, HostFunction, InvokeHostFunctionOp, Limits, OperationBody, ReadXdr,
+    Transaction, TransactionV1Envelope,
+};
+use soroban_test::{AssertExt, TestEnv};
+
+use super::util::CONSTRUCTOR;
+
+fn constructor_cmd(sandbox: &TestEnv, value: u32, arg: &str) -> Command {
+    let mut cmd = sandbox.new_assert_cmd("contract");
+    cmd.arg("deploy")
+        .arg("--wasm")
+        .arg(CONSTRUCTOR.path())
+        .arg("--alias=init");
+    if !arg.is_empty() {
+        cmd.arg(arg);
+    }
+    cmd.arg("--").arg("--counter").arg(value.to_string());
+    cmd
+}
+
+#[tokio::test]
+async fn deploy_constructor_contract() {
+    let sandbox = TestEnv::new();
+    let value = 100;
+    let build = constructor_cmd(&sandbox, value, "--build-only")
+        .assert()
+        .stdout_as_str();
+    let tx = xdr::TransactionEnvelope::from_xdr_base64(&build, Limits::none()).unwrap();
+    let ops = if let xdr::TransactionEnvelope::Tx(TransactionV1Envelope {
+        tx: Transaction { operations, .. },
+        ..
+    }) = tx
+    {
+        operations
+    } else {
+        panic!()
+    }
+    .to_vec();
+    let first = ops.first().unwrap();
+    let args = match first {
+        xdr::Operation {
+            body:
+                OperationBody::InvokeHostFunction(InvokeHostFunctionOp {
+                    host_function:
+                        HostFunction::CreateContractV2(CreateContractArgsV2 {
+                            constructor_args, ..
+                        }),
+                    ..
+                }),
+            ..
+        } => constructor_args,
+        _ => panic!("expected invoke host function with create contract v2"),
+    }
+    .to_vec();
+
+    match args.first().unwrap() {
+        xdr::ScVal::U32(u32) => assert_eq!(*u32, value),
+        _ => panic!("Expected U32"),
+    }
+
+    constructor_cmd(&sandbox, value, "").assert().success();
+
+    let res = sandbox
+        .new_assert_cmd("contract")
+        .args(["invoke", "--id=init", "--", "counter"])
+        .assert()
+        .success()
+        .stdout_as_str();
+    assert_eq!(res.trim(), value.to_string());
+}
diff --git a/cmd/crates/soroban-test/tests/it/integration/util.rs b/cmd/crates/soroban-test/tests/it/integration/util.rs
index 438428e38..486b00a1b 100644
--- a/cmd/crates/soroban-test/tests/it/integration/util.rs
+++ b/cmd/crates/soroban-test/tests/it/integration/util.rs
@@ -6,6 +6,7 @@ use soroban_test::{TestEnv, Wasm};
 use std::fmt::Display;
 
 pub const HELLO_WORLD: &Wasm = &Wasm::Custom("test-wasms", "test_hello_world");
+pub const CONSTRUCTOR: &Wasm = &Wasm::Custom("test-wasms", "test_constructor");
 pub const CUSTOM_TYPES: &Wasm = &Wasm::Custom("test-wasms", "test_custom_types");
 pub const CUSTOM_ACCOUNT: &Wasm = &Wasm::Custom("test-wasms", "test_custom_account");
 pub const SWAP: &Wasm = &Wasm::Custom("test-wasms", "test_swap");
diff --git a/cmd/soroban-cli/src/commands/contract/deploy/asset.rs b/cmd/soroban-cli/src/commands/contract/deploy/asset.rs
index 263908521..169c0109a 100644
--- a/cmd/soroban-cli/src/commands/contract/deploy/asset.rs
+++ b/cmd/soroban-cli/src/commands/contract/deploy/asset.rs
@@ -93,11 +93,11 @@ impl NetworkRunnable for Cmd {
             .verify_network_passphrase(Some(&network.network_passphrase))
             .await?;
         let source_account = config.source_account()?;
-
         // Get the account sequence number
-        let public_strkey = source_account.to_string();
         // TODO: use symbols for the method names (both here and in serve)
-        let account_details = client.get_account(&public_strkey).await?;
+        let account_details = client
+            .get_account(&source_account.clone().to_string())
+            .await?;
         let sequence: i64 = account_details.seq_num.into();
         let network_passphrase = &network.network_passphrase;
         let contract_id = contract_id_hash_from_asset(asset, network_passphrase);
diff --git a/cmd/soroban-cli/src/commands/contract/deploy/wasm.rs b/cmd/soroban-cli/src/commands/contract/deploy/wasm.rs
index 21c685b93..9bf63802c 100644
--- a/cmd/soroban-cli/src/commands/contract/deploy/wasm.rs
+++ b/cmd/soroban-cli/src/commands/contract/deploy/wasm.rs
@@ -1,33 +1,38 @@
 use std::array::TryFromSliceError;
+use std::ffi::OsString;
 use std::fmt::Debug;
 use std::num::ParseIntError;
 
 use crate::xdr::{
     AccountId, ContractExecutable, ContractIdPreimage, ContractIdPreimageFromAddress,
-    CreateContractArgs, Error as XdrError, Hash, HostFunction, InvokeHostFunctionOp, Limits, Memo,
-    MuxedAccount, Operation, OperationBody, Preconditions, PublicKey, ScAddress, SequenceNumber,
-    Transaction, TransactionExt, Uint256, VecM, WriteXdr,
+    CreateContractArgs, CreateContractArgsV2, Error as XdrError, Hash, HostFunction,
+    InvokeContractArgs, InvokeHostFunctionOp, Limits, Memo, MuxedAccount, Operation, OperationBody,
+    Preconditions, PublicKey, ScAddress, SequenceNumber, Transaction, TransactionExt, Uint256,
+    VecM, WriteXdr,
 };
 use clap::{arg, command, Parser};
 use rand::Rng;
 use regex::Regex;
 
+use soroban_spec_tools::contract as contract_spec;
+
 use crate::{
     assembled::simulate_and_assemble_transaction,
-    commands::{contract::install, HEADING_RPC},
-    config::{self, data, locator, network},
-    rpc, utils, wasm,
-};
-use crate::{
     commands::{
-        contract::{self, id::wasm::get_contract_id},
+        contract::{self, arg_parsing, id::wasm::get_contract_id, install},
         global,
         txn_result::{TxnEnvelopeResult, TxnResult},
-        NetworkRunnable,
+        NetworkRunnable, HEADING_RPC,
     },
+    config::{self, data, locator, network},
     print::Print,
+    rpc,
+    utils::{self, rpc::get_remote_wasm_from_hash},
+    wasm,
 };
 
+pub const CONSTRUCTOR_FUNCTION_NAME: &str = "__constructor";
+
 #[derive(Parser, Debug, Clone)]
 #[command(group(
     clap::ArgGroup::new("wasm_src")
@@ -60,6 +65,9 @@ pub struct Cmd {
     /// configuration without asking for confirmation.
     #[arg(long, value_parser = clap::builder::ValueParser::new(alias_validator))]
     pub alias: Option<String>,
+    /// If provided, will be passed to the contract's `__constructor` function with provided arguments for that function as `--arg-name value`
+    #[arg(last = true, id = "CONTRACT_CONSTRUCTOR_ARGS")]
+    pub slop: Vec<OsString>,
 }
 
 #[derive(thiserror::Error, Debug)]
@@ -110,6 +118,10 @@ pub enum Error {
     InvalidAliasFormat { alias: String },
     #[error(transparent)]
     Locator(#[from] locator::Error),
+    #[error(transparent)]
+    ContractSpec(#[from] contract_spec::Error),
+    #[error(transparent)]
+    ArgParse(#[from] arg_parsing::Error),
     #[error("Only ed25519 accounts are allowed")]
     OnlyEd25519AccountsAllowed,
 }
@@ -157,6 +169,7 @@ impl NetworkRunnable for Cmd {
     type Error = Error;
     type Result = TxnResult<stellar_strkey::Contract>;
 
+    #[allow(clippy::too_many_lines)]
     async fn run_against_rpc_server(
         &self,
         global_args: Option<&global::Args>,
@@ -211,21 +224,54 @@ impl NetworkRunnable for Cmd {
         client
             .verify_network_passphrase(Some(&network.network_passphrase))
             .await?;
+
         let MuxedAccount::Ed25519(bytes) = config.source_account()? else {
             return Err(Error::OnlyEd25519AccountsAllowed);
         };
+        let source_account = AccountId(PublicKey::PublicKeyTypeEd25519(bytes));
+        let contract_id_preimage = ContractIdPreimage::Address(ContractIdPreimageFromAddress {
+            address: ScAddress::Account(source_account.clone()),
+            salt: Uint256(salt),
+        });
+        let contract_id =
+            get_contract_id(contract_id_preimage.clone(), &network.network_passphrase)?;
+        let raw_wasm = if let Some(wasm) = self.wasm.as_ref() {
+            wasm::Args { wasm: wasm.clone() }.read()?
+        } else {
+            get_remote_wasm_from_hash(&client, &wasm_hash).await?
+        };
+        let entries = soroban_spec_tools::contract::Spec::new(&raw_wasm)?.spec;
+        let res = soroban_spec_tools::Spec::new(entries.clone());
+        let constructor_params = if let Ok(func) = res.find_function(CONSTRUCTOR_FUNCTION_NAME) {
+            if func.inputs.len() == 0 {
+                None
+            } else {
+                let mut slop = vec![OsString::from(CONSTRUCTOR_FUNCTION_NAME)];
+                slop.extend_from_slice(&self.slop);
+                Some(
+                    arg_parsing::build_host_function_parameters(
+                        &stellar_strkey::Contract(contract_id.0),
+                        &slop,
+                        &entries,
+                        config,
+                    )?
+                    .2,
+                )
+            }
+        } else {
+            None
+        };
 
-        let key = stellar_strkey::ed25519::PublicKey(bytes.into());
         // Get the account sequence number
-        let account_details = client.get_account(&key.to_string()).await?;
+        let account_details = client.get_account(&source_account.to_string()).await?;
         let sequence: i64 = account_details.seq_num.into();
-        let (txn, contract_id) = build_create_contract_tx(
+        let txn = build_create_contract_tx(
             wasm_hash,
             sequence + 1,
             self.fee.fee,
-            &network.network_passphrase,
-            salt,
-            key,
+            source_account,
+            contract_id_preimage,
+            constructor_params.as_ref(),
         )?;
 
         if self.fee.build_only {
@@ -266,33 +312,39 @@ impl NetworkRunnable for Cmd {
 }
 
 fn build_create_contract_tx(
-    hash: Hash,
+    wasm_hash: Hash,
     sequence: i64,
     fee: u32,
-    network_passphrase: &str,
-    salt: [u8; 32],
-    key: stellar_strkey::ed25519::PublicKey,
-) -> Result<(Transaction, stellar_strkey::Contract), Error> {
-    let source_account = AccountId(PublicKey::PublicKeyTypeEd25519(key.0.into()));
-
-    let contract_id_preimage = ContractIdPreimage::Address(ContractIdPreimageFromAddress {
-        address: ScAddress::Account(source_account),
-        salt: Uint256(salt),
-    });
-    let contract_id = get_contract_id(contract_id_preimage.clone(), network_passphrase)?;
-
-    let op = Operation {
-        source_account: None,
-        body: OperationBody::InvokeHostFunction(InvokeHostFunctionOp {
-            host_function: HostFunction::CreateContract(CreateContractArgs {
-                contract_id_preimage,
-                executable: ContractExecutable::Wasm(hash),
+    key: AccountId,
+    contract_id_preimage: ContractIdPreimage,
+    constructor_params: Option<&InvokeContractArgs>,
+) -> Result<Transaction, Error> {
+    let op = if let Some(InvokeContractArgs { args, .. }) = constructor_params {
+        Operation {
+            source_account: None,
+            body: OperationBody::InvokeHostFunction(InvokeHostFunctionOp {
+                host_function: HostFunction::CreateContractV2(CreateContractArgsV2 {
+                    contract_id_preimage,
+                    executable: ContractExecutable::Wasm(wasm_hash),
+                    constructor_args: args.clone(),
+                }),
+                auth: VecM::default(),
             }),
-            auth: VecM::default(),
-        }),
+        }
+    } else {
+        Operation {
+            source_account: None,
+            body: OperationBody::InvokeHostFunction(InvokeHostFunctionOp {
+                host_function: HostFunction::CreateContract(CreateContractArgs {
+                    contract_id_preimage,
+                    executable: ContractExecutable::Wasm(wasm_hash),
+                }),
+                auth: VecM::default(),
+            }),
+        }
     };
     let tx = Transaction {
-        source_account: MuxedAccount::Ed25519(key.0.into()),
+        source_account: key.into(),
         fee,
         seq_num: SequenceNumber(sequence),
         cond: Preconditions::None,
@@ -301,7 +353,7 @@ fn build_create_contract_tx(
         ext: TransactionExt::V0,
     };
 
-    Ok((tx, contract_id))
+    Ok(tx)
 }
 
 #[cfg(test)]
@@ -314,18 +366,26 @@ mod tests {
             .unwrap()
             .try_into()
             .unwrap();
+        let salt = [0u8; 32];
+        let key =
+            &utils::parse_secret_key("SBFGFF27Y64ZUGFAIG5AMJGQODZZKV2YQKAVUUN4HNE24XZXD2OEUVUP")
+                .unwrap();
+        let source_account = AccountId(PublicKey::PublicKeyTypeEd25519(Uint256(
+            key.verifying_key().to_bytes(),
+        )));
+
+        let contract_id_preimage = ContractIdPreimage::Address(ContractIdPreimageFromAddress {
+            address: ScAddress::Account(source_account.clone()),
+            salt: Uint256(salt),
+        });
+
         let result = build_create_contract_tx(
             Hash(hash),
             300,
             1,
-            "Public Global Stellar Network ; September 2015",
-            [0u8; 32],
-            stellar_strkey::ed25519::PublicKey(
-                utils::parse_secret_key("SBFGFF27Y64ZUGFAIG5AMJGQODZZKV2YQKAVUUN4HNE24XZXD2OEUVUP")
-                    .unwrap()
-                    .verifying_key()
-                    .to_bytes(),
-            ),
+            source_account,
+            contract_id_preimage,
+            None,
         );
 
         assert!(result.is_ok());
diff --git a/cmd/soroban-cli/src/commands/contract/extend.rs b/cmd/soroban-cli/src/commands/contract/extend.rs
index 24aac54c5..6ec8ebdb1 100644
--- a/cmd/soroban-cli/src/commands/contract/extend.rs
+++ b/cmd/soroban-cli/src/commands/contract/extend.rs
@@ -135,7 +135,9 @@ impl NetworkRunnable for Cmd {
         let extend_to = self.ledgers_to_extend();
 
         // Get the account sequence number
-        let account_details = client.get_account(&source_account.to_string()).await?;
+        let account_details = client
+            .get_account(&source_account.clone().to_string())
+            .await?;
         let sequence: i64 = account_details.seq_num.into();
 
         let tx = Transaction {
@@ -184,10 +186,7 @@ impl NetworkRunnable for Cmd {
         if !events.is_empty() {
             tracing::info!("Events:\n {events:#?}");
         }
-        let meta = res
-            .result_meta
-            .as_ref()
-            .ok_or(Error::MissingOperationResult)?;
+        let meta = res.result_meta.ok_or(Error::MissingOperationResult)?;
 
         // The transaction from core will succeed regardless of whether it actually found & extended
         // the entry, so we have to inspect the result meta to tell if it worked or not.
diff --git a/cmd/soroban-cli/src/commands/contract/install.rs b/cmd/soroban-cli/src/commands/contract/install.rs
index cd6e93b24..a215a987d 100644
--- a/cmd/soroban-cli/src/commands/contract/install.rs
+++ b/cmd/soroban-cli/src/commands/contract/install.rs
@@ -137,7 +137,9 @@ impl NetworkRunnable for Cmd {
         // Get the account sequence number
         let source_account = config.source_account()?;
 
-        let account_details = client.get_account(&source_account.to_string()).await?;
+        let account_details = client
+            .get_account(&source_account.clone().to_string())
+            .await?;
         let sequence: i64 = account_details.seq_num.into();
 
         let (tx_without_preflight, hash) =
@@ -204,7 +206,7 @@ impl NetworkRunnable for Cmd {
         if let Some(TransactionResult {
             result: TransactionResultResult::TxInternalError,
             ..
-        }) = txn_resp.result.as_ref()
+        }) = txn_resp.result
         {
             // Now just need to restore it and don't have to install again
             restore::Cmd {
diff --git a/cmd/soroban-cli/src/commands/contract/restore.rs b/cmd/soroban-cli/src/commands/contract/restore.rs
index 87a52a9f6..92fc4b41d 100644
--- a/cmd/soroban-cli/src/commands/contract/restore.rs
+++ b/cmd/soroban-cli/src/commands/contract/restore.rs
@@ -136,8 +136,9 @@ impl NetworkRunnable for Cmd {
         let source_account = config.source_account()?;
 
         // Get the account sequence number
-        let public_strkey = source_account.to_string();
-        let account_details = client.get_account(&public_strkey).await?;
+        let account_details = client
+            .get_account(&source_account.clone().to_string())
+            .await?;
         let sequence: i64 = account_details.seq_num.into();
 
         let tx = Transaction {
@@ -206,7 +207,7 @@ impl NetworkRunnable for Cmd {
             );
         }
         Ok(TxnResult::Res(
-            parse_operations(operations).ok_or(Error::MissingOperationResult)?,
+            parse_operations(&operations.to_vec()).ok_or(Error::MissingOperationResult)?,
         ))
     }
 }
diff --git a/cmd/soroban-cli/src/commands/tx/args.rs b/cmd/soroban-cli/src/commands/tx/args.rs
index 7e032fd53..fc99b9591 100644
--- a/cmd/soroban-cli/src/commands/tx/args.rs
+++ b/cmd/soroban-cli/src/commands/tx/args.rs
@@ -39,7 +39,7 @@ impl Args {
         let source_account = self.source_account()?;
         let seq_num = self
             .config
-            .next_sequence_number(&source_account.to_string())
+            .next_sequence_number(source_account.clone().account_id())
             .await?;
         // Once we have a way to add operations this will be updated to allow for a different source account
         let operation = xdr::Operation {
diff --git a/cmd/soroban-cli/src/config/data.rs b/cmd/soroban-cli/src/config/data.rs
index bbfc6994e..f032a94d3 100644
--- a/cmd/soroban-cli/src/config/data.rs
+++ b/cmd/soroban-cli/src/config/data.rs
@@ -209,7 +209,7 @@ mod test {
         assert_eq!(rpc_uri, new_rpc_uri);
         match (action, original_action) {
             (Action::Simulate { response: a }, Action::Simulate { response: b }) => {
-                assert_eq!(a.cost.cpu_insns, b.cost.cpu_insns);
+                assert_eq!(a.min_resource_fee, b.min_resource_fee);
             }
             _ => panic!("Action mismatch"),
         }
diff --git a/cmd/soroban-cli/src/config/mod.rs b/cmd/soroban-cli/src/config/mod.rs
index 21ebb1fe9..11eb179ee 100644
--- a/cmd/soroban-cli/src/config/mod.rs
+++ b/cmd/soroban-cli/src/config/mod.rs
@@ -115,10 +115,19 @@ impl Args {
         Ok(self.network.get(&self.locator)?)
     }
 
-    pub async fn next_sequence_number(&self, account_str: &str) -> Result<SequenceNumber, Error> {
+    pub async fn next_sequence_number(
+        &self,
+        account: impl Into<xdr::AccountId>,
+    ) -> Result<SequenceNumber, Error> {
         let network = self.get_network()?;
         let client = network.rpc_client()?;
-        Ok((client.get_account(account_str).await?.seq_num.0 + 1).into())
+        Ok((client
+            .get_account(&account.into().to_string())
+            .await?
+            .seq_num
+            .0
+            + 1)
+        .into())
     }
 }
 

From 048d11b88c50abb7d00123818a29991337526fc4 Mon Sep 17 00:00:00 2001
From: Leigh McCulloch <351529+leighmcculloch@users.noreply.github.com>
Date: Thu, 7 Nov 2024 03:58:33 +1000
Subject: [PATCH 04/31] Fix which macOS arch is used for binary builds (#1705)

---
 .github/workflows/binaries.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/binaries.yml b/.github/workflows/binaries.yml
index f2f53bd78..25cea7366 100644
--- a/.github/workflows/binaries.yml
+++ b/.github/workflows/binaries.yml
@@ -33,9 +33,9 @@ jobs:
           - os: ubuntu-20.04 # Use 20.04 to get an older version of glibc for increased compat
             target: aarch64-unknown-linux-gnu
           - os: macos-14
-            target: x86_64-apple-darwin
-          - os: macos-12
             target: aarch64-apple-darwin
+          - os: macos-12
+            target: x86_64-apple-darwin
           - os: windows-latest
             target: x86_64-pc-windows-msvc
             ext: .exe

From 1fc9c343798657952a6a2bae8350589c096389e0 Mon Sep 17 00:00:00 2001
From: Gleb <gleb@stellar.org>
Date: Wed, 6 Nov 2024 13:54:46 -0800
Subject: [PATCH 05/31] Cleanup unit testing/add ARM support (#1691)

* WIP: check make test

* Update makefile

* Cleanup

* Deprecation fix

* Add build target

* Add libssl-dev

* Print openssl dir

* cfg path

* cfg path

* Add sysroot

* libssl

* ls

* fix apt

* ln

* libssl

* arm

* ...

* tmate

* apt sources

* Remove tmate

* libudev arm64

* Change runner to arm

* Fix rust job

* Update rust-cache

* Uncomment other OSes

* Cleanup apt

* Update rust-cache

* Unpin rust-cache version
---
 .github/workflows/rust.yml                         | 14 +++++---------
 Makefile                                           |  2 +-
 .../tests/fixtures/test-wasms/swap/src/test.rs     |  4 +++-
 3 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
index 9ae750a77..7b046c8c3 100644
--- a/.github/workflows/rust.yml
+++ b/.github/workflows/rust.yml
@@ -47,7 +47,7 @@ jobs:
         sys:
         - os: ubuntu-latest-16-cores
           target: x86_64-unknown-linux-gnu
-        - os: ubuntu-latest-16-cores
+        - os: ubuntu-jammy-16-cores-arm64
           target: aarch64-unknown-linux-gnu
         - os: macos-latest
           target: x86_64-apple-darwin
@@ -79,14 +79,10 @@ jobs:
     - if: runner.os == 'Linux'
       run: sudo apt-get update && sudo apt-get -y install gcc-aarch64-linux-gnu g++-aarch64-linux-gnu libudev-dev
     - run: cargo clippy --all-targets --target ${{ matrix.sys.target }}
-    - run: make build-test
-      # TODO: enable ARM linux
-    - if: startsWith(matrix.sys.target, 'x86_64') || runner.os == 'macOS'
-      # specify directories explicitly (otherwise it will fail with missing symbols)
-      run: |
-        for I in cmd/soroban-cli cmd/crates/* cmd/crates/soroban-test/tests/fixtures/test-wasms/hello_world ; do
-          cargo test --target ${{ matrix.sys.target }} --manifest-path $I/Cargo.toml
-        done
+    - run: make test
+      env:
+        CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_LINKER: aarch64-linux-gnu-gcc
+        CARGO_BUILD_TARGET: ${{ matrix.sys.target }}
 
   publish-dry-run:
     if: github.event_name == 'push' || startsWith(github.head_ref, 'release/')
diff --git a/Makefile b/Makefile
index f534410e0..92cdacd73 100644
--- a/Makefile
+++ b/Makefile
@@ -48,7 +48,7 @@ generate-full-help-doc:
 	cargo run --bin doc-gen --features clap-markdown
 
 test: build-test
-	cargo test
+	cargo test --workspace
 
 e2e-test:
 	cargo test --features it --test it -- integration
diff --git a/cmd/crates/soroban-test/tests/fixtures/test-wasms/swap/src/test.rs b/cmd/crates/soroban-test/tests/fixtures/test-wasms/swap/src/test.rs
index e32b45e0a..5c973880e 100644
--- a/cmd/crates/soroban-test/tests/fixtures/test-wasms/swap/src/test.rs
+++ b/cmd/crates/soroban-test/tests/fixtures/test-wasms/swap/src/test.rs
@@ -11,7 +11,9 @@ use token::Client as TokenClient;
 use token::StellarAssetClient as TokenAdminClient;
 
 fn create_token_contract<'a>(e: &Env, admin: &Address) -> (TokenClient<'a>, TokenAdminClient<'a>) {
-    let contract_address = e.register_stellar_asset_contract(admin.clone());
+    let contract_address = e
+        .register_stellar_asset_contract_v2(admin.clone())
+        .address();
     (
         TokenClient::new(e, &contract_address),
         TokenAdminClient::new(e, &contract_address),

From 0b4c3630d423e2a2def8d3b5a922a6c651739317 Mon Sep 17 00:00:00 2001
From: Leigh McCulloch <351529+leighmcculloch@users.noreply.github.com>
Date: Thu, 7 Nov 2024 09:10:30 +1000
Subject: [PATCH 06/31] Add cargo-deny for license checks and dep duplicate
 avoidance (#1685)

---
 .github/workflows/rust.yml           |  15 +-
 Cargo.lock                           |  38 ++--
 cmd/crates/stellar-ledger/Cargo.toml |   7 +-
 deny.toml                            | 287 +++++++++++++++++++++++++++
 4 files changed, 326 insertions(+), 21 deletions(-)
 create mode 100644 deny.toml

diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
index 7b046c8c3..595e6e817 100644
--- a/.github/workflows/rust.yml
+++ b/.github/workflows/rust.yml
@@ -17,7 +17,7 @@ jobs:
 
   complete:
     if: always()
-    needs: [fmt, check-generated-full-help-docs, build-and-test, publish-dry-run]
+    needs: [fmt, cargo-deny, check-generated-full-help-docs, build-and-test, publish-dry-run]
     runs-on: ubuntu-latest
     steps:
     - if: contains(needs.*.result, 'failure') || contains(needs.*.result, 'cancelled')
@@ -30,6 +30,19 @@ jobs:
     - run: rustup update
     - run: cargo fmt --all --check
 
+  cargo-deny:
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        check: [advisories, bans, licenses, sources]
+    continue-on-error: ${{ matrix.check == 'advisories' || matrix.check == 'bans' || matrix.check == 'licenses' }}
+    steps:
+    - uses: actions/checkout@v3
+    - uses: EmbarkStudios/cargo-deny-action@b01e7a8cfb1f496c52d77361e84c1840d8246393
+      with:
+        command: check ${{ matrix.check }}
+
   check-generated-full-help-docs:
     runs-on: ubuntu-latest-16-cores
     steps:
diff --git a/Cargo.lock b/Cargo.lock
index 806e767ec..6bc90a065 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1701,9 +1701,9 @@ dependencies = [
 
 [[package]]
 name = "futures-channel"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78"
+checksum = "2dff15bf788c671c1934e366d07e30c1814a8ef514e1af724a602e8a2fbe1b10"
 dependencies = [
  "futures-core",
  "futures-sink",
@@ -1711,9 +1711,9 @@ dependencies = [
 
 [[package]]
 name = "futures-core"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d"
+checksum = "05f29059c0c2090612e8d742178b0580d2dc940c837851ad723096f87af6663e"
 
 [[package]]
 name = "futures-executor"
@@ -1728,9 +1728,9 @@ dependencies = [
 
 [[package]]
 name = "futures-io"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1"
+checksum = "9e5c1b78ca4aae1ac06c48a526a655760685149f0d465d21f37abfe57ce075c6"
 
 [[package]]
 name = "futures-lite"
@@ -1762,9 +1762,9 @@ dependencies = [
 
 [[package]]
 name = "futures-macro"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac"
+checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1773,21 +1773,21 @@ dependencies = [
 
 [[package]]
 name = "futures-sink"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5"
+checksum = "e575fab7d1e0dcb8d0c7bcf9a63ee213816ab51902e6d244a95819acacf1d4f7"
 
 [[package]]
 name = "futures-task"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004"
+checksum = "f90f7dce0722e95104fcb095585910c0977252f286e354b5e3bd38902cd99988"
 
 [[package]]
 name = "futures-util"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48"
+checksum = "9fa08315bb612088cc391249efdc3bc77536f16c91f6cf495e6fbe85b20a4a81"
 dependencies = [
  "futures-channel",
  "futures-core",
@@ -3013,11 +3013,11 @@ dependencies = [
 
 [[package]]
 name = "openssl"
-version = "0.10.55"
+version = "0.10.68"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "345df152bc43501c5eb9e4654ff05f794effb78d4efe3d53abc158baddc0703d"
+checksum = "6174bc48f102d208783c2c84bf931bb75927a617866870de8a4ea85597f871f5"
 dependencies = [
- "bitflags 1.3.2",
+ "bitflags 2.6.0",
  "cfg-if",
  "foreign-types",
  "libc",
@@ -3045,9 +3045,9 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf"
 
 [[package]]
 name = "openssl-sys"
-version = "0.9.103"
+version = "0.9.104"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f9e8deee91df40a943c71b917e5874b951d32a802526c85721ce3b776c929d6"
+checksum = "45abf306cbf99debc8195b66b7346498d7b10c210de50418b5ccd7ceba08c741"
 dependencies = [
  "cc",
  "libc",
diff --git a/cmd/crates/stellar-ledger/Cargo.toml b/cmd/crates/stellar-ledger/Cargo.toml
index abf73c375..10fd34e42 100644
--- a/cmd/crates/stellar-ledger/Cargo.toml
+++ b/cmd/crates/stellar-ledger/Cargo.toml
@@ -10,6 +10,11 @@ version.workspace = true
 edition = "2021"
 rust-version.workspace = true
 
+# This crate has not yet ever been published. Skip publishing until these
+# security issues are addressed:
+# https://github.com/stellar/stellar-cli/issues/1706
+publish = false
+
 [dependencies]
 soroban-spec = { workspace = true }
 thiserror = "1.0.32"
@@ -47,7 +52,7 @@ once_cell = "1.19.0"
 pretty_assertions = "1.2.1"
 serial_test = "3.0.0"
 httpmock = "0.7.0-rc.1"
-test-case = "*"
+test-case = "3.3.1"
 testcontainers = "0.20.1"
 
 
diff --git a/deny.toml b/deny.toml
new file mode 100644
index 000000000..7588e71f1
--- /dev/null
+++ b/deny.toml
@@ -0,0 +1,287 @@
+# This template contains all of the possible sections and their default values
+
+# Note that all fields that take a lint level have these possible values:
+# * deny - An error will be produced and the check will fail
+# * warn - A warning will be produced, but the check will not fail
+# * allow - No warning or error will be produced, though in some cases a note
+# will be
+
+# The values provided in this template are the default values that will be used
+# when any section or field is not specified in your own configuration
+
+# Root options
+
+# If 1 or more target triples (and optionally, target_features) are specified,
+# only the specified targets will be checked when running `cargo deny check`.
+# This means, if a particular package is only ever used as a target specific
+# dependency, such as, for example, the `nix` crate only being used via the
+# `target_family = "unix"` configuration, that only having windows targets in
+# this list would mean the nix crate, as well as any of its exclusive
+# dependencies not shared by any other crates, would be ignored, as the target
+# list here is effectively saying which targets you are building for.
+targets = [
+    { triple = "x86_64-unknown-linux-gnu" },
+    { triple = "aarch64-unknown-linux-gnu" },
+    { triple = "x86_64-apple-darwin" },
+    { triple = "aarch64-apple-darwin" },
+    { triple = "x86_64-pc-windows-msvc" },
+]
+# When creating the dependency graph used as the source of truth when checks are
+# executed, this field can be used to prune crates from the graph, removing them
+# from the view of cargo-deny. This is an extremely heavy hammer, as if a crate
+# is pruned from the graph, all of its dependencies will also be pruned unless
+# they are connected to another crate in the graph that hasn't been pruned,
+# so it should be used with care. The identifiers are [Package ID Specifications]
+# (https://doc.rust-lang.org/cargo/reference/pkgid-spec.html)
+
+exclude = [
+]
+
+# If true, metadata will be collected with `--all-features`. Note that this can't
+# be toggled off if true, if you want to conditionally enable `--all-features` it
+# is recommended to pass `--all-features` on the cmd line instead
+all-features = true
+# If true, metadata will be collected with `--no-default-features`. The same
+# caveat with `all-features` applies
+no-default-features = false
+# If set, these feature will be enabled when collecting metadata. If `--features`
+# is specified on the cmd line they will take precedence over this option.
+#features = []
+# When outputting inclusion graphs in diagnostics that include features, this
+# option can be used to specify the depth at which feature edges will be added.
+# This option is included since the graphs can be quite large and the addition
+# of features from the crate(s) to all of the graph roots can be far too verbose.
+# This option can be overridden via `--feature-depth` on the cmd line
+feature-depth = 1
+
+# This section is considered when running `cargo deny check advisories`
+# More documentation for the advisories section can be found here:
+# https://embarkstudios.github.io/cargo-deny/checks/advisories/cfg.html
+[advisories]
+# The path where the advisory database is cloned/fetched into
+db-path = "~/.cargo/advisory-db"
+# The url(s) of the advisory databases to use
+db-urls = ["https://github.com/rustsec/advisory-db"]
+# The lint level for security vulnerabilities
+vulnerability = "deny"
+# The lint level for unmaintained crates
+unmaintained = "warn"
+# The lint level for crates that have been yanked from their source registry
+yanked = "warn"
+# The lint level for crates with security notices. Note that as of
+# 2019-12-17 there are no security notice advisories in
+# https://github.com/rustsec/advisory-db
+notice = "warn"
+# A list of advisory IDs to ignore. Note that ignored advisories will still
+# output a note when they are encountered.
+ignore = [
+    #"RUSTSEC-0000-0000",
+]
+# Threshold for security vulnerabilities, any vulnerability with a CVSS score
+# lower than the range specified will be ignored. Note that ignored advisories
+# will still output a note when they are encountered.
+# * None - CVSS Score 0.0
+# * Low - CVSS Score 0.1 - 3.9
+# * Medium - CVSS Score 4.0 - 6.9
+# * High - CVSS Score 7.0 - 8.9
+# * Critical - CVSS Score 9.0 - 10.0
+#severity-threshold =
+
+# If this is true, then cargo deny will use the git executable to fetch advisory database.
+# If this is false, then it uses a built-in git library.
+# Setting this to true can be helpful if you have special authentication requirements that cargo-deny does not support.
+# See Git Authentication for more information about setting up git authentication.
+#git-fetch-with-cli = true
+
+# This section is considered when running `cargo deny check licenses`
+# More documentation for the licenses section can be found here:
+# https://embarkstudios.github.io/cargo-deny/checks/licenses/cfg.html
+[licenses]
+# The lint level for crates which do not have a detectable license
+unlicensed = "deny"
+# List of explicitly allowed licenses
+# See https://spdx.org/licenses/ for list of possible licenses
+# [possible values: any SPDX 3.11 short identifier (+ optional exception)].
+allow = [
+    "MIT",
+    "Apache-2.0",
+    "BSD-3-Clause",
+    "Apache-2.0 WITH LLVM-exception",
+    "Unicode-DFS-2016",
+    "ISC",
+    "BSD-2-Clause",
+]
+# List of explicitly disallowed licenses
+# See https://spdx.org/licenses/ for list of possible licenses
+# [possible values: any SPDX 3.11 short identifier (+ optional exception)].
+deny = [
+    #"Nokia",
+]
+# Lint level for licenses considered copyleft
+copyleft = "deny"
+# Blanket approval or denial for OSI-approved or FSF Free/Libre licenses
+# * both - The license will be approved if it is both OSI-approved *AND* FSF
+# * either - The license will be approved if it is either OSI-approved *OR* FSF
+# * osi-only - The license will be approved if is OSI-approved *AND NOT* FSF
+# * fsf-only - The license will be approved if is FSF *AND NOT* OSI-approved
+# * neither - This predicate is ignored and the default lint level is used
+allow-osi-fsf-free = "neither"
+# Lint level used when no other predicates are matched
+# 1. License isn't in the allow or deny lists
+# 2. License isn't copyleft
+# 3. License isn't OSI/FSF, or allow-osi-fsf-free = "neither"
+default = "deny"
+# The confidence threshold for detecting a license from license text.
+# The higher the value, the more closely the license text must be to the
+# canonical license text of a valid SPDX license file.
+# [possible values: any between 0.0 and 1.0].
+confidence-threshold = 0.8
+# Allow 1 or more licenses on a per-crate basis, so that particular licenses
+# aren't accepted for every possible crate as with the normal allow list
+exceptions = [
+    # The following dep licenses were inspected and approved for use because we
+    # do not fork them. Related conversation and approval is at:
+    # https://stellarfoundation.slack.com/archives/C07TC92R2P7/p1730924548048429?thread_ts=1730900591.962089&cid=C07TC92R2P7
+    { allow = ["MPL-2.0"], name = "option-ext" },
+    { allow = ["MPL-2.0"], name = "webpki-roots" },
+    # The following dep licensed was manually reviewed and approved for use. Related conversation and approval is at:
+    # https://stellarfoundation.slack.com/archives/C07TC92R2P7/p1730917671563029?thread_ts=1730903286.490759&cid=C07TC92R2P7
+    { allow = ["OpenSSL"], name = "ring" },
+]
+
+[[licenses.clarify]]
+name = "ring"
+expression = "MIT AND ISC AND OpenSSL"
+license-files = [
+    { path = "LICENSE", hash = 0xbd0eed23 }
+]
+
+# Some crates don't have (easily) machine readable licensing information,
+# adding a clarification entry for it allows you to manually specify the
+# licensing information
+#[[licenses.clarify]]
+# The name of the crate the clarification applies to
+#name = "ring"
+# The optional version constraint for the crate
+#version = "*"
+# The SPDX expression for the license requirements of the crate
+#expression = "MIT AND ISC AND OpenSSL"
+# One or more files in the crate's source used as the "source of truth" for
+# the license expression. If the contents match, the clarification will be used
+# when running the license check, otherwise the clarification will be ignored
+# and the crate will be checked normally, which may produce warnings or errors
+# depending on the rest of your configuration
+#license-files = [
+    # Each entry is a crate relative path, and the (opaque) hash of its contents
+    #{ path = "LICENSE", hash = 0xbd0eed23 }
+#]
+
+[licenses.private]
+# If true, ignores workspace crates that aren't published, or are only
+# published to private registries.
+# To see how to mark a crate as unpublished (to the official registry),
+# visit https://doc.rust-lang.org/cargo/reference/manifest.html#the-publish-field.
+ignore = true
+# One or more private registries that you might publish crates to, if a crate
+# is only published to private registries, and ignore is true, the crate will
+# not have its license(s) checked
+registries = [
+    #"https://sekretz.com/registry
+]
+
+# This section is considered when running `cargo deny check bans`.
+# More documentation about the 'bans' section can be found here:
+# https://embarkstudios.github.io/cargo-deny/checks/bans/cfg.html
+[bans]
+# Lint level for when multiple versions of the same crate are detected
+multiple-versions = "deny"
+# Lint level for when a crate version requirement is `*`
+wildcards = "deny"
+allow-wildcard-paths = true
+# The graph highlighting used when creating dotgraphs for crates
+# with multiple versions
+# * lowest-version - The path to the lowest versioned duplicate is highlighted
+# * simplest-path - The path to the version with the fewest edges is highlighted
+# * all - Both lowest-version and simplest-path are used
+highlight = "all"
+# The default lint level for `default` features for crates that are members of
+# the workspace that is being checked. This can be overridden by allowing/denying
+# `default` on a crate-by-crate basis if desired.
+workspace-default-features = "allow"
+# The default lint level for `default` features for external crates that are not
+# members of the workspace. This can be overridden by allowing/denying `default`
+# on a crate-by-crate basis if desired.
+external-default-features = "allow"
+# List of crates that are allowed. Use with care!
+allow = [
+    #{ name = "ansi_term", version = "=0.11.0" },
+]
+# List of crates to deny
+deny = [
+    # Each entry the name of a crate and a version range. If version is
+    # not specified, all versions will be matched.
+    #{ name = "ansi_term", version = "=0.11.0" },
+    #
+    # Wrapper crates can optionally be specified to allow the crate when it
+    # is a direct dependency of the otherwise banned crate
+    #{ name = "ansi_term", version = "=0.11.0", wrappers = [] },
+]
+
+# List of features to allow/deny
+# Each entry the name of a crate and a version range. If version is
+# not specified, all versions will be matched.
+#[[bans.features]]
+#name = "reqwest"
+# Features to not allow
+#deny = ["json"]
+# Features to allow
+#allow = [
+#    "rustls",
+#    "__rustls",
+#    "__tls",
+#    "hyper-rustls",
+#    "rustls",
+#    "rustls-pemfile",
+#    "rustls-tls-webpki-roots",
+#    "tokio-rustls",
+#    "webpki-roots",
+#]
+# If true, the allowed features must exactly match the enabled feature set. If
+# this is set there is no point setting `deny`
+#exact = true
+
+# Certain crates/versions that will be skipped when doing duplicate detection.
+skip = [
+    # { name = "hashbrown", version = "=0.13.2" },
+    # { name = "syn", version = "=1.0.109" },
+]
+# Similarly to `skip` allows you to skip certain crates during duplicate
+# detection. Unlike skip, it also includes the entire tree of transitive
+# dependencies starting at the specified crate, up to a certain depth, which is
+# by default infinite.
+skip-tree = [
+]
+
+# This section is considered when running `cargo deny check sources`.
+# More documentation about the 'sources' section can be found here:
+# https://embarkstudios.github.io/cargo-deny/checks/sources/cfg.html
+[sources]
+# Lint level for what to happen when a crate from a crate registry that is not
+# in the allow list is encountered
+unknown-registry = "deny"
+# Lint level for what to happen when a crate from a git repository that is not
+# in the allow list is encountered
+unknown-git = "deny"
+# List of URLs for allowed crate registries. Defaults to the crates.io index
+# if not specified. If it is specified but empty, no registries are allowed.
+allow-registry = ["https://github.com/rust-lang/crates.io-index"]
+# List of URLs for allowed Git repositories
+allow-git = []
+
+[sources.allow-org]
+# 1 or more github.com organizations to allow git sources for
+github = ["stellar"]
+# 1 or more gitlab.com organizations to allow git sources for
+# gitlab = [""]
+# 1 or more bitbucket.org organizations to allow git sources for
+# bitbucket = [""]

From eb4c0de8c9f482f646b2c5bc716380201c7fb71e Mon Sep 17 00:00:00 2001
From: Nando Vieira <me@fnando.com>
Date: Wed, 6 Nov 2024 16:16:36 -0800
Subject: [PATCH 07/31] Do not overwrite existing keys when generating new
 ones. (#1709)

---
 .gitignore                                    |  1 +
 FULL_HELP_DOCS.md                             |  1 +
 .../soroban-test/tests/it/integration.rs      |  2 +-
 .../soroban-test/tests/it/integration/fund.rs | 23 ------
 .../soroban-test/tests/it/integration/keys.rs | 76 +++++++++++++++++++
 cmd/soroban-cli/src/commands/keys/generate.rs | 26 ++++++-
 cmd/soroban-cli/src/print.rs                  |  1 +
 7 files changed, 105 insertions(+), 25 deletions(-)
 delete mode 100644 cmd/crates/soroban-test/tests/it/integration/fund.rs
 create mode 100644 cmd/crates/soroban-test/tests/it/integration/keys.rs

diff --git a/.gitignore b/.gitignore
index 7723bb84b..b7150ae5d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,4 @@ test_snapshots
 .vscode/settings.json
 .idea
 local.sh
+.stellar
diff --git a/FULL_HELP_DOCS.md b/FULL_HELP_DOCS.md
index ae25453c6..48cc98aa9 100644
--- a/FULL_HELP_DOCS.md
+++ b/FULL_HELP_DOCS.md
@@ -1019,6 +1019,7 @@ Generate a new identity with a seed phrase, currently 12 words
 * `--fund` — Fund generated key pair
 
   Default value: `false`
+* `--overwrite` — Overwrite existing identity if it already exists
 
 
 
diff --git a/cmd/crates/soroban-test/tests/it/integration.rs b/cmd/crates/soroban-test/tests/it/integration.rs
index d6db5842b..3ec0d61ed 100644
--- a/cmd/crates/soroban-test/tests/it/integration.rs
+++ b/cmd/crates/soroban-test/tests/it/integration.rs
@@ -3,8 +3,8 @@ mod constructor;
 mod cookbook;
 mod custom_types;
 mod dotenv;
-mod fund;
 mod hello_world;
+mod keys;
 mod snapshot;
 mod tx;
 mod util;
diff --git a/cmd/crates/soroban-test/tests/it/integration/fund.rs b/cmd/crates/soroban-test/tests/it/integration/fund.rs
deleted file mode 100644
index 263775412..000000000
--- a/cmd/crates/soroban-test/tests/it/integration/fund.rs
+++ /dev/null
@@ -1,23 +0,0 @@
-use soroban_test::TestEnv;
-
-#[tokio::test]
-#[allow(clippy::too_many_lines)]
-async fn fund() {
-    let sandbox = &TestEnv::new();
-    sandbox
-        .new_assert_cmd("keys")
-        .arg("generate")
-        .arg("test")
-        .assert()
-        .success();
-    sandbox
-        .new_assert_cmd("keys")
-        .arg("fund")
-        .arg("test")
-        .assert()
-        // Don't expect error if friendbot indicated that the account is
-        // already fully funded to the starting balance, because the
-        // user's goal is to get funded, and the account is funded
-        // so it is success much the same.
-        .success();
-}
diff --git a/cmd/crates/soroban-test/tests/it/integration/keys.rs b/cmd/crates/soroban-test/tests/it/integration/keys.rs
new file mode 100644
index 000000000..267a0b095
--- /dev/null
+++ b/cmd/crates/soroban-test/tests/it/integration/keys.rs
@@ -0,0 +1,76 @@
+use predicates::prelude::predicate;
+use soroban_test::AssertExt;
+use soroban_test::TestEnv;
+
+fn pubkey_for_identity(sandbox: &TestEnv, name: &str) -> String {
+    let output = sandbox
+        .new_assert_cmd("keys")
+        .arg("address")
+        .arg(name)
+        .assert()
+        .stdout_as_str();
+    return output;
+}
+
+#[tokio::test]
+#[allow(clippy::too_many_lines)]
+async fn fund() {
+    let sandbox = &TestEnv::new();
+    sandbox
+        .new_assert_cmd("keys")
+        .arg("generate")
+        .arg("test2")
+        .assert()
+        .success();
+    sandbox
+        .new_assert_cmd("keys")
+        .arg("fund")
+        .arg("test2")
+        .assert()
+        // Don't expect error if friendbot indicated that the account is
+        // already fully funded to the starting balance, because the
+        // user's goal is to get funded, and the account is funded
+        // so it is success much the same.
+        .success();
+}
+
+#[tokio::test]
+#[allow(clippy::too_many_lines)]
+async fn overwrite_identity() {
+    let sandbox = &TestEnv::new();
+    sandbox
+        .new_assert_cmd("keys")
+        .arg("generate")
+        .arg("test2")
+        .assert()
+        .success();
+
+    let initial_pubkey = sandbox
+        .new_assert_cmd("keys")
+        .arg("address")
+        .arg("test2")
+        .assert()
+        .stdout_as_str();
+
+    sandbox
+        .new_assert_cmd("keys")
+        .arg("generate")
+        .arg("test2")
+        .assert()
+        .stderr(predicate::str::contains(
+            "error: An identity with the name 'test2' already exists",
+        ));
+
+    assert_eq!(initial_pubkey, pubkey_for_identity(&sandbox, "test2"));
+
+    sandbox
+        .new_assert_cmd("keys")
+        .arg("generate")
+        .arg("test2")
+        .arg("--overwrite")
+        .assert()
+        .stderr(predicate::str::contains("Overwriting identity 'test2'"))
+        .success();
+
+    assert_ne!(initial_pubkey, pubkey_for_identity(&sandbox, "test2"));
+}
diff --git a/cmd/soroban-cli/src/commands/keys/generate.rs b/cmd/soroban-cli/src/commands/keys/generate.rs
index b59e227fc..c6623386c 100644
--- a/cmd/soroban-cli/src/commands/keys/generate.rs
+++ b/cmd/soroban-cli/src/commands/keys/generate.rs
@@ -10,10 +10,15 @@ use crate::{commands::global, print::Print};
 pub enum Error {
     #[error(transparent)]
     Config(#[from] locator::Error),
+
     #[error(transparent)]
     Secret(#[from] secret::Error),
+
     #[error(transparent)]
     Network(#[from] network::Error),
+
+    #[error("An identity with the name '{0}' already exists")]
+    IdentityAlreadyExists(String),
 }
 
 #[derive(Debug, clap::Parser, Clone)]
@@ -52,29 +57,47 @@ pub struct Cmd {
     /// Fund generated key pair
     #[arg(long, default_value = "false")]
     pub fund: bool,
+
+    /// Overwrite existing identity if it already exists.
+    #[arg(long)]
+    pub overwrite: bool,
 }
 
 impl Cmd {
     pub async fn run(&self, global_args: &global::Args) -> Result<(), Error> {
+        let print = Print::new(global_args.quiet);
+
+        if self.config_locator.read_identity(&self.name).is_ok() {
+            if !self.overwrite {
+                return Err(Error::IdentityAlreadyExists(self.name.clone()));
+            }
+
+            print.exclaimln(format!("Overwriting identity '{}'", &self.name));
+        }
+
         if !self.fund {
-            Print::new(global_args.quiet).warnln(
+            print.warnln(
                 "Behavior of `generate` will change in the \
             future, and it will no longer fund by default. If you want to fund please \
             provide `--fund` flag. If you don't need to fund your keys in the future, ignore this \
             warning. It can be suppressed with -q flag.",
             );
         }
+
         let seed_phrase = if self.default_seed {
             Secret::test_seed_phrase()
         } else {
             Secret::from_seed(self.seed.as_deref())
         }?;
+
         let secret = if self.as_secret {
             seed_phrase.private_key(self.hd_path)?.into()
         } else {
             seed_phrase
         };
+
         self.config_locator.write_identity(&self.name, &secret)?;
+
         if !self.no_fund {
             let addr = secret.public_key(self.hd_path)?;
             let network = self.network.get(&self.config_locator)?;
@@ -86,6 +109,7 @@ impl Cmd {
                 })
                 .unwrap_or_default();
         }
+
         Ok(())
     }
 }
diff --git a/cmd/soroban-cli/src/print.rs b/cmd/soroban-cli/src/print.rs
index ca66cdc50..fb9fb43dd 100644
--- a/cmd/soroban-cli/src/print.rs
+++ b/cmd/soroban-cli/src/print.rs
@@ -105,3 +105,4 @@ create_print_functions!(plus, plusln, "➕");
 create_print_functions!(save, saveln, "💾");
 create_print_functions!(search, searchln, "🔎");
 create_print_functions!(warn, warnln, "⚠️");
+create_print_functions!(exclaim, exclaimln, "❗️");

From 794fd4440e25de9c5a63c18015def2e421bd1ead Mon Sep 17 00:00:00 2001
From: Nnaji Benjamin <60315147+Benjtalkshow@users.noreply.github.com>
Date: Thu, 7 Nov 2024 02:02:16 +0100
Subject: [PATCH 08/31] upgrade typescript to latest version (#1641)

* upgrade typescript to latest version

* upgrade tyoescript to latest version

---------

Co-authored-by: Willem Wyndham <willem@ahalabs.dev>
Co-authored-by: Leigh McCulloch <351529+leighmcculloch@users.noreply.github.com>
---
 .../test_custom_types/package-lock.json        | 18 ++++++++++++++++++
 .../fixtures/test_custom_types/package.json    |  5 +++--
 .../src/project_template/package.json          |  6 +++---
 .../ts-tests/package-lock.json                 |  9 +++++----
 .../ts-tests/package.json                      |  5 ++---
 5 files changed, 31 insertions(+), 12 deletions(-)

diff --git a/cmd/crates/soroban-spec-typescript/fixtures/test_custom_types/package-lock.json b/cmd/crates/soroban-spec-typescript/fixtures/test_custom_types/package-lock.json
index f45484ffb..172a80888 100644
--- a/cmd/crates/soroban-spec-typescript/fixtures/test_custom_types/package-lock.json
+++ b/cmd/crates/soroban-spec-typescript/fixtures/test_custom_types/package-lock.json
@@ -12,6 +12,7 @@
         "buffer": "6.0.3"
       },
       "devDependencies": {
+        "@types/node": "^22.7.4",
         "typescript": "5.3.3"
       }
     },
@@ -47,6 +48,16 @@
         "urijs": "^1.19.1"
       }
     },
+    "node_modules/@types/node": {
+      "version": "22.7.4",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.7.4.tgz",
+      "integrity": "sha512-y+NPi1rFzDs1NdQHHToqeiX2TIS79SWEAw9GYhkkx8bD0ChpfqC+n2j5OXOCpzfojBEBt6DnEnnG9MY0zk1XLg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "undici-types": "~6.19.2"
+      }
+    },
     "node_modules/asynckit": {
       "version": "0.4.0",
       "license": "MIT"
@@ -288,6 +299,13 @@
         "node": ">=14.17"
       }
     },
+    "node_modules/undici-types": {
+      "version": "6.19.8",
+      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.19.8.tgz",
+      "integrity": "sha512-ve2KP6f/JnbPBFyobGHuerC9g1FYGn/F8n1LWTwNxCEzd6IfqTwUQcNXgEtmmQ6DlRrC1hrSrBnCZPokRrDHjw==",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/urijs": {
       "version": "1.19.11",
       "license": "MIT"
diff --git a/cmd/crates/soroban-spec-typescript/fixtures/test_custom_types/package.json b/cmd/crates/soroban-spec-typescript/fixtures/test_custom_types/package.json
index 5cc5e337f..35504c2c5 100644
--- a/cmd/crates/soroban-spec-typescript/fixtures/test_custom_types/package.json
+++ b/cmd/crates/soroban-spec-typescript/fixtures/test_custom_types/package.json
@@ -8,10 +8,11 @@
     "build": "tsc"
   },
   "dependencies": {
-    "buffer": "6.0.3",
-    "@stellar/stellar-sdk": "12.1.0"
+    "@stellar/stellar-sdk": "12.1.0",
+    "buffer": "6.0.3"
   },
   "devDependencies": {
+    "@types/node": "^22.7.4",
     "typescript": "5.3.3"
   }
 }
diff --git a/cmd/crates/soroban-spec-typescript/src/project_template/package.json b/cmd/crates/soroban-spec-typescript/src/project_template/package.json
index e9ba581a3..553d45831 100644
--- a/cmd/crates/soroban-spec-typescript/src/project_template/package.json
+++ b/cmd/crates/soroban-spec-typescript/src/project_template/package.json
@@ -8,10 +8,10 @@
     "build": "tsc"
   },
   "dependencies": {
-    "buffer": "6.0.3",
-    "@stellar/stellar-sdk": "12.1.0"
+    "@stellar/stellar-sdk": "12.1.0",
+    "buffer": "6.0.3"
   },
   "devDependencies": {
-    "typescript": "5.3.3"
+    "typescript": "^5.6.2"
   }
 }
diff --git a/cmd/crates/soroban-spec-typescript/ts-tests/package-lock.json b/cmd/crates/soroban-spec-typescript/ts-tests/package-lock.json
index deee8f09d..357de4a2c 100644
--- a/cmd/crates/soroban-spec-typescript/ts-tests/package-lock.json
+++ b/cmd/crates/soroban-spec-typescript/ts-tests/package-lock.json
@@ -14,7 +14,7 @@
         "ava": "^5.3.1",
         "dotenv": "^16.3.1",
         "eslint": "^8.53.0",
-        "typescript": "^5.3.3"
+        "typescript": "^5.6.2"
       }
     },
     "node_modules/@ava/typescript": {
@@ -3194,10 +3194,11 @@
       }
     },
     "node_modules/typescript": {
-      "version": "5.4.5",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.4.5.tgz",
-      "integrity": "sha512-vcI4UpRgg81oIRUFwR0WSIHKt11nJ7SAVlYNIu+QpqeyXP+gpQJy/Z4+F0aGxSE4MqwjyXvW/TzgkLAx2AGHwQ==",
+      "version": "5.6.2",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.6.2.tgz",
+      "integrity": "sha512-NW8ByodCSNCwZeghjN3o+JX5OFH0Ojg6sadjEKY4huZ52TqbJTJnDo5+Tw98lSy63NZvi4n+ez5m2u5d4PkZyw==",
       "dev": true,
+      "license": "Apache-2.0",
       "bin": {
         "tsc": "bin/tsc",
         "tsserver": "bin/tsserver"
diff --git a/cmd/crates/soroban-spec-typescript/ts-tests/package.json b/cmd/crates/soroban-spec-typescript/ts-tests/package.json
index 734b26bba..b3f1990dd 100644
--- a/cmd/crates/soroban-spec-typescript/ts-tests/package.json
+++ b/cmd/crates/soroban-spec-typescript/ts-tests/package.json
@@ -8,14 +8,14 @@
   },
   "devDependencies": {
     "@ava/typescript": "^4.1.0",
+    "@stellar/stellar-sdk": "12.2.0",
     "@types/node": "^20.4.9",
     "@typescript-eslint/eslint-plugin": "^6.10.0",
     "@typescript-eslint/parser": "^6.10.0",
     "ava": "^5.3.1",
     "dotenv": "^16.3.1",
     "eslint": "^8.53.0",
-    "@stellar/stellar-sdk": "12.2.0",
-    "typescript": "^5.3.3"
+    "typescript": "^5.6.2"
   },
   "ava": {
     "typescript": {
@@ -29,4 +29,3 @@
     ]
   }
 }
-

From 9912694cfb6f67c4ccfbcba62a27aa22aa43cc17 Mon Sep 17 00:00:00 2001
From: Nando Vieira <me@fnando.com>
Date: Thu, 7 Nov 2024 05:29:02 -0800
Subject: [PATCH 09/31] Resolve identity from default config. (#1711)

---
 FULL_HELP_DOCS.md                     | 64 ++++++++++++++++++++-------
 cmd/soroban-cli/src/config/address.rs | 14 ++++--
 cmd/soroban-cli/src/config/mod.rs     |  7 ++-
 3 files changed, 65 insertions(+), 20 deletions(-)

diff --git a/FULL_HELP_DOCS.md b/FULL_HELP_DOCS.md
index 48cc98aa9..6f3882ce6 100644
--- a/FULL_HELP_DOCS.md
+++ b/FULL_HELP_DOCS.md
@@ -130,7 +130,7 @@ Get Id of builtin Soroban Asset Contract. Deprecated, use `stellar contract id a
 
 Deploy builtin Soroban Asset Contract
 
-**Usage:** `stellar contract asset deploy [OPTIONS] --asset <ASSET> --source-account <SOURCE_ACCOUNT>`
+**Usage:** `stellar contract asset deploy [OPTIONS] --asset <ASSET>`
 
 ###### **Options:**
 
@@ -140,6 +140,8 @@ Deploy builtin Soroban Asset Contract
 * `--network-passphrase <NETWORK_PASSPHRASE>` — Network passphrase to sign the transaction sent to the rpc server
 * `--network <NETWORK>` — Name of network to use from config
 * `--source-account <SOURCE_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…), or a seed phrase (--source "kite urban…"). If `--build-only` or `--sim-only` flags were NOT provided, this key will also be used to sign the final transaction. In that case, trying to sign with public key will fail
+
+  Default value: ``
 * `--hd-path <HD_PATH>` — If using a seed phrase, which hierarchical deterministic path to use, e.g. `m/44'/148'/{hd_path}`. Example: `--hd-path 1`. Default: `0`
 * `--global` — Use global config
 * `--config-dir <CONFIG_DIR>` — Location of config directory, default is "."
@@ -345,7 +347,7 @@ Extend the time to live ledger of a contract-data ledger entry.
 
 If no keys are specified the contract itself is extended.
 
-**Usage:** `stellar contract extend [OPTIONS] --ledgers-to-extend <LEDGERS_TO_EXTEND> --source-account <SOURCE_ACCOUNT>`
+**Usage:** `stellar contract extend [OPTIONS] --ledgers-to-extend <LEDGERS_TO_EXTEND>`
 
 ###### **Options:**
 
@@ -371,6 +373,8 @@ If no keys are specified the contract itself is extended.
 * `--network-passphrase <NETWORK_PASSPHRASE>` — Network passphrase to sign the transaction sent to the rpc server
 * `--network <NETWORK>` — Name of network to use from config
 * `--source-account <SOURCE_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…), or a seed phrase (--source "kite urban…"). If `--build-only` or `--sim-only` flags were NOT provided, this key will also be used to sign the final transaction. In that case, trying to sign with public key will fail
+
+  Default value: ``
 * `--hd-path <HD_PATH>` — If using a seed phrase, which hierarchical deterministic path to use, e.g. `m/44'/148'/{hd_path}`. Example: `--hd-path 1`. Default: `0`
 * `--global` — Use global config
 * `--config-dir <CONFIG_DIR>` — Location of config directory, default is "."
@@ -388,7 +392,7 @@ If no keys are specified the contract itself is extended.
 
 Deploy a wasm contract
 
-**Usage:** `stellar contract deploy [OPTIONS] --source-account <SOURCE_ACCOUNT> <--wasm <WASM>|--wasm-hash <WASM_HASH>> [-- <CONTRACT_CONSTRUCTOR_ARGS>...]`
+**Usage:** `stellar contract deploy [OPTIONS] <--wasm <WASM>|--wasm-hash <WASM_HASH>> [-- <CONTRACT_CONSTRUCTOR_ARGS>...]`
 
 ###### **Arguments:**
 
@@ -404,6 +408,8 @@ Deploy a wasm contract
 * `--network-passphrase <NETWORK_PASSPHRASE>` — Network passphrase to sign the transaction sent to the rpc server
 * `--network <NETWORK>` — Name of network to use from config
 * `--source-account <SOURCE_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…), or a seed phrase (--source "kite urban…"). If `--build-only` or `--sim-only` flags were NOT provided, this key will also be used to sign the final transaction. In that case, trying to sign with public key will fail
+
+  Default value: ``
 * `--hd-path <HD_PATH>` — If using a seed phrase, which hierarchical deterministic path to use, e.g. `m/44'/148'/{hd_path}`. Example: `--hd-path 1`. Default: `0`
 * `--global` — Use global config
 * `--config-dir <CONFIG_DIR>` — Location of config directory, default is "."
@@ -475,7 +481,7 @@ Deploy builtin Soroban Asset Contract
 
 Deploy normal Wasm Contract
 
-**Usage:** `stellar contract id wasm [OPTIONS] --salt <SALT> --source-account <SOURCE_ACCOUNT>`
+**Usage:** `stellar contract id wasm [OPTIONS] --salt <SALT>`
 
 ###### **Options:**
 
@@ -485,6 +491,8 @@ Deploy normal Wasm Contract
 * `--network-passphrase <NETWORK_PASSPHRASE>` — Network passphrase to sign the transaction sent to the rpc server
 * `--network <NETWORK>` — Name of network to use from config
 * `--source-account <SOURCE_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…), or a seed phrase (--source "kite urban…"). If `--build-only` or `--sim-only` flags were NOT provided, this key will also be used to sign the final transaction. In that case, trying to sign with public key will fail
+
+  Default value: ``
 * `--hd-path <HD_PATH>` — If using a seed phrase, which hierarchical deterministic path to use, e.g. `m/44'/148'/{hd_path}`. Example: `--hd-path 1`. Default: `0`
 * `--global` — Use global config
 * `--config-dir <CONFIG_DIR>` — Location of config directory, default is "."
@@ -676,7 +684,7 @@ This command will create a Cargo workspace project and add a sample Stellar cont
 
 Install a WASM file to the ledger without creating a contract instance
 
-**Usage:** `stellar contract install [OPTIONS] --source-account <SOURCE_ACCOUNT> --wasm <WASM>`
+**Usage:** `stellar contract install [OPTIONS] --wasm <WASM>`
 
 ###### **Options:**
 
@@ -685,6 +693,8 @@ Install a WASM file to the ledger without creating a contract instance
 * `--network-passphrase <NETWORK_PASSPHRASE>` — Network passphrase to sign the transaction sent to the rpc server
 * `--network <NETWORK>` — Name of network to use from config
 * `--source-account <SOURCE_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…), or a seed phrase (--source "kite urban…"). If `--build-only` or `--sim-only` flags were NOT provided, this key will also be used to sign the final transaction. In that case, trying to sign with public key will fail
+
+  Default value: ``
 * `--hd-path <HD_PATH>` — If using a seed phrase, which hierarchical deterministic path to use, e.g. `m/44'/148'/{hd_path}`. Example: `--hd-path 1`. Default: `0`
 * `--global` — Use global config
 * `--config-dir <CONFIG_DIR>` — Location of config directory, default is "."
@@ -710,7 +720,7 @@ Generates an "implicit CLI" for the specified contract on-the-fly using the cont
 
 stellar contract invoke ... -- --help
 
-**Usage:** `stellar contract invoke [OPTIONS] --id <CONTRACT_ID> --source-account <SOURCE_ACCOUNT> [-- <CONTRACT_FN_AND_ARGS>...]`
+**Usage:** `stellar contract invoke [OPTIONS] --id <CONTRACT_ID> [-- <CONTRACT_FN_AND_ARGS>...]`
 
 ###### **Arguments:**
 
@@ -725,6 +735,8 @@ stellar contract invoke ... -- --help
 * `--network-passphrase <NETWORK_PASSPHRASE>` — Network passphrase to sign the transaction sent to the rpc server
 * `--network <NETWORK>` — Name of network to use from config
 * `--source-account <SOURCE_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…), or a seed phrase (--source "kite urban…"). If `--build-only` or `--sim-only` flags were NOT provided, this key will also be used to sign the final transaction. In that case, trying to sign with public key will fail
+
+  Default value: ``
 * `--hd-path <HD_PATH>` — If using a seed phrase, which hierarchical deterministic path to use, e.g. `m/44'/148'/{hd_path}`. Example: `--hd-path 1`. Default: `0`
 * `--global` — Use global config
 * `--config-dir <CONFIG_DIR>` — Location of config directory, default is "."
@@ -813,7 +825,7 @@ Restore an evicted value for a contract-data legder entry.
 
 If no keys are specificed the contract itself is restored.
 
-**Usage:** `stellar contract restore [OPTIONS] --source-account <SOURCE_ACCOUNT>`
+**Usage:** `stellar contract restore [OPTIONS]`
 
 ###### **Options:**
 
@@ -839,6 +851,8 @@ If no keys are specificed the contract itself is restored.
 * `--network-passphrase <NETWORK_PASSPHRASE>` — Network passphrase to sign the transaction sent to the rpc server
 * `--network <NETWORK>` — Name of network to use from config
 * `--source-account <SOURCE_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…), or a seed phrase (--source "kite urban…"). If `--build-only` or `--sim-only` flags were NOT provided, this key will also be used to sign the final transaction. In that case, trying to sign with public key will fail
+
+  Default value: ``
 * `--hd-path <HD_PATH>` — If using a seed phrase, which hierarchical deterministic path to use, e.g. `m/44'/148'/{hd_path}`. Example: `--hd-path 1`. Default: `0`
 * `--global` — Use global config
 * `--config-dir <CONFIG_DIR>` — Location of config directory, default is "."
@@ -1377,7 +1391,7 @@ Sign, Simulate, and Send transactions
 
 Simulate a transaction envelope from stdin
 
-**Usage:** `stellar tx simulate [OPTIONS] --source-account <SOURCE_ACCOUNT>`
+**Usage:** `stellar tx simulate [OPTIONS]`
 
 ###### **Options:**
 
@@ -1386,6 +1400,8 @@ Simulate a transaction envelope from stdin
 * `--network-passphrase <NETWORK_PASSPHRASE>` — Network passphrase to sign the transaction sent to the rpc server
 * `--network <NETWORK>` — Name of network to use from config
 * `--source-account <SOURCE_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…), or a seed phrase (--source "kite urban…"). If `--build-only` or `--sim-only` flags were NOT provided, this key will also be used to sign the final transaction. In that case, trying to sign with public key will fail
+
+  Default value: ``
 * `--hd-path <HD_PATH>` — If using a seed phrase, which hierarchical deterministic path to use, e.g. `m/44'/148'/{hd_path}`. Example: `--hd-path 1`. Default: `0`
 * `--global` — Use global config
 * `--config-dir <CONFIG_DIR>` — Location of config directory, default is "."
@@ -1467,7 +1483,7 @@ Create a new transaction
 
 Transfers the XLM balance of an account to another account and removes the source account from the ledger
 
-**Usage:** `stellar tx new account-merge [OPTIONS] --source-account <SOURCE_ACCOUNT> --account <ACCOUNT>`
+**Usage:** `stellar tx new account-merge [OPTIONS] --account <ACCOUNT>`
 
 ###### **Options:**
 
@@ -1483,6 +1499,8 @@ Transfers the XLM balance of an account to another account and removes the sourc
 * `--network-passphrase <NETWORK_PASSPHRASE>` — Network passphrase to sign the transaction sent to the rpc server
 * `--network <NETWORK>` — Name of network to use from config
 * `--source-account <SOURCE_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…), or a seed phrase (--source "kite urban…"). If `--build-only` or `--sim-only` flags were NOT provided, this key will also be used to sign the final transaction. In that case, trying to sign with public key will fail
+
+  Default value: ``
 * `--hd-path <HD_PATH>` — If using a seed phrase, which hierarchical deterministic path to use, e.g. `m/44'/148'/{hd_path}`. Example: `--hd-path 1`. Default: `0`
 * `--global` — Use global config
 * `--config-dir <CONFIG_DIR>` — Location of config directory, default is "."
@@ -1494,7 +1512,7 @@ Transfers the XLM balance of an account to another account and removes the sourc
 
 Bumps forward the sequence number of the source account to the given sequence number, invalidating any transaction with a smaller sequence number
 
-**Usage:** `stellar tx new bump-sequence [OPTIONS] --source-account <SOURCE_ACCOUNT> --bump-to <BUMP_TO>`
+**Usage:** `stellar tx new bump-sequence [OPTIONS] --bump-to <BUMP_TO>`
 
 ###### **Options:**
 
@@ -1510,6 +1528,8 @@ Bumps forward the sequence number of the source account to the given sequence nu
 * `--network-passphrase <NETWORK_PASSPHRASE>` — Network passphrase to sign the transaction sent to the rpc server
 * `--network <NETWORK>` — Name of network to use from config
 * `--source-account <SOURCE_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…), or a seed phrase (--source "kite urban…"). If `--build-only` or `--sim-only` flags were NOT provided, this key will also be used to sign the final transaction. In that case, trying to sign with public key will fail
+
+  Default value: ``
 * `--hd-path <HD_PATH>` — If using a seed phrase, which hierarchical deterministic path to use, e.g. `m/44'/148'/{hd_path}`. Example: `--hd-path 1`. Default: `0`
 * `--global` — Use global config
 * `--config-dir <CONFIG_DIR>` — Location of config directory, default is "."
@@ -1521,7 +1541,7 @@ Bumps forward the sequence number of the source account to the given sequence nu
 
 Creates, updates, or deletes a trustline Learn more about trustlines https://developers.stellar.org/docs/learn/fundamentals/stellar-data-structures/accounts#trustlines
 
-**Usage:** `stellar tx new change-trust [OPTIONS] --source-account <SOURCE_ACCOUNT> --line <LINE>`
+**Usage:** `stellar tx new change-trust [OPTIONS] --line <LINE>`
 
 ###### **Options:**
 
@@ -1537,6 +1557,8 @@ Creates, updates, or deletes a trustline Learn more about trustlines https://dev
 * `--network-passphrase <NETWORK_PASSPHRASE>` — Network passphrase to sign the transaction sent to the rpc server
 * `--network <NETWORK>` — Name of network to use from config
 * `--source-account <SOURCE_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…), or a seed phrase (--source "kite urban…"). If `--build-only` or `--sim-only` flags were NOT provided, this key will also be used to sign the final transaction. In that case, trying to sign with public key will fail
+
+  Default value: ``
 * `--hd-path <HD_PATH>` — If using a seed phrase, which hierarchical deterministic path to use, e.g. `m/44'/148'/{hd_path}`. Example: `--hd-path 1`. Default: `0`
 * `--global` — Use global config
 * `--config-dir <CONFIG_DIR>` — Location of config directory, default is "."
@@ -1551,7 +1573,7 @@ Creates, updates, or deletes a trustline Learn more about trustlines https://dev
 
 Creates and funds a new account with the specified starting balance
 
-**Usage:** `stellar tx new create-account [OPTIONS] --source-account <SOURCE_ACCOUNT> --destination <DESTINATION>`
+**Usage:** `stellar tx new create-account [OPTIONS] --destination <DESTINATION>`
 
 ###### **Options:**
 
@@ -1567,6 +1589,8 @@ Creates and funds a new account with the specified starting balance
 * `--network-passphrase <NETWORK_PASSPHRASE>` — Network passphrase to sign the transaction sent to the rpc server
 * `--network <NETWORK>` — Name of network to use from config
 * `--source-account <SOURCE_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…), or a seed phrase (--source "kite urban…"). If `--build-only` or `--sim-only` flags were NOT provided, this key will also be used to sign the final transaction. In that case, trying to sign with public key will fail
+
+  Default value: ``
 * `--hd-path <HD_PATH>` — If using a seed phrase, which hierarchical deterministic path to use, e.g. `m/44'/148'/{hd_path}`. Example: `--hd-path 1`. Default: `0`
 * `--global` — Use global config
 * `--config-dir <CONFIG_DIR>` — Location of config directory, default is "."
@@ -1581,7 +1605,7 @@ Creates and funds a new account with the specified starting balance
 
 Sets, modifies, or deletes a data entry (name/value pair) that is attached to an account Learn more about entries and subentries: https://developers.stellar.org/docs/learn/fundamentals/stellar-data-structures/accounts#subentries
 
-**Usage:** `stellar tx new manage-data [OPTIONS] --source-account <SOURCE_ACCOUNT> --data-name <DATA_NAME>`
+**Usage:** `stellar tx new manage-data [OPTIONS] --data-name <DATA_NAME>`
 
 ###### **Options:**
 
@@ -1597,6 +1621,8 @@ Sets, modifies, or deletes a data entry (name/value pair) that is attached to an
 * `--network-passphrase <NETWORK_PASSPHRASE>` — Network passphrase to sign the transaction sent to the rpc server
 * `--network <NETWORK>` — Name of network to use from config
 * `--source-account <SOURCE_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…), or a seed phrase (--source "kite urban…"). If `--build-only` or `--sim-only` flags were NOT provided, this key will also be used to sign the final transaction. In that case, trying to sign with public key will fail
+
+  Default value: ``
 * `--hd-path <HD_PATH>` — If using a seed phrase, which hierarchical deterministic path to use, e.g. `m/44'/148'/{hd_path}`. Example: `--hd-path 1`. Default: `0`
 * `--global` — Use global config
 * `--config-dir <CONFIG_DIR>` — Location of config directory, default is "."
@@ -1609,7 +1635,7 @@ Sets, modifies, or deletes a data entry (name/value pair) that is attached to an
 
 Sends an amount in a specific asset to a destination account
 
-**Usage:** `stellar tx new payment [OPTIONS] --source-account <SOURCE_ACCOUNT> --destination <DESTINATION> --amount <AMOUNT>`
+**Usage:** `stellar tx new payment [OPTIONS] --destination <DESTINATION> --amount <AMOUNT>`
 
 ###### **Options:**
 
@@ -1625,6 +1651,8 @@ Sends an amount in a specific asset to a destination account
 * `--network-passphrase <NETWORK_PASSPHRASE>` — Network passphrase to sign the transaction sent to the rpc server
 * `--network <NETWORK>` — Name of network to use from config
 * `--source-account <SOURCE_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…), or a seed phrase (--source "kite urban…"). If `--build-only` or `--sim-only` flags were NOT provided, this key will also be used to sign the final transaction. In that case, trying to sign with public key will fail
+
+  Default value: ``
 * `--hd-path <HD_PATH>` — If using a seed phrase, which hierarchical deterministic path to use, e.g. `m/44'/148'/{hd_path}`. Example: `--hd-path 1`. Default: `0`
 * `--global` — Use global config
 * `--config-dir <CONFIG_DIR>` — Location of config directory, default is "."
@@ -1640,7 +1668,7 @@ Sends an amount in a specific asset to a destination account
 
 Set option for an account such as flags, inflation destination, signers, home domain, and master key weight Learn more about flags: https://developers.stellar.org/docs/learn/glossary#flags Learn more about the home domain: https://github.com/stellar/stellar-protocol/blob/master/ecosystem/sep-0001.md Learn more about signers operations and key weight: https://developers.stellar.org/docs/learn/encyclopedia/security/signatures-multisig#multisig
 
-**Usage:** `stellar tx new set-options [OPTIONS] --source-account <SOURCE_ACCOUNT>`
+**Usage:** `stellar tx new set-options [OPTIONS]`
 
 ###### **Options:**
 
@@ -1656,6 +1684,8 @@ Set option for an account such as flags, inflation destination, signers, home do
 * `--network-passphrase <NETWORK_PASSPHRASE>` — Network passphrase to sign the transaction sent to the rpc server
 * `--network <NETWORK>` — Name of network to use from config
 * `--source-account <SOURCE_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…), or a seed phrase (--source "kite urban…"). If `--build-only` or `--sim-only` flags were NOT provided, this key will also be used to sign the final transaction. In that case, trying to sign with public key will fail
+
+  Default value: ``
 * `--hd-path <HD_PATH>` — If using a seed phrase, which hierarchical deterministic path to use, e.g. `m/44'/148'/{hd_path}`. Example: `--hd-path 1`. Default: `0`
 * `--global` — Use global config
 * `--config-dir <CONFIG_DIR>` — Location of config directory, default is "."
@@ -1682,7 +1712,7 @@ Set option for an account such as flags, inflation destination, signers, home do
 
 Allows issuing account to configure authorization and trustline flags to an asset The Asset parameter is of the `TrustLineAsset` type. If you are modifying a trustline to a regular asset (i.e. one in a Code:Issuer format), this is equivalent to the Asset type. If you are modifying a trustline to a pool share, however, this is composed of the liquidity pool's unique ID. Learn more about flags: https://developers.stellar.org/docs/learn/glossary#flags
 
-**Usage:** `stellar tx new set-trustline-flags [OPTIONS] --source-account <SOURCE_ACCOUNT> --trustor <TRUSTOR> --asset <ASSET>`
+**Usage:** `stellar tx new set-trustline-flags [OPTIONS] --trustor <TRUSTOR> --asset <ASSET>`
 
 ###### **Options:**
 
@@ -1698,6 +1728,8 @@ Allows issuing account to configure authorization and trustline flags to an asse
 * `--network-passphrase <NETWORK_PASSPHRASE>` — Network passphrase to sign the transaction sent to the rpc server
 * `--network <NETWORK>` — Name of network to use from config
 * `--source-account <SOURCE_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…), or a seed phrase (--source "kite urban…"). If `--build-only` or `--sim-only` flags were NOT provided, this key will also be used to sign the final transaction. In that case, trying to sign with public key will fail
+
+  Default value: ``
 * `--hd-path <HD_PATH>` — If using a seed phrase, which hierarchical deterministic path to use, e.g. `m/44'/148'/{hd_path}`. Example: `--hd-path 1`. Default: `0`
 * `--global` — Use global config
 * `--config-dir <CONFIG_DIR>` — Location of config directory, default is "."
diff --git a/cmd/soroban-cli/src/config/address.rs b/cmd/soroban-cli/src/config/address.rs
index 066bc8d91..811548316 100644
--- a/cmd/soroban-cli/src/config/address.rs
+++ b/cmd/soroban-cli/src/config/address.rs
@@ -2,7 +2,7 @@ use std::str::FromStr;
 
 use crate::xdr;
 
-use super::{locator, secret};
+use super::{locator, secret, Config};
 
 /// Address can be either a public key or eventually an alias of a address.
 #[derive(Clone, Debug)]
@@ -31,8 +31,16 @@ impl FromStr for Address {
     type Err = Error;
 
     fn from_str(value: &str) -> Result<Self, Self::Err> {
-        Ok(xdr::MuxedAccount::from_str(value).map_or_else(
-            |_| Address::AliasOrSecret(value.to_string()),
+        let mut identity = value.to_string();
+
+        if value.is_empty() {
+            if let Ok(config) = Config::new() {
+                identity = config.defaults.identity.unwrap_or_default();
+            }
+        }
+
+        Ok(xdr::MuxedAccount::from_str(&identity).map_or_else(
+            |_| Address::AliasOrSecret(identity.to_string()),
             Address::MuxedAccount,
         ))
     }
diff --git a/cmd/soroban-cli/src/config/mod.rs b/cmd/soroban-cli/src/config/mod.rs
index 11eb179ee..396b2b8cc 100644
--- a/cmd/soroban-cli/src/config/mod.rs
+++ b/cmd/soroban-cli/src/config/mod.rs
@@ -47,7 +47,12 @@ pub struct Args {
     #[command(flatten)]
     pub network: network::Args,
 
-    #[arg(long, visible_alias = "source", env = "STELLAR_ACCOUNT")]
+    #[arg(
+        long,
+        visible_alias = "source",
+        env = "STELLAR_ACCOUNT",
+        default_value = ""
+    )]
     /// 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…),

From 11e08eff6915390e388a06a359d01d9594e64954 Mon Sep 17 00:00:00 2001
From: Chad Ostrowski <221614+chadoh@users.noreply.github.com>
Date: Thu, 7 Nov 2024 14:40:01 -0500
Subject: [PATCH 10/31] feat(ts-bindings): upgrade stellar-sdk to 12.2.0
 (#1606)

* feat(ts-bindings): upgrade stellar-sdk to 12.2.0

This is the latest version

* feat(ts-bindings): upgrade stellar-sdk to 12.3.0

This is the latest version

---------

Co-authored-by: Nando Vieira <me@fnando.com>
---
 .../test_custom_types/package-lock.json       | 93 +++++++++++--------
 .../fixtures/test_custom_types/package.json   |  5 +-
 .../src/project_template/package.json         |  2 +-
 .../ts-tests/package-lock.json                | 68 +++++++++-----
 .../ts-tests/package.json                     |  2 +-
 5 files changed, 103 insertions(+), 67 deletions(-)

diff --git a/cmd/crates/soroban-spec-typescript/fixtures/test_custom_types/package-lock.json b/cmd/crates/soroban-spec-typescript/fixtures/test_custom_types/package-lock.json
index 172a80888..454c8b964 100644
--- a/cmd/crates/soroban-spec-typescript/fixtures/test_custom_types/package-lock.json
+++ b/cmd/crates/soroban-spec-typescript/fixtures/test_custom_types/package-lock.json
@@ -8,23 +8,26 @@
       "name": "test_custom_types",
       "version": "0.0.0",
       "dependencies": {
-        "@stellar/stellar-sdk": "12.1.0",
+        "@stellar/stellar-sdk": "12.3.0",
         "buffer": "6.0.3"
       },
       "devDependencies": {
-        "@types/node": "^22.7.4",
-        "typescript": "5.3.3"
+        "typescript": "^5.6.2"
       }
     },
     "node_modules/@stellar/js-xdr": {
-      "version": "3.1.1",
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/@stellar/js-xdr/-/js-xdr-3.1.2.tgz",
+      "integrity": "sha512-VVolPL5goVEIsvuGqDc5uiKxV03lzfWdvYg1KikvwheDmTBO68CKDji3bAZ/kppZrx5iTA8z3Ld5yuytcvhvOQ==",
       "license": "Apache-2.0"
     },
     "node_modules/@stellar/stellar-base": {
-      "version": "12.0.1",
+      "version": "12.1.1",
+      "resolved": "https://registry.npmjs.org/@stellar/stellar-base/-/stellar-base-12.1.1.tgz",
+      "integrity": "sha512-gOBSOFDepihslcInlqnxKZdIW9dMUO1tpOm3AtJR33K2OvpXG6SaVHCzAmCFArcCqI9zXTEiSoh70T48TmiHJA==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@stellar/js-xdr": "^3.1.1",
+        "@stellar/js-xdr": "^3.1.2",
         "base32.js": "^0.1.0",
         "bignumber.js": "^9.1.2",
         "buffer": "^6.0.3",
@@ -36,11 +39,13 @@
       }
     },
     "node_modules/@stellar/stellar-sdk": {
-      "version": "12.1.0",
+      "version": "12.3.0",
+      "resolved": "https://registry.npmjs.org/@stellar/stellar-sdk/-/stellar-sdk-12.3.0.tgz",
+      "integrity": "sha512-F2DYFop/M5ffXF0lvV5Ezjk+VWNKg0QDX8gNhwehVU3y5LYA3WAY6VcCarMGPaG9Wdgoeh1IXXzOautpqpsltw==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@stellar/stellar-base": "^12.0.1",
-        "axios": "^1.7.2",
+        "@stellar/stellar-base": "^12.1.1",
+        "axios": "^1.7.7",
         "bignumber.js": "^9.1.2",
         "eventsource": "^2.0.2",
         "randombytes": "^2.1.0",
@@ -48,24 +53,17 @@
         "urijs": "^1.19.1"
       }
     },
-    "node_modules/@types/node": {
-      "version": "22.7.4",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.7.4.tgz",
-      "integrity": "sha512-y+NPi1rFzDs1NdQHHToqeiX2TIS79SWEAw9GYhkkx8bD0ChpfqC+n2j5OXOCpzfojBEBt6DnEnnG9MY0zk1XLg==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "undici-types": "~6.19.2"
-      }
-    },
     "node_modules/asynckit": {
       "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
+      "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==",
       "license": "MIT"
     },
     "node_modules/axios": {
-      "version": "1.7.5",
-      "resolved": "https://registry.npmjs.org/axios/-/axios-1.7.5.tgz",
-      "integrity": "sha512-fZu86yCo+svH3uqJ/yTdQ0QHpQu5oL+/QE+QPSv6BZSkDAoky9vytxp7u5qk83OJFS3kEBcesWni9WTZAv3tSw==",
+      "version": "1.7.7",
+      "resolved": "https://registry.npmjs.org/axios/-/axios-1.7.7.tgz",
+      "integrity": "sha512-S4kL7XrjgBmvdGut0sN3yJxqYzrDOnivkBiN0OFs6hLiUam3UPvswUo0kqGyhqUZGEOytHyumEdXsAkgCOUf3Q==",
+      "license": "MIT",
       "dependencies": {
         "follow-redirects": "^1.15.6",
         "form-data": "^4.0.0",
@@ -74,6 +72,8 @@
     },
     "node_modules/base32.js": {
       "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/base32.js/-/base32.js-0.1.0.tgz",
+      "integrity": "sha512-n3TkB02ixgBOhTvANakDb4xaMXnYUVkNoRFJjQflcqMQhyEKxEHdj3E6N8t8sUQ0mjH/3/JxzlXuz3ul/J90pQ==",
       "license": "MIT",
       "engines": {
         "node": ">=0.12.0"
@@ -99,6 +99,8 @@
     },
     "node_modules/bignumber.js": {
       "version": "9.1.2",
+      "resolved": "https://registry.npmjs.org/bignumber.js/-/bignumber.js-9.1.2.tgz",
+      "integrity": "sha512-2/mKyZH9K85bzOEfhXDBFZTGd1CTs+5IHpeFQo9luiBG7hghdC851Pj2WAhb6E3R6b9tZj/XKhbg4fum+Kepug==",
       "license": "MIT",
       "engines": {
         "node": "*"
@@ -128,6 +130,8 @@
     },
     "node_modules/combined-stream": {
       "version": "1.0.8",
+      "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
+      "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==",
       "license": "MIT",
       "dependencies": {
         "delayed-stream": "~1.0.0"
@@ -138,6 +142,8 @@
     },
     "node_modules/delayed-stream": {
       "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
+      "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==",
       "license": "MIT",
       "engines": {
         "node": ">=0.4.0"
@@ -151,7 +157,9 @@
       }
     },
     "node_modules/follow-redirects": {
-      "version": "1.15.6",
+      "version": "1.15.9",
+      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.9.tgz",
+      "integrity": "sha512-gew4GsXizNgdoRyqmyfMHyAmXsZDk6mHkSxZFCzW9gwlbtOW44CDtYavM+y+72qD/Vq2l550kMF52DT8fOLJqQ==",
       "funding": [
         {
           "type": "individual",
@@ -169,7 +177,9 @@
       }
     },
     "node_modules/form-data": {
-      "version": "4.0.0",
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.1.tgz",
+      "integrity": "sha512-tzN8e4TX8+kkxGPK8D5u0FNmjPUjw3lwC9lSLxxoB/+GtsJG91CO8bSWy73APlgAZzZbXEYZJuxjkHH2w+Ezhw==",
       "license": "MIT",
       "dependencies": {
         "asynckit": "^0.4.0",
@@ -200,10 +210,14 @@
     },
     "node_modules/inherits": {
       "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
+      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
       "license": "ISC"
     },
     "node_modules/mime-db": {
       "version": "1.52.0",
+      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz",
+      "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==",
       "license": "MIT",
       "engines": {
         "node": ">= 0.6"
@@ -211,6 +225,8 @@
     },
     "node_modules/mime-types": {
       "version": "2.1.35",
+      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz",
+      "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==",
       "license": "MIT",
       "dependencies": {
         "mime-db": "1.52.0"
@@ -220,7 +236,9 @@
       }
     },
     "node_modules/node-gyp-build": {
-      "version": "4.8.1",
+      "version": "4.8.2",
+      "resolved": "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-4.8.2.tgz",
+      "integrity": "sha512-IRUxE4BVsHWXkV/SFOut4qTlagw2aM8T5/vnTsmrHJvVoKueJHRc/JaFND7QDDc61kLYUJ6qlZM3sqTSyx2dTw==",
       "license": "MIT",
       "optional": true,
       "bin": {
@@ -231,6 +249,8 @@
     },
     "node_modules/proxy-from-env": {
       "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz",
+      "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==",
       "license": "MIT"
     },
     "node_modules/randombytes": {
@@ -260,6 +280,8 @@
     },
     "node_modules/sha.js": {
       "version": "2.4.11",
+      "resolved": "https://registry.npmjs.org/sha.js/-/sha.js-2.4.11.tgz",
+      "integrity": "sha512-QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ==",
       "license": "(MIT AND BSD-3-Clause)",
       "dependencies": {
         "inherits": "^2.0.1",
@@ -270,8 +292,9 @@
       }
     },
     "node_modules/sodium-native": {
-      "version": "4.1.1",
-      "hasInstallScript": true,
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/sodium-native/-/sodium-native-4.3.0.tgz",
+      "integrity": "sha512-OcMgoS0NJx+4yVUlhvL9uZsVZfmyHZ2RpSXkiIoOHMglqvJDeGwn1rUigPrvcNTq3m9hPXtt6syxQbF3vvwmRQ==",
       "license": "MIT",
       "optional": true,
       "dependencies": {
@@ -284,13 +307,16 @@
     },
     "node_modules/tweetnacl": {
       "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-1.0.3.tgz",
+      "integrity": "sha512-6rt+RN7aOi1nGMyC4Xa5DdYiukl2UWCbcJft7YhxReBGQD7OAM8Pbxw6YMo4r2diNEA8FEmu32YOn9rhaiE5yw==",
       "license": "Unlicense"
     },
     "node_modules/typescript": {
-      "version": "5.3.3",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.3.3.tgz",
-      "integrity": "sha512-pXWcraxM0uxAS+tN0AG/BF2TyqmHO014Z070UsJ+pFvYuRSq8KH8DmWpnbXe0pEPDHXZV3FcAbJkijJ5oNEnWw==",
+      "version": "5.6.3",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.6.3.tgz",
+      "integrity": "sha512-hjcS1mhfuyi4WW8IWtjP7brDrG2cuDZukyrYrSauoXGNgx0S7zceP07adYkJycEr56BOUTNPzbInooiN3fn1qw==",
       "dev": true,
+      "license": "Apache-2.0",
       "bin": {
         "tsc": "bin/tsc",
         "tsserver": "bin/tsserver"
@@ -299,13 +325,6 @@
         "node": ">=14.17"
       }
     },
-    "node_modules/undici-types": {
-      "version": "6.19.8",
-      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.19.8.tgz",
-      "integrity": "sha512-ve2KP6f/JnbPBFyobGHuerC9g1FYGn/F8n1LWTwNxCEzd6IfqTwUQcNXgEtmmQ6DlRrC1hrSrBnCZPokRrDHjw==",
-      "dev": true,
-      "license": "MIT"
-    },
     "node_modules/urijs": {
       "version": "1.19.11",
       "license": "MIT"
diff --git a/cmd/crates/soroban-spec-typescript/fixtures/test_custom_types/package.json b/cmd/crates/soroban-spec-typescript/fixtures/test_custom_types/package.json
index 35504c2c5..a52979626 100644
--- a/cmd/crates/soroban-spec-typescript/fixtures/test_custom_types/package.json
+++ b/cmd/crates/soroban-spec-typescript/fixtures/test_custom_types/package.json
@@ -8,11 +8,10 @@
     "build": "tsc"
   },
   "dependencies": {
-    "@stellar/stellar-sdk": "12.1.0",
+    "@stellar/stellar-sdk": "12.3.0",
     "buffer": "6.0.3"
   },
   "devDependencies": {
-    "@types/node": "^22.7.4",
-    "typescript": "5.3.3"
+    "typescript": "^5.6.2"
   }
 }
diff --git a/cmd/crates/soroban-spec-typescript/src/project_template/package.json b/cmd/crates/soroban-spec-typescript/src/project_template/package.json
index 553d45831..1d7d48793 100644
--- a/cmd/crates/soroban-spec-typescript/src/project_template/package.json
+++ b/cmd/crates/soroban-spec-typescript/src/project_template/package.json
@@ -8,7 +8,7 @@
     "build": "tsc"
   },
   "dependencies": {
-    "@stellar/stellar-sdk": "12.1.0",
+    "@stellar/stellar-sdk": "12.3.0",
     "buffer": "6.0.3"
   },
   "devDependencies": {
diff --git a/cmd/crates/soroban-spec-typescript/ts-tests/package-lock.json b/cmd/crates/soroban-spec-typescript/ts-tests/package-lock.json
index 357de4a2c..dec6997a7 100644
--- a/cmd/crates/soroban-spec-typescript/ts-tests/package-lock.json
+++ b/cmd/crates/soroban-spec-typescript/ts-tests/package-lock.json
@@ -7,7 +7,7 @@
       "hasInstallScript": true,
       "devDependencies": {
         "@ava/typescript": "^4.1.0",
-        "@stellar/stellar-sdk": "12.2.0",
+        "@stellar/stellar-sdk": "12.3.0",
         "@types/node": "^20.4.9",
         "@typescript-eslint/eslint-plugin": "^6.10.0",
         "@typescript-eslint/parser": "^6.10.0",
@@ -202,13 +202,15 @@
       "version": "3.1.2",
       "resolved": "https://registry.npmjs.org/@stellar/js-xdr/-/js-xdr-3.1.2.tgz",
       "integrity": "sha512-VVolPL5goVEIsvuGqDc5uiKxV03lzfWdvYg1KikvwheDmTBO68CKDji3bAZ/kppZrx5iTA8z3Ld5yuytcvhvOQ==",
-      "dev": true
+      "dev": true,
+      "license": "Apache-2.0"
     },
     "node_modules/@stellar/stellar-base": {
-      "version": "12.1.0",
-      "resolved": "https://registry.npmjs.org/@stellar/stellar-base/-/stellar-base-12.1.0.tgz",
-      "integrity": "sha512-pWwn+XWP5NotmIteZNuJzHeNn9DYSqH3lsYbtFUoSYy1QegzZdi9D8dK6fJ2fpBAnf/rcDjHgHOw3gtHaQFVbg==",
+      "version": "12.1.1",
+      "resolved": "https://registry.npmjs.org/@stellar/stellar-base/-/stellar-base-12.1.1.tgz",
+      "integrity": "sha512-gOBSOFDepihslcInlqnxKZdIW9dMUO1tpOm3AtJR33K2OvpXG6SaVHCzAmCFArcCqI9zXTEiSoh70T48TmiHJA==",
       "dev": true,
+      "license": "Apache-2.0",
       "dependencies": {
         "@stellar/js-xdr": "^3.1.2",
         "base32.js": "^0.1.0",
@@ -222,13 +224,14 @@
       }
     },
     "node_modules/@stellar/stellar-sdk": {
-      "version": "12.2.0",
-      "resolved": "https://registry.npmjs.org/@stellar/stellar-sdk/-/stellar-sdk-12.2.0.tgz",
-      "integrity": "sha512-Wy5sDOqb5JvAC76f4sQIV6Pe3JNyZb0PuyVNjwt3/uWsjtxRkFk6s2yTHTefBLWoR+mKxDjO7QfzhycF1v8FXQ==",
+      "version": "12.3.0",
+      "resolved": "https://registry.npmjs.org/@stellar/stellar-sdk/-/stellar-sdk-12.3.0.tgz",
+      "integrity": "sha512-F2DYFop/M5ffXF0lvV5Ezjk+VWNKg0QDX8gNhwehVU3y5LYA3WAY6VcCarMGPaG9Wdgoeh1IXXzOautpqpsltw==",
       "dev": true,
+      "license": "Apache-2.0",
       "dependencies": {
-        "@stellar/stellar-base": "^12.1.0",
-        "axios": "^1.7.2",
+        "@stellar/stellar-base": "^12.1.1",
+        "axios": "^1.7.7",
         "bignumber.js": "^9.1.2",
         "eventsource": "^2.0.2",
         "randombytes": "^2.1.0",
@@ -601,7 +604,8 @@
       "version": "0.4.0",
       "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
       "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/ava": {
       "version": "5.3.1",
@@ -700,10 +704,11 @@
       }
     },
     "node_modules/axios": {
-      "version": "1.7.5",
-      "resolved": "https://registry.npmjs.org/axios/-/axios-1.7.5.tgz",
-      "integrity": "sha512-fZu86yCo+svH3uqJ/yTdQ0QHpQu5oL+/QE+QPSv6BZSkDAoky9vytxp7u5qk83OJFS3kEBcesWni9WTZAv3tSw==",
+      "version": "1.7.7",
+      "resolved": "https://registry.npmjs.org/axios/-/axios-1.7.7.tgz",
+      "integrity": "sha512-S4kL7XrjgBmvdGut0sN3yJxqYzrDOnivkBiN0OFs6hLiUam3UPvswUo0kqGyhqUZGEOytHyumEdXsAkgCOUf3Q==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "follow-redirects": "^1.15.6",
         "form-data": "^4.0.0",
@@ -721,6 +726,7 @@
       "resolved": "https://registry.npmjs.org/base32.js/-/base32.js-0.1.0.tgz",
       "integrity": "sha512-n3TkB02ixgBOhTvANakDb4xaMXnYUVkNoRFJjQflcqMQhyEKxEHdj3E6N8t8sUQ0mjH/3/JxzlXuz3ul/J90pQ==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=0.12.0"
       }
@@ -750,6 +756,7 @@
       "resolved": "https://registry.npmjs.org/bignumber.js/-/bignumber.js-9.1.2.tgz",
       "integrity": "sha512-2/mKyZH9K85bzOEfhXDBFZTGd1CTs+5IHpeFQo9luiBG7hghdC851Pj2WAhb6E3R6b9tZj/XKhbg4fum+Kepug==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": "*"
       }
@@ -1043,6 +1050,7 @@
       "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
       "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "delayed-stream": "~1.0.0"
       },
@@ -1162,6 +1170,7 @@
       "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
       "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=0.4.0"
       }
@@ -1658,9 +1667,9 @@
       "dev": true
     },
     "node_modules/follow-redirects": {
-      "version": "1.15.6",
-      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.6.tgz",
-      "integrity": "sha512-wWN62YITEaOpSK584EZXJafH1AGpO8RVgElfkuXbTOrPX4fIfOyEpW/CsiNd8JdYrAoOvafRTOEnvsO++qCqFA==",
+      "version": "1.15.9",
+      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.9.tgz",
+      "integrity": "sha512-gew4GsXizNgdoRyqmyfMHyAmXsZDk6mHkSxZFCzW9gwlbtOW44CDtYavM+y+72qD/Vq2l550kMF52DT8fOLJqQ==",
       "dev": true,
       "funding": [
         {
@@ -1668,6 +1677,7 @@
           "url": "https://github.com/sponsors/RubenVerborgh"
         }
       ],
+      "license": "MIT",
       "engines": {
         "node": ">=4.0"
       },
@@ -1682,6 +1692,7 @@
       "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz",
       "integrity": "sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "asynckit": "^0.4.0",
         "combined-stream": "^1.0.8",
@@ -2247,6 +2258,7 @@
       "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz",
       "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">= 0.6"
       }
@@ -2256,6 +2268,7 @@
       "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz",
       "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "mime-db": "1.52.0"
       },
@@ -2303,10 +2316,11 @@
       "dev": true
     },
     "node_modules/node-gyp-build": {
-      "version": "4.8.1",
-      "resolved": "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-4.8.1.tgz",
-      "integrity": "sha512-OSs33Z9yWr148JZcbZd5WiAXhh/n9z8TxQcdMhIOlpN9AhWpLfvVFO73+m77bBABQMaY9XSvIa+qk0jlI7Gcaw==",
+      "version": "4.8.2",
+      "resolved": "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-4.8.2.tgz",
+      "integrity": "sha512-IRUxE4BVsHWXkV/SFOut4qTlagw2aM8T5/vnTsmrHJvVoKueJHRc/JaFND7QDDc61kLYUJ6qlZM3sqTSyx2dTw==",
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "bin": {
         "node-gyp-build": "bin.js",
@@ -2703,7 +2717,8 @@
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz",
       "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/punycode": {
       "version": "2.3.1",
@@ -2906,6 +2921,7 @@
       "resolved": "https://registry.npmjs.org/sha.js/-/sha.js-2.4.11.tgz",
       "integrity": "sha512-QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ==",
       "dev": true,
+      "license": "(MIT AND BSD-3-Clause)",
       "dependencies": {
         "inherits": "^2.0.1",
         "safe-buffer": "^5.0.1"
@@ -2967,11 +2983,12 @@
       }
     },
     "node_modules/sodium-native": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/sodium-native/-/sodium-native-4.1.1.tgz",
-      "integrity": "sha512-LXkAfRd4FHtkQS4X6g+nRcVaN7mWVNepV06phIsC6+IZFvGh1voW5TNQiQp2twVaMf05gZqQjuS+uWLM6gHhNQ==",
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/sodium-native/-/sodium-native-4.2.0.tgz",
+      "integrity": "sha512-rdJRAf/RE/IRFUUoUsz10slNAQDTGz5ChpIeR1Ti0BtGYstl6Uok4hHALPBdnFcLml6qXJ2pDd0/De09mPa6mg==",
       "dev": true,
       "hasInstallScript": true,
+      "license": "MIT",
       "optional": true,
       "dependencies": {
         "node-gyp-build": "^4.8.0"
@@ -3167,7 +3184,8 @@
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-1.0.3.tgz",
       "integrity": "sha512-6rt+RN7aOi1nGMyC4Xa5DdYiukl2UWCbcJft7YhxReBGQD7OAM8Pbxw6YMo4r2diNEA8FEmu32YOn9rhaiE5yw==",
-      "dev": true
+      "dev": true,
+      "license": "Unlicense"
     },
     "node_modules/type-check": {
       "version": "0.4.0",
diff --git a/cmd/crates/soroban-spec-typescript/ts-tests/package.json b/cmd/crates/soroban-spec-typescript/ts-tests/package.json
index b3f1990dd..69a17eb5c 100644
--- a/cmd/crates/soroban-spec-typescript/ts-tests/package.json
+++ b/cmd/crates/soroban-spec-typescript/ts-tests/package.json
@@ -8,7 +8,7 @@
   },
   "devDependencies": {
     "@ava/typescript": "^4.1.0",
-    "@stellar/stellar-sdk": "12.2.0",
+    "@stellar/stellar-sdk": "12.3.0",
     "@types/node": "^20.4.9",
     "@typescript-eslint/eslint-plugin": "^6.10.0",
     "@typescript-eslint/parser": "^6.10.0",

From 8e1d45b53392338f26a41fa60e99b09dcd14b20f Mon Sep 17 00:00:00 2001
From: Leigh McCulloch <351529+leighmcculloch@users.noreply.github.com>
Date: Fri, 8 Nov 2024 06:16:33 +1000
Subject: [PATCH 11/31] Move container command to root (#1710)

---
 FULL_HELP_DOCS.md                             | 93 +++++++++++++++++--
 .../commands/{network => }/container/logs.rs  |  2 +-
 .../container.rs => container/mod.rs}         |  4 +-
 .../{network => }/container/shared.rs         |  0
 .../commands/{network => }/container/start.rs |  2 +-
 .../commands/{network => }/container/stop.rs  |  2 +-
 cmd/soroban-cli/src/commands/mod.rs           | 11 ++-
 cmd/soroban-cli/src/commands/network/mod.rs   | 21 +++--
 8 files changed, 114 insertions(+), 21 deletions(-)
 rename cmd/soroban-cli/src/commands/{network => }/container/logs.rs (94%)
 rename cmd/soroban-cli/src/commands/{network/container.rs => container/mod.rs} (91%)
 rename cmd/soroban-cli/src/commands/{network => }/container/shared.rs (100%)
 rename cmd/soroban-cli/src/commands/{network => }/container/start.rs (99%)
 rename cmd/soroban-cli/src/commands/{network => }/container/stop.rs (95%)

diff --git a/FULL_HELP_DOCS.md b/FULL_HELP_DOCS.md
index 6f3882ce6..581c2cb87 100644
--- a/FULL_HELP_DOCS.md
+++ b/FULL_HELP_DOCS.md
@@ -47,7 +47,8 @@ Anything after the `--` double dash (the "slop") is parsed as arguments to the c
 * `events` — Watch the network for contract events
 * `env` — Prints the current environment variables or defaults to the stdout, in a format that can be used as .env file. Environment variables have precedency over defaults
 * `keys` — Create and manage identities including keys and addresses
-* `network` — Start and configure networks
+* `network` — Configure connection to networks
+* `container` — Start local networks in containers
 * `snapshot` — Download a snapshot of a ledger from an archive
 * `tx` — Sign, Simulate, and Send transactions
 * `xdr` — Decode and encode XDR
@@ -1105,7 +1106,7 @@ Set the default identity that will be used on all commands. This allows you to s
 
 ## `stellar network`
 
-Start and configure networks
+Configure connection to networks
 
 **Usage:** `stellar network <COMMAND>`
 
@@ -1117,7 +1118,7 @@ Start and configure networks
 * `start` — ⚠️ Deprecated: use `stellar container start` instead
 * `stop` — ⚠️ Deprecated: use `stellar container stop` instead
 * `use` — Set the default network that will be used on all commands. This allows you to skip `--network` or setting a environment variable, while reusing this value in all commands that require it
-* `container` — Commands to start, stop and get logs for a quickstart container
+* `container` — ⚠️ Deprecated: use `stellar container` instead
 
 
 
@@ -1245,6 +1246,8 @@ Set the default network that will be used on all commands. This allows you to sk
 
 ## `stellar network container`
 
+⚠️ Deprecated: use `stellar container` instead
+
 Commands to start, stop and get logs for a quickstart container
 
 **Usage:** `stellar network container <COMMAND>`
@@ -1253,7 +1256,7 @@ Commands to start, stop and get logs for a quickstart container
 
 * `logs` — Get logs from a running network container
 * `start` — Start a container running a Stellar node, RPC, API, and friendbot (faucet)
-* `stop` — Stop a network container started with `network container start`
+* `stop` — Stop a network container started with `stellar container start`
 
 
 
@@ -1277,7 +1280,7 @@ Get logs from a running network container
 
 Start a container running a Stellar node, RPC, API, and friendbot (faucet).
 
-`stellar network container start NETWORK [OPTIONS]`
+`stellar container start NETWORK [OPTIONS]`
 
 By default, when starting a testnet container, without any optional arguments, it will run the equivalent of the following docker command:
 
@@ -1307,7 +1310,7 @@ By default, when starting a testnet container, without any optional arguments, i
 
 ## `stellar network container stop`
 
-Stop a network container started with `network container start`
+Stop a network container started with `stellar container start`
 
 **Usage:** `stellar network container stop [OPTIONS] <NAME>`
 
@@ -1321,6 +1324,84 @@ Stop a network container started with `network container start`
 
 
 
+## `stellar container`
+
+Start local networks in containers
+
+**Usage:** `stellar container <COMMAND>`
+
+###### **Subcommands:**
+
+* `logs` — Get logs from a running network container
+* `start` — Start a container running a Stellar node, RPC, API, and friendbot (faucet)
+* `stop` — Stop a network container started with `stellar container start`
+
+
+
+## `stellar container logs`
+
+Get logs from a running network container
+
+**Usage:** `stellar container logs [OPTIONS] <NAME>`
+
+###### **Arguments:**
+
+* `<NAME>` — Container to get logs from
+
+###### **Options:**
+
+* `-d`, `--docker-host <DOCKER_HOST>` — Optional argument to override the default docker host. This is useful when you are using a non-standard docker host path for your Docker-compatible container runtime, e.g. Docker Desktop defaults to $HOME/.docker/run/docker.sock instead of /var/run/docker.sock
+
+
+
+## `stellar container start`
+
+Start a container running a Stellar node, RPC, API, and friendbot (faucet).
+
+`stellar container start NETWORK [OPTIONS]`
+
+By default, when starting a testnet container, without any optional arguments, it will run the equivalent of the following docker command:
+
+`docker run --rm -p 8000:8000 --name stellar stellar/quickstart:testing --testnet --enable rpc,horizon`
+
+**Usage:** `stellar container start [OPTIONS] <NETWORK>`
+
+###### **Arguments:**
+
+* `<NETWORK>` — Network to start
+
+  Possible values: `local`, `testnet`, `futurenet`, `pubnet`
+
+
+###### **Options:**
+
+* `-d`, `--docker-host <DOCKER_HOST>` — Optional argument to override the default docker host. This is useful when you are using a non-standard docker host path for your Docker-compatible container runtime, e.g. Docker Desktop defaults to $HOME/.docker/run/docker.sock instead of /var/run/docker.sock
+* `--name <NAME>` — Optional argument to specify the container name
+* `-l`, `--limits <LIMITS>` — Optional argument to specify the limits for the local network only
+* `-p`, `--ports-mapping <PORTS_MAPPING>` — Argument to specify the `HOST_PORT:CONTAINER_PORT` mapping
+
+  Default value: `8000:8000`
+* `-t`, `--image-tag-override <IMAGE_TAG_OVERRIDE>` — Optional argument to override the default docker image tag for the given network
+* `--protocol-version <PROTOCOL_VERSION>` — Optional argument to specify the protocol version for the local network only
+
+
+
+## `stellar container stop`
+
+Stop a network container started with `stellar container start`
+
+**Usage:** `stellar container stop [OPTIONS] <NAME>`
+
+###### **Arguments:**
+
+* `<NAME>` — Container to stop
+
+###### **Options:**
+
+* `-d`, `--docker-host <DOCKER_HOST>` — Optional argument to override the default docker host. This is useful when you are using a non-standard docker host path for your Docker-compatible container runtime, e.g. Docker Desktop defaults to $HOME/.docker/run/docker.sock instead of /var/run/docker.sock
+
+
+
 ## `stellar snapshot`
 
 Download a snapshot of a ledger from an archive
diff --git a/cmd/soroban-cli/src/commands/network/container/logs.rs b/cmd/soroban-cli/src/commands/container/logs.rs
similarity index 94%
rename from cmd/soroban-cli/src/commands/network/container/logs.rs
rename to cmd/soroban-cli/src/commands/container/logs.rs
index aaccffdde..85824b06c 100644
--- a/cmd/soroban-cli/src/commands/network/container/logs.rs
+++ b/cmd/soroban-cli/src/commands/container/logs.rs
@@ -1,7 +1,7 @@
 use futures_util::TryStreamExt;
 
 use crate::{
-    commands::{global, network::container::shared::Error as ConnectionError},
+    commands::{container::shared::Error as ConnectionError, global},
     print,
 };
 
diff --git a/cmd/soroban-cli/src/commands/network/container.rs b/cmd/soroban-cli/src/commands/container/mod.rs
similarity index 91%
rename from cmd/soroban-cli/src/commands/network/container.rs
rename to cmd/soroban-cli/src/commands/container/mod.rs
index d14dc72e4..08203095d 100644
--- a/cmd/soroban-cli/src/commands/network/container.rs
+++ b/cmd/soroban-cli/src/commands/container/mod.rs
@@ -16,13 +16,13 @@ pub enum Cmd {
     Logs(logs::Cmd),
     /// Start a container running a Stellar node, RPC, API, and friendbot (faucet).
     ///
-    /// `stellar network container start NETWORK [OPTIONS]`
+    /// `stellar container start NETWORK [OPTIONS]`
     ///
     /// By default, when starting a testnet container, without any optional arguments, it will run the equivalent of the following docker command:
     ///
     /// `docker run --rm -p 8000:8000 --name stellar stellar/quickstart:testing --testnet --enable rpc,horizon`
     Start(start::Cmd),
-    /// Stop a network container started with `network container start`.
+    /// Stop a network container started with `stellar container start`.
     Stop(stop::Cmd),
 }
 
diff --git a/cmd/soroban-cli/src/commands/network/container/shared.rs b/cmd/soroban-cli/src/commands/container/shared.rs
similarity index 100%
rename from cmd/soroban-cli/src/commands/network/container/shared.rs
rename to cmd/soroban-cli/src/commands/container/shared.rs
diff --git a/cmd/soroban-cli/src/commands/network/container/start.rs b/cmd/soroban-cli/src/commands/container/start.rs
similarity index 99%
rename from cmd/soroban-cli/src/commands/network/container/start.rs
rename to cmd/soroban-cli/src/commands/container/start.rs
index 2f16d3c1e..6c5a5c291 100644
--- a/cmd/soroban-cli/src/commands/network/container/start.rs
+++ b/cmd/soroban-cli/src/commands/container/start.rs
@@ -9,8 +9,8 @@ use futures_util::TryStreamExt;
 
 use crate::{
     commands::{
+        container::shared::{Error as ConnectionError, Network},
         global,
-        network::container::shared::{Error as ConnectionError, Network},
     },
     print,
 };
diff --git a/cmd/soroban-cli/src/commands/network/container/stop.rs b/cmd/soroban-cli/src/commands/container/stop.rs
similarity index 95%
rename from cmd/soroban-cli/src/commands/network/container/stop.rs
rename to cmd/soroban-cli/src/commands/container/stop.rs
index 77f674c46..6211c629f 100644
--- a/cmd/soroban-cli/src/commands/network/container/stop.rs
+++ b/cmd/soroban-cli/src/commands/container/stop.rs
@@ -1,5 +1,5 @@
 use crate::{
-    commands::{global, network::container::shared::Error as BollardConnectionError},
+    commands::{container::shared::Error as BollardConnectionError, global},
     print,
 };
 
diff --git a/cmd/soroban-cli/src/commands/mod.rs b/cmd/soroban-cli/src/commands/mod.rs
index f1febae27..f4344fb9d 100644
--- a/cmd/soroban-cli/src/commands/mod.rs
+++ b/cmd/soroban-cli/src/commands/mod.rs
@@ -7,6 +7,7 @@ use crate::config;
 
 pub mod cache;
 pub mod completion;
+pub mod container;
 pub mod contract;
 pub mod env;
 pub mod events;
@@ -113,6 +114,7 @@ impl Root {
             Cmd::Events(events) => events.run().await?,
             Cmd::Xdr(xdr) => xdr.run()?,
             Cmd::Network(network) => network.run(&self.global_args).await?,
+            Cmd::Container(container) => container.run(&self.global_args).await?,
             Cmd::Snapshot(snapshot) => snapshot.run(&self.global_args).await?,
             Cmd::Version(version) => version.run(),
             Cmd::Keys(id) => id.run(&self.global_args).await?,
@@ -150,10 +152,14 @@ pub enum Cmd {
     #[command(subcommand)]
     Keys(keys::Cmd),
 
-    /// Start and configure networks
+    /// Configure connection to networks
     #[command(subcommand)]
     Network(network::Cmd),
 
+    /// Start local networks in containers
+    #[command(subcommand)]
+    Container(container::Cmd),
+
     /// Download a snapshot of a ledger from an archive.
     #[command(subcommand)]
     Snapshot(snapshot::Cmd),
@@ -201,6 +207,9 @@ pub enum Error {
     #[error(transparent)]
     Network(#[from] network::Error),
 
+    #[error(transparent)]
+    Container(#[from] container::Error),
+
     #[error(transparent)]
     Snapshot(#[from] snapshot::Error),
 
diff --git a/cmd/soroban-cli/src/commands/network/mod.rs b/cmd/soroban-cli/src/commands/network/mod.rs
index a7519bc83..5cc2acc43 100644
--- a/cmd/soroban-cli/src/commands/network/mod.rs
+++ b/cmd/soroban-cli/src/commands/network/mod.rs
@@ -5,7 +5,6 @@ use crate::rpc::{self};
 use super::{config::locator, global};
 
 pub mod add;
-pub mod container;
 pub mod default;
 pub mod ls;
 pub mod rm;
@@ -32,12 +31,12 @@ pub enum Cmd {
     /// By default, when starting a testnet container, without any optional arguments, it will run the equivalent of the following docker command:
     ///
     /// `docker run --rm -p 8000:8000 --name stellar stellar/quickstart:testing --testnet --enable rpc,horizon`
-    Start(container::StartCmd),
+    Start(crate::commands::container::StartCmd),
 
     /// ⚠️ Deprecated: use `stellar container stop` instead
     ///
     /// Stop a network started with `network start`. For example, if you ran `stellar network start local`, you can use `stellar network stop local` to stop it.
-    Stop(container::StopCmd),
+    Stop(crate::commands::container::StopCmd),
 
     /// Set the default network that will be used on all commands.
     /// This allows you to skip `--network` or setting a environment variable,
@@ -45,9 +44,11 @@ pub enum Cmd {
     #[command(name = "use")]
     Default(default::Cmd),
 
+    /// ⚠️ Deprecated: use `stellar container` instead
+    ///
     /// Commands to start, stop and get logs for a quickstart container
     #[command(subcommand)]
-    Container(container::Cmd),
+    Container(crate::commands::container::Cmd),
 }
 
 #[derive(thiserror::Error, Debug)]
@@ -66,14 +67,14 @@ pub enum Error {
 
     // TODO: remove once `network start` is removed
     #[error(transparent)]
-    Start(#[from] container::start::Error),
+    Start(#[from] crate::commands::container::start::Error),
 
     // TODO: remove once `network stop` is removed
     #[error(transparent)]
-    Stop(#[from] container::stop::Error),
+    Stop(#[from] crate::commands::container::stop::Error),
 
     #[error(transparent)]
-    Container(#[from] container::Error),
+    Container(#[from] crate::commands::container::Error),
 
     #[error(transparent)]
     Config(#[from] locator::Error),
@@ -103,12 +104,14 @@ impl Cmd {
 
             // TODO Remove this once `network start` is removed
             Cmd::Start(cmd) => {
-                eprintln!("⚠️ Warning: `network start` has been deprecated. Use `network container start` instead");
+                eprintln!("⚠️ Warning: `network start` has been deprecated. Use `container start` instead");
                 cmd.run(global_args).await?;
             }
             // TODO Remove this once `network stop` is removed
             Cmd::Stop(cmd) => {
-                println!("⚠️ Warning: `network stop` has been deprecated. Use `network container stop` instead");
+                println!(
+                    "⚠️ Warning: `network stop` has been deprecated. Use `container stop` instead"
+                );
                 cmd.run(global_args).await?;
             }
         };

From 5fac1383ca3d51d0b9f113f233d9f7c07894bffa Mon Sep 17 00:00:00 2001
From: Nando Vieira <me@fnando.com>
Date: Thu, 7 Nov 2024 15:07:54 -0800
Subject: [PATCH 12/31] Revert "Resolve identity from default config. (#1711)"
 (#1715)

This reverts commit 9912694cfb6f67c4ccfbcba62a27aa22aa43cc17.
---
 FULL_HELP_DOCS.md                     | 64 +++++++--------------------
 cmd/soroban-cli/src/config/address.rs | 14 ++----
 cmd/soroban-cli/src/config/mod.rs     |  7 +--
 3 files changed, 20 insertions(+), 65 deletions(-)

diff --git a/FULL_HELP_DOCS.md b/FULL_HELP_DOCS.md
index 581c2cb87..899c0115e 100644
--- a/FULL_HELP_DOCS.md
+++ b/FULL_HELP_DOCS.md
@@ -131,7 +131,7 @@ Get Id of builtin Soroban Asset Contract. Deprecated, use `stellar contract id a
 
 Deploy builtin Soroban Asset Contract
 
-**Usage:** `stellar contract asset deploy [OPTIONS] --asset <ASSET>`
+**Usage:** `stellar contract asset deploy [OPTIONS] --asset <ASSET> --source-account <SOURCE_ACCOUNT>`
 
 ###### **Options:**
 
@@ -141,8 +141,6 @@ Deploy builtin Soroban Asset Contract
 * `--network-passphrase <NETWORK_PASSPHRASE>` — Network passphrase to sign the transaction sent to the rpc server
 * `--network <NETWORK>` — Name of network to use from config
 * `--source-account <SOURCE_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…), or a seed phrase (--source "kite urban…"). If `--build-only` or `--sim-only` flags were NOT provided, this key will also be used to sign the final transaction. In that case, trying to sign with public key will fail
-
-  Default value: ``
 * `--hd-path <HD_PATH>` — If using a seed phrase, which hierarchical deterministic path to use, e.g. `m/44'/148'/{hd_path}`. Example: `--hd-path 1`. Default: `0`
 * `--global` — Use global config
 * `--config-dir <CONFIG_DIR>` — Location of config directory, default is "."
@@ -348,7 +346,7 @@ Extend the time to live ledger of a contract-data ledger entry.
 
 If no keys are specified the contract itself is extended.
 
-**Usage:** `stellar contract extend [OPTIONS] --ledgers-to-extend <LEDGERS_TO_EXTEND>`
+**Usage:** `stellar contract extend [OPTIONS] --ledgers-to-extend <LEDGERS_TO_EXTEND> --source-account <SOURCE_ACCOUNT>`
 
 ###### **Options:**
 
@@ -374,8 +372,6 @@ If no keys are specified the contract itself is extended.
 * `--network-passphrase <NETWORK_PASSPHRASE>` — Network passphrase to sign the transaction sent to the rpc server
 * `--network <NETWORK>` — Name of network to use from config
 * `--source-account <SOURCE_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…), or a seed phrase (--source "kite urban…"). If `--build-only` or `--sim-only` flags were NOT provided, this key will also be used to sign the final transaction. In that case, trying to sign with public key will fail
-
-  Default value: ``
 * `--hd-path <HD_PATH>` — If using a seed phrase, which hierarchical deterministic path to use, e.g. `m/44'/148'/{hd_path}`. Example: `--hd-path 1`. Default: `0`
 * `--global` — Use global config
 * `--config-dir <CONFIG_DIR>` — Location of config directory, default is "."
@@ -393,7 +389,7 @@ If no keys are specified the contract itself is extended.
 
 Deploy a wasm contract
 
-**Usage:** `stellar contract deploy [OPTIONS] <--wasm <WASM>|--wasm-hash <WASM_HASH>> [-- <CONTRACT_CONSTRUCTOR_ARGS>...]`
+**Usage:** `stellar contract deploy [OPTIONS] --source-account <SOURCE_ACCOUNT> <--wasm <WASM>|--wasm-hash <WASM_HASH>> [-- <CONTRACT_CONSTRUCTOR_ARGS>...]`
 
 ###### **Arguments:**
 
@@ -409,8 +405,6 @@ Deploy a wasm contract
 * `--network-passphrase <NETWORK_PASSPHRASE>` — Network passphrase to sign the transaction sent to the rpc server
 * `--network <NETWORK>` — Name of network to use from config
 * `--source-account <SOURCE_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…), or a seed phrase (--source "kite urban…"). If `--build-only` or `--sim-only` flags were NOT provided, this key will also be used to sign the final transaction. In that case, trying to sign with public key will fail
-
-  Default value: ``
 * `--hd-path <HD_PATH>` — If using a seed phrase, which hierarchical deterministic path to use, e.g. `m/44'/148'/{hd_path}`. Example: `--hd-path 1`. Default: `0`
 * `--global` — Use global config
 * `--config-dir <CONFIG_DIR>` — Location of config directory, default is "."
@@ -482,7 +476,7 @@ Deploy builtin Soroban Asset Contract
 
 Deploy normal Wasm Contract
 
-**Usage:** `stellar contract id wasm [OPTIONS] --salt <SALT>`
+**Usage:** `stellar contract id wasm [OPTIONS] --salt <SALT> --source-account <SOURCE_ACCOUNT>`
 
 ###### **Options:**
 
@@ -492,8 +486,6 @@ Deploy normal Wasm Contract
 * `--network-passphrase <NETWORK_PASSPHRASE>` — Network passphrase to sign the transaction sent to the rpc server
 * `--network <NETWORK>` — Name of network to use from config
 * `--source-account <SOURCE_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…), or a seed phrase (--source "kite urban…"). If `--build-only` or `--sim-only` flags were NOT provided, this key will also be used to sign the final transaction. In that case, trying to sign with public key will fail
-
-  Default value: ``
 * `--hd-path <HD_PATH>` — If using a seed phrase, which hierarchical deterministic path to use, e.g. `m/44'/148'/{hd_path}`. Example: `--hd-path 1`. Default: `0`
 * `--global` — Use global config
 * `--config-dir <CONFIG_DIR>` — Location of config directory, default is "."
@@ -685,7 +677,7 @@ This command will create a Cargo workspace project and add a sample Stellar cont
 
 Install a WASM file to the ledger without creating a contract instance
 
-**Usage:** `stellar contract install [OPTIONS] --wasm <WASM>`
+**Usage:** `stellar contract install [OPTIONS] --source-account <SOURCE_ACCOUNT> --wasm <WASM>`
 
 ###### **Options:**
 
@@ -694,8 +686,6 @@ Install a WASM file to the ledger without creating a contract instance
 * `--network-passphrase <NETWORK_PASSPHRASE>` — Network passphrase to sign the transaction sent to the rpc server
 * `--network <NETWORK>` — Name of network to use from config
 * `--source-account <SOURCE_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…), or a seed phrase (--source "kite urban…"). If `--build-only` or `--sim-only` flags were NOT provided, this key will also be used to sign the final transaction. In that case, trying to sign with public key will fail
-
-  Default value: ``
 * `--hd-path <HD_PATH>` — If using a seed phrase, which hierarchical deterministic path to use, e.g. `m/44'/148'/{hd_path}`. Example: `--hd-path 1`. Default: `0`
 * `--global` — Use global config
 * `--config-dir <CONFIG_DIR>` — Location of config directory, default is "."
@@ -721,7 +711,7 @@ Generates an "implicit CLI" for the specified contract on-the-fly using the cont
 
 stellar contract invoke ... -- --help
 
-**Usage:** `stellar contract invoke [OPTIONS] --id <CONTRACT_ID> [-- <CONTRACT_FN_AND_ARGS>...]`
+**Usage:** `stellar contract invoke [OPTIONS] --id <CONTRACT_ID> --source-account <SOURCE_ACCOUNT> [-- <CONTRACT_FN_AND_ARGS>...]`
 
 ###### **Arguments:**
 
@@ -736,8 +726,6 @@ stellar contract invoke ... -- --help
 * `--network-passphrase <NETWORK_PASSPHRASE>` — Network passphrase to sign the transaction sent to the rpc server
 * `--network <NETWORK>` — Name of network to use from config
 * `--source-account <SOURCE_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…), or a seed phrase (--source "kite urban…"). If `--build-only` or `--sim-only` flags were NOT provided, this key will also be used to sign the final transaction. In that case, trying to sign with public key will fail
-
-  Default value: ``
 * `--hd-path <HD_PATH>` — If using a seed phrase, which hierarchical deterministic path to use, e.g. `m/44'/148'/{hd_path}`. Example: `--hd-path 1`. Default: `0`
 * `--global` — Use global config
 * `--config-dir <CONFIG_DIR>` — Location of config directory, default is "."
@@ -826,7 +814,7 @@ Restore an evicted value for a contract-data legder entry.
 
 If no keys are specificed the contract itself is restored.
 
-**Usage:** `stellar contract restore [OPTIONS]`
+**Usage:** `stellar contract restore [OPTIONS] --source-account <SOURCE_ACCOUNT>`
 
 ###### **Options:**
 
@@ -852,8 +840,6 @@ If no keys are specificed the contract itself is restored.
 * `--network-passphrase <NETWORK_PASSPHRASE>` — Network passphrase to sign the transaction sent to the rpc server
 * `--network <NETWORK>` — Name of network to use from config
 * `--source-account <SOURCE_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…), or a seed phrase (--source "kite urban…"). If `--build-only` or `--sim-only` flags were NOT provided, this key will also be used to sign the final transaction. In that case, trying to sign with public key will fail
-
-  Default value: ``
 * `--hd-path <HD_PATH>` — If using a seed phrase, which hierarchical deterministic path to use, e.g. `m/44'/148'/{hd_path}`. Example: `--hd-path 1`. Default: `0`
 * `--global` — Use global config
 * `--config-dir <CONFIG_DIR>` — Location of config directory, default is "."
@@ -1472,7 +1458,7 @@ Sign, Simulate, and Send transactions
 
 Simulate a transaction envelope from stdin
 
-**Usage:** `stellar tx simulate [OPTIONS]`
+**Usage:** `stellar tx simulate [OPTIONS] --source-account <SOURCE_ACCOUNT>`
 
 ###### **Options:**
 
@@ -1481,8 +1467,6 @@ Simulate a transaction envelope from stdin
 * `--network-passphrase <NETWORK_PASSPHRASE>` — Network passphrase to sign the transaction sent to the rpc server
 * `--network <NETWORK>` — Name of network to use from config
 * `--source-account <SOURCE_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…), or a seed phrase (--source "kite urban…"). If `--build-only` or `--sim-only` flags were NOT provided, this key will also be used to sign the final transaction. In that case, trying to sign with public key will fail
-
-  Default value: ``
 * `--hd-path <HD_PATH>` — If using a seed phrase, which hierarchical deterministic path to use, e.g. `m/44'/148'/{hd_path}`. Example: `--hd-path 1`. Default: `0`
 * `--global` — Use global config
 * `--config-dir <CONFIG_DIR>` — Location of config directory, default is "."
@@ -1564,7 +1548,7 @@ Create a new transaction
 
 Transfers the XLM balance of an account to another account and removes the source account from the ledger
 
-**Usage:** `stellar tx new account-merge [OPTIONS] --account <ACCOUNT>`
+**Usage:** `stellar tx new account-merge [OPTIONS] --source-account <SOURCE_ACCOUNT> --account <ACCOUNT>`
 
 ###### **Options:**
 
@@ -1580,8 +1564,6 @@ Transfers the XLM balance of an account to another account and removes the sourc
 * `--network-passphrase <NETWORK_PASSPHRASE>` — Network passphrase to sign the transaction sent to the rpc server
 * `--network <NETWORK>` — Name of network to use from config
 * `--source-account <SOURCE_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…), or a seed phrase (--source "kite urban…"). If `--build-only` or `--sim-only` flags were NOT provided, this key will also be used to sign the final transaction. In that case, trying to sign with public key will fail
-
-  Default value: ``
 * `--hd-path <HD_PATH>` — If using a seed phrase, which hierarchical deterministic path to use, e.g. `m/44'/148'/{hd_path}`. Example: `--hd-path 1`. Default: `0`
 * `--global` — Use global config
 * `--config-dir <CONFIG_DIR>` — Location of config directory, default is "."
@@ -1593,7 +1575,7 @@ Transfers the XLM balance of an account to another account and removes the sourc
 
 Bumps forward the sequence number of the source account to the given sequence number, invalidating any transaction with a smaller sequence number
 
-**Usage:** `stellar tx new bump-sequence [OPTIONS] --bump-to <BUMP_TO>`
+**Usage:** `stellar tx new bump-sequence [OPTIONS] --source-account <SOURCE_ACCOUNT> --bump-to <BUMP_TO>`
 
 ###### **Options:**
 
@@ -1609,8 +1591,6 @@ Bumps forward the sequence number of the source account to the given sequence nu
 * `--network-passphrase <NETWORK_PASSPHRASE>` — Network passphrase to sign the transaction sent to the rpc server
 * `--network <NETWORK>` — Name of network to use from config
 * `--source-account <SOURCE_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…), or a seed phrase (--source "kite urban…"). If `--build-only` or `--sim-only` flags were NOT provided, this key will also be used to sign the final transaction. In that case, trying to sign with public key will fail
-
-  Default value: ``
 * `--hd-path <HD_PATH>` — If using a seed phrase, which hierarchical deterministic path to use, e.g. `m/44'/148'/{hd_path}`. Example: `--hd-path 1`. Default: `0`
 * `--global` — Use global config
 * `--config-dir <CONFIG_DIR>` — Location of config directory, default is "."
@@ -1622,7 +1602,7 @@ Bumps forward the sequence number of the source account to the given sequence nu
 
 Creates, updates, or deletes a trustline Learn more about trustlines https://developers.stellar.org/docs/learn/fundamentals/stellar-data-structures/accounts#trustlines
 
-**Usage:** `stellar tx new change-trust [OPTIONS] --line <LINE>`
+**Usage:** `stellar tx new change-trust [OPTIONS] --source-account <SOURCE_ACCOUNT> --line <LINE>`
 
 ###### **Options:**
 
@@ -1638,8 +1618,6 @@ Creates, updates, or deletes a trustline Learn more about trustlines https://dev
 * `--network-passphrase <NETWORK_PASSPHRASE>` — Network passphrase to sign the transaction sent to the rpc server
 * `--network <NETWORK>` — Name of network to use from config
 * `--source-account <SOURCE_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…), or a seed phrase (--source "kite urban…"). If `--build-only` or `--sim-only` flags were NOT provided, this key will also be used to sign the final transaction. In that case, trying to sign with public key will fail
-
-  Default value: ``
 * `--hd-path <HD_PATH>` — If using a seed phrase, which hierarchical deterministic path to use, e.g. `m/44'/148'/{hd_path}`. Example: `--hd-path 1`. Default: `0`
 * `--global` — Use global config
 * `--config-dir <CONFIG_DIR>` — Location of config directory, default is "."
@@ -1654,7 +1632,7 @@ Creates, updates, or deletes a trustline Learn more about trustlines https://dev
 
 Creates and funds a new account with the specified starting balance
 
-**Usage:** `stellar tx new create-account [OPTIONS] --destination <DESTINATION>`
+**Usage:** `stellar tx new create-account [OPTIONS] --source-account <SOURCE_ACCOUNT> --destination <DESTINATION>`
 
 ###### **Options:**
 
@@ -1670,8 +1648,6 @@ Creates and funds a new account with the specified starting balance
 * `--network-passphrase <NETWORK_PASSPHRASE>` — Network passphrase to sign the transaction sent to the rpc server
 * `--network <NETWORK>` — Name of network to use from config
 * `--source-account <SOURCE_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…), or a seed phrase (--source "kite urban…"). If `--build-only` or `--sim-only` flags were NOT provided, this key will also be used to sign the final transaction. In that case, trying to sign with public key will fail
-
-  Default value: ``
 * `--hd-path <HD_PATH>` — If using a seed phrase, which hierarchical deterministic path to use, e.g. `m/44'/148'/{hd_path}`. Example: `--hd-path 1`. Default: `0`
 * `--global` — Use global config
 * `--config-dir <CONFIG_DIR>` — Location of config directory, default is "."
@@ -1686,7 +1662,7 @@ Creates and funds a new account with the specified starting balance
 
 Sets, modifies, or deletes a data entry (name/value pair) that is attached to an account Learn more about entries and subentries: https://developers.stellar.org/docs/learn/fundamentals/stellar-data-structures/accounts#subentries
 
-**Usage:** `stellar tx new manage-data [OPTIONS] --data-name <DATA_NAME>`
+**Usage:** `stellar tx new manage-data [OPTIONS] --source-account <SOURCE_ACCOUNT> --data-name <DATA_NAME>`
 
 ###### **Options:**
 
@@ -1702,8 +1678,6 @@ Sets, modifies, or deletes a data entry (name/value pair) that is attached to an
 * `--network-passphrase <NETWORK_PASSPHRASE>` — Network passphrase to sign the transaction sent to the rpc server
 * `--network <NETWORK>` — Name of network to use from config
 * `--source-account <SOURCE_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…), or a seed phrase (--source "kite urban…"). If `--build-only` or `--sim-only` flags were NOT provided, this key will also be used to sign the final transaction. In that case, trying to sign with public key will fail
-
-  Default value: ``
 * `--hd-path <HD_PATH>` — If using a seed phrase, which hierarchical deterministic path to use, e.g. `m/44'/148'/{hd_path}`. Example: `--hd-path 1`. Default: `0`
 * `--global` — Use global config
 * `--config-dir <CONFIG_DIR>` — Location of config directory, default is "."
@@ -1716,7 +1690,7 @@ Sets, modifies, or deletes a data entry (name/value pair) that is attached to an
 
 Sends an amount in a specific asset to a destination account
 
-**Usage:** `stellar tx new payment [OPTIONS] --destination <DESTINATION> --amount <AMOUNT>`
+**Usage:** `stellar tx new payment [OPTIONS] --source-account <SOURCE_ACCOUNT> --destination <DESTINATION> --amount <AMOUNT>`
 
 ###### **Options:**
 
@@ -1732,8 +1706,6 @@ Sends an amount in a specific asset to a destination account
 * `--network-passphrase <NETWORK_PASSPHRASE>` — Network passphrase to sign the transaction sent to the rpc server
 * `--network <NETWORK>` — Name of network to use from config
 * `--source-account <SOURCE_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…), or a seed phrase (--source "kite urban…"). If `--build-only` or `--sim-only` flags were NOT provided, this key will also be used to sign the final transaction. In that case, trying to sign with public key will fail
-
-  Default value: ``
 * `--hd-path <HD_PATH>` — If using a seed phrase, which hierarchical deterministic path to use, e.g. `m/44'/148'/{hd_path}`. Example: `--hd-path 1`. Default: `0`
 * `--global` — Use global config
 * `--config-dir <CONFIG_DIR>` — Location of config directory, default is "."
@@ -1749,7 +1721,7 @@ Sends an amount in a specific asset to a destination account
 
 Set option for an account such as flags, inflation destination, signers, home domain, and master key weight Learn more about flags: https://developers.stellar.org/docs/learn/glossary#flags Learn more about the home domain: https://github.com/stellar/stellar-protocol/blob/master/ecosystem/sep-0001.md Learn more about signers operations and key weight: https://developers.stellar.org/docs/learn/encyclopedia/security/signatures-multisig#multisig
 
-**Usage:** `stellar tx new set-options [OPTIONS]`
+**Usage:** `stellar tx new set-options [OPTIONS] --source-account <SOURCE_ACCOUNT>`
 
 ###### **Options:**
 
@@ -1765,8 +1737,6 @@ Set option for an account such as flags, inflation destination, signers, home do
 * `--network-passphrase <NETWORK_PASSPHRASE>` — Network passphrase to sign the transaction sent to the rpc server
 * `--network <NETWORK>` — Name of network to use from config
 * `--source-account <SOURCE_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…), or a seed phrase (--source "kite urban…"). If `--build-only` or `--sim-only` flags were NOT provided, this key will also be used to sign the final transaction. In that case, trying to sign with public key will fail
-
-  Default value: ``
 * `--hd-path <HD_PATH>` — If using a seed phrase, which hierarchical deterministic path to use, e.g. `m/44'/148'/{hd_path}`. Example: `--hd-path 1`. Default: `0`
 * `--global` — Use global config
 * `--config-dir <CONFIG_DIR>` — Location of config directory, default is "."
@@ -1793,7 +1763,7 @@ Set option for an account such as flags, inflation destination, signers, home do
 
 Allows issuing account to configure authorization and trustline flags to an asset The Asset parameter is of the `TrustLineAsset` type. If you are modifying a trustline to a regular asset (i.e. one in a Code:Issuer format), this is equivalent to the Asset type. If you are modifying a trustline to a pool share, however, this is composed of the liquidity pool's unique ID. Learn more about flags: https://developers.stellar.org/docs/learn/glossary#flags
 
-**Usage:** `stellar tx new set-trustline-flags [OPTIONS] --trustor <TRUSTOR> --asset <ASSET>`
+**Usage:** `stellar tx new set-trustline-flags [OPTIONS] --source-account <SOURCE_ACCOUNT> --trustor <TRUSTOR> --asset <ASSET>`
 
 ###### **Options:**
 
@@ -1809,8 +1779,6 @@ Allows issuing account to configure authorization and trustline flags to an asse
 * `--network-passphrase <NETWORK_PASSPHRASE>` — Network passphrase to sign the transaction sent to the rpc server
 * `--network <NETWORK>` — Name of network to use from config
 * `--source-account <SOURCE_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…), or a seed phrase (--source "kite urban…"). If `--build-only` or `--sim-only` flags were NOT provided, this key will also be used to sign the final transaction. In that case, trying to sign with public key will fail
-
-  Default value: ``
 * `--hd-path <HD_PATH>` — If using a seed phrase, which hierarchical deterministic path to use, e.g. `m/44'/148'/{hd_path}`. Example: `--hd-path 1`. Default: `0`
 * `--global` — Use global config
 * `--config-dir <CONFIG_DIR>` — Location of config directory, default is "."
diff --git a/cmd/soroban-cli/src/config/address.rs b/cmd/soroban-cli/src/config/address.rs
index 811548316..066bc8d91 100644
--- a/cmd/soroban-cli/src/config/address.rs
+++ b/cmd/soroban-cli/src/config/address.rs
@@ -2,7 +2,7 @@ use std::str::FromStr;
 
 use crate::xdr;
 
-use super::{locator, secret, Config};
+use super::{locator, secret};
 
 /// Address can be either a public key or eventually an alias of a address.
 #[derive(Clone, Debug)]
@@ -31,16 +31,8 @@ impl FromStr for Address {
     type Err = Error;
 
     fn from_str(value: &str) -> Result<Self, Self::Err> {
-        let mut identity = value.to_string();
-
-        if value.is_empty() {
-            if let Ok(config) = Config::new() {
-                identity = config.defaults.identity.unwrap_or_default();
-            }
-        }
-
-        Ok(xdr::MuxedAccount::from_str(&identity).map_or_else(
-            |_| Address::AliasOrSecret(identity.to_string()),
+        Ok(xdr::MuxedAccount::from_str(value).map_or_else(
+            |_| Address::AliasOrSecret(value.to_string()),
             Address::MuxedAccount,
         ))
     }
diff --git a/cmd/soroban-cli/src/config/mod.rs b/cmd/soroban-cli/src/config/mod.rs
index 396b2b8cc..11eb179ee 100644
--- a/cmd/soroban-cli/src/config/mod.rs
+++ b/cmd/soroban-cli/src/config/mod.rs
@@ -47,12 +47,7 @@ pub struct Args {
     #[command(flatten)]
     pub network: network::Args,
 
-    #[arg(
-        long,
-        visible_alias = "source",
-        env = "STELLAR_ACCOUNT",
-        default_value = ""
-    )]
+    #[arg(long, 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…),

From 61550ec2157e5550dfaa967fa20c2ca9e2de4df2 Mon Sep 17 00:00:00 2001
From: Nando Vieira <me@fnando.com>
Date: Thu, 7 Nov 2024 15:41:20 -0800
Subject: [PATCH 13/31] Load default configuration into env vars. (#1716)

---
 cmd/soroban-cli/src/cli.rs              | 27 +++++++++++++++++++++++++
 cmd/soroban-cli/src/commands/env/mod.rs | 23 +++++++++------------
 2 files changed, 37 insertions(+), 13 deletions(-)

diff --git a/cmd/soroban-cli/src/cli.rs b/cmd/soroban-cli/src/cli.rs
index 9183d0e30..76c5c3194 100644
--- a/cmd/soroban-cli/src/cli.rs
+++ b/cmd/soroban-cli/src/cli.rs
@@ -2,6 +2,7 @@ use clap::CommandFactory;
 use dotenvy::dotenv;
 use tracing_subscriber::{fmt, EnvFilter};
 
+use crate::config::Config;
 use crate::print::Print;
 use crate::upgrade_check::upgrade_check;
 use crate::{commands, Root};
@@ -33,6 +34,8 @@ pub async fn main() {
         }
     }
 
+    set_env_from_config();
+
     let mut root = Root::new().unwrap_or_else(|e| match e {
         commands::Error::Clap(e) => {
             let mut cmd = Root::command();
@@ -86,3 +89,27 @@ pub async fn main() {
         std::process::exit(1);
     }
 }
+
+// Load ~/.config/stellar/config.toml defaults as env vars.
+fn set_env_from_config() {
+    if let Ok(config) = Config::new() {
+        set_env_value_from_config("STELLAR_ACCOUNT", config.defaults.identity);
+        set_env_value_from_config("STELLAR_NETWORK", config.defaults.network);
+    }
+}
+
+// Set an env var from a config file if the env var is not already set.
+// Additionally, a `$NAME_SOURCE` variant will be set, which allows
+// `stellar env` to properly identity the source.
+fn set_env_value_from_config(name: &str, value: Option<String>) {
+    let Some(value) = value else {
+        return;
+    };
+
+    std::env::remove_var(format!("{name}_SOURCE"));
+
+    if std::env::var(name).is_err() {
+        std::env::set_var(name, value);
+        std::env::set_var(format!("{name}_SOURCE"), "use");
+    }
+}
diff --git a/cmd/soroban-cli/src/commands/env/mod.rs b/cmd/soroban-cli/src/commands/env/mod.rs
index 4d745400c..298cac3d2 100644
--- a/cmd/soroban-cli/src/commands/env/mod.rs
+++ b/cmd/soroban-cli/src/commands/env/mod.rs
@@ -1,9 +1,6 @@
 use crate::{
     commands::global,
-    config::{
-        locator::{self},
-        Config,
-    },
+    config::locator::{self},
     print::Print,
 };
 use clap::Parser;
@@ -23,14 +20,13 @@ pub enum Error {
 impl Cmd {
     pub fn run(&self, global_args: &global::Args) -> Result<(), Error> {
         let print = Print::new(global_args.quiet);
-        let config = Config::new()?;
         let mut lines: Vec<(String, String)> = Vec::new();
 
-        if let Some(data) = get("STELLAR_NETWORK", config.defaults.network) {
+        if let Some(data) = get("STELLAR_NETWORK") {
             lines.push(data);
         }
 
-        if let Some(data) = get("STELLAR_ACCOUNT", config.defaults.identity) {
+        if let Some(data) = get("STELLAR_ACCOUNT") {
             lines.push(data);
         }
 
@@ -51,13 +47,14 @@ impl Cmd {
     }
 }
 
-fn get(env_var: &str, default_value: Option<String>) -> Option<(String, String)> {
-    if let Ok(value) = std::env::var(env_var) {
-        return Some((format!("{env_var}={value}"), "env".to_string()));
-    }
+fn get(env_var: &str) -> Option<(String, String)> {
+    // The _SOURCE env var is set from cmd/soroban-cli/src/cli.rs#set_env_value_from_config
+    let source = std::env::var(format!("{env_var}_SOURCE"))
+        .ok()
+        .unwrap_or("env".to_string());
 
-    if let Some(value) = default_value {
-        return Some((format!("{env_var}={value}"), "default".to_string()));
+    if let Ok(value) = std::env::var(env_var) {
+        return Some((format!("{env_var}={value}"), source));
     }
 
     None

From 715a2008090afdc6c538a1c373d89709981181d6 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Fri, 8 Nov 2024 00:55:59 +0000
Subject: [PATCH 14/31] Bump version to 22.0.0-rc.1 (#1717)

Co-authored-by: Nando Vieira <me@fnando.com>
---
 Cargo.lock                                    | 37 ++++++++++---------
 Cargo.toml                                    | 14 +++----
 cmd/crates/soroban-test/Cargo.toml            |  2 +-
 .../tests/fixtures/bye/Cargo.toml             |  2 +-
 .../tests/fixtures/hello/Cargo.toml           |  2 +-
 .../test-wasms/constructor/Cargo.toml         |  2 +-
 .../test-wasms/custom_account/Cargo.toml      |  2 +-
 .../test-wasms/custom_type/Cargo.toml         |  2 +-
 .../test-wasms/hello_world/Cargo.toml         |  2 +-
 cmd/soroban-cli/Cargo.toml                    |  2 +-
 cmd/stellar-cli/Cargo.toml                    |  2 +-
 11 files changed, 34 insertions(+), 35 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 6bc90a065..4d3cc0c78 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -4432,7 +4432,7 @@ dependencies = [
 
 [[package]]
 name = "soroban-cli"
-version = "21.5.0"
+version = "22.0.0-rc.1"
 dependencies = [
  "assert_cmd",
  "assert_fs",
@@ -4676,7 +4676,7 @@ dependencies = [
 
 [[package]]
 name = "soroban-hello"
-version = "21.5.0"
+version = "22.0.0-rc.1"
 
 [[package]]
 name = "soroban-ledger-snapshot"
@@ -4813,7 +4813,7 @@ dependencies = [
 
 [[package]]
 name = "soroban-spec-json"
-version = "21.5.0"
+version = "22.0.0-rc.1"
 dependencies = [
  "pretty_assertions",
  "serde",
@@ -4859,7 +4859,7 @@ dependencies = [
 
 [[package]]
 name = "soroban-spec-tools"
-version = "21.5.0"
+version = "22.0.0-rc.1"
 dependencies = [
  "base64 0.21.7",
  "ethnum",
@@ -4877,7 +4877,7 @@ dependencies = [
 
 [[package]]
 name = "soroban-spec-typescript"
-version = "21.5.0"
+version = "22.0.0-rc.1"
 dependencies = [
  "base64 0.21.7",
  "heck 0.4.1",
@@ -4898,7 +4898,7 @@ dependencies = [
 
 [[package]]
 name = "soroban-test"
-version = "21.5.0"
+version = "22.0.0-rc.1"
 dependencies = [
  "assert_cmd",
  "assert_fs",
@@ -4969,18 +4969,18 @@ checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f"
 
 [[package]]
 name = "stellar-bye"
-version = "21.5.0"
+version = "22.0.0-rc.1"
 
 [[package]]
 name = "stellar-cli"
-version = "21.5.0"
+version = "22.0.0-rc.1"
 dependencies = [
  "soroban-cli",
 ]
 
 [[package]]
 name = "stellar-ledger"
-version = "21.5.0"
+version = "22.0.0-rc.1"
 dependencies = [
  "async-trait",
  "bollard",
@@ -5018,8 +5018,9 @@ dependencies = [
 
 [[package]]
 name = "stellar-rpc-client"
-version = "21.4.0"
-source = "git+https://github.com/stellar/rs-stellar-rpc-client?rev=7554d4c87c026313a1f5b3c7ae66a92b5ff7e091#7554d4c87c026313a1f5b3c7ae66a92b5ff7e091"
+version = "22.0.0-rc.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "eaba3219c517ceba11f99e1f9adb1e801fe8416bc9ff35c6842b5fe8cac19290"
 dependencies = [
  "clap",
  "hex",
@@ -5354,42 +5355,42 @@ dependencies = [
 
 [[package]]
 name = "test_constructor"
-version = "21.5.0"
+version = "22.0.0-rc.1"
 dependencies = [
  "soroban-sdk 22.0.0-rc.3",
 ]
 
 [[package]]
 name = "test_custom_account"
-version = "21.5.0"
+version = "22.0.0-rc.1"
 dependencies = [
  "soroban-sdk 21.7.2",
 ]
 
 [[package]]
 name = "test_custom_types"
-version = "21.5.0"
+version = "22.0.0-rc.1"
 dependencies = [
  "soroban-sdk 21.7.2",
 ]
 
 [[package]]
 name = "test_hello_world"
-version = "21.5.0"
+version = "22.0.0-rc.1"
 dependencies = [
  "soroban-sdk 21.7.2",
 ]
 
 [[package]]
 name = "test_swap"
-version = "21.5.0"
+version = "22.0.0-rc.1"
 dependencies = [
  "soroban-sdk 21.7.2",
 ]
 
 [[package]]
 name = "test_token"
-version = "21.5.0"
+version = "22.0.0-rc.1"
 dependencies = [
  "soroban-sdk 21.7.2",
  "soroban-token-sdk",
@@ -5397,7 +5398,7 @@ dependencies = [
 
 [[package]]
 name = "test_udt"
-version = "21.5.0"
+version = "22.0.0-rc.1"
 dependencies = [
  "soroban-sdk 21.7.2",
 ]
diff --git a/Cargo.toml b/Cargo.toml
index d5f87b38e..31e92e40b 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -19,24 +19,24 @@ exclude = [
 ]
 
 [workspace.package]
-version = "21.5.0"
+version = "22.0.0-rc.1"
 rust-version = "1.81.0"
 
 # Dependencies located in this repo:
 [workspace.dependencies.soroban-cli]
-version = "=21.5.0"
+version = "=22.0.0-rc.1"
 path = "cmd/soroban-cli"
 
 [workspace.dependencies.soroban-spec-json]
-version = "=21.5.0"
+version = "=22.0.0-rc.1"
 path = "./cmd/crates/soroban-spec-json"
 
 [workspace.dependencies.soroban-spec-typescript]
-version = "21.5.0"
+version = "22.0.0-rc.1"
 path = "./cmd/crates/soroban-spec-typescript"
 
 [workspace.dependencies.soroban-spec-tools]
-version = "21.5.0"
+version = "22.0.0-rc.1"
 path = "./cmd/crates/soroban-spec-tools"
 
 # Dependencies from the rs-stellar-xdr repo:
@@ -63,9 +63,7 @@ version = "=22.0.0-rc.3"
 # Dependencies from the rs-stellar-rpc-client repo:
 [workspace.dependencies.soroban-rpc]
 package = "stellar-rpc-client"
-version = "21.4.0"
-git = "https://github.com/stellar/rs-stellar-rpc-client"
-rev = "7554d4c87c026313a1f5b3c7ae66a92b5ff7e091"
+version = "=22.0.0-rc.1"
 
 # Dependencies from elsewhere shared by crates:
 [workspace.dependencies]
diff --git a/cmd/crates/soroban-test/Cargo.toml b/cmd/crates/soroban-test/Cargo.toml
index b240494e4..d9eb31bdd 100644
--- a/cmd/crates/soroban-test/Cargo.toml
+++ b/cmd/crates/soroban-test/Cargo.toml
@@ -6,7 +6,7 @@ repository = "https://github.com/stellar/soroban-test"
 authors = ["Stellar Development Foundation <info@stellar.org>"]
 license = "Apache-2.0"
 readme = "README.md"
-version = "21.5.0"
+version = "22.0.0-rc.1"
 edition = "2021"
 rust-version.workspace = true
 autobins = false
diff --git a/cmd/crates/soroban-test/tests/fixtures/bye/Cargo.toml b/cmd/crates/soroban-test/tests/fixtures/bye/Cargo.toml
index 7678eee5e..acee77f4b 100644
--- a/cmd/crates/soroban-test/tests/fixtures/bye/Cargo.toml
+++ b/cmd/crates/soroban-test/tests/fixtures/bye/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "stellar-bye"
-version = "21.5.0"
+version = "22.0.0-rc.1"
 edition = "2021"
 publish = false
 
diff --git a/cmd/crates/soroban-test/tests/fixtures/hello/Cargo.toml b/cmd/crates/soroban-test/tests/fixtures/hello/Cargo.toml
index 0c3b1512f..2a212a532 100644
--- a/cmd/crates/soroban-test/tests/fixtures/hello/Cargo.toml
+++ b/cmd/crates/soroban-test/tests/fixtures/hello/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "soroban-hello"
-version = "21.5.0"
+version = "22.0.0-rc.1"
 edition = "2021"
 publish = false
 
diff --git a/cmd/crates/soroban-test/tests/fixtures/test-wasms/constructor/Cargo.toml b/cmd/crates/soroban-test/tests/fixtures/test-wasms/constructor/Cargo.toml
index ef1dd882c..8c38fecb4 100644
--- a/cmd/crates/soroban-test/tests/fixtures/test-wasms/constructor/Cargo.toml
+++ b/cmd/crates/soroban-test/tests/fixtures/test-wasms/constructor/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "test_constructor"
-version = "21.5.0"
+version = "22.0.0-rc.1"
 authors = ["Stellar Development Foundation <info@stellar.org>"]
 license = "Apache-2.0"
 edition = "2021"
diff --git a/cmd/crates/soroban-test/tests/fixtures/test-wasms/custom_account/Cargo.toml b/cmd/crates/soroban-test/tests/fixtures/test-wasms/custom_account/Cargo.toml
index 792925edb..9be386b69 100644
--- a/cmd/crates/soroban-test/tests/fixtures/test-wasms/custom_account/Cargo.toml
+++ b/cmd/crates/soroban-test/tests/fixtures/test-wasms/custom_account/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "test_custom_account"
-version = "21.5.0"
+version = "22.0.0-rc.1"
 authors = ["Stellar Development Foundation <info@stellar.org>"]
 license = "Apache-2.0"
 edition = "2021"
diff --git a/cmd/crates/soroban-test/tests/fixtures/test-wasms/custom_type/Cargo.toml b/cmd/crates/soroban-test/tests/fixtures/test-wasms/custom_type/Cargo.toml
index 398520104..7c4ca5828 100644
--- a/cmd/crates/soroban-test/tests/fixtures/test-wasms/custom_type/Cargo.toml
+++ b/cmd/crates/soroban-test/tests/fixtures/test-wasms/custom_type/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "test_custom_types"
-version = "21.5.0"
+version = "22.0.0-rc.1"
 authors = ["Stellar Development Foundation <info@stellar.org>"]
 license = "Apache-2.0"
 edition = "2021"
diff --git a/cmd/crates/soroban-test/tests/fixtures/test-wasms/hello_world/Cargo.toml b/cmd/crates/soroban-test/tests/fixtures/test-wasms/hello_world/Cargo.toml
index 5f8b1256f..19b7353ca 100644
--- a/cmd/crates/soroban-test/tests/fixtures/test-wasms/hello_world/Cargo.toml
+++ b/cmd/crates/soroban-test/tests/fixtures/test-wasms/hello_world/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "test_hello_world"
-version = "21.5.0"
+version = "22.0.0-rc.1"
 authors = ["Stellar Development Foundation <info@stellar.org>"]
 license = "Apache-2.0"
 edition = "2021"
diff --git a/cmd/soroban-cli/Cargo.toml b/cmd/soroban-cli/Cargo.toml
index efef18e0f..d2a53e6f2 100644
--- a/cmd/soroban-cli/Cargo.toml
+++ b/cmd/soroban-cli/Cargo.toml
@@ -6,7 +6,7 @@ repository = "https://github.com/stellar/stellar-cli"
 authors = ["Stellar Development Foundation <info@stellar.org>"]
 license = "Apache-2.0"
 readme = "README.md"
-version = "21.5.0"
+version = "22.0.0-rc.1"
 edition = "2021"
 rust-version.workspace = true
 autobins = false
diff --git a/cmd/stellar-cli/Cargo.toml b/cmd/stellar-cli/Cargo.toml
index 2a388b4de..21e7e307b 100644
--- a/cmd/stellar-cli/Cargo.toml
+++ b/cmd/stellar-cli/Cargo.toml
@@ -6,7 +6,7 @@ repository = "https://github.com/stellar/stellar-cli"
 authors = ["Stellar Development Foundation <info@stellar.org>"]
 license = "Apache-2.0"
 readme = "README.md"
-version = "21.5.0"
+version = "22.0.0-rc.1"
 edition = "2021"
 rust-version.workspace = true
 autobins = false

From f1f95831b13baaecbe6127aa7e28a2d017ccec5e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?jeesun=20=EC=A7=80=EC=84=A0?=
 <jeesunikim@users.noreply.github.com>
Date: Sun, 10 Nov 2024 16:48:20 -0800
Subject: [PATCH 15/31] update cli doc url (#1719)

---
 FULL_HELP_DOCS.md                   | 2 +-
 cmd/soroban-cli/src/commands/mod.rs | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/FULL_HELP_DOCS.md b/FULL_HELP_DOCS.md
index 899c0115e..c7cd9c56c 100644
--- a/FULL_HELP_DOCS.md
+++ b/FULL_HELP_DOCS.md
@@ -18,7 +18,7 @@ For additional information see:
 
 - Stellar Docs: https://developers.stellar.org
 - Smart Contract Docs: https://developers.stellar.org/docs/build/smart-contracts/overview
-- CLI Docs: https://developers.stellar.org/docs/tools/stellar-cli
+- CLI Docs: https://developers.stellar.org/docs/tools/developer-tools/cli/stellar-cli
 
 To get started generate a new identity:
 
diff --git a/cmd/soroban-cli/src/commands/mod.rs b/cmd/soroban-cli/src/commands/mod.rs
index f4344fb9d..25d61364d 100644
--- a/cmd/soroban-cli/src/commands/mod.rs
+++ b/cmd/soroban-cli/src/commands/mod.rs
@@ -38,7 +38,7 @@ For additional information see:
 
 - Stellar Docs: https://developers.stellar.org
 - Smart Contract Docs: https://developers.stellar.org/docs/build/smart-contracts/overview
-- CLI Docs: https://developers.stellar.org/docs/tools/stellar-cli";
+- CLI Docs: https://developers.stellar.org/docs/tools/developer-tools/cli/stellar-cli";
 
 // long_about is shown when someone uses `--help`; short help when using `-h`
 const LONG_ABOUT: &str = "

From ec8e93f7885c17e17b2d5bfe827d0927cded80e9 Mon Sep 17 00:00:00 2001
From: Paul <134265547+pamellix@users.noreply.github.com>
Date: Tue, 12 Nov 2024 01:31:16 +0300
Subject: [PATCH 16/31] docs: Add syntax highlights (#1712)

* Add syntax highlights

* tweak

* undo

---------

Co-authored-by: Leigh McCulloch <351529+leighmcculloch@users.noreply.github.com>
---
 README.md | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index 381f5a3dd..f8ba1f052 100644
--- a/README.md
+++ b/README.md
@@ -39,9 +39,9 @@ cargo install --locked stellar-cli --features opt
 
 Install or run the unreleased main branch with nix:
 ```
-% nix run 'github:stellar/stellar-cli' -- --help
+$ nix run 'github:stellar/stellar-cli' -- --help
 or install
-% nix profile install github:stellar/stellar-cli
+$ nix profile install github:stellar/stellar-cli
 ```
 
 ## Autocomplete
@@ -53,12 +53,12 @@ stellar completion --shell <SHELL>
 Possible SHELL values are `bash`, `elvish`, `fish`, `powershell`, `zsh`, etc.
 
 To enable autocomplete in the current bash shell, run:
-```
+```bash
 source <(stellar completion --shell bash)
 ```
 
 To enable autocomplete permanently, run:
-```
+```bash
 echo "source <(stellar completion --shell bash)" >> ~/.bashrc
 ```
 

From 9e15e9519a345edcc034d541c7b30694b078bcf4 Mon Sep 17 00:00:00 2001
From: Nando Vieira <me@fnando.com>
Date: Tue, 12 Nov 2024 13:08:46 -0800
Subject: [PATCH 17/31] Add license. (#1723)

---
 LICENSE | 202 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 202 insertions(+)
 create mode 100644 LICENSE

diff --git a/LICENSE b/LICENSE
new file mode 100644
index 000000000..a084d8624
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,202 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright 2024 Stellar Development Foundation
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.

From 02c9c8e5422f7f83795eb75dfadfa3f2c1b8f640 Mon Sep 17 00:00:00 2001
From: Elizabeth Engelman <4752801+elizabethengelman@users.noreply.github.com>
Date: Wed, 13 Nov 2024 11:32:55 -0500
Subject: [PATCH 18/31] Fix/invoke view only (#1697)

* Use a default account if the tx is only being simulated

* Add a comment to get_matches_from for --help

* Update invoke_view_with_non_existent_source_account test
---
 .../tests/it/integration/hello_world.rs       |  4 +-
 .../src/commands/contract/arg_parsing.rs      |  3 +
 .../src/commands/contract/invoke.rs           | 62 ++++++++++++++-----
 3 files changed, 49 insertions(+), 20 deletions(-)

diff --git a/cmd/crates/soroban-test/tests/it/integration/hello_world.rs b/cmd/crates/soroban-test/tests/it/integration/hello_world.rs
index 272587c53..12963b1f4 100644
--- a/cmd/crates/soroban-test/tests/it/integration/hello_world.rs
+++ b/cmd/crates/soroban-test/tests/it/integration/hello_world.rs
@@ -20,9 +20,7 @@ async fn invoke_view_with_non_existent_source_account() {
     let id = deploy_hello(sandbox).await;
     let world = "world";
     let mut cmd = hello_world_cmd(&id, world);
-    cmd.config.source_account = Address::default();
-    cmd.is_view = true;
-    let res = sandbox.run_cmd_with(cmd, "test").await.unwrap();
+    let res = sandbox.run_cmd_with(cmd, "").await.unwrap();
     assert_eq!(res, TxnResult::Res(format!(r#"["Hello",{world:?}]"#)));
 }
 
diff --git a/cmd/soroban-cli/src/commands/contract/arg_parsing.rs b/cmd/soroban-cli/src/commands/contract/arg_parsing.rs
index 2eb3c2696..21fa2f383 100644
--- a/cmd/soroban-cli/src/commands/contract/arg_parsing.rs
+++ b/cmd/soroban-cli/src/commands/contract/arg_parsing.rs
@@ -62,6 +62,9 @@ pub fn build_host_function_parameters(
     }
     cmd.build();
     let long_help = cmd.render_long_help();
+
+    // get_matches_from exits the process if `help`, `--help` or `-h`are passed in the slop
+    // see clap documentation for more info: https://github.com/clap-rs/clap/blob/v4.1.8/src/builder/command.rs#L631
     let mut matches_ = cmd.get_matches_from(slop);
     let Some((function, matches_)) = &matches_.remove_subcommand() else {
         println!("{long_help}");
diff --git a/cmd/soroban-cli/src/commands/contract/invoke.rs b/cmd/soroban-cli/src/commands/contract/invoke.rs
index 5d43f9bfa..47e2699fc 100644
--- a/cmd/soroban-cli/src/commands/contract/invoke.rs
+++ b/cmd/soroban-cli/src/commands/contract/invoke.rs
@@ -7,7 +7,7 @@ use std::{fmt::Debug, fs, io};
 
 use clap::{arg, command, Parser, ValueEnum};
 
-use soroban_rpc::{SimulateHostFunctionResult, SimulateTransactionResponse};
+use soroban_rpc::{Client, SimulateHostFunctionResult, SimulateTransactionResponse};
 use soroban_spec::read::FromWasmError;
 
 use super::super::events;
@@ -163,7 +163,7 @@ impl Cmd {
             .transpose()
     }
 
-    fn send(&self, sim_res: &SimulateTransactionResponse) -> Result<ShouldSend, Error> {
+    fn should_send_tx(&self, sim_res: &SimulateTransactionResponse) -> Result<ShouldSend, Error> {
         Ok(match self.send {
             Send::Default => {
                 if self.is_view {
@@ -179,6 +179,28 @@ impl Cmd {
             Send::Yes => ShouldSend::Yes,
         })
     }
+
+    // uses a default account to check if the tx should be sent after the simulation
+    async fn should_send_after_sim(
+        &self,
+        host_function_params: InvokeContractArgs,
+        rpc_client: Client,
+    ) -> Result<ShouldSend, Error> {
+        let account_details = default_account_entry();
+        let sequence: i64 = account_details.seq_num.into();
+        let AccountId(PublicKey::PublicKeyTypeEd25519(account_id)) = account_details.account_id;
+
+        let tx = build_invoke_contract_tx(
+            host_function_params.clone(),
+            sequence + 1,
+            self.fee.fee,
+            account_id,
+        )?;
+        let txn = simulate_and_assemble_transaction(&rpc_client, &tx).await?;
+        let txn = self.fee.apply_to_assembled_txn(txn); // do we need this part?
+        let sim_res = txn.sim_response();
+        self.should_send_tx(sim_res)
+    }
 }
 
 #[async_trait::async_trait]
@@ -205,19 +227,6 @@ impl NetworkRunnable for Cmd {
             let _ = build_host_function_parameters(&contract_id, &self.slop, spec_entries, config)?;
         }
         let client = network.rpc_client()?;
-        let account_details = if self.is_view {
-            default_account_entry()
-        } else {
-            client
-                .verify_network_passphrase(Some(&network.network_passphrase))
-                .await?;
-
-            client
-                .get_account(&config.source_account()?.to_string())
-                .await?
-        };
-        let sequence: i64 = account_details.seq_num.into();
-        let AccountId(PublicKey::PublicKeyTypeEd25519(account_id)) = account_details.account_id;
 
         let spec_entries = get_remote_contract_spec(
             &contract_id.0,
@@ -229,9 +238,27 @@ impl NetworkRunnable for Cmd {
         .await
         .map_err(Error::from)?;
 
-        // Get the ledger footprint
         let (function, spec, host_function_params, signers) =
             build_host_function_parameters(&contract_id, &self.slop, &spec_entries, config)?;
+
+        let should_send_tx = self
+            .should_send_after_sim(host_function_params.clone(), client.clone())
+            .await?;
+
+        let account_details = if should_send_tx == ShouldSend::Yes {
+            client
+                .verify_network_passphrase(Some(&network.network_passphrase))
+                .await?;
+
+            client
+                .get_account(&config.source_account()?.to_string())
+                .await?
+        } else {
+            default_account_entry()
+        };
+        let sequence: i64 = account_details.seq_num.into();
+        let AccountId(PublicKey::PublicKeyTypeEd25519(account_id)) = account_details.account_id;
+
         let tx = build_invoke_contract_tx(
             host_function_params.clone(),
             sequence + 1,
@@ -250,7 +277,7 @@ impl NetworkRunnable for Cmd {
         if global_args.map_or(true, |a| !a.no_cache) {
             data::write(sim_res.clone().into(), &network.rpc_uri()?)?;
         }
-        let should_send = self.send(sim_res)?;
+        let should_send = self.should_send_tx(sim_res)?;
         let (return_value, events) = match should_send {
             ShouldSend::Yes => {
                 let global::Args { no_cache, .. } = global_args.cloned().unwrap_or_default();
@@ -365,6 +392,7 @@ pub enum Send {
     Yes,
 }
 
+#[derive(Debug, PartialEq)]
 enum ShouldSend {
     DefaultNo,
     No,

From bc49f4ca1a23a86ca92c7c483b57462682d8b987 Mon Sep 17 00:00:00 2001
From: Chad Ostrowski <221614+chadoh@users.noreply.github.com>
Date: Thu, 14 Nov 2024 16:24:15 -0500
Subject: [PATCH 19/31] feat(ts-bindings): update js stellar-sdk dep to 13.0.0
 (#1724)

---
 .../test_custom_types/package-lock.json       | 52 +++++++++++++-----
 .../fixtures/test_custom_types/package.json   |  2 +-
 .../src/project_template/package.json         |  2 +-
 .../ts-tests/package-lock.json                | 55 +++++++++++++------
 .../ts-tests/package.json                     |  2 +-
 5 files changed, 79 insertions(+), 34 deletions(-)

diff --git a/cmd/crates/soroban-spec-typescript/fixtures/test_custom_types/package-lock.json b/cmd/crates/soroban-spec-typescript/fixtures/test_custom_types/package-lock.json
index 454c8b964..a4e3759e2 100644
--- a/cmd/crates/soroban-spec-typescript/fixtures/test_custom_types/package-lock.json
+++ b/cmd/crates/soroban-spec-typescript/fixtures/test_custom_types/package-lock.json
@@ -8,7 +8,7 @@
       "name": "test_custom_types",
       "version": "0.0.0",
       "dependencies": {
-        "@stellar/stellar-sdk": "12.3.0",
+        "@stellar/stellar-sdk": "13.0.0",
         "buffer": "6.0.3"
       },
       "devDependencies": {
@@ -22,9 +22,9 @@
       "license": "Apache-2.0"
     },
     "node_modules/@stellar/stellar-base": {
-      "version": "12.1.1",
-      "resolved": "https://registry.npmjs.org/@stellar/stellar-base/-/stellar-base-12.1.1.tgz",
-      "integrity": "sha512-gOBSOFDepihslcInlqnxKZdIW9dMUO1tpOm3AtJR33K2OvpXG6SaVHCzAmCFArcCqI9zXTEiSoh70T48TmiHJA==",
+      "version": "13.0.1",
+      "resolved": "https://registry.npmjs.org/@stellar/stellar-base/-/stellar-base-13.0.1.tgz",
+      "integrity": "sha512-Xbd12mc9Oj/130Tv0URmm3wXG77XMshZtZ2yNCjqX5ZbMD5IYpbBs3DVCteLU/4SLj/Fnmhh1dzhrQXnk4r+pQ==",
       "license": "Apache-2.0",
       "dependencies": {
         "@stellar/js-xdr": "^3.1.2",
@@ -35,19 +35,20 @@
         "tweetnacl": "^1.0.3"
       },
       "optionalDependencies": {
-        "sodium-native": "^4.1.1"
+        "sodium-native": "^4.3.0"
       }
     },
     "node_modules/@stellar/stellar-sdk": {
-      "version": "12.3.0",
-      "resolved": "https://registry.npmjs.org/@stellar/stellar-sdk/-/stellar-sdk-12.3.0.tgz",
-      "integrity": "sha512-F2DYFop/M5ffXF0lvV5Ezjk+VWNKg0QDX8gNhwehVU3y5LYA3WAY6VcCarMGPaG9Wdgoeh1IXXzOautpqpsltw==",
+      "version": "13.0.0",
+      "resolved": "https://registry.npmjs.org/@stellar/stellar-sdk/-/stellar-sdk-13.0.0.tgz",
+      "integrity": "sha512-+wvmKi+XWwu27nLYTM17EgBdpbKohEkOfCIK4XKfsI4WpMXAqvnqSm98i9h5dAblNB+w8BJqzGs1JY0PtTGm4A==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@stellar/stellar-base": "^12.1.1",
+        "@stellar/stellar-base": "^13.0.1",
         "axios": "^1.7.7",
         "bignumber.js": "^9.1.2",
         "eventsource": "^2.0.2",
+        "feaxios": "^0.0.20",
         "randombytes": "^2.1.0",
         "toml": "^3.0.0",
         "urijs": "^1.19.1"
@@ -156,6 +157,15 @@
         "node": ">=12.0.0"
       }
     },
+    "node_modules/feaxios": {
+      "version": "0.0.20",
+      "resolved": "https://registry.npmjs.org/feaxios/-/feaxios-0.0.20.tgz",
+      "integrity": "sha512-g3hm2YDNffNxA3Re3Hd8ahbpmDee9Fv1Pb1C/NoWsjY7mtD8nyNeJytUzn+DK0Hyl9o6HppeWOrtnqgmhOYfWA==",
+      "license": "MIT",
+      "dependencies": {
+        "is-retry-allowed": "^3.0.0"
+      }
+    },
     "node_modules/follow-redirects": {
       "version": "1.15.9",
       "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.9.tgz",
@@ -214,6 +224,18 @@
       "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
       "license": "ISC"
     },
+    "node_modules/is-retry-allowed": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/is-retry-allowed/-/is-retry-allowed-3.0.0.tgz",
+      "integrity": "sha512-9xH0xvoggby+u0uGF7cZXdrutWiBiaFG8ZT4YFPXL8NzkyAwX3AKGLeFQLvzDpM430+nDFBZ1LHkie/8ocL06A==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "node_modules/mime-db": {
       "version": "1.52.0",
       "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz",
@@ -236,9 +258,9 @@
       }
     },
     "node_modules/node-gyp-build": {
-      "version": "4.8.2",
-      "resolved": "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-4.8.2.tgz",
-      "integrity": "sha512-IRUxE4BVsHWXkV/SFOut4qTlagw2aM8T5/vnTsmrHJvVoKueJHRc/JaFND7QDDc61kLYUJ6qlZM3sqTSyx2dTw==",
+      "version": "4.8.3",
+      "resolved": "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-4.8.3.tgz",
+      "integrity": "sha512-EMS95CMJzdoSKoIiXo8pxKoL8DYxwIZXYlLmgPb8KUv794abpnLK6ynsCAWNliOjREKruYKdzbh76HHYUHX7nw==",
       "license": "MIT",
       "optional": true,
       "bin": {
@@ -292,9 +314,9 @@
       }
     },
     "node_modules/sodium-native": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/sodium-native/-/sodium-native-4.3.0.tgz",
-      "integrity": "sha512-OcMgoS0NJx+4yVUlhvL9uZsVZfmyHZ2RpSXkiIoOHMglqvJDeGwn1rUigPrvcNTq3m9hPXtt6syxQbF3vvwmRQ==",
+      "version": "4.3.1",
+      "resolved": "https://registry.npmjs.org/sodium-native/-/sodium-native-4.3.1.tgz",
+      "integrity": "sha512-YdP64gAdpIKHfL4ttuX4aIfjeunh9f+hNeQJpE9C8UMndB3zkgZ7YmmGT4J2+v6Ibyp6Wem8D1TcSrtdW0bqtg==",
       "license": "MIT",
       "optional": true,
       "dependencies": {
diff --git a/cmd/crates/soroban-spec-typescript/fixtures/test_custom_types/package.json b/cmd/crates/soroban-spec-typescript/fixtures/test_custom_types/package.json
index a52979626..8c3762b91 100644
--- a/cmd/crates/soroban-spec-typescript/fixtures/test_custom_types/package.json
+++ b/cmd/crates/soroban-spec-typescript/fixtures/test_custom_types/package.json
@@ -8,7 +8,7 @@
     "build": "tsc"
   },
   "dependencies": {
-    "@stellar/stellar-sdk": "12.3.0",
+    "@stellar/stellar-sdk": "13.0.0",
     "buffer": "6.0.3"
   },
   "devDependencies": {
diff --git a/cmd/crates/soroban-spec-typescript/src/project_template/package.json b/cmd/crates/soroban-spec-typescript/src/project_template/package.json
index 1d7d48793..b5c6459e4 100644
--- a/cmd/crates/soroban-spec-typescript/src/project_template/package.json
+++ b/cmd/crates/soroban-spec-typescript/src/project_template/package.json
@@ -8,7 +8,7 @@
     "build": "tsc"
   },
   "dependencies": {
-    "@stellar/stellar-sdk": "12.3.0",
+    "@stellar/stellar-sdk": "13.0.0",
     "buffer": "6.0.3"
   },
   "devDependencies": {
diff --git a/cmd/crates/soroban-spec-typescript/ts-tests/package-lock.json b/cmd/crates/soroban-spec-typescript/ts-tests/package-lock.json
index dec6997a7..45cc97a67 100644
--- a/cmd/crates/soroban-spec-typescript/ts-tests/package-lock.json
+++ b/cmd/crates/soroban-spec-typescript/ts-tests/package-lock.json
@@ -7,7 +7,7 @@
       "hasInstallScript": true,
       "devDependencies": {
         "@ava/typescript": "^4.1.0",
-        "@stellar/stellar-sdk": "12.3.0",
+        "@stellar/stellar-sdk": "13.0.0",
         "@types/node": "^20.4.9",
         "@typescript-eslint/eslint-plugin": "^6.10.0",
         "@typescript-eslint/parser": "^6.10.0",
@@ -206,9 +206,9 @@
       "license": "Apache-2.0"
     },
     "node_modules/@stellar/stellar-base": {
-      "version": "12.1.1",
-      "resolved": "https://registry.npmjs.org/@stellar/stellar-base/-/stellar-base-12.1.1.tgz",
-      "integrity": "sha512-gOBSOFDepihslcInlqnxKZdIW9dMUO1tpOm3AtJR33K2OvpXG6SaVHCzAmCFArcCqI9zXTEiSoh70T48TmiHJA==",
+      "version": "13.0.1",
+      "resolved": "https://registry.npmjs.org/@stellar/stellar-base/-/stellar-base-13.0.1.tgz",
+      "integrity": "sha512-Xbd12mc9Oj/130Tv0URmm3wXG77XMshZtZ2yNCjqX5ZbMD5IYpbBs3DVCteLU/4SLj/Fnmhh1dzhrQXnk4r+pQ==",
       "dev": true,
       "license": "Apache-2.0",
       "dependencies": {
@@ -220,20 +220,21 @@
         "tweetnacl": "^1.0.3"
       },
       "optionalDependencies": {
-        "sodium-native": "^4.1.1"
+        "sodium-native": "^4.3.0"
       }
     },
     "node_modules/@stellar/stellar-sdk": {
-      "version": "12.3.0",
-      "resolved": "https://registry.npmjs.org/@stellar/stellar-sdk/-/stellar-sdk-12.3.0.tgz",
-      "integrity": "sha512-F2DYFop/M5ffXF0lvV5Ezjk+VWNKg0QDX8gNhwehVU3y5LYA3WAY6VcCarMGPaG9Wdgoeh1IXXzOautpqpsltw==",
+      "version": "13.0.0",
+      "resolved": "https://registry.npmjs.org/@stellar/stellar-sdk/-/stellar-sdk-13.0.0.tgz",
+      "integrity": "sha512-+wvmKi+XWwu27nLYTM17EgBdpbKohEkOfCIK4XKfsI4WpMXAqvnqSm98i9h5dAblNB+w8BJqzGs1JY0PtTGm4A==",
       "dev": true,
       "license": "Apache-2.0",
       "dependencies": {
-        "@stellar/stellar-base": "^12.1.1",
+        "@stellar/stellar-base": "^13.0.1",
         "axios": "^1.7.7",
         "bignumber.js": "^9.1.2",
         "eventsource": "^2.0.2",
+        "feaxios": "^0.0.20",
         "randombytes": "^2.1.0",
         "toml": "^3.0.0",
         "urijs": "^1.19.1"
@@ -1590,6 +1591,16 @@
         "reusify": "^1.0.4"
       }
     },
+    "node_modules/feaxios": {
+      "version": "0.0.20",
+      "resolved": "https://registry.npmjs.org/feaxios/-/feaxios-0.0.20.tgz",
+      "integrity": "sha512-g3hm2YDNffNxA3Re3Hd8ahbpmDee9Fv1Pb1C/NoWsjY7mtD8nyNeJytUzn+DK0Hyl9o6HppeWOrtnqgmhOYfWA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "is-retry-allowed": "^3.0.0"
+      }
+    },
     "node_modules/figures": {
       "version": "5.0.0",
       "resolved": "https://registry.npmjs.org/figures/-/figures-5.0.0.tgz",
@@ -2040,6 +2051,19 @@
       "integrity": "sha512-hvpoI6korhJMnej285dSg6nu1+e6uxs7zG3BYAm5byqDsgJNWwxzM6z6iZiAgQR4TJ30JmBTOwqZUw3WlyH3AQ==",
       "dev": true
     },
+    "node_modules/is-retry-allowed": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/is-retry-allowed/-/is-retry-allowed-3.0.0.tgz",
+      "integrity": "sha512-9xH0xvoggby+u0uGF7cZXdrutWiBiaFG8ZT4YFPXL8NzkyAwX3AKGLeFQLvzDpM430+nDFBZ1LHkie/8ocL06A==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "node_modules/is-stream": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-3.0.0.tgz",
@@ -2316,9 +2340,9 @@
       "dev": true
     },
     "node_modules/node-gyp-build": {
-      "version": "4.8.2",
-      "resolved": "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-4.8.2.tgz",
-      "integrity": "sha512-IRUxE4BVsHWXkV/SFOut4qTlagw2aM8T5/vnTsmrHJvVoKueJHRc/JaFND7QDDc61kLYUJ6qlZM3sqTSyx2dTw==",
+      "version": "4.8.3",
+      "resolved": "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-4.8.3.tgz",
+      "integrity": "sha512-EMS95CMJzdoSKoIiXo8pxKoL8DYxwIZXYlLmgPb8KUv794abpnLK6ynsCAWNliOjREKruYKdzbh76HHYUHX7nw==",
       "dev": true,
       "license": "MIT",
       "optional": true,
@@ -2983,11 +3007,10 @@
       }
     },
     "node_modules/sodium-native": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/sodium-native/-/sodium-native-4.2.0.tgz",
-      "integrity": "sha512-rdJRAf/RE/IRFUUoUsz10slNAQDTGz5ChpIeR1Ti0BtGYstl6Uok4hHALPBdnFcLml6qXJ2pDd0/De09mPa6mg==",
+      "version": "4.3.1",
+      "resolved": "https://registry.npmjs.org/sodium-native/-/sodium-native-4.3.1.tgz",
+      "integrity": "sha512-YdP64gAdpIKHfL4ttuX4aIfjeunh9f+hNeQJpE9C8UMndB3zkgZ7YmmGT4J2+v6Ibyp6Wem8D1TcSrtdW0bqtg==",
       "dev": true,
-      "hasInstallScript": true,
       "license": "MIT",
       "optional": true,
       "dependencies": {
diff --git a/cmd/crates/soroban-spec-typescript/ts-tests/package.json b/cmd/crates/soroban-spec-typescript/ts-tests/package.json
index 69a17eb5c..a8bb3c1ff 100644
--- a/cmd/crates/soroban-spec-typescript/ts-tests/package.json
+++ b/cmd/crates/soroban-spec-typescript/ts-tests/package.json
@@ -8,7 +8,7 @@
   },
   "devDependencies": {
     "@ava/typescript": "^4.1.0",
-    "@stellar/stellar-sdk": "12.3.0",
+    "@stellar/stellar-sdk": "13.0.0",
     "@types/node": "^20.4.9",
     "@typescript-eslint/eslint-plugin": "^6.10.0",
     "@typescript-eslint/parser": "^6.10.0",

From b37da02841fa4c31c71ed4064bae1c312599d8b4 Mon Sep 17 00:00:00 2001
From: Willem Wyndham <willem@ahalabs.dev>
Date: Thu, 14 Nov 2024 19:31:16 -0500
Subject: [PATCH 20/31] fix: Add ContractAddress type to consolidate contract
 id parsing with aliases (#1692)

* fix: resolve contract id

* refactor: Refactor contract ID handling in Args module.
---
 Cargo.lock                                    | 38 ++++++++--------
 FULL_HELP_DOCS.md                             |  8 ++--
 .../tests/it/integration/hello_world.rs       |  2 +-
 .../src/commands/contract/alias/add.rs        |  8 ++--
 .../src/commands/contract/fetch.rs            | 10 ++++-
 .../src/commands/contract/info/shared.rs      | 14 +++---
 .../src/commands/contract/invoke.rs           |  7 ++-
 cmd/soroban-cli/src/commands/events.rs        |  7 ++-
 cmd/soroban-cli/src/config/alias.rs           | 43 ++++++++++++++++++-
 cmd/soroban-cli/src/config/locator.rs         | 25 ++++++-----
 cmd/soroban-cli/src/config/mod.rs             |  2 +
 cmd/soroban-cli/src/key.rs                    | 11 +++--
 cmd/soroban-cli/src/wasm.rs                   |  8 +---
 13 files changed, 118 insertions(+), 65 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 4d3cc0c78..82b62d2e3 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1701,9 +1701,9 @@ dependencies = [
 
 [[package]]
 name = "futures-channel"
-version = "0.3.31"
+version = "0.3.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2dff15bf788c671c1934e366d07e30c1814a8ef514e1af724a602e8a2fbe1b10"
+checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78"
 dependencies = [
  "futures-core",
  "futures-sink",
@@ -1711,9 +1711,9 @@ dependencies = [
 
 [[package]]
 name = "futures-core"
-version = "0.3.31"
+version = "0.3.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "05f29059c0c2090612e8d742178b0580d2dc940c837851ad723096f87af6663e"
+checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d"
 
 [[package]]
 name = "futures-executor"
@@ -1728,9 +1728,9 @@ dependencies = [
 
 [[package]]
 name = "futures-io"
-version = "0.3.31"
+version = "0.3.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9e5c1b78ca4aae1ac06c48a526a655760685149f0d465d21f37abfe57ce075c6"
+checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1"
 
 [[package]]
 name = "futures-lite"
@@ -1762,9 +1762,9 @@ dependencies = [
 
 [[package]]
 name = "futures-macro"
-version = "0.3.31"
+version = "0.3.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650"
+checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1773,21 +1773,21 @@ dependencies = [
 
 [[package]]
 name = "futures-sink"
-version = "0.3.31"
+version = "0.3.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e575fab7d1e0dcb8d0c7bcf9a63ee213816ab51902e6d244a95819acacf1d4f7"
+checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5"
 
 [[package]]
 name = "futures-task"
-version = "0.3.31"
+version = "0.3.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f90f7dce0722e95104fcb095585910c0977252f286e354b5e3bd38902cd99988"
+checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004"
 
 [[package]]
 name = "futures-util"
-version = "0.3.31"
+version = "0.3.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9fa08315bb612088cc391249efdc3bc77536f16c91f6cf495e6fbe85b20a4a81"
+checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48"
 dependencies = [
  "futures-channel",
  "futures-core",
@@ -3013,11 +3013,11 @@ dependencies = [
 
 [[package]]
 name = "openssl"
-version = "0.10.68"
+version = "0.10.55"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6174bc48f102d208783c2c84bf931bb75927a617866870de8a4ea85597f871f5"
+checksum = "345df152bc43501c5eb9e4654ff05f794effb78d4efe3d53abc158baddc0703d"
 dependencies = [
- "bitflags 2.6.0",
+ "bitflags 1.3.2",
  "cfg-if",
  "foreign-types",
  "libc",
@@ -3045,9 +3045,9 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf"
 
 [[package]]
 name = "openssl-sys"
-version = "0.9.104"
+version = "0.9.103"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "45abf306cbf99debc8195b66b7346498d7b10c210de50418b5ccd7ceba08c741"
+checksum = "7f9e8deee91df40a943c71b917e5874b951d32a802526c85721ce3b776c929d6"
 dependencies = [
  "cc",
  "libc",
diff --git a/FULL_HELP_DOCS.md b/FULL_HELP_DOCS.md
index c7cd9c56c..6bf321246 100644
--- a/FULL_HELP_DOCS.md
+++ b/FULL_HELP_DOCS.md
@@ -198,7 +198,7 @@ Add contract alias
 
 ###### **Arguments:**
 
-* `<ALIAS>` — The contract alias that will be removed
+* `<ALIAS>` — The contract alias that will be used
 
 ###### **Options:**
 
@@ -522,7 +522,7 @@ Outputs no data when no data is present in the contract.
 
 * `--wasm <WASM>` — Wasm file to extract the data from
 * `--wasm-hash <WASM_HASH>` — Wasm hash to get the data for
-* `--id <CONTRACT_ID>` — Contract id to get the data for
+* `--id <CONTRACT_ID>` — Contract id or contract alias to get the data for
 * `--rpc-url <RPC_URL>` — RPC server endpoint
 * `--rpc-header <RPC_HEADERS>` — RPC Header(s) to include in requests to the RPC provider
 * `--network-passphrase <NETWORK_PASSPHRASE>` — Network passphrase to sign the transaction sent to the rpc server
@@ -562,7 +562,7 @@ Outputs no data when no data is present in the contract.
 
 * `--wasm <WASM>` — Wasm file to extract the data from
 * `--wasm-hash <WASM_HASH>` — Wasm hash to get the data for
-* `--id <CONTRACT_ID>` — Contract id to get the data for
+* `--id <CONTRACT_ID>` — Contract id or contract alias to get the data for
 * `--rpc-url <RPC_URL>` — RPC server endpoint
 * `--rpc-header <RPC_HEADERS>` — RPC Header(s) to include in requests to the RPC provider
 * `--network-passphrase <NETWORK_PASSPHRASE>` — Network passphrase to sign the transaction sent to the rpc server
@@ -602,7 +602,7 @@ Outputs no data when no data is present in the contract.
 
 * `--wasm <WASM>` — Wasm file to extract the data from
 * `--wasm-hash <WASM_HASH>` — Wasm hash to get the data for
-* `--id <CONTRACT_ID>` — Contract id to get the data for
+* `--id <CONTRACT_ID>` — Contract id or contract alias to get the data for
 * `--rpc-url <RPC_URL>` — RPC server endpoint
 * `--rpc-header <RPC_HEADERS>` — RPC Header(s) to include in requests to the RPC provider
 * `--network-passphrase <NETWORK_PASSPHRASE>` — Network passphrase to sign the transaction sent to the rpc server
diff --git a/cmd/crates/soroban-test/tests/it/integration/hello_world.rs b/cmd/crates/soroban-test/tests/it/integration/hello_world.rs
index 12963b1f4..a6bd00c91 100644
--- a/cmd/crates/soroban-test/tests/it/integration/hello_world.rs
+++ b/cmd/crates/soroban-test/tests/it/integration/hello_world.rs
@@ -159,7 +159,7 @@ pub(crate) fn invoke_hello_world(sandbox: &TestEnv, id: &str) {
 
 fn hello_world_cmd(id: &str, arg: &str) -> contract::invoke::Cmd {
     contract::invoke::Cmd {
-        contract_id: id.to_string(),
+        contract_id: id.parse().unwrap(),
         slop: vec!["hello".into(), format!("--world={arg}").into()],
         ..Default::default()
     }
diff --git a/cmd/soroban-cli/src/commands/contract/alias/add.rs b/cmd/soroban-cli/src/commands/contract/alias/add.rs
index 5a7a17ddb..923ead5e9 100644
--- a/cmd/soroban-cli/src/commands/contract/alias/add.rs
+++ b/cmd/soroban-cli/src/commands/contract/alias/add.rs
@@ -13,9 +13,9 @@ pub struct Cmd {
     pub config_locator: locator::Args,
 
     #[command(flatten)]
-    network: network::Args,
+    pub network: network::Args,
 
-    /// The contract alias that will be removed.
+    /// The contract alias that will be used.
     pub alias: String,
 
     /// Overwrite the contract alias if it already exists.
@@ -41,7 +41,7 @@ pub enum Error {
     AlreadyExist {
         alias: String,
         network_passphrase: String,
-        contract: String,
+        contract: stellar_strkey::Contract,
     },
 }
 
@@ -57,7 +57,7 @@ impl Cmd {
             .get_contract_id(&self.alias, network_passphrase)?;
 
         if let Some(contract) = contract {
-            if contract != self.contract_id.to_string() && !self.overwrite {
+            if contract != self.contract_id && !self.overwrite {
                 return Err(Error::AlreadyExist {
                     alias: alias.to_string(),
                     network_passphrase: network_passphrase.to_string(),
diff --git a/cmd/soroban-cli/src/commands/contract/fetch.rs b/cmd/soroban-cli/src/commands/contract/fetch.rs
index 2714b1f07..31ed191ff 100644
--- a/cmd/soroban-cli/src/commands/contract/fetch.rs
+++ b/cmd/soroban-cli/src/commands/contract/fetch.rs
@@ -22,7 +22,7 @@ use crate::{
 pub struct Cmd {
     /// Contract ID to fetch
     #[arg(long = "id", env = "STELLAR_CONTRACT_ID")]
-    pub contract_id: String,
+    pub contract_id: config::ContractAddress,
     /// Where to write output otherwise stdout is used
     #[arg(long, short = 'o')]
     pub out_file: Option<std::path::PathBuf>,
@@ -111,6 +111,12 @@ impl NetworkRunnable for Cmd {
         config: Option<&config::Args>,
     ) -> Result<Vec<u8>, Error> {
         let network = config.map_or_else(|| self.network(), |c| Ok(c.get_network()?))?;
-        return Ok(wasm::fetch_from_contract(&self.contract_id, &network, &self.locator).await?);
+        Ok(wasm::fetch_from_contract(
+            &self
+                .contract_id
+                .resolve_contract_id(&self.locator, &network.network_passphrase)?,
+            &network,
+        )
+        .await?)
     }
 }
diff --git a/cmd/soroban-cli/src/commands/contract/info/shared.rs b/cmd/soroban-cli/src/commands/contract/info/shared.rs
index b34ec7da8..33a95b607 100644
--- a/cmd/soroban-cli/src/commands/contract/info/shared.rs
+++ b/cmd/soroban-cli/src/commands/contract/info/shared.rs
@@ -1,13 +1,13 @@
 use std::path::PathBuf;
 
-use crate::xdr;
 use clap::arg;
 
 use crate::{
     commands::contract::info::shared::Error::InvalidWasmHash,
-    config::{locator, network},
+    config::{self, locator, network},
     utils::rpc::get_remote_wasm_from_hash,
     wasm::{self, Error::ContractIsStellarAsset},
+    xdr,
 };
 
 #[derive(Debug, clap::Args, Clone, Default)]
@@ -24,9 +24,9 @@ pub struct Args {
     /// Wasm hash to get the data for
     #[arg(long = "wasm-hash", group = "Source")]
     pub wasm_hash: Option<String>,
-    /// Contract id to get the data for
+    /// Contract id or contract alias to get the data for
     #[arg(long = "id", env = "STELLAR_CONTRACT_ID", group = "Source")]
-    pub contract_id: Option<String>,
+    pub contract_id: Option<config::ContractAddress>,
     #[command(flatten)]
     pub network: network::Args,
     #[command(flatten)]
@@ -56,6 +56,8 @@ pub enum Error {
     InvalidWasmHash(String),
     #[error(transparent)]
     Rpc(#[from] soroban_rpc::Error),
+    #[error(transparent)]
+    Locator(#[from] locator::Error),
 }
 
 pub async fn fetch_wasm(args: &Args) -> Result<Option<Vec<u8>>, Error> {
@@ -84,7 +86,9 @@ pub async fn fetch_wasm(args: &Args) -> Result<Option<Vec<u8>>, Error> {
 
         get_remote_wasm_from_hash(&client, &hash).await?
     } else if let Some(contract_id) = &args.contract_id {
-        let res = wasm::fetch_from_contract(contract_id, network, &args.locator).await;
+        let contract_id =
+            contract_id.resolve_contract_id(&args.locator, &network.network_passphrase)?;
+        let res = wasm::fetch_from_contract(&contract_id, network).await;
         if let Some(ContractIsStellarAsset) = res.as_ref().err() {
             return Ok(None);
         }
diff --git a/cmd/soroban-cli/src/commands/contract/invoke.rs b/cmd/soroban-cli/src/commands/contract/invoke.rs
index 47e2699fc..04eeaebd6 100644
--- a/cmd/soroban-cli/src/commands/contract/invoke.rs
+++ b/cmd/soroban-cli/src/commands/contract/invoke.rs
@@ -40,7 +40,7 @@ use soroban_spec_tools::contract;
 pub struct Cmd {
     /// Contract ID to invoke
     #[arg(long = "id", env = "STELLAR_CONTRACT_ID")]
-    pub contract_id: String,
+    pub contract_id: config::ContractAddress,
     // For testing only
     #[arg(skip)]
     pub wasm: Option<std::path::PathBuf>,
@@ -217,9 +217,8 @@ impl NetworkRunnable for Cmd {
         let network = config.get_network()?;
         tracing::trace!(?network);
         let contract_id = self
-            .config
-            .locator
-            .resolve_contract_id(&self.contract_id, &network.network_passphrase)?;
+            .contract_id
+            .resolve_contract_id(&config.locator, &network.network_passphrase)?;
 
         let spec_entries = self.spec_entries()?;
         if let Some(spec_entries) = &spec_entries {
diff --git a/cmd/soroban-cli/src/commands/events.rs b/cmd/soroban-cli/src/commands/events.rs
index a1f5de921..48d79c1b7 100644
--- a/cmd/soroban-cli/src/commands/events.rs
+++ b/cmd/soroban-cli/src/commands/events.rs
@@ -42,7 +42,7 @@ pub struct Cmd {
         num_args = 1..=6,
         help_heading = "FILTERS"
     )]
-    contract_ids: Vec<String>,
+    contract_ids: Vec<config::ContractAddress>,
     /// A set of (up to 4) topic filters to filter event topics on. A single
     /// topic filter can contain 1-4 different segment filters, separated by
     /// commas, with an asterisk (`*` character) indicating a wildcard segment.
@@ -218,9 +218,8 @@ impl NetworkRunnable for Cmd {
             .contract_ids
             .iter()
             .map(|id| {
-                Ok(self
-                    .locator
-                    .resolve_contract_id(id, &network.network_passphrase)?
+                Ok(id
+                    .resolve_contract_id(&self.locator, &network.network_passphrase)?
                     .to_string())
             })
             .collect::<Result<Vec<_>, Error>>()?;
diff --git a/cmd/soroban-cli/src/config/alias.rs b/cmd/soroban-cli/src/config/alias.rs
index 68ad556d6..9d1d8c11b 100644
--- a/cmd/soroban-cli/src/config/alias.rs
+++ b/cmd/soroban-cli/src/config/alias.rs
@@ -1,8 +1,49 @@
-use std::collections::HashMap;
+use std::{collections::HashMap, convert::Infallible, str::FromStr};
 
 use serde::{Deserialize, Serialize};
 
+use super::locator;
+
 #[derive(Serialize, Deserialize, Default)]
 pub struct Data {
     pub ids: HashMap<String, String>,
 }
+
+/// Address can be either a contract address, C.. or eventually an alias of a contract address.
+#[derive(Clone, Debug)]
+pub enum ContractAddress {
+    ContractId(stellar_strkey::Contract),
+    Alias(String),
+}
+
+impl Default for ContractAddress {
+    fn default() -> Self {
+        ContractAddress::Alias(String::default())
+    }
+}
+
+impl FromStr for ContractAddress {
+    type Err = Infallible;
+
+    fn from_str(value: &str) -> Result<Self, Self::Err> {
+        Ok(stellar_strkey::Contract::from_str(value).map_or_else(
+            |_| ContractAddress::Alias(value.to_string()),
+            ContractAddress::ContractId,
+        ))
+    }
+}
+
+impl ContractAddress {
+    pub fn resolve_contract_id(
+        &self,
+        locator: &locator::Args,
+        network_passphrase: &str,
+    ) -> Result<stellar_strkey::Contract, locator::Error> {
+        match self {
+            ContractAddress::ContractId(muxed_account) => Ok(*muxed_account),
+            ContractAddress::Alias(alias) => locator
+                .get_contract_id(alias, network_passphrase)?
+                .ok_or_else(|| locator::Error::ContractNotFound(alias.to_owned())),
+        }
+    }
+}
diff --git a/cmd/soroban-cli/src/config/locator.rs b/cmd/soroban-cli/src/config/locator.rs
index 60b7856a6..8f51975a1 100644
--- a/cmd/soroban-cli/src/config/locator.rs
+++ b/cmd/soroban-cli/src/config/locator.rs
@@ -76,6 +76,8 @@ pub enum Error {
     CannotAccessAliasConfigFile,
     #[error("cannot parse contract ID {0}: {1}")]
     CannotParseContractId(String, DecodeError),
+    #[error("contract not found: {0}")]
+    ContractNotFound(String),
     #[error("Failed to read upgrade check file: {path}: {error}")]
     UpgradeCheckReadFailed { path: PathBuf, error: io::Error },
     #[error("Failed to write upgrade check file: {path}: {error}")]
@@ -332,12 +334,17 @@ impl Args {
         &self,
         alias: &str,
         network_passphrase: &str,
-    ) -> Result<Option<String>, Error> {
+    ) -> Result<Option<Contract>, Error> {
         let Some(alias_data) = self.load_contract_from_alias(alias)? else {
             return Ok(None);
         };
 
-        Ok(alias_data.ids.get(network_passphrase).cloned())
+        alias_data
+            .ids
+            .get(network_passphrase)
+            .map(|id| id.parse())
+            .transpose()
+            .map_err(|e| Error::CannotParseContractId(alias.to_owned(), e))
     }
 
     pub fn resolve_contract_id(
@@ -345,14 +352,12 @@ impl Args {
         alias_or_contract_id: &str,
         network_passphrase: &str,
     ) -> Result<Contract, Error> {
-        let contract_id = self
-            .get_contract_id(alias_or_contract_id, network_passphrase)?
-            .unwrap_or_else(|| alias_or_contract_id.to_string());
-
-        Ok(Contract(
-            soroban_spec_tools::utils::contract_id_from_str(&contract_id)
-                .map_err(|e| Error::CannotParseContractId(contract_id.clone(), e))?,
-        ))
+        let Some(contract) = self.get_contract_id(alias_or_contract_id, network_passphrase)? else {
+            return alias_or_contract_id
+                .parse()
+                .map_err(|e| Error::CannotParseContractId(alias_or_contract_id.to_owned(), e));
+        };
+        Ok(contract)
     }
 }
 
diff --git a/cmd/soroban-cli/src/config/mod.rs b/cmd/soroban-cli/src/config/mod.rs
index 11eb179ee..6cd9b4d71 100644
--- a/cmd/soroban-cli/src/config/mod.rs
+++ b/cmd/soroban-cli/src/config/mod.rs
@@ -23,6 +23,8 @@ pub mod secret;
 pub mod sign_with;
 pub mod upgrade_check;
 
+pub use alias::ContractAddress;
+
 #[derive(thiserror::Error, Debug)]
 pub enum Error {
     #[error(transparent)]
diff --git a/cmd/soroban-cli/src/key.rs b/cmd/soroban-cli/src/key.rs
index 3f4dcaf7c..b704541c4 100644
--- a/cmd/soroban-cli/src/key.rs
+++ b/cmd/soroban-cli/src/key.rs
@@ -4,7 +4,7 @@ use crate::xdr::{
 };
 use crate::{
     commands::contract::Durability,
-    config::{locator, network::Network},
+    config::{alias, locator, network::Network},
     wasm,
 };
 use clap::arg;
@@ -34,7 +34,7 @@ pub struct Args {
         required_unless_present = "wasm",
         required_unless_present = "wasm_hash"
     )]
-    pub contract_id: Option<String>,
+    pub contract_id: Option<alias::ContractAddress>,
     /// Storage key (symbols only)
     #[arg(long = "key", conflicts_with = "key_xdr")]
     pub key: Option<Vec<String>>,
@@ -97,8 +97,11 @@ impl Args {
         } else {
             vec![ScVal::LedgerKeyContractInstance]
         };
-        let contract =
-            locator.resolve_contract_id(self.contract_id.as_ref().unwrap(), network_passphrase)?;
+        let contract = self
+            .contract_id
+            .as_ref()
+            .unwrap()
+            .resolve_contract_id(locator, network_passphrase)?;
 
         Ok(keys
             .into_iter()
diff --git a/cmd/soroban-cli/src/wasm.rs b/cmd/soroban-cli/src/wasm.rs
index 5f0ed3b5c..a907e021a 100644
--- a/cmd/soroban-cli/src/wasm.rs
+++ b/cmd/soroban-cli/src/wasm.rs
@@ -121,16 +121,10 @@ pub fn len(p: &Path) -> Result<u64, Error> {
 }
 
 pub async fn fetch_from_contract(
-    contract_id: &str,
+    stellar_strkey::Contract(contract_id): &stellar_strkey::Contract,
     network: &Network,
-    locator: &locator::Args,
 ) -> Result<Vec<u8>, Error> {
     tracing::trace!(?network);
-
-    let contract_id = &locator
-        .resolve_contract_id(contract_id, &network.network_passphrase)?
-        .0;
-
     let client = network.rpc_client()?;
     client
         .verify_network_passphrase(Some(&network.network_passphrase))

From 355905df40285855f144cf66f95ff092abe45903 Mon Sep 17 00:00:00 2001
From: Nando Vieira <me@fnando.com>
Date: Fri, 15 Nov 2024 14:46:40 -0800
Subject: [PATCH 21/31] Generate windows installer. (#1726)

---
 .github/workflows/binaries.yml |  71 ++++++++++++++++++++++++-
 installer.iss                  |  94 +++++++++++++++++++++++++++++++++
 stellar.ico                    | Bin 0 -> 11166 bytes
 3 files changed, 163 insertions(+), 2 deletions(-)
 create mode 100644 installer.iss
 create mode 100644 stellar.ico

diff --git a/.github/workflows/binaries.yml b/.github/workflows/binaries.yml
index 25cea7366..985f91fa5 100644
--- a/.github/workflows/binaries.yml
+++ b/.github/workflows/binaries.yml
@@ -34,7 +34,7 @@ jobs:
             target: aarch64-unknown-linux-gnu
           - os: macos-14
             target: aarch64-apple-darwin
-          - os: macos-12
+          - os: macos-14
             target: x86_64-apple-darwin
           - os: windows-latest
             target: x86_64-pc-windows-msvc
@@ -44,41 +44,50 @@ jobs:
     - uses: actions/checkout@v4
     - run: rustup update
     - run: rustup target add ${{ matrix.sys.target }}
+
     - if: matrix.sys.target == 'aarch64-unknown-linux-gnu'
       run: sudo apt-get update && sudo apt-get -y install gcc-aarch64-linux-gnu g++-aarch64-linux-gnu libudev-dev
+
     - name: Setup vars
       run: |
         version="$(cargo metadata --format-version 1 --no-deps | jq -r '.packages[] | select(.name == "stellar-cli") | .version')"
         echo "VERSION=${version}" >> $GITHUB_ENV
         echo "NAME=${{ matrix.crate.name }}-${version}-${{ matrix.sys.target }}" >> $GITHUB_ENV
+
     - name: Package (release only)
       if: github.event_name == 'release'
       run: cargo package --no-verify --package ${{ matrix.crate.name }}
+
     - name: Package Extract (release only)
       if: github.event_name == 'release'
       run: |
         cd target/package
         tar xvfz ${{ matrix.crate.name }}-$VERSION.crate
         echo "BUILD_WORKING_DIR=target/package/${{ matrix.crate.name }}-$VERSION" >> $GITHUB_ENV
+
     - name: Build
       env:
         CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_LINKER: aarch64-linux-gnu-gcc
       working-directory: ${{ env.BUILD_WORKING_DIR }}
       run: cargo build --target-dir="$GITHUB_WORKSPACE/target" --package ${{ matrix.crate.name }} --features opt --release --target ${{ matrix.sys.target }}
+
     - name: Build provenance for attestation (release only)
       if: github.event_name == 'release'
       uses: actions/attest-build-provenance@v1
       with:
         subject-path: target/${{ matrix.sys.target }}/release/${{ matrix.crate.binary }}${{ matrix.sys.ext }}
+
     - name: Compress
       run: |
           cd target/${{ matrix.sys.target }}/release
           tar czvf $NAME.tar.gz ${{ matrix.crate.binary }}${{ matrix.sys.ext }}
+
     - name: Upload to Artifacts
       uses: actions/upload-artifact@v4
       with:
-        name: ${{ env.NAME }}
+        name: ${{ env.NAME }}.tar.gz
         path: 'target/${{ matrix.sys.target }}/release/${{ env.NAME }}.tar.gz'
+
     - name: Upload to Release (release only)
       if: github.event_name == 'release'
       uses: actions/github-script@v7
@@ -92,3 +101,61 @@ jobs:
             name: '${{ env.NAME }}.tar.gz',
             data: fs.readFileSync('target/${{ matrix.sys.target }}/release/${{ env.NAME }}.tar.gz'),
           });
+
+  installer:
+    needs: build
+    runs-on: windows-latest
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Setup vars
+        run: |
+          version="$(cargo metadata --format-version 1 --no-deps | jq -r '.packages[] | select(.name == "stellar-cli") | .version')"
+          installer_basename="stellar-cli-installer-${version}-x86_64-pc-windows-msvc"
+          echo "VERSION=${version}" >> $GITHUB_ENV
+          echo "STELLAR_CLI_INSTALLER_BASENAME=${installer_basename}" >> $GITHUB_ENV
+          echo "STELLAR_CLI_INSTALLER=${installer_basename}.exe" >> $GITHUB_ENV
+          echo "ARTIFACT_NAME=stellar-cli-${version}-x86_64-pc-windows-msvc.tar.gz" >> $GITHUB_ENV
+
+      - name: Download Artifact
+        uses: actions/download-artifact@v4
+        with:
+          name: ${{ env.ARTIFACT_NAME }}
+
+      - name: Uncompress Artifact
+        run: tar xvf ${{ env.ARTIFACT_NAME }}
+
+      - name: Build Installer
+        shell: powershell
+        run: |
+          $Env:Path += ";C:\Users\$Env:UserName\AppData\Local\Programs\Inno Setup 6"
+          $Env:STELLAR_CLI_VERSION = "${{ env.VERSION }}"
+          ISCC.exe installer.iss
+
+      - name: Build provenance for attestation (release only)
+        if: github.event_name == 'release'
+        uses: actions/attest-build-provenance@v1
+        with:
+          subject-path: ${{ env.STELLAR_CLI_INSTALLER }}
+
+      - name: Upload Artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: ${{ env.STELLAR_CLI_INSTALLER }}
+          path: Output/stellar-installer.exe
+
+      - name: Upload to Release (release only)
+        if: github.event_name == 'release'
+        uses: actions/github-script@v7
+        with:
+          script: |
+            const fs = require('fs');
+            await github.rest.repos.uploadReleaseAsset({
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              release_id: ${{ github.event.release.id }},
+              name: '${{ env.STELLAR_CLI_INSTALLER }}',
+              data: fs.readFileSync('Output/stellar-installer.exe'),
+            });
+
diff --git a/installer.iss b/installer.iss
new file mode 100644
index 000000000..895740ccb
--- /dev/null
+++ b/installer.iss
@@ -0,0 +1,94 @@
+#define STELLAR_CLI_VERSION GetEnv("STELLAR_CLI_VERSION")
+#define STELLAR_CLI_INSTALLER GetEnv("STELLAR_CLI_INSTALLER")
+
+[Setup]
+AppName=Stellar CLI
+AppVersion={#STELLAR_CLI_VERSION}
+DefaultDirName={commonpf}\Stellar CLI
+DefaultGroupName=Stellar CLI
+OutputBaseFilename=stellar-installer
+PrivilegesRequired=admin
+LicenseFile=LICENSE
+UninstallDisplayIcon={app}\stellar.ico
+Compression=lzma
+SolidCompression=yes
+ChangesEnvironment=yes
+
+[Files]
+Source: "stellar.exe"; DestDir: "{app}"
+Source: "stellar.ico"; DestDir: "{app}"
+Source: "LICENSE"; DestDir: "{app}"; Flags: ignoreversion
+
+[Icons]
+; Windows optimizes start menu, and removes the uninstall entry. Unless we
+; specify it twice. 🫠
+Name: "{group}\Uninstall Stellar CLI"; Filename: "{uninstallexe}"
+Name: "{group}\Uninstall Stellar CLI"; Filename: "{uninstallexe}"
+Name: "{group}\Stellar Developer Docs"; Filename: "https://stellar.org/docs"
+
+[Code]
+const EnvironmentKey = 'SYSTEM\CurrentControlSet\Control\Session Manager\Environment';
+
+procedure EnvAddPath(Path: string);
+var
+    Paths: string;
+begin
+    { Retrieve current path (use empty string if entry not exists) }
+    if not RegQueryStringValue(HKEY_LOCAL_MACHINE, EnvironmentKey, 'Path', Paths)
+    then Paths := '';
+
+    { Skip if string already found in path }
+    if Pos(';' + Uppercase(Path) + ';', ';' + Uppercase(Paths) + ';') > 0 then exit;
+
+    { App string to the end of the path variable }
+    Paths := Paths + ';'+ Path +';'
+
+    { Overwrite (or create if missing) path environment variable }
+    if RegWriteStringValue(HKEY_LOCAL_MACHINE, EnvironmentKey, 'Path', Paths)
+    then Log(Format('The [%s] added to PATH: [%s]', [Path, Paths]))
+    else Log(Format('Error while adding the [%s] to PATH: [%s]', [Path, Paths]));
+end;
+
+procedure EnvRemovePath(Path: string);
+var
+    Paths: string;
+    P: Integer;
+begin
+    { Skip if registry entry not exists }
+    if not RegQueryStringValue(HKEY_LOCAL_MACHINE, EnvironmentKey, 'Path', Paths) then
+        exit;
+
+    { Skip if string not found in path }
+    P := Pos(';' + Uppercase(Path) + ';', ';' + Uppercase(Paths) + ';');
+    if P = 0 then exit;
+
+    { Update path variable }
+    Delete(Paths, P - 1, Length(Path) + 1);
+
+    { Overwrite path environment variable }
+    if RegWriteStringValue(HKEY_LOCAL_MACHINE, EnvironmentKey, 'Path', Paths)
+    then Log(Format('The [%s] removed from PATH: [%s]', [Path, Paths]))
+    else Log(Format('Error while removing the [%s] from PATH: [%s]', [Path, Paths]));
+end;
+
+procedure CurStepChanged(CurStep: TSetupStep);
+begin
+    if CurStep = ssPostInstall
+     then EnvAddPath(ExpandConstant('{app}'));
+end;
+
+procedure CurUninstallStepChanged(CurUninstallStep: TUninstallStep);
+begin
+    if CurUninstallStep = usPostUninstall
+    then EnvRemovePath(ExpandConstant('{app}'));
+end;
+
+[UninstallDelete]
+; Remove the Start Menu group
+Type: filesandordirs; Name: "{group}"
+
+; Remove installed files and directory
+Type: files; Name: "{app}\stellar.exe"
+Type: files; Name: "{uninstallexe}"
+Type: files; Name: "{app}\stellar.ico"
+Type: dirifempty; Name: "{app}"
diff --git a/stellar.ico b/stellar.ico
new file mode 100644
index 0000000000000000000000000000000000000000..4bbfa5f04cc650d18b34a9d03d6c5c6193db2213
GIT binary patch
literal 11166
zcmdsdg;!Nk_wA*T20`h#ASfs;ARyfeQX(KCp$JO1N_RJc(k&8#5(3hxBFIIM2I=mS
zeCvGQZ@lr|pYWdI;12IS_w2LxT64`g*FvGN;4ktA3&n~G;X$D;!Rt^>4P{aydLnp9
zs;Z)(jl7HeBgBVaMvm_-P$-^zstU5Y?jvhyul2i^jyos&9kf-iII1lAJSt|nv=Z~E
zxYh8^rMcABDh20sow~{ThS6?e^}v`Gs_+v11=sS1ShKk=ZxjnZ_8VS^jZ?k3b8Oz|
zvgTVdzw05j^V0awfJ@Ehzp;ZI;ojHjt*2w6_j39yWwJEILg}msu2K`-dXLh)${0k1
z3T!d`fBj{LUj+{Jsg{n8|HEqAtS?_^6%`e~I4zKIb8~AN7=$kLX5@VOL`6eGL+b5y
zc5>_Y^P8)yt7rS>FJ2H!NJtEgj<){%Nt&LXzPY=rki`4Q#L7ywwvhUEbHAl9Jw`+G
zUFVM^K8L?8ct-WFXyB_!anAPFM&Fl|+<b52<mB|FuCDdR4`OC!=FRPGxoGCwzpCvX
z>l+xvuG6atWnnjAFB5p!+VXC1Z^vY0kSD4sj+987nw$H}`s14pm6>jCZOLXxd77BY
zawXplCPLw86%B|v&6DI1c$g0j51VdIHN!`Iqoc`R9jvR5T=~wEiQU9nYE<Lb-F<g;
ztmfju#w6ETl=0F?CC|yp$<)F^a8H^<yle2b^m`P=JiH#Nd~sP&NXX&z$OW@b8wmGp
zo}6T9XlSsvw`W}=E6Bo@@qs;JXJ^NG`}S>DZ!f_EZ@j_5L0Spd>nEqD0<U&0lT%XS
zT|=ETvG~z*b8{-{>WXS=MBl%ESE*~gD(<ozkeSKaoqn64s;Vk?{4a?vDxxVzIXWga
zHG-5uBr`kPuR<as|9+8Pvb49<B|c-4%a<=>)+uCj`b^HxPLstPvYTzRu=rWwNtCs<
zsW2GK=5#wTX1y%z(hWnCt?73CDr>re{R?DF;<$ynVQ?BVOZ^4-)yjBHsDz{>dG18B
zA8&5FFD>O<BP(*Sw{O~>`%!M$hpw>fgFEBTEcWHZsO5ce-!f~R)WR}hTUuH=T>ad;
zx%pQfQ<_Z8B<?IDCx_h;#dK$cramquB|JHqc6MRmd~NbQsw`yX&qwy_*GURA($H&R
zsyltkENr~IWTmC0xsUon`wQ-|b8_OpeEIU@skAOiU*`UO8Z&eAa@%q7-@kvyxCUQ@
z@R|wdYiRoVa>vA?qm;M=wmMjsThZ0kHRn8u2-W&;y>5eojxO}|!FsIgT;=9J4>2*Z
z%%?xzlvP(N!*em5S=-r>R~nKgss%1DKYy>w4L_2vb_vOuC1tFvt{FFYsMcQi__WCf
zOTY3t&8yu-*^xx08s{adS;t$jWxr>iy+`pUz@;i2RMul(Vk-con4^Q?ttN=uiHQk_
z`+(|d(XaLOeWi~i(k4!4zg--wb0ZH747_^%x`M1M77-DVroO)AW=gPnGX_J|+}un-
z6d3U}(tT~@X4exzMoIUwVXVg;6sT8^ir$WWeR&ZJ3+oH4K!ByYyZcw2+eT1|+s4-&
zGRQj;vmbqZlu=Ppi^HE6GR_)4d?32aYb4|4CDoIDI~?|tVGif`0kW1xZ|@G$vz8V)
zfUDJs`jo!dbZ7iuB>U^*;Zsv4=w?Y{V`JJ|jvO8y9{f+bC_2(2{|pTLT^;@`=5feR
z#v&C_^xz}?Z{up)aaL*~0V@p0rn@BOr`^>2&lJt8)I&8+T+7SL&aW;%!sZWv-BD0h
zHg63gRjM4#S7*4JE=hNGcDC4GK)z&ad8zU2h{ttpBye}vx!%}udvnuAhP5f-nhtFx
zmixi_qpOK(t3&1Tc6ZphQ6y6U4#`5#qWbbrL_|amH(SXCY(|75Xa!n0c)Lzcc6wFr
z-BW(`s&>$gb!>c`l7<G)+uK`d@7w9|L2OKnPszjTWzW_GB9tlb<A#W6=`-5AygdBs
zfh>6fTmpiW-KVq=2e6LZ++5+8dcWYm6_k|B=DXiUd{@*rGz@ENQ^?KBqq}ZEOoQ^9
zotrZ~+Finbyz$!Iot1+F7oI8N$cN$G>Z*0IemQncP0hy>w+9a%1Ox_}u8-A}RaJ4W
z+2TaANOyd=UsPt=itj(Uk%=u6f<r)N^0y@rKXS%<CQ_7wnK?=|o>Snt+6!xqR54%3
zm(*KM_^7GrX}@2;G`lmTSv;gNDqfRHdLB`~7%XnCby?Xw`R9}~EG(>xI+HUrq;F|y
z$<!+%-9C$Al91z0oX&}sGW)%L(<+MbmLD8Bd_{&<k{2L2f+CeK{!9;lex_8Zj@Q%$
zo2`<k?f-T3`*)%{Z?4Pg>QY-<TdRmBVhHcwzmH%OU`V>;OEc$V$g#t{KaWXmgYmIX
zqZbz~iw!<^ux@xAjJsv&a{ry1Q>=ZPprl!-d$?TmvCOQU2-2!+ao@(;nu3-#1X7T$
zotXxzd1xp;-3erT%#XRvy}c{r3To`S4<499a;n_DtDveH+PAjz&!am<lsqdd%d$T|
zvTxPV>q435vFmk%PYN3wOn{_=B@YRdm6b8-xhFU`Z{8fLvSCP2yW(}cCYm!^{pnK+
zY#;?CrR;2&Pyyc5=HJ%jTTc1Le3fvd(*Pg*A@4PJm2GTp2nq^jYF@Qp=wX7(%F3D|
z=!7U}XaZpusa6Pjh??FCJ>z$nR;W*(b6x&@Aw|?qsnP3HMKpSw9?BksFkYaX@AR};
z&ZwxUXy@-j9X4trIxW_~cx+8gO`me}&Se)jx0Zkl`kyUGXLy%1y_5l@Hzw*sA|n-L
zWqteBQr^Bb-JbnML5LeMLNcF<N=QgBneB>wr9KVc1V5^xk=yj2K7C?MR3r70-?|Su
zcQ=_I%dDJsyv~hloW|Q<rvT;R;sT|hVFJJL?OQt7g-h4<WooSw9@x)zQNr1p)i3}U
z6Nf7J8P~sxT@U-yat#X>Fz^tg@#4jc;>V2>SKAq`{+t;qH;?)DMC|qcb;@IQ<){D!
zwCrSqr>dJ`j=jZ&nD}^{$B!S^2ON%!j+%EyG0}=x(=J(Poi%-n=c2rL(VxZpBsRp8
zg@pxRk%Un!#`%FTod#i(KLI(v^$>r((Ta<MLv!_{*PWGdp^%dk55T$E*;$HmY0F=%
z2v#iq%F3<F9!@@?k}1(+=jYet^PilUU<R<W*nJmu$Eeo%0#P9Lq~`$><uT-Tu>SRq
z5K49xx4^;Vuc)@p&Xu{8W(Z*k*VRn_3@n6Oz{ijG*VxU@OR6XQR5%1fxfMC<aS<}m
z5y?>C<ftShBxF5OaUq^l9X-yWp#vv2G^D>eUYDejKQ21qjsv?q(-|%LwrGq~0_S~E
zk-WZsa*sdD;pwgqnU~|(7Y7^&<*u$Se*N?y@0QU~2DvN>-~pUMn=1kaSU^T_fLCPi
zyl!c2rKF`*slAmt3t*<AqS6Gv_RzCG^IrTZ4G9Ztsj%v&P4v~zNS>vdYW62soNR3D
z`FFyp{w|=RLKyS&FXO@bxV(plWR=aRQtpJAC%&1qv@|Sc)r|vnF%8ROfB2a=xtE)p
z8^@I^v9?47SFc@b{+`HF{&L5{f8N}K2@*y@K>>G0kb;3K{-RGj*FCh5kWPUcWP{nx
z{7=i_Pgj=a?frtuS<Lp92lN}g>YKH#&o8cxRLZ-%ivbw6exWiC>d3{-tg5>7_wQfv
z#sx?s6Gd9C(Q7<Bts|8$kP5AP|32Ng*JzauB|UwZj}J=eDXR!4=M_|8VWD_Z7QK)K
ziJzaJifDW8H9kH&mGVah23F3;fX_-QDukDKjk<<?A4h+)#{Qtoy}LX>OwJ<p`-o|6
zv|8ENm^n2yRYkOuqwxLvrlY-;*o1_D?QO@LQ8!0NIeUA4sncB@r95V?&~M$SD(m6w
z{wV^VfB;<aLsEo4h}e#W(D3L{sFsg^dU^*J56|>l+!Y`LT;ojY)4NOk5c5Ng-i@+r
z$!#Q=`T6*sN4tGX>F2<5TqY!QPw1dN{7eyLXJhkK39|u$i;ItM_HTQx_}g#i{Z#`f
zri`~=QTzN2_lN6QZ{L1Y&}?U8LmDV2TT90&@8WW^;q2%I#OFoTavPwjfy9^5P&j&e
zdUES>RE@s6Q$m;mc@X^YXpmUu(IY0kQlr9ti8p+Yqj(?H#@G_A!1gr*9sx{+<POd6
z{39eJl!3F?a#~qw>6Jbw0R$>8zK-5E;6nlD8Mszgl#;>#^*}|`f8h7vpxHuC8UU?=
zw)H~;1Jl7`0|+>D+{4EV%XY%+lZ_c&?fI|tZ=mQS@h@DsAYRWdBJyTOS#~5_uV`zn
zdQy%zX{Pb~^kd)JLw)@w;JI>HF_yNc^Y*}gkunWDVzKFC@BlX8Lyk`VA1oYvlas@(
z+>~Z<VR}*sa{^$P45GHQ<5K;OE24q$l2uBIS;B3d!!c*erOXh8>F;-Wm9BA`60DTd
zd@$)9&DVHB^{4caP^~BA=iPV07tpaGS~Yv;q334@jhftvUESSqZMlH{YZCqY_wo4n
z_$0m0jEWXs?=Jf46llC1JGGT}0OV_HYnxig@D{1H0d}@E)5$I_{w}s=?{PcC6eSBw
zv|YnLr2>r8F74(`MlpMtm1c4jlpE(wQD1;JHejK^EV<0QyORY%qM|I+xvL&~pVGh{
zwUr8rULGWpQBn#T?5(Y<GY9<6O=+^!NS6#n)?RQggVW5rErb%e>}Ou_q}MSik6v-p
zn;Q=|x99F))`jWxh-9G3X@p88-FRrR9m-rW2XPn@8Y&B+PI)XJOs44UER0V|uTabL
z4tI$WzqaMOR@sX`yd|Q#j7&@dPV;v$>L!eEu>N;B<y~DxD3AT|Nn4&}cm}b_2gR(1
zacTi`$<5_J=&1@Bj%TwP)~}}rlYjmsr5~UB-bvz><xOI^ja!-Sb$TSrL1p^;y%u1v
zD#C(+UdTRw{=xXpk9a>9Z2OrG(zG~FjTDhc=Zmz>14R$m;=kE%PRXM8A=XIC^}FAV
z9o<Wpv{Et7{xL7qZ<2;$l=d=Oc{V;arhmWsCj~V%H7hS~ls<<cC^=TDP=3=ET)os5
zkQwZ^ZqWh!U5WeJ_Nz<-<>=&8>E$|7VO4zii_UL)dOFC5TDxX1Cp&v{tCQvPw40`u
zmM;(&G+fr3ejB2Lhli*8tx)HbtNs-vdb#eU|33Oxs8bMU>(^IEt}<M1P7te70ZAl0
zI|$Vo(mhh!z+gD0vg?<u*vITMGabM-apy%7``5)(K0t1#AxI2wj}|@P8&rs0@`ndx
zV`IaDQ@<JOLoF&=9Yj59E#_F#Ygpkpr<RbINH^Y)mv_aYJJ~lRgz!sE4c$-P9d99T
znWQD@2fU|9C2tR-8T$HCDAp(8h<em%q35ZhttY^VdWr~}fIzIuAexw%_-=+2Q*3PP
z;_t%vtu==6Y_e1_2f3AJ!K4gIBcA@-AgYQDE5n9roDpE9qVoH<v(P#+^3K^!I7}_C
z1%fIjIXQ%YoS9<F6iR4FbTpT^(9@q!St|`AOCQxeujHNC`S->1ScFF^8G^Bx1RhlB
z`E%~ru_M4BL<wT!;DCOXua%(BtF5JnyZCDta>SLA9D3HWT)rIqa%Vnvoov4w1^l^q
zFaIt`Om*8$X<(u&gC*>)l5>lTA)r?QSDOb1-@vle)YVC$Pz4<xx~FX`FNej)U#zm5
zjB=ZJ8SI>dGKobkQk@7nFKS}eS0cm0h=6#TK+#c%Dp*}xW6-w#oaJl?#0+2|3y2x0
zf$WB%k&)?9yT<nO)5-JL^*8wX>?rUJ45eQXt(<@OzzqzBxk#@BKy7kx@RF~uFY;87
zC#r7BIll)6*o1^G0>*-FL9da4ekyZW(NiMz@=?Ujv{}9;l@Wb*dK~Zi_=U=bHn7g?
z`eg_VSdQ1;Tw1qGIFbx3FE1Cr5<Vare(6R_S1h|~-IgdUV5A2HqROD=>|<%E?NA<P
zxxrH#o5&ic1+=6jqs?g56$m%L(DG-!%uphzFI|drUAX7GK1P?}eRj)A)c67qF7TWg
z5Ko4;SC*DkM@}uY8V&MvxkG0Mt1BwnfLbFe77#RkJxZz1QdrD=lQmbnuqV)zR1pH#
z+%EHz9BO@{zR2YhUKOFt|K_qGaD7>sPeuj{E;befu1(kX?|w$Sf2{n6epS5qL+0h>
zl{@Z!qnHBqNCb6TQc|VvJQ{Y%6d)I5oPy&DLP@_TTmwbA2p$M*0+n(UqpvP^d)}QS
zl{(B-U=Klwi8SyGAc^F_(*eeG*|8?I>s?~!jOlb+C`EYt=Kek>lvlKb1cQKpz!&?!
z*j5kTbrZ07$czMf2hd<={tzJRe}km0fq?-4A6u10$-VON9A$FMcprzOqa*NLhxu+g
zOsO#OojZ3r7BWl%QI-sw)2piydL@Rju8qEclCqrfl;29oPmHl2p<}0j<)O!E)X{u=
z<Z#b6!HW{NZe=~|O*fpBT^g$qnz54;9IZRgvU$&=6ZP@a=g(}3YN2z3-XLBmnV5dQ
za}R;yA<Lb(oNz3AnURsP?8!H(>&9Pc!KlC(qJ}gb-odhM$V6Vhex2>LFh36}i|QDk
zLGTG-c1{l6MYjpsXFaL1*4Ed{yW95n_w_3*DgFHY8Cp_DD_<1s9VdVN_kbMEe3TAV
zc!xXJX@#6oi~<N|YcM&NS!0dS7kexSG%?3nLP|tuk(%~+KN4IP41dz9_)w2fMo}?P
zuXlKOm~P-6re+UlEpe<$094D2kkffN@hdMOI5)p>Wq>A~tvp~bGBPr;wJp6bev|VO
z&M6O^wM`PL;~iGa8SBC7@I|xo<Sk{5y_4-9e4qo`eQ^jvhN{cUn@|4jq&PP=cXyNU
z^70x6nt#r+MIlSR;*)iN^7=P-xoghRtY!}=Ia!uwNa#hbPw4*jy_G*~Nk7WH&%Mz7
z=8#Q5`~rf5Tie_7zV+U^b<64s%KAO+6AZS=dpa4gJ`gv@ZNnJN^5ovVdxW^y9w%F!
z{7~p?Pv^Du^@lXWeH7HTkHXbWO-=1xTx|AtMmo0o>3q_Ei4>JIxS58BhXX7iwGhoR
z3uc@=D@7S+yU3CuuAZJ=^6l3mXf)b+<maD#k!xvKix;FaJ`PCvG<>L>Xz*lkaBu*x
zfa_Cvf4R9b@L>}mLlNZHvAm+kbh#7Tj*6t(U3GO6j2&0{=}@L1f-9&{k7y1j>R$uv
z7;5m80L%o{N=QsBFC&BE=}FiatMLb(X+7D%R9RW6RBdNvH5_C1Fr#K~iNuG0guARt
z$R{q2ii49Aed9)?imfLYbpb&^W@jh=BI=dTlo7Sc!NFkyK&lXcX=%ZR2n>{Am4U*(
zcjjf2#Ap3Jyom_wm&mxY6V2h@)?oc|GdvNS5e0?%wA9ox>tR8Uqosmkpwf>6IBwif
zxBF2t59c0rO($Q5m4bGc`*W4U)m(P16l~-a?V9uRDfxJK<U!AuzuVX=UyzlRRU$XW
z1Yt1R#YQ!8$(rxpzHR>V=Q29B>uUAwx6HxW#7O8gk}?z>ZUaLJdbh#hxH1YZDq<qm
zI$wh{iLh;~L3o3zswyIQD6@)tO`*>JDtRcHGd!^Wxfx&J8Kmy(*}d8+fcvojen+)s
zUpCwR*tc)r7WY$#mzL!vnaNqa4%ynw1Y#NS0b9Xq&9A7SrjN{LQ!52e3rMhvni@cS
zM(=`XK&A*6RU~!pGnJ+dIu{PA3lknY>Sm`+Z|bg&Ap7OY)c`sL2!~&Ny{G)rGpd@s
zlHy_t3W`h@j(6oR_gCrS;^SjeQ|~?r!bO>PMEHWz1yLTlA81%I_^L)8Pv+iY+;yEo
zT{F<X3fxVGAd^4@g+xUBz9SQsRajhXeN{rw*jS@2SSv?K79Go<@7DuLv6Ac{A3Ku(
zj9lk;r5{08FG{7Pq=@DYxw^TDA_3kgY*_#5CcGbV$Zyt07}9Rm@$?2Jua<)0IhUX@
zszSX}0UL4w$qB>}xTAE$ZT!{U_hZ9R*bs&g1<o96tO{+4q)t-A?;t`ojA+DVl(ySy
z3Qlxqt1^oxE?~m?cwM|}ftD^e4fwtYHGsoKOOY^3(q?$>)6MiJE}>Ci^yQA*Q7aKQ
zeSX#(lbEPD66yT}<ZO%z2e^n_RuBHe1i<`P1Rpo{l|O2;M`A<f`lZkLW}kVnn}Q5j
zbMQ=NIwB2OnrYtw2(bX52&CLUZv!j2+-6h+Q9FgAgeV+*5+BX0z=T1jD}Vl_hcbHf
z$ciJASMudHE*yRC_#p$pU$6qY*#`>;DJ_siU_uapg#m@_PFpZSPp?vc;=K2l1#Eo7
z%Xy})yDTPUD8LOf2Az-7X>Jp;z?6eX=;XkoEi5W}aaH)$@xBdO3Zj(&9ZLv@%Qntr
zsH3Z!yZ4BI8zmm|_H8H_{TN#mYQpQ-22SAX!Nlv_M^@CBKqah9w~Yy?d&R1nM-Tyn
zX{0OOKE8;w@rT+M=jwld(&Tw1{p<Zz1m|tXzR0!(i%xo6#P&s9<h*O5=!eOd0Y{Bd
z+?kO0(skCjfSh#X?f=>c2>;CPvn&IkL|`;f34u{KuxP2Ht|$0jw`&PeOBD0@EreK_
zMFSA)Eg-w>(BIgxGT|U#QOUwqR5Q|DP%;q@<cT010?247_t&r4xw(m;C|f96Od}Zj
z-X$WSpn!{K-2+8J;S+wD4-IzvWj<pLvqs?C5Le0KF5Em)UAa6YuV1}F3kt^FJk7fS
z)}^8J%FK-X$SJ4%T@(>9F@m$eUeJ?AY2q$&U<*R?!XVb_AehC=$B4HRglx#r1}2Xf
z&CdRJVWBfDVYW8=$8N?ASq)TEKW)t?MF$4~;PGWn3mRygM$hAY$RC8(=*L!U{hwCT
z`uciENJtZ$m;qbD(bU|JBw!D=j%qd1Ei+pnKq8gyL<!*KoGRIk*9Lz1BKG9T6N+y%
zk2CC@`mz;^yDIL~R(wGeZ)+<ejPwZeq;5IRhUkG$<EfKy!=Hse4h2r{Op09tTO3aV
zv`rA?f=)<V*zvIR*&%zb_O)`%G-5OWt+MD%{~2b88zhrNOI?-l<YVVm>`kyd8R|`M
zJgidC)T96lL*Ic<LRy-|v4*iTnuW`3a$tZ47$eB?U$qoL*EEfdqadnZoJyt)o}+Ly
zuy!NU(wN|W0T4skaQobGtAw3}UU^W~;4vtyRs&l!o%(EQ^~4g`UV%#_4yXdXfUxs#
z&oE?*#8pp6PL~QYC>R*-T%Ys}4<|;f0oZ(u?>Paumla;Fpx%lPG5^?$FQcIT{?}j#
zph@9-P-^6B#LM+&A=71LkdTZ_$;5<}=L0!iJVf3!c$J3I8yg$<YA^f@s>C({YXTv!
z!ot)Dd0o@UF{*PV1xA8cBZI1(F3o*?<)%UjqzAuM!9p(H+vsR+#)89P9}lo-6~`+3
z{8=7$=goD4maymIczAfESob*ay?~a}i^vb#6Ul{r`Xp#Q{7G?TflK{e+xMS3gM>1t
z^xj~k*gHFO!2PIcXplxwo$DH!YO}3MhXMo2U{QC^5)Aj;luR0>P~6{7%>!%(oNXt*
zh9YrbVL^4l-Rxn#EGN>IOuzm5In&9^`g&A`*HP$JQkOBF`7;#43MAZkAvg>iJ}(1d
zfKuLuoo;Po!=NEM#4m3~l_Fw;d9{htXm?ibu!%#GiiMbB9T9Y3lb9*qOhZ&47#1Ll
z<ki(9`_`axVP|-3UjX5S|LoZ_%y_f-hoYjsIybu#9_1}}$y8}?=0|m|SH`JJOu9*$
z#>N=?^VR)jSWOgV1CI|j*aZYAA68kj#We-=E|@p_;SpZAVA_reDa_5!U)B{__a~P!
zS(_rD<;MY1)H?eu9z0-!SfwR!1(D(pm|melTS)97#R4s%;#+4=1d%QuXtGM)bJ7#9
zhw-F^e;*T+)1jau1YEetdMVsMOML;M4$#X2CrstZ)We4l&3jUB6%SuD1&33=pjp~+
zRz;88%O?gE!6b2sDipW=)gF5MOzGvxp+H<*9MZN(iwdo12Y2<e#ZNgf5=W}-?$t`%
z4N6UAg#M6nfg7-?7~7y8+WRP_D8>umG&gu2$Jx5&APoydaH^?=X-ra$XgAW)gQx*F
zD{h@EJ{!z7P`={z=FpUl`1oRoIs%P?mXSXcgiKj~mFj9OIMks3ivG7M27-_mhsVbV
z+yNq?$C)_4f%B*Zh}SRSOhb`xvYTLXH!nLI8~7CBNopAz+d3c5&(9-(2V$t!c}Wgd
z{Ra9WBrH;le8yjY9WeneLGMsxDSr{KgApe#8#>#-HT3IWRcbV|j+j|k1pSvyHMO?-
zJG&(db0-qP&Wn?Jp`cpkreuqX@t~kj0-ot@*egvvJqzb!3kwVAYXFn;fi~dM`V=k{
zhzB2y2bP$iOf(@HQdH5--u430mIaH35)rT39tr=Wo}m7Soe9$*{V~Yp<=rU2jw#sY
z;t)+6?$ozf(5^&WYn}(CziX$%d7&c^!6MBJMaJ&y7CzjKy1l&}qN?xTZEWABTzu&!
zUpgPPJfumaSFE3<(^bG5!5~ToC7Z^9JYNY6N~K8pK&ad+yXin4*hNME%xdSRtdeAc
z8}L6IKut{z7>h+WZHNLIa5~u8&7KPUg{CH%Gy-W9P}t<LDT2G2sOQh0mqGmpWAJ2u
z)K0;J_U3bH1vDjCw#u~<V(Jh%2*T~WhQ_*n(pq(4ayJ#?C{KFqkV2(E#6DUIsmBzd
z3bgztD0mo2fFPt-@$WXc6^Gyi^+7igqb^8ToPqU!Yx`-O6f{#!6IlCuf`>09nYDFv
z)Ll1mu3tjIO6?j?FM$UDt^q7c(w(1!D)gHM`EVC-d*~SECAkF#1ehQ$SjrPk{c7A_
zmcm1IZhW(jH9cEnBZBr*GC&jt2YiKGpcTV!Hz8TiVM!-!NkPUeX}L`kYru{uS@2*2
z?sB$5xP~15`uJEH_A35d&xGB|%8HPj{LdY<9^l37{Ji7z(M_J&wd0M(;JcjtKOCY&
zzU~b^L>?L1T1%ywU$Fz_uxgA-liUDK00ZsK0G2NMKu1P~GyZQuh8Nnb5o9fLfwY(8
ze=dM01PcnHLe*}=sKMjbg!j28MqP+L!U+4xvuE;f*;tK}!s@|d9}bWrgsa%pKGRXo
z)BYQOPpTR8-|l`7Fj=<Sx5sDyoO%anVcSo)U4RZvs+8xu5KlWhJ78RgM@KE)-4V`i
zn#QeQhzlUw&_e>477gu~9L4ZUxhc<dY1vR9nEk*lfVNQR(81=W3^0d$jWjg^sn+58
z*P>9pO8;1^Lz`U8d69zW`}Y-wY;0tbqsAx-DD=hh$r`6;3W|!&y}jg+y1BK!7+fH;
z0dj1BeY-~!kQRS|flOIXD5AsD{*O9JzcxP~)YYW|eyzXG%Izv`Xy<?yt!Fu}dOkn|
zobB)G6hXvw6ilRm9nzU49~>fFg|HIf9*|w?+ZIWM$jnPZ0yR8%TEF`#4OG*J2$CMI
zrvhOpqZ&s%sQ6%4D9|r0FNc+t@pq?5BqiP)tLXwIjCeJEe%SSmDZL9bD<2y>ntX9o
zMdQVkhH;?2;f9t3fo@}k>I&@^oQz)4T2Hl|8t-!{5HGG96E-mi5@KSk?Ck!=V@E7X
zZ?R}!Z-QS%4_VpS5=ad8oVo63q{HGbwuCotFsH$dh>;AT0Ru?1#T4O1MLh5&>N=lJ
zv8LN)_d>yO1M6W6ScBlY<bU`Y#ASQ<Wvmk~Y^Wy!F3Y+a88XnWVY_jI6yUi74v^HM
zv%mi$Y?Ci=sU=P!qIe1)a9T{4FnNfTflL~Vr&`3OrIErxfoy2lo~*C0r@VA22oAdS
z`}eSlIwfR`1OY;AZEceDH}!Ut4aihLYFe7AXo>?^{f1T6p<oq46Bid8k|0~9&z82j
z=1^LZSVD|9upM&8MQN{GxuRcf%hYhR%%iKPM?W?J3If5Ej-P~Yv3c;Cpe+crwj=J!
zohg`Huslc!EY*sH2^)kWBNH|rhxYLycXbPO!TOR@Qo;wbN9*Ck7u0o#g_rc$OEuc#
z982$lPf5uQq;&-Bu(hwR@0YD;`2X%pF0Q44)K3<CO7tJB(l*NJV+CUgMqP%g?J~3)
z)>f<rKG1-S+-fFZiCM?*XeGibD=(J?iUrJ|<BJO<+yZOTkFAXJlg>=nv9U3JnEQ!f
zzD+MBB^4ntj`9J&8u>=x-LT4*`qu{$>#bmNMnY;iiPwI-#czl@^pJv9u1`!1MMp`v
z_t6p;2nR+fkD<k?e;!i!WQ-w5w*}@@+>h6)BV94u%Fy4p-=0+kkO3R+;ups`qF8tG
zsRIROm@qknQHiCk=Rzh=?rr_^z{SNyqVYdmuZQOvFR!f_Mo0vT8(21^KS-IQ381gC
z3wSYJ>*Al3bQvZNg1}B*p3|M}%Td0{&D|2oAbPgzv@@?>pF4%20cb0JSWO0FN}Ov%
zD<;25nnp(Go#wk`fm4I(Q$0}60ndNt@%hnZ=+McnrhF7Itg!S2pIGDsMtb~v5mTEU
zXbljy_l1SBii&th?f?E=O;=YJMxL+}6BFGxr?6r_EvdJIMFD;zO~z$TP)lY1W0q1<
zHh-TEhvo~?PAq-gs4+s*Gc`Adm!}=-HtCsE!BZUc9;L6ZZ-Q{Uh=?bi0eWCmL(R_A
z<<8PBRH-xnG&D5CDkw+={gFA{se~+6Gzt)Cb7w~$AWYnC{cbJ!?sqsIB<P_<6zkeP
zi;SaC0yB3z+zZjdL)aczIEwJ`TGutT+BN(+VE9POs<)R5wq<F&PE_jr#K|za8AYpz
zf~F?_%k3ust?n;h#@c??y5%s93w1CiDM@*RW>5ec<1k0kH|~jJMve8w>r{L}=pz6!
zJ@{B%Jw33`GcPyl50EK`7rgXXN>A|SslYix`o!fGmUjbzPJpHdc#}c8_;syx;HgXl
zEkYEw>-tzII8!h+mIFR&vWN|R{=Ez`z<JENJsCGD0MvHZw{NnLJ7kPvCS}%QcUyXT
z$S!he1T;2E2az$U74cC95TX3vfB4V>)D&2pFMziYx?Artvc(|zVcS{{w`Q!Ol!9dN
ze6j$y&|F*uNVNa_*$$hiTKC&pQc@C`4Ip6<Apymt475$PPT?Oh%zYvGKyN!f2Z0Qn
zB=^w~1E@q&oQcj(0%%IJuTkYu!Yo<BXtmu8n3fQZNBzA3N+h<Uph}R@!|iRq;9!EU
zU%w)icre(>iIN+|sRZL)Vd3Fgy1D@{vjH8PEMR-R8PaxN{vN<M4PXsI{~!q<4gsLb
zDk}ri(#A8qKrQ?Q{39nPcYpP&rN2L3V@{or8%0eNZ0g;iN)(uVQx|oWnoJ(gNA55G
e{~s^U$&cD;%T$S<zkmr_l&YeJLaCgI-~R%J5+5o6

literal 0
HcmV?d00001


From 796d47667b2093f4153e1d417ac9b256abde98ea Mon Sep 17 00:00:00 2001
From: Nando Vieira <me@fnando.com>
Date: Fri, 15 Nov 2024 16:46:52 -0800
Subject: [PATCH 22/31] Fix powershell completion code. (#1730)

---
 FULL_HELP_DOCS.md                                  | 4 ++--
 cmd/soroban-cli/src/commands/tx/new/set_options.rs | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/FULL_HELP_DOCS.md b/FULL_HELP_DOCS.md
index 6bf321246..f007d0bf4 100644
--- a/FULL_HELP_DOCS.md
+++ b/FULL_HELP_DOCS.md
@@ -1749,9 +1749,9 @@ Set option for an account such as flags, inflation destination, signers, home do
 * `--signer <SIGNER>` — Add, update, or remove a signer from an account
 * `--signer-weight <SIGNER_WEIGHT>` — Signer weight is a number from 0-255 (inclusive). The signer is deleted if the weight is 0
 * `--set-required` — When enabled, an issuer must approve an account before that account can hold its asset. https://developers.stellar.org/docs/tokens/control-asset-access#authorization-required-0x1
-* `--set-revocable` — When enabled, an issuer can revoke an existing trustline’s authorization, thereby freezing the asset held by an account. https://developers.stellar.org/docs/tokens/control-asset-access#authorization-revocable-0x2
+* `--set-revocable` — When enabled, an issuer can revoke an existing trustline's authorization, thereby freezing the asset held by an account. https://developers.stellar.org/docs/tokens/control-asset-access#authorization-revocable-0x2
 * `--set-clawback-enabled` — Enables the issuing account to take back (burning) all of the asset. https://developers.stellar.org/docs/tokens/control-asset-access#clawback-enabled-0x8
-* `--set-immutable` — With this setting, none of the other authorization flags (`AUTH_REQUIRED_FLAG`, `AUTH_REVOCABLE_FLAG`) can be set, and the issuing account can’t be merged. https://developers.stellar.org/docs/tokens/control-asset-access#authorization-immutable-0x4
+* `--set-immutable` — With this setting, none of the other authorization flags (`AUTH_REQUIRED_FLAG`, `AUTH_REVOCABLE_FLAG`) can be set, and the issuing account can't be merged. https://developers.stellar.org/docs/tokens/control-asset-access#authorization-immutable-0x4
 * `--clear-required`
 * `--clear-revocable`
 * `--clear-immutable`
diff --git a/cmd/soroban-cli/src/commands/tx/new/set_options.rs b/cmd/soroban-cli/src/commands/tx/new/set_options.rs
index 3410b69e8..69cd10745 100644
--- a/cmd/soroban-cli/src/commands/tx/new/set_options.rs
+++ b/cmd/soroban-cli/src/commands/tx/new/set_options.rs
@@ -40,7 +40,7 @@ pub struct Cmd {
     /// https://developers.stellar.org/docs/tokens/control-asset-access#authorization-required-0x1
     pub set_required: bool,
     #[arg(long, conflicts_with = "clear_revocable")]
-    /// When enabled, an issuer can revoke an existing trustline’s authorization, thereby freezing the asset held by an account.
+    /// When enabled, an issuer can revoke an existing trustline's authorization, thereby freezing the asset held by an account.
     /// https://developers.stellar.org/docs/tokens/control-asset-access#authorization-revocable-0x2
     pub set_revocable: bool,
     #[arg(long, conflicts_with = "clear_clawback_enabled")]
@@ -48,7 +48,7 @@ pub struct Cmd {
     /// https://developers.stellar.org/docs/tokens/control-asset-access#clawback-enabled-0x8
     pub set_clawback_enabled: bool,
     #[arg(long, conflicts_with = "clear_immutable")]
-    /// With this setting, none of the other authorization flags (`AUTH_REQUIRED_FLAG`, `AUTH_REVOCABLE_FLAG`) can be set, and the issuing account can’t be merged.
+    /// With this setting, none of the other authorization flags (`AUTH_REQUIRED_FLAG`, `AUTH_REVOCABLE_FLAG`) can be set, and the issuing account can't be merged.
     /// https://developers.stellar.org/docs/tokens/control-asset-access#authorization-immutable-0x4
     pub set_immutable: bool,
     #[arg(long)]

From a8fdd5a6846f62baf9253ef6cbb3cd523e008369 Mon Sep 17 00:00:00 2001
From: Willem Wyndham <willem@ahalabs.dev>
Date: Sun, 17 Nov 2024 18:54:37 -0500
Subject: [PATCH 23/31] fix/add-exceptions-to-cargo-deny (#1722)

---
 Cargo.lock                                    | 612 ++++--------------
 Cargo.toml                                    |   8 +-
 cmd/crates/soroban-test/Cargo.toml            |   4 +-
 .../test-wasms/custom_account/Cargo.toml      |   4 +-
 .../test-wasms/custom_account/src/lib.rs      |   4 +-
 .../test-wasms/custom_type/Cargo.toml         |   4 +-
 .../test-wasms/hello_world/Cargo.toml         |   4 +-
 .../test-wasms/hello_world/src/lib.rs         |   2 +-
 .../tests/fixtures/test-wasms/swap/Cargo.toml |   4 +-
 .../fixtures/test-wasms/swap/src/test.rs      |   2 +-
 .../fixtures/test-wasms/token/Cargo.toml      |   6 +-
 .../fixtures/test-wasms/token/src/test.rs     |   4 +-
 .../tests/fixtures/test-wasms/udt/Cargo.toml  |   4 +-
 .../tests/fixtures/test-wasms/udt/src/lib.rs  |   2 +-
 .../tests/it/integration/hello_world.rs       |   2 +-
 cmd/crates/stellar-ledger/Cargo.toml          |   6 +-
 cmd/soroban-cli/Cargo.toml                    |  13 +-
 cmd/soroban-cli/src/commands/contract/init.rs |   2 +-
 cmd/soroban-cli/src/config/locator.rs         |   9 +-
 cmd/soroban-cli/src/config/mod.rs             |   5 +-
 .../src/utils/contract-template/src/test.rs   |   2 +-
 deny.toml                                     |  57 ++
 22 files changed, 226 insertions(+), 534 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 82b62d2e3..e043b4f8e 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -270,7 +270,7 @@ dependencies = [
  "bstr",
  "doc-comment",
  "libc",
- "predicates 3.1.2",
+ "predicates",
  "predicates-core",
  "predicates-tree",
  "wait-timeout",
@@ -285,7 +285,7 @@ dependencies = [
  "anstyle",
  "doc-comment",
  "globwalk",
- "predicates 3.1.2",
+ "predicates",
  "predicates-core",
  "predicates-tree",
  "tempfile",
@@ -848,7 +848,7 @@ dependencies = [
  "anstream",
  "anstyle",
  "clap_lex",
- "strsim 0.11.1",
+ "strsim",
 ]
 
 [[package]]
@@ -944,17 +944,6 @@ dependencies = [
  "libc",
 ]
 
-[[package]]
-name = "crate-git-revision"
-version = "0.0.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f998aef136a4e7833b0e4f0fc0939a59c40140b28e0ffbf524ad84fb2cc568c8"
-dependencies = [
- "serde",
- "serde_derive",
- "serde_json",
-]
-
 [[package]]
 name = "crate-git-revision"
 version = "0.0.6"
@@ -1022,7 +1011,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0dc92fb57ca44df6db8059111ab3af99a63d5d0f8375d9972e319a379c6bab76"
 dependencies = [
  "generic-array",
- "rand_core 0.6.4",
+ "rand_core",
  "subtle",
  "zeroize",
 ]
@@ -1078,19 +1067,6 @@ dependencies = [
  "syn 2.0.77",
 ]
 
-[[package]]
-name = "curve25519-dalek"
-version = "3.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b9fdf9972b2bd6af2d913799d9ebc165ea4d2e65878e329d9c6b372c4491b61"
-dependencies = [
- "byteorder 1.5.0",
- "digest 0.9.0",
- "rand_core 0.5.1",
- "subtle",
- "zeroize",
-]
-
 [[package]]
 name = "curve25519-dalek"
 version = "4.1.3"
@@ -1182,7 +1158,7 @@ dependencies = [
  "ident_case",
  "proc-macro2",
  "quote",
- "strsim 0.11.1",
+ "strsim",
  "syn 2.0.77",
 ]
 
@@ -1284,16 +1260,7 @@ version = "5.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9a49173b84e034382284f27f1af4dcbbd231ffa358c0fe316541a7337f376a35"
 dependencies = [
- "dirs-sys 0.4.1",
-]
-
-[[package]]
-name = "dirs"
-version = "4.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ca3aa72a6f96ea37bbc5aa912f6788242832f75369bdfdadcb0e38423f100059"
-dependencies = [
- "dirs-sys 0.3.7",
+ "dirs-sys",
 ]
 
 [[package]]
@@ -1302,7 +1269,7 @@ version = "5.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "44c45a9d03d6676652bcb5e724c7e988de1acad23a711b5217ab9cbecbec2225"
 dependencies = [
- "dirs-sys 0.4.1",
+ "dirs-sys",
 ]
 
 [[package]]
@@ -1315,17 +1282,6 @@ dependencies = [
  "dirs-sys-next",
 ]
 
-[[package]]
-name = "dirs-sys"
-version = "0.3.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1b1d1d91c932ef41c0f2663aa8b0ca0342d444d842c06914aa0a7e352d0bada6"
-dependencies = [
- "libc",
- "redox_users",
- "winapi",
-]
-
 [[package]]
 name = "dirs-sys"
 version = "0.4.1"
@@ -1394,16 +1350,7 @@ dependencies = [
  "digest 0.10.7",
  "elliptic-curve",
  "rfc6979",
- "signature 2.1.0",
-]
-
-[[package]]
-name = "ed25519"
-version = "1.5.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "91cff35c70bba8a626e3185d8cd48cc11b5437e1a5bcd15b9b5fa3c64b6dfee7"
-dependencies = [
- "signature 1.6.4",
+ "signature",
 ]
 
 [[package]]
@@ -1413,19 +1360,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "115531babc129696a58c64a4fef0a8bf9e9698629fb97e9e40767d235cfbcd53"
 dependencies = [
  "pkcs8",
- "signature 2.1.0",
-]
-
-[[package]]
-name = "ed25519-dalek"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c762bae6dcaf24c4c84667b8579785430908723d5c889f469d76a41d59cc7a9d"
-dependencies = [
- "curve25519-dalek 3.2.0",
- "ed25519 1.5.3",
- "sha2 0.9.9",
- "zeroize",
+ "signature",
 ]
 
 [[package]]
@@ -1434,9 +1369,9 @@ version = "2.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4a3daa8e81a3963a60642bcc1f90a670680bd4a77535faa384e9d1c79d620871"
 dependencies = [
- "curve25519-dalek 4.1.3",
- "ed25519 2.2.3",
- "rand_core 0.6.4",
+ "curve25519-dalek",
+ "ed25519",
+ "rand_core",
  "serde",
  "sha2 0.10.8",
  "subtle",
@@ -1461,7 +1396,7 @@ dependencies = [
  "ff",
  "generic-array",
  "group",
- "rand_core 0.6.4",
+ "rand_core",
  "sec1",
  "subtle",
  "zeroize",
@@ -1607,7 +1542,7 @@ version = "0.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ded41244b729663b1e574f1b4fb731469f69f79c17667b5d776b16cda0479449"
 dependencies = [
- "rand_core 0.6.4",
+ "rand_core",
  "subtle",
 ]
 
@@ -1880,7 +1815,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f0f9ef7462f7c099f518d754361858f86d8a07af53ba9af0fe635bbccb151a63"
 dependencies = [
  "ff",
- "rand_core 0.6.4",
+ "rand_core",
  "subtle",
 ]
 
@@ -2305,15 +2240,18 @@ dependencies = [
 
 [[package]]
 name = "hyper-tls"
-version = "0.5.0"
+version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905"
+checksum = "70206fc6890eaca9fde8a0bf71caa2ddfc9fe045ac9e5c70df101a7dbde866e0"
 dependencies = [
  "bytes",
- "hyper 0.14.30",
+ "http-body-util",
+ "hyper 1.4.1",
+ "hyper-util",
  "native-tls",
  "tokio",
  "tokio-native-tls",
+ "tower-service",
 ]
 
 [[package]]
@@ -3338,20 +3276,6 @@ version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "925383efa346730478fb4838dbe9137d2a47675ad789c546d150a6e1dd4ab31c"
 
-[[package]]
-name = "predicates"
-version = "2.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "59230a63c37f3e18569bdb90e4a89cbf5bf8b06fea0b84e65ea10cc4df47addd"
-dependencies = [
- "difflib",
- "float-cmp",
- "itertools 0.10.5",
- "normalize-line-endings",
- "predicates-core",
- "regex",
-]
-
 [[package]]
 name = "predicates"
 version = "3.1.2"
@@ -3360,7 +3284,10 @@ checksum = "7e9086cc7640c29a356d1a29fd134380bee9d8f79a17410aa76e7ad295f42c97"
 dependencies = [
  "anstyle",
  "difflib",
+ "float-cmp",
+ "normalize-line-endings",
  "predicates-core",
+ "regex",
 ]
 
 [[package]]
@@ -3488,7 +3415,7 @@ checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404"
 dependencies = [
  "libc",
  "rand_chacha",
- "rand_core 0.6.4",
+ "rand_core",
 ]
 
 [[package]]
@@ -3498,15 +3425,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88"
 dependencies = [
  "ppv-lite86",
- "rand_core 0.6.4",
+ "rand_core",
 ]
 
-[[package]]
-name = "rand_core"
-version = "0.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19"
-
 [[package]]
 name = "rand_core"
 version = "0.6.4"
@@ -3580,46 +3501,6 @@ version = "0.8.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b"
 
-[[package]]
-name = "reqwest"
-version = "0.11.27"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd67538700a17451e7cba03ac727fb961abb7607553461627b97de0b89cf4a62"
-dependencies = [
- "base64 0.21.7",
- "bytes",
- "encoding_rs",
- "futures-core",
- "futures-util",
- "h2 0.3.26",
- "http 0.2.12",
- "http-body 0.4.6",
- "hyper 0.14.30",
- "hyper-tls",
- "ipnet",
- "js-sys",
- "log",
- "mime",
- "native-tls",
- "once_cell",
- "percent-encoding",
- "pin-project-lite",
- "rustls-pemfile 1.0.4",
- "serde",
- "serde_json",
- "serde_urlencoded",
- "sync_wrapper 0.1.2",
- "system-configuration",
- "tokio",
- "tokio-native-tls",
- "tower-service",
- "url",
- "wasm-bindgen",
- "wasm-bindgen-futures",
- "web-sys",
- "winreg",
-]
-
 [[package]]
 name = "reqwest"
 version = "0.12.7"
@@ -3639,11 +3520,13 @@ dependencies = [
  "http-body-util",
  "hyper 1.4.1",
  "hyper-rustls 0.27.3",
+ "hyper-tls",
  "hyper-util",
  "ipnet",
  "js-sys",
  "log",
  "mime",
+ "native-tls",
  "once_cell",
  "percent-encoding",
  "pin-project-lite",
@@ -3655,8 +3538,10 @@ dependencies = [
  "serde",
  "serde_json",
  "serde_urlencoded",
- "sync_wrapper 1.0.1",
+ "sync_wrapper",
+ "system-configuration",
  "tokio",
+ "tokio-native-tls",
  "tokio-rustls 0.26.0",
  "tokio-util",
  "tower-service",
@@ -4299,12 +4184,6 @@ dependencies = [
  "libc",
 ]
 
-[[package]]
-name = "signature"
-version = "1.6.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "74233d3b3b2f6d4b006dc19dee745e73e2a6bfb6f93607cd3b02bd5b00797d7c"
-
 [[package]]
 name = "signature"
 version = "2.1.0"
@@ -4312,7 +4191,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5e1788eed21689f9cf370582dfc467ef36ed9c707f073528ddafa8d83e3b8500"
 dependencies = [
  "digest 0.10.7",
- "rand_core 0.6.4",
+ "rand_core",
 ]
 
 [[package]]
@@ -4336,24 +4215,13 @@ dependencies = [
  "autocfg",
 ]
 
-[[package]]
-name = "slip10"
-version = "0.4.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "28724a6e6f70b0cb115c580891483da6f3aa99e6a353598303a57f89d23aa6bc"
-dependencies = [
- "ed25519-dalek 1.0.1",
- "hmac 0.9.0",
- "sha2 0.9.9",
-]
-
 [[package]]
 name = "slipped10"
 version = "0.4.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0a45443e66aa5d96db5e02d17db056e1ca970232a4fe73e1f9bc1816d68f4e98"
 dependencies = [
- "ed25519-dalek 2.1.1",
+ "ed25519-dalek",
  "hmac 0.9.0",
  "sha2 0.9.9",
 ]
@@ -4406,18 +4274,6 @@ dependencies = [
  "windows-sys 0.52.0",
 ]
 
-[[package]]
-name = "soroban-builtin-sdk-macros"
-version = "21.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2f57a68ef8777e28e274de0f3a88ad9a5a41d9a2eb461b4dd800b086f0e83b80"
-dependencies = [
- "itertools 0.11.0",
- "proc-macro2",
- "quote",
- "syn 2.0.77",
-]
-
 [[package]]
 name = "soroban-builtin-sdk-macros"
 version = "22.0.0-rc.3"
@@ -4446,12 +4302,11 @@ dependencies = [
  "clap",
  "clap-markdown",
  "clap_complete",
- "crate-git-revision 0.0.4",
+ "crate-git-revision",
  "csv",
  "directories",
- "dirs 4.0.0",
  "dotenvy",
- "ed25519-dalek 2.1.1",
+ "ed25519-dalek",
  "ethnum",
  "flate2",
  "fqdn",
@@ -4470,10 +4325,10 @@ dependencies = [
  "open",
  "pathdiff",
  "phf",
- "predicates 2.1.5",
+ "predicates",
  "rand",
  "regex",
- "reqwest 0.12.7",
+ "reqwest",
  "rpassword",
  "rust-embed",
  "semver",
@@ -4484,17 +4339,17 @@ dependencies = [
  "sha2 0.10.8",
  "shell-escape",
  "shlex",
- "soroban-ledger-snapshot 22.0.0-rc.3",
- "soroban-sdk 22.0.0-rc.3",
- "soroban-spec 22.0.0-rc.3",
+ "soroban-ledger-snapshot",
+ "soroban-sdk",
+ "soroban-spec",
  "soroban-spec-json",
- "soroban-spec-rust 22.0.0-rc.3",
+ "soroban-spec-rust",
  "soroban-spec-tools",
  "soroban-spec-typescript",
  "stellar-rpc-client",
  "stellar-strkey 0.0.11",
- "stellar-xdr 22.0.0-rc.1.1",
- "strsim 0.10.0",
+ "stellar-xdr",
+ "strsim",
  "strum 0.17.1",
  "strum_macros 0.17.1",
  "tempfile",
@@ -4503,8 +4358,8 @@ dependencies = [
  "thiserror",
  "tokio",
  "tokio-util",
- "toml 0.5.11",
- "toml_edit 0.21.1",
+ "toml",
+ "toml_edit",
  "tracing",
  "tracing-appender",
  "tracing-subscriber",
@@ -4513,29 +4368,10 @@ dependencies = [
  "walkdir",
  "wasm-gen",
  "wasm-opt",
- "wasmparser 0.90.0",
+ "wasmparser",
  "which",
 ]
 
-[[package]]
-name = "soroban-env-common"
-version = "21.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2fd1c89463835fe6da996318156d39f424b4f167c725ec692e5a7a2d4e694b3d"
-dependencies = [
- "arbitrary",
- "crate-git-revision 0.0.6",
- "ethnum",
- "num-derive",
- "num-traits",
- "serde",
- "soroban-env-macros 21.2.1",
- "soroban-wasmi",
- "static_assertions",
- "stellar-xdr 21.2.0",
- "wasmparser 0.116.1",
-]
-
 [[package]]
 name = "soroban-env-common"
 version = "22.0.0-rc.3"
@@ -4543,26 +4379,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "39b6d2ec8955243394278e1fae88be3b367fcfed9cf74e5044799a90786a8642"
 dependencies = [
  "arbitrary",
- "crate-git-revision 0.0.6",
+ "crate-git-revision",
  "ethnum",
  "num-derive",
  "num-traits",
  "serde",
- "soroban-env-macros 22.0.0-rc.3",
+ "soroban-env-macros",
  "soroban-wasmi",
  "static_assertions",
- "stellar-xdr 22.0.0-rc.1.1",
- "wasmparser 0.116.1",
-]
-
-[[package]]
-name = "soroban-env-guest"
-version = "21.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6bfb2536811045d5cd0c656a324cbe9ce4467eb734c7946b74410d90dea5d0ce"
-dependencies = [
- "soroban-env-common 21.2.1",
- "static_assertions",
+ "stellar-xdr",
+ "wasmparser",
 ]
 
 [[package]]
@@ -4571,41 +4397,8 @@ version = "22.0.0-rc.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4002fc582cd20cc9b9fbb73959bc5d6b5b15feda11485cbfab0c28e78ecbab3e"
 dependencies = [
- "soroban-env-common 22.0.0-rc.3",
- "static_assertions",
-]
-
-[[package]]
-name = "soroban-env-host"
-version = "21.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2b7a32c28f281c423189f1298960194f0e0fc4eeb72378028171e556d8cd6160"
-dependencies = [
- "backtrace",
- "curve25519-dalek 4.1.3",
- "ecdsa",
- "ed25519-dalek 2.1.1",
- "elliptic-curve",
- "generic-array",
- "getrandom",
- "hex-literal",
- "hmac 0.12.1",
- "k256",
- "num-derive",
- "num-integer",
- "num-traits",
- "p256",
- "rand",
- "rand_chacha",
- "sec1",
- "sha2 0.10.8",
- "sha3",
- "soroban-builtin-sdk-macros 21.2.1",
- "soroban-env-common 21.2.1",
- "soroban-wasmi",
+ "soroban-env-common",
  "static_assertions",
- "stellar-strkey 0.0.8",
- "wasmparser 0.116.1",
 ]
 
 [[package]]
@@ -4618,9 +4411,9 @@ dependencies = [
  "ark-ec",
  "ark-ff",
  "ark-serialize",
- "curve25519-dalek 4.1.3",
+ "curve25519-dalek",
  "ecdsa",
- "ed25519-dalek 2.1.1",
+ "ed25519-dalek",
  "elliptic-curve",
  "generic-array",
  "getrandom",
@@ -4636,27 +4429,12 @@ dependencies = [
  "sec1",
  "sha2 0.10.8",
  "sha3",
- "soroban-builtin-sdk-macros 22.0.0-rc.3",
- "soroban-env-common 22.0.0-rc.3",
+ "soroban-builtin-sdk-macros",
+ "soroban-env-common",
  "soroban-wasmi",
  "static_assertions",
  "stellar-strkey 0.0.9",
- "wasmparser 0.116.1",
-]
-
-[[package]]
-name = "soroban-env-macros"
-version = "21.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "242926fe5e0d922f12d3796cd7cd02dd824e5ef1caa088f45fce20b618309f64"
-dependencies = [
- "itertools 0.11.0",
- "proc-macro2",
- "quote",
- "serde",
- "serde_json",
- "stellar-xdr 21.2.0",
- "syn 2.0.77",
+ "wasmparser",
 ]
 
 [[package]]
@@ -4670,7 +4448,7 @@ dependencies = [
  "quote",
  "serde",
  "serde_json",
- "stellar-xdr 22.0.0-rc.1.1",
+ "stellar-xdr",
  "syn 2.0.77",
 ]
 
@@ -4678,20 +4456,6 @@ dependencies = [
 name = "soroban-hello"
 version = "22.0.0-rc.1"
 
-[[package]]
-name = "soroban-ledger-snapshot"
-version = "21.7.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "84589856911dfd6731695c9b51c858aed6d4540118c0a1e5c4c858ea13bc744c"
-dependencies = [
- "serde",
- "serde_json",
- "serde_with",
- "soroban-env-common 21.2.1",
- "soroban-env-host 21.2.1",
- "thiserror",
-]
-
 [[package]]
 name = "soroban-ledger-snapshot"
 version = "22.0.0-rc.3"
@@ -4701,31 +4465,11 @@ dependencies = [
  "serde",
  "serde_json",
  "serde_with",
- "soroban-env-common 22.0.0-rc.3",
- "soroban-env-host 22.0.0-rc.3",
+ "soroban-env-common",
+ "soroban-env-host",
  "thiserror",
 ]
 
-[[package]]
-name = "soroban-sdk"
-version = "21.7.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "69e39bf9e8ab05579c836e8e5be5f2f4c5ba75e7337ece20e975e82fc3a9d41e"
-dependencies = [
- "arbitrary",
- "bytes-lit",
- "ctor",
- "ed25519-dalek 2.1.1",
- "rand",
- "serde",
- "serde_json",
- "soroban-env-guest 21.2.1",
- "soroban-env-host 21.2.1",
- "soroban-ledger-snapshot 21.7.3",
- "soroban-sdk-macros 21.7.3",
- "stellar-strkey 0.0.8",
-]
-
 [[package]]
 name = "soroban-sdk"
 version = "22.0.0-rc.3"
@@ -4735,70 +4479,38 @@ dependencies = [
  "arbitrary",
  "bytes-lit",
  "ctor",
- "ed25519-dalek 2.1.1",
+ "ed25519-dalek",
  "rand",
  "rustc_version",
  "serde",
  "serde_json",
- "soroban-env-guest 22.0.0-rc.3",
- "soroban-env-host 22.0.0-rc.3",
- "soroban-ledger-snapshot 22.0.0-rc.3",
- "soroban-sdk-macros 22.0.0-rc.3",
+ "soroban-env-guest",
+ "soroban-env-host",
+ "soroban-ledger-snapshot",
+ "soroban-sdk-macros",
  "stellar-strkey 0.0.9",
 ]
 
-[[package]]
-name = "soroban-sdk-macros"
-version = "21.7.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "63c2173f1aacd56b4405eed71cb2a9694dff99d51ba72d4f0cbc5e4961fdabf4"
-dependencies = [
- "crate-git-revision 0.0.6",
- "darling",
- "itertools 0.11.0",
- "proc-macro2",
- "quote",
- "rustc_version",
- "sha2 0.10.8",
- "soroban-env-common 21.2.1",
- "soroban-spec 21.7.3",
- "soroban-spec-rust 21.7.3",
- "stellar-xdr 21.2.0",
- "syn 2.0.77",
-]
-
 [[package]]
 name = "soroban-sdk-macros"
 version = "22.0.0-rc.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "508c9d819a05109120664aab86c371e1b72c5bea20b1a13158b4ef7948d9f673"
 dependencies = [
- "crate-git-revision 0.0.6",
+ "crate-git-revision",
  "darling",
  "itertools 0.10.5",
  "proc-macro2",
  "quote",
  "rustc_version",
  "sha2 0.10.8",
- "soroban-env-common 22.0.0-rc.3",
- "soroban-spec 22.0.0-rc.3",
- "soroban-spec-rust 22.0.0-rc.3",
- "stellar-xdr 22.0.0-rc.1.1",
+ "soroban-env-common",
+ "soroban-spec",
+ "soroban-spec-rust",
+ "stellar-xdr",
  "syn 2.0.77",
 ]
 
-[[package]]
-name = "soroban-spec"
-version = "21.7.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7705bffbcc747c08e81698b87b4a787f8b268c25d88f777160091dc1ee8121cb"
-dependencies = [
- "base64 0.13.1",
- "stellar-xdr 21.2.0",
- "thiserror",
- "wasmparser 0.116.1",
-]
-
 [[package]]
 name = "soroban-spec"
 version = "22.0.0-rc.3"
@@ -4806,9 +4518,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "69001c97783ed3ce197eac2404e7beeabedd16e40e6f0aa210d1bc6a13063c33"
 dependencies = [
  "base64 0.13.1",
- "stellar-xdr 22.0.0-rc.1.1",
+ "stellar-xdr",
  "thiserror",
- "wasmparser 0.116.1",
+ "wasmparser",
 ]
 
 [[package]]
@@ -4820,24 +4532,8 @@ dependencies = [
  "serde_derive",
  "serde_json",
  "sha2 0.9.9",
- "soroban-spec 22.0.0-rc.3",
- "stellar-xdr 22.0.0-rc.1.1",
- "thiserror",
-]
-
-[[package]]
-name = "soroban-spec-rust"
-version = "21.7.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "48207ebc8616c2804a17203d1d86c53c3d3c804b682cbab011a135893db1cf78"
-dependencies = [
- "prettyplease",
- "proc-macro2",
- "quote",
- "sha2 0.10.8",
- "soroban-spec 21.7.3",
- "stellar-xdr 21.2.0",
- "syn 2.0.77",
+ "soroban-spec",
+ "stellar-xdr",
  "thiserror",
 ]
 
@@ -4851,8 +4547,8 @@ dependencies = [
  "proc-macro2",
  "quote",
  "sha2 0.10.8",
- "soroban-spec 22.0.0-rc.3",
- "stellar-xdr 22.0.0-rc.1.1",
+ "soroban-spec",
+ "stellar-xdr",
  "syn 2.0.77",
  "thiserror",
 ]
@@ -4866,12 +4562,12 @@ dependencies = [
  "hex",
  "itertools 0.10.5",
  "serde_json",
- "soroban-spec 22.0.0-rc.3",
+ "soroban-spec",
  "stellar-strkey 0.0.11",
- "stellar-xdr 22.0.0-rc.1.1",
+ "stellar-xdr",
  "thiserror",
  "tokio",
- "wasmparser 0.90.0",
+ "wasmparser",
  "which",
 ]
 
@@ -4889,8 +4585,8 @@ dependencies = [
  "serde_derive",
  "serde_json",
  "sha2 0.9.9",
- "soroban-spec 22.0.0-rc.3",
- "stellar-xdr 22.0.0-rc.1.1",
+ "soroban-spec",
+ "stellar-xdr",
  "temp-dir",
  "thiserror",
  "walkdir",
@@ -4902,22 +4598,22 @@ version = "22.0.0-rc.1"
 dependencies = [
  "assert_cmd",
  "assert_fs",
- "ed25519-dalek 2.1.1",
+ "ed25519-dalek",
  "fs_extra",
  "hex",
- "predicates 2.1.5",
+ "predicates",
  "sep5",
  "serde_json",
  "sha2 0.10.8",
  "soroban-cli",
- "soroban-ledger-snapshot 22.0.0-rc.3",
- "soroban-spec 22.0.0-rc.3",
+ "soroban-ledger-snapshot",
+ "soroban-spec",
  "soroban-spec-tools",
  "stellar-rpc-client",
  "stellar-strkey 0.0.11",
  "thiserror",
  "tokio",
- "toml 0.8.19",
+ "toml",
  "ulid",
  "walkdir",
  "which",
@@ -4925,11 +4621,11 @@ dependencies = [
 
 [[package]]
 name = "soroban-token-sdk"
-version = "21.7.2"
+version = "22.0.0-rc.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c6ede0da76646037f3ea5db9ccd37830865444bb24f137cb8f0af8282c784f5"
+checksum = "17bb933a3dcf41d234f6d669b077eb755663773630c6899a1c8a30dddf950f52"
 dependencies = [
- "soroban-sdk 21.7.2",
+ "soroban-sdk",
 ]
 
 [[package]]
@@ -4985,7 +4681,7 @@ dependencies = [
  "async-trait",
  "bollard",
  "byteorder 1.5.0",
- "ed25519-dalek 2.1.1",
+ "ed25519-dalek",
  "env_logger",
  "futures",
  "hex",
@@ -4997,18 +4693,18 @@ dependencies = [
  "once_cell",
  "phf",
  "pretty_assertions",
- "reqwest 0.11.27",
+ "reqwest",
  "sep5",
  "serde",
  "serde_derive",
  "serde_json",
  "serial_test",
- "sha2 0.9.9",
- "slip10",
- "soroban-spec 22.0.0-rc.3",
+ "sha2 0.10.8",
+ "slipped10",
+ "soroban-spec",
  "stellar-rpc-client",
  "stellar-strkey 0.0.11",
- "stellar-xdr 22.0.0-rc.1.1",
+ "stellar-xdr",
  "test-case",
  "testcontainers",
  "thiserror",
@@ -5034,7 +4730,7 @@ dependencies = [
  "serde_with",
  "sha2 0.10.8",
  "stellar-strkey 0.0.9",
- "stellar-xdr 22.0.0-rc.1.1",
+ "stellar-xdr",
  "termcolor",
  "termcolor_output",
  "thiserror",
@@ -5049,7 +4745,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "12d2bf45e114117ea91d820a846fd1afbe3ba7d717988fee094ce8227a3bf8bd"
 dependencies = [
  "base32",
- "crate-git-revision 0.0.6",
+ "crate-git-revision",
  "thiserror",
 ]
 
@@ -5059,7 +4755,7 @@ version = "0.0.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5e3aa3ed00e70082cb43febc1c2afa5056b9bb3e348bbb43d0cd0aa88a611144"
 dependencies = [
- "crate-git-revision 0.0.6",
+ "crate-git-revision",
  "data-encoding",
  "thiserror",
 ]
@@ -5070,26 +4766,10 @@ version = "0.0.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0989c9a05eccbd08b60e603a1c7e3ed3ec92c0de73b8681fc964d272ab2b2697"
 dependencies = [
- "crate-git-revision 0.0.6",
+ "crate-git-revision",
  "data-encoding",
 ]
 
-[[package]]
-name = "stellar-xdr"
-version = "21.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2675a71212ed39a806e415b0dbf4702879ff288ec7f5ee996dda42a135512b50"
-dependencies = [
- "arbitrary",
- "base64 0.13.1",
- "crate-git-revision 0.0.6",
- "escape-bytes",
- "hex",
- "serde",
- "serde_with",
- "stellar-strkey 0.0.8",
-]
-
 [[package]]
 name = "stellar-xdr"
 version = "22.0.0-rc.1.1"
@@ -5099,7 +4779,7 @@ dependencies = [
  "arbitrary",
  "base64 0.13.1",
  "clap",
- "crate-git-revision 0.0.6",
+ "crate-git-revision",
  "escape-bytes",
  "hex",
  "schemars",
@@ -5123,12 +4803,6 @@ dependencies = [
  "precomputed-hash",
 ]
 
-[[package]]
-name = "strsim"
-version = "0.10.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623"
-
 [[package]]
 name = "strsim"
 version = "0.11.1"
@@ -5223,12 +4897,6 @@ dependencies = [
  "unicode-ident",
 ]
 
-[[package]]
-name = "sync_wrapper"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160"
-
 [[package]]
 name = "sync_wrapper"
 version = "1.0.1"
@@ -5240,20 +4908,20 @@ dependencies = [
 
 [[package]]
 name = "system-configuration"
-version = "0.5.1"
+version = "0.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ba3a3adc5c275d719af8cb4272ea1c4a6d668a777f37e115f6d11ddbc1c8e0e7"
+checksum = "3c879d448e9d986b661742763247d3693ed13609438cf3d006f51f5368a5ba6b"
 dependencies = [
- "bitflags 1.3.2",
+ "bitflags 2.6.0",
  "core-foundation",
  "system-configuration-sys",
 ]
 
 [[package]]
 name = "system-configuration-sys"
-version = "0.5.0"
+version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a75fb188eb626b924683e3b95e3a48e63551fcfb51949de2f06a9d91dbee93c9"
+checksum = "8e1d1b10ced5ca923a1fcb8d03e96b8d3268065d724548c0211415ff6ac6bac4"
 dependencies = [
  "core-foundation-sys",
  "libc",
@@ -5357,42 +5025,42 @@ dependencies = [
 name = "test_constructor"
 version = "22.0.0-rc.1"
 dependencies = [
- "soroban-sdk 22.0.0-rc.3",
+ "soroban-sdk",
 ]
 
 [[package]]
 name = "test_custom_account"
 version = "22.0.0-rc.1"
 dependencies = [
- "soroban-sdk 21.7.2",
+ "soroban-sdk",
 ]
 
 [[package]]
 name = "test_custom_types"
 version = "22.0.0-rc.1"
 dependencies = [
- "soroban-sdk 21.7.2",
+ "soroban-sdk",
 ]
 
 [[package]]
 name = "test_hello_world"
 version = "22.0.0-rc.1"
 dependencies = [
- "soroban-sdk 21.7.2",
+ "soroban-sdk",
 ]
 
 [[package]]
 name = "test_swap"
 version = "22.0.0-rc.1"
 dependencies = [
- "soroban-sdk 21.7.2",
+ "soroban-sdk",
 ]
 
 [[package]]
 name = "test_token"
 version = "22.0.0-rc.1"
 dependencies = [
- "soroban-sdk 21.7.2",
+ "soroban-sdk",
  "soroban-token-sdk",
 ]
 
@@ -5400,7 +5068,7 @@ dependencies = [
 name = "test_udt"
 version = "22.0.0-rc.1"
 dependencies = [
- "soroban-sdk 21.7.2",
+ "soroban-sdk",
 ]
 
 [[package]]
@@ -5413,7 +5081,7 @@ dependencies = [
  "bollard",
  "bollard-stubs",
  "bytes",
- "dirs 5.0.1",
+ "dirs",
  "docker_credential",
  "either",
  "futures",
@@ -5421,7 +5089,7 @@ dependencies = [
  "memchr",
  "parse-display",
  "pin-project-lite",
- "reqwest 0.12.7",
+ "reqwest",
  "serde",
  "serde_json",
  "serde_with",
@@ -5632,15 +5300,6 @@ dependencies = [
  "tokio",
 ]
 
-[[package]]
-name = "toml"
-version = "0.5.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234"
-dependencies = [
- "serde",
-]
-
 [[package]]
 name = "toml"
 version = "0.8.19"
@@ -5650,7 +5309,7 @@ dependencies = [
  "serde",
  "serde_spanned",
  "toml_datetime",
- "toml_edit 0.22.20",
+ "toml_edit",
 ]
 
 [[package]]
@@ -5662,17 +5321,6 @@ dependencies = [
  "serde",
 ]
 
-[[package]]
-name = "toml_edit"
-version = "0.21.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1"
-dependencies = [
- "indexmap 2.3.0",
- "toml_datetime",
- "winnow 0.5.40",
-]
-
 [[package]]
 name = "toml_edit"
 version = "0.22.20"
@@ -5683,7 +5331,7 @@ dependencies = [
  "serde",
  "serde_spanned",
  "toml_datetime",
- "winnow 0.6.18",
+ "winnow",
 ]
 
 [[package]]
@@ -6017,9 +5665,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-opt"
-version = "0.114.2"
+version = "0.116.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "effbef3bd1dde18acb401f73e740a6f3d4a1bc651e9773bddc512fe4d8d68f67"
+checksum = "2fd87a4c135535ffed86123b6fb0f0a5a0bc89e50416c942c5f0662c645f679c"
 dependencies = [
  "anyhow",
  "libc",
@@ -6033,9 +5681,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-opt-cxx-sys"
-version = "0.114.2"
+version = "0.116.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c09e24eb283919ace2ed5733bda4842a59ce4c8de110ef5c6d98859513d17047"
+checksum = "8c57b28207aa724318fcec6575fe74803c23f6f266fce10cbc9f3f116762f12e"
 dependencies = [
  "anyhow",
  "cxx",
@@ -6045,9 +5693,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-opt-sys"
-version = "0.114.2"
+version = "0.116.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "36f2f817bed2e8d65eb779fa37317e74de15585751f903c9118342d1970703a4"
+checksum = "8a1cce564dc768dacbdb718fc29df2dba80bd21cb47d8f77ae7e3d95ceb98cbe"
 dependencies = [
  "anyhow",
  "cc",
@@ -6086,15 +5734,6 @@ dependencies = [
  "paste",
 ]
 
-[[package]]
-name = "wasmparser"
-version = "0.90.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b62c8d843f4423efee314dc75a1049886deba3214f7e7f9ff0e4e58b4d618581"
-dependencies = [
- "indexmap 1.9.3",
-]
-
 [[package]]
 name = "wasmparser"
 version = "0.116.1"
@@ -6380,15 +6019,6 @@ version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
 
-[[package]]
-name = "winnow"
-version = "0.5.40"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f593a95398737aeed53e489c785df13f3618e41dbcd6718c6addbf1395aa6876"
-dependencies = [
- "memchr",
-]
-
 [[package]]
 name = "winnow"
 version = "0.6.18"
diff --git a/Cargo.toml b/Cargo.toml
index 31e92e40b..f689accea 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -91,7 +91,7 @@ tracing = "0.1.37"
 tracing-subscriber = "0.3.16"
 tracing-appender = "0.2.2"
 which = "4.4.0"
-wasmparser = "0.90.0"
+wasmparser = "0.116.1"
 directories = "5.0.1"
 ulid = "1.1"
 termcolor = "1.1.3"
@@ -100,7 +100,11 @@ ed25519-dalek = ">= 2.1.1"
 http = "1.0.0"
 jsonrpsee-http-client = "0.20.1"
 jsonrpsee-core = "0.20.1"
-tokio = "1.28.1"
+walkdir = "2.5.0"
+toml_edit = "0.22.20"
+toml = "0.8.19"
+reqwest = "0.12.7"
+predicates = "3.1.2"
 
 [profile.test-wasms]
 inherits = "release"
diff --git a/cmd/crates/soroban-test/Cargo.toml b/cmd/crates/soroban-test/Cargo.toml
index d9eb31bdd..f694ec533 100644
--- a/cmd/crates/soroban-test/Cargo.toml
+++ b/cmd/crates/soroban-test/Cargo.toml
@@ -29,9 +29,9 @@ thiserror = "1.0.31"
 sha2 = "0.10.6"
 assert_cmd = "2.0.4"
 assert_fs = "1.0.7"
-predicates = "2.1.5"
+predicates = { workspace = true }
 fs_extra = "1.3.0"
-toml = "0.8.10"
+toml = { workspace = true }
 
 
 [dev-dependencies]
diff --git a/cmd/crates/soroban-test/tests/fixtures/test-wasms/custom_account/Cargo.toml b/cmd/crates/soroban-test/tests/fixtures/test-wasms/custom_account/Cargo.toml
index 9be386b69..330fa03df 100644
--- a/cmd/crates/soroban-test/tests/fixtures/test-wasms/custom_account/Cargo.toml
+++ b/cmd/crates/soroban-test/tests/fixtures/test-wasms/custom_account/Cargo.toml
@@ -12,7 +12,7 @@ crate-type = ["cdylib"]
 doctest = false
 
 [dependencies]
-soroban-sdk = { version = "=21.7.2" }
+soroban-sdk = { workspace = true }
 
 [dev-dependencies]
-soroban-sdk = { version = "=21.7.2", features = ["testutils"]}
+soroban-sdk = { workspace = true, features = ["testutils"]}
diff --git a/cmd/crates/soroban-test/tests/fixtures/test-wasms/custom_account/src/lib.rs b/cmd/crates/soroban-test/tests/fixtures/test-wasms/custom_account/src/lib.rs
index c71324110..ed924322b 100644
--- a/cmd/crates/soroban-test/tests/fixtures/test-wasms/custom_account/src/lib.rs
+++ b/cmd/crates/soroban-test/tests/fixtures/test-wasms/custom_account/src/lib.rs
@@ -115,7 +115,9 @@ impl CustomAccountInterface for Contract {
                         return Err(Error::NotPermitted);
                     }
                 }
-                Context::CreateContractHostFn(_) => return Err(Error::InvalidContext),
+                Context::CreateContractWithCtorHostFn(_) | Context::CreateContractHostFn(_) => {
+                    return Err(Error::InvalidContext)
+                }
             };
         }
 
diff --git a/cmd/crates/soroban-test/tests/fixtures/test-wasms/custom_type/Cargo.toml b/cmd/crates/soroban-test/tests/fixtures/test-wasms/custom_type/Cargo.toml
index 7c4ca5828..01429b00a 100644
--- a/cmd/crates/soroban-test/tests/fixtures/test-wasms/custom_type/Cargo.toml
+++ b/cmd/crates/soroban-test/tests/fixtures/test-wasms/custom_type/Cargo.toml
@@ -12,7 +12,7 @@ crate-type = ["cdylib", "rlib"]
 doctest = false
 
 [dependencies]
-soroban-sdk = { version = "=21.7.2" }
+soroban-sdk = { workspace = true }
 
 [dev-dependencies]
-soroban-sdk = { version = "=21.7.2", features = ["testutils"]}
+soroban-sdk = { workspace = true, features = ["testutils"]}
diff --git a/cmd/crates/soroban-test/tests/fixtures/test-wasms/hello_world/Cargo.toml b/cmd/crates/soroban-test/tests/fixtures/test-wasms/hello_world/Cargo.toml
index 19b7353ca..6f00b845e 100644
--- a/cmd/crates/soroban-test/tests/fixtures/test-wasms/hello_world/Cargo.toml
+++ b/cmd/crates/soroban-test/tests/fixtures/test-wasms/hello_world/Cargo.toml
@@ -12,7 +12,7 @@ crate-type = ["cdylib", "rlib"]
 doctest = false
 
 [dependencies]
-soroban-sdk = { version = "=21.7.2" }
+soroban-sdk = { workspace = true }
 
 [dev-dependencies]
-soroban-sdk = { version = "=21.7.2", features = ["testutils"]}
+soroban-sdk = { workspace = true, features = ["testutils"]}
diff --git a/cmd/crates/soroban-test/tests/fixtures/test-wasms/hello_world/src/lib.rs b/cmd/crates/soroban-test/tests/fixtures/test-wasms/hello_world/src/lib.rs
index 40006a1b7..b4b53c237 100644
--- a/cmd/crates/soroban-test/tests/fixtures/test-wasms/hello_world/src/lib.rs
+++ b/cmd/crates/soroban-test/tests/fixtures/test-wasms/hello_world/src/lib.rs
@@ -77,7 +77,7 @@ mod test {
     #[test]
     fn test_hello() {
         let env = Env::default();
-        let contract_id = env.register_contract(None, Contract);
+        let contract_id = env.register(Contract, ());
         let client = ContractClient::new(&env, &contract_id);
         let world = symbol_short!("world");
         let res = client.hello(&world);
diff --git a/cmd/crates/soroban-test/tests/fixtures/test-wasms/swap/Cargo.toml b/cmd/crates/soroban-test/tests/fixtures/test-wasms/swap/Cargo.toml
index 509483408..f74201a31 100644
--- a/cmd/crates/soroban-test/tests/fixtures/test-wasms/swap/Cargo.toml
+++ b/cmd/crates/soroban-test/tests/fixtures/test-wasms/swap/Cargo.toml
@@ -12,7 +12,7 @@ crate-type = ["cdylib"]
 doctest = false
 
 [dependencies]
-soroban-sdk = { version = "=21.7.2" }
+soroban-sdk = { workspace = true }
 
 [dev-dependencies]
-soroban-sdk = { version = "=21.7.2", features = ["testutils"] }
+soroban-sdk = { workspace = true, features = ["testutils"] }
diff --git a/cmd/crates/soroban-test/tests/fixtures/test-wasms/swap/src/test.rs b/cmd/crates/soroban-test/tests/fixtures/test-wasms/swap/src/test.rs
index 5c973880e..a60615162 100644
--- a/cmd/crates/soroban-test/tests/fixtures/test-wasms/swap/src/test.rs
+++ b/cmd/crates/soroban-test/tests/fixtures/test-wasms/swap/src/test.rs
@@ -21,7 +21,7 @@ fn create_token_contract<'a>(e: &Env, admin: &Address) -> (TokenClient<'a>, Toke
 }
 
 fn create_atomic_swap_contract(e: &Env) -> AtomicSwapContractClient {
-    AtomicSwapContractClient::new(e, &e.register_contract(None, AtomicSwapContract {}))
+    AtomicSwapContractClient::new(e, &e.register(AtomicSwapContract {}, ()))
 }
 
 #[test]
diff --git a/cmd/crates/soroban-test/tests/fixtures/test-wasms/token/Cargo.toml b/cmd/crates/soroban-test/tests/fixtures/test-wasms/token/Cargo.toml
index 03055f2b7..880c39d52 100644
--- a/cmd/crates/soroban-test/tests/fixtures/test-wasms/token/Cargo.toml
+++ b/cmd/crates/soroban-test/tests/fixtures/test-wasms/token/Cargo.toml
@@ -12,8 +12,8 @@ rust-version.workspace = true
 crate-type = ["cdylib"]
 
 [dependencies]
-soroban-sdk = { version = "=21.7.2" }
-soroban-token-sdk = { version = "=21.7.2" }
+soroban-sdk = { workspace = true }
+soroban-token-sdk = { workspace = true }
 
 [dev-dependencies]
-soroban-sdk = { version = "=21.7.2", features = ["testutils"] }
+soroban-sdk = { workspace = true, features = ["testutils"] }
diff --git a/cmd/crates/soroban-test/tests/fixtures/test-wasms/token/src/test.rs b/cmd/crates/soroban-test/tests/fixtures/test-wasms/token/src/test.rs
index 08be5f9ef..cd892a646 100644
--- a/cmd/crates/soroban-test/tests/fixtures/test-wasms/token/src/test.rs
+++ b/cmd/crates/soroban-test/tests/fixtures/test-wasms/token/src/test.rs
@@ -9,7 +9,7 @@ use soroban_sdk::{
 };
 
 fn create_token<'a>(e: &Env, admin: &Address) -> TokenClient<'a> {
-    let token = TokenClient::new(e, &e.register_contract(None, Token {}));
+    let token = TokenClient::new(e, &e.register(Token {}, ()));
     token.initialize(admin, &7, &"name".into_val(e), &"symbol".into_val(e));
     token
 }
@@ -247,7 +247,7 @@ fn initialize_already_initialized() {
 fn decimal_is_over_max() {
     let e = Env::default();
     let admin = Address::generate(&e);
-    let token = TokenClient::new(&e, &e.register_contract(None, Token {}));
+    let token = TokenClient::new(&e, &e.register(Token {}, ()));
     token.initialize(
         &admin,
         &(u32::from(u8::MAX) + 1),
diff --git a/cmd/crates/soroban-test/tests/fixtures/test-wasms/udt/Cargo.toml b/cmd/crates/soroban-test/tests/fixtures/test-wasms/udt/Cargo.toml
index aea356447..206284802 100644
--- a/cmd/crates/soroban-test/tests/fixtures/test-wasms/udt/Cargo.toml
+++ b/cmd/crates/soroban-test/tests/fixtures/test-wasms/udt/Cargo.toml
@@ -12,7 +12,7 @@ crate-type = ["cdylib"]
 doctest = false
 
 [dependencies]
-soroban-sdk = { version = "=21.7.2" }
+soroban-sdk = { workspace = true }
 
 [dev-dependencies]
-soroban-sdk = { version = "=21.7.2" , features = ["testutils"]}
+soroban-sdk = { workspace = true , features = ["testutils"]}
diff --git a/cmd/crates/soroban-test/tests/fixtures/test-wasms/udt/src/lib.rs b/cmd/crates/soroban-test/tests/fixtures/test-wasms/udt/src/lib.rs
index 695d8a7a3..efb3cf480 100644
--- a/cmd/crates/soroban-test/tests/fixtures/test-wasms/udt/src/lib.rs
+++ b/cmd/crates/soroban-test/tests/fixtures/test-wasms/udt/src/lib.rs
@@ -80,7 +80,7 @@ mod test {
     #[test]
     fn test_add() {
         let e = Env::default();
-        let contract_id = e.register_contract(None, Contract);
+        let contract_id = e.register(Contract, ());
         let client = ContractClient::new(&e, &contract_id);
 
         let udt = UdtStruct {
diff --git a/cmd/crates/soroban-test/tests/it/integration/hello_world.rs b/cmd/crates/soroban-test/tests/it/integration/hello_world.rs
index a6bd00c91..fd38c2012 100644
--- a/cmd/crates/soroban-test/tests/it/integration/hello_world.rs
+++ b/cmd/crates/soroban-test/tests/it/integration/hello_world.rs
@@ -96,7 +96,7 @@ async fn invoke() {
         .arg("--id")
         .arg(id)
         .assert()
-        .stdout(predicates::str::contains(id).not())
+        .stdout(predicates::str::contains(id))
         .success();
     invoke_hello_world_with_lib(sandbox, id).await;
     let config_locator = locator::Args {
diff --git a/cmd/crates/stellar-ledger/Cargo.toml b/cmd/crates/stellar-ledger/Cargo.toml
index 10fd34e42..b3d6318a4 100644
--- a/cmd/crates/stellar-ledger/Cargo.toml
+++ b/cmd/crates/stellar-ledger/Cargo.toml
@@ -21,20 +21,20 @@ thiserror = "1.0.32"
 serde = "1.0.82"
 serde_derive = "1.0.82"
 serde_json = "1.0.82"
-sha2 = "0.9.9"
+sha2 = { workspace = true }
 ed25519-dalek = { workspace = true }
 stellar-strkey = { workspace = true }
 ledger-transport-hid = "0.10.0"
 ledger-transport = "0.10.0"
 sep5.workspace = true
-slip10 = "0.4.3"
+slip10 = { package = "slipped10", version = "0.4.6" }
 tracing = { workspace = true }
 hex.workspace = true
 byteorder = "1.5.0"
 bollard = { workspace = true }
 home = "0.5.9"
 tokio = { version = "1", features = ["full"] }
-reqwest = { version = "0.11", features = ["json"] }
+reqwest = { workspace = true, features = ["json"] }
 soroban-rpc.workspace = true
 phf = { version = "0.11.2", features = ["macros"] }
 futures = "0.3.30"
diff --git a/cmd/soroban-cli/Cargo.toml b/cmd/soroban-cli/Cargo.toml
index d2a53e6f2..f1a2b146d 100644
--- a/cmd/soroban-cli/Cargo.toml
+++ b/cmd/soroban-cli/Cargo.toml
@@ -83,18 +83,17 @@ reqwest = { version = "0.12.7", default-features = false, features = [
 jsonrpsee-http-client = "0.20.1"
 jsonrpsee-core = "0.20.1"
 regex = "1.6.0"
-wasm-opt = { version = "0.114.0", optional = true }
+wasm-opt = { version = "0.116.1", optional = true }
 chrono = { version = "0.4.27", features = ["serde"] }
 rpassword = "7.2.0"
-dirs = "4.0.0"
-toml = "0.5.9"
+toml = { workspace = true }
 itertools = "0.10.5"
 shlex = "1.1.0"
 sep5 = { workspace = true }
 ethnum = { workspace = true }
 clap-markdown = { version = "0.1.4", optional = true }
 which = { workspace = true, features = ["regex"] }
-strsim = "0.10.0"
+strsim = "0.11.1"
 heck = "0.5.0"
 tracing = { workspace = true }
 tracing-appender = { workspace = true }
@@ -109,7 +108,7 @@ strum_macros = "0.17.1"
 async-compression = { version = "0.4.12", features = ["tokio", "gzip"] }
 shell-escape = "0.1.5"
 tempfile = "3.8.1"
-toml_edit = "0.21.0"
+toml_edit = { workspace = true }
 rust-embed = { version = "8.2.0", features = ["debug-embed"] }
 bollard = { workspace = true }
 futures-util = "0.3.30"
@@ -127,7 +126,7 @@ url = "2.5.2"
 wasm-gen = "0.1.4"
 
 [build-dependencies]
-crate-git-revision = "0.0.4"
+crate-git-revision = "0.0.6"
 serde.workspace = true
 thiserror.workspace = true
 
@@ -135,6 +134,6 @@ thiserror.workspace = true
 [dev-dependencies]
 assert_cmd = "2.0.4"
 assert_fs = "1.0.7"
-predicates = "2.1.5"
+predicates = { workspace = true }
 walkdir = "2.5.0"
 mockito = "1.5.0"
diff --git a/cmd/soroban-cli/src/commands/contract/init.rs b/cmd/soroban-cli/src/commands/contract/init.rs
index 96f28c64e..9147bacf0 100644
--- a/cmd/soroban-cli/src/commands/contract/init.rs
+++ b/cmd/soroban-cli/src/commands/contract/init.rs
@@ -275,7 +275,7 @@ mod tests {
         let contract_dir = project_dir.join("contracts").join(contract_name);
         let cargo_toml_path = contract_dir.as_path().join("Cargo.toml");
         let cargo_toml_str = read_to_string(cargo_toml_path.clone()).unwrap();
-        let doc = cargo_toml_str.parse::<toml_edit::Document>().unwrap();
+        let doc: toml_edit::DocumentMut = cargo_toml_str.parse().unwrap();
         assert!(
             doc.get("dependencies")
                 .unwrap()
diff --git a/cmd/soroban-cli/src/config/locator.rs b/cmd/soroban-cli/src/config/locator.rs
index 8f51975a1..b6f5c75c1 100644
--- a/cmd/soroban-cli/src/config/locator.rs
+++ b/cmd/soroban-cli/src/config/locator.rs
@@ -1,4 +1,5 @@
 use clap::arg;
+use directories::UserDirs;
 use itertools::Itertools;
 use serde::de::DeserializeOwned;
 use std::{
@@ -419,11 +420,10 @@ impl KeyType {
     }
 
     pub fn read_from_path<T: DeserializeOwned>(path: &Path) -> Result<T, Error> {
-        let data = fs::read(path).map_err(|_| Error::NetworkFileRead {
+        let data = fs::read_to_string(path).map_err(|_| Error::NetworkFileRead {
             path: path.to_path_buf(),
         })?;
-        let res = toml::from_slice(data.as_slice());
-        Ok(res?)
+        Ok(toml::from_str(&data)?)
     }
 
     pub fn read_with_global<T: DeserializeOwned>(&self, key: &str, pwd: &Path) -> Result<T, Error> {
@@ -494,8 +494,9 @@ pub fn global_config_path() -> Result<PathBuf, Error> {
     let config_dir = if let Ok(config_home) = std::env::var("XDG_CONFIG_HOME") {
         PathBuf::from_str(&config_home).map_err(|_| Error::XdgConfigHome(config_home))?
     } else {
-        dirs::home_dir()
+        UserDirs::new()
             .ok_or(Error::HomeDirNotFound)?
+            .home_dir()
             .join(".config")
     };
 
diff --git a/cmd/soroban-cli/src/config/mod.rs b/cmd/soroban-cli/src/config/mod.rs
index 6cd9b4d71..a429ff434 100644
--- a/cmd/soroban-cli/src/config/mod.rs
+++ b/cmd/soroban-cli/src/config/mod.rs
@@ -171,9 +171,8 @@ impl Config {
         let path = locator::config_file()?;
 
         if path.exists() {
-            let data = fs::read(&path).map_err(|_| locator::Error::FileRead { path })?;
-
-            Ok(toml::from_slice(&data)?)
+            let data = fs::read_to_string(&path).map_err(|_| locator::Error::FileRead { path })?;
+            Ok(toml::from_str(&data)?)
         } else {
             Ok(Config::default())
         }
diff --git a/cmd/soroban-cli/src/utils/contract-template/src/test.rs b/cmd/soroban-cli/src/utils/contract-template/src/test.rs
index af69a7ecb..0bdcba082 100644
--- a/cmd/soroban-cli/src/utils/contract-template/src/test.rs
+++ b/cmd/soroban-cli/src/utils/contract-template/src/test.rs
@@ -6,7 +6,7 @@ use soroban_sdk::{vec, Env, String};
 #[test]
 fn test() {
     let env = Env::default();
-    let contract_id = env.register_contract(None, Contract);
+    let contract_id = env.register(Contract, ());
     let client = ContractClient::new(&env, &contract_id);
 
     let words = client.hello(&String::from_str(&env, "Dev"));
diff --git a/deny.toml b/deny.toml
index 7588e71f1..238e91a14 100644
--- a/deny.toml
+++ b/deny.toml
@@ -252,6 +252,63 @@ deny = [
 
 # Certain crates/versions that will be skipped when doing duplicate detection.
 skip = [
+
+    # Requires updating slipped10 to newest sha2 others are dependents that will be updated
+    { crate = "sha2", reason = "temporary duplicate until upstream updates" },
+    { crate = "digest", reason = "temporary duplicate until upstream updates" },
+    { crate = "block-buffer", reason = "temporary duplicate until upstream updates" },
+    # slipped again 0.12.1
+    { crate = "hmac", reason = "temp" },
+
+    # update rpassword, hidapi (then ledger-transport-hid), and dirs-sys (then directories) to 0.52
+    # { crate = "window-sys", reason = "temp" },
+
+    # syn is too large of a surface to check
+    { crate = "syn", reason = "Too many crates haven't updated to v2" },
+
+    # Need to release new version and update all stellar crates
+    { crate = "stellar-strkey", reason = "Temp until new release and updates upstream", version = "0.0.8" },
+
+    # Need to update jsonrpsee in stellar-rpc-client
+    { crate = "rustls-pemfile", reason = "Temp until new release and updates upstream" },
+    { crate = "rustls-webpki", reason = "Temp until new release and updates upstream" },
+    { crate = "rustls-native-certs", reason = "Temp until new release and updates upstream", version = "0.7.3" },
+    { crate = "rustls", reason = "Temp until new release and updates upstream" },
+    { crate = "hyper", reason = "temporary duplicate until upstream updates" },
+    { crate = "hyper-rustls", reason = "temporary duplicate until upstream updates", version = "0.27.3" },
+    { crate = "http-body", reason = "temporary duplicate until upstream updates" },
+    { crate = "http", reason = "temporary duplicate until upstream updates" },
+    { crate = "h2", reason = "temporary duplicate until upstream updates", version = "0.3.26" },
+    { crate = "base64", reason = "temporary duplicate until upstream updates", version = "0.22.1" },
+    # Upgrade stellar-rpc-client to use 0.26.0
+    { crate = "tokio-rustls", reason = "temporary duplicate until upstream updates" },
+
+    # wasm-opt
+    { crate = "heck", reason = "wasm-opt needs to update to 0.5", version = "0.5.0"},
+    { crate = "strum", reason = "wasm-opt needs to update", version = "0.26.3" },
+    { crate = "strum_macros", reason = "wasm-opt needs to update", version = "0.26.4" },
+
+
+    # soroban-env-host  must upgrade ark-* to 0.14.5
+    { crate = "hashbrown", reason = "temp", version = "13.2"},
+
+    { crate = "windows-sys", reason = "temp", version = "0.59.0"},
+    { crate = "windows-targets", reason = "temp", version = "0.52.6"},
+    { crate = "windows_x86_64_gnu", reason = "temp", version = "0.52.6"},
+    { crate = "windows_x86_64_msvc", reason = "temp", version = "0.52.6"},
+    # { crate = "dir-sys", reason = "temp", version }
+    #
+    # update tracing-subscriber
+    { crate = "regex-syntax", reason = "temp", version = "0.8.4" },
+    { crate = "regex-automata", reason = "temp", version = "0.4.7" },
+
+    # wasm-gen update
+    { crate = "byteorder", reason = "temp", version = "1.5.0" },
+
+    # testcontainers
+    { crate = "idna", reason = "temp", version = "0.5.0" },
+
+
     # { name = "hashbrown", version = "=0.13.2" },
     # { name = "syn", version = "=1.0.109" },
 ]

From 77788732f7ed446a21586ede7416e6a599b0c97b Mon Sep 17 00:00:00 2001
From: Leigh McCulloch <351529+leighmcculloch@users.noreply.github.com>
Date: Tue, 19 Nov 2024 03:49:20 +1000
Subject: [PATCH 24/31] Do not run npm commands but output instructions instead
 (#1731)

---
 .../ts-tests/initialize.sh                    |  1 +
 .../commands/contract/bindings/typescript.rs  | 24 ++++++++++---------
 2 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/cmd/crates/soroban-spec-typescript/ts-tests/initialize.sh b/cmd/crates/soroban-spec-typescript/ts-tests/initialize.sh
index d85eff115..031061cca 100755
--- a/cmd/crates/soroban-spec-typescript/ts-tests/initialize.sh
+++ b/cmd/crates/soroban-spec-typescript/ts-tests/initialize.sh
@@ -37,6 +37,7 @@ function deploy_all() {
 }
 function bind() {
   exe eval "./soroban contract bindings typescript --contract-id $(cat $1) --output-dir ./node_modules/$2 --overwrite"
+  exe eval "sh -c \"cd ./node_modules/$2 && npm install && npm run build\""
 }
 function bind_all() {
   bind contract-id-custom-types.txt test-custom-types
diff --git a/cmd/soroban-cli/src/commands/contract/bindings/typescript.rs b/cmd/soroban-cli/src/commands/contract/bindings/typescript.rs
index 84e2b1762..4fcfe0955 100644
--- a/cmd/soroban-cli/src/commands/contract/bindings/typescript.rs
+++ b/cmd/soroban-cli/src/commands/contract/bindings/typescript.rs
@@ -5,6 +5,7 @@ use soroban_spec_tools::contract as contract_spec;
 use soroban_spec_typescript::{self as typescript, boilerplate::Project};
 use stellar_strkey::DecodeError;
 
+use crate::print::Print;
 use crate::wasm;
 use crate::{
     commands::{contract::fetch, global, NetworkRunnable},
@@ -13,6 +14,7 @@ use crate::{
         network::{self, Network},
     },
     get_spec::{self, get_remote_contract_spec},
+    xdr::{Hash, ScAddress},
 };
 
 #[derive(Parser, Debug, Clone)]
@@ -83,7 +85,9 @@ impl NetworkRunnable for Cmd {
         global_args: Option<&global::Args>,
         config: Option<&config::Args>,
     ) -> Result<(), Error> {
+        let print = Print::new(global_args.is_some_and(|a| a.quiet));
         let spec = if let Some(wasm) = &self.wasm {
+            print.infoln("Loading contract spec from file...");
             let wasm: wasm::Args = wasm.into();
             wasm.parse()?.spec
         } else {
@@ -97,6 +101,8 @@ impl NetworkRunnable for Cmd {
                 .resolve_contract_id(&self.contract_id, &network.network_passphrase)?
                 .0;
 
+            let contract_address = ScAddress::Contract(Hash(contract_id));
+            print.globeln(format!("Downloading contract spec: {contract_address}"));
             get_remote_contract_spec(
                 &contract_id,
                 &self.locator,
@@ -129,6 +135,7 @@ impl NetworkRunnable for Cmd {
                 .expect("why did we remove the default futurenet network?")
                 .into()
         });
+        print.infoln(format!("Network: {network_passphrase}"));
         let absolute_path = self.output_dir.canonicalize()?;
         let file_name = absolute_path
             .file_name()
@@ -136,6 +143,7 @@ impl NetworkRunnable for Cmd {
         let contract_name = &file_name
             .to_str()
             .ok_or_else(|| Error::NotUtf8(file_name.to_os_string()))?;
+        print.infoln(format!("Embedding contract address: {}", self.contract_id));
         p.init(
             contract_name,
             &self.contract_id,
@@ -143,17 +151,11 @@ impl NetworkRunnable for Cmd {
             &network_passphrase,
             &spec,
         )?;
-        std::process::Command::new("npm")
-            .arg("install")
-            .current_dir(&self.output_dir)
-            .spawn()?
-            .wait()?;
-        std::process::Command::new("npm")
-            .arg("run")
-            .arg("build")
-            .current_dir(&self.output_dir)
-            .spawn()?
-            .wait()?;
+        print.checkln("Generated!");
+        print.infoln(format!(
+            "Run \"npm install && npm run build\" in {:?} to build the JavaScript NPM package.",
+            self.output_dir
+        ));
         Ok(())
     }
 }

From 90db678c08e51e84f05719b5f0965e8f53c3c893 Mon Sep 17 00:00:00 2001
From: Leigh McCulloch <351529+leighmcculloch@users.noreply.github.com>
Date: Tue, 19 Nov 2024 04:19:46 +1000
Subject: [PATCH 25/31] Use the same network and contract resolution for all of
 the bindings generation logic (#1733)

---
 .../commands/contract/bindings/typescript.rs  | 50 ++++++++-----------
 1 file changed, 20 insertions(+), 30 deletions(-)

diff --git a/cmd/soroban-cli/src/commands/contract/bindings/typescript.rs b/cmd/soroban-cli/src/commands/contract/bindings/typescript.rs
index 4fcfe0955..679e757f4 100644
--- a/cmd/soroban-cli/src/commands/contract/bindings/typescript.rs
+++ b/cmd/soroban-cli/src/commands/contract/bindings/typescript.rs
@@ -9,10 +9,7 @@ use crate::print::Print;
 use crate::wasm;
 use crate::{
     commands::{contract::fetch, global, NetworkRunnable},
-    config::{
-        self, locator,
-        network::{self, Network},
-    },
+    config::{self, locator, network},
     get_spec::{self, get_remote_contract_spec},
     xdr::{Hash, ScAddress},
 };
@@ -86,22 +83,25 @@ impl NetworkRunnable for Cmd {
         config: Option<&config::Args>,
     ) -> Result<(), Error> {
         let print = Print::new(global_args.is_some_and(|a| a.quiet));
+
+        let network = self.network.get(&self.locator).ok().unwrap_or_else(|| {
+            network::DEFAULTS
+                .get("testnet")
+                .expect("no network specified and testnet network not found")
+                .into()
+        });
+
+        let contract_id = self
+            .locator
+            .resolve_contract_id(&self.contract_id, &network.network_passphrase)?
+            .0;
+        let contract_address = ScAddress::Contract(Hash(contract_id));
+
         let spec = if let Some(wasm) = &self.wasm {
             print.infoln("Loading contract spec from file...");
             let wasm: wasm::Args = wasm.into();
             wasm.parse()?.spec
         } else {
-            let network = config.map_or_else(
-                || self.network.get(&self.locator).map_err(Error::from),
-                |c| c.get_network().map_err(Error::from),
-            )?;
-
-            let contract_id = self
-                .locator
-                .resolve_contract_id(&self.contract_id, &network.network_passphrase)?
-                .0;
-
-            let contract_address = ScAddress::Contract(Hash(contract_id));
             print.globeln(format!("Downloading contract spec: {contract_address}"));
             get_remote_contract_spec(
                 &contract_id,
@@ -125,17 +125,7 @@ impl NetworkRunnable for Cmd {
         }
         std::fs::create_dir_all(&self.output_dir)?;
         let p: Project = self.output_dir.clone().try_into()?;
-        let Network {
-            rpc_url,
-            network_passphrase,
-            ..
-        } = self.network.get(&self.locator).ok().unwrap_or_else(|| {
-            network::DEFAULTS
-                .get("futurenet")
-                .expect("why did we remove the default futurenet network?")
-                .into()
-        });
-        print.infoln(format!("Network: {network_passphrase}"));
+        print.infoln(format!("Network: {}", network.network_passphrase));
         let absolute_path = self.output_dir.canonicalize()?;
         let file_name = absolute_path
             .file_name()
@@ -143,12 +133,12 @@ impl NetworkRunnable for Cmd {
         let contract_name = &file_name
             .to_str()
             .ok_or_else(|| Error::NotUtf8(file_name.to_os_string()))?;
-        print.infoln(format!("Embedding contract address: {}", self.contract_id));
+        print.infoln(format!("Embedding contract address: {contract_address}"));
         p.init(
             contract_name,
-            &self.contract_id,
-            &rpc_url,
-            &network_passphrase,
+            &contract_address.to_string(),
+            &network.rpc_url,
+            &network.network_passphrase,
             &spec,
         )?;
         print.checkln("Generated!");

From 98b01007cc01d53516c60661739c5dba72d85108 Mon Sep 17 00:00:00 2001
From: Willem Wyndham <willem@ahalabs.dev>
Date: Mon, 18 Nov 2024 15:22:05 -0500
Subject: [PATCH 26/31] feat(stellar-ledger): make test utilties public

---
 .gitignore                                    |   1 +
 Cargo.lock                                    |   4 -
 cmd/crates/stellar-ledger/Cargo.toml          |  14 +-
 .../src/emulator_test_support.rs              |   7 +
 .../emulator_test_support/http_transport.rs}  |   0
 .../emulator_test_support}/speculos.rs        |   2 +-
 .../src/emulator_test_support/util.rs         | 200 +++++++++++++++++
 cmd/crates/stellar-ledger/src/lib.rs          |  11 +-
 .../tests/test/emulator_tests.rs              | 206 +-----------------
 cmd/crates/stellar-ledger/tests/utils/mod.rs  |   2 -
 10 files changed, 222 insertions(+), 225 deletions(-)
 create mode 100644 cmd/crates/stellar-ledger/src/emulator_test_support.rs
 rename cmd/crates/stellar-ledger/{tests/utils/emulator_http_transport.rs => src/emulator_test_support/http_transport.rs} (100%)
 rename cmd/crates/stellar-ledger/{tests/utils => src/emulator_test_support}/speculos.rs (99%)
 create mode 100644 cmd/crates/stellar-ledger/src/emulator_test_support/util.rs
 delete mode 100644 cmd/crates/stellar-ledger/tests/utils/mod.rs

diff --git a/.gitignore b/.gitignore
index b7150ae5d..578b28adf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,4 @@ test_snapshots
 .idea
 local.sh
 .stellar
+.zed
diff --git a/Cargo.lock b/Cargo.lock
index cd98e4f58..6e71d2a9a 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -4684,7 +4684,6 @@ dependencies = [
  "byteorder 1.5.0",
  "ed25519-dalek",
  "env_logger",
- "futures",
  "hex",
  "home",
  "httpmock",
@@ -4695,15 +4694,12 @@ dependencies = [
  "phf",
  "pretty_assertions",
  "reqwest",
- "sep5",
  "serde",
  "serde_derive",
  "serde_json",
  "serial_test",
  "sha2 0.10.8",
  "slipped10",
- "soroban-spec",
- "stellar-rpc-client",
  "stellar-strkey 0.0.11",
  "stellar-xdr",
  "test-case",
diff --git a/cmd/crates/stellar-ledger/Cargo.toml b/cmd/crates/stellar-ledger/Cargo.toml
index b3d6318a4..17335a453 100644
--- a/cmd/crates/stellar-ledger/Cargo.toml
+++ b/cmd/crates/stellar-ledger/Cargo.toml
@@ -16,7 +16,6 @@ rust-version.workspace = true
 publish = false
 
 [dependencies]
-soroban-spec = { workspace = true }
 thiserror = "1.0.32"
 serde = "1.0.82"
 serde_derive = "1.0.82"
@@ -26,7 +25,6 @@ ed25519-dalek = { workspace = true }
 stellar-strkey = { workspace = true }
 ledger-transport-hid = "0.10.0"
 ledger-transport = "0.10.0"
-sep5.workspace = true
 slip10 = { package = "slipped10", version = "0.4.6" }
 tracing = { workspace = true }
 hex.workspace = true
@@ -35,10 +33,9 @@ bollard = { workspace = true }
 home = "0.5.9"
 tokio = { version = "1", features = ["full"] }
 reqwest = { workspace = true, features = ["json"] }
-soroban-rpc.workspace = true
-phf = { version = "0.11.2", features = ["macros"] }
-futures = "0.3.30"
+phf = { version = "0.11.2", features = ["macros"], optional = true }
 async-trait = { workspace = true }
+testcontainers = { version = "0.20.1", optional = true }
 
 [dependencies.stellar-xdr]
 workspace = true
@@ -46,15 +43,16 @@ features = ["curr", "std", "serde"]
 
 [dev-dependencies]
 env_logger = "0.11.3"
-futures = "0.3.30"
 log = "0.4.21"
 once_cell = "1.19.0"
 pretty_assertions = "1.2.1"
 serial_test = "3.0.0"
 httpmock = "0.7.0-rc.1"
 test-case = "3.3.1"
-testcontainers = "0.20.1"
+
 
 
 [features]
-emulator-tests = []
+default = ["http-transport"]
+emulator-tests = ["dep:testcontainers", "http-transport", "dep:phf"]
+http-transport = []
diff --git a/cmd/crates/stellar-ledger/src/emulator_test_support.rs b/cmd/crates/stellar-ledger/src/emulator_test_support.rs
new file mode 100644
index 000000000..e69ec128f
--- /dev/null
+++ b/cmd/crates/stellar-ledger/src/emulator_test_support.rs
@@ -0,0 +1,7 @@
+pub mod http_transport;
+#[cfg(feature = "emulator-tests")]
+pub mod speculos;
+#[cfg(feature = "emulator-tests")]
+pub mod util;
+#[cfg(feature = "emulator-tests")]
+pub use util::*;
diff --git a/cmd/crates/stellar-ledger/tests/utils/emulator_http_transport.rs b/cmd/crates/stellar-ledger/src/emulator_test_support/http_transport.rs
similarity index 100%
rename from cmd/crates/stellar-ledger/tests/utils/emulator_http_transport.rs
rename to cmd/crates/stellar-ledger/src/emulator_test_support/http_transport.rs
diff --git a/cmd/crates/stellar-ledger/tests/utils/speculos.rs b/cmd/crates/stellar-ledger/src/emulator_test_support/speculos.rs
similarity index 99%
rename from cmd/crates/stellar-ledger/tests/utils/speculos.rs
rename to cmd/crates/stellar-ledger/src/emulator_test_support/speculos.rs
index 57439b0af..9084b8c85 100644
--- a/cmd/crates/stellar-ledger/tests/utils/speculos.rs
+++ b/cmd/crates/stellar-ledger/src/emulator_test_support/speculos.rs
@@ -92,4 +92,4 @@ impl Image for Speculos {
     fn cmd(&self) -> impl IntoIterator<Item = impl Into<std::borrow::Cow<'_, str>>> {
         vec![self.cmd.clone()].into_iter()
     }
-}
\ No newline at end of file
+}
diff --git a/cmd/crates/stellar-ledger/src/emulator_test_support/util.rs b/cmd/crates/stellar-ledger/src/emulator_test_support/util.rs
new file mode 100644
index 000000000..cc442eca9
--- /dev/null
+++ b/cmd/crates/stellar-ledger/src/emulator_test_support/util.rs
@@ -0,0 +1,200 @@
+use ledger_transport::Exchange;
+use serde::Deserialize;
+use std::ops::Range;
+use std::sync::LazyLock;
+use std::sync::Mutex;
+
+use crate::{Error, LedgerSigner};
+use std::net::TcpListener;
+
+use super::{http_transport::EmulatorHttpTransport, speculos::Speculos};
+
+use std::{collections::HashMap, time::Duration};
+
+use stellar_xdr::curr::Hash;
+
+use testcontainers::{core::ContainerPort, runners::AsyncRunner, ContainerAsync, ImageExt};
+use tokio::time::sleep;
+
+static PORT_RANGE: LazyLock<Mutex<Range<u16>>> = LazyLock::new(|| Mutex::new(40000..50000));
+
+pub const TEST_NETWORK_PASSPHRASE: &[u8] = b"Test SDF Network ; September 2015";
+pub fn test_network_hash() -> Hash {
+    use sha2::Digest;
+    Hash(sha2::Sha256::digest(TEST_NETWORK_PASSPHRASE).into())
+}
+
+pub async fn ledger(host_port: u16) -> LedgerSigner<impl Exchange> {
+    LedgerSigner::new(get_http_transport("127.0.0.1", host_port).await.unwrap())
+}
+
+pub async fn click(ui_host_port: u16, url: &str) {
+    let previous_events = get_emulator_events(ui_host_port).await;
+
+    let client = reqwest::Client::new();
+    let mut payload = HashMap::new();
+    payload.insert("action", "press-and-release");
+
+    let mut screen_has_changed = false;
+
+    client
+        .post(format!("http://localhost:{ui_host_port}/{url}"))
+        .json(&payload)
+        .send()
+        .await
+        .unwrap();
+
+    while !screen_has_changed {
+        let current_events = get_emulator_events(ui_host_port).await;
+
+        if !(previous_events == current_events) {
+            screen_has_changed = true
+        }
+    }
+
+    sleep(Duration::from_secs(1)).await;
+}
+
+pub async fn enable_hash_signing(ui_host_port: u16) {
+    click(ui_host_port, "button/right").await;
+
+    click(ui_host_port, "button/both").await;
+
+    click(ui_host_port, "button/both").await;
+
+    click(ui_host_port, "button/right").await;
+
+    click(ui_host_port, "button/right").await;
+
+    click(ui_host_port, "button/both").await;
+}
+
+#[derive(Debug, Deserialize, PartialEq)]
+pub struct EmulatorEvent {
+    text: String,
+    x: u16,
+    y: u16,
+    w: u16,
+    h: u16,
+}
+
+#[derive(Debug, Deserialize)]
+struct EventsResponse {
+    events: Vec<EmulatorEvent>,
+}
+
+pub async fn get_container(ledger_device_model: String) -> ContainerAsync<Speculos> {
+    let (tcp_port_1, tcp_port_2) = get_available_ports(2);
+    Speculos::new(ledger_device_model)
+        .with_mapped_port(tcp_port_1, ContainerPort::Tcp(9998))
+        .with_mapped_port(tcp_port_2, ContainerPort::Tcp(5000))
+        .start()
+        .await
+        .unwrap()
+}
+
+pub fn get_available_ports(n: usize) -> (u16, u16) {
+    let mut range = PORT_RANGE.lock().unwrap();
+    let mut ports = Vec::with_capacity(n);
+    while ports.len() < n {
+        if let Some(port) = range.next() {
+            if let Ok(listener) = TcpListener::bind(("0.0.0.0", port)) {
+                ports.push(port);
+                drop(listener);
+            }
+        } else {
+            panic!("No more available ports");
+        }
+    }
+
+    (ports[0], ports[1])
+}
+
+pub async fn get_http_transport(host: &str, port: u16) -> Result<impl Exchange, Error> {
+    let max_retries = 5;
+    let mut retries = 0;
+    let mut wait_time = Duration::from_secs(1);
+    // ping the emulator port to make sure it's up and running
+    // retry with exponential backoff
+    loop {
+        match reqwest::get(format!("http://{host}:{port}")).await {
+            Ok(_) => return Ok(EmulatorHttpTransport::new(host, port)),
+            Err(e) => {
+                retries += 1;
+                if retries >= max_retries {
+                    println!("get_http_transport: Exceeded max retries for connecting to emulated device");
+
+                    return Err(Error::APDUExchangeError(format!(
+                        "Failed to connect to emulator: {e}"
+                    )));
+                }
+                sleep(wait_time).await;
+                wait_time *= 2;
+            }
+        }
+    }
+}
+
+pub async fn wait_for_emulator_start_text(ui_host_port: u16) {
+    let mut ready = false;
+    while !ready {
+        let events = get_emulator_events_with_retries(ui_host_port, 5).await;
+
+        if events.iter().any(|event| event.text == "is ready") {
+            ready = true;
+        }
+    }
+}
+
+pub async fn get_emulator_events(ui_host_port: u16) -> Vec<EmulatorEvent> {
+    // Allowing for less retries here because presumably the emulator should be up and running since we waited
+    // for the "is ready" text via wait_for_emulator_start_text
+    get_emulator_events_with_retries(ui_host_port, 1).await
+}
+
+pub async fn get_emulator_events_with_retries(
+    ui_host_port: u16,
+    max_retries: u16,
+) -> Vec<EmulatorEvent> {
+    let client = reqwest::Client::new();
+    let mut retries = 0;
+    let mut wait_time = Duration::from_secs(1);
+    loop {
+        match client
+            .get(format!("http://localhost:{ui_host_port}/events"))
+            .send()
+            .await
+        {
+            Ok(req) => {
+                let resp = req.json::<EventsResponse>().await.unwrap();
+                return resp.events;
+            }
+            Err(e) => {
+                retries += 1;
+                if retries >= max_retries {
+                    println!("get_emulator_events_with_retries: Exceeded max retries");
+                    panic!("get_emulator_events_with_retries: Failed to get emulator events: {e}");
+                }
+                sleep(wait_time).await;
+                wait_time *= 2;
+            }
+        }
+    }
+}
+
+pub async fn approve_tx_hash_signature(ui_host_port: u16, device_model: String) {
+    let number_of_right_clicks = if device_model == "nanos" { 10 } else { 6 };
+    for _ in 0..number_of_right_clicks {
+        click(ui_host_port, "button/right").await;
+    }
+
+    click(ui_host_port, "button/both").await;
+}
+
+pub async fn approve_tx_signature(ui_host_port: u16, device_model: String) {
+    let number_of_right_clicks = if device_model == "nanos" { 17 } else { 11 };
+    for _ in 0..number_of_right_clicks {
+        click(ui_host_port, "button/right").await;
+    }
+    click(ui_host_port, "button/both").await;
+}
diff --git a/cmd/crates/stellar-ledger/src/lib.rs b/cmd/crates/stellar-ledger/src/lib.rs
index 2c4a4006f..fa490da0a 100644
--- a/cmd/crates/stellar-ledger/src/lib.rs
+++ b/cmd/crates/stellar-ledger/src/lib.rs
@@ -20,6 +20,8 @@ pub use crate::signer::Blob;
 pub mod hd_path;
 mod signer;
 
+pub mod emulator_test_support;
+
 // this is from https://github.com/LedgerHQ/ledger-live/blob/36cfbf3fa3300fd99bcee2ab72e1fd8f280e6280/libs/ledgerjs/packages/hw-app-str/src/Str.ts#L181
 const APDU_MAX_SIZE: u8 = 150;
 const HD_PATH_ELEMENTS_COUNT: u8 = 3;
@@ -305,18 +307,13 @@ pub fn test_network_hash() -> Hash {
     Hash(sha2::Sha256::digest(TEST_NETWORK_PASSPHRASE).into())
 }
 
-#[cfg(test)]
+#[cfg(all(test, feature = "http-transport"))]
 mod test {
-    mod test_helpers {
-        pub mod test {
-            include!("../tests/utils/mod.rs");
-        }
-    }
     use httpmock::prelude::*;
     use serde_json::json;
 
+    use super::emulator_test_support::http_transport::EmulatorHttpTransport;
     use crate::Blob;
-    use test_helpers::test::emulator_http_transport::EmulatorHttpTransport;
 
     use std::vec;
 
diff --git a/cmd/crates/stellar-ledger/tests/test/emulator_tests.rs b/cmd/crates/stellar-ledger/tests/test/emulator_tests.rs
index 1b0c09bab..c01f55849 100644
--- a/cmd/crates/stellar-ledger/tests/test/emulator_tests.rs
+++ b/cmd/crates/stellar-ledger/tests/test/emulator_tests.rs
@@ -1,45 +1,16 @@
-use ledger_transport::Exchange;
-use once_cell::sync::Lazy;
-use serde::Deserialize;
-use std::ops::Range;
-use std::sync::Mutex;
-use std::vec;
-
-use std::net::TcpListener;
 use stellar_ledger::hd_path::HdPath;
-use stellar_ledger::{Blob, Error, LedgerSigner};
+use stellar_ledger::{Blob, Error};
 
 use std::sync::Arc;
-use std::{collections::HashMap, time::Duration};
 
 use stellar_xdr::curr::{
-    self as xdr, Hash, Memo, MuxedAccount, Operation, OperationBody, PaymentOp, Preconditions,
+    self as xdr, Memo, MuxedAccount, Operation, OperationBody, PaymentOp, Preconditions,
     SequenceNumber, Transaction, TransactionExt, Uint256,
 };
 
-use testcontainers::{core::ContainerPort, runners::AsyncRunner, ContainerAsync, ImageExt};
-use tokio::time::sleep;
-
-static PORT_RANGE: Lazy<Mutex<Range<u16>>> = Lazy::new(|| Mutex::new(40000..50000));
-
-pub const TEST_NETWORK_PASSPHRASE: &[u8] = b"Test SDF Network ; September 2015";
-pub fn test_network_hash() -> Hash {
-    use sha2::Digest;
-    Hash(sha2::Sha256::digest(TEST_NETWORK_PASSPHRASE).into())
-}
-
-async fn ledger(host_port: u16) -> LedgerSigner<impl Exchange> {
-    LedgerSigner::new(get_http_transport("127.0.0.1", host_port).await.unwrap())
-}
-
-mod test_helpers {
-    pub mod test {
-        include!("../utils/mod.rs");
-    }
-}
+use stellar_ledger::emulator_test_support::*;
 
 use test_case::test_case;
-use test_helpers::test::{emulator_http_transport::EmulatorHttpTransport, speculos::Speculos};
 
 #[test_case("nanos".to_string() ; "when the device is NanoS")]
 #[test_case("nanox".to_string() ; "when the device is NanoX")]
@@ -244,174 +215,3 @@ async fn test_sign_tx_hash_when_hash_signing_is_enabled(ledger_device_model: Str
         }
     }
 }
-
-async fn click(ui_host_port: u16, url: &str) {
-    let previous_events = get_emulator_events(ui_host_port).await;
-
-    let client = reqwest::Client::new();
-    let mut payload = HashMap::new();
-    payload.insert("action", "press-and-release");
-
-    let mut screen_has_changed = false;
-
-    client
-        .post(format!("http://localhost:{ui_host_port}/{url}"))
-        .json(&payload)
-        .send()
-        .await
-        .unwrap();
-
-    while !screen_has_changed {
-        let current_events = get_emulator_events(ui_host_port).await;
-
-        if !(previous_events == current_events) {
-            screen_has_changed = true
-        }
-    }
-
-    sleep(Duration::from_secs(1)).await;
-}
-
-async fn enable_hash_signing(ui_host_port: u16) {
-    click(ui_host_port, "button/right").await;
-
-    click(ui_host_port, "button/both").await;
-
-    click(ui_host_port, "button/both").await;
-
-    click(ui_host_port, "button/right").await;
-
-    click(ui_host_port, "button/right").await;
-
-    click(ui_host_port, "button/both").await;
-}
-
-#[derive(Debug, Deserialize, PartialEq)]
-struct EmulatorEvent {
-    text: String,
-    x: u16,
-    y: u16,
-    w: u16,
-    h: u16,
-}
-
-#[derive(Debug, Deserialize)]
-struct EventsResponse {
-    events: Vec<EmulatorEvent>,
-}
-
-async fn get_container(ledger_device_model: String) -> ContainerAsync<Speculos> {
-    let (tcp_port_1, tcp_port_2) = get_available_ports(2);
-    Speculos::new(ledger_device_model)
-        .with_mapped_port(tcp_port_1, ContainerPort::Tcp(9998))
-        .with_mapped_port(tcp_port_2, ContainerPort::Tcp(5000))
-        .start()
-        .await
-        .unwrap()
-}
-
-fn get_available_ports(n: usize) -> (u16, u16) {
-    let mut range = PORT_RANGE.lock().unwrap();
-    let mut ports = Vec::with_capacity(n);
-    while ports.len() < n {
-        if let Some(port) = range.next() {
-            if let Ok(listener) = TcpListener::bind(("0.0.0.0", port)) {
-                ports.push(port);
-                drop(listener);
-            }
-        } else {
-            panic!("No more available ports");
-        }
-    }
-
-    (ports[0], ports[1])
-}
-
-async fn get_http_transport(host: &str, port: u16) -> Result<impl Exchange, Error> {
-    let max_retries = 5;
-    let mut retries = 0;
-    let mut wait_time = Duration::from_secs(1);
-    // ping the emulator port to make sure it's up and running
-    // retry with exponential backoff
-    loop {
-        match reqwest::get(format!("http://{host}:{port}")).await {
-            Ok(_) => return Ok(EmulatorHttpTransport::new(host, port)),
-            Err(e) => {
-                retries += 1;
-                if retries >= max_retries {
-                    println!("get_http_transport: Exceeded max retries for connecting to emulated device");
-
-                    return Err(Error::APDUExchangeError(format!(
-                        "Failed to connect to emulator: {e}"
-                    )));
-                }
-                sleep(wait_time).await;
-                wait_time *= 2;
-            }
-        }
-    }
-}
-
-async fn wait_for_emulator_start_text(ui_host_port: u16) {
-    let mut ready = false;
-    while !ready {
-        let events = get_emulator_events_with_retries(ui_host_port, 5).await;
-
-        if events.iter().any(|event| event.text == "is ready") {
-            ready = true;
-        }
-    }
-}
-
-async fn get_emulator_events(ui_host_port: u16) -> Vec<EmulatorEvent> {
-    // Allowing for less retries here because presumably the emulator should be up and running since we waited
-    // for the "is ready" text via wait_for_emulator_start_text
-    get_emulator_events_with_retries(ui_host_port, 1).await
-}
-
-async fn get_emulator_events_with_retries(
-    ui_host_port: u16,
-    max_retries: u16,
-) -> Vec<EmulatorEvent> {
-    let client = reqwest::Client::new();
-    let mut retries = 0;
-    let mut wait_time = Duration::from_secs(1);
-    loop {
-        match client
-            .get(format!("http://localhost:{ui_host_port}/events"))
-            .send()
-            .await
-        {
-            Ok(req) => {
-                let resp = req.json::<EventsResponse>().await.unwrap();
-                return resp.events;
-            }
-            Err(e) => {
-                retries += 1;
-                if retries >= max_retries {
-                    println!("get_emulator_events_with_retries: Exceeded max retries");
-                    panic!("get_emulator_events_with_retries: Failed to get emulator events: {e}");
-                }
-                sleep(wait_time).await;
-                wait_time *= 2;
-            }
-        }
-    }
-}
-
-async fn approve_tx_hash_signature(ui_host_port: u16, device_model: String) {
-    let number_of_right_clicks = if device_model == "nanos" { 10 } else { 6 };
-    for _ in 0..number_of_right_clicks {
-        click(ui_host_port, "button/right").await;
-    }
-
-    click(ui_host_port, "button/both").await;
-}
-
-async fn approve_tx_signature(ui_host_port: u16, device_model: String) {
-    let number_of_right_clicks = if device_model == "nanos" { 17 } else { 11 };
-    for _ in 0..number_of_right_clicks {
-        click(ui_host_port, "button/right").await;
-    }
-    click(ui_host_port, "button/both").await;
-}
diff --git a/cmd/crates/stellar-ledger/tests/utils/mod.rs b/cmd/crates/stellar-ledger/tests/utils/mod.rs
deleted file mode 100644
index 5b63732bc..000000000
--- a/cmd/crates/stellar-ledger/tests/utils/mod.rs
+++ /dev/null
@@ -1,2 +0,0 @@
-pub(crate) mod emulator_http_transport;
-pub(crate) mod speculos;

From 7abcaeb65cf254602a7e0fe6c552d3813bcb5bfe Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Tue, 19 Nov 2024 04:11:55 +0000
Subject: [PATCH 27/31] Bump version to 22.0.0 (#1742)

Co-authored-by: Leigh McCulloch <351529+leighmcculloch@users.noreply.github.com>
---
 Cargo.lock                                    | 32 +++++++++----------
 Cargo.toml                                    | 10 +++---
 cmd/crates/soroban-test/Cargo.toml            |  2 +-
 .../tests/fixtures/bye/Cargo.toml             |  2 +-
 .../tests/fixtures/hello/Cargo.toml           |  2 +-
 .../test-wasms/constructor/Cargo.toml         |  3 +-
 .../test-wasms/custom_account/Cargo.toml      |  3 +-
 .../test-wasms/custom_type/Cargo.toml         |  3 +-
 .../test-wasms/hello_world/Cargo.toml         |  3 +-
 .../tests/fixtures/test-wasms/swap/Cargo.toml |  3 +-
 .../fixtures/test-wasms/token/Cargo.toml      |  3 +-
 cmd/soroban-cli/Cargo.toml                    |  2 +-
 cmd/stellar-cli/Cargo.toml                    |  2 +-
 13 files changed, 32 insertions(+), 38 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index e043b4f8e..89cb82cdf 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -4288,7 +4288,7 @@ dependencies = [
 
 [[package]]
 name = "soroban-cli"
-version = "22.0.0-rc.1"
+version = "22.0.0"
 dependencies = [
  "assert_cmd",
  "assert_fs",
@@ -4454,7 +4454,7 @@ dependencies = [
 
 [[package]]
 name = "soroban-hello"
-version = "22.0.0-rc.1"
+version = "0.0.0"
 
 [[package]]
 name = "soroban-ledger-snapshot"
@@ -4525,7 +4525,7 @@ dependencies = [
 
 [[package]]
 name = "soroban-spec-json"
-version = "22.0.0-rc.1"
+version = "22.0.0"
 dependencies = [
  "pretty_assertions",
  "serde",
@@ -4555,7 +4555,7 @@ dependencies = [
 
 [[package]]
 name = "soroban-spec-tools"
-version = "22.0.0-rc.1"
+version = "22.0.0"
 dependencies = [
  "base64 0.21.7",
  "ethnum",
@@ -4573,7 +4573,7 @@ dependencies = [
 
 [[package]]
 name = "soroban-spec-typescript"
-version = "22.0.0-rc.1"
+version = "22.0.0"
 dependencies = [
  "base64 0.21.7",
  "heck 0.4.1",
@@ -4594,7 +4594,7 @@ dependencies = [
 
 [[package]]
 name = "soroban-test"
-version = "22.0.0-rc.1"
+version = "22.0.0"
 dependencies = [
  "assert_cmd",
  "assert_fs",
@@ -4665,18 +4665,18 @@ checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f"
 
 [[package]]
 name = "stellar-bye"
-version = "22.0.0-rc.1"
+version = "0.0.0"
 
 [[package]]
 name = "stellar-cli"
-version = "22.0.0-rc.1"
+version = "22.0.0"
 dependencies = [
  "soroban-cli",
 ]
 
 [[package]]
 name = "stellar-ledger"
-version = "22.0.0-rc.1"
+version = "22.0.0"
 dependencies = [
  "async-trait",
  "bollard",
@@ -5023,42 +5023,42 @@ dependencies = [
 
 [[package]]
 name = "test_constructor"
-version = "22.0.0-rc.1"
+version = "0.0.0"
 dependencies = [
  "soroban-sdk",
 ]
 
 [[package]]
 name = "test_custom_account"
-version = "22.0.0-rc.1"
+version = "0.0.0"
 dependencies = [
  "soroban-sdk",
 ]
 
 [[package]]
 name = "test_custom_types"
-version = "22.0.0-rc.1"
+version = "0.0.0"
 dependencies = [
  "soroban-sdk",
 ]
 
 [[package]]
 name = "test_hello_world"
-version = "22.0.0-rc.1"
+version = "0.0.0"
 dependencies = [
  "soroban-sdk",
 ]
 
 [[package]]
 name = "test_swap"
-version = "22.0.0-rc.1"
+version = "0.0.0"
 dependencies = [
  "soroban-sdk",
 ]
 
 [[package]]
 name = "test_token"
-version = "22.0.0-rc.1"
+version = "0.0.0"
 dependencies = [
  "soroban-sdk",
  "soroban-token-sdk",
@@ -5066,7 +5066,7 @@ dependencies = [
 
 [[package]]
 name = "test_udt"
-version = "22.0.0-rc.1"
+version = "22.0.0"
 dependencies = [
  "soroban-sdk",
 ]
diff --git a/Cargo.toml b/Cargo.toml
index f689accea..d2572e9c0 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -19,24 +19,24 @@ exclude = [
 ]
 
 [workspace.package]
-version = "22.0.0-rc.1"
+version = "22.0.0"
 rust-version = "1.81.0"
 
 # Dependencies located in this repo:
 [workspace.dependencies.soroban-cli]
-version = "=22.0.0-rc.1"
+version = "=22.0.0"
 path = "cmd/soroban-cli"
 
 [workspace.dependencies.soroban-spec-json]
-version = "=22.0.0-rc.1"
+version = "=22.0.0"
 path = "./cmd/crates/soroban-spec-json"
 
 [workspace.dependencies.soroban-spec-typescript]
-version = "22.0.0-rc.1"
+version = "22.0.0"
 path = "./cmd/crates/soroban-spec-typescript"
 
 [workspace.dependencies.soroban-spec-tools]
-version = "22.0.0-rc.1"
+version = "22.0.0"
 path = "./cmd/crates/soroban-spec-tools"
 
 # Dependencies from the rs-stellar-xdr repo:
diff --git a/cmd/crates/soroban-test/Cargo.toml b/cmd/crates/soroban-test/Cargo.toml
index f694ec533..d035652d1 100644
--- a/cmd/crates/soroban-test/Cargo.toml
+++ b/cmd/crates/soroban-test/Cargo.toml
@@ -6,7 +6,7 @@ repository = "https://github.com/stellar/soroban-test"
 authors = ["Stellar Development Foundation <info@stellar.org>"]
 license = "Apache-2.0"
 readme = "README.md"
-version = "22.0.0-rc.1"
+version.workspace = true
 edition = "2021"
 rust-version.workspace = true
 autobins = false
diff --git a/cmd/crates/soroban-test/tests/fixtures/bye/Cargo.toml b/cmd/crates/soroban-test/tests/fixtures/bye/Cargo.toml
index acee77f4b..deccb9c75 100644
--- a/cmd/crates/soroban-test/tests/fixtures/bye/Cargo.toml
+++ b/cmd/crates/soroban-test/tests/fixtures/bye/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "stellar-bye"
-version = "22.0.0-rc.1"
+version = "0.0.0"
 edition = "2021"
 publish = false
 
diff --git a/cmd/crates/soroban-test/tests/fixtures/hello/Cargo.toml b/cmd/crates/soroban-test/tests/fixtures/hello/Cargo.toml
index 2a212a532..fe7eb636a 100644
--- a/cmd/crates/soroban-test/tests/fixtures/hello/Cargo.toml
+++ b/cmd/crates/soroban-test/tests/fixtures/hello/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "soroban-hello"
-version = "22.0.0-rc.1"
+version = "0.0.0"
 edition = "2021"
 publish = false
 
diff --git a/cmd/crates/soroban-test/tests/fixtures/test-wasms/constructor/Cargo.toml b/cmd/crates/soroban-test/tests/fixtures/test-wasms/constructor/Cargo.toml
index 8c38fecb4..69d8a6430 100644
--- a/cmd/crates/soroban-test/tests/fixtures/test-wasms/constructor/Cargo.toml
+++ b/cmd/crates/soroban-test/tests/fixtures/test-wasms/constructor/Cargo.toml
@@ -1,11 +1,10 @@
 [package]
 name = "test_constructor"
-version = "22.0.0-rc.1"
+version = "0.0.0"
 authors = ["Stellar Development Foundation <info@stellar.org>"]
 license = "Apache-2.0"
 edition = "2021"
 publish = false
-rust-version.workspace = true
 
 [lib]
 crate-type = ["cdylib"]
diff --git a/cmd/crates/soroban-test/tests/fixtures/test-wasms/custom_account/Cargo.toml b/cmd/crates/soroban-test/tests/fixtures/test-wasms/custom_account/Cargo.toml
index 330fa03df..765f671c6 100644
--- a/cmd/crates/soroban-test/tests/fixtures/test-wasms/custom_account/Cargo.toml
+++ b/cmd/crates/soroban-test/tests/fixtures/test-wasms/custom_account/Cargo.toml
@@ -1,11 +1,10 @@
 [package]
 name = "test_custom_account"
-version = "22.0.0-rc.1"
+version = "0.0.0"
 authors = ["Stellar Development Foundation <info@stellar.org>"]
 license = "Apache-2.0"
 edition = "2021"
 publish = false
-rust-version.workspace = true
 
 [lib]
 crate-type = ["cdylib"]
diff --git a/cmd/crates/soroban-test/tests/fixtures/test-wasms/custom_type/Cargo.toml b/cmd/crates/soroban-test/tests/fixtures/test-wasms/custom_type/Cargo.toml
index 01429b00a..b5a17c6a5 100644
--- a/cmd/crates/soroban-test/tests/fixtures/test-wasms/custom_type/Cargo.toml
+++ b/cmd/crates/soroban-test/tests/fixtures/test-wasms/custom_type/Cargo.toml
@@ -1,11 +1,10 @@
 [package]
 name = "test_custom_types"
-version = "22.0.0-rc.1"
+version = "0.0.0"
 authors = ["Stellar Development Foundation <info@stellar.org>"]
 license = "Apache-2.0"
 edition = "2021"
 publish = false
-rust-version.workspace = true
 
 [lib]
 crate-type = ["cdylib", "rlib"]
diff --git a/cmd/crates/soroban-test/tests/fixtures/test-wasms/hello_world/Cargo.toml b/cmd/crates/soroban-test/tests/fixtures/test-wasms/hello_world/Cargo.toml
index 6f00b845e..a13c98a39 100644
--- a/cmd/crates/soroban-test/tests/fixtures/test-wasms/hello_world/Cargo.toml
+++ b/cmd/crates/soroban-test/tests/fixtures/test-wasms/hello_world/Cargo.toml
@@ -1,11 +1,10 @@
 [package]
 name = "test_hello_world"
-version = "22.0.0-rc.1"
+version = "0.0.0"
 authors = ["Stellar Development Foundation <info@stellar.org>"]
 license = "Apache-2.0"
 edition = "2021"
 publish = false
-rust-version.workspace = true
 
 [lib]
 crate-type = ["cdylib", "rlib"]
diff --git a/cmd/crates/soroban-test/tests/fixtures/test-wasms/swap/Cargo.toml b/cmd/crates/soroban-test/tests/fixtures/test-wasms/swap/Cargo.toml
index f74201a31..495a52d71 100644
--- a/cmd/crates/soroban-test/tests/fixtures/test-wasms/swap/Cargo.toml
+++ b/cmd/crates/soroban-test/tests/fixtures/test-wasms/swap/Cargo.toml
@@ -1,11 +1,10 @@
 [package]
 name = "test_swap"
-version.workspace = true
+version = "0.0.0"
 authors = ["Stellar Development Foundation <info@stellar.org>"]
 license = "Apache-2.0"
 edition = "2021"
 publish = false
-rust-version.workspace = true
 
 [lib]
 crate-type = ["cdylib"]
diff --git a/cmd/crates/soroban-test/tests/fixtures/test-wasms/token/Cargo.toml b/cmd/crates/soroban-test/tests/fixtures/test-wasms/token/Cargo.toml
index 880c39d52..6456983e8 100644
--- a/cmd/crates/soroban-test/tests/fixtures/test-wasms/token/Cargo.toml
+++ b/cmd/crates/soroban-test/tests/fixtures/test-wasms/token/Cargo.toml
@@ -1,12 +1,11 @@
 [package]
 name = "test_token"
-version.workspace = true
+version = "0.0.0"
 description = "Soroban standard token contract"
 authors = ["Stellar Development Foundation <info@stellar.org>"]
 license = "Apache-2.0"
 edition = "2021"
 publish = false
-rust-version.workspace = true
 
 [lib]
 crate-type = ["cdylib"]
diff --git a/cmd/soroban-cli/Cargo.toml b/cmd/soroban-cli/Cargo.toml
index f1a2b146d..2f2a26255 100644
--- a/cmd/soroban-cli/Cargo.toml
+++ b/cmd/soroban-cli/Cargo.toml
@@ -6,7 +6,7 @@ repository = "https://github.com/stellar/stellar-cli"
 authors = ["Stellar Development Foundation <info@stellar.org>"]
 license = "Apache-2.0"
 readme = "README.md"
-version = "22.0.0-rc.1"
+version.workspace = true
 edition = "2021"
 rust-version.workspace = true
 autobins = false
diff --git a/cmd/stellar-cli/Cargo.toml b/cmd/stellar-cli/Cargo.toml
index 21e7e307b..e1f1dce6b 100644
--- a/cmd/stellar-cli/Cargo.toml
+++ b/cmd/stellar-cli/Cargo.toml
@@ -6,7 +6,7 @@ repository = "https://github.com/stellar/stellar-cli"
 authors = ["Stellar Development Foundation <info@stellar.org>"]
 license = "Apache-2.0"
 readme = "README.md"
-version = "22.0.0-rc.1"
+version.workspace = true
 edition = "2021"
 rust-version.workspace = true
 autobins = false

From ad1f4a4ae198a84202ae133e025aac6f3d89a59d Mon Sep 17 00:00:00 2001
From: Gleb <gleb@stellar.org>
Date: Tue, 19 Nov 2024 10:27:06 -0800
Subject: [PATCH 28/31] Clippy fixes for 1.82 (#1741)

---
 .../src/commands/contract/deploy/asset.rs     |  4 +--
 .../src/commands/contract/deploy/wasm.rs      |  8 +++---
 .../src/commands/contract/extend.rs           |  4 +--
 .../src/commands/contract/install.rs          |  6 ++---
 .../src/commands/contract/invoke.rs           | 26 +++++++++----------
 .../src/commands/contract/restore.rs          |  6 ++---
 cmd/soroban-cli/src/commands/tx/args.rs       |  2 +-
 cmd/soroban-cli/src/commands/txn_result.rs    | 14 +++++-----
 cmd/soroban-cli/src/wasm.rs                   |  4 +--
 9 files changed, 36 insertions(+), 38 deletions(-)

diff --git a/cmd/soroban-cli/src/commands/contract/deploy/asset.rs b/cmd/soroban-cli/src/commands/contract/deploy/asset.rs
index 169c0109a..04a0380ed 100644
--- a/cmd/soroban-cli/src/commands/contract/deploy/asset.rs
+++ b/cmd/soroban-cli/src/commands/contract/deploy/asset.rs
@@ -110,12 +110,12 @@ impl NetworkRunnable for Cmd {
             source_account,
         )?;
         if self.fee.build_only {
-            return Ok(TxnResult::Txn(tx));
+            return Ok(TxnResult::Txn(Box::new(tx)));
         }
         let txn = simulate_and_assemble_transaction(&client, &tx).await?;
         let txn = self.fee.apply_to_assembled_txn(txn).transaction().clone();
         if self.fee.sim_only {
-            return Ok(TxnResult::Txn(txn));
+            return Ok(TxnResult::Txn(Box::new(txn)));
         }
         let get_txn_resp = client
             .send_transaction_polling(&self.config.sign_with_local_key(txn).await?)
diff --git a/cmd/soroban-cli/src/commands/contract/deploy/wasm.rs b/cmd/soroban-cli/src/commands/contract/deploy/wasm.rs
index 9bf63802c..1d85832b0 100644
--- a/cmd/soroban-cli/src/commands/contract/deploy/wasm.rs
+++ b/cmd/soroban-cli/src/commands/contract/deploy/wasm.rs
@@ -265,14 +265,14 @@ impl NetworkRunnable for Cmd {
         // Get the account sequence number
         let account_details = client.get_account(&source_account.to_string()).await?;
         let sequence: i64 = account_details.seq_num.into();
-        let txn = build_create_contract_tx(
+        let txn = Box::new(build_create_contract_tx(
             wasm_hash,
             sequence + 1,
             self.fee.fee,
             source_account,
             contract_id_preimage,
             constructor_params.as_ref(),
-        )?;
+        )?);
 
         if self.fee.build_only {
             print.checkln("Transaction built!");
@@ -282,7 +282,7 @@ impl NetworkRunnable for Cmd {
         print.infoln("Simulating deploy transaction…");
 
         let txn = simulate_and_assemble_transaction(&client, &txn).await?;
-        let txn = self.fee.apply_to_assembled_txn(txn).transaction().clone();
+        let txn = Box::new(self.fee.apply_to_assembled_txn(txn).transaction().clone());
 
         if self.fee.sim_only {
             print.checkln("Done!");
@@ -293,7 +293,7 @@ impl NetworkRunnable for Cmd {
         print.log_transaction(&txn, &network, true)?;
 
         let get_txn_resp = client
-            .send_transaction_polling(&config.sign_with_local_key(txn).await?)
+            .send_transaction_polling(&config.sign_with_local_key(*txn).await?)
             .await?
             .try_into()?;
 
diff --git a/cmd/soroban-cli/src/commands/contract/extend.rs b/cmd/soroban-cli/src/commands/contract/extend.rs
index 6ec8ebdb1..e56cbe166 100644
--- a/cmd/soroban-cli/src/commands/contract/extend.rs
+++ b/cmd/soroban-cli/src/commands/contract/extend.rs
@@ -140,7 +140,7 @@ impl NetworkRunnable for Cmd {
             .await?;
         let sequence: i64 = account_details.seq_num.into();
 
-        let tx = Transaction {
+        let tx = Box::new(Transaction {
             source_account,
             fee: self.fee.fee,
             seq_num: SequenceNumber(sequence + 1),
@@ -167,7 +167,7 @@ impl NetworkRunnable for Cmd {
                 },
                 resource_fee: 0,
             }),
-        };
+        });
         if self.fee.build_only {
             return Ok(TxnResult::Txn(tx));
         }
diff --git a/cmd/soroban-cli/src/commands/contract/install.rs b/cmd/soroban-cli/src/commands/contract/install.rs
index a215a987d..0a9ec856d 100644
--- a/cmd/soroban-cli/src/commands/contract/install.rs
+++ b/cmd/soroban-cli/src/commands/contract/install.rs
@@ -146,7 +146,7 @@ impl NetworkRunnable for Cmd {
             build_install_contract_code_tx(&contract, sequence + 1, self.fee.fee, &source_account)?;
 
         if self.fee.build_only {
-            return Ok(TxnResult::Txn(tx_without_preflight));
+            return Ok(TxnResult::Txn(Box::new(tx_without_preflight)));
         }
 
         // Don't check whether the contract is already installed when the user
@@ -186,7 +186,7 @@ impl NetworkRunnable for Cmd {
         print.infoln("Simulating install transaction…");
 
         let txn = simulate_and_assemble_transaction(&client, &tx_without_preflight).await?;
-        let txn = self.fee.apply_to_assembled_txn(txn).transaction().clone();
+        let txn = Box::new(self.fee.apply_to_assembled_txn(txn).transaction().clone());
 
         if self.fee.sim_only {
             return Ok(TxnResult::Txn(txn));
@@ -195,7 +195,7 @@ impl NetworkRunnable for Cmd {
         print.globeln("Submitting install transaction…");
 
         let txn_resp = client
-            .send_transaction_polling(&self.config.sign_with_local_key(txn).await?)
+            .send_transaction_polling(&self.config.sign_with_local_key(*txn).await?)
             .await?;
 
         if args.map_or(true, |a| !a.no_cache) {
diff --git a/cmd/soroban-cli/src/commands/contract/invoke.rs b/cmd/soroban-cli/src/commands/contract/invoke.rs
index 04eeaebd6..c7b631343 100644
--- a/cmd/soroban-cli/src/commands/contract/invoke.rs
+++ b/cmd/soroban-cli/src/commands/contract/invoke.rs
@@ -25,10 +25,10 @@ use crate::{
     print, rpc,
     xdr::{
         self, AccountEntry, AccountEntryExt, AccountId, ContractEvent, ContractEventType,
-        DiagnosticEvent, HostFunction, InvokeContractArgs, InvokeHostFunctionOp, LedgerEntryData,
-        Limits, Memo, MuxedAccount, Operation, OperationBody, Preconditions, PublicKey,
-        ScSpecEntry, SequenceNumber, String32, StringM, Thresholds, Transaction, TransactionExt,
-        Uint256, VecM, WriteXdr,
+        DiagnosticEvent, HostFunction, InvokeContractArgs, InvokeHostFunctionOp, Limits, Memo,
+        MuxedAccount, Operation, OperationBody, Preconditions, PublicKey, ScSpecEntry,
+        SequenceNumber, String32, StringM, Thresholds, Transaction, TransactionExt, Uint256, VecM,
+        WriteXdr,
     },
     Pwd,
 };
@@ -93,8 +93,6 @@ pub enum Error {
     ParseIntError(#[from] ParseIntError),
     #[error(transparent)]
     Rpc(#[from] rpc::Error),
-    #[error("unexpected contract code data type: {0:?}")]
-    UnexpectedContractCodeDataType(LedgerEntryData),
     #[error("missing operation result")]
     MissingOperationResult,
     #[error("error loading signing key: {0}")]
@@ -258,21 +256,22 @@ impl NetworkRunnable for Cmd {
         let sequence: i64 = account_details.seq_num.into();
         let AccountId(PublicKey::PublicKeyTypeEd25519(account_id)) = account_details.account_id;
 
-        let tx = build_invoke_contract_tx(
+        let tx = Box::new(build_invoke_contract_tx(
             host_function_params.clone(),
             sequence + 1,
             self.fee.fee,
             account_id,
-        )?;
+        )?);
         if self.fee.build_only {
             return Ok(TxnResult::Txn(tx));
         }
         let txn = simulate_and_assemble_transaction(&client, &tx).await?;
-        let txn = self.fee.apply_to_assembled_txn(txn);
+        let assembled = self.fee.apply_to_assembled_txn(txn);
+        let mut txn = Box::new(assembled.transaction().clone());
         if self.fee.sim_only {
-            return Ok(TxnResult::Txn(txn.transaction().clone()));
+            return Ok(TxnResult::Txn(txn));
         }
-        let sim_res = txn.sim_response();
+        let sim_res = assembled.sim_response();
         if global_args.map_or(true, |a| !a.no_cache) {
             data::write(sim_res.clone().into(), &network.rpc_uri()?)?;
         }
@@ -281,12 +280,11 @@ impl NetworkRunnable for Cmd {
             ShouldSend::Yes => {
                 let global::Args { no_cache, .. } = global_args.cloned().unwrap_or_default();
                 // Need to sign all auth entries
-                let mut txn = txn.transaction().clone();
                 if let Some(tx) = config.sign_soroban_authorizations(&txn, &signers).await? {
-                    txn = tx;
+                    txn = Box::new(tx);
                 }
                 let res = client
-                    .send_transaction_polling(&config.sign_with_local_key(txn).await?)
+                    .send_transaction_polling(&config.sign_with_local_key(*txn).await?)
                     .await?;
                 if !no_cache {
                     data::write(res.clone().try_into()?, &network.rpc_uri()?)?;
diff --git a/cmd/soroban-cli/src/commands/contract/restore.rs b/cmd/soroban-cli/src/commands/contract/restore.rs
index 92fc4b41d..cb35e6304 100644
--- a/cmd/soroban-cli/src/commands/contract/restore.rs
+++ b/cmd/soroban-cli/src/commands/contract/restore.rs
@@ -141,7 +141,7 @@ impl NetworkRunnable for Cmd {
             .await?;
         let sequence: i64 = account_details.seq_num.into();
 
-        let tx = Transaction {
+        let tx = Box::new(Transaction {
             source_account,
             fee: self.fee.fee,
             seq_num: SequenceNumber(sequence + 1),
@@ -167,12 +167,12 @@ impl NetworkRunnable for Cmd {
                 },
                 resource_fee: 0,
             }),
-        };
+        });
         if self.fee.build_only {
             return Ok(TxnResult::Txn(tx));
         }
         let res = client
-            .send_transaction_polling(&config.sign_with_local_key(tx).await?)
+            .send_transaction_polling(&config.sign_with_local_key(*tx).await?)
             .await?;
         if args.map_or(true, |a| !a.no_cache) {
             data::write(res.clone().try_into()?, &network.rpc_uri()?)?;
diff --git a/cmd/soroban-cli/src/commands/tx/args.rs b/cmd/soroban-cli/src/commands/tx/args.rs
index fc99b9591..1da1f230a 100644
--- a/cmd/soroban-cli/src/commands/tx/args.rs
+++ b/cmd/soroban-cli/src/commands/tx/args.rs
@@ -87,7 +87,7 @@ impl Args {
         let network = self.config.get_network()?;
         let client = Client::new(&network.rpc_url)?;
         if self.fee.build_only {
-            return Ok(TxnEnvelopeResult::TxnEnvelope(tx.into()));
+            return Ok(TxnEnvelopeResult::TxnEnvelope(Box::new(tx.into())));
         }
 
         let txn_resp = client
diff --git a/cmd/soroban-cli/src/commands/txn_result.rs b/cmd/soroban-cli/src/commands/txn_result.rs
index d6b308b3a..568fd79d2 100644
--- a/cmd/soroban-cli/src/commands/txn_result.rs
+++ b/cmd/soroban-cli/src/commands/txn_result.rs
@@ -2,7 +2,7 @@ use crate::xdr::{Transaction, TransactionEnvelope, TransactionV1Envelope, VecM};
 
 #[derive(Debug, Clone, PartialEq, Eq, PartialOrd, Ord)]
 pub enum TxnResult<R> {
-    Txn(Transaction),
+    Txn(Box<Transaction>),
     Res(R),
 }
 
@@ -16,12 +16,12 @@ impl<R> TxnResult<R> {
 
     pub fn to_envelope(self) -> TxnEnvelopeResult<R> {
         match self {
-            TxnResult::Txn(tx) => {
-                TxnEnvelopeResult::TxnEnvelope(TransactionEnvelope::Tx(TransactionV1Envelope {
-                    tx,
+            TxnResult::Txn(tx) => TxnEnvelopeResult::TxnEnvelope(Box::new(
+                TransactionEnvelope::Tx(TransactionV1Envelope {
+                    tx: *tx,
                     signatures: VecM::default(),
-                }))
-            }
+                }),
+            )),
             TxnResult::Res(res) => TxnEnvelopeResult::Res(res),
         }
     }
@@ -29,6 +29,6 @@ impl<R> TxnResult<R> {
 
 #[derive(Debug, Clone, PartialEq, Eq, PartialOrd, Ord)]
 pub enum TxnEnvelopeResult<R> {
-    TxnEnvelope(TransactionEnvelope),
+    TxnEnvelope(Box<TransactionEnvelope>),
     Res(R),
 }
diff --git a/cmd/soroban-cli/src/wasm.rs b/cmd/soroban-cli/src/wasm.rs
index a907e021a..30f7a3e4a 100644
--- a/cmd/soroban-cli/src/wasm.rs
+++ b/cmd/soroban-cli/src/wasm.rs
@@ -42,7 +42,7 @@ pub enum Error {
     #[error(transparent)]
     Rpc(#[from] soroban_rpc::Error),
     #[error("unexpected contract data {0:?}")]
-    UnexpectedContractToken(ContractDataEntry),
+    UnexpectedContractToken(Box<ContractDataEntry>),
     #[error(
         "cannot fetch wasm for contract because the contract is \
     a network built-in asset contract that does not have a downloadable code binary"
@@ -136,5 +136,5 @@ pub async fn fetch_from_contract(
             ContractExecutable::StellarAsset => Err(ContractIsStellarAsset),
         };
     }
-    Err(UnexpectedContractToken(data_entry))
+    Err(UnexpectedContractToken(Box::new(data_entry)))
 }

From 11cde0c0c084ddc984cb9a346cacb97fcfb0b598 Mon Sep 17 00:00:00 2001
From: Nando Vieira <me@fnando.com>
Date: Tue, 19 Nov 2024 11:05:00 -0800
Subject: [PATCH 29/31] Fix attestation order. (#1744)

---
 .github/workflows/binaries.yml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/binaries.yml b/.github/workflows/binaries.yml
index 985f91fa5..c008cc7b4 100644
--- a/.github/workflows/binaries.yml
+++ b/.github/workflows/binaries.yml
@@ -133,18 +133,18 @@ jobs:
           $Env:STELLAR_CLI_VERSION = "${{ env.VERSION }}"
           ISCC.exe installer.iss
 
-      - name: Build provenance for attestation (release only)
-        if: github.event_name == 'release'
-        uses: actions/attest-build-provenance@v1
-        with:
-          subject-path: ${{ env.STELLAR_CLI_INSTALLER }}
-
       - name: Upload Artifact
         uses: actions/upload-artifact@v4
         with:
           name: ${{ env.STELLAR_CLI_INSTALLER }}
           path: Output/stellar-installer.exe
 
+      - name: Build provenance for attestation (release only)
+        if: github.event_name == 'release'
+        uses: actions/attest-build-provenance@v1
+        with:
+          subject-path: ${{ env.STELLAR_CLI_INSTALLER }}
+
       - name: Upload to Release (release only)
         if: github.event_name == 'release'
         uses: actions/github-script@v7

From 37f302d67d162e1316e02d5da3e1c3aee3755e53 Mon Sep 17 00:00:00 2001
From: Willem Wyndham <willem@ahalabs.dev>
Date: Tue, 19 Nov 2024 15:37:36 -0500
Subject: [PATCH 30/31] fix: add first proper test using ledger and CLI

---
 Cargo.lock                                    |  3 +
 Cargo.toml                                    |  3 +
 cmd/crates/soroban-test/Cargo.toml            |  4 +
 cmd/crates/soroban-test/src/lib.rs            | 12 +++
 .../soroban-test/tests/it/integration.rs      |  3 +
 .../tests/it/integration/emulator.rs          | 83 +++++++++++++++++++
 .../soroban-test/tests/it/integration/tx.rs   | 13 ++-
 cmd/crates/stellar-ledger/Cargo.toml          |  2 +-
 .../emulator_test_support/http_transport.rs   |  2 +-
 .../src/emulator_test_support/speculos.rs     | 58 +++++++++++--
 .../src/emulator_test_support/util.rs         |  9 +-
 .../tests/test/emulator_tests.rs              | 62 +++++++-------
 cmd/soroban-cli/Cargo.toml                    |  1 +
 cmd/soroban-cli/src/config/address.rs         |  4 +-
 cmd/soroban-cli/src/config/secret.rs          |  6 +-
 cmd/soroban-cli/src/config/sign_with.rs       |  9 +-
 cmd/soroban-cli/src/signer.rs                 | 43 +++++++++-
 17 files changed, 261 insertions(+), 56 deletions(-)
 create mode 100644 cmd/crates/soroban-test/tests/it/integration/emulator.rs

diff --git a/Cargo.lock b/Cargo.lock
index 6e71d2a9a..df4d0ea3d 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -4610,8 +4610,11 @@ dependencies = [
  "soroban-ledger-snapshot",
  "soroban-spec",
  "soroban-spec-tools",
+ "stellar-ledger",
  "stellar-rpc-client",
  "stellar-strkey 0.0.11",
+ "test-case",
+ "testcontainers",
  "thiserror",
  "tokio",
  "toml",
diff --git a/Cargo.toml b/Cargo.toml
index 73dbd4cb5..33f8363fa 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -108,7 +108,10 @@ walkdir = "2.5.0"
 toml_edit = "0.22.20"
 toml = "0.8.19"
 reqwest = "0.12.7"
+# testing
 predicates = "3.1.2"
+testcontainers = { version = "0.20.1" }
+
 
 [profile.test-wasms]
 inherits = "release"
diff --git a/cmd/crates/soroban-test/Cargo.toml b/cmd/crates/soroban-test/Cargo.toml
index f694ec533..86656ceb2 100644
--- a/cmd/crates/soroban-test/Cargo.toml
+++ b/cmd/crates/soroban-test/Cargo.toml
@@ -24,6 +24,7 @@ stellar-strkey = { workspace = true }
 sep5 = { workspace = true }
 soroban-cli = { workspace = true }
 soroban-rpc = { workspace = true }
+stellar-ledger = { workspace = true }
 
 thiserror = "1.0.31"
 sha2 = "0.10.6"
@@ -32,6 +33,7 @@ assert_fs = "1.0.7"
 predicates = { workspace = true }
 fs_extra = "1.3.0"
 toml = { workspace = true }
+testcontainers = { workspace = true }
 
 
 [dev-dependencies]
@@ -42,6 +44,8 @@ walkdir = "2.4.0"
 ulid.workspace = true
 ed25519-dalek = { workspace = true }
 hex = { workspace = true }
+test-case = "3.3.1"
 
 [features]
 it = []
+emulator-tests = ["stellar-ledger/emulator-tests"]
diff --git a/cmd/crates/soroban-test/src/lib.rs b/cmd/crates/soroban-test/src/lib.rs
index 82e05b78e..6645acf61 100644
--- a/cmd/crates/soroban-test/src/lib.rs
+++ b/cmd/crates/soroban-test/src/lib.rs
@@ -36,6 +36,10 @@ use soroban_cli::{
 };
 
 mod wasm;
+use stellar_ledger::emulator_test_support::{
+    enable_hash_signing, get_container, speculos::Speculos, wait_for_emulator_start_text,
+};
+use testcontainers::ContainerAsync;
 pub use wasm::Wasm;
 
 pub const TEST_ACCOUNT: &str = "test";
@@ -308,6 +312,14 @@ impl TestEnv {
     pub fn client(&self) -> soroban_rpc::Client {
         soroban_rpc::Client::new(&self.rpc_url).unwrap()
     }
+
+    pub async fn speculos_container(ledger_device_model: &str) -> ContainerAsync<Speculos> {
+        let container = get_container(ledger_device_model).await;
+        let ui_host_port: u16 = container.get_host_port_ipv4(5000).await.unwrap();
+        wait_for_emulator_start_text(ui_host_port).await;
+        enable_hash_signing(ui_host_port).await;
+        container
+    }
 }
 
 pub fn temp_ledger_file() -> OsString {
diff --git a/cmd/crates/soroban-test/tests/it/integration.rs b/cmd/crates/soroban-test/tests/it/integration.rs
index 3ec0d61ed..a8a637b20 100644
--- a/cmd/crates/soroban-test/tests/it/integration.rs
+++ b/cmd/crates/soroban-test/tests/it/integration.rs
@@ -9,3 +9,6 @@ mod snapshot;
 mod tx;
 mod util;
 mod wrap;
+
+#[cfg(feature = "emulator-tests")]
+mod emulator;
diff --git a/cmd/crates/soroban-test/tests/it/integration/emulator.rs b/cmd/crates/soroban-test/tests/it/integration/emulator.rs
new file mode 100644
index 000000000..9c4ccd1c0
--- /dev/null
+++ b/cmd/crates/soroban-test/tests/it/integration/emulator.rs
@@ -0,0 +1,83 @@
+use stellar_ledger::{Blob, Error};
+
+use soroban_test::{AssertExt, TestEnv, LOCAL_NETWORK_PASSPHRASE};
+use std::sync::Arc;
+
+use soroban_cli::xdr::{
+    self, Memo, MuxedAccount, Operation, OperationBody, PaymentOp, Preconditions, SequenceNumber,
+    Transaction, TransactionExt, Uint256,
+};
+
+use stellar_ledger::emulator_test_support::*;
+
+use test_case::test_case;
+
+use crate::integration::util::{deploy_contract, DeployKind, HELLO_WORLD};
+
+// #[test_case("nanos"; "when the device is NanoS")]
+#[test_case("nanox"; "when the device is NanoX")]
+// #[test_case("nanosp"; "when the device is NanoS Plus")]
+#[tokio::test]
+async fn test_get_public_key(ledger_device_model: &str) {
+    let sandbox = Arc::new(TestEnv::new());
+    let container = TestEnv::speculos_container(ledger_device_model).await;
+    let host_port = container.get_host_port_ipv4(9998).await.unwrap();
+    let ui_host_port = container.get_host_port_ipv4(5000).await.unwrap();
+
+    let ledger = ledger(host_port).await;
+
+    let key = ledger.get_public_key(&0.into()).await.unwrap();
+    let account = &key.to_string();
+    sandbox.fund_account(account);
+    sandbox
+        .new_assert_cmd("contract")
+        .arg("install")
+        .args([
+            "--wasm",
+            HELLO_WORLD.path().as_os_str().to_str().unwrap(),
+            "--source",
+            account,
+        ])
+        .assert()
+        .success();
+
+    let tx_simulated =
+        deploy_contract(&sandbox, HELLO_WORLD, DeployKind::SimOnly, Some(account)).await;
+    dbg!("{tx_simulated}");
+    let key = ledger.get_public_key(&0.into()).await.unwrap();
+    println!("{key}");
+    let sign = tokio::task::spawn_blocking({
+        let sandbox = Arc::clone(&sandbox);
+
+        move || {
+            sandbox
+                .new_assert_cmd("tx")
+                .arg("sign")
+                .arg("--sign-with-ledger")
+                .write_stdin(tx_simulated.as_bytes())
+                .env("SPECULOS_PORT", host_port.to_string())
+                .env("RUST_LOGS", "trace")
+                .assert()
+                .success()
+                .stdout_as_str()
+        }
+    });
+    let approve = tokio::task::spawn(approve_tx_hash_signature(
+        ui_host_port,
+        ledger_device_model.to_string(),
+    ));
+
+    let response = sign.await.unwrap();
+    approve.await.unwrap();
+
+    dbg!("{tx_signed}");
+
+    sandbox
+        .clone()
+        .new_assert_cmd("tx")
+        .arg("send")
+        .write_stdin(response.as_bytes())
+        .assert()
+        .success()
+        .stdout(predicates::str::contains("SUCCESS"));
+}
diff --git a/cmd/crates/soroban-test/tests/it/integration/tx.rs b/cmd/crates/soroban-test/tests/it/integration/tx.rs
index c3cd2693b..00d907e77 100644
--- a/cmd/crates/soroban-test/tests/it/integration/tx.rs
+++ b/cmd/crates/soroban-test/tests/it/integration/tx.rs
@@ -56,10 +56,19 @@ async fn txn_hash() {
 #[tokio::test]
 async fn build_simulate_sign_send() {
     let sandbox = &TestEnv::new();
+    build_sim_sign_send(sandbox, "test", "--sign-with-key=test").await;
+}
+
+pub(crate) async fn build_sim_sign_send(sandbox: &TestEnv, account: &str, sign_with: &str) {
     sandbox
         .new_assert_cmd("contract")
         .arg("install")
-        .args(["--wasm", HELLO_WORLD.path().as_os_str().to_str().unwrap()])
+        .args([
+            "--wasm",
+            HELLO_WORLD.path().as_os_str().to_str().unwrap(),
+            "--source",
+            account,
+        ])
         .assert()
         .success();
 
@@ -69,7 +78,7 @@ async fn build_simulate_sign_send() {
     let tx_signed = sandbox
         .new_assert_cmd("tx")
         .arg("sign")
-        .arg("--sign-with-key=test")
+        .arg(sign_with)
         .write_stdin(tx_simulated.as_bytes())
         .assert()
         .success()
diff --git a/cmd/crates/stellar-ledger/Cargo.toml b/cmd/crates/stellar-ledger/Cargo.toml
index 17335a453..8b2d22b41 100644
--- a/cmd/crates/stellar-ledger/Cargo.toml
+++ b/cmd/crates/stellar-ledger/Cargo.toml
@@ -35,7 +35,7 @@ tokio = { version = "1", features = ["full"] }
 reqwest = { workspace = true, features = ["json"] }
 phf = { version = "0.11.2", features = ["macros"], optional = true }
 async-trait = { workspace = true }
-testcontainers = { version = "0.20.1", optional = true }
+testcontainers = { workspace = true, optional = true }
 
 [dependencies.stellar-xdr]
 workspace = true
diff --git a/cmd/crates/stellar-ledger/src/emulator_test_support/http_transport.rs b/cmd/crates/stellar-ledger/src/emulator_test_support/http_transport.rs
index c90c28d92..c82c46cac 100644
--- a/cmd/crates/stellar-ledger/src/emulator_test_support/http_transport.rs
+++ b/cmd/crates/stellar-ledger/src/emulator_test_support/http_transport.rs
@@ -72,7 +72,7 @@ impl Exchange for EmulatorHttpTransport {
         let resp: Response = HttpClient::new()
             .post(&self.url)
             .headers(headers)
-            .timeout(Duration::from_secs(25))
+            .timeout(Duration::from_secs(60))
             .json(&request)
             .send()
             .await
diff --git a/cmd/crates/stellar-ledger/src/emulator_test_support/speculos.rs b/cmd/crates/stellar-ledger/src/emulator_test_support/speculos.rs
index 9084b8c85..f8b95c13a 100644
--- a/cmd/crates/stellar-ledger/src/emulator_test_support/speculos.rs
+++ b/cmd/crates/stellar-ledger/src/emulator_test_support/speculos.rs
@@ -1,4 +1,4 @@
-use std::{borrow::Cow, collections::HashMap, path::PathBuf};
+use std::{borrow::Cow, collections::HashMap, path::PathBuf, str::FromStr};
 use testcontainers::{
     core::{Mount, WaitFor},
     Image,
@@ -55,14 +55,54 @@ impl Speculos {
     }
 
     fn get_cmd(ledger_device_model: String) -> String {
-        let device_model = ledger_device_model.clone();
-        let container_elf_path = match device_model.as_str() {
-            "nanos" => format!("{DEFAULT_APP_PATH}/stellarNanoSApp.elf"),
-            "nanosp" => format!("{DEFAULT_APP_PATH}/stellarNanoSPApp.elf"),
-            "nanox" => format!("{DEFAULT_APP_PATH}/stellarNanoXApp.elf"),
-            _ => panic!("Unsupported device model"),
-        };
-        format!("/home/zondax/speculos/speculos.py --log-level speculos:DEBUG --color JADE_GREEN --display headless -s {TEST_SEED_PHRASE} -m {device_model}  {container_elf_path}")
+        let device_model: DeviceModel = ledger_device_model.parse().unwrap();
+        let container_elf_path = format!("{DEFAULT_APP_PATH}/{}", device_model.as_file());
+        format!(
+            "/home/zondax/speculos/speculos.py --log-level speculos:DEBUG --color JADE_GREEN \
+            --display headless \
+            -s {TEST_SEED_PHRASE} \
+            -m {device_model}  {container_elf_path}"
+        )
+    }
+}
+
+#[derive(Debug, Clone, Eq, PartialEq)]
+pub enum DeviceModel {
+    NanoS,
+    NanoSP,
+    NanoX,
+}
+
+impl FromStr for DeviceModel {
+    type Err = String;
+
+    fn from_str(s: &str) -> Result<Self, Self::Err> {
+        match s {
+            "nanos" => Ok(DeviceModel::NanoS),
+            "nanosp" => Ok(DeviceModel::NanoSP),
+            "nanox" => Ok(DeviceModel::NanoX),
+            _ => Err(format!("Unsupported device model: {}", s)),
+        }
+    }
+}
+
+impl std::fmt::Display for DeviceModel {
+    fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
+        match self {
+            DeviceModel::NanoS => write!(f, "nanos"),
+            DeviceModel::NanoSP => write!(f, "nanosp"),
+            DeviceModel::NanoX => write!(f, "nanox"),
+        }
+    }
+}
+
+impl DeviceModel {
+    pub fn as_file(&self) -> &str {
+        match self {
+            DeviceModel::NanoS => "stellarNanoSApp.elf",
+            DeviceModel::NanoSP => "stellarNanoSPApp.elf",
+            DeviceModel::NanoX => "stellarNanoXApp.elf",
+        }
     }
 }
 
diff --git a/cmd/crates/stellar-ledger/src/emulator_test_support/util.rs b/cmd/crates/stellar-ledger/src/emulator_test_support/util.rs
index cc442eca9..50479d532 100644
--- a/cmd/crates/stellar-ledger/src/emulator_test_support/util.rs
+++ b/cmd/crates/stellar-ledger/src/emulator_test_support/util.rs
@@ -1,4 +1,3 @@
-use ledger_transport::Exchange;
 use serde::Deserialize;
 use std::ops::Range;
 use std::sync::LazyLock;
@@ -24,7 +23,7 @@ pub fn test_network_hash() -> Hash {
     Hash(sha2::Sha256::digest(TEST_NETWORK_PASSPHRASE).into())
 }
 
-pub async fn ledger(host_port: u16) -> LedgerSigner<impl Exchange> {
+pub async fn ledger(host_port: u16) -> LedgerSigner<EmulatorHttpTransport> {
     LedgerSigner::new(get_http_transport("127.0.0.1", host_port).await.unwrap())
 }
 
@@ -83,9 +82,9 @@ struct EventsResponse {
     events: Vec<EmulatorEvent>,
 }
 
-pub async fn get_container(ledger_device_model: String) -> ContainerAsync<Speculos> {
+pub async fn get_container(ledger_device_model: &str) -> ContainerAsync<Speculos> {
     let (tcp_port_1, tcp_port_2) = get_available_ports(2);
-    Speculos::new(ledger_device_model)
+    Speculos::new(ledger_device_model.to_string())
         .with_mapped_port(tcp_port_1, ContainerPort::Tcp(9998))
         .with_mapped_port(tcp_port_2, ContainerPort::Tcp(5000))
         .start()
@@ -110,7 +109,7 @@ pub fn get_available_ports(n: usize) -> (u16, u16) {
     (ports[0], ports[1])
 }
 
-pub async fn get_http_transport(host: &str, port: u16) -> Result<impl Exchange, Error> {
+pub async fn get_http_transport(host: &str, port: u16) -> Result<EmulatorHttpTransport, Error> {
     let max_retries = 5;
     let mut retries = 0;
     let mut wait_time = Duration::from_secs(1);
diff --git a/cmd/crates/stellar-ledger/tests/test/emulator_tests.rs b/cmd/crates/stellar-ledger/tests/test/emulator_tests.rs
index c01f55849..880ac95ff 100644
--- a/cmd/crates/stellar-ledger/tests/test/emulator_tests.rs
+++ b/cmd/crates/stellar-ledger/tests/test/emulator_tests.rs
@@ -12,12 +12,12 @@ use stellar_ledger::emulator_test_support::*;
 
 use test_case::test_case;
 
-#[test_case("nanos".to_string() ; "when the device is NanoS")]
-#[test_case("nanox".to_string() ; "when the device is NanoX")]
-#[test_case("nanosp".to_string() ; "when the device is NanoS Plus")]
+#[test_case("nanos"; "when the device is NanoS")]
+#[test_case("nanox"; "when the device is NanoX")]
+#[test_case("nanosp"; "when the device is NanoS Plus")]
 #[tokio::test]
-async fn test_get_public_key(ledger_device_model: String) {
-    let container = get_container(ledger_device_model.clone()).await;
+async fn test_get_public_key(ledger_device_model: &str) {
+    let container = get_container(ledger_device_model).await;
     let host_port = container.get_host_port_ipv4(9998).await.unwrap();
     let ui_host_port: u16 = container.get_host_port_ipv4(5000).await.unwrap();
     wait_for_emulator_start_text(ui_host_port).await;
@@ -39,12 +39,12 @@ async fn test_get_public_key(ledger_device_model: String) {
     }
 }
 
-#[test_case("nanos".to_string() ; "when the device is NanoS")]
-#[test_case("nanox".to_string() ; "when the device is NanoX")]
-#[test_case("nanosp".to_string() ; "when the device is NanoS Plus")]
+#[test_case("nanos"; "when the device is NanoS")]
+#[test_case("nanox"; "when the device is NanoX")]
+#[test_case("nanosp"; "when the device is NanoS Plus")]
 #[tokio::test]
-async fn test_get_app_configuration(ledger_device_model: String) {
-    let container = get_container(ledger_device_model.clone()).await;
+async fn test_get_app_configuration(ledger_device_model: &str) {
+    let container = get_container(ledger_device_model).await;
     let host_port = container.get_host_port_ipv4(9998).await.unwrap();
     let ui_host_port: u16 = container.get_host_port_ipv4(5000).await.unwrap();
     wait_for_emulator_start_text(ui_host_port).await;
@@ -62,12 +62,12 @@ async fn test_get_app_configuration(ledger_device_model: String) {
     };
 }
 
-#[test_case("nanos".to_string() ; "when the device is NanoS")]
-#[test_case("nanox".to_string() ; "when the device is NanoX")]
-#[test_case("nanosp".to_string() ; "when the device is NanoS Plus")]
+#[test_case("nanos"; "when the device is NanoS")]
+#[test_case("nanox"; "when the device is NanoX")]
+#[test_case("nanosp"; "when the device is NanoS Plus")]
 #[tokio::test]
-async fn test_sign_tx(ledger_device_model: String) {
-    let container = get_container(ledger_device_model.clone()).await;
+async fn test_sign_tx(ledger_device_model: &str) {
+    let container = get_container(ledger_device_model).await;
     let host_port = container.get_host_port_ipv4(9998).await.unwrap();
     let ui_host_port: u16 = container.get_host_port_ipv4(5000).await.unwrap();
     wait_for_emulator_start_text(ui_host_port).await;
@@ -112,7 +112,7 @@ async fn test_sign_tx(ledger_device_model: String) {
         fee: 100,
         seq_num: SequenceNumber(1),
         cond: Preconditions::None,
-        memo: Memo::Text("Stellar".as_bytes().try_into().unwrap()),
+        memo: Memo::Text("Stellar".try_into().unwrap()),
         ext: TransactionExt::V0,
         operations: [Operation {
             source_account: Some(MuxedAccount::Ed25519(Uint256(source_account_bytes))),
@@ -130,7 +130,10 @@ async fn test_sign_tx(ledger_device_model: String) {
         let ledger = Arc::clone(&ledger);
         async move { ledger.sign_transaction(path, tx, test_network_hash()).await }
     });
-    let approve = tokio::task::spawn(approve_tx_signature(ui_host_port, ledger_device_model));
+    let approve = tokio::task::spawn(approve_tx_signature(
+        ui_host_port,
+        ledger_device_model.to_string(),
+    ));
 
     let result = sign.await.unwrap();
     let _ = approve.await.unwrap();
@@ -146,12 +149,12 @@ async fn test_sign_tx(ledger_device_model: String) {
     };
 }
 
-#[test_case("nanos".to_string() ; "when the device is NanoS")]
-#[test_case("nanox".to_string() ; "when the device is NanoX")]
-#[test_case("nanosp".to_string() ; "when the device is NanoS Plus")]
+#[test_case("nanos"; "when the device is NanoS")]
+#[test_case("nanox"; "when the device is NanoX")]
+#[test_case("nanosp"; "when the device is NanoS Plus")]
 #[tokio::test]
-async fn test_sign_tx_hash_when_hash_signing_is_not_enabled(ledger_device_model: String) {
-    let container = get_container(ledger_device_model.clone()).await;
+async fn test_sign_tx_hash_when_hash_signing_is_not_enabled(ledger_device_model: &str) {
+    let container = get_container(ledger_device_model).await;
     let host_port = container.get_host_port_ipv4(9998).await.unwrap();
     let ui_host_port: u16 = container.get_host_port_ipv4(5000).await.unwrap();
     wait_for_emulator_start_text(ui_host_port).await;
@@ -170,12 +173,12 @@ async fn test_sign_tx_hash_when_hash_signing_is_not_enabled(ledger_device_model:
     }
 }
 
-#[test_case("nanos".to_string() ; "when the device is NanoS")]
-#[test_case("nanox".to_string() ; "when the device is NanoX")]
-#[test_case("nanosp".to_string() ; "when the device is NanoS Plus")]
+#[test_case("nanos"; "when the device is NanoS")]
+#[test_case("nanox"; "when the device is NanoX")]
+#[test_case("nanosp"; "when the device is NanoS Plus")]
 #[tokio::test]
-async fn test_sign_tx_hash_when_hash_signing_is_enabled(ledger_device_model: String) {
-    let container = get_container(ledger_device_model.clone()).await;
+async fn test_sign_tx_hash_when_hash_signing_is_enabled(ledger_device_model: &str) {
+    let container = get_container(ledger_device_model).await;
     let host_port = container.get_host_port_ipv4(9998).await.unwrap();
     let ui_host_port: u16 = container.get_host_port_ipv4(5000).await.unwrap();
 
@@ -201,7 +204,10 @@ async fn test_sign_tx_hash_when_hash_signing_is_enabled(ledger_device_model: Str
         let ledger = Arc::clone(&ledger);
         async move { ledger.sign_transaction_hash(path, &test_hash).await }
     });
-    let approve = tokio::task::spawn(approve_tx_hash_signature(ui_host_port, ledger_device_model));
+    let approve = tokio::task::spawn(approve_tx_hash_signature(
+        ui_host_port,
+        ledger_device_model.to_string(),
+    ));
 
     let response = sign.await.unwrap();
     let _ = approve.await.unwrap();
diff --git a/cmd/soroban-cli/Cargo.toml b/cmd/soroban-cli/Cargo.toml
index 3e65072b5..234a70da9 100644
--- a/cmd/soroban-cli/Cargo.toml
+++ b/cmd/soroban-cli/Cargo.toml
@@ -37,6 +37,7 @@ doctest = false
 [features]
 default = []
 opt = ["dep:wasm-opt"]
+emulator-tests = ["stellar-ledger/emulator-tests"]
 
 [dependencies]
 stellar-xdr = { workspace = true, features = ["cli"] }
diff --git a/cmd/soroban-cli/src/config/address.rs b/cmd/soroban-cli/src/config/address.rs
index d7c1ebaba..43a9521ec 100644
--- a/cmd/soroban-cli/src/config/address.rs
+++ b/cmd/soroban-cli/src/config/address.rs
@@ -1,7 +1,7 @@
 use std::str::FromStr;
 
 use crate::{
-    signer::{self, native_ledger},
+    signer::{self, ledger},
     xdr,
 };
 
@@ -80,7 +80,7 @@ impl Address {
                 ))
             }),
             Address::Ledger(hd_path) => Ok(xdr::MuxedAccount::Ed25519(
-                native_ledger(*hd_path)?.public_key().await?.0.into(),
+                ledger(*hd_path).await?.public_key().await?.0.into(),
             )),
         }
     }
diff --git a/cmd/soroban-cli/src/config/secret.rs b/cmd/soroban-cli/src/config/secret.rs
index 6e5703d57..1c8f89c5c 100644
--- a/cmd/soroban-cli/src/config/secret.rs
+++ b/cmd/soroban-cli/src/config/secret.rs
@@ -6,7 +6,7 @@ use stellar_strkey::ed25519::{PrivateKey, PublicKey};
 
 use crate::{
     print::Print,
-    signer::{self, native_ledger, LocalKey, Signer, SignerKind},
+    signer::{self, ledger, LocalKey, Signer, SignerKind},
     utils,
 };
 
@@ -133,7 +133,7 @@ impl Secret {
         )?)
     }
 
-    pub fn signer(&self, index: Option<usize>, print: Print) -> Result<Signer, Error> {
+    pub async fn signer(&self, index: Option<usize>, print: Print) -> Result<Signer, Error> {
         let kind = match self {
             Secret::SecretKey { .. } | Secret::SeedPhrase { .. } => {
                 let key = self.key_pair(index)?;
@@ -144,7 +144,7 @@ impl Secret {
                     .unwrap_or_default()
                     .try_into()
                     .expect("uszie bigger than u32");
-                SignerKind::Ledger(native_ledger(hd_path)?)
+                SignerKind::Ledger(ledger(hd_path).await?)
             }
         };
         Ok(Signer { kind, print })
diff --git a/cmd/soroban-cli/src/config/sign_with.rs b/cmd/soroban-cli/src/config/sign_with.rs
index a747a5524..8446f086e 100644
--- a/cmd/soroban-cli/src/config/sign_with.rs
+++ b/cmd/soroban-cli/src/config/sign_with.rs
@@ -1,6 +1,6 @@
 use crate::{
     print::Print,
-    signer::{self, native_ledger, Signer, SignerKind},
+    signer::{self, ledger, Signer, SignerKind},
     xdr::{self, TransactionEnvelope},
 };
 use clap::arg;
@@ -72,12 +72,13 @@ impl Args {
                 print,
             }
         } else if self.sign_with_ledger {
-            let ledger = native_ledger(
+            let ledger = ledger(
                 self.hd_path
                     .unwrap_or_default()
                     .try_into()
                     .unwrap_or_default(),
-            )?;
+            )
+            .await?;
             Signer {
                 kind: SignerKind::Ledger(ledger),
                 print,
@@ -85,7 +86,7 @@ impl Args {
         } else {
             let key_or_name = self.sign_with_key.as_deref().ok_or(Error::NoSignWithKey)?;
             let secret = locator.key(key_or_name)?;
-            secret.signer(self.hd_path, print)?
+            secret.signer(self.hd_path, print).await?
         };
         Ok(signer.sign_tx_env(tx, network).await?)
     }
diff --git a/cmd/soroban-cli/src/signer.rs b/cmd/soroban-cli/src/signer.rs
index 1593d8c9c..3ef79ecaf 100644
--- a/cmd/soroban-cli/src/signer.rs
+++ b/cmd/soroban-cli/src/signer.rs
@@ -209,7 +209,10 @@ pub struct Signer {
 #[allow(clippy::module_name_repetitions, clippy::large_enum_variant)]
 pub enum SignerKind {
     Local(LocalKey),
+    #[cfg(not(feature = "emulator-tests"))]
     Ledger(Ledger<TransportNativeHID>),
+    #[cfg(feature = "emulator-tests")]
+    Ledger(Ledger<stellar_ledger::emulator_test_support::http_transport::EmulatorHttpTransport>),
     Lab,
 }
 
@@ -279,12 +282,29 @@ impl<T: Exchange> Ledger<T> {
         Ok(DecoratedSignature { hint, signature })
     }
 
+    pub async fn sign_transaction(
+        &self,
+        tx: Transaction,
+        network_passphrase: &str,
+    ) -> Result<DecoratedSignature, Error> {
+        let network_id = Hash(Sha256::digest(network_passphrase).into());
+        let signature = self
+            .signer
+            .sign_transaction(self.index, tx, network_id)
+            .await?;
+        let key = self.public_key().await?;
+        let hint = SignatureHint(key.0[28..].try_into()?);
+        let signature = Signature(signature.try_into()?);
+        Ok(DecoratedSignature { hint, signature })
+    }
+
     pub async fn public_key(&self) -> Result<stellar_strkey::ed25519::PublicKey, Error> {
         Ok(self.signer.get_public_key(&self.index.into()).await?)
     }
 }
 
-pub fn native_ledger(hd_path: u32) -> Result<Ledger<TransportNativeHID>, Error> {
+#[cfg(not(feature = "emulator-tests"))]
+pub async fn ledger(hd_path: u32) -> Result<Ledger<TransportNativeHID>, Error> {
     let signer = stellar_ledger::native()?;
     Ok(Ledger {
         index: hd_path,
@@ -292,6 +312,27 @@ pub fn native_ledger(hd_path: u32) -> Result<Ledger<TransportNativeHID>, Error>
     })
 }
 
+#[cfg(feature = "emulator-tests")]
+pub async fn ledger(
+    hd_path: u32,
+) -> Result<
+    Ledger<stellar_ledger::emulator_test_support::http_transport::EmulatorHttpTransport>,
+    Error,
+> {
+    use stellar_ledger::emulator_test_support::ledger as emulator_ledger;
+    // port from SPECULOS_PORT ENV var
+    let host_port: u16 = std::env::var("SPECULOS_PORT")
+        .expect("SPECULOS_PORT env var not set")
+        .parse()
+        .expect("port must be a number");
+    let signer = emulator_ledger(host_port).await;
+
+    Ok(Ledger {
+        index: hd_path,
+        signer,
+    })
+}
+
 impl LocalKey {
     pub fn sign_tx_hash(&self, tx_hash: [u8; 32]) -> Result<DecoratedSignature, Error> {
         let hint = SignatureHint(self.key.verifying_key().to_bytes()[28..].try_into()?);

From 4680b96d886ac547e58d7d9e982060a3f2ce2a55 Mon Sep 17 00:00:00 2001
From: Willem Wyndham <willem@ahalabs.dev>
Date: Tue, 19 Nov 2024 15:50:38 -0500
Subject: [PATCH 31/31] fix: actually test in CI

---
 .github/workflows/rpc-tests.yml    | 7 +++++--
 cmd/crates/soroban-test/src/lib.rs | 5 ++++-
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/rpc-tests.yml b/.github/workflows/rpc-tests.yml
index 75b6d7760..778cc6525 100644
--- a/.github/workflows/rpc-tests.yml
+++ b/.github/workflows/rpc-tests.yml
@@ -39,7 +39,10 @@ jobs:
             target/
           key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
       - run: rustup update
-      - run: cargo build
       - run: rustup target add wasm32-unknown-unknown
       - run: make build-test-wasms
-      - run: SOROBAN_PORT=8000 cargo test --features it --package soroban-test --test it -- integration
+      - name: install libudev-dev
+        run: |
+          sudo apt install -y libudev-dev
+      - run: cargo build --features emulator-tests
+      - run: SOROBAN_PORT=8000 cargo test --features it --features emulator-tests --package soroban-test --test it -- integration
diff --git a/cmd/crates/soroban-test/src/lib.rs b/cmd/crates/soroban-test/src/lib.rs
index 4956521e1..b10b32ec1 100644
--- a/cmd/crates/soroban-test/src/lib.rs
+++ b/cmd/crates/soroban-test/src/lib.rs
@@ -311,7 +311,10 @@ impl TestEnv {
     }
 
     #[cfg(feature = "emulator-tests")]
-    pub async fn speculos_container(ledger_device_model: &str) -> testcontainers::ContainerAsync<stellar_ledger::emulator_test_support::speculos::Speculos> {
+    pub async fn speculos_container(
+        ledger_device_model: &str,
+    ) -> testcontainers::ContainerAsync<stellar_ledger::emulator_test_support::speculos::Speculos>
+    {
         use stellar_ledger::emulator_test_support::{
             enable_hash_signing, get_container, wait_for_emulator_start_text,
         };