Merge f8fa579 into 7483c39

ChainSafe · Jun 23, 2023 · 9725bc9 · 9725bc9
2 parents 7483c39 + f8fa579
commit 9725bc9
Showing 1 changed file with 7 additions and 4 deletions.
diff --git a/packages/cli/src/cmds/validator/import.ts b/packages/cli/src/cmds/validator/import.ts
@@ -10,7 +10,11 @@ import {PersistedKeysBackend} from "./keymanager/persistedKeys.js";
 
 /* eslint-disable no-console */
 
-export const importCmd: CliCommand<IValidatorCliArgs, GlobalArgs> = {
+type ValidatorImportArgs = Pick<IValidatorCliArgs, "importKeystores" | "importKeystoresPassword">;
+
+const {importKeystores, importKeystoresPassword} = validatorOptions;
+
+export const importCmd: CliCommand<ValidatorImportArgs, IValidatorCliArgs & GlobalArgs> = {
   command: "import",
 
   describe:
@@ -29,12 +33,11 @@ Ethereum Foundation utility.",
   // Note: re-uses `--importKeystores` and `--importKeystoresPassword` from root validator command options
 
   options: {
-    ...validatorOptions,
-
     importKeystores: {
-      ...validatorOptions.importKeystores,
+      ...importKeystores,
       requiresArg: true,
     },
+    importKeystoresPassword,
   },
 
   handler: async (args) => {