gnosis/lighthouse
1
0
Fork 0
mirror of https://github.com/sigp/lighthouse.git synced 2026-03-09 19:51:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

merge with upstream

Browse Source
This commit is contained in:
realbigsean
2023-02-15 14:20:12 -05:00
parent 87d1fbeb21 918b688f72
commit b805fa6279
63 changed files with 2499 additions and 454 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
beacon_node/network/Cargo.toml
View File

@@ -46,6 +46,7 @@ derivative = "2.2.0"
delay_map = "0.1.1"
ethereum-types = { version = "0.14.1", optional = true }
operation_pool = { path = "../operation_pool" }
execution_layer = { path = "../execution_layer" }
[features]
deterministic_long_lived_attnets = [ "ethereum-types" ]

30
beacon_node/network/src/beacon_processor/worker/rpc_methods.rs
View File

@@ -10,7 +10,7 @@ use lighthouse_network::rpc::methods::{
use lighthouse_network::rpc::StatusMessage;
use lighthouse_network::rpc::*;
use lighthouse_network::{PeerId, PeerRequestId, ReportSource, Response, SyncInfo};
use slog::{debug, error};
use slog::{debug, error, warn};
use slot_clock::SlotClock;
use std::sync::Arc;
use task_executor::TaskExecutor;
@@ -576,14 +576,26 @@ impl<T: BeaconChainTypes> Worker<T> {
break;
}
Err(e) => {
error!(
self.log,
"Error fetching block for peer";
"request" => ?req,
"peer" => %peer_id,
"block_root" => ?root,
"error" => ?e
);
if matches!(
e,
BeaconChainError::ExecutionLayerErrorPayloadReconstruction(_block_hash, ref boxed_error)
if matches!(**boxed_error, execution_layer::Error::EngineError(_))
) {
warn!(
self.log,
"Error rebuilding payload for peer";
"info" => "this may occur occasionally when the EE is busy",
"block_root" => ?root,
"error" => ?e,
);
} else {
error!(
self.log,
"Error fetching block for peer";
"block_root" => ?root,
"error" => ?e
);
}
// send the stream terminator
self.send_error_response(