gnosis/lighthouse
1
0
Fork 0
mirror of https://github.com/sigp/lighthouse.git synced 2026-05-08 09:16:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add version to the response of beacon API getPendingConsolidations (#8251)

Browse Source 
* #7440


  


Co-Authored-By: Tan Chee Keong <tanck@sigmaprime.io>
This commit is contained in:
chonghe
2025-10-21 21:58:10 +08:00
committed by GitHub
parent 66f88f6bb4
commit 040d992132
3 changed files with 30 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
beacon_node/http_api/src/lib.rs
View File

@@ -1236,8 +1236,8 @@ pub fn serve<T: BeaconChainTypes>(
|state_id: StateId, |state_id: StateId,
task_spawner: TaskSpawner<T::EthSpec>, task_spawner: TaskSpawner<T::EthSpec>,
chain: Arc<BeaconChain<T>>| { chain: Arc<BeaconChain<T>>| {
task_spawner.blocking_json_task(Priority::P1, move || { task_spawner.blocking_response_task(Priority::P1, move || {
let (data, execution_optimistic, finalized) = state_id let (data, execution_optimistic, finalized, fork_name) = state_id
.map_state_and_execution_optimistic_and_finalized( .map_state_and_execution_optimistic_and_finalized(
&chain, &chain,
|state, execution_optimistic, finalized| { |state, execution_optimistic, finalized| {
@@ -1247,15 +1247,23 @@ pub fn serve<T: BeaconChainTypes>(
)); ));
}; };
Ok((consolidations.clone(), execution_optimistic, finalized)) Ok((
consolidations.clone(),
execution_optimistic,
finalized,
state.fork_name_unchecked(),
))
}, },
)?; )?;
Ok(api_types::ExecutionOptimisticFinalizedResponse { execution_optimistic_finalized_beacon_response(
ResponseIncludesVersion::Yes(fork_name),
execution_optimistic,
finalized,
data, data,
execution_optimistic: Some(execution_optimistic), )
finalized: Some(finalized), .map(|res| warp::reply::json(&res).into_response())
}) .map(|resp| add_consensus_version_header(resp, fork_name))
}) })
}, },
); );

15
beacon_node/http_api/tests/tests.rs
View File

@@ -1369,12 +1369,14 @@ impl ApiTester {
.ok() .ok()
.map(|(state, _execution_optimistic, _finalized)| state); .map(|(state, _execution_optimistic, _finalized)| state);
let result = self let result = match self
.client .client
.get_beacon_states_pending_consolidations(state_id.0) .get_beacon_states_pending_consolidations(state_id.0)
.await .await
.unwrap() {
.map(|res| res.data); Ok(response) => response,
Err(e) => panic!("query failed incorrectly: {e:?}"),
};
if result.is_none() && state_opt.is_none() { if result.is_none() && state_opt.is_none() {
continue; continue;
@@ -1383,7 +1385,12 @@ impl ApiTester {
let state = state_opt.as_mut().expect("result should be none"); let state = state_opt.as_mut().expect("result should be none");
let expected = state.pending_consolidations().unwrap(); let expected = state.pending_consolidations().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 self

6
common/eth2/src/lib.rs
View File

@@ -943,7 +943,7 @@ impl BeaconNodeHttpClient {
pub async fn get_beacon_states_pending_consolidations( pub async fn get_beacon_states_pending_consolidations(
&self, &self,
state_id: StateId, state_id: StateId,
) -> Result<Option<ExecutionOptimisticFinalizedResponse<Vec<PendingConsolidation>>>, Error> ) -> Result<Option<ExecutionOptimisticFinalizedBeaconResponse<Vec<PendingConsolidation>>>, Error>
{ {
let mut path = self.eth_path(V1)?; let mut path = self.eth_path(V1)?;
@@ -954,7 +954,9 @@ impl BeaconNodeHttpClient {
.push(&state_id.to_string()) .push(&state_id.to_string())
.push("pending_consolidations"); .push("pending_consolidations");
self.get_opt(path).await self.get_fork_contextual(path, |fork| fork)
.await
.map(|opt| opt.map(BeaconResponse::ForkVersioned))
} }
/// `GET beacon/light_client/updates` /// `GET beacon/light_client/updates`