merge queue: embarking unstable (acc746d) and [#8665 + #8666] together

beacon_node/beacon_chain/src/beacon_chain.rs

@@ -132,8 +132,7 @@ use task_executor::{RayonPoolType, ShutdownReason, TaskExecutor};
 use tokio_stream::Stream;
 use tracing::{Span, debug, debug_span, error, info, info_span, instrument, trace, warn};
 use tree_hash::TreeHash;
-use types::blob_sidecar::FixedBlobSidecarList;
-use types::data_column_sidecar::ColumnIndex;
+use types::data::{ColumnIndex, FixedBlobSidecarList};
 use types::execution::BlockProductionVersion;
 use types::*;
 

beacon_node/beacon_chain/src/blob_verification.rs

@@ -15,7 +15,7 @@ use ssz_derive::{Decode, Encode};
 use std::time::Duration;
 use tracing::{debug, instrument};
 use tree_hash::TreeHash;
-use types::blob_sidecar::BlobIdentifier;
+use types::data::BlobIdentifier;
 use types::{
     BeaconStateError, BlobSidecar, Epoch, EthSpec, Hash256, SignedBeaconBlockHeader, Slot,
 };

beacon_node/beacon_chain/src/block_verification.rs

@@ -98,8 +98,7 @@ use tracing::{Instrument, Span, debug, debug_span, error, info_span, instrument}
 use types::{
     BeaconBlockRef, BeaconState, BeaconStateError, BlobsList, ChainSpec, DataColumnSidecarList,
     Epoch, EthSpec, ExecutionBlockHash, FullPayload, Hash256, InconsistentFork, KzgProofs,
-    RelativeEpoch, SignedBeaconBlock, SignedBeaconBlockHeader, Slot,
-    data_column_sidecar::DataColumnSidecarError,
+    RelativeEpoch, SignedBeaconBlock, SignedBeaconBlockHeader, Slot, data::DataColumnSidecarError,
 };
 
 pub const POS_PANDA_BANNER: &str = r#"

beacon_node/beacon_chain/src/block_verification_types.rs

@@ -7,7 +7,7 @@ use ssz_types::VariableList;
 use state_processing::ConsensusContext;
 use std::fmt::{Debug, Formatter};
 use std::sync::Arc;
-use types::blob_sidecar::BlobIdentifier;
+use types::data::BlobIdentifier;
 use types::{
     BeaconBlockRef, BeaconState, BlindedPayload, BlobSidecarList, Epoch, EthSpec, Hash256,
     SignedBeaconBlock, SignedBeaconBlockHeader, Slot,

beacon_node/beacon_chain/src/builder.rs

@@ -42,7 +42,7 @@ use std::time::Duration;
 use store::{Error as StoreError, HotColdDB, ItemStore, KeyValueStoreOp};
 use task_executor::{ShutdownReason, TaskExecutor};
 use tracing::{debug, error, info};
-use types::data_column_custody_group::CustodyIndex;
+use types::data::CustodyIndex;
 use types::{
     BeaconBlock, BeaconState, BlobSidecarList, ChainSpec, ColumnIndex, DataColumnSidecarList,
     Epoch, EthSpec, Hash256, SignedBeaconBlock, Slot,

beacon_node/beacon_chain/src/data_availability_checker.rs

@@ -19,7 +19,7 @@ use std::sync::Arc;
 use std::time::Duration;
 use task_executor::TaskExecutor;
 use tracing::{debug, error, instrument};
-use types::blob_sidecar::{BlobIdentifier, BlobSidecar, FixedBlobSidecarList};
+use types::data::{BlobIdentifier, BlobSidecar, FixedBlobSidecarList};
 use types::{
     BlobSidecarList, BlockImportSource, ChainSpec, DataColumnSidecar, DataColumnSidecarList, Epoch,
     EthSpec, Hash256, SignedBeaconBlock, Slot,
@@ -876,7 +876,7 @@ mod test {
     use std::sync::Arc;
     use std::time::Duration;
     use store::HotColdDB;
-    use types::data_column_sidecar::DataColumn;
+    use types::data::DataColumn;
     use types::{ChainSpec, ColumnIndex, EthSpec, ForkName, MainnetEthSpec, Slot};
 
     type E = MainnetEthSpec;

beacon_node/beacon_chain/src/data_availability_checker/overflow_lru_cache.rs

@@ -18,7 +18,7 @@ use std::num::NonZeroUsize;
 use std::sync::Arc;
 use tracing::{Span, debug, debug_span};
 use types::beacon_block_body::KzgCommitments;
-use types::blob_sidecar::BlobIdentifier;
+use types::data::BlobIdentifier;
 use types::{
     BlobSidecar, BlockImportSource, ChainSpec, ColumnIndex, DataColumnSidecar,
     DataColumnSidecarList, Epoch, EthSpec, Hash256, SignedBeaconBlock,

beacon_node/beacon_chain/src/data_column_verification.rs

@@ -15,7 +15,7 @@ use std::iter;
 use std::marker::PhantomData;
 use std::sync::Arc;
 use tracing::{debug, instrument};
-use types::data_column_sidecar::ColumnIndex;
+use types::data::ColumnIndex;
 use types::{
     BeaconStateError, ChainSpec, DataColumnSidecar, DataColumnSubnetId, EthSpec, Hash256,
     SignedBeaconBlockHeader, Slot,

beacon_node/beacon_chain/src/fetch_blobs/mod.rs

@@ -33,8 +33,7 @@ use ssz_types::FixedVector;
 use state_processing::per_block_processing::deneb::kzg_commitment_to_versioned_hash;
 use std::sync::Arc;
 use tracing::{Span, debug, instrument, warn};
-use types::blob_sidecar::BlobSidecarError;
-use types::data_column_sidecar::DataColumnSidecarError;
+use types::data::{BlobSidecarError, DataColumnSidecarError};
 use types::{
     BeaconStateError, Blob, BlobSidecar, ColumnIndex, EthSpec, FullPayload, Hash256, KzgProofs,
     SignedBeaconBlock, SignedBeaconBlockHeader, VersionedHash,

beacon_node/beacon_chain/src/kzg_utils.rs

@@ -7,7 +7,7 @@ use ssz_types::{FixedVector, VariableList};
 use std::sync::Arc;
 use tracing::instrument;
 use types::beacon_block_body::KzgCommitments;
-use types::data_column_sidecar::{Cell, DataColumn, DataColumnSidecarError};
+use types::data::{Cell, DataColumn, DataColumnSidecarError};
 use types::{
     Blob, BlobSidecar, BlobSidecarList, ChainSpec, DataColumnSidecar, DataColumnSidecarList,
     EthSpec, Hash256, KzgCommitment, KzgProof, SignedBeaconBlock, SignedBeaconBlockHeader,

beacon_node/beacon_chain/src/test_utils.rs

@@ -67,9 +67,9 @@ use task_executor::TaskExecutor;
 use task_executor::{ShutdownReason, test_utils::TestRuntime};
 use tree_hash::TreeHash;
 use typenum::U4294967296;
-use types::data_column_custody_group::CustodyIndex;
+use types::attestation::IndexedAttestationBase;
+use types::data::CustodyIndex;
 use types::execution::BlockProductionVersion;
-use types::indexed_attestation::IndexedAttestationBase;
 use types::test_utils::TestRandom;
 pub use types::test_utils::generate_deterministic_keypairs;
 use types::*;

beacon_node/beacon_chain/tests/attestation_verification.rs

@@ -24,8 +24,7 @@ use typenum::Unsigned;
 use types::{
     Address, Attestation, AttestationRef, ChainSpec, Epoch, EthSpec, ForkName, Hash256,
     MainnetEthSpec, SelectionProof, SignedAggregateAndProof, SingleAttestation, Slot, SubnetId,
-    signed_aggregate_and_proof::SignedAggregateAndProofRefMut,
-    test_utils::generate_deterministic_keypair,
+    attestation::SignedAggregateAndProofRefMut, test_utils::generate_deterministic_keypair,
 };
 
 pub type E = MainnetEthSpec;

beacon_node/beacon_chain/tests/blob_verification.rs

@@ -10,7 +10,7 @@ use beacon_chain::{
 use bls::{Keypair, Signature};
 use logging::create_test_tracing_subscriber;
 use std::sync::{Arc, LazyLock};
-use types::{blob_sidecar::FixedBlobSidecarList, *};
+use types::{data::FixedBlobSidecarList, *};
 
 type E = MainnetEthSpec;
 

beacon_node/beacon_chain/tests/events.rs

@@ -7,7 +7,7 @@ use eth2::types::{EventKind, SseBlobSidecar, SseDataColumnSidecar};
 use rand::SeedableRng;
 use rand::rngs::StdRng;
 use std::sync::Arc;
-use types::blob_sidecar::FixedBlobSidecarList;
+use types::data::FixedBlobSidecarList;
 use types::test_utils::TestRandom;
 use types::{BlobSidecar, DataColumnSidecar, EthSpec, MinimalEthSpec, Slot};
 

beacon_node/client/src/builder.rs

@@ -43,7 +43,7 @@ use std::time::{SystemTime, UNIX_EPOCH};
 use store::database::interface::BeaconNodeBackend;
 use timer::spawn_timer;
 use tracing::{debug, info, instrument, warn};
-use types::data_column_custody_group::compute_ordered_custody_column_indices;
+use types::data::compute_ordered_custody_column_indices;
 use types::{
     BeaconState, BlobSidecarList, ChainSpec, EthSpec, ExecutionBlockHash, Hash256,
     SignedBeaconBlock, test_utils::generate_deterministic_keypairs,

beacon_node/execution_layer/src/engine_api/json_structures.rs

@@ -6,10 +6,8 @@ use ssz_types::{FixedVector, VariableList, typenum::Unsigned};
 use strum::EnumString;
 use superstruct::superstruct;
 use types::beacon_block_body::KzgCommitments;
-use types::blob_sidecar::BlobsList;
-use types::execution_requests::{
-    ConsolidationRequests, DepositRequests, RequestType, WithdrawalRequests,
-};
+use types::data::BlobsList;
+use types::execution::{ConsolidationRequests, DepositRequests, RequestType, WithdrawalRequests};
 use types::{Blob, KzgProof};
 
 #[derive(Debug, PartialEq, Serialize, Deserialize)]

beacon_node/lighthouse_network/src/discovery/subnet_predicate.rs

@@ -4,7 +4,7 @@ use crate::types::{EnrAttestationBitfield, EnrSyncCommitteeBitfield};
 use std::ops::Deref;
 use tracing::trace;
 use types::ChainSpec;
-use types::data_column_custody_group::compute_subnets_for_node;
+use types::data::compute_subnets_for_node;
 
 /// Returns the predicate for a given subnet.
 pub fn subnet_predicate<E>(

beacon_node/lighthouse_network/src/peer_manager/mod.rs

@@ -33,9 +33,7 @@ pub use peerdb::sync_status::{SyncInfo, SyncStatus};
 use std::collections::{HashMap, HashSet, hash_map::Entry};
 use std::net::IpAddr;
 use strum::IntoEnumIterator;
-use types::data_column_custody_group::{
-    CustodyIndex, compute_subnets_from_custody_group, get_custody_groups,
-};
+use types::data::{CustodyIndex, compute_subnets_from_custody_group, get_custody_groups};
 
 /// Unified peer subnet information structure for pruning logic.
 struct PeerSubnetInfo<E: EthSpec> {

beacon_node/lighthouse_network/src/peer_manager/peerdb.rs

@@ -15,7 +15,7 @@ use std::{
 };
 use sync_status::SyncStatus;
 use tracing::{debug, error, trace, warn};
-use types::data_column_custody_group::compute_subnets_for_node;
+use types::data::compute_subnets_for_node;
 use types::{ChainSpec, DataColumnSubnetId, Epoch, EthSpec, Hash256, Slot};
 
 pub mod client;

beacon_node/lighthouse_network/src/rpc/codec.rs

@@ -913,7 +913,8 @@ mod tests {
     use types::{
         BeaconBlock, BeaconBlockAltair, BeaconBlockBase, BeaconBlockBellatrix, BeaconBlockHeader,
         DataColumnsByRootIdentifier, EmptyBlock, Epoch, FullPayload, KzgCommitment, KzgProof,
-        SignedBeaconBlockHeader, Slot, blob_sidecar::BlobIdentifier, data_column_sidecar::Cell,
+        SignedBeaconBlockHeader, Slot,
+        data::{BlobIdentifier, Cell},
     };
 
     type Spec = types::MainnetEthSpec;

beacon_node/lighthouse_network/src/rpc/methods.rs

@@ -12,13 +12,12 @@ use std::ops::Deref;
 use std::sync::Arc;
 use strum::IntoStaticStr;
 use superstruct::superstruct;
-use types::blob_sidecar::BlobIdentifier;
+use types::data::BlobIdentifier;
 use types::light_client_update::MAX_REQUEST_LIGHT_CLIENT_UPDATES;
 use types::{
     ChainSpec, ColumnIndex, DataColumnSidecar, DataColumnsByRootIdentifier, Epoch, EthSpec,
     ForkContext, Hash256, LightClientBootstrap, LightClientFinalityUpdate,
-    LightClientOptimisticUpdate, LightClientUpdate, SignedBeaconBlock, Slot,
-    blob_sidecar::BlobSidecar,
+    LightClientOptimisticUpdate, LightClientUpdate, SignedBeaconBlock, Slot, data::BlobSidecar,
 };
 
 /// Maximum length of error message.

beacon_node/lighthouse_network/src/types/globals.rs

@@ -10,7 +10,7 @@ use parking_lot::RwLock;
 use std::collections::HashSet;
 use std::sync::Arc;
 use tracing::{debug, error};
-use types::data_column_custody_group::{compute_subnets_from_custody_group, get_custody_groups};
+use types::data::{compute_subnets_from_custody_group, get_custody_groups};
 use types::{ChainSpec, ColumnIndex, DataColumnSubnetId, EthSpec};
 
 pub struct NetworkGlobals<E: EthSpec> {

beacon_node/network/src/network_beacon_processor/mod.rs

@@ -31,7 +31,7 @@ use tracing::{debug, error, instrument, trace, warn};
 use types::*;
 
 pub use sync_methods::ChainSegmentProcessId;
-use types::blob_sidecar::FixedBlobSidecarList;
+use types::data::FixedBlobSidecarList;
 
 pub type Error<T> = TrySendError<BeaconWorkEvent<T>>;
 

beacon_node/network/src/network_beacon_processor/rpc_methods.rs

@@ -23,7 +23,7 @@ use std::collections::{HashMap, HashSet, hash_map::Entry};
 use std::sync::Arc;
 use tokio_stream::StreamExt;
 use tracing::{Span, debug, error, field, instrument, warn};
-use types::blob_sidecar::BlobIdentifier;
+use types::data::BlobIdentifier;
 use types::{ColumnIndex, Epoch, EthSpec, Hash256, Slot};
 
 impl<T: BeaconChainTypes> NetworkBeaconProcessor<T> {

beacon_node/network/src/network_beacon_processor/sync_methods.rs

@@ -32,7 +32,7 @@ use std::time::Duration;
 use store::KzgCommitment;
 use tracing::{debug, debug_span, error, info, instrument, warn};
 use types::beacon_block_body::format_kzg_commitments;
-use types::blob_sidecar::FixedBlobSidecarList;
+use types::data::FixedBlobSidecarList;
 use types::{BlockImportSource, DataColumnSidecarList, Epoch, Hash256};
 
 /// Id associated to a batch processing request, either a sync batch or a parent lookup.

beacon_node/network/src/network_beacon_processor/tests.rs

@@ -39,7 +39,7 @@ use std::iter::Iterator;
 use std::sync::Arc;
 use std::time::Duration;
 use tokio::sync::mpsc;
-use types::blob_sidecar::{BlobIdentifier, FixedBlobSidecarList};
+use types::data::{BlobIdentifier, FixedBlobSidecarList};
 use types::{
     AttesterSlashing, BlobSidecar, BlobSidecarList, ChainSpec, DataColumnSidecarList,
     DataColumnSubnetId, Epoch, EthSpec, Hash256, MainnetEthSpec, ProposerSlashing,

beacon_node/network/src/sync/block_lookups/common.rs

@@ -11,7 +11,7 @@ use lighthouse_network::service::api_types::Id;
 use parking_lot::RwLock;
 use std::collections::HashSet;
 use std::sync::Arc;
-use types::blob_sidecar::FixedBlobSidecarList;
+use types::data::FixedBlobSidecarList;
 use types::{DataColumnSidecarList, SignedBeaconBlock};
 
 use super::SingleLookupId;

beacon_node/network/src/sync/block_lookups/single_block_lookup.rs

@@ -16,7 +16,7 @@ use std::time::{Duration, Instant};
 use store::Hash256;
 use strum::IntoStaticStr;
 use tracing::{Span, debug_span};
-use types::blob_sidecar::FixedBlobSidecarList;
+use types::data::FixedBlobSidecarList;
 use types::{DataColumnSidecarList, EthSpec, SignedBeaconBlock, Slot};
 
 // Dedicated enum for LookupResult to force its usage

beacon_node/network/src/sync/network_context.rs

@@ -49,7 +49,7 @@ use std::time::Duration;
 use task_executor::TaskExecutor;
 use tokio::sync::mpsc;
 use tracing::{Span, debug, debug_span, error, warn};
-use types::blob_sidecar::FixedBlobSidecarList;
+use types::data::FixedBlobSidecarList;
 use types::{
     BlobSidecar, BlockImportSource, ColumnIndex, DataColumnSidecar, DataColumnSidecarList, EthSpec,
     ForkContext, Hash256, SignedBeaconBlock, Slot,

beacon_node/network/src/sync/network_context/custody.rs

@@ -13,7 +13,7 @@ use std::hash::{BuildHasher, RandomState};
 use std::time::{Duration, Instant};
 use std::{collections::HashMap, marker::PhantomData, sync::Arc};
 use tracing::{Span, debug, debug_span, warn};
-use types::{DataColumnSidecar, Hash256, data_column_sidecar::ColumnIndex};
+use types::{DataColumnSidecar, Hash256, data::ColumnIndex};
 use types::{DataColumnSidecarList, EthSpec};
 
 use super::{LookupRequestResult, PeerGroup, RpcResponseResult, SyncNetworkContext};

beacon_node/network/src/sync/network_context/requests/blobs_by_root.rs

@@ -1,6 +1,6 @@
 use lighthouse_network::rpc::methods::BlobsByRootRequest;
 use std::sync::Arc;
-use types::{BlobSidecar, EthSpec, ForkContext, Hash256, blob_sidecar::BlobIdentifier};
+use types::{BlobSidecar, EthSpec, ForkContext, Hash256, data::BlobIdentifier};
 
 use super::{ActiveRequestItems, LookupVerifyError};
 

beacon_node/network/src/sync/tests/lookups.rs

@@ -43,7 +43,7 @@ use tracing::info;
 use types::{
     BeaconState, BeaconStateBase, BlobSidecar, BlockImportSource, DataColumnSidecar, EthSpec,
     ForkContext, ForkName, Hash256, MinimalEthSpec as E, SignedBeaconBlock, Slot,
-    data_column_sidecar::ColumnIndex,
+    data::ColumnIndex,
     test_utils::{SeedableRng, TestRandom, XorShiftRng},
 };
 

beacon_node/store/src/hot_cold_store.rs

@@ -40,7 +40,7 @@ use std::sync::Arc;
 use std::time::Duration;
 use tracing::{debug, error, info, instrument, warn};
 use typenum::Unsigned;
-use types::data_column_sidecar::{ColumnIndex, DataColumnSidecar, DataColumnSidecarList};
+use types::data::{ColumnIndex, DataColumnSidecar, DataColumnSidecarList};
 use types::*;
 use zstd::{Decoder, Encoder};
 

consensus/state_processing/src/per_epoch_processing/altair/participation_flag_updates.rs

@@ -1,8 +1,8 @@
 use crate::EpochProcessingError;
 use milhouse::List;
+use types::attestation::ParticipationFlags;
 use types::beacon_state::BeaconState;
 use types::eth_spec::EthSpec;
-use types::participation_flags::ParticipationFlags;
 
 pub fn process_participation_flag_updates<E: EthSpec>(
     state: &mut BeaconState<E>,

consensus/types/src/block/beacon_block_body.rs

@@ -13,10 +13,11 @@ use test_random_derive::TestRandom;
 use tree_hash::{BYTES_PER_CHUNK, TreeHash};
 use tree_hash_derive::TreeHash;
 
-use crate::payload_attestation::PayloadAttestation;
 use crate::{
     SignedExecutionPayloadBid,
-    attestation::{AttestationBase, AttestationElectra, AttestationRef, AttestationRefMut},
+    attestation::{
+        AttestationBase, AttestationElectra, AttestationRef, AttestationRefMut, PayloadAttestation,
+    },
     core::{EthSpec, Graffiti, Hash256},
     deposit::Deposit,
     execution::{

consensus/types/src/core/chain_spec.rs

@@ -14,10 +14,9 @@ use tree_hash::TreeHash;
 use crate::{
     core::{
         APPLICATION_DOMAIN_BUILDER, Address, ApplicationDomain, EnrForkId, Epoch, EthSpec,
-        EthSpecId, Hash256, MainnetEthSpec, Slot, Uint256,
+        EthSpecId, ExecutionBlockHash, Hash256, MainnetEthSpec, Slot, Uint256,
     },
     data::{BlobIdentifier, DataColumnSubnetId, DataColumnsByRootIdentifier},
-    execution::ExecutionBlockHash,
     fork::{Fork, ForkData, ForkName},
 };
 

consensus/types/src/core/mod.rs

@@ -5,6 +5,7 @@ mod chain_spec;
 mod config_and_preset;
 mod enr_fork_id;
 mod eth_spec;
+mod execution_block_hash;
 mod graffiti;
 mod non_zero_usize;
 mod preset;
@@ -25,6 +26,7 @@ pub use config_and_preset::{
 };
 pub use enr_fork_id::EnrForkId;
 pub use eth_spec::{EthSpec, EthSpecId, GNOSIS, GnosisEthSpec, MainnetEthSpec, MinimalEthSpec};
+pub use execution_block_hash::ExecutionBlockHash;
 pub use graffiti::{GRAFFITI_BYTES_LEN, Graffiti, GraffitiString};
 pub use non_zero_usize::new_non_zero_usize;
 pub use preset::{

consensus/types/src/execution/execution_payload.rs

@@ -10,8 +10,7 @@ use test_random_derive::TestRandom;
 use tree_hash_derive::TreeHash;
 
 use crate::{
-    core::{Address, EthSpec, Hash256},
-    execution::ExecutionBlockHash,
+    core::{Address, EthSpec, ExecutionBlockHash, Hash256},
     fork::{ForkName, ForkVersionDecode},
     state::BeaconStateError,
     test_utils::TestRandom,