Merge remote-tracking branch 'jimmy/gloas-ptc-pool-block-packing' into unstable

This commit is contained in:
Eitan Seri-Levi
2026-04-28 00:12:16 +02:00
6 changed files with 353 additions and 25 deletions

View File

@@ -140,11 +140,6 @@ struct RejectedAggregate<E: EthSpec> {
error: AttnError,
}
struct RejectedPayloadAttestation {
payload_attestation_message: Box<PayloadAttestationMessage>,
error: PayloadAttestationError,
}
/// Data for an aggregated or unaggregated attestation that failed verification.
enum FailedAtt<E: EthSpec> {
Unaggregate {
@@ -4134,25 +4129,20 @@ impl<T: BeaconChainTypes> NetworkBeaconProcessor<T> {
peer_id: PeerId,
payload_attestation_message: Box<PayloadAttestationMessage>,
) {
let result = match self
let message_slot = payload_attestation_message.data.slot;
let result = self
.chain
.verify_payload_attestation_message_for_gossip(*payload_attestation_message.clone())
{
Ok(verified) => Ok(verified),
Err(error) => Err(RejectedPayloadAttestation {
payload_attestation_message: payload_attestation_message.clone(),
error,
}),
};
.verify_payload_attestation_message_for_gossip(*payload_attestation_message);
self.process_gossip_payload_attestation_result(result, message_id, peer_id);
self.process_gossip_payload_attestation_result(result, message_id, peer_id, message_slot);
}
fn process_gossip_payload_attestation_result(
self: &Arc<Self>,
result: Result<VerifiedPayloadAttestationMessage<T>, RejectedPayloadAttestation>,
result: Result<VerifiedPayloadAttestationMessage<T>, PayloadAttestationError>,
message_id: MessageId,
peer_id: PeerId,
message_slot: Slot,
) {
match result {
Ok(verified) => {
@@ -4179,16 +4169,21 @@ impl<T: BeaconChainTypes> NetworkBeaconProcessor<T> {
),
}
}
if let Err(e) = self.chain.add_payload_attestation_to_pool(&verified) {
warn!(
reason = ?e,
%peer_id,
"Failed to add payload attestation to pool"
);
}
}
Err(RejectedPayloadAttestation {
payload_attestation_message,
error,
}) => {
Err(error) => {
self.handle_payload_attestation_verification_failure(
peer_id,
message_id,
error,
payload_attestation_message.data.slot,
message_slot,
);
}
}