diff --git a/beacon_node/execution_layer/src/test_utils/handle_rpc.rs b/beacon_node/execution_layer/src/test_utils/handle_rpc.rs index 7ca83ad39b..ba26591baf 100644 --- a/beacon_node/execution_layer/src/test_utils/handle_rpc.rs +++ b/beacon_node/execution_layer/src/test_utils/handle_rpc.rs @@ -78,7 +78,7 @@ pub async fn handle_rpc( let request: JsonExecutionPayload = get_param(params, 0)?; // Canned responses set by block hash take priority. - if let Some(status) = ctx.get_new_payload_status(&request.block_hash) { + if let Some(status) = ctx.get_new_payload_status(&request.block_hash()) { return Ok(serde_json::to_value(JsonPayloadStatusV1::from(status)).unwrap()); } diff --git a/beacon_node/network/src/beacon_processor/worker/gossip_methods.rs b/beacon_node/network/src/beacon_processor/worker/gossip_methods.rs index 5f13e27d7b..37cc1903d3 100644 --- a/beacon_node/network/src/beacon_processor/worker/gossip_methods.rs +++ b/beacon_node/network/src/beacon_processor/worker/gossip_methods.rs @@ -706,6 +706,7 @@ impl Worker { block_and_blob: Arc>, seen_timestamp: Duration, ) { + //FIXME unimplemented!() } @@ -2213,15 +2214,4 @@ impl Worker { self.propagate_if_timely(is_timely, message_id, peer_id) } - - /// Handle an error whilst verifying a `SignedBlobsSidecar` from the network. - fn handle_blobs_verification_failure( - &self, - peer_id: PeerId, - message_id: MessageId, - reprocess_tx: Option>>, - error: BlobError, - seen_timestamp: Duration, - ) { - } } diff --git a/consensus/state_processing/src/consensus_context.rs b/consensus/state_processing/src/consensus_context.rs index fdd3f95a65..18ae5ad3b7 100644 --- a/consensus/state_processing/src/consensus_context.rs +++ b/consensus/state_processing/src/consensus_context.rs @@ -1,8 +1,8 @@ use std::marker::PhantomData; use tree_hash::TreeHash; use types::{ - BeaconState, BeaconStateError, ChainSpec, EthSpec, ExecPayload, Hash256, SignedBeaconBlock, - Slot, + AbstractExecPayload, BeaconState, BeaconStateError, ChainSpec, EthSpec, ExecPayload, Hash256, + SignedBeaconBlock, Slot, }; #[derive(Debug)] @@ -64,7 +64,7 @@ impl ConsensusContext { self } - pub fn get_current_block_root>( + pub fn get_current_block_root>( &mut self, block: &SignedBeaconBlock, ) -> Result { diff --git a/testing/ef_tests/src/cases/operations.rs b/testing/ef_tests/src/cases/operations.rs index 8e96a41392..e3dfb7f67b 100644 --- a/testing/ef_tests/src/cases/operations.rs +++ b/testing/ef_tests/src/cases/operations.rs @@ -92,7 +92,8 @@ impl Operation for Attestation { BeaconState::Altair(_) | BeaconState::Merge(_) | BeaconState::Capella(_) - | BeaconState::Eip4844(_) => altair::process_attestation( state, + | BeaconState::Eip4844(_) => altair::process_attestation( + state, self, 0, proposer_index, diff --git a/validator_client/src/http_metrics/metrics.rs b/validator_client/src/http_metrics/metrics.rs index cc71196f4c..2d2e7da753 100644 --- a/validator_client/src/http_metrics/metrics.rs +++ b/validator_client/src/http_metrics/metrics.rs @@ -13,7 +13,6 @@ pub const BEACON_BLOCK: &str = "beacon_block"; pub const BEACON_BLOCK_HTTP_GET: &str = "beacon_block_http_get"; pub const BLINDED_BEACON_BLOCK_HTTP_GET: &str = "blinded_beacon_block_http_get"; pub const BEACON_BLOCK_HTTP_POST: &str = "beacon_block_http_post"; -pub const BEACON_BLOB_HTTP_POST: &str = "beacon_blob_http_post"; pub const BLINDED_BEACON_BLOCK_HTTP_POST: &str = "blinded_beacon_block_http_post"; pub const ATTESTATIONS: &str = "attestations"; pub const ATTESTATIONS_HTTP_GET: &str = "attestations_http_get";