Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore(iota): Remove extra address generation in client commands #4644

Merged
merged 1 commit into from
Dec 31, 2024
Merged

chore(iota): Remove extra address generation in client commands #4644

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 20 additions & 10 deletions Cargo.lock
View file
Open in desktop
thibault-martinez marked this conversation as resolved.
Show resolved Hide resolved

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

44 changes: 23 additions & 21 deletions crates/iota/src/iota_commands.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -439,7 +439,7 @@ impl IotaCommand {
}
IotaCommand::Console { config } => {
let config = config.unwrap_or(iota_config_dir()?.join(IOTA_CLIENT_CONFIG));
prompt_if_no_config(&config, false).await?;
prompt_if_no_config(&config, false, true).await?;
let context = WalletContext::new(&config, None, None)?;
start_console(context, &mut stdout(), &mut stderr()).await
}
Expand All @@ -450,7 +450,12 @@ impl IotaCommand {
accept_defaults,
} => {
let config_path = config.unwrap_or(iota_config_dir()?.join(IOTA_CLIENT_CONFIG));
prompt_if_no_config(&config_path, accept_defaults).await?;
prompt_if_no_config(
&config_path,
accept_defaults,
!matches!(cmd, Some(IotaClientCommands::NewAddress { .. })),
)
.await?;
let mut context = WalletContext::new(&config_path, None, None)?;
if let Some(cmd) = cmd {
cmd.execute(&mut context).await?.print(!json);
Expand All @@ -469,7 +474,7 @@ impl IotaCommand {
accept_defaults,
} => {
let config_path = config.unwrap_or(iota_config_dir()?.join(IOTA_CLIENT_CONFIG));
prompt_if_no_config(&config_path, accept_defaults).await?;
prompt_if_no_config(&config_path, accept_defaults, true).await?;
let mut context = WalletContext::new(&config_path, None, None)?;
if let Some(cmd) = cmd {
cmd.execute(&mut context).await?.print(!json);
Expand All @@ -496,7 +501,7 @@ impl IotaCommand {
// management.
let config =
client_config.unwrap_or(iota_config_dir()?.join(IOTA_CLIENT_CONFIG));
prompt_if_no_config(&config, false).await?;
prompt_if_no_config(&config, false, true).await?;
let context = WalletContext::new(&config, None, None)?;
let client = context.get_client().await?;
let chain_id = client.read_api().get_chain_identifier().await.ok();
Expand Down Expand Up @@ -1148,7 +1153,8 @@ async fn genesis(
async fn prompt_if_no_config(
wallet_conf_path: &Path,
accept_defaults: bool,
) -> Result<(), anyhow::Error> {
generate_address: bool,
) -> anyhow::Result<()> {
// Prompt user for connect to devnet fullnode if config does not exist.
if !wallet_conf_path.exists() {
let env = match std::env::var_os("IOTA_CONFIG_WITH_RPC_URL") {
Expand Down Expand Up @@ -1199,12 +1205,13 @@ async fn prompt_if_no_config(
.parent()
.unwrap_or(&iota_config_dir()?)
.join(IOTA_KEYSTORE_FILENAME);
let mut keystore = Keystore::from(FileBasedKeystore::new(&keystore_path)?);
let keystore = Keystore::from(FileBasedKeystore::new(&keystore_path)?);
let mut config = IotaClientConfig::new(keystore).with_envs([env]);
// Get an existing address or generate a new one
let active_address = if let Some(existing_address) = keystore.addresses().first() {
if let Some(existing_address) = config.keystore().addresses().first() {
println!("Using existing address {existing_address} as active address.");
*existing_address
} else {
config = config.with_active_address(*existing_address);
} else if generate_address {
let key_scheme = if accept_defaults {
SignatureScheme::ED25519
} else {
Expand All @@ -1216,23 +1223,18 @@ async fn prompt_if_no_config(
Err(e) => return Err(anyhow!("{e}")),
}
};
let (new_address, phrase, scheme) =
keystore.generate_and_add_new_key(key_scheme, None, None, None)?;
let alias = keystore.get_alias_by_address(&new_address)?;
let (new_address, phrase, scheme) = config
.keystore_mut()
.generate_and_add_new_key(key_scheme, None, None, None)?;
let alias = config.keystore().get_alias_by_address(&new_address)?;
println!(
"Generated new keypair and alias for address with scheme {:?} [{alias}: {new_address}]",
scheme.to_string()
);
println!("Secret Recovery Phrase : [{phrase}]");
new_address
};
let alias = env.alias().clone();
IotaClientConfig::new(keystore)
.with_envs([env])
.with_active_address(active_address)
.with_active_env(alias)
thibault-martinez marked this conversation as resolved.
Show resolved Hide resolved
.persisted(wallet_conf_path)
.save()?;
config = config.with_active_address(new_address);
}
config.persisted(wallet_conf_path).save()?;
}
}
Ok(())
Expand Down