diff --git a/consensus/types/src/beacon_block_body.rs b/consensus/types/src/beacon_block_body.rs index 0671598f74..d6c6149b4d 100644 --- a/consensus/types/src/beacon_block_body.rs +++ b/consensus/types/src/beacon_block_body.rs @@ -127,14 +127,11 @@ pub struct BeaconBlockBody = FullPay #[superstruct(only(Fulu), partial_getter(rename = "execution_payload_fulu"))] #[serde(flatten)] pub execution_payload: Payload::Fulu, - // execution_payload removed from Gloas, replaced with signed_execution_bid below #[superstruct(only(Capella, Deneb, Electra, Fulu, Gloas))] pub bls_to_execution_changes: VariableList, - // blob_kzg_commitments removed from Gloas, moved to `ExecutionPayloadEnvelope` #[superstruct(only(Deneb, Electra, Fulu))] pub blob_kzg_commitments: KzgCommitments, - // execution_requests removed from Gloas, moved to `ExecutionPayloadEnvelope` #[superstruct(only(Electra, Fulu))] pub execution_requests: ExecutionRequests, #[superstruct(only(Gloas))] diff --git a/consensus/types/src/beacon_state.rs b/consensus/types/src/beacon_state.rs index cb851fb592..17d56e4644 100644 --- a/consensus/types/src/beacon_state.rs +++ b/consensus/types/src/beacon_state.rs @@ -2137,6 +2137,7 @@ impl BeaconState { pub fn is_parent_block_full(&self) -> bool { match self { BeaconState::Base(_) | BeaconState::Altair(_) => false, + // TODO(EIP-7732): check the implications of this when we get to forkchoice modifications BeaconState::Bellatrix(_) | BeaconState::Capella(_) | BeaconState::Deneb(_) diff --git a/consensus/types/src/dumb_macros.rs b/consensus/types/src/dumb_macros.rs index 29bf3fb506..4eae416bb5 100644 --- a/consensus/types/src/dumb_macros.rs +++ b/consensus/types/src/dumb_macros.rs @@ -3,6 +3,7 @@ // - ExecutionPayloadHeader // - FullPayload // - BlindedPayload +// TODO(EIP-7732): get rid of this whole file and panics once the engine_api is refactored for ePBS #[macro_export] macro_rules! map_execution_payload_into_full_payload { diff --git a/consensus/types/src/execution_bid.rs b/consensus/types/src/execution_bid.rs index 80f9d7684a..a3672daeac 100644 --- a/consensus/types/src/execution_bid.rs +++ b/consensus/types/src/execution_bid.rs @@ -11,7 +11,8 @@ use tree_hash_derive::TreeHash; #[cfg_attr(feature = "arbitrary", derive(arbitrary::Arbitrary))] #[derivative(PartialEq, Hash)] #[context_deserialize(ForkName)] -// This is what Potuz' spec calls an `ExecutionPayload` even though it's clearly a bid. +// This is what Potuz' spec calls an `ExecutionPayloadHeader` even though it's clearly a bid. +// https://github.com/ethereum/consensus-specs/blob/bba2c7be148d6d921d2ca5e1cc528f5daaf456d9/specs/gloas/beacon-chain.md#executionpayloadheader pub struct ExecutionBid { pub parent_block_hash: ExecutionBlockHash, pub parent_block_root: Hash256, diff --git a/consensus/types/src/signed_execution_bid.rs b/consensus/types/src/signed_execution_bid.rs index 4538b9c256..4be520565a 100644 --- a/consensus/types/src/signed_execution_bid.rs +++ b/consensus/types/src/signed_execution_bid.rs @@ -12,6 +12,7 @@ use tree_hash_derive::TreeHash; #[cfg_attr(feature = "arbitrary", derive(arbitrary::Arbitrary))] #[derivative(PartialEq, Hash)] #[context_deserialize(ForkName)] +// https://github.com/ethereum/consensus-specs/blob/bba2c7be148d6d921d2ca5e1cc528f5daaf456d9/specs/gloas/beacon-chain.md#signedexecutionpayloadheader pub struct SignedExecutionBid { pub message: ExecutionBid, pub signature: Signature,