[cli] interactive config init and fix (#416)

Co-authored-by: Chiaretta Lento <[email protected]>
Co-authored-by: Caro Beaver <[email protected]>
Co-authored-by: Algernon De Accelerando <[email protected]>
Co-authored-by: Mariella Von Diminuendo <[email protected]>
Co-authored-by: Franci Von Ritardando <[email protected]>
Co-authored-by: Vale di Bittern <[email protected]>
Co-authored-by: Peregrine Von Stag <[email protected]>
Co-authored-by: Crispin Saint Hind <[email protected]>
Co-authored-by: Crispin LeLento <[email protected]>
Co-authored-by: Mariella Leveret <[email protected]>
Co-authored-by: Sere Mezzo <[email protected]>
Co-authored-by: Raffa Tempo <[email protected]>
Co-authored-by: 0o-de-lally <[email protected]>

Author: 14 people

tools/config/src/config_cli.rs

@@ -1,19 +1,16 @@
 use crate::{
     config_wizard,
     get_genesis_artifacts::{download_genesis, get_genesis_waypoint},
+    interactive::options::{fix_config, FixOptions},
     make_yaml_public_fullnode::init_fullnode_yaml,
     validator_config::{validator_dialogue, vfn_dialogue},
 };
-use anyhow::{anyhow, bail, Context, Result};
+use anyhow::{bail, Context, Result};
 use clap::Parser;
 use libra_types::{
-    core_types::{
-        app_cfg::{self, AppCfg},
-        network_playlist::NetworkPlaylist,
-    },
-    exports::{AccountAddress, AuthenticationKey, Client, NamedChain},
+    core_types::network_playlist::NetworkPlaylist,
+    exports::{AccountAddress, AuthenticationKey, NamedChain},
     global_config_dir, ol_progress,
-    type_extensions::client_ext::ClientExt,
 };
 use libra_wallet::{utils::read_operator_file, validator_files::OPERATOR_FILE};
 use std::path::PathBuf;
@@ -98,107 +95,14 @@ impl ConfigCli {
                 remove_profile,
                 fullnode_url: force_url,
             }) => {
-                // Validate exactly one argument is provided
-                let args_count = [
-                    *reset_address,
-                    remove_profile.is_some(),
-                    force_url.is_some(),
-                ]
-                .iter()
-                .filter(|&&x| x)
-                .count();
-
-                if args_count == 0 {
-                    return Err(anyhow!(
-                        "At least one argument must be provided to 'fix' command"
-                    ));
-                }
-                if args_count > 1 {
-                    return Err(anyhow!(
-                        "Only one argument can be provided to 'fix' command"
-                    ));
-                }
-
-                // Load configuration file
-                let mut cfg = AppCfg::load(self.path.clone())
-                    .map_err(|e| anyhow!("no config file found for libra tools, {}", e))?;
-                if !cfg.user_profiles.is_empty() {
-                    println!("your profiles:");
-                    for p in &cfg.user_profiles {
-                        println!("- address: {}, nickname: {}", p.account, p.nickname);
-                    }
-                } else {
-                    println!("no profiles found");
-                }
-
-                // Handle address fix option
-                let profile = if *reset_address {
-                    let mut account_keys = config_wizard::prompt_for_account()?;
-
-                    let client = Client::new(cfg.pick_url(self.chain_name)?);
-
-                    // Lookup originating address if client index is successful
-                    if client.get_index().await.is_ok() {
-                        account_keys.account = match client
-                            .lookup_originating_address(account_keys.auth_key)
-                            .await
-                        {
-                            Ok(r) => r,
-                            _ => {
-                                println!("This looks like a new account, and it's not yet on chain. If this is not what you expected, are you sure you are using the correct recovery mnemonic?");
-                                // do nothing
-                                account_keys.account
-                            }
-                        };
-                    };
-
-                    // Create profile based on account keys
-                    let profile =
-                        app_cfg::Profile::new(account_keys.auth_key, account_keys.account);
-
-                    // Add profile to configuration
-                    cfg.maybe_add_profile(profile)?;
-
-                    // Prompt to set as default profile
-                    if dialoguer::Confirm::new()
-                        .with_prompt("set as default profile?")
-                        .interact()?
-                    {
-                        cfg.workspace
-                            .set_default(account_keys.account.to_hex_literal());
-                    }
-
-                    cfg.get_profile_mut(Some(account_keys.account.to_hex_literal()))
-                } else {
-                    // get default profile
-                    println!("will try to fix your default profile");
-                    cfg.get_profile_mut(None)
-                }?;
-
-                println!("using profile: {}", &profile.nickname);
-
-                // user can take pledge here on fix or on init
-                profile.maybe_offer_basic_pledge();
-                profile.maybe_offer_validator_pledge();
-
-                // Remove profile if specified
-                if let Some(p) = remove_profile {
-                    let r = cfg.try_remove_profile(p);
-                    if r.is_err() {
-                        println!("no profile found matching {}", &p)
-                    }
-                }
-
-                // Force URL overwrite if specified
-                if let Some(u) = force_url {
-                    let np = cfg.get_network_profile_mut(self.chain_name)?;
-                    np.nodes = vec![];
-                    np.add_url(u.to_owned());
-                }
-
-                // Save configuration file
-                cfg.save_file()?;
-                Ok(())
+                fix_config(FixOptions {
+                    reset_address: *reset_address,
+                    remove_profile: remove_profile.clone(),
+                    fullnode_url: force_url.clone(),
+                    config_path: self.path.clone(),
+                    chain_name: self.chain_name,
+                })
+                .await
             }
 
             // Initialize configuration wizard

