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

update process_registry_updates #9060

Merged
merged 2 commits into from
Jan 31, 2025
Merged

update process_registry_updates #9060

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f728b3d
update process_registry_updates
rolfyone Jan 30, 2025
1468dc7
Merge branch 'master' into procress-registry-updates
rolfyone Jan 30, 2025
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
20 changes: 9 additions & 11 deletions ...ava/tech/pegasys/teku/spec/logic/common/statetransition/epoch/AbstractEpochProcessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -371,15 +371,11 @@ public void processRegistryUpdates(
for (int index = 0; index < validators.size(); index++) {
final ValidatorStatus status = statuses.get(index);

if (isEligibleForActivationQueue(status)) {
final Validator validator = validators.get(index);
if (validator.getActivationEligibilityEpoch().equals(SpecConfig.FAR_FUTURE_EPOCH)) {
validators.set(
index, validator.withActivationEligibilityEpoch(currentEpoch.plus(UInt64.ONE)));
}
}

if (status.isActiveInCurrentEpoch()
final Validator validator = validators.get(index);
if (isEligibleForActivationQueue(validator, status)) {
validators.set(
index, validator.withActivationEligibilityEpoch(currentEpoch.plus(UInt64.ONE)));
} else if (status.isActiveInCurrentEpoch()
&& status.getCurrentEpochEffectiveBalance().isLessThanOrEqualTo(ejectionBalance)) {
beaconStateMutators.initiateValidatorExit(state, index, validatorExitContextSupplier);
}
Expand Down Expand Up @@ -435,9 +431,11 @@ public void processRegistryUpdates(
* @param status - Validator status
* @return true if validator is eligible to be added to the activation queue
*/
protected boolean isEligibleForActivationQueue(final ValidatorStatus status) {
protected boolean isEligibleForActivationQueue(
final Validator validator, final ValidatorStatus status) {
return !status.isActiveInCurrentEpoch()
&& status.getCurrentEpochEffectiveBalance().equals(maxEffectiveBalance);
&& status.getCurrentEpochEffectiveBalance().equals(maxEffectiveBalance)
&& validator.getActivationEligibilityEpoch().equals(SpecConfig.FAR_FUTURE_EPOCH);
}

/** Processes slashings */
Expand Down
24 changes: 10 additions & 14 deletions ...pegasys/teku/spec/logic/versions/electra/statetransition/epoch/EpochProcessorElectra.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,21 +102,15 @@ public void processRegistryUpdates(
for (int index = 0; index < validators.size(); index++) {
final ValidatorStatus status = statuses.get(index);

if (isEligibleForActivationQueue(status)) {
final Validator validator = validators.get(index);
if (validator.getActivationEligibilityEpoch().equals(SpecConfig.FAR_FUTURE_EPOCH)) {
state
.getValidators()
.update(
index, v -> v.withActivationEligibilityEpoch(currentEpoch.plus(UInt64.ONE)));
}
final Validator validator = validators.get(index);
if (isEligibleForActivationQueue(validator, status)) {
state
.getValidators()
.update(index, v -> v.withActivationEligibilityEpoch(currentEpoch.plus(UInt64.ONE)));
} else if (status.isActiveInCurrentEpoch()
&& status.getCurrentEpochEffectiveBalance().isLessThanOrEqualTo(ejectionBalance)) {
beaconStateMutators.initiateValidatorExit(state, index, validatorExitContextSupplier);
}
// activate all eligible validators
final Validator validator = validators.get(index);
if (isEligibleForActivation(finalizedEpoch, validator)) {
} else if (isEligibleForActivation(finalizedEpoch, validator)) {
state.getValidators().update(index, v -> v.withActivationEpoch(activationEpoch));
}
}
Expand All @@ -137,9 +131,11 @@ protected boolean isEligibleForActivation(
* @param status - Validator status
*/
@Override
protected boolean isEligibleForActivationQueue(final ValidatorStatus status) {
protected boolean isEligibleForActivationQueue(
final Validator validator, final ValidatorStatus status) {
return !status.isActiveInCurrentEpoch()
&& status.getCurrentEpochEffectiveBalance().isGreaterThanOrEqualTo(minActivationBalance);
&& status.getCurrentEpochEffectiveBalance().isGreaterThanOrEqualTo(minActivationBalance)
&& validator.getActivationEligibilityEpoch().equals(SpecConfig.FAR_FUTURE_EPOCH);
}

@Override
Expand Down