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

Merge branch 'unstable' into validator-manager

Browse Source
This commit is contained in:
Paul Hauner
2023-02-14 14:41:41 +11:00
parent 8ca7f321e3 fa1d4c7054
commit d278bab54f
162 changed files with 6028 additions and 2235 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
validator_client/src/initialized_validators.rs
View File

@@ -479,7 +479,7 @@ impl InitializedValidators {
/// Iterate through all voting public keys in `self` that should be used when querying for duties.
pub fn iter_voting_pubkeys(&self) -> impl Iterator<Item = &PublicKeyBytes> {
self.validators.iter().map(|(pubkey, _)| pubkey)
self.validators.keys()
}
/// Returns the voting `Keypair` for a given voting `PublicKey`, if all are true:
@@ -1020,17 +1020,17 @@ impl InitializedValidators {
let mut disabled_uuids = HashSet::new();
for def in self.definitions.as_slice() {
if def.enabled {
let pubkey_bytes = def.voting_public_key.compress();
if self.validators.contains_key(&pubkey_bytes) {
continue;
}
match &def.signing_definition {
SigningDefinition::LocalKeystore {
voting_keystore_path,
..
} => {
let pubkey_bytes = def.voting_public_key.compress();
if self.validators.contains_key(&pubkey_bytes) {
continue;
}
if let Some(key_store) = key_stores.get(voting_keystore_path) {
disabled_uuids.remove(key_store.uuid());
}