apollo_storage,apollo_rpc: migrate hyper to 1.x PART 10 (#12074)

Author: victorkstarkware

Cargo.lock

@@ -218,6 +218,7 @@ async-recursion = "1.1.0"
 async-stream = "0.3.3"
 async-trait = "0.1.79"
 asynchronous-codec = "0.7.0"
+# TODO(victork): finalise migration to hyper 1.x
 axum_08 = { package = "axum", version = "0.8" }
 base64 = "0.13.0"
 bench_tools.path = "crates/bench_tools"
@@ -276,9 +277,7 @@ insta = "1.29.0"
 integer-encoding = "3.0.4"
 itertools = "0.12.1"
 json-patch = "4.1.0"
-tower = { package = "tower", version = "0.4.13" }
-# TODO(victork): upgrade to jsonrpsee 0.26+ (uses tower 0.5, but has breaking API changes in RpcServiceT)
-jsonrpsee = "0.24.10"
+jsonrpsee = "0.26.0"
 jsonschema = "0.17.0"
 keccak = "0.1.3"
 lazy_static = "1.5.0"
@@ -376,6 +375,7 @@ tokio-test = "0.4.4"
 tokio-util = "0.7.13"
 toml = "0.8"
 toml_test_utils.path = "toml_test_utils"
+tower = { package = "tower", version = "0.4.13" }
 tower_05 = { package = "tower", version = "0.5.2" }
 tracing = "0.1.37"
 tracing-subscriber = "0.3.16"

Cargo.toml

@@ -30,8 +30,6 @@ serde_json = { workspace = true, features = ["arbitrary_precision"] }
 starknet-types-core.workspace = true
 starknet_api.workspace = true
 tokio = { workspace = true, features = ["full", "sync"] }
-# tower 0.4 is required for jsonrpsee 0.24 http middleware compatibility (jsonrpsee expects tower 0.4 types)
-tower = { version = "0.4.13", features = ["full"] }
 tower_05 = { workspace = true, features = ["full"] }
 tracing.workspace = true
 validator = { workspace = true, features = ["derive"] }

crates/apollo_rpc/Cargo.toml

@@ -33,7 +33,7 @@ use apollo_storage::state::StateStorageReader;
 use apollo_storage::{StorageReader, StorageScope, StorageTxn};
 use jsonrpsee::core::RpcResult;
 use jsonrpsee::server::middleware::rpc::RpcServiceBuilder;
-use jsonrpsee::server::{Server, ServerHandle};
+use jsonrpsee::server::{Server, ServerConfig, ServerHandle};
 use jsonrpsee::types::error::ErrorCode::InternalError;
 use jsonrpsee::types::error::INTERNAL_ERROR_MSG;
 use jsonrpsee::types::ErrorObjectOwned;
@@ -44,6 +44,7 @@ use serde::{Deserialize, Serialize};
 use starknet_api::block::{BlockHashAndNumber, BlockNumber, BlockStatus};
 use starknet_api::core::ChainId;
 use tokio::sync::RwLock;
+use tower_05::ServiceBuilder;
 use tracing::{debug, error, info, instrument};
 // Aliasing the latest version of the RPC.
 use v0_8 as latest;
@@ -244,9 +245,10 @@ pub async fn run_server(
     );
     let addr;
     let handle;
+    let server_config = ServerConfig::builder().max_request_body_size(SERVER_MAX_BODY_SIZE).build();
     let server_builder = Server::builder()
-        .max_request_body_size(SERVER_MAX_BODY_SIZE)
-        .set_http_middleware(tower::ServiceBuilder::new().filter_async(proxy_rpc_request));
+        .set_config(server_config)
+        .set_http_middleware(ServiceBuilder::new().filter_async(proxy_rpc_request));
 
     let server_address = SocketAddr::new(config.ip, config.port);
 

crates/apollo_rpc/src/lib.rs

@@ -1,7 +1,7 @@
 use jsonrpsee::core::http_helpers::read_body;
 use jsonrpsee::server::HttpRequest;
 use regex::Regex;
-use tower::BoxError;
+use tower_05::BoxError;
 use tracing::debug;
 
 use crate::version_config::{VERSION_0_8, VERSION_PATTERN};