updates per pr review second wave

beacon_node/beacon_chain/src/errors.rs

@@ -292,7 +292,6 @@ pub enum BlockProductionError {
     MissingBlobs,
     MissingSyncAggregate,
     MissingExecutionPayload,
-    MissingExecutionBid,
     MissingKzgCommitment(String),
     TokioJoin(JoinError),
     BeaconChain(Box<BeaconChainError>),

consensus/state_processing/src/upgrade/gloas.rs

@@ -87,7 +87,7 @@ pub fn upgrade_state_to_gloas<E: EthSpec>(
         execution_payload_availability: BitVector::default(), // All bits set to false initially
         builder_pending_payments: Vector::new(vec![
             BuilderPendingPayment::default();
-            2 * E::slots_per_epoch() as usize
+            E::builder_pending_withdrawals_limit()
         ])?,
         builder_pending_withdrawals: List::default(), // Empty list initially,
         latest_block_hash: pre.latest_execution_payload_header.block_hash,

consensus/types/src/beacon_block.rs

@@ -684,6 +684,7 @@ impl<E: EthSpec, Payload: AbstractExecPayload<E>> EmptyBlock for BeaconBlockGloa
 /// TODO(EIP-7732) Mark's branch had the following implementation but not sure if it's needed so will just add header below for reference
 // impl<E: EthSpec, Payload: AbstractExecPayload<E>> BeaconBlockEIP7732<E, Payload> {
 
+// TODO(EIP-7732) Look into whether we can remove this in the future since no blinded blocks post-gloas
 impl<E: EthSpec> From<BeaconBlockGloas<E, BlindedPayload<E>>>
     for BeaconBlockGloas<E, FullPayload<E>>
 {

consensus/types/src/beacon_block_body.rs

@@ -170,7 +170,6 @@ impl<'a, E: EthSpec, Payload: AbstractExecPayload<E>> BeaconBlockBodyRef<'a, E,
             Self::Deneb(body) => Ok(Payload::Ref::from(&body.execution_payload)),
             Self::Electra(body) => Ok(Payload::Ref::from(&body.execution_payload)),
             Self::Fulu(body) => Ok(Payload::Ref::from(&body.execution_payload)),
-            // TODO(eip-7732): idk if this is right there's no more execution payload
             Self::Gloas(_) => Err(Error::IncorrectStateVariant),
         }
     }
@@ -229,6 +228,7 @@ impl<'a, E: EthSpec, Payload: AbstractExecPayload<E>> BeaconBlockBodyRef<'a, E,
 
     /// Produces the proof of inclusion for a `KzgCommitment` in `self.blob_kzg_commitments`
     /// at `index` using an existing proof for the `blob_kzg_commitments` field.
+    /// TODO(EIP7732) Investigate calling functions since this will no longer work for glas since no block_kzg_commitments in the body anymore
     pub fn complete_kzg_commitment_merkle_proof(
         &self,
         index: usize,
@@ -240,7 +240,6 @@ impl<'a, E: EthSpec, Payload: AbstractExecPayload<E>> BeaconBlockBodyRef<'a, E,
             | Self::Bellatrix(_)
             | Self::Capella(_)
             | Self::Gloas(_) => Err(Error::IncorrectStateVariant),
-            // TODO(eip-7732): Mark's impl had the Self::EIP-7732 variant below, but I think it should produce error instead since no self.blob_kzg_commitments in BeaconState for gloas
             Self::Deneb(_) | Self::Electra(_) | Self::Fulu(_) => {
                 // We compute the branches by generating 2 merkle trees:
                 // 1. Merkle tree for the `blob_kzg_commitments` List object
@@ -521,6 +520,7 @@ impl<E: EthSpec> From<BeaconBlockBodyAltair<E, BlindedPayload<E>>>
 }
 
 // Post-Fulu block bodies without payloads can be converted into block bodies with payloads
+// TODO(EIP-7732) Look into whether we can remove this in the future since no blinded blocks post-gloas
 impl<E: EthSpec> From<BeaconBlockBodyGloas<E, BlindedPayload<E>>>
     for BeaconBlockBodyGloas<E, FullPayload<E>>
 {

consensus/types/src/beacon_state.rs

@@ -1091,7 +1091,7 @@ impl<E: EthSpec> BeaconState<E> {
             BeaconState::Fulu(state) => Ok(ExecutionPayloadHeaderRef::Fulu(
                 &state.latest_execution_payload_header,
             )),
-            // FIXME(EIP-7732): this is only to make the code compile, needs to be written later
+            // TODO(EIP-7732): investigate calling functions
             BeaconState::Gloas(_) => Err(Error::IncorrectStateVariant),
         }
     }
@@ -1116,7 +1116,7 @@ impl<E: EthSpec> BeaconState<E> {
             BeaconState::Fulu(state) => Ok(ExecutionPayloadHeaderRefMut::Fulu(
                 &mut state.latest_execution_payload_header,
             )),
-            // FIXME(EIP-7732): this is only to make the code compile, needs to be written later
+            // TODO(EIP-7732): investigate calling functions
             BeaconState::Gloas(_) => Err(Error::IncorrectStateVariant),
         }
     }
@@ -1854,7 +1854,6 @@ impl<E: EthSpec> BeaconState<E> {
             | BeaconState::Altair(_)
             | BeaconState::Bellatrix(_)
             | BeaconState::Capella(_) => self.get_validator_churn_limit(spec)?,
-            // FIXME(EIP-7732): check this
             BeaconState::Deneb(_)
             | BeaconState::Electra(_)
             | BeaconState::Fulu(_)

consensus/types/src/execution_payload_header.rs

@@ -512,7 +512,6 @@ impl<'de, E: EthSpec> ContextDeserialize<'de, ForkName> for ExecutionPayloadHead
                 Self::Fulu(Deserialize::deserialize(deserializer).map_err(convert_err)?)
             }
 
-            // FIXME(EIP7732): Check this
             ForkName::Base | ForkName::Altair | ForkName::Gloas => {
                 return Err(serde::de::Error::custom(format!(
                     "ExecutionPayloadHeader failed to deserialize: unsupported fork '{}'",

consensus/types/src/signed_beacon_block.rs

@@ -649,6 +649,7 @@ impl<E: EthSpec> SignedBeaconBlockFulu<E, BlindedPayload<E>> {
 }
 
 // We can convert gloas blocks without payloads into blocks "with" payloads.
+// TODO(EIP-7732) Look into whether we can remove this in the future since no blinded blocks post-gloas
 impl<E: EthSpec> From<SignedBeaconBlockGloas<E, BlindedPayload<E>>>
     for SignedBeaconBlockGloas<E, FullPayload<E>>
 {