Skip to content
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

Optimise no-op PATCH ops in VC HTTP API #5064

Merged
merged 3 commits into from
Feb 29, 2024
Merged

Optimise no-op PATCH ops in VC HTTP API #5064

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cea197e
Optimise no-op changes in VC API
michaelsproul Jan 12, 2024
bbf1812
Handle another no-op case
michaelsproul Jan 15, 2024
e2a4ae7
Merge remote-tracking branch 'origin/unstable' into opt-vc-patch-api
michaelsproul Feb 7, 2024
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
80 changes: 61 additions & 19 deletions validator_client/src/http_api/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -685,7 +685,16 @@ pub fn serve<T: 'static + SlotClock + Clone, E: EthSpec>(

let maybe_graffiti = body.graffiti.clone().map(Into::into);
let initialized_validators_rw_lock = validator_store.initialized_validators();
let mut initialized_validators = initialized_validators_rw_lock.write();
let initialized_validators = initialized_validators_rw_lock.upgradable_read();

// Do not make any changes if all fields are identical or unchanged.
fn equal_or_none<T: PartialEq>(
current_value: Option<T>,
new_value: Option<T>,
) -> bool {
new_value.is_none() || current_value == new_value
}

match (
initialized_validators.is_enabled(&validator_pubkey),
initialized_validators.validator(&validator_pubkey.compress()),
Expand All @@ -694,32 +703,65 @@ pub fn serve<T: 'static + SlotClock + Clone, E: EthSpec>(
"no validator for {:?}",
validator_pubkey
))),
// If all specified parameters match their existing settings, then this
// change is a no-op.
(Some(is_enabled), Some(initialized_validator))
if Some(is_enabled) == body.enabled
&& initialized_validator.get_gas_limit() == body.gas_limit
&& initialized_validator.get_builder_boost_factor()
== body.builder_boost_factor
&& initialized_validator.get_builder_proposals()
== body.builder_proposals
&& initialized_validator.get_prefer_builder_proposals()
== body.prefer_builder_proposals
&& initialized_validator.get_graffiti() == maybe_graffiti =>
if equal_or_none(Some(is_enabled), body.enabled)
&& equal_or_none(
initialized_validator.get_gas_limit(),
body.gas_limit,
)
&& equal_or_none(
initialized_validator.get_builder_boost_factor(),
body.builder_boost_factor,
)
&& equal_or_none(
initialized_validator.get_builder_proposals(),
body.builder_proposals,
)
&& equal_or_none(
initialized_validator.get_prefer_builder_proposals(),
body.prefer_builder_proposals,
)
&& equal_or_none(
initialized_validator.get_graffiti(),
maybe_graffiti,
) =>
{
Ok(())
}
// Disabling an already disabled validator *with no other changes* is a
// no-op.
(Some(false), None)
if body.enabled.map_or(true, |enabled| !enabled)
&& body.gas_limit.is_none()
&& body.builder_boost_factor.is_none()
&& body.builder_proposals.is_none()
&& body.prefer_builder_proposals.is_none()
&& maybe_graffiti.is_none() =>
{
Ok(())
}
(Some(_), _) => {
// Upgrade read lock only in the case where a write is actually
// required.
let mut initialized_validators_write =
parking_lot::RwLockUpgradableReadGuard::upgrade(
initialized_validators,
);
if let Some(handle) = task_executor.handle() {
handle
.block_on(
initialized_validators.set_validator_definition_fields(
&validator_pubkey,
body.enabled,
body.gas_limit,
body.builder_proposals,
body.builder_boost_factor,
body.prefer_builder_proposals,
body.graffiti,
),
initialized_validators_write
.set_validator_definition_fields(
&validator_pubkey,
body.enabled,
body.gas_limit,
body.builder_proposals,
body.builder_boost_factor,
body.prefer_builder_proposals,
body.graffiti,
),
)
.map_err(|e| {
warp_utils::reject::custom_server_error(format!(
Expand Down
Loading