Gusinacio/bump axum reqwest (#151)

* chore: bump axum to 0.7.0, reqwest to 0.12 and deps

Signed-off-by: Gustavo Inacio <[email protected]>

* chore: use crates.io for thegraph-graphql-http

Signed-off-by: Gustavo Inacio <[email protected]>

* chore: remove comment

Signed-off-by: Gustavo Inacio <[email protected]>

* fix: use expect to bind to ports

Signed-off-by: Gustavo Inacio <[email protected]>

---------

Signed-off-by: Gustavo Inacio <[email protected]>

Author: gusinacio

Cargo.lock

@@ -18,34 +18,33 @@ lru = "0.11.1"
 once_cell = "1.17"
 prometheus = "0.13.3"
 regex = "1.7.1"
-reqwest = "0.11.20"
+reqwest = "0.12"
 secp256k1 = { version = "0.28.0", features = ["recovery"] }
 serde = { version = "1.0.188", features = ["derive"] }
 serde_json = { version = "1.0.107", features = ["arbitrary_precision"] }
 sqlx = { version = "0.7.1", features = [
-  "postgres",
-  "runtime-tokio",
-  "bigdecimal",
-  "rust_decimal",
-  "time",
+    "postgres",
+    "runtime-tokio",
+    "bigdecimal",
+    "rust_decimal",
+    "time",
 ] }
 tokio = { version = "1.32.0", features = ["full", "macros", "rt"] }
 thegraph = { git = "https://github.com/edgeandnode/toolshed", tag = "thegraph-v0.5.0" }
-graphql-http = { git = "https://github.com/edgeandnode/toolshed", tag = "graphql-http-v0.2.1", features = [
-  "http-reqwest",
+thegraph-graphql-http = { version = "0.2.0", features = [
+    "http-client-reqwest",
 ] }
 tap_core = "0.8.0"
-axum = { version = "0.6.20", default_features = true, features = ["headers"] }
+axum = { version = "0.7.5", default_features = true }
+axum-extra = { version = "0.9.3", features = ["typed-header"] }
 thiserror = "1.0.49"
 async-trait = "0.1.74"
-headers-derive = "0.1.1"
-headers = "0.3.9"
 build-info = "0.0.34"
-autometrics = { version = "0.6.0", features = ["prometheus-exporter"] }
+autometrics = { version = "1.0.1", features = ["prometheus-exporter"] }
 tracing = "0.1.40"
 tower = "0.4.13"
-tower_governor = "0.1.0"
-tower-http = { version = "0.4.4", features = ["trace"] }
+tower_governor = "0.3.2"
+tower-http = { version = "0.5.2", features = ["trace"] }
 tokio-util = "0.7.10"
 bigdecimal = "0.4.2"
 

common/Cargo.toml

@@ -11,13 +11,12 @@ use anyhow;
 use autometrics::prometheus_exporter;
 use axum::extract::MatchedPath;
 use axum::http::Request;
+use axum::serve;
 use axum::{
     async_trait,
-    body::Body,
-    error_handling::HandleErrorLayer,
     response::{IntoResponse, Response},
     routing::{get, post},
-    BoxError, Extension, Json, Router, Server,
+    Extension, Json, Router,
 };
 use build_info::BuildInfo;
 use eventuals::Eventual;
@@ -28,9 +27,9 @@ use tap_core::{manager::Manager, receipt::checks::Checks};
 use thegraph::types::Address;
 use thegraph::types::{Attestation, DeploymentId};
 use thiserror::Error;
+use tokio::net::TcpListener;
 use tokio::signal;
-use tower::ServiceBuilder;
-use tower_governor::{errors::display_error, governor::GovernorConfigBuilder, GovernorLayer};
+use tower_governor::{governor::GovernorConfigBuilder, GovernorLayer};
 use tower_http::trace::TraceLayer;
 use tracing::{info, info_span};
 
@@ -167,7 +166,7 @@ where
     pub release: IndexerServiceRelease,
     pub url_namespace: &'static str,
     pub metrics_prefix: &'static str,
-    pub extra_routes: Router<Arc<IndexerServiceState<I>>, Body>,
+    pub extra_routes: Router<Arc<IndexerServiceState<I>>>,
 }
 
 pub struct IndexerServiceState<I>
@@ -329,13 +328,7 @@ impl IndexerService {
             .route("/", get("Service is up and running"))
             .route("/version", get(Json(options.release)))
             .route("/info", get(operator_address))
-            .layer(
-                ServiceBuilder::new()
-                    .layer(HandleErrorLayer::new(|e: BoxError| async move {
-                        display_error(e)
-                    }))
-                    .layer(misc_rate_limiter),
-            );
+            .layer(misc_rate_limiter);
 
         // Rate limits by allowing bursts of 50 requests and requiring 20ms of
         // time between consecutive requests after that, effectively rate
@@ -360,13 +353,7 @@ impl IndexerService {
                     .route_layer(Extension(
                         options.config.network_subgraph.serve_auth_token.clone(),
                     ))
-                    .route_layer(
-                        ServiceBuilder::new()
-                            .layer(HandleErrorLayer::new(|e: BoxError| async move {
-                                display_error(e)
-                            }))
-                            .layer(static_subgraph_rate_limiter.clone()),
-                    ),
+                    .route_layer(static_subgraph_rate_limiter.clone()),
             );
         }
 
@@ -379,13 +366,7 @@ impl IndexerService {
                 .route_layer(Extension(
                     options.config.escrow_subgraph.serve_auth_token.clone(),
                 ))
-                .route_layer(
-                    ServiceBuilder::new()
-                        .layer(HandleErrorLayer::new(|e: BoxError| async move {
-                            display_error(e)
-                        }))
-                        .layer(static_subgraph_rate_limiter),
-                );
+                .route_layer(static_subgraph_rate_limiter);
         }
 
         misc_routes = misc_routes.with_state(state.clone());
@@ -435,11 +416,16 @@ impl IndexerService {
             address = %options.config.server.host_and_port,
             "Serving requests",
         );
+        let listener = TcpListener::bind(&options.config.server.host_and_port)
+            .await
+            .expect("Failed to bind to indexer-service port");
 
-        Ok(Server::bind(&options.config.server.host_and_port)
-            .serve(router.into_make_service_with_connect_info::<SocketAddr>())
-            .with_graceful_shutdown(shutdown_signal())
-            .await?)
+        Ok(serve(
+            listener,
+            router.into_make_service_with_connect_info::<SocketAddr>(),
+        )
+        .with_graceful_shutdown(shutdown_signal())
+        .await?)
     }
 
     fn serve_metrics(host_and_port: SocketAddr) {
@@ -451,10 +437,14 @@ impl IndexerService {
                 get(|| async { prometheus_exporter::encode_http_response() }),
             );
 
-            Server::bind(&host_and_port)
-                .serve(router.into_make_service())
-                .await
-                .expect("Failed to serve metrics")
+            serve(
+                TcpListener::bind(host_and_port)
+                    .await
+                    .expect("Failed to bind to metrics port"),
+                router.into_make_service(),
+            )
+            .await
+            .expect("Failed to serve metrics")
         });
     }
 }

