From 7f7205a13155643c980983b25dec3fcf2a537b25 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1s=20Gr=C3=BCner?= <47506558+MegaRedHand@users.noreply.github.com> Date: Wed, 24 Jun 2026 10:28:20 -0300 Subject: [PATCH 1/3] refactor(rpc): compose api router from per-feature route modules Split the monolithic lib.rs API router into focused modules: core.rs holds the finalized-state/finalized-block/justified-checkpoint handlers and shared response helpers; blocks.rs, fork_choice.rs, and admin.rs each expose pub(crate) routes() -> Router. build_api_router merges them with .with_state(store). No behavior change. --- crates/net/rpc/src/admin.rs | 17 +++++- crates/net/rpc/src/blocks.rs | 12 +++- crates/net/rpc/src/core.rs | 73 ++++++++++++++++++++++++ crates/net/rpc/src/fork_choice.rs | 19 ++++--- crates/net/rpc/src/lib.rs | 93 ++++--------------------------- 5 files changed, 118 insertions(+), 96 deletions(-) create mode 100644 crates/net/rpc/src/core.rs diff --git a/crates/net/rpc/src/admin.rs b/crates/net/rpc/src/admin.rs index 43804d02..679a636d 100644 --- a/crates/net/rpc/src/admin.rs +++ b/crates/net/rpc/src/admin.rs @@ -12,10 +12,12 @@ //! the role (hot-standby model). See leanSpec PR #636 for the full rationale. use axum::{ - Extension, Json, + Extension, Json, Router, http::StatusCode, response::{IntoResponse, Response}, + routing::get, }; +use ethlambda_storage::Store; use ethlambda_types::aggregator::AggregatorController; use serde::Serialize; use serde_json::Value; @@ -23,6 +25,13 @@ use tracing::info; use crate::json_response; +pub(crate) fn routes() -> Router { + Router::new().route( + "/lean/v0/admin/aggregator", + get(get_aggregator).post(post_aggregator), + ) +} + #[derive(Serialize)] struct StatusResponse { is_aggregator: bool, @@ -44,7 +53,9 @@ struct ToggleResponse { /// `Extension` would cause axum to short-circuit with a 500 when the /// extension is missing, whereas `Option` yields `None` and lets us return /// a clean 503 with a useful message. -pub async fn get_aggregator(controller: Option>) -> Response { +pub(crate) async fn get_aggregator( + controller: Option>, +) -> Response { match controller { Some(Extension(controller)) => json_response(StatusResponse { is_aggregator: controller.is_enabled(), @@ -62,7 +73,7 @@ pub async fn get_aggregator(controller: Option>) /// `Extension` would cause axum to short-circuit with a 500 when the /// extension is missing, whereas `Option` yields `None` and lets us return /// a clean 503 with a useful message. -pub async fn post_aggregator( +pub(crate) async fn post_aggregator( controller: Option>, body: Option>, ) -> Response { diff --git a/crates/net/rpc/src/blocks.rs b/crates/net/rpc/src/blocks.rs index edfa1737..8110b99b 100644 --- a/crates/net/rpc/src/blocks.rs +++ b/crates/net/rpc/src/blocks.rs @@ -1,7 +1,9 @@ use axum::{ + Router, extract::{Path, State}, http::StatusCode, response::IntoResponse, + routing::get, }; use ethlambda_storage::Store; use ethlambda_types::primitives::H256; @@ -9,10 +11,16 @@ use serde_json::json; use crate::json_response; +pub(crate) fn routes() -> Router { + Router::new() + .route("/lean/v0/blocks/{block_id}", get(get_block)) + .route("/lean/v0/blocks/{block_id}/header", get(get_block_header)) +} + /// `GET /lean/v0/blocks/:block_id` — returns the block as JSON. /// /// `block_id` can be a `0x`-prefixed 32-byte hex root or a decimal slot. -pub async fn get_block( +pub(crate) async fn get_block( Path(block_id): Path, State(store): State, ) -> impl IntoResponse { @@ -28,7 +36,7 @@ pub async fn get_block( } /// `GET /lean/v0/blocks/:block_id/header` — returns the block header as JSON. -pub async fn get_block_header( +pub(crate) async fn get_block_header( Path(block_id): Path, State(store): State, ) -> impl IntoResponse { diff --git a/crates/net/rpc/src/core.rs b/crates/net/rpc/src/core.rs new file mode 100644 index 00000000..4ccd1f9a --- /dev/null +++ b/crates/net/rpc/src/core.rs @@ -0,0 +1,73 @@ +use axum::{ + Json, Router, + http::{HeaderValue, header}, + response::IntoResponse, + routing::get, +}; +use ethlambda_storage::Store; +use ethlambda_types::primitives::H256; +use libssz::SszEncode; + +pub(crate) fn routes() -> Router { + Router::new() + .route("/lean/v0/health", get(crate::metrics::get_health)) + .route("/lean/v0/states/finalized", get(get_latest_finalized_state)) + .route("/lean/v0/blocks/finalized", get(get_latest_finalized_block)) + .route( + "/lean/v0/checkpoints/justified", + get(get_latest_justified_state), + ) +} + +pub(crate) async fn get_latest_finalized_state( + axum::extract::State(store): axum::extract::State, +) -> impl IntoResponse { + let finalized = store.latest_finalized(); + let mut state = store + .get_state(&finalized.root) + .expect("finalized state exists"); + + // Zero state_root to match the canonical post-state representation. + // The spec's state_transition sets state_root to zero during process_block_header, + // and only fills it in lazily at the next slot's process_slots. + // Serving the canonical form ensures checkpoint sync interoperability. + state.latest_block_header.state_root = H256::ZERO; + + ssz_response(state.to_ssz()) +} + +pub(crate) async fn get_latest_finalized_block( + axum::extract::State(store): axum::extract::State, +) -> impl IntoResponse { + let finalized = store.latest_finalized(); + // Returns 404 for genesis since it doesn't have a valid signature + match store.get_signed_block(&finalized.root) { + Some(block) => ssz_response(block.to_ssz()), + None => axum::http::StatusCode::NOT_FOUND.into_response(), + } +} + +pub(crate) async fn get_latest_justified_state( + axum::extract::State(store): axum::extract::State, +) -> impl IntoResponse { + let checkpoint = store.latest_justified(); + json_response(checkpoint) +} + +pub(crate) fn json_response(value: T) -> axum::response::Response { + let mut response = Json(value).into_response(); + response.headers_mut().insert( + header::CONTENT_TYPE, + HeaderValue::from_static(crate::JSON_CONTENT_TYPE), + ); + response +} + +fn ssz_response(bytes: Vec) -> axum::response::Response { + let mut response = bytes.into_response(); + response.headers_mut().insert( + header::CONTENT_TYPE, + HeaderValue::from_static(crate::SSZ_CONTENT_TYPE), + ); + response +} diff --git a/crates/net/rpc/src/fork_choice.rs b/crates/net/rpc/src/fork_choice.rs index 75fb2702..19f368d4 100644 --- a/crates/net/rpc/src/fork_choice.rs +++ b/crates/net/rpc/src/fork_choice.rs @@ -1,10 +1,16 @@ -use axum::{http::HeaderValue, http::header, response::IntoResponse}; +use axum::{Router, http::HeaderValue, http::header, response::IntoResponse, routing::get}; use ethlambda_storage::Store; use ethlambda_types::{checkpoint::Checkpoint, primitives::H256}; use serde::Serialize; use crate::json_response; +pub(crate) fn routes() -> Router { + Router::new() + .route("/lean/v0/fork_choice", get(get_fork_choice)) + .route("/lean/v0/fork_choice/ui", get(get_fork_choice_ui)) +} + const HTML_CONTENT_TYPE: &str = "text/html; charset=utf-8"; const FORK_CHOICE_HTML: &str = include_str!("../static/fork_choice.html"); @@ -27,7 +33,7 @@ pub struct ForkChoiceNode { weight: u64, } -pub async fn get_fork_choice( +pub(crate) async fn get_fork_choice( axum::extract::State(store): axum::extract::State, ) -> impl IntoResponse { let blocks = store.get_live_chain(); @@ -75,7 +81,7 @@ pub async fn get_fork_choice( json_response(response) } -pub async fn get_fork_choice_ui() -> impl IntoResponse { +pub(crate) async fn get_fork_choice_ui() -> impl IntoResponse { let mut response = FORK_CHOICE_HTML.into_response(); response.headers_mut().insert( header::CONTENT_TYPE, @@ -87,7 +93,7 @@ pub async fn get_fork_choice_ui() -> impl IntoResponse { #[cfg(test)] mod tests { use super::*; - use axum::{Router, body::Body, http::Request, http::StatusCode, routing::get}; + use axum::{Router, body::Body, http::Request, http::StatusCode}; use ethlambda_storage::{Store, backend::InMemoryBackend}; use http_body_util::BodyExt; use std::sync::Arc; @@ -96,10 +102,7 @@ mod tests { use crate::test_utils::create_test_state; fn build_test_router(store: Store) -> Router { - Router::new() - .route("/lean/v0/fork_choice", get(get_fork_choice)) - .route("/lean/v0/fork_choice/ui", get(get_fork_choice_ui)) - .with_state(store) + routes().with_state(store) } #[tokio::test] diff --git a/crates/net/rpc/src/lib.rs b/crates/net/rpc/src/lib.rs index 9906bfb9..2886cf16 100644 --- a/crates/net/rpc/src/lib.rs +++ b/crates/net/rpc/src/lib.rs @@ -1,15 +1,8 @@ use std::net::{IpAddr, SocketAddr}; -use axum::{ - Extension, Json, Router, - http::{HeaderValue, StatusCode, header}, - response::IntoResponse, - routing::get, -}; +use axum::{Extension, Router}; use ethlambda_storage::Store; use ethlambda_types::aggregator::AggregatorController; -use ethlambda_types::primitives::H256; -use libssz::SszEncode; use tokio_util::sync::CancellationToken; pub(crate) const JSON_CONTENT_TYPE: &str = "application/json; charset=utf-8"; @@ -17,11 +10,14 @@ pub(crate) const SSZ_CONTENT_TYPE: &str = "application/octet-stream"; mod admin; mod blocks; +mod core; mod fork_choice; mod heap_profiling; pub mod metrics; pub mod test_driver; +pub(crate) use core::json_response; + #[derive(Debug, Clone)] pub struct RpcConfig { pub http_address: IpAddr, @@ -100,32 +96,16 @@ pub async fn start_rpc_server( /// know about it and admin handlers extract it independently. fn build_api_router(store: Store) -> Router { Router::new() - .route("/lean/v0/health", get(metrics::get_health)) - .route("/lean/v0/states/finalized", get(get_latest_finalized_state)) - .route("/lean/v0/blocks/finalized", get(get_latest_finalized_block)) - .route( - "/lean/v0/checkpoints/justified", - get(get_latest_justified_state), - ) - .route("/lean/v0/fork_choice", get(fork_choice::get_fork_choice)) - .route( - "/lean/v0/fork_choice/ui", - get(fork_choice::get_fork_choice_ui), - ) - .route("/lean/v0/blocks/{block_id}", get(blocks::get_block)) - .route( - "/lean/v0/blocks/{block_id}/header", - get(blocks::get_block_header), - ) - .route( - "/lean/v0/admin/aggregator", - get(admin::get_aggregator).post(admin::post_aggregator), - ) + .merge(core::routes()) + .merge(blocks::routes()) + .merge(fork_choice::routes()) + .merge(admin::routes()) .with_state(store) } /// Build the debug router for profiling endpoints. fn build_debug_router() -> Router { + use axum::routing::get; Router::new() .route("/debug/pprof/allocs", get(heap_profiling::handle_get_heap)) .route( @@ -134,59 +114,6 @@ fn build_debug_router() -> Router { ) } -async fn get_latest_finalized_state( - axum::extract::State(store): axum::extract::State, -) -> impl IntoResponse { - let finalized = store.latest_finalized(); - let mut state = store - .get_state(&finalized.root) - .expect("finalized state exists"); - - // Zero state_root to match the canonical post-state representation. - // The spec's state_transition sets state_root to zero during process_block_header, - // and only fills it in lazily at the next slot's process_slots. - // Serving the canonical form ensures checkpoint sync interoperability. - state.latest_block_header.state_root = H256::ZERO; - - ssz_response(state.to_ssz()) -} - -async fn get_latest_finalized_block( - axum::extract::State(store): axum::extract::State, -) -> impl IntoResponse { - let finalized = store.latest_finalized(); - // Returns 404 for genesis since it doesn't have a valid signature - match store.get_signed_block(&finalized.root) { - Some(block) => ssz_response(block.to_ssz()), - None => StatusCode::NOT_FOUND.into_response(), - } -} - -async fn get_latest_justified_state( - axum::extract::State(store): axum::extract::State, -) -> impl IntoResponse { - let checkpoint = store.latest_justified(); - json_response(checkpoint) -} - -fn json_response(value: T) -> axum::response::Response { - let mut response = Json(value).into_response(); - response.headers_mut().insert( - header::CONTENT_TYPE, - HeaderValue::from_static(JSON_CONTENT_TYPE), - ); - response -} - -fn ssz_response(bytes: Vec) -> axum::response::Response { - let mut response = bytes.into_response(); - response.headers_mut().insert( - header::CONTENT_TYPE, - HeaderValue::from_static(SSZ_CONTENT_TYPE), - ); - response -} - #[cfg(test)] pub(crate) mod test_utils { use ethlambda_storage::{StorageBackend, Table}; @@ -267,7 +194,7 @@ pub(crate) mod test_utils { #[cfg(test)] mod tests { use super::*; - use axum::{body::Body, http::Request}; + use axum::{body::Body, http::Request, http::StatusCode, http::header}; use ethlambda_storage::{ForkCheckpoints, Store, backend::InMemoryBackend}; use http_body_util::BodyExt; use serde_json::json; From bca044ab75d5b8d8d11e9befbb806c06dc26254d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1s=20Gr=C3=BCner?= <47506558+MegaRedHand@users.noreply.github.com> Date: Wed, 24 Jun 2026 10:48:20 -0300 Subject: [PATCH 2/3] feat(rpc): add GET /lean/v0/genesis --- crates/net/rpc/src/genesis.rs | 58 +++++++++++++++++++++++++++++++++++ crates/net/rpc/src/lib.rs | 2 ++ 2 files changed, 60 insertions(+) create mode 100644 crates/net/rpc/src/genesis.rs diff --git a/crates/net/rpc/src/genesis.rs b/crates/net/rpc/src/genesis.rs new file mode 100644 index 00000000..8efbbbd2 --- /dev/null +++ b/crates/net/rpc/src/genesis.rs @@ -0,0 +1,58 @@ +use axum::{Router, extract::State, response::IntoResponse, routing::get}; +use ethlambda_storage::Store; +use serde::Serialize; + +use crate::json_response; + +#[derive(Serialize)] +struct GenesisResponse { + genesis_time: u64, + validator_count: u64, +} + +async fn get_genesis(State(store): State) -> impl IntoResponse { + let genesis_time = store.config().genesis_time; + let validator_count = store.head_state().validators.len() as u64; + json_response(GenesisResponse { + genesis_time, + validator_count, + }) +} + +pub(crate) fn routes() -> Router { + Router::new().route("/lean/v0/genesis", get(get_genesis)) +} + +#[cfg(test)] +mod tests { + use crate::test_utils::create_test_state; + use axum::{ + body::Body, + http::{Request, StatusCode}, + }; + use ethlambda_storage::{Store, backend::InMemoryBackend}; + use http_body_util::BodyExt; + use std::sync::Arc; + use tower::ServiceExt; + + #[tokio::test] + async fn genesis_returns_time_and_validator_count() { + let state = create_test_state(); // genesis_time = 1000 + let store = Store::from_anchor_state(Arc::new(InMemoryBackend::new()), state); + let app = crate::build_api_router(store); + let resp = app + .oneshot( + Request::builder() + .uri("/lean/v0/genesis") + .body(Body::empty()) + .unwrap(), + ) + .await + .unwrap(); + assert_eq!(resp.status(), StatusCode::OK); + let body = resp.into_body().collect().await.unwrap().to_bytes(); + let json: serde_json::Value = serde_json::from_slice(&body).unwrap(); + assert_eq!(json["genesis_time"], 1000); + assert_eq!(json["validator_count"], 0); + } +} diff --git a/crates/net/rpc/src/lib.rs b/crates/net/rpc/src/lib.rs index 2886cf16..c8b3470e 100644 --- a/crates/net/rpc/src/lib.rs +++ b/crates/net/rpc/src/lib.rs @@ -12,6 +12,7 @@ mod admin; mod blocks; mod core; mod fork_choice; +mod genesis; mod heap_profiling; pub mod metrics; pub mod test_driver; @@ -100,6 +101,7 @@ fn build_api_router(store: Store) -> Router { .merge(blocks::routes()) .merge(fork_choice::routes()) .merge(admin::routes()) + .merge(genesis::routes()) .with_state(store) } From c36ca30f8783d669df538ed890d7400e079340dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1s=20Gr=C3=BCner?= <47506558+MegaRedHand@users.noreply.github.com> Date: Wed, 24 Jun 2026 15:39:18 -0300 Subject: [PATCH 3/3] fix(rpc): address review feedback on genesis (non-vacuous validator_count test) Build a 3-validator anchor state in the genesis test so asserting validator_count == 3 actually exercises the handler. Also adds a clarifying comment explaining why head_state().validators.len() equals the genesis count (no churn in lean), and switches the test router to routes().with_state(store) for isolation. --- crates/net/rpc/src/genesis.rs | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/crates/net/rpc/src/genesis.rs b/crates/net/rpc/src/genesis.rs index 8efbbbd2..45638360 100644 --- a/crates/net/rpc/src/genesis.rs +++ b/crates/net/rpc/src/genesis.rs @@ -12,6 +12,8 @@ struct GenesisResponse { async fn get_genesis(State(store): State) -> impl IntoResponse { let genesis_time = store.config().genesis_time; + // Lean validators are fixed at genesis (no churn), so the current head + // state's validator registry always equals the genesis validator count. let validator_count = store.head_state().validators.len() as u64; json_response(GenesisResponse { genesis_time, @@ -25,21 +27,30 @@ pub(crate) fn routes() -> Router { #[cfg(test)] mod tests { - use crate::test_utils::create_test_state; + use super::*; use axum::{ body::Body, http::{Request, StatusCode}, }; use ethlambda_storage::{Store, backend::InMemoryBackend}; + use ethlambda_types::state::{State, Validator}; use http_body_util::BodyExt; use std::sync::Arc; use tower::ServiceExt; #[tokio::test] async fn genesis_returns_time_and_validator_count() { - let state = create_test_state(); // genesis_time = 1000 + // Build a state with 3 validators so the assertion is non-vacuous. + let dummy_validator = |index: u64| Validator { + attestation_pubkey: [0u8; 52], + proposal_pubkey: [0u8; 52], + index, + }; + let validators = vec![dummy_validator(0), dummy_validator(1), dummy_validator(2)]; + let state = State::from_genesis(1000, validators); + let store = Store::from_anchor_state(Arc::new(InMemoryBackend::new()), state); - let app = crate::build_api_router(store); + let app = routes().with_state(store); let resp = app .oneshot( Request::builder() @@ -53,6 +64,6 @@ mod tests { let body = resp.into_body().collect().await.unwrap().to_bytes(); let json: serde_json::Value = serde_json::from_slice(&body).unwrap(); assert_eq!(json["genesis_time"], 1000); - assert_eq!(json["validator_count"], 0); + assert_eq!(json["validator_count"], 3); } }