Add automatic registry mux refreshing #384
Open
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
ManuelBilbao
previously approved these changes
Oct 13, 2025
ltitanb
requested changes
Oct 14, 2025
ltitanb
requested changes
Oct 15, 2025
Comment on lines
+36
to
+41
| let mut is_refreshing_required = false; | ||
| if let Some(muxes) = &state.config.registry_muxes { | ||
| is_refreshing_required = muxes.iter().any(|(loader, _)| { | ||
| matches!(loader, MuxKeysLoader::Registry { enable_refreshing: true, .. }) | ||
| }); | ||
| } |
There was a problem hiding this comment.
a bit more idiomatic
Suggested change
| let mut is_refreshing_required = false; | |
| if let Some(muxes) = &state.config.registry_muxes { | |
| is_refreshing_required = muxes.iter().any(|(loader, _)| { | |
| matches!(loader, MuxKeysLoader::Registry { enable_refreshing: true, .. }) | |
| }); | |
| } | |
| llet is_refreshing_required = state.config.registry_muxes.as_ref().is_some_and(|muxes| { | |
| muxes.iter().any(|(loader, _)| { | |
| matches!(loader, MuxKeysLoader::Registry { enable_refreshing: true, .. }) | |
| }) | |
| }); |
| // Initialize an empty lookup if the config doesn't have one yet | ||
| let mux_lookup = match &config.mux_lookup { | ||
| Some(lookup) => lookup, | ||
| None => &HashMap::new(), |
There was a problem hiding this comment.
should we not return here?
Comment on lines
+162
to
+164
| for (pubkey, runtime_config) in new_pubkeys.iter() { | ||
| debug!("adding new pubkey {pubkey} to mux {}", runtime_config.id); | ||
| } |
There was a problem hiding this comment.
not sure this adds a lot, and it iterates over the map whether debug is enabled or not
Comment on lines
+169
to
+171
| for pubkey in removed_pubkeys.iter() { | ||
| debug!("removing old pubkey {pubkey} from mux lookup"); | ||
| } |
| let mut state = state.write().await; | ||
| let config = state.config.as_ref(); | ||
| let new_mux_lookup = if let Some(existing) = &config.mux_lookup { | ||
| let mut map = HashMap::new(); |
There was a problem hiding this comment.
instead of allocating a new map here, we can just take a mutable reference, remove all removed_pubkeys and add all new_pubkeys
ltitanb
reviewed
Oct 15, 2025
Comment on lines
+130
to
+137
| match mux_lookup.get(&pubkey) { | ||
| Some(_) => { | ||
| // Pubkey already existed | ||
| } | ||
| None => { | ||
| // New pubkey | ||
| new_pubkeys.insert(pubkey.clone(), runtime_config.clone()); | ||
| } |
There was a problem hiding this comment.
Suggested change
| match mux_lookup.get(&pubkey) { | |
| Some(_) => { | |
| // Pubkey already existed | |
| } | |
| None => { | |
| // New pubkey | |
| new_pubkeys.insert(pubkey.clone(), runtime_config.clone()); | |
| } | |
| if mux_lookup.get(&pubkey).is_none() { | |
| // New pubkey | |
| new_pubkeys.insert(pubkey.clone(), runtime_config.clone()); | |
| } |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This is part of #382 and incorporates some additional user feedback. Basically, users want the PBS service to routinely query SSV or Lido when set up with muxes that use them as registries, and automatically support new pubkeys that get added to the corresponding operators. This PR adds that capability by:
Note this has a substantial rewrite of the SSV loader, including breaking the core structs out into a public module and a more robust mock of the SSV API server for testing.