gnosis/lighthouse
1
0
Fork 0
mirror of https://github.com/sigp/lighthouse.git synced 2026-04-20 22:38:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge conlficts

Browse Source
This commit is contained in:
Eitan Seri- Levi
2026-03-26 21:50:30 -07:00
parent c396272c00 e1a2cfe202
commit 5567bf9339
158 changed files with 4877 additions and 3908 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
beacon_node/beacon_chain/src/errors.rs
View File

@@ -8,6 +8,7 @@ use crate::observed_aggregates::Error as ObservedAttestationsError;
use crate::observed_attesters::Error as ObservedAttestersError;
use crate::observed_block_producers::Error as ObservedBlockProducersError;
use crate::observed_data_sidecars::Error as ObservedDataSidecarsError;
use crate::payload_envelope_streamer::Error as EnvelopeStreamerError;
use bls::PublicKeyBytes;
use execution_layer::PayloadStatus;
use fork_choice::ExecutionStatus;
@@ -157,6 +158,7 @@ pub enum BeaconChainError {
reconstructed_transactions_root: Hash256,
},
BlockStreamerError(BlockStreamerError),
EnvelopeStreamerError(EnvelopeStreamerError),
AddPayloadLogicError,
ExecutionForkChoiceUpdateFailed(execution_layer::Error),
PrepareProposerFailed(BlockProcessingError),