tools/config/src/config_wizard.rs

@@ -1,3 +1,4 @@
+use crate::interactive::account_selection;
 use anyhow::Context;
 use diem_crypto::{ed25519::Ed25519PrivateKey, ValidCryptoMaterialStringExt};
 use diem_types::chain_id::NamedChain;
@@ -7,7 +8,6 @@ use libra_types::{
     ol_progress,
     type_extensions::client_ext::ClientExt,
 };
-use libra_wallet::account_keys::{get_ol_legacy_address, AccountKeys};
 use std::path::PathBuf;
 use url::Url;
 
@@ -29,9 +29,7 @@ pub async fn wizard(
         let account_keys = libra_wallet::account_keys::get_account_from_private(&pk);
         (account_keys.auth_key, account_keys.account)
     } else {
-        let account_keys = prompt_for_account()?;
-
-        (account_keys.auth_key, account_keys.account)
+        account_selection::interactive_account_selection()?
     };
 
     let spin = ol_progress::OLProgress::spin_steady(250, "fetching metadata".to_string());
@@ -81,18 +79,3 @@ pub async fn wizard(
 
     Ok(cfg)
 }
-
-/// Wrapper on get keys_from_prompt,
-/// Prompts the user for account details and checks if it is a legacy account.
-pub fn prompt_for_account() -> anyhow::Result<AccountKeys> {
-    let mut account_keys = libra_wallet::account_keys::get_keys_from_prompt()?.child_0_owner;
-
-    if dialoguer::Confirm::new()
-        .with_prompt("Is this a legacy pre-v7 address (16 characters)?")
-        .interact()?
-    {
-        account_keys.account = get_ol_legacy_address(account_keys.account)?;
-    }
-
-    Ok(account_keys)
-}

tools/config/src/interactive/account_selection.rs

@@ -0,0 +1,60 @@
+use anyhow::Context;
+use libra_types::exports::{AccountAddress, AuthenticationKey};
+use libra_wallet::account_keys::{get_ol_legacy_address, AccountKeys};
+
+/// Interactive account selection - allows user to choose between existing address, mnemonic, or dummy account
+pub fn interactive_account_selection() -> anyhow::Result<(AuthenticationKey, AccountAddress)> {
+    // Ask the user if they want to include an account address in profile
+    if dialoguer::Confirm::new()
+        .with_prompt("Do you want to configure with an account address in this profile?")
+        .interact()?
+    {
+        // User wants to configure with a real account
+        println!("You can either provide an existing address or derive one from a mnemonic.");
+
+        let use_existing = dialoguer::Confirm::new()
+            .with_prompt("Do you want to enter an address? If not, will derive from mnemonic.")
+            .interact()?;
+
+        if use_existing {
+            // User wants to provide an existing address
+            let address_input: String = dialoguer::Input::new()
+                .with_prompt("Enter your account address (hex format)")
+                .interact()?;
+
+            let address = AccountAddress::from_hex_literal(&address_input)
+                .context("Invalid account address format")?;
+
+            // Use dummy authkey for existing addresses since we don't control them
+            let dummy_authkey = AuthenticationKey::zero();
+
+            Ok((dummy_authkey, address))
+        } else {
+            // User wants to derive from mnemonic
+            let account_keys = prompt_for_account()?;
+            Ok((account_keys.auth_key, account_keys.account))
+        }
+    } else {
+        // User doesn't want to configure with account, use dummy values
+        println!("Using dummy account values (0x0) - you can configure a real account later.");
+        let dummy_address = AccountAddress::ZERO;
+        let dummy_authkey = AuthenticationKey::zero();
+
+        Ok((dummy_authkey, dummy_address))
+    }
+}
+
+/// Wrapper on get keys_from_prompt,
+/// Prompts the user for account details and checks if it is a legacy account.
+pub fn prompt_for_account() -> anyhow::Result<AccountKeys> {
+    let mut account_keys = libra_wallet::account_keys::get_keys_from_prompt()?.child_0_owner;
+
+    if dialoguer::Confirm::new()
+        .with_prompt("Is this a legacy pre-v7 address (16 characters)?")
+        .interact()?
+    {
+        account_keys.account = get_ol_legacy_address(account_keys.account)?;
+    }
+
+    Ok(account_keys)
+}

