Many fixes

This commit is contained in:
Eitan Seri-Levi
2026-05-09 18:58:08 +03:00
parent 2356bdd256
commit 1b2cf3ba01
45 changed files with 667 additions and 1328 deletions

View File

@@ -4069,6 +4069,7 @@ impl<T: BeaconChainTypes> NetworkBeaconProcessor<T> {
match chain.verify_envelope_for_gossip(raw_envelope).await {
Ok(re_verified) => {
let re_block_root = re_verified.signed_envelope.beacon_block_root();
#[allow(clippy::result_large_err)]
let result = chain
.process_execution_payload_envelope(
re_block_root,
@@ -4094,11 +4095,11 @@ impl<T: BeaconChainTypes> NetworkBeaconProcessor<T> {
// On repeated transient failure, the envelope will be
// retried again via the reprocess queue (up to max
// retries), handled by the RetryEnvelope message handler.
if let EnvelopeError::ExecutionPayloadError(epe) = e {
if !epe.penalize_peer() {
// Could retry again, but we let the
// reprocess queue handle max retry logic.
}
if let EnvelopeError::ExecutionPayloadError(epe) = e
&& !epe.penalize_peer()
{
// Could retry again, but we let the
// reprocess queue handle max retry logic.
}
}
}

View File

@@ -43,9 +43,10 @@ use std::time::Duration;
use tokio::sync::mpsc;
use types::{
AttesterSlashing, BlobSidecar, ChainSpec, DataColumnSidecarList, DataColumnSubnetId, Epoch,
EthSpec, ExecutionPayloadEnvelope, ExecutionPayloadGloas, ExecutionRequests, Hash256,
EthSpec, ExecutionPayloadEnvelopeGloas, ExecutionPayloadGloas, ExecutionRequests, Hash256,
MainnetEthSpec, ProposerSlashing, SignedAggregateAndProof, SignedBeaconBlock,
SignedExecutionPayloadEnvelope, SignedVoluntaryExit, SingleAttestation, Slot, SubnetId,
SignedExecutionPayloadEnvelope, SignedExecutionPayloadEnvelopeGloas, SignedVoluntaryExit,
SingleAttestation, Slot, SubnetId,
};
use types::{
BlobSidecarList,
@@ -2122,8 +2123,8 @@ fn make_test_payload_envelope(
slot: Slot,
beacon_block_root: Hash256,
) -> SignedExecutionPayloadEnvelope<E> {
SignedExecutionPayloadEnvelope {
message: ExecutionPayloadEnvelope {
SignedExecutionPayloadEnvelope::Gloas(SignedExecutionPayloadEnvelopeGloas {
message: ExecutionPayloadEnvelopeGloas {
payload: ExecutionPayloadGloas {
slot_number: slot,
..ExecutionPayloadGloas::default()
@@ -2134,7 +2135,7 @@ fn make_test_payload_envelope(
parent_beacon_block_root: Hash256::ZERO,
},
signature: Signature::empty(),
}
})
}
#[tokio::test]