Merge branch 'main' into mb/remove_accounts

Author: ManuelBilbao

Cargo.lock

@@ -5,7 +5,7 @@ resolver = "2"
 [workspace.package]
 edition = "2021"
 rust-version = "1.83"
-version = "0.7.0-rc.2"
+version = "0.8.0-rc.1"
 
 [workspace.dependencies]
 aes = "0.8"

Cargo.toml

@@ -3,7 +3,7 @@ TERMS OF USE
 
 PLEASE READ THE FOLLOWING TERMS AND CONDITIONS (THE “TERMS”) WHICH CONSTITUTE THE AGREEMENT BETWEEN YOU OR ANY ENTITY ON WHOSE BEHALF YOU ACCESS OR USE THE FEATURES DESCRIBED HEREIN (“USER” OR “YOU”), AND COMMIT-BOOST, INC. (“COMMIT-BOOST”). THIS AGREEMENT REPRESENTS THE ENTIRE AGREEMENT CONCERNING THE FEATURES BETWEEN THE PARTIES AND IT SUPERSEDES ANY PRIOR PROPOSAL, REPRESENTATION, OR UNDERSTANDING BETWEEN THE PARTIES. COMMIT-BOOST AND USER ARE HEREINAFTER JOINTLY DEFINED AS THE “PARTIES” OR INDIVIDUALLY A “PARTY”.
 
-These Terms of Use (as amended or supplemented from time to time, these "Terms") explain the terms and conditions by which you may access and/or use Commit-Boost, Inc.’s website, https://github.com/Commit-Boost, tools, software, documentation, and other online properties (collectively, “Features”) provided by the Commit-Boost, Inc. (“Commit-Boost,” “we,” “us,” or “our”) repository. 
+These Terms of Use (as amended or supplemented from time to time, these "Terms") explain the terms and conditions by which you may access and/or use Commit-Boost, Inc.’s website, https://github.com/Commit-Boost, tools, software, documentation, projects, and other online properties (collectively, “Features”) provided by the Commit-Boost, Inc. (“Commit-Boost,” “we,” “us,” or “our”) repository. 
 
 All access and use of the Features is subject to these Terms. By accessing or otherwise using the Features, you acknowledge that you have read, understood, and agree to be bound by these Terms. If you do not accept the terms and conditions of these Terms, you will not access, browse, or otherwise use the Features.
 

TERMS-OF-USE.md

@@ -217,10 +217,12 @@ sol! {
     "src/abi/LidoNORegistry.json"
 }
 
