Fix remaining compilation errors

eth2_libp2p needed changes as expected.

The changes on this branch are making some tests fail.
They are failing in 5 crates as opposed to 1 on electra-alpha3-containers.
That is most likely due to changed definitions of hash_tree_root and BlobSidecar.
There is a branch of consensus-spec-tests for EIP-7688, but it may be based on a different version.

The oversight with proof lengths should be fixed.
The cause of the crash while attesting is still unknown.
It may be specific to Kurtosis.
The changes made on this branch should not have affected anything until Electra (now Deneb).
The built-in-validator test case only fails in slot 40 (Electra), which is unchanged from electra-alpha3-containers.

http_api/src/standard.rs

@@ -58,14 +58,11 @@ use types::{
     },
     capella::containers::{SignedBlsToExecutionChange, Withdrawal},
     combined::{
-        Attestation, AttesterSlashing, BeaconBlock, BeaconState, SignedAggregateAndProof,
-        SignedBeaconBlock, SignedBlindedBeaconBlock,
+        Attestation, AttesterSlashing, BeaconBlock, BeaconState, BlobSidecar,
+        SignedAggregateAndProof, SignedBeaconBlock, SignedBlindedBeaconBlock,
     },
     config::Config as ChainConfig,
-    deneb::{
-        containers::{BlobIdentifier, BlobSidecar},
-        primitives::BlobIndex,
-    },
+    deneb::{containers::BlobIdentifier, primitives::BlobIndex},
     nonstandard::{
         BlockRewards, Phase, RelativeEpoch, ValidationOutcome, WithBlobsAndMev, WithStatus,
         WEI_IN_GWEI,

p2p/src/messages.rs

@@ -14,8 +14,10 @@ use operation_pools::PoolRejectionReason;
 use serde::Serialize;
 use types::{
     altair::containers::{SignedContributionAndProof, SyncCommitteeMessage},
-    combined::{Attestation, AttesterSlashing, SignedAggregateAndProof, SignedBeaconBlock},
-    deneb::containers::{BlobIdentifier, BlobSidecar},
+    combined::{
+        Attestation, AttesterSlashing, BlobSidecar, SignedAggregateAndProof, SignedBeaconBlock,
+    },
+    deneb::containers::BlobIdentifier,
     nonstandard::Phase,
     phase0::{
         containers::{ProposerSlashing, SignedVoluntaryExit},

p2p/src/network.rs

@@ -41,8 +41,10 @@ use thiserror::Error;
 use types::{
     altair::containers::{SignedContributionAndProof, SyncCommitteeMessage},
     capella::containers::SignedBlsToExecutionChange,
-    combined::{Attestation, AttesterSlashing, SignedAggregateAndProof, SignedBeaconBlock},
-    deneb::containers::{BlobIdentifier, BlobSidecar},
+    combined::{
+        Attestation, AttesterSlashing, BlobSidecar, SignedAggregateAndProof, SignedBeaconBlock,
+    },
+    deneb::containers::BlobIdentifier,
     nonstandard::{Phase, WithStatus},
     phase0::{
         consts::{FAR_FUTURE_EPOCH, GENESIS_EPOCH},
@@ -535,7 +537,7 @@ impl<P: Preset> Network<P> {
     }
 
     fn publish_blob_sidecar(&self, blob_sidecar: Arc<BlobSidecar<P>>) {
-        let subnet_id = misc::compute_subnet_for_blob_sidecar(blob_sidecar.index);
+        let subnet_id = misc::compute_subnet_for_blob_sidecar(blob_sidecar.index());
         let blob_identifier: BlobIdentifier = blob_sidecar.as_ref().into();
 
         self.log(
@@ -1269,12 +1271,12 @@ impl<P: Preset> Network<P> {
                     format_args!(
                         "received BlobsByRange response chunk \
                          (request_id: {request_id}, peer_id: {peer_id}, blob_sidecar.slot: {:?})",
-                        blob_sidecar.signed_block_header.message.slot,
+                        blob_sidecar.signed_block_header().message.slot,
                     ),
                 );
 
                 let blob_identifier = blob_sidecar.as_ref().into();
-                let blob_sidecar_slot = blob_sidecar.signed_block_header.message.slot;
+                let blob_sidecar_slot = blob_sidecar.signed_block_header().message.slot;
 
                 if self.register_new_received_blob_sidecar(blob_identifier, blob_sidecar_slot) {
                     let block_seen = self
@@ -1299,12 +1301,12 @@ impl<P: Preset> Network<P> {
                     format_args!(
                         "received BlobsByRoot response chunk \
                          (request_id: {request_id}, peer_id: {peer_id}, blob_sidecar.slot: {:?})",
-                        blob_sidecar.signed_block_header.message.slot,
+                        blob_sidecar.signed_block_header().message.slot,
                     ),
                 );
 
                 let blob_identifier = blob_sidecar.as_ref().into();
-                let blob_sidecar_slot = blob_sidecar.signed_block_header.message.slot;
+                let blob_sidecar_slot = blob_sidecar.signed_block_header().message.slot;
 
                 self.log_with_feature(format_args!(
                     "received blob from RPC (blob_id: {blob_identifier:?}, slot: {blob_sidecar_slot}, peer_id: {peer_id}, request_id: {request_id})",

types/src/combined.rs

@@ -1463,7 +1463,8 @@ impl<P: Preset> LightClientOptimisticUpdate<P> {
     }
 }
 
-#[derive(Debug, From)]
+#[derive(PartialEq, Eq, Debug, From, Deserialize, Serialize)]
+#[serde(bound = "", untagged)]
 pub enum BlobSidecar<P: Preset> {
     Deneb(DenebBlobSidecar<P>),
     Electra(ElectraBlobSidecar<P>),