feat: update tap, axum, tonic, alloy dependencies:

Author: suchapalaver

Cargo.lock

@@ -21,7 +21,7 @@ opt-level = 3
 [workspace.dependencies]
 anyhow = { version = "1.0.72" }
 async-trait = "0.1.83"
-axum = { version = "0.7.9", default-features = false, features = [
+axum = { version = "0.8.3", default-features = false, features = [
     "tokio",
     "http1",
     "http2",
@@ -74,13 +74,13 @@ sqlx = { version = "0.8.2", features = [
     "uuid",
 ], default-features = false }
 stdext = "0.3.3"
-tap_aggregator = { version = "0.4.0", default-features = false }
-tap_core = { version = "3.0.0", default-features = false }
-tap_graph = { version = "0.2.0", features = ["v2"] }
+tap_aggregator = { version = "0.5.1", default-features = false }
+tap_core = { version = "4.1.0", default-features = false }
+tap_graph = { version = "0.3.0", features = ["v2"] }
 tempfile = "3.8.0"
 test-log = { version = "0.2.12", default-features = false }
 test-with = "0.14.6"
-thegraph-core = { version = "0.11.0", features = [
+thegraph-core = { version = "0.14.0", features = [
     "attestation",
     "alloy-eip712",
     "alloy-sol-types",
@@ -94,8 +94,8 @@ thegraph-graphql-http = { version = "0.3.2", features = ["reqwest"] }
 thiserror = "1.0.49"
 tokio = "1.40"
 tokio-test = "0.4.4"
-tonic = { version = "0.12.3", features = ["tls-roots", "gzip"] }
-tonic-build = "0.12.3"
+tonic = { version = "0.13.0", features = ["tls-native-roots", "gzip"] }
+tonic-build = "0.13.0"
 tower-service = "0.3.3"
 tower-test = "0.4.0"
 tracing = { version = "0.1.40", default-features = false }
@@ -106,19 +106,7 @@ tracing-subscriber = { version = "0.3", features = [
 ], default-features = false }
 uuid = { version = "1.11.0", features = ["v7"] }
 wiremock = "0.6.1"
-wiremock-grpc = "0.0.3-alpha3"
-
-[patch.crates-io.tap_core]
-git = "https://github.com/semiotic-ai/timeline-aggregation-protocol"
-rev = "9fd4beb"
-
-[patch.crates-io.tap_aggregator]
-git = "https://github.com/semiotic-ai/timeline-aggregation-protocol"
-rev = "9fd4beb"
-
-[patch.crates-io.tap_graph]
-git = "https://github.com/semiotic-ai/timeline-aggregation-protocol"
-rev = "9fd4beb"
+wiremock-grpc = { git = "https://github.com/semiotic-ai/wiremock-grpc-rs.git", branch = "main" }
 
 # Insta benefits from being compiled in release mode, even as dev dependency
 # see https://insta.rs/docs/quickstart

Cargo.toml

@@ -38,10 +38,10 @@ impl AgreementStore for PsqlAgreementStore {
             Err(err) => return Err(DipsError::UnknownError(err.into())),
         };
 
-        let signed = SignedIndexingAgreementVoucher::abi_decode(item.signed_payload.as_ref(), true)
+        let signed = SignedIndexingAgreementVoucher::abi_decode(item.signed_payload.as_ref())
             .map_err(|e| DipsError::AbiDecoding(e.to_string()))?;
         let metadata =
-            SubgraphIndexingVoucherMetadata::abi_decode(signed.voucher.metadata.as_ref(), true)
+            SubgraphIndexingVoucherMetadata::abi_decode(signed.voucher.metadata.as_ref())
                 .map_err(|e| DipsError::AbiDecoding(e.to_string()))?;
         let cancelled = item.cancelled_at.is_some();
         Ok(Some(StoredIndexingAgreement {

crates/dips/src/database.rs

@@ -6,9 +6,7 @@ use std::{str::FromStr, sync::Arc};
 use server::DipsServerContext;
 use thegraph_core::alloy::{
     core::primitives::Address,
-    primitives::{
-        b256, ruint::aliases::U256, ChainId, PrimitiveSignature as Signature, Uint, B256,
-    },
+    primitives::{b256, ruint::aliases::U256, ChainId, Signature, Uint, B256},
     signers::SignerSync,
     sol,
     sol_types::{eip712_domain, Eip712Domain, SolStruct, SolValue},
@@ -315,13 +313,11 @@ pub async fn validate_and_create_agreement(
         registry,
         additional_networks,
     } = ctx.as_ref();
-    let decoded_voucher = SignedIndexingAgreementVoucher::abi_decode(voucher.as_ref(), true)
+    let decoded_voucher = SignedIndexingAgreementVoucher::abi_decode(voucher.as_ref())
         .map_err(|e| DipsError::AbiDecoding(e.to_string()))?;
-    let metadata = SubgraphIndexingVoucherMetadata::abi_decode(
-        decoded_voucher.voucher.metadata.as_ref(),
-        true,
-    )
-    .map_err(|e| DipsError::AbiDecoding(e.to_string()))?;
+    let metadata =
+        SubgraphIndexingVoucherMetadata::abi_decode(decoded_voucher.voucher.metadata.as_ref())
+            .map_err(|e| DipsError::AbiDecoding(e.to_string()))?;
 
     decoded_voucher.validate(signer_validator, domain, expected_payee, allowed_payers)?;
 
@@ -426,9 +422,8 @@ pub async fn validate_and_cancel_agreement(
     domain: &Eip712Domain,
     cancellation_request: Vec<u8>,
 ) -> Result<Uuid, DipsError> {
-    let decoded_request =
-        SignedCancellationRequest::abi_decode(cancellation_request.as_ref(), true)
-            .map_err(|e| DipsError::AbiDecoding(e.to_string()))?;
+    let decoded_request = SignedCancellationRequest::abi_decode(cancellation_request.as_ref())
+        .map_err(|e| DipsError::AbiDecoding(e.to_string()))?;
 
     // Get the agreement ID from the cancellation request
     let agreement_id = Uuid::from_bytes(decoded_request.request.agreement_id.into());

crates/dips/src/lib.rs

@@ -113,7 +113,7 @@ pub mod gateway_dips_service_client {
     }
     impl<T> GatewayDipsServiceClient<T>
     where
-        T: tonic::client::GrpcService<tonic::body::BoxBody>,
+        T: tonic::client::GrpcService<tonic::body::Body>,
         T::Error: Into<StdError>,
         T::ResponseBody: Body<Data = Bytes> + std::marker::Send + 'static,
         <T::ResponseBody as Body>::Error: Into<StdError> + std::marker::Send,
@@ -134,13 +134,13 @@ pub mod gateway_dips_service_client {
             F: tonic::service::Interceptor,
             T::ResponseBody: Default,
             T: tonic::codegen::Service<
-                http::Request<tonic::body::BoxBody>,
+                http::Request<tonic::body::Body>,
                 Response = http::Response<
-                    <T as tonic::client::GrpcService<tonic::body::BoxBody>>::ResponseBody,
+                    <T as tonic::client::GrpcService<tonic::body::Body>>::ResponseBody,
                 >,
             >,
             <T as tonic::codegen::Service<
-                http::Request<tonic::body::BoxBody>,
+                http::Request<tonic::body::Body>,
             >>::Error: Into<StdError> + std::marker::Send + std::marker::Sync,
         {
             GatewayDipsServiceClient::new(InterceptedService::new(inner, interceptor))
@@ -349,7 +349,7 @@ pub mod gateway_dips_service_server {
         B: Body + std::marker::Send + 'static,
         B::Error: Into<StdError> + std::marker::Send + 'static,
     {
-        type Response = http::Response<tonic::body::BoxBody>;
+        type Response = http::Response<tonic::body::Body>;
         type Error = std::convert::Infallible;
         type Future = BoxFuture<Self::Response, Self::Error>;
         fn poll_ready(
@@ -454,7 +454,9 @@ pub mod gateway_dips_service_server {
                 }
                 _ => {
                     Box::pin(async move {
-                        let mut response = http::Response::new(empty_body());
+                        let mut response = http::Response::new(
+                            tonic::body::Body::default(),
+                        );
                         let headers = response.headers_mut();
                         headers
                             .insert(

crates/dips/src/proto/graphprotocol.gateway.dips.rs

@@ -99,7 +99,7 @@ pub mod indexer_dips_service_client {
     }
     impl<T> IndexerDipsServiceClient<T>
     where
-        T: tonic::client::GrpcService<tonic::body::BoxBody>,
+        T: tonic::client::GrpcService<tonic::body::Body>,
         T::Error: Into<StdError>,
         T::ResponseBody: Body<Data = Bytes> + std::marker::Send + 'static,
         <T::ResponseBody as Body>::Error: Into<StdError> + std::marker::Send,
@@ -120,13 +120,13 @@ pub mod indexer_dips_service_client {
             F: tonic::service::Interceptor,
             T::ResponseBody: Default,
             T: tonic::codegen::Service<
-                http::Request<tonic::body::BoxBody>,
+                http::Request<tonic::body::Body>,
                 Response = http::Response<
-                    <T as tonic::client::GrpcService<tonic::body::BoxBody>>::ResponseBody,
+                    <T as tonic::client::GrpcService<tonic::body::Body>>::ResponseBody,
                 >,
             >,
             <T as tonic::codegen::Service<
-                http::Request<tonic::body::BoxBody>,
+                http::Request<tonic::body::Body>,
             >>::Error: Into<StdError> + std::marker::Send + std::marker::Sync,
         {
             IndexerDipsServiceClient::new(InterceptedService::new(inner, interceptor))
@@ -327,7 +327,7 @@ pub mod indexer_dips_service_server {
         B: Body + std::marker::Send + 'static,
         B::Error: Into<StdError> + std::marker::Send + 'static,
     {
-        type Response = http::Response<tonic::body::BoxBody>;
+        type Response = http::Response<tonic::body::Body>;
         type Error = std::convert::Infallible;
         type Future = BoxFuture<Self::Response, Self::Error>;
         fn poll_ready(
@@ -437,7 +437,9 @@ pub mod indexer_dips_service_server {
                 }
                 _ => {
                     Box::pin(async move {
-                        let mut response = http::Response::new(empty_body());
+                        let mut response = http::Response::new(
+                            tonic::body::Body::default(),
+                        );
                         let headers = response.headers_mut();
                         headers
                             .insert(

crates/dips/src/proto/graphprotocol.indexer.dips.rs

@@ -42,7 +42,7 @@ tap_graph.workspace = true
 tap_aggregator.workspace = true
 uuid.workspace = true
 bon.workspace = true
-tower_governor = { version = "0.5.0", features = ["axum"] }
+tower_governor = { version = "0.7.0", features = ["axum"] }
 governor = "0.8.0"
 tower-http = { version = "0.6.2", features = [
     "auth",
@@ -51,7 +51,7 @@ tower-http = { version = "0.6.2", features = [
     "trace",
 ] }
 autometrics = { version = "1.0.1", features = ["prometheus-exporter"] }
-axum-extra = { version = "0.9.3", features = [
+axum-extra = { version = "0.10.1", features = [
     "typed-header",
 ], default-features = false }
 tokio-util = "0.7.10"

crates/service/Cargo.toml

@@ -660,6 +660,7 @@ async fn create_grpc_aggregator() -> (JoinHandle<()>, SocketAddr) {
         max_request_body_size,
         max_response_body_size,
         max_concurrent_connections,
+        None,
     )
     .await
     .unwrap()