Skip to content

Fork aware Attestation ssz decoding #8881

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

Open
hopinheimer wants to merge 3 commits into
base: unstable
Choose a base branch
from
+18 −1
Open

Fork aware Attestation ssz decoding #8881

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7cecff6
fork-aware ssz decode
hopinheimer Feb 21, 2026
52f28a9
cleanup
hopinheimer Feb 21, 2026
417cdf9
Merge branch 'unstable' into fork-aware-attestation-decode
hopinheimer Feb 21, 2026
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
19 changes: 18 additions & 1 deletion consensus/types/src/attestation/attestation.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ use crate::{
IndexedAttestationElectra,
},
core::{ChainSpec, Domain, EthSpec, Hash256, SignedRoot, Slot, SlotData},
fork::{Fork, ForkName},
fork::{Fork, ForkName, ForkVersionDecode},
test_utils::TestRandom,
};

Expand Down Expand Up @@ -261,6 +261,17 @@ impl<E: EthSpec> Attestation<E> {
Self::Electra(attn) => attn.get_aggregation_bits(),
}
}

pub fn from_ssz_bytes_for_fork(
Copy link
Member

@michaelsproul michaelsproul Feb 21, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

To fix the bug that was reported we probably also need to use this func in the network layer.

bytes: &[u8],
fork_name: ForkName,
) -> Result<Self, ssz::DecodeError> {
if fork_name.electra_enabled() {
ssz::Decode::from_ssz_bytes(bytes).map(Self::Electra)
} else {
ssz::Decode::from_ssz_bytes(bytes).map(Self::Base)
}
}
}

impl<E: EthSpec> AttestationRef<'_, E> {
Expand Down Expand Up @@ -582,6 +593,12 @@ impl<'de, E: EthSpec> ContextDeserialize<'de, ForkName> for Attestation<E> {
}
}

impl<E: EthSpec> ForkVersionDecode for Attestation<E> {
fn from_ssz_bytes_by_fork(bytes: &[u8], fork_name: ForkName) -> Result<Self, ssz::DecodeError> {
Self::from_ssz_bytes_for_fork(bytes, fork_name)
}
}

/*
impl<'de, E: EthSpec> ContextDeserialize<'de, ForkName> for Vec<Attestation<E>> {
Copy link
Member

@michaelsproul michaelsproul Feb 21, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This commented out code could be revived or deleted as part of this PR too.

fn context_deserialize<D>(
Expand Down