fix: only resolve contract alias if needed (#1575)

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

@@ -130,11 +130,7 @@ impl NetworkRunnable for Cmd {
         let config = config.unwrap_or(&self.config);
         let network = config.get_network()?;
         tracing::trace!(?network);
-        let contract = config.locator.resolve_contract_id(
-            self.key.contract_id.as_ref().unwrap(),
-            &network.network_passphrase,
-        )?;
-        let keys = self.key.parse_keys(contract)?;
+        let keys = self.key.parse_keys(&config.locator, &network)?;
         let network = &config.get_network()?;
         let client = Client::new(&network.rpc_url)?;
         let key = config.key_pair()?;

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

@@ -186,11 +186,7 @@ impl NetworkRunnable for Cmd {
         let network = config.get_network()?;
         tracing::trace!(?network);
         let client = Client::new(&network.rpc_url)?;
-        let contract = config.locator.resolve_contract_id(
-            self.key.contract_id.as_ref().unwrap(),
-            &network.network_passphrase,
-        )?;
-        let keys = self.key.parse_keys(contract)?;
+        let keys = self.key.parse_keys(&config.locator, &network)?;
         Ok(client.get_full_ledger_entries(&keys).await?)
     }
 }

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

@@ -133,11 +133,7 @@ impl NetworkRunnable for Cmd {
         let config = config.unwrap_or(&self.config);
         let network = config.get_network()?;
         tracing::trace!(?network);
-        let contract = config.locator.resolve_contract_id(
-            self.key.contract_id.as_ref().unwrap(),
-            &network.network_passphrase,
-        )?;
-        let entry_keys = self.key.parse_keys(contract)?;
+        let entry_keys = self.key.parse_keys(&config.locator, &network)?;
         let client = Client::new(&network.rpc_url)?;
         let key = config.key_pair()?;
 

cmd/soroban-cli/src/key.rs

@@ -1,12 +1,14 @@
+use crate::{
+    commands::contract::Durability,
+    config::{locator, network::Network},
+    wasm,
+};
 use clap::arg;
 use soroban_env_host::xdr::{
     self, LedgerKey, LedgerKeyContractCode, LedgerKeyContractData, Limits, ReadXdr, ScAddress,
     ScVal,
 };
 use std::path::PathBuf;
-use stellar_strkey::Contract;
-
-use crate::{commands::contract::Durability, wasm};
 
 #[derive(thiserror::Error, Debug)]
 pub enum Error {
@@ -18,6 +20,8 @@ pub enum Error {
     CannotParseContractId(String, stellar_strkey::DecodeError),
     #[error(transparent)]
     Wasm(#[from] wasm::Error),
+    #[error(transparent)]
+    Locator(#[from] locator::Error),
 }
 
 #[derive(Debug, clap::Args, Clone)]
@@ -61,7 +65,13 @@ pub struct Args {
 }
 
 impl Args {
-    pub fn parse_keys(&self, contract: Contract) -> Result<Vec<LedgerKey>, Error> {
+    pub fn parse_keys(
+        &self,
+        locator: &locator::Args,
+        Network {
+            network_passphrase, ..
+        }: &Network,
+    ) -> Result<Vec<LedgerKey>, Error> {
         let keys = if let Some(keys) = &self.key {
             keys.iter()
                 .map(|key| {
@@ -87,6 +97,8 @@ impl Args {
         } else {
             vec![ScVal::LedgerKeyContractInstance]
         };
+        let contract =
+            locator.resolve_contract_id(self.contract_id.as_ref().unwrap(), network_passphrase)?;
 
         Ok(keys
             .into_iter()