Merge remote-tracking branch 'origin/unstable' into tree-states

This commit is contained in:
Michael Sproul
2022-09-22 10:13:02 +10:00
38 changed files with 1118 additions and 223 deletions

View File

@@ -1752,6 +1752,19 @@ impl<T: BeaconChainTypes> Worker<T> {
debug!(self.log, "Attestation for finalized state"; "peer_id" => % peer_id);
self.propagate_validation_result(message_id, peer_id, MessageAcceptance::Ignore);
}
e @ AttnError::BeaconChainError(BeaconChainError::MaxCommitteePromises(_)) => {
debug!(
self.log,
"Dropping attestation";
"target_root" => ?failed_att.attestation().data.target.root,
"beacon_block_root" => ?beacon_block_root,
"slot" => ?failed_att.attestation().data.slot,
"type" => ?attestation_type,
"error" => ?e,
"peer_id" => % peer_id
);
self.propagate_validation_result(message_id, peer_id, MessageAcceptance::Ignore);
}
AttnError::BeaconChainError(e) => {
/*
* Lighthouse hit an unexpected error whilst processing the attestation. It
@@ -1762,7 +1775,10 @@ impl<T: BeaconChainTypes> Worker<T> {
*/
error!(
self.log,
"Unable to validate aggregate";
"Unable to validate attestation";
"beacon_block_root" => ?beacon_block_root,
"slot" => ?failed_att.attestation().data.slot,
"type" => ?attestation_type,
"peer_id" => %peer_id,
"error" => ?e,
);