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

add missing electra attestation processing committee check #8901

Merged
merged 7 commits into from
Dec 9, 2024
Merged

add missing electra attestation processing committee check #8901

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
4d459b2
add missing electra attestation processing committee check
mehdi-aouadi Dec 9, 2024
1275cd9
missing final
mehdi-aouadi Dec 9, 2024
8f291ea
rename variable
mehdi-aouadi Dec 9, 2024
d916a56
refactoring
mehdi-aouadi Dec 9, 2024
f9bb956
missing final
mehdi-aouadi Dec 9, 2024
425db21
rename variable
mehdi-aouadi Dec 9, 2024
8abd8ba
Merge branch 'master' into 8892-attestation-processing-fix
mehdi-aouadi Dec 9, 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
9 changes: 0 additions & 9 deletions ...erenceTest/java/tech/pegasys/teku/reference/common/operations/OperationsTestExecutor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@

import com.fasterxml.jackson.annotation.JsonProperty;
import com.google.common.collect.ImmutableMap;
import java.util.List;
import java.util.Optional;
import tech.pegasys.teku.ethtests.finder.TestDefinition;
import tech.pegasys.teku.infrastructure.ssz.SszData;
Expand Down Expand Up @@ -68,9 +67,6 @@ public class OperationsTestExecutor<T extends SszData> implements TestExecutor {

public static final String EXPECTED_STATE_FILE = "post.ssz_snappy";

// TODO remove https://github.com/Consensys/teku/issues/8892
private static final List<String> IGNORED_TEST = List.of("invalid_nonset_bits_for_one_committee");

private enum Operation {
ATTESTER_SLASHING,
PROPOSER_SLASHING,
Expand Down Expand Up @@ -148,11 +144,6 @@ public OperationsTestExecutor(final String dataFileName, final Operation operati

@Override
public void runTest(final TestDefinition testDefinition) throws Exception {
// TODO remove https://github.com/Consensys/teku/issues/8892
if (IGNORED_TEST.contains(testDefinition.getTestName())) {
return;
}

final BeaconState preState = loadStateFromSsz(testDefinition, "pre.ssz_snappy");

final DefaultOperationProcessor standardProcessor =
Expand Down
16 changes: 13 additions & 3 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 @@ -23,6 +23,7 @@
import java.util.List;
import java.util.Optional;
import java.util.function.Supplier;
import java.util.stream.IntStream;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.apache.tuweni.bytes.Bytes32;
Expand Down Expand Up @@ -725,16 +726,25 @@ private Optional<OperationInvalidReason> checkCommittees(
final BeaconState state,
final UInt64 slot,
final SszBitlist aggregationBits) {
int participantsCount = 0;
int committeeOffset = 0;
for (final UInt64 committeeIndex : committeeIndices) {
if (committeeIndex.isGreaterThanOrEqualTo(committeeCountPerSlot)) {
return Optional.of(AttestationInvalidReason.COMMITTEE_INDEX_TOO_HIGH);
}
final IntList committee =
beaconStateAccessorsElectra.getBeaconCommittee(state, slot, committeeIndex);
participantsCount += committee.size();
final int currentCommitteeOffset = committeeOffset;
final boolean committeeHasAtLeastOneAttester =
IntStream.range(0, committee.size())
.anyMatch(
committeeParticipantIndex ->
aggregationBits.isSet(currentCommitteeOffset + committeeParticipantIndex));
if (!committeeHasAtLeastOneAttester) {
return Optional.of(AttestationInvalidReason.PARTICIPANTS_COUNT_MISMATCH);
}
committeeOffset += committee.size();
}
if (participantsCount != aggregationBits.size()) {
if (committeeOffset != aggregationBits.size()) {
return Optional.of(AttestationInvalidReason.PARTICIPANTS_COUNT_MISMATCH);
}
return Optional.empty();
Expand Down
Loading