+// Fetching Lido Curated Module
 fn lido_registry_address(chain: Chain) -> eyre::Result<Address> {
     match chain {
         Chain::Mainnet => Ok(address!("55032650b14df07b85bF18A3a3eC8E0Af2e028d5")),
         Chain::Holesky => Ok(address!("595F64Ddc3856a3b5Ff4f4CC1d1fb4B46cFd2bAC")),
+        Chain::Hoodi => Ok(address!("5cDbE1590c083b5A2A64427fAA63A7cfDB91FbB5")),
         Chain::Sepolia => Ok(address!("33d6E15047E8644F8DDf5CD05d202dfE587DA6E3")),
         _ => bail!("Lido registry not supported for chain: {chain:?}"),
     }
@@ -290,6 +292,7 @@ async fn fetch_ssv_pubkeys(
     let chain_name = match chain {
         Chain::Mainnet => "mainnet",
         Chain::Holesky => "holesky",
+        Chain::Hoodi => "hoodi",
         _ => bail!("SSV network is not supported for chain: {chain:?}"),
     };
 

crates/common/src/config/mux.rs

@@ -10,9 +10,12 @@ pub const TIMEOUT_ERROR_CODE_STR: &str = "555";
 
 /// 20 MiB to cover edge cases for heavy blocks and also add a bit of slack for
 /// any Ethereum upgrades in the near future
-pub const MAX_SIZE_SUBMIT_BLOCK: usize = 20 * 1024 * 1024;
+pub const MAX_SIZE_SUBMIT_BLOCK_RESPONSE: usize = 20 * 1024 * 1024;
+
+/// 20 MiB, enough to process ~45000 registrations in one request
+pub const MAX_SIZE_REGISTER_VALIDATOR_REQUEST: usize = 20 * 1024 * 1024;
 
 /// 10 KiB, headers are around 700 bytes + buffer for encoding
-pub const MAX_SIZE_GET_HEADER: usize = 10 * 1024;
+pub const MAX_SIZE_GET_HEADER_RESPONSE: usize = 10 * 1024;
 
 pub const MAX_SIZE_DEFAULT: usize = 1024;

crates/pbs/src/constants.rs

@@ -31,7 +31,8 @@ use url::Url;
 
 use crate::{
     constants::{
-        GET_HEADER_ENDPOINT_TAG, MAX_SIZE_GET_HEADER, TIMEOUT_ERROR_CODE, TIMEOUT_ERROR_CODE_STR,
+        GET_HEADER_ENDPOINT_TAG, MAX_SIZE_GET_HEADER_RESPONSE, TIMEOUT_ERROR_CODE,
+        TIMEOUT_ERROR_CODE_STR,
     },
     metrics::{RELAY_HEADER_VALUE, RELAY_LAST_SLOT, RELAY_LATENCY, RELAY_STATUS_CODE},
     state::{BuilderApiState, PbsState},
@@ -323,7 +324,7 @@ async fn send_one_get_header(
     let code = res.status();
     RELAY_STATUS_CODE.with_label_values(&[code.as_str(), GET_HEADER_ENDPOINT_TAG, &relay.id]).inc();
 
-    let response_bytes = read_chunked_body_with_max(res, MAX_SIZE_GET_HEADER).await?;
+    let response_bytes = read_chunked_body_with_max(res, MAX_SIZE_GET_HEADER_RESPONSE).await?;
     if !code.is_success() {
         return Err(PbsError::RelayResponse {
             error_msg: String::from_utf8_lossy(&response_bytes).into_owned(),

crates/pbs/src/mev_boost/get_header.rs

@@ -16,7 +16,9 @@ use tracing::{debug, warn};
 use url::Url;
 
 use crate::{
-    constants::{MAX_SIZE_SUBMIT_BLOCK, SUBMIT_BLINDED_BLOCK_ENDPOINT_TAG, TIMEOUT_ERROR_CODE_STR},
+    constants::{
+        MAX_SIZE_SUBMIT_BLOCK_RESPONSE, SUBMIT_BLINDED_BLOCK_ENDPOINT_TAG, TIMEOUT_ERROR_CODE_STR,
+    },
     metrics::{RELAY_LATENCY, RELAY_STATUS_CODE},
     state::{BuilderApiState, PbsState},
     utils::read_chunked_body_with_max,
@@ -139,7 +141,7 @@ async fn send_submit_block(
         .with_label_values(&[code.as_str(), SUBMIT_BLINDED_BLOCK_ENDPOINT_TAG, &relay.id])
         .inc();
 
-    let response_bytes = read_chunked_body_with_max(res, MAX_SIZE_SUBMIT_BLOCK).await?;
+    let response_bytes = read_chunked_body_with_max(res, MAX_SIZE_SUBMIT_BLOCK_RESPONSE).await?;
     if !code.is_success() {
         let err = PbsError::RelayResponse {
             error_msg: String::from_utf8_lossy(&response_bytes).into_owned(),

crates/pbs/src/mev_boost/submit_block.rs

@@ -1,5 +1,5 @@
 use axum::{
-    extract::{MatchedPath, Request},
+    extract::{DefaultBodyLimit, MatchedPath, Request},
     middleware::{self, Next},
     response::Response,
     routing::{get, post},
@@ -20,16 +20,27 @@ use super::{
 use crate::{
     api::BuilderApi,
     state::{BuilderApiState, PbsStateGuard},
+    MAX_SIZE_REGISTER_VALIDATOR_REQUEST, MAX_SIZE_SUBMIT_BLOCK_RESPONSE,
 };
 
 pub fn create_app_router<S: BuilderApiState, A: BuilderApi<S>>(state: PbsStateGuard<S>) -> Router {
+    // DefaultBodyLimit is 2Mib by default, so we only increase it for a few routes
+    // thay may need more
+
     let builder_routes = Router::new()
         .route(GET_HEADER_PATH, get(handle_get_header::<S, A>))
         .route(GET_STATUS_PATH, get(handle_get_status::<S, A>))
-        .route(REGISTER_VALIDATOR_PATH, post(handle_register_validator::<S, A>))
-        .route(SUBMIT_BLOCK_PATH, post(handle_submit_block::<S, A>));
+        .route(
+            REGISTER_VALIDATOR_PATH,
+            post(handle_register_validator::<S, A>)
+                .route_layer(DefaultBodyLimit::max(MAX_SIZE_REGISTER_VALIDATOR_REQUEST)),
+        )
+        .route(
+            SUBMIT_BLOCK_PATH,
+            post(handle_submit_block::<S, A>)
+                .route_layer(DefaultBodyLimit::max(MAX_SIZE_SUBMIT_BLOCK_RESPONSE)),
+        ); // header is smaller than the response but err on the safe side
     let reload_router = Router::new().route(RELOAD_PATH, post(handle_reload::<S, A>));
-
     let builder_api = Router::new().nest(BUILDER_API_PATH, builder_routes).merge(reload_router);
 
     let app = if let Some(extra_routes) = A::extra_routes() {
@@ -58,7 +69,7 @@ pub async fn tracing_middleware(req: Request, next: Next) -> Response {
     trace!(
         http.method = %req.method(),
         http.user_agent = req.headers().typed_get::<UserAgent>().map(|ua| ua.to_string()).unwrap_or_default(),
-        http.content_type = req.headers().typed_get::<ContentType>().map(|ua| ua.to_string()).unwrap_or_default(), 
+        http.content_type = req.headers().typed_get::<ContentType>().map(|ua| ua.to_string()).unwrap_or_default(),
     "start request");
 
     let response = next.run(req).await;

crates/pbs/src/routes/router.rs

@@ -24,3 +24,5 @@ Commit-Boost runs as a single sidecar composed of multiple modules:
 <br/>
 
 Commit-Boost is being developed in Rust from scratch, and has been designed with safety and modularity at its core, with the goal of not limiting the market downstream including stakeholders, flows, proposer commitments, enforcement mechanisms, etc.
+
+Please see Commit-Boost, Inc's [terms of service](https://github.com/Commit-Boost/commit-boost-client/blob/main/TERMS-OF-USE.md). 

docs/docs/intro.md

@@ -25,7 +25,7 @@ use cb_common::{
     types::Chain,
     utils::{blst_pubkey_to_alloy, timestamp_of_slot_start_sec},
 };
-use cb_pbs::MAX_SIZE_SUBMIT_BLOCK;
+use cb_pbs::MAX_SIZE_SUBMIT_BLOCK_RESPONSE;
 use tokio::net::TcpListener;
 use tracing::debug;
 use tree_hash::TreeHash;
@@ -136,7 +136,7 @@ async fn handle_register_validator(
 async fn handle_submit_block(State(state): State<Arc<MockRelayState>>) -> Response {
     state.received_submit_block.fetch_add(1, Ordering::Relaxed);
     if state.large_body() {
-        (StatusCode::OK, Json(vec![1u8; 1 + MAX_SIZE_SUBMIT_BLOCK])).into_response()
+        (StatusCode::OK, Json(vec![1u8; 1 + MAX_SIZE_SUBMIT_BLOCK_RESPONSE])).into_response()
     } else {
         let response = SubmitBlindedBlockResponse::default();
         (StatusCode::OK, Json(response)).into_response()