feat: Add early validation for configuration and keypair in main function

Author: swaroop-osec

src/main.rs

@@ -38,8 +38,8 @@ mod test;
 
 use crate::solana_program::{
     compose_transaction, find_build_params_pda, get_all_pdas_available, get_program_pda,
-    process_close, resolve_rpc_url, upload_program_verification_data, InputParams,
-    OtterBuildParams, OtterVerifyInstructions,
+    process_close, resolve_rpc_url, upload_program_verification_data, validate_config_and_keypair,
+    InputParams, OtterBuildParams, OtterVerifyInstructions,
 };
 
 const MAINNET_GENESIS_HASH: &str = "5eykt4UsFv8P8NJdTREpY1vzqKqZKvdpKuc147dw2N9d";
@@ -352,9 +352,21 @@ async fn main() -> anyhow::Result<()> {
         )
         .get_matches();
 
+    // Validate configuration early if custom config is provided
+    let config_path = matches.value_of("config").map(|s| s.to_string());
+    if config_path.is_some() {
+        // Check if verify-from-repo subcommand has a keypair parameter
+        let keypair_path = if let ("verify-from-repo", Some(sub_m)) = matches.subcommand() {
+            sub_m.value_of("keypair").map(|s| s.to_string())
+        } else {
+            None
+        };
+        validate_config_and_keypair(config_path.as_deref(), keypair_path.as_deref())?;
+    }
+
     let connection = resolve_rpc_url(
         matches.value_of("url").map(|s| s.to_string()),
-        matches.value_of("config").map(|s| s.to_string()),
+        config_path.clone(),
     )?;
     let res = match matches.subcommand() {
         ("build", Some(sub_m)) => {
@@ -385,7 +397,7 @@ async fn main() -> anyhow::Result<()> {
                 executable_path.to_string(),
                 image.to_string(),
                 matches.value_of("url").map(|s| s.to_string()),
-                matches.value_of("config").map(|s| s.to_string()),
+                config_path.clone(),
                 Pubkey::try_from(program_id)?,
                 current_dir,
                 &mut temp_dir,
@@ -458,7 +470,7 @@ async fn main() -> anyhow::Result<()> {
                 &mut container_id,
                 &mut temp_dir,
                 &check_signal,
-                matches.value_of("config").map(|s| s.to_string()),
+                config_path.clone(),
             )
             .await
         }
@@ -473,7 +485,7 @@ async fn main() -> anyhow::Result<()> {
                 Pubkey::try_from(program_id)?,
                 &connection,
                 compute_unit_price,
-                matches.value_of("config").map(|s| s.to_string()),
+                config_path.clone(),
             )
             .await
         }
@@ -510,7 +522,7 @@ async fn main() -> anyhow::Result<()> {
 
             let connection = resolve_rpc_url(
                 matches.value_of("url").map(|s| s.to_string()),
-                matches.value_of("config").map(|s| s.to_string()),
+                config_path.clone(),
             )?;
             println!("Using connection url: {}", connection.url());
 
@@ -542,7 +554,7 @@ async fn main() -> anyhow::Result<()> {
                 Pubkey::try_from(program_id)?,
                 signer,
                 &connection,
-                matches.value_of("config").map(|s| s.to_string()),
+                config_path.clone(),
             )
             .await
         }

src/solana_program.rs

@@ -100,7 +100,13 @@ fn get_keypair_from_path(path: &str) -> anyhow::Result<Keypair> {
 
 fn get_user_config_with_path(config_path: Option<String>) -> anyhow::Result<(Keypair, RpcClient)> {
     let cli_config: Config = match config_path {
-        Some(config_file) => Config::load(&config_file).map_err(|err| anyhow!("Failed to load Solana CLI configuration file '{}'.\nError: {}", config_file, err))?,
+        Some(config_file) => Config::load(&config_file).map_err(|err| {
+            anyhow!(
+                "Failed to load Solana CLI configuration file '{}'.\nError: {}",
+                config_file,
+                err
+            )
+        })?,
         None => {
             let config_file = solana_cli_config::CONFIG_FILE
                 .as_ref()
@@ -115,6 +121,35 @@ fn get_user_config_with_path(config_path: Option<String>) -> anyhow::Result<(Key
     Ok((signer, rpc_client))
 }
 
+/// Validates configuration and keypair early to avoid late failures
+pub fn validate_config_and_keypair(
+    config_path: Option<&str>,
+    path_to_keypair: Option<&str>,
+) -> anyhow::Result<()> {
+    // Validate the config file if provided
+    if let Some(config_file) = config_path {
+        let cli_config = Config::load(config_file).map_err(|err| {
+            anyhow!(
+                "Failed to load Solana CLI configuration file '{}'.\nError: {}",
+                config_file,
+                err
+            )
+        })?;
+
+        // If no explicit keypair path provided, validate the one from config
+        if path_to_keypair.is_none() {
+            let _ = get_keypair_from_path(&cli_config.keypair_path)?;
+        }
+    }
+
+    // Validate the explicit keypair path if provided
+    if let Some(keypair_path) = path_to_keypair {
+        let _ = get_keypair_from_path(keypair_path)?;
+    }
+
+    Ok(())
+}
+
 pub fn compose_transaction(
     params: &InputParams,
     signer_pubkey: Pubkey,