Skip to content

Removed code for GET validator/blinded_blocks and also adjusted/removed tests #7515

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
PoulavBhowmick03 wants to merge 6 commits into
base: unstable
Choose a base branch
from
+286 −354
Open

Removed code for GET validator/blinded_blocks and also adjusted/removed tests #7515

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
1fbe324
Removed code for GET validator/blinded_blocks and also adjusted/remov…
PoulavBhowmick03 May 24, 2025
2fba392
added back the tests previously removed and modified them to fit in w…
PoulavBhowmick03 May 29, 2025
5fed9de
Error in case of Full for test_blinded_block_production
PoulavBhowmick03 Jun 13, 2025
f876ade
fixed pre-merge tests
PoulavBhowmick03 Jul 8, 2025
25ea22b
updated to the changes, tested locally
PoulavBhowmick03 Oct 9, 2025
f1fd3f1
Merge branch 'unstable' into remove/blinded_blocks
eserilev Oct 14, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 1 addition & 33 deletions beacon_node/http_api/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ mod validator_inclusion;
mod validators;
mod version;
use crate::light_client::{get_light_client_bootstrap, get_light_client_updates};
use crate::produce_block::{produce_blinded_block_v2, produce_block_v2, produce_block_v3};
use crate::produce_block::{produce_block_v2, produce_block_v3};
use crate::version::beacon_response;
use beacon_chain::{
AttestationError as AttnError, BeaconChain, BeaconChainError, BeaconChainTypes,
Expand Down Expand Up @@ -256,8 +256,6 @@ pub fn prometheus_metrics() -> warp::filters::log::Log<impl Fn(warp::filters::lo
.or_else(|| starts_with("v2/validator/aggregate_attestation"))
.or_else(|| starts_with("v1/validator/attestation_data"))
.or_else(|| starts_with("v1/validator/beacon_committee_subscriptions"))
.or_else(|| starts_with("v1/validator/blinded_blocks"))
.or_else(|| starts_with("v2/validator/blinded_blocks"))
.or_else(|| starts_with("v1/validator/blocks"))
.or_else(|| starts_with("v2/validator/blocks"))
.or_else(|| starts_with("v3/validator/blocks"))
Expand Down Expand Up @@ -3415,35 +3413,6 @@ pub fn serve<T: BeaconChainTypes>(
},
);

// GET validator/blinded_blocks/{slot}
let get_validator_blinded_blocks = eth_v1
.and(warp::path("validator"))
.and(warp::path("blinded_blocks"))
.and(warp::path::param::<Slot>().or_else(|_| async {
Err(warp_utils::reject::custom_bad_request(
"Invalid slot".to_string(),
))
}))
.and(warp::path::end())
.and(not_while_syncing_filter.clone())
.and(warp::query::<api_types::ValidatorBlocksQuery>())
.and(warp::header::optional::<api_types::Accept>("accept"))
.and(task_spawner_filter.clone())
.and(chain_filter.clone())
.then(
|slot: Slot,
not_synced_filter: Result<(), Rejection>,
query: api_types::ValidatorBlocksQuery,
accept_header: Option<api_types::Accept>,
task_spawner: TaskSpawner<T::EthSpec>,
chain: Arc<BeaconChain<T>>| {
task_spawner.spawn_async_with_rejection(Priority::P0, async move {
not_synced_filter?;
produce_blinded_block_v2(accept_header, chain, slot, query).await
})
},
);

// GET validator/attestation_data?slot,committee_index
let get_validator_attestation_data = eth_v1
.and(warp::path("validator"))
Expand Down Expand Up @@ -4865,7 +4834,6 @@ pub fn serve<T: BeaconChainTypes>(
.uor(get_node_peer_count)
.uor(get_validator_duties_proposer)
.uor(get_validator_blocks)
.uor(get_validator_blinded_blocks)
.uor(get_validator_attestation_data)
.uor(get_validator_aggregate_attestation)
.uor(get_validator_sync_committee_contribution)
Expand Down
29 changes: 0 additions & 29 deletions beacon_node/http_api/src/produce_block.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,35 +133,6 @@ pub fn build_response_v3<T: BeaconChainTypes>(
}
}

pub async fn produce_blinded_block_v2<T: BeaconChainTypes>(
accept_header: Option<api_types::Accept>,
chain: Arc<BeaconChain<T>>,
slot: Slot,
query: api_types::ValidatorBlocksQuery,
) -> Result<Response<Body>, warp::Rejection> {
let randao_reveal = query.randao_reveal.decompress().map_err(|e| {
warp_utils::reject::custom_bad_request(format!(
"randao reveal is not a valid BLS signature: {:?}",
e
))
})?;

let randao_verification = get_randao_verification(&query, randao_reveal.is_infinity())?;
let block_response_type = chain
.produce_block_with_verification(
randao_reveal,
slot,
query.graffiti,
randao_verification,
None,
BlockProductionVersion::BlindedV2,
)
.await
.map_err(warp_utils::reject::unhandled_error)?;

build_response_v2(chain, block_response_type, accept_header)
}

#[instrument(
name = SPAN_PRODUCE_BLOCK_V2,
skip_all,
Expand Down
Loading
Loading