Skip to content

[Merged by Bors] - Optimise update_validators by decrypting key cache only when necessary #4126

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 2 commits into from
Closed

[Merged by Bors] - Optimise update_validators by decrypting key cache only when necessary #4126

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a197f05
fix(web3signer-cache): don't use cache for web3signer when updaing va…
screwyprof Mar 23, 2023
f61ce73
fix(web3signer-cache): fix style
screwyprof Mar 23, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 23 additions & 4 deletions validator_client/src/initialized_validators.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -989,7 +989,23 @@ impl InitializedValidators {

let cache =
KeyCache::open_or_create(&self.validators_dir).map_err(Error::UnableToOpenKeyCache)?;
let mut key_cache = self.decrypt_key_cache(cache, &mut key_stores).await?;

// Check if there is at least one local definition.
let has_local_definitions = self.definitions.as_slice().iter().any(|def| {
matches!(
def.signing_definition,
SigningDefinition::LocalKeystore { .. }
)
});

// Only decrypt cache when there is at least one local definition.
// Decrypting cache is a very expensive operation which is never used for web3signer.
let mut key_cache = if has_local_definitions {
self.decrypt_key_cache(cache, &mut key_stores).await?
} else {
// Assign an empty KeyCache if all definitions are of the Web3Signer type.
KeyCache::new()
};

let mut disabled_uuids = HashSet::new();
for def in self.definitions.as_slice() {
Expand Down Expand Up @@ -1115,13 +1131,16 @@ impl InitializedValidators {
);
}
}
for uuid in disabled_uuids {
key_cache.remove(&uuid);

if has_local_definitions {
for uuid in disabled_uuids {
key_cache.remove(&uuid);
}
}

let validators_dir = self.validators_dir.clone();
let log = self.log.clone();
if key_cache.is_modified() {
if has_local_definitions && key_cache.is_modified() {
tokio::task::spawn_blocking(move || {
match key_cache.save(validators_dir) {
Err(e) => warn!(
Expand Down