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

Jump to bottom

Invert validatorActiveLongEnough check to be more clear #8196

Merged
merged 2 commits into from
Apr 15, 2024
Merged

Invert validatorActiveLongEnough check to be more clear #8196

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
452e2d0
Invert validatorActiveLongEnough check to be more clear
jtraglia Apr 12, 2024
426e236
Merge branch 'master' into final-and-active
zilm13 Apr 15, 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
10 changes: 5 additions & 5 deletions .../main/java/tech/pegasys/teku/spec/logic/versions/electra/block/BlockProcessorElectra.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,15 +158,15 @@ public void processExecutionLayerExits(
final Validator validator = state.getValidators().get(validatorIndex);

// Check if validator has eth1 credentials
boolean isExecutionAddress = predicates.hasEth1WithdrawalCredential(validator);
final boolean isExecutionAddress = predicates.hasEth1WithdrawalCredential(validator);
if (!isExecutionAddress) {
return;
}

// Check exit source_address matches validator eth1 withdrawal credentials
final Bytes20 executionAddress =
new Bytes20(validator.getWithdrawalCredentials().slice(12));
boolean isCorrectSourceAddress = executionAddress.equals(exit.getSourceAddress());
final boolean isCorrectSourceAddress = executionAddress.equals(exit.getSourceAddress());
if (!isCorrectSourceAddress) {
return;
}
Expand All @@ -178,16 +178,16 @@ public void processExecutionLayerExits(
}

// Check if validator has already initiated exit
boolean hasInitiatedExit = !validator.getExitEpoch().equals(FAR_FUTURE_EPOCH);
final boolean hasInitiatedExit = !validator.getExitEpoch().equals(FAR_FUTURE_EPOCH);
if (hasInitiatedExit) {
return;
}

// Check if validator has been active long enough
final boolean validatorActiveLongEnough =
currentEpoch.isLessThan(
currentEpoch.isGreaterThanOrEqualTo(
validator.getActivationEpoch().plus(specConfig.getShardCommitteePeriod()));
if (validatorActiveLongEnough) {
if (!validatorActiveLongEnough) {
return;
}

Expand Down