Merge branch 'electra-engine-api' of https://github.com/sigp/lighthouse into beacon-api-electra

This commit is contained in:
realbigsean
2024-05-31 08:53:12 -04:00
194 changed files with 5822 additions and 3879 deletions

View File

@@ -3386,7 +3386,7 @@ pub fn serve<T: BeaconChainTypes>(
"error" => format!("{:?}", e),
"request_index" => index,
"aggregator_index" => aggregate.message().aggregator_index(),
"attestation_index" => aggregate.message().aggregate().data().index,
"attestation_index" => aggregate.message().aggregate().committee_index(),
"attestation_slot" => aggregate.message().aggregate().data().slot,
);
failures.push(api_types::Failure::new(index, format!("Verification: {:?}", e)));
@@ -3407,7 +3407,7 @@ pub fn serve<T: BeaconChainTypes>(
"error" => format!("{:?}", e),
"request_index" => index,
"aggregator_index" => verified_aggregate.aggregate().message().aggregator_index(),
"attestation_index" => verified_aggregate.attestation().data().index,
"attestation_index" => verified_aggregate.attestation().committee_index(),
"attestation_slot" => verified_aggregate.attestation().data().slot,
);
failures.push(api_types::Failure::new(index, format!("Fork choice: {:?}", e)));
@@ -4386,6 +4386,9 @@ pub fn serve<T: BeaconChainTypes>(
api_types::EventTopic::ProposerSlashing => {
event_handler.subscribe_proposer_slashing()
}
api_types::EventTopic::BlsToExecutionChange => {
event_handler.subscribe_bls_to_execution_change()
}
};
receivers.push(

View File

@@ -141,7 +141,7 @@ pub async fn publish_attestations<T: BeaconChainTypes>(
// move the `attestations` vec into the blocking task, so this small overhead is unavoidable.
let attestation_metadata = attestations
.iter()
.map(|att| (att.data().slot, att.data().index))
.map(|att| (att.data().slot, att.committee_index()))
.collect::<Vec<_>>();
// Gossip validate and publish attestations that can be immediately processed.