Validator manager commands for standard key-manager APIs

common/account_utils/src/lib.rs

@@ -9,7 +9,7 @@ use eth2_wallet::{
 use filesystem::{create_with_600_perms, Error as FsError};
 use rand::{distributions::Alphanumeric, Rng};
 use serde::{Deserialize, Serialize};
-use std::fs::{self, File};
+use std::{fs::{self, File}, str::FromStr};
 use std::io;
 use std::io::prelude::*;
 use std::path::{Path, PathBuf};
@@ -213,6 +213,14 @@ pub fn mnemonic_from_phrase(phrase: &str) -> Result<Mnemonic, String> {
 #[serde(transparent)]
 pub struct ZeroizeString(String);
 
+impl FromStr for ZeroizeString {
+    type Err = String;
+
+    fn from_str(s: &str) -> Result<Self, Self::Err> {
+        Ok(Self(s.to_owned()))
+    }
+}
+
 impl From<String> for ZeroizeString {
     fn from(s: String) -> Self {
         Self(s)

crypto/eth2_keystore/src/keystore.rs

@@ -327,6 +327,11 @@ impl Keystore {
         serde_json::from_reader(reader).map_err(|e| Error::ReadError(format!("{}", e)))
     }
 
+    /// Instantiates `self` from a `JsonKeystore`.
+    pub fn from_json_keystore(json_keystore: JsonKeystore) -> Result<Self, Error> {
+        Ok(Keystore { json: json_keystore })
+    }
+
     /// Instantiates `self` by reading a JSON file at `path`.
     pub fn from_json_file<P: AsRef<Path>>(path: P) -> Result<Self, Error> {
         File::options()