Deprecate generate-account-key in favour of generate-moonbeam-key

Cargo.toml

@@ -1,7 +1,5 @@
 [workspace]
-exclude = ["bin/utils/moonkey"]
 members = [
-    "bin/utils/moonkey",
     "client/rpc/dev",
     "client/rpc/finality",
     "client/vrf",
@@ -411,6 +409,7 @@ tracing-core = "0.1.32"
 trie-root = "0.18.0"
 url = { version = "2.4.0" }
 thiserror = "1.0.63"
+colored = { version = "2.1.0" }
 
 # The list of dependencies below (which can be both direct and indirect dependencies) are crates
 # that are suspected to be CPU-intensive, and that are unlikely to require debugging (as some of

node/cli-opt/src/account_key.rs

@@ -40,7 +40,7 @@ pub struct GenerateAccountKey {
 }
 
 impl GenerateAccountKey {
-	pub fn run(&self) {
+	pub fn run(&self, deprecated: bool) {
 		// Retrieve the mnemonic from the args or generate random ones
 		let mnemonic = if let Some(phrase) = &self.mnemonic {
 			Mnemonic::from_phrase(phrase, Language::English).expect("invalid mnemonic")
@@ -53,7 +53,11 @@ impl GenerateAccountKey {
 
 		// Retrieves the seed from the mnemonic
 		let seed = Seed::new(&mnemonic, "");
-		let derivation_path = format!("m/44'/60'/0'/0/{}", self.account_index.unwrap_or(0));
+		let derivation_path = if deprecated {
+			format!("m/44'/60'/0'/0/{}", self.account_index.unwrap_or(0))
+		} else {
+			format!("m/44'/1284'/0'/0/{}", self.account_index.unwrap_or(0))
+		};
 		let private_key = if let Some(private_key) =
 			derivation_path.parse().ok().and_then(|derivation_path| {
 				let extended = ExtendedPrivateKey::<Secp256k1SecretKey>::derive_from_path(

node/cli/Cargo.toml

@@ -10,6 +10,7 @@ clap-num = { workspace = true }
 log = { workspace = true }
 parity-scale-codec = { workspace = true }
 url = { workspace = true }
+colored = { workspace = true }
 
 # Moonbeam
 moonbeam-cli-opt = { workspace = true }

node/cli/src/cli.rs

@@ -20,6 +20,7 @@
 //! It is built using clap and inherits behavior from Substrate's sc_cli crate.
 
 use clap::Parser;
+use colored::Colorize;
 use moonbeam_cli_opt::{account_key::GenerateAccountKey, EthApi, FrontierBackendType, Sealing};
 use moonbeam_service::chain_spec;
 use sc_cli::{Error as CliError, SubstrateCli};
@@ -372,7 +373,10 @@ pub enum KeyCmd {
 	#[clap(flatten)]
 	BaseCli(sc_cli::KeySubcommand),
 	/// Generate an Ethereum account.
+	#[clap(about = "This command is deprecated, please use `generate-moonbeam-key` instead.")]
 	GenerateAccountKey(GenerateAccountKey),
+	/// Generate a Moonbeam account.
+	GenerateMoonbeamKey(GenerateAccountKey),
 }
 
 impl KeyCmd {
@@ -381,7 +385,18 @@ impl KeyCmd {
 		match self {
 			KeyCmd::BaseCli(cmd) => cmd.run(cli),
 			KeyCmd::GenerateAccountKey(cmd) => {
-				cmd.run();
+				eprintln!(
+				"\n{}\n",
+				"Warning: This command is deprecated, please use `generate-moonbeam-key`instead."
+					.on_yellow()
+					.black()
+					.bold()
+				);
+				cmd.run(true);
+				Ok(())
+			}
+			KeyCmd::GenerateMoonbeamKey(cmd) => {
+				cmd.run(false);
 				Ok(())
 			}
 		}