Skip to content

fix: return correct type from attestation validation when using cache #7261

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
merged 7 commits into from
Nov 30, 2024
Merged

fix: return correct type from attestation validation when using cache #7261

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
603aae8
fix: return correct type from attestation validation when using cache
nflaig Nov 28, 2024
33255b3
Remove type casts
nflaig Nov 29, 2024
bdaf3b0
Remove unused import
nflaig Nov 29, 2024
73b6c0c
Use ternary operator instead of if-else
nflaig Nov 29, 2024
0b5bcb3
Fix aggregationBits type issue
nflaig Nov 29, 2024
4d07fe0
Merge branch 'devnet-5' into nflaig/fix-attestation-format
nflaig Nov 29, 2024
e0be1ea
Add comment
nflaig Nov 29, 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
33 changes: 16 additions & 17 deletions packages/beacon-node/src/chain/validation/attestation.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ import {
SingleAttestation,
Slot,
ValidatorIndex,
electra,
isElectraSingleAttestation,
phase0,
ssz,
Expand Down Expand Up @@ -514,27 +513,27 @@ async function validateAttestationNoSignatureCheck(
}

// no signature check, leave that for step1
const indexedAttestationContent = {
const indexedAttestation: IndexedAttestation = {
attestingIndices,
data: attData,
signature,
};
const indexedAttestation =
ForkSeq[fork] >= ForkSeq.electra
? (indexedAttestationContent as electra.IndexedAttestation)
: (indexedAttestationContent as phase0.IndexedAttestation);

const attestationContent = attestationOrCache.attestation ?? {
aggregationBits,
data: attData,
committeeIndex,
signature,
};

const attestation =
ForkSeq[fork] >= ForkSeq.electra
? (attestationContent as SingleAttestation<ForkPostElectra>)
: (attestationContent as SingleAttestation<ForkPreElectra>);
const attestation: SingleAttestation = attestationOrCache.attestation
? attestationOrCache.attestation
: !isForkPostElectra(fork)
? {
// Aggregation bits are already asserted above to not be null
aggregationBits: aggregationBits as BitArray,
data: attData,
signature,
}
: {
committeeIndex,
attesterIndex: validatorIndex,
data: attData,
signature,
};

return {
attestation,
Expand Down