tools/config/src/interactive/defaults.rs

@@ -0,0 +1,111 @@
+use anyhow::{anyhow, Result};
+use libra_types::{core_types::app_cfg::AppCfg, exports::NamedChain};
+
+/// Change the default profile
+pub fn change_default_profile(cfg: &mut AppCfg) -> Result<()> {
+    if cfg.user_profiles.is_empty() {
+        return Err(anyhow!("No profiles available"));
+    }
+
+    let profile_options: Vec<String> = cfg
+        .user_profiles
+        .iter()
+        .map(|p| {
+            let is_default = cfg
+                .workspace
+                .default_profile
+                .as_ref()
+                .map(|default| default == &p.account.to_hex_literal())
+                .unwrap_or(false);
+
+            let default_marker = if is_default { " (current default)" } else { "" };
+            format!("{} ({}){}", p.nickname, p.account, default_marker)
+        })
+        .collect();
+
+    let selection = dialoguer::Select::new()
+        .with_prompt("Choose default profile")
+        .items(&profile_options)
+        .default(0)
+        .interact()?;
+
+    let selected_profile = &cfg.user_profiles[selection];
+    cfg.workspace
+        .set_default(selected_profile.account.to_hex_literal());
+
+    println!(
+        "Default profile changed to: {} ({})",
+        selected_profile.nickname, selected_profile.account
+    );
+    Ok(())
+}
+
+/// Change the default chain
+pub fn change_default_chain(cfg: &mut AppCfg) -> Result<()> {
+    use dialoguer::Select;
+
+    if cfg.network_playlist.is_empty() {
+        return Err(anyhow!(
+            "No networks configured. Please configure a network first."
+        ));
+    }
+
+    let configured_chains: Vec<NamedChain> = cfg
+        .network_playlist
+        .iter()
+        .map(|np| np.chain_name)
+        .collect();
+
+    let chain_options: Vec<String> = configured_chains
+        .iter()
+        .map(|chain| format!("{:?}", chain).to_lowercase())
+        .collect();
+
+    let selection = Select::new()
+        .with_prompt("Choose default chain")
+        .items(&chain_options)
+        .default(0)
+        .interact()?;
+
+    let selected_chain = configured_chains[selection];
+
+    cfg.workspace.default_chain_id = selected_chain;
+    println!("Default chain changed to: {:?}", selected_chain);
+    Ok(())
+}
+
+/// Interactive defaults management
+pub async fn interactive_change_defaults(cfg: &mut AppCfg) -> Result<bool> {
+    println!("\nWhat default would you like to change?");
+
+    let options = vec!["Change default profile", "Change default chain", "Cancel"];
+
+    let selection = dialoguer::Select::new()
+        .with_prompt("Choose an option")
+        .items(&options)
+        .default(0)
+        .interact()?;
+
+    match selection {
+        0 => {
+            // Change default profile
+            if cfg.user_profiles.len() > 1 {
+                change_default_profile(cfg)?;
+                Ok(true)
+            } else {
+                println!("Only one profile available. Cannot change default.");
+                Ok(false)
+            }
+        }
+        1 => {
+            // Change default chain
+            change_default_chain(cfg)?;
+            Ok(true)
+        }
+        2 => {
+            // Cancel
+            Ok(false)
+        }
+        _ => unreachable!(),
+    }
+}