common/src/indexer_service/http/indexer_service.rs

@@ -8,8 +8,8 @@ use axum::{
     extract::{Path, State},
     http::HeaderMap,
     response::IntoResponse,
-    TypedHeader,
 };
+use axum_extra::TypedHeader;
 use reqwest::StatusCode;
 use thegraph::types::DeploymentId;
 use tracing::trace;

common/src/indexer_service/http/request_handler.rs

@@ -3,7 +3,7 @@
 
 use std::ops::Deref;
 
-use headers::{Header, HeaderName, HeaderValue};
+use axum_extra::headers::{self, Header, HeaderName, HeaderValue};
 use lazy_static::lazy_static;
 use tap_core::receipt::SignedReceipt;
 
@@ -61,7 +61,8 @@ impl Header for ScalarReceipt {
 mod test {
     use std::str::FromStr;
 
-    use axum::{headers::Header, http::HeaderValue};
+    use axum::http::HeaderValue;
+    use axum_extra::headers::Header;
     use thegraph::types::Address;
 
     use crate::test_vectors::create_signed_receipt;

common/src/indexer_service/http/scalar_receipt_header.rs

@@ -4,15 +4,15 @@
 use anyhow::anyhow;
 use axum::body::Bytes;
 use eventuals::Eventual;
-use graphql_http::{
-    graphql::{Document, IntoDocument},
-    http::request::{IntoRequestParameters, RequestParameters},
-    http_client::{ReqwestExt, ResponseResult},
-};
 use reqwest::{header, Url};
 use serde::de::Deserialize;
 use serde_json::{Map, Value};
 use thegraph::types::DeploymentId;
+use thegraph_graphql_http::{
+    graphql::{Document, IntoDocument},
+    http::request::{IntoRequestParameters, RequestParameters},
+    http_client::{ReqwestExt, ResponseResult},
+};
 use tracing::warn;
 
 use super::monitor::{monitor_deployment_status, DeploymentStatus};

common/src/subgraph_client/client.rs

@@ -4,14 +4,14 @@
 use std::time::Duration;
 
 use eventuals::{timer, Eventual, EventualExt};
-use graphql_http::{
-    http::request::IntoRequestParameters,
-    http_client::{ReqwestExt, ResponseResult},
-};
 use reqwest::Url;
 use serde::Deserialize;
 use serde_json::json;
 use thegraph::types::DeploymentId;
+use thegraph_graphql_http::{
+    http::request::IntoRequestParameters,
+    http_client::{ReqwestExt, ResponseResult},
+};
 use tokio::time::sleep;
 use tracing::warn;
 

common/src/subgraph_client/monitor.rs

@@ -15,13 +15,13 @@ eventuals = "0.6.7"
 dotenvy = "0.15"
 log = "0.4.17"
 anyhow = "1.0.57"
-reqwest = "0.11.10"
+reqwest = { version = "0.12", features = ["json"] }
 tokio = { version = "1", features = ["rt", "macros", "sync", "full"] }
 tracing = "0.1.34"
 thiserror = "1.0.49"
 serde = { version = "1.0", features = ["rc", "derive"] }
 serde_json = "1"
-axum = "0.6.20"
+axum = "0.7.5"
 hyper = "0.14.27"
 tower = { version = "0.4", features = ["util", "timeout", "limit"] }
 tower-http = { version = "0.4.0", features = [
@@ -30,8 +30,8 @@ tower-http = { version = "0.4.0", features = [
     "cors",
 ] }
 once_cell = "1.17"
-async-graphql = "6.0.11"
-async-graphql-axum = "6.0.11"
+async-graphql = "7.0.3"
+async-graphql-axum = "7.0.3"
 sha3 = "0.10.6"
 tracing-subscriber = { version = "0.3", features = [
     "env-filter",
@@ -58,8 +58,8 @@ alloy-sol-types = "0.6"
 lazy_static = "1.4.0"
 thegraph = { git = "https://github.com/edgeandnode/toolshed", tag = "thegraph-v0.5.0" }
 graphql = { git = "https://github.com/edgeandnode/toolshed", tag = "graphql-v0.3.0" }
-graphql-http = { git = "https://github.com/edgeandnode/toolshed", tag = "graphql-http-v0.2.1", features = [
-    "http-reqwest",
+thegraph-graphql-http = { version = "0.2.0", features = [
+    "http-client-reqwest",
 ] }
 build-info = "0.0.34"
 figment = { version = "0.10", features = ["toml", "env"] }

service/Cargo.toml

@@ -7,11 +7,11 @@ use std::sync::Arc;
 use async_graphql_axum::GraphQLRequest;
 use axum::{extract::State, response::IntoResponse, Json};
 use graphql::graphql_parser::query as q;
-use graphql_http::{
+use serde_json::{json, Map, Value};
+use thegraph_graphql_http::{
     http::request::{IntoRequestParameters, RequestParameters},
     http_client::{ReqwestExt, ResponseError},
 };
-use serde_json::{json, Map, Value};
 
 use crate::{SubgraphServiceError, SubgraphServiceState};
 

service/src/routes/status.rs

@@ -22,7 +22,7 @@ eventuals = "0.6.7"
 indexer-common = { version = "0.1.0", path = "../common" }
 jsonrpsee = { version = "0.20.2", features = ["http-client", "macros"] }
 lazy_static = "1.4.0"
-reqwest = "0.11.20"
+reqwest = "0.12"
 serde = "1.0.188"
 serde_json = "1.0.104"
 serde_yaml = "0.9.25"
@@ -38,7 +38,9 @@ tap_core = "0.8.0"
 thiserror = "1.0.44"
 tokio = { version = "1.33.0" }
 thegraph = { git = "https://github.com/edgeandnode/toolshed", tag = "thegraph-v0.5.0" }
-graphql-http = { git = "https://github.com/edgeandnode/toolshed", tag = "graphql-http-v0.2.1" }
+thegraph-graphql-http = { version = "0.2.0", features = [
+    "http-client-reqwest",
+] }
 tracing = "0.1.37"
 tracing-subscriber = { version = "0.3", features = [
     "env-filter",
@@ -48,7 +50,7 @@ tracing-subscriber = { version = "0.3", features = [
     "json",
 ] }
 enum-as-inner = "0.6.0"
-ethers = "2.0.13"
+ethers = "2.0.14"
 typetag = "0.2.14"
 ractor = "0.9.7"