build: update protobuf crates to 0.14.1

Signed-off-by: Joseph Livesey <[email protected]>

Author: suchapalaver

Cargo.lock

@@ -52,8 +52,8 @@ insta = "1.42.2"
 itertools = "0.14.0"
 jsonrpsee = { version = "0.24.0", features = ["http-client", "tracing"] }
 prometheus = "0.13.3"
-prost = "0.13.4"
-prost-types = "0.13.3"
+prost = "0.14.1"
+prost-types = "0.14.1"
 ractor = { version = "0.15.7", features = [
     "async-trait",
     "tokio_runtime",
@@ -107,8 +107,10 @@ thegraph-graphql-http = { version = "0.3.2", features = ["reqwest"] }
 thiserror = "2.0.12"
 tokio = "1.40"
 tokio-test = "0.4.4"
-tonic = { version = "0.13.0", features = ["tls-native-roots", "gzip"] }
-tonic-build = "0.13.0"
+tonic = { version = "0.14.1", features = ["tls-native-roots", "gzip"] }
+tonic-build = "0.14.1"
+tonic-prost = "0.14.1"
+tonic-prost-build = "0.14.1"
 tower-service = "0.3.3"
 tower-test = "0.4.0"
 tracing = { version = "0.1.40", default-features = false }
@@ -119,7 +121,7 @@ tracing-subscriber = { version = "0.3", features = [
 ], default-features = false }
 uuid = { version = "1.11.0", features = ["v7"] }
 wiremock = "0.6.1"
-wiremock-grpc = "0.1.0"
+wiremock-grpc = { git = "https://github.com/suchapalaver/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

@@ -5,7 +5,14 @@ edition = "2021"
 
 [features]
 default = ["rpc", "db"]
-rpc = ["dep:prost", "dep:tonic", "dep:tonic-build", "dep:bytes"]
+rpc = [
+    "dep:prost",
+    "dep:tonic",
+    "dep:tonic-build",
+    "dep:tonic-prost",
+    "dep:tonic-prost-build",
+    "dep:bytes",
+]
 db = ["dep:sqlx"]
 
 [dependencies]
@@ -34,6 +41,7 @@ serde_yaml.workspace = true
 serde.workspace = true
 sqlx = { workspace = true, optional = true }
 tonic = { workspace = true, optional = true }
+tonic-prost = { workspace = true, optional = true }
 serde_json.workspace = true
 
 [dev-dependencies]
@@ -44,3 +52,4 @@ test-assets = { path = "../test-assets" }
 
 [build-dependencies]
 tonic-build = { workspace = true, optional = true }
+tonic-prost-build = { workspace = true, optional = true }

crates/dips/Cargo.toml

@@ -6,14 +6,16 @@ fn main() {
     {
         println!("cargo:rerun-if-changed=proto");
 
-        tonic_build::configure()
+        tonic_prost_build::configure()
+            .build_server(true)
             .out_dir("src/proto")
             .include_file("indexer.rs")
             .protoc_arg("--experimental_allow_proto3_optional")
             .compile_protos(&["proto/indexer.proto"], &["proto/"])
             .expect("Failed to compile DIPs indexer RPC proto(s)");
 
-        tonic_build::configure()
+        tonic_prost_build::configure()
+            .build_server(true)
             .out_dir("src/proto")
             .include_file("gateway.rs")
             .protoc_arg("--experimental_allow_proto3_optional")

crates/dips/build.rs

@@ -1,9 +1,10 @@
 // This file is @generated by prost-build.
 /// *
-/// A request to cancel an _indexing agreement_.
+///
+/// A request to cancel an *indexing agreement*.
 ///
 /// See the `DipsService.CancelAgreement` method.
-#[derive(Clone, PartialEq, ::prost::Message)]
+#[derive(Clone, PartialEq, Eq, Hash, ::prost::Message)]
 pub struct CancelAgreementRequest {
     #[prost(uint64, tag = "1")]
     pub version: u64,
@@ -12,29 +13,32 @@ pub struct CancelAgreementRequest {
     pub signed_cancellation: ::prost::alloc::vec::Vec<u8>,
 }
 /// *
-/// A response to a request to cancel an _indexing agreement_.
+///
+/// A response to a request to cancel an *indexing agreement*.
 ///
 /// See the `DipsService.CancelAgreement` method.
 ///
 /// / Empty response, eventually we may add custom status codes
-#[derive(Clone, Copy, PartialEq, ::prost::Message)]
+#[derive(Clone, Copy, PartialEq, Eq, Hash, ::prost::Message)]
 pub struct CancelAgreementResponse {}
 /// *
-/// A request to collect payment _indexing agreement_.
+///
+/// A request to collect payment *indexing agreement*.
 ///
 /// See the `DipsService.CollectPayment` method.
-#[derive(Clone, PartialEq, ::prost::Message)]
+#[derive(Clone, PartialEq, Eq, Hash, ::prost::Message)]
 pub struct CollectPaymentRequest {
     #[prost(uint64, tag = "1")]
     pub version: u64,
     #[prost(bytes = "vec", tag = "2")]
     pub signed_collection: ::prost::alloc::vec::Vec<u8>,
 }
 /// *
-/// A response to a request to collect payment for an _indexing agreement_.
+///
+/// A response to a request to collect payment for an *indexing agreement*.
 ///
 /// See the `DipsService.CollectAgreement` method.
-#[derive(Clone, PartialEq, ::prost::Message)]
+#[derive(Clone, PartialEq, Eq, Hash, ::prost::Message)]
 pub struct CollectPaymentResponse {
     #[prost(uint64, tag = "1")]
     pub version: u64,
@@ -44,7 +48,8 @@ pub struct CollectPaymentResponse {
     pub tap_receipt: ::prost::alloc::vec::Vec<u8>,
 }
 /// *
-/// The status on response to collect an _indexing agreement_.
+///
+/// The status on response to collect an *indexing agreement*.
 #[derive(Clone, Copy, Debug, PartialEq, Eq, Hash, PartialOrd, Ord, ::prost::Enumeration)]
 #[repr(i32)]
 pub enum CollectPaymentStatus {
@@ -177,7 +182,8 @@ pub mod gateway_dips_service_client {
             self
         }
         /// *
-        /// Cancel an _indexing agreement_.
+        ///
+        /// Cancel an *indexing agreement*.
         ///
         /// This method allows the indexer to notify the DIPs gateway that the agreement
         /// should be canceled.
@@ -196,7 +202,7 @@ pub mod gateway_dips_service_client {
                         format!("Service was not ready: {}", e.into()),
                     )
                 })?;
-            let codec = tonic::codec::ProstCodec::default();
+            let codec = tonic_prost::ProstCodec::default();
             let path = http::uri::PathAndQuery::from_static(
                 "/graphprotocol.gateway.dips.GatewayDipsService/CancelAgreement",
             );
@@ -211,7 +217,8 @@ pub mod gateway_dips_service_client {
             self.inner.unary(req, path, codec).await
         }
         /// *
-        /// Collect payment for an _indexing agreement_.
+        ///
+        /// Collect payment for an *indexing agreement*.
         ///
         /// This method allows the indexer to report the work completed to the DIPs gateway
         /// and receive payment for the indexing work done.
@@ -230,7 +237,7 @@ pub mod gateway_dips_service_client {
                         format!("Service was not ready: {}", e.into()),
                     )
                 })?;
-            let codec = tonic::codec::ProstCodec::default();
+            let codec = tonic_prost::ProstCodec::default();
             let path = http::uri::PathAndQuery::from_static(
                 "/graphprotocol.gateway.dips.GatewayDipsService/CollectPayment",
             );
@@ -260,7 +267,8 @@ pub mod gateway_dips_service_server {
     #[async_trait]
     pub trait GatewayDipsService: std::marker::Send + std::marker::Sync + 'static {
         /// *
-        /// Cancel an _indexing agreement_.
+        ///
+        /// Cancel an *indexing agreement*.
         ///
         /// This method allows the indexer to notify the DIPs gateway that the agreement
         /// should be canceled.
@@ -272,7 +280,8 @@ pub mod gateway_dips_service_server {
             tonic::Status,
         >;
         /// *
-        /// Collect payment for an _indexing agreement_.
+        ///
+        /// Collect payment for an *indexing agreement*.
         ///
         /// This method allows the indexer to report the work completed to the DIPs gateway
         /// and receive payment for the indexing work done.
@@ -391,7 +400,7 @@ pub mod gateway_dips_service_server {
                     let inner = self.inner.clone();
                     let fut = async move {
                         let method = CancelAgreementSvc(inner);
-                        let codec = tonic::codec::ProstCodec::default();
+                        let codec = tonic_prost::ProstCodec::default();
                         let mut grpc = tonic::server::Grpc::new(codec)
                             .apply_compression_config(
                                 accept_compression_encodings,
@@ -437,7 +446,7 @@ pub mod gateway_dips_service_server {
                     let inner = self.inner.clone();
                     let fut = async move {
                         let method = CollectPaymentSvc(inner);
-                        let codec = tonic::codec::ProstCodec::default();
+                        let codec = tonic_prost::ProstCodec::default();
                         let mut grpc = tonic::server::Grpc::new(codec)
                             .apply_compression_config(
                                 accept_compression_encodings,