Skip to content

Add version to the response of beacon API client side #8326

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

Merged
merged 1 commit into from
Oct 30, 2025
Merged

Add version to the response of beacon API client side #8326

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
30 changes: 22 additions & 8 deletions beacon_node/http_api/tests/tests.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1316,12 +1316,14 @@ impl ApiTester {
.ok()
.map(|(state, _execution_optimistic, _finalized)| state);

let result = self
let result = match self
.client
.get_beacon_states_pending_deposits(state_id.0)
.await
.unwrap()
.map(|res| res.data);
{
Ok(response) => response,
Err(e) => panic!("query failed incorrectly: {e:?}"),
};

if result.is_none() && state_opt.is_none() {
continue;
Expand All @@ -1330,7 +1332,12 @@ impl ApiTester {
let state = state_opt.as_mut().expect("result should be none");
let expected = state.pending_deposits().unwrap();

assert_eq!(result.unwrap(), expected.to_vec());
let response = result.unwrap();
assert_eq!(response.data(), &expected.to_vec());

// Check that the version header is returned in the response
let fork_name = state.fork_name(&self.chain.spec).unwrap();
assert_eq!(response.version(), Some(fork_name),);
}

self
Expand All @@ -1343,12 +1350,14 @@ impl ApiTester {
.ok()
.map(|(state, _execution_optimistic, _finalized)| state);

let result = self
let result = match self
.client
.get_beacon_states_pending_partial_withdrawals(state_id.0)
.await
.unwrap()
.map(|res| res.data);
{
Ok(response) => response,
Err(e) => panic!("query failed incorrectly: {e:?}"),
};

if result.is_none() && state_opt.is_none() {
continue;
Expand All @@ -1357,7 +1366,12 @@ impl ApiTester {
let state = state_opt.as_mut().expect("result should be none");
let expected = state.pending_partial_withdrawals().unwrap();

assert_eq!(result.unwrap(), expected.to_vec());
let response = result.unwrap();
assert_eq!(response.data(), &expected.to_vec());

// Check that the version header is returned in the response
let fork_name = state.fork_name(&self.chain.spec).unwrap();
assert_eq!(response.version(), Some(fork_name),);
}

self
Expand Down
17 changes: 12 additions & 5 deletions common/eth2/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -904,7 +904,8 @@ impl BeaconNodeHttpClient {
pub async fn get_beacon_states_pending_deposits(
&self,
state_id: StateId,
) -> Result<Option<ExecutionOptimisticFinalizedResponse<Vec<PendingDeposit>>>, Error> {
) -> Result<Option<ExecutionOptimisticFinalizedBeaconResponse<Vec<PendingDeposit>>>, Error>
{
let mut path = self.eth_path(V1)?;

path.path_segments_mut()
Expand All @@ -914,7 +915,9 @@ impl BeaconNodeHttpClient {
.push(&state_id.to_string())
.push("pending_deposits");

self.get_opt(path).await
self.get_fork_contextual(path, |fork| fork)
.await
.map(|opt| opt.map(BeaconResponse::ForkVersioned))
}

/// `GET beacon/states/{state_id}/pending_partial_withdrawals`
Expand All @@ -923,8 +926,10 @@ impl BeaconNodeHttpClient {
pub async fn get_beacon_states_pending_partial_withdrawals(
&self,
state_id: StateId,
) -> Result<Option<ExecutionOptimisticFinalizedResponse<Vec<PendingPartialWithdrawal>>>, Error>
{
) -> Result<
Option<ExecutionOptimisticFinalizedBeaconResponse<Vec<PendingPartialWithdrawal>>>,
Error,
> {
let mut path = self.eth_path(V1)?;

path.path_segments_mut()
Expand All @@ -934,7 +939,9 @@ impl BeaconNodeHttpClient {
.push(&state_id.to_string())
.push("pending_partial_withdrawals");

self.get_opt(path).await
self.get_fork_contextual(path, |fork| fork)
.await
.map(|opt| opt.map(BeaconResponse::ForkVersioned))
}

/// `GET beacon/states/{state_id}/pending_consolidations`
Expand Down
Loading