extend files validation logic

package.json

@@ -1,6 +1,6 @@
 {
   "name": "ssv-keys",
-  "version": "1.0.3",
+  "version": "1.0.4",
   "description": "Tool for splitting a validator key into a predefined threshold of shares via Shamir-Secret-Sharing (SSS), and encrypt them with a set of operator keys.",
   "author": "SSV.Network",
   "repository": "https://github.com/bloxapp/ssv-keys",

src/commands/actions/KeySharesAction.ts

@@ -67,26 +67,30 @@ export class KeySharesAction extends BaseAction {
     if (multiShares) {
       const { files } = await getKeyStoreFiles(keystorePath);
       // validate all files
+      console.debug('Validating keystore files, do not terminate process!');
+      const validatedFiles = [];
+      let failedValidation = 0;
       for (const file of files) {
         const isKeyStoreValid = await keystorePathArgument.interactive.options.validateSingle(file);
-        if (isKeyStoreValid !== true) {
-          throw Error(String(isKeyStoreValid));
-        }
         const isValidPassword = await keystorePasswordValidator.validatePassword(password, file);
-        if (isValidPassword !== true) {
-          throw Error(String(isValidPassword));
+        if (isKeyStoreValid === true && isValidPassword === true) {
+          validatedFiles.push(file);
+        } else {
+          failedValidation++;
         }
+        process.stdout.write(`\r${validatedFiles.length}/${files.length} keystore files successfully validated. ${failedValidation} failed validation`);
       }
+      process.stdout.write('\n');
       const outputFiles = [];
       let nextNonce = ownerNonce;
       let processedFilesCount = 0;
       console.debug('Splitting keystore files to shares, do not terminate process!');
-      for (const file of files) {
+      for (const file of validatedFiles) {
         const keySharesFilePath = await this._processFile(file, password, outputFolder, operators, ownerAddress, nextNonce);
         outputFiles.push(keySharesFilePath);
 
         processedFilesCount++;
-        process.stdout.write(`\r${processedFilesCount}/${files.length} keystore files successfully split into shares`);
+        process.stdout.write(`\r${processedFilesCount}/${validatedFiles.length} keystore files successfully split into shares`);
 
         nextNonce++;
       }

src/commands/actions/validators/file.ts

@@ -1,10 +1,9 @@
 import fs from 'fs';
-import * as path from 'path';
 
 export const fileExistsValidator = (filePath: string, message = ''): boolean | string => {
   filePath = sanitizePath(filePath);
 
-  if (!path.basename(filePath).includes('keystore') || !fs.existsSync(filePath.trim())) {
+  if (!fs.existsSync(filePath.trim())) {
     return message || 'Couldn’t locate keystore file or directory.';
   }
   return true;