fix: resolve tree hash calculation for IndexedAttestation and Attestation types (#698)

* fix: resolve tree hash calculation for IndexedAttestation and Attestation types

Fixed incorrect variant ordering in superstruct definitions that was causing
tree hash mismatches for beacon blocks. The Electra variant must be listed
first before Base variant to ensure proper deserialization and hash calculation.

Changes made:
- Reordered IndexedAttestation variants to list Electra before Base
- Reordered Attestation variants to list Electra before Base
- Added test case for slot 12557247 to verify tree hash calculation
- Added reqwest and serde_json dependencies for the new test

This resolves issues with beacon block hash verification where the calculated
tree hash did not match the expected value.

* fmt

Author: ncitron

Cargo.lock

@@ -37,3 +37,5 @@ wasmtimer = "0.2.0"
 tokio = { version = "1", features = ["full"] }
 snap = "1"
 serde_yaml = "0.9.34"
+reqwest = { version = "0.11", features = ["json"] }
+serde_json = "1.0"

ethereum/consensus-core/Cargo.toml

@@ -277,7 +277,7 @@ pub struct AttesterSlashing<S: ConsensusSpec> {
 }
 
 #[superstruct(
-    variants(Base, Electra),
+    variants(Electra, Base),
     variant_attributes(
         derive(Deserialize, Debug, Default, Encode, TreeHash, Clone,),
         serde(deny_unknown_fields),
@@ -288,13 +288,13 @@ pub struct AttesterSlashing<S: ConsensusSpec> {
 #[serde(untagged)]
 #[ssz(enum_behaviour = "transparent")]
 #[tree_hash(enum_behaviour = "transparent")]
-struct IndexedAttestation<S: ConsensusSpec> {
-    #[serde(with = "quoted_u64_var_list")]
-    #[superstruct(only(Base), partial_getter(rename = "attesting_indices_base"))]
-    attesting_indices: VariableList<u64, S::MaxValidatorsPerCommittee>,
+pub struct IndexedAttestation<S: ConsensusSpec> {
     #[serde(with = "quoted_u64_var_list")]
     #[superstruct(only(Electra), partial_getter(rename = "attesting_indices_electra"))]
     attesting_indices: VariableList<u64, S::MaxValidatorsPerSlot>,
+    #[serde(with = "quoted_u64_var_list")]
+    #[superstruct(only(Base), partial_getter(rename = "attesting_indices_base"))]
+    attesting_indices: VariableList<u64, S::MaxValidatorsPerCommittee>,
     data: AttestationData,
     signature: Signature,
 }
@@ -306,7 +306,7 @@ impl<S: ConsensusSpec> Default for IndexedAttestation<S> {
 }
 
 #[superstruct(
-    variants(Base, Electra),
+    variants(Electra, Base),
     variant_attributes(
         derive(Deserialize, Debug, Encode, TreeHash, Clone,),
         serde(deny_unknown_fields),
@@ -318,10 +318,10 @@ impl<S: ConsensusSpec> Default for IndexedAttestation<S> {
 #[ssz(enum_behaviour = "transparent")]
 #[tree_hash(enum_behaviour = "transparent")]
 pub struct Attestation<S: ConsensusSpec> {
-    #[superstruct(only(Base), partial_getter(rename = "aggregation_bits_base"))]
-    aggregation_bits: BitList<S::MaxValidatorsPerCommittee>,
     #[superstruct(only(Electra), partial_getter(rename = "aggregation_bits_electra"))]
     aggregation_bits: BitList<S::MaxValidatorsPerSlot>,
+    #[superstruct(only(Base), partial_getter(rename = "aggregation_bits_base"))]
+    aggregation_bits: BitList<S::MaxValidatorsPerCommittee>,
     data: AttestationData,
     signature: Signature,
     #[superstruct(only(Electra))]