fix compilation issues after merge

beacon_node/beacon_chain/src/test_utils.rs

@@ -331,11 +331,6 @@ where
         )
     }
 
-    pub fn withdrawal_keypairs(mut self, withdrawal_keypairs: Vec<Option<Keypair>>) -> Self {
-        self.withdrawal_keypairs = withdrawal_keypairs;
-        self
-    }
-
     pub fn default_spec(self) -> Self {
         self.spec_or_default(None)
     }

beacon_node/execution_layer/src/engine_api/http.rs

@@ -73,13 +73,16 @@ pub static LIGHTHOUSE_CAPABILITIES: &[&str] = &[
 /// This is necessary because a user might run a capella-enabled version of
 /// lighthouse before they update to a capella-enabled execution engine.
 // TODO (mark): rip this out once we are post-capella on mainnet
+// TODO (sean): do we similarly need something like this for 4844?
 pub static PRE_CAPELLA_ENGINE_CAPABILITIES: EngineCapabilities = EngineCapabilities {
     new_payload_v1: true,
     new_payload_v2: false,
+    new_payload_v3: false,
     forkchoice_updated_v1: true,
     forkchoice_updated_v2: false,
     get_payload_v1: true,
     get_payload_v2: false,
+    get_payload_v3: false,
     exchange_transition_configuration_v1: true,
 };
 
@@ -1019,10 +1022,12 @@ impl HttpJsonRpc {
             Ok(capabilities) => Ok(EngineCapabilities {
                 new_payload_v1: capabilities.contains(ENGINE_NEW_PAYLOAD_V1),
                 new_payload_v2: capabilities.contains(ENGINE_NEW_PAYLOAD_V2),
+                new_payload_v3: capabilities.contains(ENGINE_NEW_PAYLOAD_V3),
                 forkchoice_updated_v1: capabilities.contains(ENGINE_FORKCHOICE_UPDATED_V1),
                 forkchoice_updated_v2: capabilities.contains(ENGINE_FORKCHOICE_UPDATED_V2),
                 get_payload_v1: capabilities.contains(ENGINE_GET_PAYLOAD_V1),
                 get_payload_v2: capabilities.contains(ENGINE_GET_PAYLOAD_V2),
+                get_payload_v3: capabilities.contains(ENGINE_GET_PAYLOAD_V3),
                 exchange_transition_configuration_v1: capabilities
                     .contains(ENGINE_EXCHANGE_TRANSITION_CONFIGURATION_V1),
             }),
@@ -1070,7 +1075,7 @@ impl HttpJsonRpc {
         let engine_capabilities = self.get_engine_capabilities(None).await?;
         if engine_capabilities.new_payload_v3 {
             self.new_payload_v3(execution_payload).await
-        }else if engine_capabilities.new_payload_v2 {
+        } else if engine_capabilities.new_payload_v2 {
             self.new_payload_v2(execution_payload).await
         } else if engine_capabilities.new_payload_v1 {
             self.new_payload_v1(execution_payload).await

beacon_node/execution_layer/src/lib.rs

@@ -145,9 +145,13 @@ impl<T: EthSpec, Payload: AbstractExecPayload<T>> BlockProposalContents<T, Paylo
         Option<VariableList<Blob<T>, T::MaxBlobsPerBlock>>,
     ) {
         match self {
-            Self::Payload(payload) => (payload, None, None),
+            Self::Payload {
+                payload,
+                block_value: _,
+            } => (payload, None, None),
             Self::PayloadAndBlobs {
                 payload,
+                block_value: _,
                 kzg_commitments,
                 blobs,
             } => (payload, Some(kzg_commitments), Some(blobs)),
@@ -2128,7 +2132,10 @@ fn ethers_tx_to_bytes<T: EthSpec>(
     VariableList::new(tx).map_err(Into::into)
 }
 
-fn noop<T: EthSpec>(_: &ExecutionLayer<T>, _: &ExecutionPayload<T>) -> Option<ExecutionPayload<T>> {
+fn noop<T: EthSpec>(
+    _: &ExecutionLayer<T>,
+    _: ExecutionPayloadRef<T>,
+) -> Option<ExecutionPayload<T>> {
     None
 }
 

beacon_node/execution_layer/src/test_utils/handle_rpc.rs

@@ -110,7 +110,8 @@ pub async fn handle_rpc<T: EthSpec>(
                                 get_param::<JsonExecutionPayloadV1<T>>(params, 0)
                                     .map(|jep| JsonExecutionPayload::V1(jep))
                             })
-                    })?,
+                    })
+                    .map_err(|s| (s, BAD_PARAMS_ERROR_CODE))?,
                 _ => unreachable!(),
             };
 
