Skip to content

Introduce AggregatingAttestationPoolV2 #9445

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

Merged
rolfyone merged 2 commits into from
May 20, 2025
Merged

Introduce AggregatingAttestationPoolV2 #9445

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
d8a8e27
introduce-poolV2
tbenr May 20, 2025
c93927e
fix tests
tbenr May 20, 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
5 changes: 5 additions & 0 deletions ethereum/spec/src/testFixtures/java/tech/pegasys/teku/spec/util/DataStructureUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -811,6 +811,11 @@ public AttestationData randomAttestationData(final UInt64 slot) {
slot, randomUInt64(), randomBytes32(), randomCheckpoint(), randomCheckpoint());
}

public AttestationData randomAttestationData(final UInt64 slot, final UInt64 committeeIndex) {
return new AttestationData(
slot, committeeIndex, randomBytes32(), randomCheckpoint(), randomCheckpoint());
}

public AttestationData randomAttestationData(final UInt64 slot, final Bytes32 blockRoot) {
return new AttestationData(
slot,
Expand Down
14 changes: 11 additions & 3 deletions ...c/main/java/tech/pegasys/teku/statetransition/attestation/AggregatingAttestationPool.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@

import java.util.List;
import java.util.Optional;
import java.util.function.Supplier;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.apache.tuweni.bytes.Bytes32;
Expand Down Expand Up @@ -79,13 +80,19 @@ public abstract void onAttestationsIncludedInBlock(
* otherwise.
*/
protected boolean ensureCommitteesSizeInAttestation(final ValidatableAttestation attestation) {
return ensureCommitteesSizeInAttestation(
attestation, () -> retrieveStateForAttestation(attestation.getData()));
}

protected boolean ensureCommitteesSizeInAttestation(
final ValidatableAttestation attestation,
final Supplier<Optional<BeaconState>> stateSupplier) {
if (attestation.getCommitteesSize().isPresent()
|| !attestation.getAttestation().requiresCommitteeBits()) {
return true;
}

final Optional<BeaconState> maybeState =
retrieveStateForAttestation(attestation.getAttestation().getData());
final Optional<BeaconState> maybeState = stateSupplier.get();
if (maybeState.isEmpty()) {
return false;
}
Expand All @@ -95,7 +102,8 @@ protected boolean ensureCommitteesSizeInAttestation(final ValidatableAttestation
return true;
}

private Optional<BeaconState> retrieveStateForAttestation(final AttestationData attestationData) {
protected Optional<BeaconState> retrieveStateForAttestation(
final AttestationData attestationData) {
// we can use the first state of the epoch to get committees for an attestation
final MiscHelpers miscHelpers = spec.atSlot(attestationData.getSlot()).miscHelpers();
final Optional<UInt64> maybeEpoch = recentChainData.getCurrentEpoch();
Expand Down
Loading