cerc-io/lighthouse
16
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

merge with unstable fixes

Browse Source
This commit is contained in:
realbigsean 2022-11-01 13:26:56 -04:00
parent 8656d23327
commit d8a49aad2b
No known key found for this signature in database
GPG Key ID: B372B64D866BF8CC
5 changed files with 7 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
beacon_node/execution_layer/src/test_utils/handle_rpc.rs
View File

@ -78,7 +78,7 @@ pub async fn handle_rpc<T: EthSpec>(
let request: JsonExecutionPayload<T> = get_param(params, 0)?; let request: JsonExecutionPayload<T> = get_param(params, 0)?;
// Canned responses set by block hash take priority. // 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()); return Ok(serde_json::to_value(JsonPayloadStatusV1::from(status)).unwrap());
} }

12
beacon_node/network/src/beacon_processor/worker/gossip_methods.rs
View File

@ -706,6 +706,7 @@ impl<T: BeaconChainTypes> Worker<T> {
block_and_blob: Arc<SignedBeaconBlockAndBlobsSidecar<T::EthSpec>>, block_and_blob: Arc<SignedBeaconBlockAndBlobsSidecar<T::EthSpec>>,
seen_timestamp: Duration, seen_timestamp: Duration,
) { ) {
//FIXME
unimplemented!() unimplemented!()
} }
@ -2213,15 +2214,4 @@ impl<T: BeaconChainTypes> Worker<T> {
self.propagate_if_timely(is_timely, message_id, peer_id) 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<mpsc::Sender<ReprocessQueueMessage<T>>>,
error: BlobError,
seen_timestamp: Duration,
) {
}
} }

6
consensus/state_processing/src/consensus_context.rs
View File

@ -1,8 +1,8 @@
use std::marker::PhantomData; use std::marker::PhantomData;
use tree_hash::TreeHash; use tree_hash::TreeHash;
use types::{ use types::{
BeaconState, BeaconStateError, ChainSpec, EthSpec, ExecPayload, Hash256, SignedBeaconBlock, AbstractExecPayload, BeaconState, BeaconStateError, ChainSpec, EthSpec, ExecPayload, Hash256,
Slot, SignedBeaconBlock, Slot,
}; };
#[derive(Debug)] #[derive(Debug)]
@ -64,7 +64,7 @@ impl<T: EthSpec> ConsensusContext<T> {
self self
} }
pub fn get_current_block_root<Payload: ExecPayload<T>>( pub fn get_current_block_root<Payload: AbstractExecPayload<T>>(
&mut self, &mut self,
block: &SignedBeaconBlock<T, Payload>, block: &SignedBeaconBlock<T, Payload>,
) -> Result<Hash256, ContextError> { ) -> Result<Hash256, ContextError> {

3
testing/ef_tests/src/cases/operations.rs
View File

@ -92,7 +92,8 @@ impl<E: EthSpec> Operation<E> for Attestation<E> {
BeaconState::Altair(_) BeaconState::Altair(_)
| BeaconState::Merge(_) | BeaconState::Merge(_)
| BeaconState::Capella(_) | BeaconState::Capella(_)
| BeaconState::Eip4844(_) => altair::process_attestation( state, | BeaconState::Eip4844(_) => altair::process_attestation(
state,
self, self,
0, 0,
proposer_index, proposer_index,

1
validator_client/src/http_metrics/metrics.rs
View File

@ -13,7 +13,6 @@ pub const BEACON_BLOCK: &str = "beacon_block";
pub const BEACON_BLOCK_HTTP_GET: &str = "beacon_block_http_get"; 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 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_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 BLINDED_BEACON_BLOCK_HTTP_POST: &str = "blinded_beacon_block_http_post";
pub const ATTESTATIONS: &str = "attestations"; pub const ATTESTATIONS: &str = "attestations";
pub const ATTESTATIONS_HTTP_GET: &str = "attestations_http_get"; pub const ATTESTATIONS_HTTP_GET: &str = "attestations_http_get";