gnosis/lighthouse
1
0
Fork 0
mirror of https://github.com/sigp/lighthouse.git synced 2026-05-07 08:52:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Allow export without password

Browse Source
This commit is contained in:
Paul Hauner
2022-12-14 11:29:12 +11:00
parent bbcf7b857e
commit 6bef2beba4
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
validator_client/src/http_api/keystores.rs
View File

@@ -333,7 +333,7 @@ fn delete_single_keystore(
Ok(Some(keystore_and_password)) => Ok(SingleExportKeystoresResponse { Ok(Some(keystore_and_password)) => Ok(SingleExportKeystoresResponse {
status: Status::ok(DeleteKeystoreStatus::Deleted), status: Status::ok(DeleteKeystoreStatus::Deleted),
validating_keystore: Some(KeystoreJsonStr(keystore_and_password.keystore)), validating_keystore: Some(KeystoreJsonStr(keystore_and_password.keystore)),
validating_keystore_password: Some(keystore_and_password.password), validating_keystore_password: keystore_and_password.password,
}), }),
Ok(None) => Ok(SingleExportKeystoresResponse { Ok(None) => Ok(SingleExportKeystoresResponse {
status: Status::ok(DeleteKeystoreStatus::Deleted), status: Status::ok(DeleteKeystoreStatus::Deleted),

8
validator_client/src/initialized_validators.rs
View File

@@ -45,7 +45,7 @@ const USE_STDIN: bool = false;
pub struct KeystoreAndPassword { pub struct KeystoreAndPassword {
pub keystore: Keystore, pub keystore: Keystore,
pub password: ZeroizeString, pub password: Option<ZeroizeString>,
} }
#[derive(Debug)] #[derive(Debug)]
@@ -103,7 +103,6 @@ pub enum Error {
/// Unable to apply an action to a validator. /// Unable to apply an action to a validator.
InvalidActionOnValidator, InvalidActionOnValidator,
UnableToReadValidatorPassword(String), UnableToReadValidatorPassword(String),
MissingKeystorePassword,
UnableToReadKeystoreFile(eth2_keystore::Error), UnableToReadKeystoreFile(eth2_keystore::Error),
} }
@@ -561,10 +560,11 @@ impl InitializedValidators {
.. ..
} if is_local_keystore => { } if is_local_keystore => {
let password = match (voting_keystore_password, voting_keystore_password_path) { let password = match (voting_keystore_password, voting_keystore_password_path) {
(Some(password), _) => password.clone(), (Some(password), _) => Some(password.clone()),
(_, Some(path)) => read_password_string(path) (_, Some(path)) => read_password_string(path)
.map(Option::Some)
.map_err(Error::UnableToReadValidatorPassword)?, .map_err(Error::UnableToReadValidatorPassword)?,
(None, None) => return Err(Error::MissingKeystorePassword), (None, None) => None,
}; };
let keystore = Keystore::from_json_file(voting_keystore_path) let keystore = Keystore::from_json_file(voting_keystore_path)
.map_err(Error::UnableToReadKeystoreFile)?; .map_err(Error::UnableToReadKeystoreFile)?;