Merge branch 'feat/os_keychain' into feat/os-keychain-followup

stellar · Dec 23, 2024 · b5ea7de · b5ea7de
2 parents 78d59f1 + 01c8753
commit b5ea7de
Showing 1 changed file with 9 additions and 1 deletion.
diff --git a/cmd/soroban-cli/src/commands/keys/address.rs b/cmd/soroban-cli/src/commands/keys/address.rs
@@ -1,6 +1,9 @@
 use clap::arg;
 
-use crate::commands::config::{address, locator, secret};
+use crate::{
+    commands::config::{address, locator, secret},
+    config::UnresolvedMuxedAccount,
+};
 
 #[derive(thiserror::Error, Debug)]
 pub enum Error {
@@ -47,6 +50,11 @@ impl Cmd {
     pub fn public_key(&self) -> Result<stellar_strkey::ed25519::PublicKey, Error> {
         if let Ok(key) = stellar_strkey::ed25519::PublicKey::from_string(&self.name) {
             Ok(key)
+        } else if let Ok(unresolved) = self.name.parse::<UnresolvedMuxedAccount>() {
+            let muxed = unresolved.resolve_muxed_account(&self.locator, self.hd_path)?;
+            Ok(stellar_strkey::ed25519::PublicKey::from_string(
+                &muxed.to_string(),
+            )?)
         } else {
             Ok(stellar_strkey::ed25519::PublicKey::from_payload(
                 self.private_key()?.verifying_key().as_bytes(),