Merge branch 'main' into move-container-to-root

.gitignore

@@ -8,3 +8,4 @@ test_snapshots
 .vscode/settings.json
 .idea
 local.sh
+.stellar

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"
   }
 }

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 @@
     ]
   }
 }
-

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;

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"));
+}

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(())
     }
 }

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,
         ))
     }

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…),

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, "❗️");