gnosis/lighthouse
1
0
Fork 0
mirror of https://github.com/sigp/lighthouse.git synced 2026-03-22 06:14:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Handle status from import

Browse Source
This commit is contained in:
Paul Hauner
2022-08-25 10:06:04 +10:00
parent 0c32b5a48b
commit 64decbc65a
3 changed files with 105 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
validator_manager/src/validators/move_validators.rs
View File

@@ -3,7 +3,10 @@ use crate::DumpConfig;
use clap::{App, Arg, ArgMatches};
use eth2::{
lighthouse_vc::{
std_types::{DeleteKeystoreStatus, DeleteKeystoresRequest, InterchangeJsonStr, Status},
std_types::{
DeleteKeystoreStatus, DeleteKeystoresRequest, ImportKeystoreStatus, InterchangeJsonStr,
Status,
},
types::{ExportKeystoresResponse, SingleExportKeystoresResponse},
},
SensitiveUrl,
@@ -399,7 +402,37 @@ async fn run<'a>(config: MoveConfig) -> Result<(), String> {
.upload(&dest_http_client, ignore_duplicates)
.await
{
Ok(()) => break,
Ok(status) => {
match status.status {
ImportKeystoreStatus::Imported => {
eprintln!("Moved keystore {} of {}", i + 1, count);
break;
}
ImportKeystoreStatus::Duplicate => {
eprintln!("Moved duplicate keystore {} of {} to the VC", i + 1, count);
break;
}
ImportKeystoreStatus::Error => {
eprintln!(
"Upload of keystore {} of {} failed with message: {:?}. \
A potential solution is run this command again \
using the --{} flag, however care should be taken to ensure \
that there are no duplicate deposits submitted.",
i + 1,
count,
status.message,
IGNORE_DUPLICATES_FLAG
);
// Retry uploading this validator.
sleep_with_retry_message(
&pubkey_to_move,
keystore_derivation_path.as_deref(),
)
.await;
return Err(format!("Upload failed with {:?}", status.message));
}
}
}
e @ Err(UploadError::InvalidPublicKey) => {
eprintln!("Validator {} has an invalid public key", i);
return Err(format!("{:?}", e));
@@ -429,6 +462,18 @@ async fn run<'a>(config: MoveConfig) -> Result<(), String> {
sleep_with_retry_message(&pubkey_to_move, keystore_derivation_path.as_deref())
.await;
}
Err(UploadError::IncorrectStatusCount(count)) => {
eprintln!(
"Keystore was uploaded, however the validator client returned an invalid response. \
A potential solution is run this command again using the --{} flag, however care \
should be taken to ensure that there are no duplicate deposits submitted.",
IGNORE_DUPLICATES_FLAG
);
return Err(format!(
"Invalid status count in import response: {}",
count
));
}
Err(UploadError::FeeRecipientUpdateFailed(e)) => {
eprintln!(
"Failed to set fee recipient for validator {}. This value may need \