@@ -150,18 +151,27 @@ pub async fn handle_rpc<T: EthSpec>(
                 }
                 ForkName::Eip4844 => {
                     if method == ENGINE_NEW_PAYLOAD_V1 || method == ENGINE_NEW_PAYLOAD_V2 {
-                        return Err((format!("{} called after capella fork!", method), GENERIC_ERROR_CODE));
+                        return Err((
+                            format!("{} called after capella fork!", method),
+                            GENERIC_ERROR_CODE,
+                        ));
                     }
                     if matches!(request, JsonExecutionPayload::V1(_)) {
-                        return Err((format!(
+                        return Err((
+                            format!(
                                 "{} called with `ExecutionPayloadV1` after eip4844 fork!",
                                 method
-                        ), GENERIC_ERROR_CODE));
+                            ),
+                            GENERIC_ERROR_CODE,
+                        ));
                     }
                     if matches!(request, JsonExecutionPayload::V2(_)) {
-                        return Err((format!(
+                        return Err((
+                            format!(
                                 "{} called with `ExecutionPayloadV2` after eip4844 fork!",
-                            method), GENERIC_ERROR_CODE
+                                method
+                            ),
+                            GENERIC_ERROR_CODE,
                         ));
                     }
                 }
@@ -235,7 +245,10 @@ pub async fn handle_rpc<T: EthSpec>(
                 == ForkName::Eip4844
                 && (method == ENGINE_GET_PAYLOAD_V1 || method == ENGINE_GET_PAYLOAD_V2)
             {
-                return Err((format!("{} called after eip4844 fork!", method), FORK_REQUEST_MISMATCH_ERROR_CODE));
+                return Err((
+                    format!("{} called after eip4844 fork!", method),
+                    FORK_REQUEST_MISMATCH_ERROR_CODE,
+                ));
             }
 
             match method {
@@ -263,21 +276,21 @@ pub async fn handle_rpc<T: EthSpec>(
                     JsonExecutionPayload::V1(execution_payload) => {
                         serde_json::to_value(JsonGetPayloadResponseV1 {
                             execution_payload,
-                            block_value: DEFAULT_MOCK_EL_PAYLOAD_VALUE_WEI.into()
+                            block_value: DEFAULT_MOCK_EL_PAYLOAD_VALUE_WEI.into(),
                         })
                         .unwrap()
                     }
                     JsonExecutionPayload::V2(execution_payload) => {
                         serde_json::to_value(JsonGetPayloadResponseV2 {
                             execution_payload,
-                            block_value: DEFAULT_MOCK_EL_PAYLOAD_VALUE_WEI.into()
+                            block_value: DEFAULT_MOCK_EL_PAYLOAD_VALUE_WEI.into(),
                         })
                         .unwrap()
                     }
                     JsonExecutionPayload::V3(execution_payload) => {
                         serde_json::to_value(JsonGetPayloadResponseV3 {
                             execution_payload,
-                            block_value: DEFAULT_MOCK_EL_PAYLOAD_VALUE_WEI.into()
+                            block_value: DEFAULT_MOCK_EL_PAYLOAD_VALUE_WEI.into(),
                         })
                         .unwrap()
                     }

beacon_node/execution_layer/src/test_utils/mod.rs

@@ -37,10 +37,12 @@ pub const DEFAULT_BUILDER_PAYLOAD_VALUE_WEI: u128 = 20_000_000_000_000_000;
 pub const DEFAULT_ENGINE_CAPABILITIES: EngineCapabilities = EngineCapabilities {
     new_payload_v1: true,
     new_payload_v2: true,
+    new_payload_v3: true,
     forkchoice_updated_v1: true,
     forkchoice_updated_v2: true,
     get_payload_v1: true,
     get_payload_v2: true,
+    get_payload_v3: true,
     exchange_transition_configuration_v1: true,
 };
 

beacon_node/http_api/src/lib.rs

@@ -3569,7 +3569,6 @@ pub fn serve<T: BeaconChainTypes>(
                 .or(post_beacon_pool_proposer_slashings.boxed())
                 .or(post_beacon_pool_voluntary_exits.boxed())
                 .or(post_beacon_pool_sync_committees.boxed())
-                .or(post_beacon_rewards_sync_committee.boxed())
                 .or(post_beacon_pool_bls_to_execution_changes.boxed())
                 .or(post_beacon_rewards_sync_committee.boxed())
                 .or(post_validator_duties_attester.boxed())

beacon_node/network/src/beacon_processor/mod.rs

@@ -802,21 +802,6 @@ impl<T: BeaconChainTypes> std::convert::From<ReadyWork<T>> for WorkEvent<T> {
                     seen_timestamp,
                 },
             },
-            ReadyWork::LightClientUpdate(QueuedLightClientUpdate {
-                peer_id,
-                message_id,
-                light_client_optimistic_update,
-                seen_timestamp,
-                ..
-            }) => Self {
-                drop_during_sync: true,
-                work: Work::UnknownLightClientOptimisticUpdate {
-                    message_id,
-                    peer_id,
-                    light_client_optimistic_update,
-                    seen_timestamp,
-                },
-            },
         }
     }
 }
@@ -1001,7 +986,6 @@ impl<T: BeaconChainTypes> Work<T> {
             Work::UnknownBlockAggregate { .. } => UNKNOWN_BLOCK_AGGREGATE,
             Work::UnknownLightClientOptimisticUpdate { .. } => UNKNOWN_LIGHT_CLIENT_UPDATE,
             Work::GossipBlsToExecutionChange { .. } => GOSSIP_BLS_TO_EXECUTION_CHANGE,
-            Work::UnknownLightClientOptimisticUpdate { .. } => UNKNOWN_LIGHT_CLIENT_UPDATE,
         }
     }
 }
@@ -1529,9 +1513,6 @@ impl<T: BeaconChainTypes> BeaconProcessor<T> {
                             Work::UnknownBlockAggregate { .. } => {
                                 unknown_block_aggregate_queue.push(work)
                             }
-                            Work::UnknownLightClientOptimisticUpdate { .. } => {
-                                unknown_light_client_update_queue.push(work, work_id, &self.log)
-                            }
                             Work::GossipBlsToExecutionChange { .. } => {
                                 gossip_bls_to_execution_change_queue.push(work, work_id, &self.log)
                             }

beacon_node/network/src/beacon_processor/work_reprocessing_queue.rs

@@ -31,8 +31,7 @@ use tokio::sync::mpsc::{self, Receiver, Sender};
 use tokio::time::error::Error as TimeError;
 use tokio_util::time::delay_queue::{DelayQueue, Key as DelayKey};
 use types::{
-    Attestation, EthSpec, Hash256, LightClientOptimisticUpdate, SignedAggregateAndProof,
+    Attestation, EthSpec, Hash256, LightClientOptimisticUpdate, SignedAggregateAndProof, SubnetId,
-    SignedBeaconBlock, SubnetId,
 };
 
 const TASK_NAME: &str = "beacon_processor_reprocess_queue";