Beacon api + validator electra #5744
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -31,6 +31,7 @@ mod validators; | |
| mod version; | ||
|
|
||
| use crate::produce_block::{produce_blinded_block_v2, produce_block_v2, produce_block_v3}; | ||
| use crate::version::fork_versioned_response; | ||
| use beacon_chain::{ | ||
| attestation_verification::VerifiedAttestation, observed_operations::ObservationOutcome, | ||
| validator_monitor::timestamp_now, AttestationError as AttnError, BeaconChain, BeaconChainError, | ||
|
|
@@ -256,12 +257,15 @@ pub fn prometheus_metrics() -> warp::filters::log::Log<impl Fn(warp::filters::lo | |
| .or_else(|| starts_with("v1/validator/duties/sync")) | ||
| .or_else(|| starts_with("v1/validator/attestation_data")) | ||
| .or_else(|| starts_with("v1/validator/aggregate_attestation")) | ||
| .or_else(|| starts_with("v2/validator/aggregate_attestation")) | ||
| .or_else(|| starts_with("v1/validator/aggregate_and_proofs")) | ||
| .or_else(|| starts_with("v2/validator/aggregate_and_proofs")) | ||
| .or_else(|| starts_with("v1/validator/sync_committee_contribution")) | ||
| .or_else(|| starts_with("v1/validator/contribution_and_proofs")) | ||
| .or_else(|| starts_with("v1/validator/beacon_committee_subscriptions")) | ||
| .or_else(|| starts_with("v1/validator/sync_committee_subscriptions")) | ||
| .or_else(|| starts_with("v1/beacon/pool/attestations")) | ||
| .or_else(|| starts_with("v2/beacon/pool/attestations")) | ||
| .or_else(|| starts_with("v1/beacon/pool/sync_committees")) | ||
| .or_else(|| starts_with("v1/beacon/blocks/head/root")) | ||
| .or_else(|| starts_with("v1/validator/prepare_beacon_proposer")) | ||
|
|
@@ -1623,26 +1627,38 @@ pub fn serve<T: BeaconChainTypes>( | |
| ); | ||
|
|
||
| // GET beacon/blocks/{block_id}/attestations | ||
| let get_beacon_block_attestations = beacon_blocks_path_any | ||
| .clone() | ||
| .and(warp::path("attestations")) | ||
| .and(warp::path::end()) | ||
| .then( | ||
| |endpoint_version: EndpointVersion, | ||
| block_id: BlockId, | ||
| task_spawner: TaskSpawner<T::EthSpec>, | ||
| chain: Arc<BeaconChain<T>>| { | ||
| task_spawner.blocking_response_task(Priority::P1, move || { | ||
| let (block, execution_optimistic, finalized) = | ||
| block_id.blinded_block(&chain)?; | ||
| let fork_name = block | ||
| .fork_name(&chain.spec) | ||
| .map_err(inconsistent_fork_rejection)?; | ||
| let atts = block | ||
| .message() | ||
| .body() | ||
| .attestations() | ||
| .map(|att| att.clone_as_attestation()) | ||
| .collect::<Vec<_>>(); | ||
| let res = execution_optimistic_finalized_fork_versioned_response( | ||
| endpoint_version, | ||
| fork_name, | ||
| execution_optimistic, | ||
| finalized, | ||
| &atts, | ||
| )?; | ||
| Ok(add_consensus_version_header( | ||
| warp::reply::json(&res).into_response(), | ||
| fork_name, | ||
| )) | ||
| }) | ||
| }, | ||
| ); | ||
|
|
@@ -1750,8 +1766,14 @@ pub fn serve<T: BeaconChainTypes>( | |
| .and(task_spawner_filter.clone()) | ||
| .and(chain_filter.clone()); | ||
|
|
||
| let beacon_pool_path_any = any_version | ||
| .and(warp::path("beacon")) | ||
| .and(warp::path("pool")) | ||
| .and(task_spawner_filter.clone()) | ||
| .and(chain_filter.clone()); | ||
|
|
||
| // POST beacon/pool/attestations | ||
| let post_beacon_pool_attestations = beacon_pool_path_any | ||
| .clone() | ||
| .and(warp::path("attestations")) | ||
| .and(warp::path::end()) | ||
|
|
@@ -1760,7 +1782,11 @@ pub fn serve<T: BeaconChainTypes>( | |
| .and(reprocess_send_filter) | ||
| .and(log_filter.clone()) | ||
| .then( | ||
| // V1 and V2 are identical except V2 has a consensus version header in the request. | ||
| // We only require this header for SSZ deserialization, which isn't supported for | ||
| // this endpoint presently. | ||
| |_endpoint_version: EndpointVersion, | ||
| task_spawner: TaskSpawner<T::EthSpec>, | ||
| chain: Arc<BeaconChain<T>>, | ||
| attestations: Vec<Attestation<T::EthSpec>>, | ||
| network_tx: UnboundedSender<NetworkMessage<T::EthSpec>>, | ||
|
|
@@ -1781,16 +1807,17 @@ pub fn serve<T: BeaconChainTypes>( | |
| ); | ||
|
|
||
| // GET beacon/pool/attestations?committee_index,slot | ||
| let get_beacon_pool_attestations = beacon_pool_path_any | ||
| .clone() | ||
| .and(warp::path("attestations")) | ||
| .and(warp::path::end()) | ||
| .and(warp::query::<api_types::AttestationPoolQuery>()) | ||
| .then( | ||
| |endpoint_version: EndpointVersion, | ||
| task_spawner: TaskSpawner<T::EthSpec>, | ||
| chain: Arc<BeaconChain<T>>, | ||
| query: api_types::AttestationPoolQuery| { | ||
| task_spawner.blocking_response_task(Priority::P1, move || { | ||
| let query_filter = |data: &AttestationData| { | ||
| query.slot.map_or(true, |slot| slot == data.slot) | ||
| && query | ||
|
|
@@ -1807,20 +1834,40 @@ pub fn serve<T: BeaconChainTypes>( | |
| .filter(|&att| query_filter(att.data())) | ||
| .cloned(), | ||
| ); | ||
| let slot = query | ||
| .slot | ||
| .or_else(|| { | ||
| attestations | ||
| .first() | ||
| .map(|att| att.data().slot) | ||
| .or_else(|| chain.slot_clock.now()) | ||
| }) | ||
| .ok_or(warp_utils::reject::custom_server_error( | ||
| "unable to read slot clock".to_string(), | ||
| ))?; | ||
| let fork_name = chain.spec.fork_name_at_slot::<T::EthSpec>(slot); | ||
| let res = fork_versioned_response(endpoint_version, fork_name, &attestations)?; | ||
| Ok(add_consensus_version_header( | ||
| warp::reply::json(&res).into_response(), | ||
| fork_name, | ||
| )) | ||
| }) | ||
| }, | ||
| ); | ||
|
|
||
| // POST beacon/pool/attester_slashings | ||
| let post_beacon_pool_attester_slashings = beacon_pool_path_any | ||
| .clone() | ||
| .and(warp::path("attester_slashings")) | ||
| .and(warp::path::end()) | ||
| .and(warp_utils::json::json()) | ||
| .and(network_tx_filter.clone()) | ||
| .then( | ||
| // V1 and V2 are identical except V2 has a consensus version header in the request. | ||
| // We only require this header for SSZ deserialization, which isn't supported for | ||
| // this endpoint presently. | ||
| |_endpoint_version: EndpointVersion, | ||
| task_spawner: TaskSpawner<T::EthSpec>, | ||
| chain: Arc<BeaconChain<T>>, | ||
| slashing: AttesterSlashing<T::EthSpec>, | ||
| network_tx: UnboundedSender<NetworkMessage<T::EthSpec>>| { | ||
|
|
@@ -1857,15 +1904,29 @@ pub fn serve<T: BeaconChainTypes>( | |
| ); | ||
|
|
||
| // GET beacon/pool/attester_slashings | ||
| let get_beacon_pool_attester_slashings = beacon_pool_path_any | ||
| .clone() | ||
| .and(warp::path("attester_slashings")) | ||
| .and(warp::path::end()) | ||
| .then( | ||
| |endpoint_version: EndpointVersion, | ||
| task_spawner: TaskSpawner<T::EthSpec>, | ||
| chain: Arc<BeaconChain<T>>| { | ||
| task_spawner.blocking_response_task(Priority::P1, move || { | ||
| let slashings = chain.op_pool.get_all_attester_slashings(); | ||
| let slot = slashings | ||
| .first() | ||
| .map(|slashing| slashing.attestation_1().data().slot) | ||
| .or_else(|| chain.slot_clock.now()) | ||
| .ok_or(warp_utils::reject::custom_server_error( | ||
| "unable to read slot clock".to_string(), | ||
| ))?; | ||
| let fork_name = chain.spec.fork_name_at_slot::<T::EthSpec>(slot); | ||
|
There was a problem hiding this comment. Not a reliable way to get the attester slashing fork. One can have an attester slashing electra with an attestation data from deneb. Instead we should implement There was a problem hiding this comment. Why aren't we always calculating the fork based on There was a problem hiding this comment. Good catch
I think this makes sense considering return types could be mixed for a given There was a problem hiding this comment. raised a spec issue as well ethereum/beacon-APIs#458 |
||
| let res = fork_versioned_response(endpoint_version, fork_name, &slashings)?; | ||
| Ok(add_consensus_version_header( | ||
| warp::reply::json(&res).into_response(), | ||
| fork_name, | ||
| )) | ||
| }) | ||
| }, | ||
| ); | ||
|
|
@@ -3175,7 +3236,7 @@ pub fn serve<T: BeaconChainTypes>( | |
| ); | ||
|
|
||
| // GET validator/aggregate_attestation?attestation_data_root,slot | ||
| let get_validator_aggregate_attestation = any_version | ||
| .and(warp::path("validator")) | ||
| .and(warp::path("aggregate_attestation")) | ||
| .and(warp::path::end()) | ||
|
|
@@ -3184,29 +3245,45 @@ pub fn serve<T: BeaconChainTypes>( | |
| .and(task_spawner_filter.clone()) | ||
| .and(chain_filter.clone()) | ||
| .then( | ||
| |endpoint_version: EndpointVersion, | ||
| query: api_types::ValidatorAggregateAttestationQuery, | ||
| not_synced_filter: Result<(), Rejection>, | ||
| task_spawner: TaskSpawner<T::EthSpec>, | ||
| chain: Arc<BeaconChain<T>>| { | ||
| task_spawner.blocking_json_task(Priority::P0, move || { | ||
| not_synced_filter?; | ||
| let res = if endpoint_version == V2 { | ||
|
There was a problem hiding this comment.
|
||
| let Some(committee_index) = query.committee_index else { | ||
| return Err(warp_utils::reject::custom_bad_request( | ||
| "missing committee index".to_string(), | ||
| )); | ||
| }; | ||
| chain.get_aggregated_attestation_electra( | ||
| query.slot, | ||
| &query.attestation_data_root, | ||
| committee_index, | ||
| ) | ||
| } else if endpoint_version == V1 { | ||
| // Do nothing | ||
| chain.get_pre_electra_aggregated_attestation_by_slot_and_root( | ||
| query.slot, | ||
| &query.attestation_data_root, | ||
| ) | ||
| } else { | ||
| return Err(unsupported_version_rejection(endpoint_version)); | ||
| }; | ||
| res.map_err(|e| { | ||
| warp_utils::reject::custom_bad_request(format!( | ||
| "unable to fetch aggregate: {:?}", | ||
| e | ||
| )) | ||
| })? | ||
| .map(api_types::GenericResponse::from) | ||
| .ok_or_else(|| { | ||
| warp_utils::reject::custom_not_found( | ||
| "no matching aggregate found".to_string(), | ||
| ) | ||
| }) | ||
| }) | ||
| }, | ||
| ); | ||
|
|
@@ -3302,7 +3379,7 @@ pub fn serve<T: BeaconChainTypes>( | |
| ); | ||
|
|
||
| // POST validator/aggregate_and_proofs | ||
| let post_validator_aggregate_and_proofs = any_version | ||
| .and(warp::path("validator")) | ||
| .and(warp::path("aggregate_and_proofs")) | ||
| .and(warp::path::end()) | ||
|
|
@@ -3313,7 +3390,11 @@ pub fn serve<T: BeaconChainTypes>( | |
| .and(network_tx_filter.clone()) | ||
| .and(log_filter.clone()) | ||
| .then( | ||
| // V1 and V2 are identical except V2 has a consensus version header in the request. | ||
| // We only require this header for SSZ deserialization, which isn't supported for | ||
| // this endpoint presently. | ||
| |_endpoint_version: EndpointVersion, | ||
| not_synced_filter: Result<(), Rejection>, | ||
| task_spawner: TaskSpawner<T::EthSpec>, | ||
| chain: Arc<BeaconChain<T>>, | ||
| aggregates: Vec<SignedAggregateAndProof<T::EthSpec>>, | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
What if someone queries the pool at the fork boundary? There may be attestations from both forks
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
that's a great point.. looks like we'll have to convert to the new format for all of these attestations
Seems to mean Pawan's idea is the best way to approach it: #5744 (comment)