Merge remote-tracking branch 'origin/unstable' into gloas-envelope-processing

beacon_node/http_api/src/beacon/states.rs

@@ -12,9 +12,7 @@ use eth2::types::{
     ValidatorsRequestBody,
 };
 use std::sync::Arc;
-use types::{
-    AttestationShufflingId, CommitteeCache, Error as BeaconStateError, EthSpec, RelativeEpoch,
-};
+use types::{AttestationShufflingId, BeaconStateError, CommitteeCache, EthSpec, RelativeEpoch};
 use warp::filters::BoxedFilter;
 use warp::{Filter, Reply};
 use warp_utils::query::multi_key_query;

beacon_node/http_api/src/block_rewards.rs

@@ -5,8 +5,8 @@ use state_processing::BlockReplayer;
 use std::num::NonZeroUsize;
 use std::sync::Arc;
 use tracing::{debug, warn};
-use types::beacon_block::BlindedBeaconBlock;
-use types::non_zero_usize::new_non_zero_usize;
+use types::block::BlindedBeaconBlock;
+use types::new_non_zero_usize;
 use warp_utils::reject::{beacon_state_error, custom_bad_request, unhandled_error};
 
 const STATE_CACHE_SIZE: NonZeroUsize = new_non_zero_usize(2);

beacon_node/http_api/src/produce_block.rs

@@ -16,7 +16,7 @@ use lighthouse_tracing::{SPAN_PRODUCE_BLOCK_V2, SPAN_PRODUCE_BLOCK_V3};
 use ssz::Encode;
 use std::sync::Arc;
 use tracing::instrument;
-use types::{payload::BlockProductionVersion, *};
+use types::{execution::BlockProductionVersion, *};
 use warp::{
     Reply,
     hyper::{Body, Response},

beacon_node/http_api/src/sync_committees.rs

@@ -17,8 +17,8 @@ use std::collections::HashMap;
 use tokio::sync::mpsc::UnboundedSender;
 use tracing::{debug, error, warn};
 use types::{
-    BeaconStateError, Epoch, EthSpec, SignedContributionAndProof, SyncCommitteeMessage, SyncDuty,
-    SyncSubnetId, slot_data::SlotData,
+    BeaconStateError, Epoch, EthSpec, SignedContributionAndProof, SlotData, SyncCommitteeMessage,
+    SyncDuty, SyncSubnetId,
 };
 
 /// The struct that is returned to the requesting HTTP client.