feat: electra process_registry_updates & slash_validators changes #1420
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
LeanSerra
changed the title
LeanSerra
changed the title
…ne eject_validator fn
rodrigo-o
reviewed
Apr 10, 2025
rodrigo-o
approved these changes
Apr 11, 2025
Collaborator
rodrigo-o
left a comment
rodrigo-o
left a comment
There was a problem hiding this comment.
Great 🚀 , added a small nit and a comment for the future.
Comment on lines
147
to
215
| validators | ||
| |> Enum.with_index() | ||
| |> Enum.reduce_while(state, fn {validator, idx}, state -> | ||
| handle_validator_registry_update( | ||
| state, | ||
| validator, | ||
| idx, | ||
| current_epoch, | ||
| activation_exit_epoch, | ||
| ejection_balance | ||
| ) | ||
| end) | ||
| |> then(fn | ||
| %BeaconState{} = state -> {:ok, state} | ||
| {:error, reason} -> {:error, reason} | ||
| end) | ||
| end | ||
|
|
||
| result = | ||
| validators | ||
| |> Stream.with_index() | ||
| |> Stream.map(fn {v, i} -> | ||
| {{v, i}, Predicates.eligible_for_activation_queue?(v), | ||
| Predicates.active_validator?(v, current_epoch) and | ||
| v.effective_balance <= ejection_balance} | ||
| end) | ||
| |> Stream.filter(&(elem(&1, 1) or elem(&1, 2))) | ||
| |> Stream.map(fn | ||
| {{v, i}, true, b} -> {{%{v | activation_eligibility_epoch: current_epoch + 1}, i}, b} | ||
| {{v, i}, false = _is_eligible, b} -> {{v, i}, b} | ||
| end) | ||
| |> Enum.reduce({:ok, state}, fn | ||
| _, {:error, _} = err -> err | ||
| {{v, i}, should_be_ejected}, {:ok, st} -> eject_validator(st, v, i, should_be_ejected) | ||
| {err, _}, _ -> err | ||
| end) | ||
| defp handle_validator_registry_update( | ||
| state, | ||
| validator, | ||
| idx, | ||
| current_epoch, | ||
| activation_exit_epoch, | ||
| ejection_balance | ||
| ) do | ||
| cond do | ||
| Predicates.eligible_for_activation_queue?(validator) -> | ||
| updated_validator = %Validator{ | ||
| validator | ||
| | activation_eligibility_epoch: current_epoch + 1 | ||
| } | ||
|
|
||
| with {:ok, new_state} <- result do | ||
| new_state.validators | ||
| |> Stream.with_index() | ||
| |> Stream.filter(fn {v, _} -> Predicates.eligible_for_activation?(state, v) end) | ||
| |> Enum.sort_by(fn {%{activation_eligibility_epoch: ep}, i} -> {ep, i} end) | ||
| |> Enum.take(churn_limit) | ||
| |> Enum.reduce(new_state.validators, fn {v, i}, acc -> | ||
| %{v | activation_epoch: activation_exit_epoch} | ||
| |> then(&Aja.Vector.replace_at!(acc, i, &1)) | ||
| end) | ||
| |> then(&{:ok, %BeaconState{new_state | validators: &1}}) | ||
| end | ||
| end | ||
| {:cont, | ||
| %BeaconState{ | ||
| state | ||
| | validators: Aja.Vector.replace_at!(state.validators, idx, updated_validator) | ||
| }} | ||
|
|
||
| defp eject_validator(state, validator, index, false) do | ||
| {:ok, %{state | validators: Aja.Vector.replace_at!(state.validators, index, validator)}} | ||
| end | ||
| Predicates.active_validator?(validator, current_epoch) && | ||
| validator.effective_balance <= ejection_balance -> | ||
| case Mutators.initiate_validator_exit(state, validator) do | ||
| {:ok, state, ejected_validator} -> | ||
| updated_state = %{ | ||
| state | ||
| | validators: Aja.Vector.replace_at!(state.validators, idx, ejected_validator) | ||
| } | ||
|
|
||
| {:cont, updated_state} | ||
|
|
||
| {:error, msg} -> | ||
| {:halt, {:error, msg}} | ||
| end | ||
|
|
||
| Predicates.eligible_for_activation?(state, validator) -> | ||
| updated_validator = %Validator{ | ||
| validator | ||
| | activation_epoch: activation_exit_epoch | ||
| } | ||
|
|
||
| updated_state = %BeaconState{ | ||
| state | ||
| | validators: Aja.Vector.replace_at!(state.validators, idx, updated_validator) | ||
| } | ||
|
|
||
| {:cont, updated_state} | ||
|
|
||
| defp eject_validator(state, validator, index, true) do | ||
| with {:ok, ejected_validator} <- Mutators.initiate_validator_exit(state, validator) do | ||
| {:ok, | ||
| %{state | validators: Aja.Vector.replace_at!(state.validators, index, ejected_validator)}} | ||
| true -> | ||
| {:cont, state} |
Collaborator
There was a problem hiding this comment.
I really prefer how now we have the cond in a separate function! But I'm a bit concerned about the complexity still, it's better than the previous version but I feel it's a really long function for the matching spec:
def process_registry_updates(state: BeaconState) -> None:
current_epoch = get_current_epoch(state)
activation_epoch = compute_activation_exit_epoch(current_epoch)
# Process activation eligibility, ejections, and activations
for index, validator in enumerate(state.validators):
if is_eligible_for_activation_queue(validator): # [Modified in Electra:EIP7251]
validator.activation_eligibility_epoch = current_epoch + 1
elif is_active_validator(validator, current_epoch) and validator.effective_balance <= EJECTION_BALANCE:
initiate_validator_exit(state, ValidatorIndex(index)) # [Modified in Electra:EIP7251]
elif is_eligible_for_activation(state, validator):
validator.activation_epoch = activation_epochI feel that we can simplify it even more, but probably for another moment when we already have all the spec-test running.
rodrigo-o
pushed a commit
that referenced
this pull request
Apr 25, 2025
rodrigo-o
pushed a commit
that referenced
this pull request
Apr 25, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Motivation
Implement the changes in Electra related to
process_registry_updatesandslash_validatorsDescription
slash_validatorlinkget_balance_churn_limitlinkget_activation_exit_churn_limitlinkcompute_exit_epoch_and_update_churnlinkinitiate_validator_exitlinkprocess_registry_updateslinkFixed spec tests