Update stellar-strkey to 0.0.18

Cargo.toml

@@ -76,7 +76,7 @@ version = "27.0.0"
 
 # Dependencies from elsewhere shared by crates:
 [workspace.dependencies]
-stellar-strkey = "0.0.16"
+stellar-strkey = "0.0.18"
 sep5 = "0.1.0"
 base64 = "0.21.2"
 thiserror = "1.0.46"

FULL_HELP_DOCS.md

@@ -4396,7 +4396,7 @@ Print version information
 
 Decode and encode strkey
 
-**Usage:** `stellar strkey <COMMAND>`
+**Usage:** `stellar strkey [OPTIONS] <COMMAND>`
 
 ###### **Subcommands:**
 
@@ -4405,25 +4405,25 @@ Decode and encode strkey
 - `zero` — Generate the zero strkey
 - `version` — Print version information
 
+###### **Options:**
+
+- `-q`, `--quiet` — Suppress stderr log and warning output
+
 ## `stellar strkey decode`
 
 Decode strkey
 
-**Usage:** `stellar strkey decode <STRKEY>`
+Reads the strkey from stdin.
 
-###### **Arguments:**
-
-- `<STRKEY>` — Strkey to decode
+**Usage:** `stellar strkey decode`
 
 ## `stellar strkey encode`
 
 Encode strkey
 
-**Usage:** `stellar strkey encode <JSON>`
-
-###### **Arguments:**
+Reads the JSON from stdin.
 
-- `<JSON>` — JSON for Strkey to encode
+**Usage:** `stellar strkey encode`
 
 ## `stellar strkey zero`
 

cmd/crates/soroban-spec-tools/src/utils.rs

@@ -22,9 +22,9 @@ pub fn contract_id_from_str(contract_id: &str) -> Result<[u8; 32], stellar_strke
         .or_else(|_| {
             // strkey failed, try to parse it as a hex string, for backwards compatibility.
             padded_hex_from_str(contract_id, 32)
-                .map_err(|_| stellar_strkey::DecodeError::Invalid)?
+                .map_err(|_| stellar_strkey::DecodeError::InvalidPayloadLength)?
                 .try_into()
-                .map_err(|_| stellar_strkey::DecodeError::Invalid)
+                .map_err(|_| stellar_strkey::DecodeError::InvalidPayloadLength)
         })
-        .map_err(|_| stellar_strkey::DecodeError::Invalid)
+        .map_err(|_| stellar_strkey::DecodeError::InvalidPayloadLength)
 }

cmd/crates/soroban-test/src/lib.rs

@@ -297,6 +297,7 @@ impl TestEnv {
             self.cmd::<keys::secret::Cmd>(&format!("--hd-path={hd_path}"))
                 .private_key()
                 .unwrap()
+                .as_unredacted()
         )
     }
 

cmd/crates/soroban-test/tests/it/strkey.rs

@@ -5,10 +5,8 @@ fn decode() {
     let sandbox = TestEnv::default();
     sandbox
         .new_assert_cmd("strkey")
-        .args([
-            "decode",
-            "GAZTAML6YJA5PGKDXONKPSHKL6FYT6OG5I2R7YB7R3B5CETRG7KIJONK",
-        ])
+        .args(["decode"])
+        .write_stdin("GAZTAML6YJA5PGKDXONKPSHKL6FYT6OG5I2R7YB7R3B5CETRG7KIJONK")
         .assert()
         .success()
         .stdout(
@@ -24,7 +22,8 @@ fn encode() {
     let sandbox = TestEnv::default();
     sandbox
         .new_assert_cmd("strkey")
-        .args(["encode", r#"{"public_key_ed25519":"3330317ec241d79943bb9aa7c8ea5f8b89f9c6ea351fe03f8ec3d1127137d484"}"#])
+        .args(["encode"])
+        .write_stdin(r#"{"public_key_ed25519":"3330317ec241d79943bb9aa7c8ea5f8b89f9c6ea351fe03f8ec3d1127137d484"}"#)
         .assert()
         .success()
         .stdout("GAZTAML6YJA5PGKDXONKPSHKL6FYT6OG5I2R7YB7R3B5CETRG7KIJONK\n");

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

@@ -40,7 +40,7 @@ impl Cmd {
         if self.phrase {
             println!("{}", self.seed_phrase()?);
         } else {
-            println!("{}", self.private_key()?);
+            println!("{}", self.private_key()?.as_unredacted());
         }
 
         Ok(())

cmd/soroban-cli/src/commands/network/root_account/secret.rs

@@ -13,7 +13,7 @@ impl Cmd {
     pub fn run(&self) -> Result<(), Error> {
         let root_key = self.args.root_key()?;
         let private_key = PrivateKey::from_payload(&root_key)?;
-        println!("{private_key}");
+        println!("{}", private_key.as_unredacted());
         Ok(())
     }
 }

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

@@ -177,7 +177,10 @@ mod test {
     }
     #[test]
     fn secret_key() {
-        let secret_key = format!("{}", stellar_strkey::ed25519::PrivateKey([0; 32]));
+        let secret_key = format!(
+            "{}",
+            stellar_strkey::ed25519::PrivateKey([0; 32]).as_unredacted()
+        );
         let secret = Secret::SecretKey { secret_key };
         let key = Key::Secret(secret);
         round_trip(&key);

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

@@ -130,7 +130,7 @@ impl FromStr for Secret {
 impl From<PrivateKey> for Secret {
     fn from(value: PrivateKey) -> Self {
         Secret::SecretKey {
-            secret_key: format!("{value}"),
+            secret_key: format!("{}", value.as_unredacted()),
         }
     }
 }
@@ -285,7 +285,7 @@ mod tests {
 
         assert!(matches!(secret, Secret::SecretKey { .. }));
         assert_eq!(public_key.to_string(), TEST_PUBLIC_KEY);
-        assert_eq!(private_key.to_string(), TEST_SECRET_KEY);
+        assert_eq!(private_key.as_unredacted().to_string(), TEST_SECRET_KEY);
     }
 
     #[test]
@@ -296,7 +296,7 @@ mod tests {
 
         assert!(matches!(secret, Secret::SeedPhrase { .. }));
         assert_eq!(public_key.to_string(), TEST_PUBLIC_KEY);
-        assert_eq!(private_key.to_string(), TEST_SECRET_KEY);
+        assert_eq!(private_key.as_unredacted().to_string(), TEST_SECRET_KEY);
     }
 
     #[test]
@@ -463,7 +463,7 @@ mod tests {
         let pk = secret.public_key(Some(0)).unwrap();
         let sk = secret.private_key(Some(0)).unwrap();
         assert_eq!(pk.to_string(), TEST_PUBLIC_KEY);
-        assert_eq!(sk.to_string(), TEST_SECRET_KEY);
+        assert_eq!(sk.as_unredacted().to_string(), TEST_SECRET_KEY);
     }
 
     #[test]

cmd/soroban-cli/src/utils.rs

@@ -109,9 +109,9 @@ pub fn contract_id_from_str(
             // strkey failed, try to parse it as a hex string, for backwards compatibility.
             stellar_strkey::Contract(
                 soroban_spec_tools::utils::padded_hex_from_str(contract_id, 32)
-                    .map_err(|_| stellar_strkey::DecodeError::Invalid)?
+                    .map_err(|_| stellar_strkey::DecodeError::InvalidPayloadLength)?
                     .try_into()
-                    .map_err(|_| stellar_strkey::DecodeError::Invalid)?,
+                    .map_err(|_| stellar_strkey::DecodeError::InvalidPayloadLength)?,
             )
         },
     )