From 2eac633a5815f5c19afb208b0daa6f33adbc83cf Mon Sep 17 00:00:00 2001 From: chonghe Date: Mon, 15 Jul 2024 09:58:10 +0800 Subject: [PATCH 1/8] create --- account_manager/src/validator/create.rs | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/account_manager/src/validator/create.rs b/account_manager/src/validator/create.rs index cfe4d8e94ad..8b6dc4076ff 100644 --- a/account_manager/src/validator/create.rs +++ b/account_manager/src/validator/create.rs @@ -33,6 +33,15 @@ pub fn cli_app() -> Command { "Creates new validators from an existing EIP-2386 wallet using the EIP-2333 HD key \ derivation scheme.", ) + .arg( + Arg::new("help") + .long("help") + .short('h') + .help("Prints help information") + .action(ArgAction::HelpLong) + .display_order(0) + .help_heading(FLAG_HEADER) + ) .arg( Arg::new(WALLET_NAME_FLAG) .long(WALLET_NAME_FLAG) From d665666bc765665914f406ce6c5c3f657983f9e4 Mon Sep 17 00:00:00 2001 From: Tan Chee Keong Date: Mon, 15 Jul 2024 10:14:54 +0800 Subject: [PATCH 2/8] import, exit and list --- account_manager/src/validator/create.rs | 12 ++++++------ account_manager/src/validator/exit.rs | 9 +++++++++ account_manager/src/validator/import.rs | 9 +++++++++ account_manager/src/validator/list.rs | 15 +++++++++++++-- 4 files changed, 37 insertions(+), 8 deletions(-) diff --git a/account_manager/src/validator/create.rs b/account_manager/src/validator/create.rs index 8b6dc4076ff..021687229fb 100644 --- a/account_manager/src/validator/create.rs +++ b/account_manager/src/validator/create.rs @@ -35,12 +35,12 @@ pub fn cli_app() -> Command { ) .arg( Arg::new("help") - .long("help") - .short('h') - .help("Prints help information") - .action(ArgAction::HelpLong) - .display_order(0) - .help_heading(FLAG_HEADER) + .long("help") + .short('h') + .help("Prints help information") + .action(ArgAction::HelpLong) + .display_order(0) + .help_heading(FLAG_HEADER) ) .arg( Arg::new(WALLET_NAME_FLAG) diff --git a/account_manager/src/validator/exit.rs b/account_manager/src/validator/exit.rs index 277d2ae8eca..ce9a497aa30 100644 --- a/account_manager/src/validator/exit.rs +++ b/account_manager/src/validator/exit.rs @@ -32,6 +32,15 @@ pub const WEBSITE_URL: &str = "https://lighthouse-book.sigmaprime.io/voluntary-e pub fn cli_app() -> Command { Command::new("exit") .about("Submits a VoluntaryExit to the beacon chain for a given validator keystore.") + .arg( + Arg::new("help") + .long("help") + .short('h') + .help("Prints help information") + .action(ArgAction::HelpLong) + .display_order(0) + .help_heading(FLAG_HEADER) + ) .arg( Arg::new(KEYSTORE_FLAG) .long(KEYSTORE_FLAG) diff --git a/account_manager/src/validator/import.rs b/account_manager/src/validator/import.rs index a7c72679f74..203a9e3391d 100644 --- a/account_manager/src/validator/import.rs +++ b/account_manager/src/validator/import.rs @@ -34,6 +34,15 @@ pub fn cli_app() -> Command { method for importing a directory of keys generated by the eth2-deposit-cli \ Python utility.", ) + .arg( + Arg::new("help") + .long("help") + .short('h') + .help("Prints help information") + .action(ArgAction::HelpLong) + .display_order(0) + .help_heading(FLAG_HEADER), + ) .arg( Arg::new(KEYSTORE_FLAG) .long(KEYSTORE_FLAG) diff --git a/account_manager/src/validator/list.rs b/account_manager/src/validator/list.rs index d082a49590b..ee7911473cb 100644 --- a/account_manager/src/validator/list.rs +++ b/account_manager/src/validator/list.rs @@ -1,11 +1,22 @@ use account_utils::validator_definitions::ValidatorDefinitions; -use clap::Command; +use clap::{Arg, ArgAction, Command}; +use clap_utils::FLAG_HEADER; use std::path::PathBuf; pub const CMD: &str = "list"; pub fn cli_app() -> Command { - Command::new(CMD).about("Lists the public keys of all validators.") + Command::new(CMD) + .about("Lists the public keys of all validators.") + .arg( + Arg::new("help") + .long("help") + .short('h') + .help("Prints help information") + .action(ArgAction::HelpLong) + .display_order(0) + .help_heading(FLAG_HEADER), + ) } pub fn cli_run(validator_dir: PathBuf) -> Result<(), String> { From 7f22407942543409596b7377f53d0562009cadc3 Mon Sep 17 00:00:00 2001 From: Tan Chee Keong Date: Mon, 15 Jul 2024 10:24:49 +0800 Subject: [PATCH 3/8] validator the rest --- account_manager/src/validator/modify.rs | 9 +++++++++ account_manager/src/validator/recover.rs | 9 +++++++++ account_manager/src/validator/slashing_protection.rs | 9 +++++++++ 3 files changed, 27 insertions(+) diff --git a/account_manager/src/validator/modify.rs b/account_manager/src/validator/modify.rs index 571cd28bf5e..23cd396330e 100644 --- a/account_manager/src/validator/modify.rs +++ b/account_manager/src/validator/modify.rs @@ -15,6 +15,15 @@ pub fn cli_app() -> Command { Command::new(CMD) .about("Modify validator status in validator_definitions.yml.") .display_order(0) + .arg( + Arg::new("help") + .long("help") + .short('h') + .help("Prints help information") + .action(ArgAction::HelpLong) + .display_order(0) + .help_heading(FLAG_HEADER), + ) .subcommand( Command::new(ENABLE) .about("Enable validator(s) in validator_definitions.yml.") diff --git a/account_manager/src/validator/recover.rs b/account_manager/src/validator/recover.rs index 4677db18df3..6ef318efc49 100644 --- a/account_manager/src/validator/recover.rs +++ b/account_manager/src/validator/recover.rs @@ -23,6 +23,15 @@ pub fn cli_app() -> Command { If you did not specify a `--first-index` or count `--count`, by default this will \ only recover the keys associated with the validator at index 0 for an HD wallet \ in accordance with the EIP-2333 spec.") + .arg( + Arg::new("help") + .long("help") + .short('h') + .help("Prints help information") + .action(ArgAction::HelpLong) + .display_order(0) + .help_heading(FLAG_HEADER) + ) .arg( Arg::new(FIRST_INDEX_FLAG) .long(FIRST_INDEX_FLAG) diff --git a/account_manager/src/validator/slashing_protection.rs b/account_manager/src/validator/slashing_protection.rs index bcd860a4847..161454a26af 100644 --- a/account_manager/src/validator/slashing_protection.rs +++ b/account_manager/src/validator/slashing_protection.rs @@ -22,6 +22,15 @@ pub fn cli_app() -> Command { Command::new(CMD) .about("Import or export slashing protection data to or from another client") .display_order(0) + .arg( + Arg::new("help") + .long("help") + .short('h') + .help("Prints help information") + .action(ArgAction::HelpLong) + .display_order(0) + .help_heading(FLAG_HEADER) + ) .subcommand( Command::new(IMPORT_CMD) .about("Import an interchange file") From dd6cb6d99758d0e82255ba43c2a95fffad693e79 Mon Sep 17 00:00:00 2001 From: chonghe Date: Mon, 15 Jul 2024 10:45:39 +0800 Subject: [PATCH 4/8] FIx --- account_manager/src/validator/modify.rs | 18 ++++++++++++++++++ .../src/validator/slashing_protection.rs | 19 +++++++++++++++++++ 2 files changed, 37 insertions(+) diff --git a/account_manager/src/validator/modify.rs b/account_manager/src/validator/modify.rs index 23cd396330e..400079f4804 100644 --- a/account_manager/src/validator/modify.rs +++ b/account_manager/src/validator/modify.rs @@ -27,6 +27,15 @@ pub fn cli_app() -> Command { .subcommand( Command::new(ENABLE) .about("Enable validator(s) in validator_definitions.yml.") + .arg( + Arg::new("help") + .long("help") + .short('h') + .help("Prints help information") + .action(ArgAction::HelpLong) + .display_order(0) + .help_heading(FLAG_HEADER), + ) .arg( Arg::new(PUBKEY_FLAG) .long(PUBKEY_FLAG) @@ -48,6 +57,15 @@ pub fn cli_app() -> Command { .subcommand( Command::new(DISABLE) .about("Disable validator(s) in validator_definitions.yml.") + .arg( + Arg::new("help") + .long("help") + .short('h') + .help("Prints help information") + .action(ArgAction::HelpLong) + .display_order(0) + .help_heading(FLAG_HEADER), + ) .arg( Arg::new(PUBKEY_FLAG) .long(PUBKEY_FLAG) diff --git a/account_manager/src/validator/slashing_protection.rs b/account_manager/src/validator/slashing_protection.rs index 161454a26af..7a4407401a4 100644 --- a/account_manager/src/validator/slashing_protection.rs +++ b/account_manager/src/validator/slashing_protection.rs @@ -1,4 +1,5 @@ use clap::{Arg, ArgAction, ArgMatches, Command}; +use clap_utils::FLAG_HEADER; use environment::Environment; use slashing_protection::{ interchange::Interchange, InterchangeError, InterchangeImportOutcome, SlashingDatabase, @@ -34,6 +35,15 @@ pub fn cli_app() -> Command { .subcommand( Command::new(IMPORT_CMD) .about("Import an interchange file") + .arg( + Arg::new("help") + .long("help") + .short('h') + .help("Prints help information") + .action(ArgAction::HelpLong) + .display_order(0) + .help_heading(FLAG_HEADER), + ) .arg( Arg::new(IMPORT_FILE_ARG) .action(ArgAction::Set) @@ -45,6 +55,15 @@ pub fn cli_app() -> Command { .subcommand( Command::new(EXPORT_CMD) .about("Export an interchange file") + .arg( + Arg::new("help") + .long("help") + .short('h') + .help("Prints help information") + .action(ArgAction::HelpLong) + .display_order(0) + .help_heading(FLAG_HEADER), + ) .arg( Arg::new(EXPORT_FILE_ARG) .action(ArgAction::Set) From c8a92bfa5ade70c36963673071bffe9957bf72cc Mon Sep 17 00:00:00 2001 From: Tan Chee Keong Date: Mon, 15 Jul 2024 11:00:52 +0800 Subject: [PATCH 5/8] wallet subcommands --- account_manager/src/wallet/create.rs | 10 ++++++++++ account_manager/src/wallet/list.rs | 15 +++++++++++++-- account_manager/src/wallet/recover.rs | 10 ++++++++++ 3 files changed, 33 insertions(+), 2 deletions(-) diff --git a/account_manager/src/wallet/create.rs b/account_manager/src/wallet/create.rs index 12aa5d3801a..e33a759dfc6 100644 --- a/account_manager/src/wallet/create.rs +++ b/account_manager/src/wallet/create.rs @@ -4,6 +4,7 @@ use account_utils::{ is_password_sufficiently_complex, random_password, read_password_from_user, strip_off_newlines, }; use clap::{Arg, ArgAction, ArgMatches, Command}; +use clap_utils::FLAG_HEADER; use eth2_wallet::{ bip39::{Language, Mnemonic, MnemonicType}, PlainText, @@ -36,6 +37,15 @@ pub const RETYPE_PASSWORD_PROMPT: &str = "Please re-enter your wallet's new pass pub fn cli_app() -> Command { Command::new(CMD) .about("Creates a new HD (hierarchical-deterministic) EIP-2386 wallet.") + .arg( + Arg::new("help") + .long("help") + .short('h') + .help("Prints help information") + .action(ArgAction::HelpLong) + .display_order(0) + .help_heading(FLAG_HEADER) + ) .arg( Arg::new(NAME_FLAG) .long(NAME_FLAG) diff --git a/account_manager/src/wallet/list.rs b/account_manager/src/wallet/list.rs index a551ffae128..789ad814adf 100644 --- a/account_manager/src/wallet/list.rs +++ b/account_manager/src/wallet/list.rs @@ -1,12 +1,23 @@ use crate::WALLETS_DIR_FLAG; -use clap::Command; +use clap::{Arg, ArgAction, Command}; +use clap_utils::FLAG_HEADER; use eth2_wallet_manager::WalletManager; use std::path::PathBuf; pub const CMD: &str = "list"; pub fn cli_app() -> Command { - Command::new(CMD).about("Lists the names of all wallets.") + Command::new(CMD) + .about("Lists the names of all wallets.") + .arg( + Arg::new("help") + .long("help") + .short('h') + .help("Prints help information") + .action(ArgAction::HelpLong) + .display_order(0) + .help_heading(FLAG_HEADER), + ) } pub fn cli_run(wallet_base_dir: PathBuf) -> Result<(), String> { diff --git a/account_manager/src/wallet/recover.rs b/account_manager/src/wallet/recover.rs index b9641f11521..80dbaf52f00 100644 --- a/account_manager/src/wallet/recover.rs +++ b/account_manager/src/wallet/recover.rs @@ -2,6 +2,7 @@ use crate::wallet::create::{create_wallet_from_mnemonic, STDIN_INPUTS_FLAG}; use crate::wallet::create::{HD_TYPE, NAME_FLAG, PASSWORD_FLAG, TYPE_FLAG}; use account_utils::read_mnemonic_from_cli; use clap::{Arg, ArgAction, ArgMatches, Command}; +use clap_utils::FLAG_HEADER; use std::path::PathBuf; pub const CMD: &str = "recover"; @@ -10,6 +11,15 @@ pub const MNEMONIC_FLAG: &str = "mnemonic-path"; pub fn cli_app() -> Command { Command::new(CMD) .about("Recovers an EIP-2386 wallet from a given a BIP-39 mnemonic phrase.") + .arg( + Arg::new("help") + .long("help") + .short('h') + .help("Prints help information") + .action(ArgAction::HelpLong) + .display_order(0) + .help_heading(FLAG_HEADER), + ) .arg( Arg::new(NAME_FLAG) .long(NAME_FLAG) From b31321338e6d62850ab2674c9c1881151b81bc37 Mon Sep 17 00:00:00 2001 From: Tan Chee Keong Date: Mon, 15 Jul 2024 11:16:18 +0800 Subject: [PATCH 6/8] Fix white spaces --- account_manager/src/validator/recover.rs | 2 +- account_manager/src/validator/slashing_protection.rs | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/account_manager/src/validator/recover.rs b/account_manager/src/validator/recover.rs index 6ef318efc49..35764a261bb 100644 --- a/account_manager/src/validator/recover.rs +++ b/account_manager/src/validator/recover.rs @@ -31,7 +31,7 @@ pub fn cli_app() -> Command { .action(ArgAction::HelpLong) .display_order(0) .help_heading(FLAG_HEADER) - ) + ) .arg( Arg::new(FIRST_INDEX_FLAG) .long(FIRST_INDEX_FLAG) diff --git a/account_manager/src/validator/slashing_protection.rs b/account_manager/src/validator/slashing_protection.rs index 7a4407401a4..fc0d9f05926 100644 --- a/account_manager/src/validator/slashing_protection.rs +++ b/account_manager/src/validator/slashing_protection.rs @@ -42,7 +42,7 @@ pub fn cli_app() -> Command { .help("Prints help information") .action(ArgAction::HelpLong) .display_order(0) - .help_heading(FLAG_HEADER), + .help_heading(FLAG_HEADER) ) .arg( Arg::new(IMPORT_FILE_ARG) @@ -62,7 +62,7 @@ pub fn cli_app() -> Command { .help("Prints help information") .action(ArgAction::HelpLong) .display_order(0) - .help_heading(FLAG_HEADER), + .help_heading(FLAG_HEADER) ) .arg( Arg::new(EXPORT_FILE_ARG) From b7f8dc28f6bc25195d631534958a8f42f8d64faa Mon Sep 17 00:00:00 2001 From: Tan Chee Keong Date: Thu, 18 Jul 2024 20:31:18 +0800 Subject: [PATCH 7/8] Revert "create" This reverts commit 2eac633a5815f5c19afb208b0daa6f33adbc83cf. --- account_manager/src/validator/create.rs | 9 ------ account_manager/src/validator/exit.rs | 9 ------ account_manager/src/validator/import.rs | 9 ------ account_manager/src/validator/list.rs | 15 ++-------- account_manager/src/validator/modify.rs | 27 ------------------ account_manager/src/validator/recover.rs | 9 ------ .../src/validator/slashing_protection.rs | 28 ------------------- account_manager/src/wallet/create.rs | 10 ------- account_manager/src/wallet/list.rs | 15 ++-------- account_manager/src/wallet/recover.rs | 10 ------- 10 files changed, 4 insertions(+), 137 deletions(-) diff --git a/account_manager/src/validator/create.rs b/account_manager/src/validator/create.rs index 021687229fb..cfe4d8e94ad 100644 --- a/account_manager/src/validator/create.rs +++ b/account_manager/src/validator/create.rs @@ -33,15 +33,6 @@ pub fn cli_app() -> Command { "Creates new validators from an existing EIP-2386 wallet using the EIP-2333 HD key \ derivation scheme.", ) - .arg( - Arg::new("help") - .long("help") - .short('h') - .help("Prints help information") - .action(ArgAction::HelpLong) - .display_order(0) - .help_heading(FLAG_HEADER) - ) .arg( Arg::new(WALLET_NAME_FLAG) .long(WALLET_NAME_FLAG) diff --git a/account_manager/src/validator/exit.rs b/account_manager/src/validator/exit.rs index ce9a497aa30..277d2ae8eca 100644 --- a/account_manager/src/validator/exit.rs +++ b/account_manager/src/validator/exit.rs @@ -32,15 +32,6 @@ pub const WEBSITE_URL: &str = "https://lighthouse-book.sigmaprime.io/voluntary-e pub fn cli_app() -> Command { Command::new("exit") .about("Submits a VoluntaryExit to the beacon chain for a given validator keystore.") - .arg( - Arg::new("help") - .long("help") - .short('h') - .help("Prints help information") - .action(ArgAction::HelpLong) - .display_order(0) - .help_heading(FLAG_HEADER) - ) .arg( Arg::new(KEYSTORE_FLAG) .long(KEYSTORE_FLAG) diff --git a/account_manager/src/validator/import.rs b/account_manager/src/validator/import.rs index 203a9e3391d..a7c72679f74 100644 --- a/account_manager/src/validator/import.rs +++ b/account_manager/src/validator/import.rs @@ -34,15 +34,6 @@ pub fn cli_app() -> Command { method for importing a directory of keys generated by the eth2-deposit-cli \ Python utility.", ) - .arg( - Arg::new("help") - .long("help") - .short('h') - .help("Prints help information") - .action(ArgAction::HelpLong) - .display_order(0) - .help_heading(FLAG_HEADER), - ) .arg( Arg::new(KEYSTORE_FLAG) .long(KEYSTORE_FLAG) diff --git a/account_manager/src/validator/list.rs b/account_manager/src/validator/list.rs index ee7911473cb..d082a49590b 100644 --- a/account_manager/src/validator/list.rs +++ b/account_manager/src/validator/list.rs @@ -1,22 +1,11 @@ use account_utils::validator_definitions::ValidatorDefinitions; -use clap::{Arg, ArgAction, Command}; -use clap_utils::FLAG_HEADER; +use clap::Command; use std::path::PathBuf; pub const CMD: &str = "list"; pub fn cli_app() -> Command { - Command::new(CMD) - .about("Lists the public keys of all validators.") - .arg( - Arg::new("help") - .long("help") - .short('h') - .help("Prints help information") - .action(ArgAction::HelpLong) - .display_order(0) - .help_heading(FLAG_HEADER), - ) + Command::new(CMD).about("Lists the public keys of all validators.") } pub fn cli_run(validator_dir: PathBuf) -> Result<(), String> { diff --git a/account_manager/src/validator/modify.rs b/account_manager/src/validator/modify.rs index 400079f4804..571cd28bf5e 100644 --- a/account_manager/src/validator/modify.rs +++ b/account_manager/src/validator/modify.rs @@ -15,27 +15,9 @@ pub fn cli_app() -> Command { Command::new(CMD) .about("Modify validator status in validator_definitions.yml.") .display_order(0) - .arg( - Arg::new("help") - .long("help") - .short('h') - .help("Prints help information") - .action(ArgAction::HelpLong) - .display_order(0) - .help_heading(FLAG_HEADER), - ) .subcommand( Command::new(ENABLE) .about("Enable validator(s) in validator_definitions.yml.") - .arg( - Arg::new("help") - .long("help") - .short('h') - .help("Prints help information") - .action(ArgAction::HelpLong) - .display_order(0) - .help_heading(FLAG_HEADER), - ) .arg( Arg::new(PUBKEY_FLAG) .long(PUBKEY_FLAG) @@ -57,15 +39,6 @@ pub fn cli_app() -> Command { .subcommand( Command::new(DISABLE) .about("Disable validator(s) in validator_definitions.yml.") - .arg( - Arg::new("help") - .long("help") - .short('h') - .help("Prints help information") - .action(ArgAction::HelpLong) - .display_order(0) - .help_heading(FLAG_HEADER), - ) .arg( Arg::new(PUBKEY_FLAG) .long(PUBKEY_FLAG) diff --git a/account_manager/src/validator/recover.rs b/account_manager/src/validator/recover.rs index 35764a261bb..4677db18df3 100644 --- a/account_manager/src/validator/recover.rs +++ b/account_manager/src/validator/recover.rs @@ -23,15 +23,6 @@ pub fn cli_app() -> Command { If you did not specify a `--first-index` or count `--count`, by default this will \ only recover the keys associated with the validator at index 0 for an HD wallet \ in accordance with the EIP-2333 spec.") - .arg( - Arg::new("help") - .long("help") - .short('h') - .help("Prints help information") - .action(ArgAction::HelpLong) - .display_order(0) - .help_heading(FLAG_HEADER) - ) .arg( Arg::new(FIRST_INDEX_FLAG) .long(FIRST_INDEX_FLAG) diff --git a/account_manager/src/validator/slashing_protection.rs b/account_manager/src/validator/slashing_protection.rs index fc0d9f05926..bcd860a4847 100644 --- a/account_manager/src/validator/slashing_protection.rs +++ b/account_manager/src/validator/slashing_protection.rs @@ -1,5 +1,4 @@ use clap::{Arg, ArgAction, ArgMatches, Command}; -use clap_utils::FLAG_HEADER; use environment::Environment; use slashing_protection::{ interchange::Interchange, InterchangeError, InterchangeImportOutcome, SlashingDatabase, @@ -23,27 +22,9 @@ pub fn cli_app() -> Command { Command::new(CMD) .about("Import or export slashing protection data to or from another client") .display_order(0) - .arg( - Arg::new("help") - .long("help") - .short('h') - .help("Prints help information") - .action(ArgAction::HelpLong) - .display_order(0) - .help_heading(FLAG_HEADER) - ) .subcommand( Command::new(IMPORT_CMD) .about("Import an interchange file") - .arg( - Arg::new("help") - .long("help") - .short('h') - .help("Prints help information") - .action(ArgAction::HelpLong) - .display_order(0) - .help_heading(FLAG_HEADER) - ) .arg( Arg::new(IMPORT_FILE_ARG) .action(ArgAction::Set) @@ -55,15 +36,6 @@ pub fn cli_app() -> Command { .subcommand( Command::new(EXPORT_CMD) .about("Export an interchange file") - .arg( - Arg::new("help") - .long("help") - .short('h') - .help("Prints help information") - .action(ArgAction::HelpLong) - .display_order(0) - .help_heading(FLAG_HEADER) - ) .arg( Arg::new(EXPORT_FILE_ARG) .action(ArgAction::Set) diff --git a/account_manager/src/wallet/create.rs b/account_manager/src/wallet/create.rs index e33a759dfc6..12aa5d3801a 100644 --- a/account_manager/src/wallet/create.rs +++ b/account_manager/src/wallet/create.rs @@ -4,7 +4,6 @@ use account_utils::{ is_password_sufficiently_complex, random_password, read_password_from_user, strip_off_newlines, }; use clap::{Arg, ArgAction, ArgMatches, Command}; -use clap_utils::FLAG_HEADER; use eth2_wallet::{ bip39::{Language, Mnemonic, MnemonicType}, PlainText, @@ -37,15 +36,6 @@ pub const RETYPE_PASSWORD_PROMPT: &str = "Please re-enter your wallet's new pass pub fn cli_app() -> Command { Command::new(CMD) .about("Creates a new HD (hierarchical-deterministic) EIP-2386 wallet.") - .arg( - Arg::new("help") - .long("help") - .short('h') - .help("Prints help information") - .action(ArgAction::HelpLong) - .display_order(0) - .help_heading(FLAG_HEADER) - ) .arg( Arg::new(NAME_FLAG) .long(NAME_FLAG) diff --git a/account_manager/src/wallet/list.rs b/account_manager/src/wallet/list.rs index 789ad814adf..a551ffae128 100644 --- a/account_manager/src/wallet/list.rs +++ b/account_manager/src/wallet/list.rs @@ -1,23 +1,12 @@ use crate::WALLETS_DIR_FLAG; -use clap::{Arg, ArgAction, Command}; -use clap_utils::FLAG_HEADER; +use clap::Command; use eth2_wallet_manager::WalletManager; use std::path::PathBuf; pub const CMD: &str = "list"; pub fn cli_app() -> Command { - Command::new(CMD) - .about("Lists the names of all wallets.") - .arg( - Arg::new("help") - .long("help") - .short('h') - .help("Prints help information") - .action(ArgAction::HelpLong) - .display_order(0) - .help_heading(FLAG_HEADER), - ) + Command::new(CMD).about("Lists the names of all wallets.") } pub fn cli_run(wallet_base_dir: PathBuf) -> Result<(), String> { diff --git a/account_manager/src/wallet/recover.rs b/account_manager/src/wallet/recover.rs index 80dbaf52f00..b9641f11521 100644 --- a/account_manager/src/wallet/recover.rs +++ b/account_manager/src/wallet/recover.rs @@ -2,7 +2,6 @@ use crate::wallet::create::{create_wallet_from_mnemonic, STDIN_INPUTS_FLAG}; use crate::wallet::create::{HD_TYPE, NAME_FLAG, PASSWORD_FLAG, TYPE_FLAG}; use account_utils::read_mnemonic_from_cli; use clap::{Arg, ArgAction, ArgMatches, Command}; -use clap_utils::FLAG_HEADER; use std::path::PathBuf; pub const CMD: &str = "recover"; @@ -11,15 +10,6 @@ pub const MNEMONIC_FLAG: &str = "mnemonic-path"; pub fn cli_app() -> Command { Command::new(CMD) .about("Recovers an EIP-2386 wallet from a given a BIP-39 mnemonic phrase.") - .arg( - Arg::new("help") - .long("help") - .short('h') - .help("Prints help information") - .action(ArgAction::HelpLong) - .display_order(0) - .help_heading(FLAG_HEADER), - ) .arg( Arg::new(NAME_FLAG) .long(NAME_FLAG) From c5b7f46bd62e7c936be4d6b8fc90b149f58988aa Mon Sep 17 00:00:00 2001 From: Tan Chee Keong Date: Thu, 18 Jul 2024 20:32:21 +0800 Subject: [PATCH 8/8] Add global --- account_manager/src/validator/mod.rs | 3 ++- account_manager/src/wallet/mod.rs | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/account_manager/src/validator/mod.rs b/account_manager/src/validator/mod.rs index 6616bb0c45c..61584cbfbb6 100644 --- a/account_manager/src/validator/mod.rs +++ b/account_manager/src/validator/mod.rs @@ -27,7 +27,8 @@ pub fn cli_app() -> Command { .help("Prints help information") .action(ArgAction::HelpLong) .display_order(0) - .help_heading(FLAG_HEADER), + .help_heading(FLAG_HEADER) + .global(true), ) .arg( Arg::new(VALIDATOR_DIR_FLAG) diff --git a/account_manager/src/wallet/mod.rs b/account_manager/src/wallet/mod.rs index 59f5f362529..020858db772 100644 --- a/account_manager/src/wallet/mod.rs +++ b/account_manager/src/wallet/mod.rs @@ -22,6 +22,7 @@ pub fn cli_app() -> Command { .action(ArgAction::HelpLong) .display_order(0) .help_heading(FLAG_HEADER) + .global(true) ) .arg( Arg::new(WALLETS_DIR_FLAG)