From 762af4c4223d41c6b6da355e9f0f795f1f767540 Mon Sep 17 00:00:00 2001
From: Victor Nordam Suadicani <vs@concordium.com>
Date: Wed, 12 Jun 2024 10:54:36 +0200
Subject: [PATCH] Regenerated protobuf code

---
 src/v2/generated/concordium.v2.rs | 678 ++++++++++++++++++++++--------
 src/v2/proto_schema_version.rs    |   2 +-
 2 files changed, 504 insertions(+), 176 deletions(-)

diff --git a/src/v2/generated/concordium.v2.rs b/src/v2/generated/concordium.v2.rs
index 0ff347f76..794974a65 100644
--- a/src/v2/generated/concordium.v2.rs
+++ b/src/v2/generated/concordium.v2.rs
@@ -1,3 +1,4 @@
+// This file is @generated by prost-build.
 /// A message that contains no information.
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
@@ -644,6 +645,73 @@ pub mod account_credential {
         Normal(super::NormalCredentialValues),
     }
 }
+#[allow(clippy::derive_partial_eq_without_eq)]
+#[derive(Clone, PartialEq, ::prost::Message)]
+pub struct Cooldown {
+    /// The time in milliseconds since the Unix epoch when the cooldown period
+    /// ends.
+    #[prost(message, optional, tag = "1")]
+    pub end_time: ::core::option::Option<Timestamp>,
+    /// The amount that is in cooldown and set to be released at the end of the
+    /// cooldown period.
+    #[prost(message, optional, tag = "2")]
+    pub amount:   ::core::option::Option<Amount>,
+    /// The status of the cooldown.
+    #[prost(enumeration = "cooldown::CooldownStatus", tag = "3")]
+    pub status:   i32,
+}
+/// Nested message and enum types in `Cooldown`.
+pub mod cooldown {
+    /// The status of a cooldown. When stake is removed from a baker or
+    /// delegator (from protocol version 7) it first enters the
+    /// pre-pre-cooldown state. The next time the stake snaphot is taken (at
+    /// the epoch transition before a payday) it enters the pre-cooldown
+    /// state. At the subsequent payday, it enters the cooldown state. At
+    /// the payday after the end of the cooldown period, the stake is
+    /// finally released.
+    #[derive(Clone, Copy, Debug, PartialEq, Eq, Hash, PartialOrd, Ord, ::prost::Enumeration)]
+    #[repr(i32)]
+    pub enum CooldownStatus {
+        /// The amount is in cooldown and will expire at the specified time,
+        /// becoming available at the subsequent pay day.
+        Cooldown       = 0,
+        /// The amount will enter cooldown at the next pay day. The specified
+        /// end time is projected to be the end of the cooldown period,
+        /// but the actual end time will be determined at the payday,
+        /// and may be different if the global cooldown period changes.
+        PreCooldown    = 1,
+        /// The amount will enter pre-cooldown at the next snapshot epoch (i.e.
+        /// the epoch transition before a pay day transition). As with
+        /// pre-cooldown, the specified end time is projected, but the
+        /// actual end time will be determined later.
+        PrePreCooldown = 2,
+    }
+    impl CooldownStatus {
+        /// String value of the enum field names used in the ProtoBuf
+        /// definition.
+        ///
+        /// The values are not transformed in any way and thus are considered
+        /// stable (if the ProtoBuf definition does not change) and safe
+        /// for programmatic use.
+        pub fn as_str_name(&self) -> &'static str {
+            match self {
+                CooldownStatus::Cooldown => "COOLDOWN",
+                CooldownStatus::PreCooldown => "PRE_COOLDOWN",
+                CooldownStatus::PrePreCooldown => "PRE_PRE_COOLDOWN",
+            }
+        }
+
+        /// Creates an enum from field names used in the ProtoBuf definition.
+        pub fn from_str_name(value: &str) -> ::core::option::Option<Self> {
+            match value {
+                "COOLDOWN" => Some(Self::Cooldown),
+                "PRE_COOLDOWN" => Some(Self::PreCooldown),
+                "PRE_PRE_COOLDOWN" => Some(Self::PrePreCooldown),
+                _ => None,
+            }
+        }
+    }
+}
 /// Information about the account at a particular point in time.
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
@@ -690,6 +758,18 @@ pub struct AccountInfo {
     /// credential that created the account.
     #[prost(message, optional, tag = "10")]
     pub address:           ::core::option::Option<AccountAddress>,
+    /// The stake on the account that is in cooldown.
+    /// There can be multiple amounts in cooldown that expire at different
+    /// times.
+    #[prost(message, repeated, tag = "11")]
+    pub cooldowns:         ::prost::alloc::vec::Vec<Cooldown>,
+    /// The available (unencrypted) balance of the account (i.e. that can be
+    /// transferred or used to pay for transactions). This is the balance
+    /// minus the locked amount. The locked amount is the maximum of the
+    /// amount in the release schedule and the total amount that is actively
+    /// staked or in cooldown (inactive stake).
+    #[prost(message, optional, tag = "12")]
+    pub available_balance: ::core::option::Option<Amount>,
 }
 /// Input to queries which take a block as a parameter.
 #[allow(clippy::derive_partial_eq_without_eq)]
@@ -3048,6 +3128,12 @@ pub struct PoolCurrentPaydayInfo {
 }
 /// Type for the response of GetPoolInfo.
 /// Contains information about a given pool at the end of a given block.
+/// From protocol version 7, pool removal has immediate effect, however, the
+/// pool may still be present for the current (and possibly next) reward period.
+/// In this case, the `current_payday_infor` field will be set, but the
+/// `equity_capital`, `delegated_capital`, `delegated_capital_cap` and,
+/// `pool_info` fields will all be absent. The `equity_pending_change` field
+/// will also be absent, as stake changes are immediate.
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct PoolInfoResponse {
@@ -3071,7 +3157,9 @@ pub struct PoolInfoResponse {
     /// commission rates.
     #[prost(message, optional, tag = "6")]
     pub pool_info:              ::core::option::Option<BakerPoolInfo>,
-    /// Any pending change to the equity carpital.
+    /// Any pending change to the equity capital.
+    /// This is not used from protocol version 7 onwards, as stake changes are
+    /// immediate.
     #[prost(message, optional, tag = "7")]
     pub equity_pending_change:  ::core::option::Option<PoolPendingChange>,
     /// Information of the pool in the current reward period.
@@ -5602,7 +5690,7 @@ pub mod queries_client {
         /// Attempt to create a new client by connecting to a given endpoint.
         pub async fn connect<D>(dst: D) -> Result<Self, tonic::transport::Error>
         where
-            D: std::convert::TryInto<tonic::transport::Endpoint>,
+            D: TryInto<tonic::transport::Endpoint>,
             D::Error: Into<StdError>, {
             let conn = tonic::transport::Endpoint::new(dst)?.connect().await?;
             Ok(Self::new(conn))
@@ -5660,13 +5748,33 @@ pub mod queries_client {
             self
         }
 
+        /// Limits the maximum size of a decoded message.
+        ///
+        /// Default: `4MB`
+        #[must_use]
+        pub fn max_decoding_message_size(mut self, limit: usize) -> Self {
+            self.inner = self.inner.max_decoding_message_size(limit);
+            self
+        }
+
+        /// Limits the maximum size of an encoded message.
+        ///
+        /// Default: `usize::MAX`
+        #[must_use]
+        pub fn max_encoding_message_size(mut self, limit: usize) -> Self {
+            self.inner = self.inner.max_encoding_message_size(limit);
+            self
+        }
+
         /// Return a stream of blocks that arrive from the time the query is
         /// made onward. This can be used to listen for incoming blocks.
         pub async fn get_blocks(
             &mut self,
             request: impl tonic::IntoRequest<super::Empty>,
-        ) -> Result<tonic::Response<tonic::codec::Streaming<super::ArrivedBlockInfo>>, tonic::Status>
-        {
+        ) -> std::result::Result<
+            tonic::Response<tonic::codec::Streaming<super::ArrivedBlockInfo>>,
+            tonic::Status,
+        > {
             self.inner.ready().await.map_err(|e| {
                 tonic::Status::new(
                     tonic::Code::Unknown,
@@ -5675,9 +5783,10 @@ pub mod queries_client {
             })?;
             let codec = tonic::codec::ProstCodec::default();
             let path = http::uri::PathAndQuery::from_static("/concordium.v2.Queries/GetBlocks");
-            self.inner
-                .server_streaming(request.into_request(), path, codec)
-                .await
+            let mut req = request.into_request();
+            req.extensions_mut()
+                .insert(GrpcMethod::new("concordium.v2.Queries", "GetBlocks"));
+            self.inner.server_streaming(req, path, codec).await
         }
 
         /// Return a stream of blocks that are finalized from the time the query
@@ -5689,7 +5798,7 @@ pub mod queries_client {
         pub async fn get_finalized_blocks(
             &mut self,
             request: impl tonic::IntoRequest<super::Empty>,
-        ) -> Result<
+        ) -> std::result::Result<
             tonic::Response<tonic::codec::Streaming<super::FinalizedBlockInfo>>,
             tonic::Status,
         > {
@@ -5702,16 +5811,19 @@ pub mod queries_client {
             let codec = tonic::codec::ProstCodec::default();
             let path =
                 http::uri::PathAndQuery::from_static("/concordium.v2.Queries/GetFinalizedBlocks");
-            self.inner
-                .server_streaming(request.into_request(), path, codec)
-                .await
+            let mut req = request.into_request();
+            req.extensions_mut().insert(GrpcMethod::new(
+                "concordium.v2.Queries",
+                "GetFinalizedBlocks",
+            ));
+            self.inner.server_streaming(req, path, codec).await
         }
 
         /// Retrieve the information about the given account in the given block.
         pub async fn get_account_info(
             &mut self,
             request: impl tonic::IntoRequest<super::AccountInfoRequest>,
-        ) -> Result<tonic::Response<super::AccountInfo>, tonic::Status> {
+        ) -> std::result::Result<tonic::Response<super::AccountInfo>, tonic::Status> {
             self.inner.ready().await.map_err(|e| {
                 tonic::Status::new(
                     tonic::Code::Unknown,
@@ -5721,7 +5833,10 @@ pub mod queries_client {
             let codec = tonic::codec::ProstCodec::default();
             let path =
                 http::uri::PathAndQuery::from_static("/concordium.v2.Queries/GetAccountInfo");
-            self.inner.unary(request.into_request(), path, codec).await
+            let mut req = request.into_request();
+            req.extensions_mut()
+                .insert(GrpcMethod::new("concordium.v2.Queries", "GetAccountInfo"));
+            self.inner.unary(req, path, codec).await
         }
 
         /// Retrieve the list of accounts that exist at the end of the given
@@ -5729,8 +5844,10 @@ pub mod queries_client {
         pub async fn get_account_list(
             &mut self,
             request: impl tonic::IntoRequest<super::BlockHashInput>,
-        ) -> Result<tonic::Response<tonic::codec::Streaming<super::AccountAddress>>, tonic::Status>
-        {
+        ) -> std::result::Result<
+            tonic::Response<tonic::codec::Streaming<super::AccountAddress>>,
+            tonic::Status,
+        > {
             self.inner.ready().await.map_err(|e| {
                 tonic::Status::new(
                     tonic::Code::Unknown,
@@ -5740,9 +5857,10 @@ pub mod queries_client {
             let codec = tonic::codec::ProstCodec::default();
             let path =
                 http::uri::PathAndQuery::from_static("/concordium.v2.Queries/GetAccountList");
-            self.inner
-                .server_streaming(request.into_request(), path, codec)
-                .await
+            let mut req = request.into_request();
+            req.extensions_mut()
+                .insert(GrpcMethod::new("concordium.v2.Queries", "GetAccountList"));
+            self.inner.server_streaming(req, path, codec).await
         }
 
         /// Get a list of all smart contract modules. The stream will end
@@ -5751,8 +5869,10 @@ pub mod queries_client {
         pub async fn get_module_list(
             &mut self,
             request: impl tonic::IntoRequest<super::BlockHashInput>,
-        ) -> Result<tonic::Response<tonic::codec::Streaming<super::ModuleRef>>, tonic::Status>
-        {
+        ) -> std::result::Result<
+            tonic::Response<tonic::codec::Streaming<super::ModuleRef>>,
+            tonic::Status,
+        > {
             self.inner.ready().await.map_err(|e| {
                 tonic::Status::new(
                     tonic::Code::Unknown,
@@ -5761,9 +5881,10 @@ pub mod queries_client {
             })?;
             let codec = tonic::codec::ProstCodec::default();
             let path = http::uri::PathAndQuery::from_static("/concordium.v2.Queries/GetModuleList");
-            self.inner
-                .server_streaming(request.into_request(), path, codec)
-                .await
+            let mut req = request.into_request();
+            req.extensions_mut()
+                .insert(GrpcMethod::new("concordium.v2.Queries", "GetModuleList"));
+            self.inner.server_streaming(req, path, codec).await
         }
 
         /// Get a stream of ancestors for the provided block.
@@ -5773,8 +5894,10 @@ pub mod queries_client {
         pub async fn get_ancestors(
             &mut self,
             request: impl tonic::IntoRequest<super::AncestorsRequest>,
-        ) -> Result<tonic::Response<tonic::codec::Streaming<super::BlockHash>>, tonic::Status>
-        {
+        ) -> std::result::Result<
+            tonic::Response<tonic::codec::Streaming<super::BlockHash>>,
+            tonic::Status,
+        > {
             self.inner.ready().await.map_err(|e| {
                 tonic::Status::new(
                     tonic::Code::Unknown,
@@ -5783,16 +5906,18 @@ pub mod queries_client {
             })?;
             let codec = tonic::codec::ProstCodec::default();
             let path = http::uri::PathAndQuery::from_static("/concordium.v2.Queries/GetAncestors");
-            self.inner
-                .server_streaming(request.into_request(), path, codec)
-                .await
+            let mut req = request.into_request();
+            req.extensions_mut()
+                .insert(GrpcMethod::new("concordium.v2.Queries", "GetAncestors"));
+            self.inner.server_streaming(req, path, codec).await
         }
 
         /// Get the source of a smart contract module.
         pub async fn get_module_source(
             &mut self,
             request: impl tonic::IntoRequest<super::ModuleSourceRequest>,
-        ) -> Result<tonic::Response<super::VersionedModuleSource>, tonic::Status> {
+        ) -> std::result::Result<tonic::Response<super::VersionedModuleSource>, tonic::Status>
+        {
             self.inner.ready().await.map_err(|e| {
                 tonic::Status::new(
                     tonic::Code::Unknown,
@@ -5802,7 +5927,10 @@ pub mod queries_client {
             let codec = tonic::codec::ProstCodec::default();
             let path =
                 http::uri::PathAndQuery::from_static("/concordium.v2.Queries/GetModuleSource");
-            self.inner.unary(request.into_request(), path, codec).await
+            let mut req = request.into_request();
+            req.extensions_mut()
+                .insert(GrpcMethod::new("concordium.v2.Queries", "GetModuleSource"));
+            self.inner.unary(req, path, codec).await
         }
 
         /// Get a list of addresses for all smart contract instances. The stream
@@ -5811,8 +5939,10 @@ pub mod queries_client {
         pub async fn get_instance_list(
             &mut self,
             request: impl tonic::IntoRequest<super::BlockHashInput>,
-        ) -> Result<tonic::Response<tonic::codec::Streaming<super::ContractAddress>>, tonic::Status>
-        {
+        ) -> std::result::Result<
+            tonic::Response<tonic::codec::Streaming<super::ContractAddress>>,
+            tonic::Status,
+        > {
             self.inner.ready().await.map_err(|e| {
                 tonic::Status::new(
                     tonic::Code::Unknown,
@@ -5822,9 +5952,10 @@ pub mod queries_client {
             let codec = tonic::codec::ProstCodec::default();
             let path =
                 http::uri::PathAndQuery::from_static("/concordium.v2.Queries/GetInstanceList");
-            self.inner
-                .server_streaming(request.into_request(), path, codec)
-                .await
+            let mut req = request.into_request();
+            req.extensions_mut()
+                .insert(GrpcMethod::new("concordium.v2.Queries", "GetInstanceList"));
+            self.inner.server_streaming(req, path, codec).await
         }
 
         /// Get info about a smart contract instance as it appears at the end of
@@ -5832,7 +5963,7 @@ pub mod queries_client {
         pub async fn get_instance_info(
             &mut self,
             request: impl tonic::IntoRequest<super::InstanceInfoRequest>,
-        ) -> Result<tonic::Response<super::InstanceInfo>, tonic::Status> {
+        ) -> std::result::Result<tonic::Response<super::InstanceInfo>, tonic::Status> {
             self.inner.ready().await.map_err(|e| {
                 tonic::Status::new(
                     tonic::Code::Unknown,
@@ -5842,7 +5973,10 @@ pub mod queries_client {
             let codec = tonic::codec::ProstCodec::default();
             let path =
                 http::uri::PathAndQuery::from_static("/concordium.v2.Queries/GetInstanceInfo");
-            self.inner.unary(request.into_request(), path, codec).await
+            let mut req = request.into_request();
+            req.extensions_mut()
+                .insert(GrpcMethod::new("concordium.v2.Queries", "GetInstanceInfo"));
+            self.inner.unary(req, path, codec).await
         }
 
         /// Get the exact state of a specific contract instance, streamed as a
@@ -5851,7 +5985,7 @@ pub mod queries_client {
         pub async fn get_instance_state(
             &mut self,
             request: impl tonic::IntoRequest<super::InstanceInfoRequest>,
-        ) -> Result<
+        ) -> std::result::Result<
             tonic::Response<tonic::codec::Streaming<super::InstanceStateKvPair>>,
             tonic::Status,
         > {
@@ -5864,9 +5998,10 @@ pub mod queries_client {
             let codec = tonic::codec::ProstCodec::default();
             let path =
                 http::uri::PathAndQuery::from_static("/concordium.v2.Queries/GetInstanceState");
-            self.inner
-                .server_streaming(request.into_request(), path, codec)
-                .await
+            let mut req = request.into_request();
+            req.extensions_mut()
+                .insert(GrpcMethod::new("concordium.v2.Queries", "GetInstanceState"));
+            self.inner.server_streaming(req, path, codec).await
         }
 
         /// Get the value at a specific key of a contract state. In contrast to
@@ -5875,7 +6010,8 @@ pub mod queries_client {
         pub async fn instance_state_lookup(
             &mut self,
             request: impl tonic::IntoRequest<super::InstanceStateLookupRequest>,
-        ) -> Result<tonic::Response<super::InstanceStateValueAtKey>, tonic::Status> {
+        ) -> std::result::Result<tonic::Response<super::InstanceStateValueAtKey>, tonic::Status>
+        {
             self.inner.ready().await.map_err(|e| {
                 tonic::Status::new(
                     tonic::Code::Unknown,
@@ -5885,7 +6021,12 @@ pub mod queries_client {
             let codec = tonic::codec::ProstCodec::default();
             let path =
                 http::uri::PathAndQuery::from_static("/concordium.v2.Queries/InstanceStateLookup");
-            self.inner.unary(request.into_request(), path, codec).await
+            let mut req = request.into_request();
+            req.extensions_mut().insert(GrpcMethod::new(
+                "concordium.v2.Queries",
+                "InstanceStateLookup",
+            ));
+            self.inner.unary(req, path, codec).await
         }
 
         /// Get the best guess as to what the next account sequence number
@@ -5896,7 +6037,8 @@ pub mod queries_client {
         pub async fn get_next_account_sequence_number(
             &mut self,
             request: impl tonic::IntoRequest<super::AccountAddress>,
-        ) -> Result<tonic::Response<super::NextAccountSequenceNumber>, tonic::Status> {
+        ) -> std::result::Result<tonic::Response<super::NextAccountSequenceNumber>, tonic::Status>
+        {
             self.inner.ready().await.map_err(|e| {
                 tonic::Status::new(
                     tonic::Code::Unknown,
@@ -5907,14 +6049,19 @@ pub mod queries_client {
             let path = http::uri::PathAndQuery::from_static(
                 "/concordium.v2.Queries/GetNextAccountSequenceNumber",
             );
-            self.inner.unary(request.into_request(), path, codec).await
+            let mut req = request.into_request();
+            req.extensions_mut().insert(GrpcMethod::new(
+                "concordium.v2.Queries",
+                "GetNextAccountSequenceNumber",
+            ));
+            self.inner.unary(req, path, codec).await
         }
 
         /// Get information about the current state of consensus.
         pub async fn get_consensus_info(
             &mut self,
             request: impl tonic::IntoRequest<super::Empty>,
-        ) -> Result<tonic::Response<super::ConsensusInfo>, tonic::Status> {
+        ) -> std::result::Result<tonic::Response<super::ConsensusInfo>, tonic::Status> {
             self.inner.ready().await.map_err(|e| {
                 tonic::Status::new(
                     tonic::Code::Unknown,
@@ -5924,7 +6071,10 @@ pub mod queries_client {
             let codec = tonic::codec::ProstCodec::default();
             let path =
                 http::uri::PathAndQuery::from_static("/concordium.v2.Queries/GetConsensusInfo");
-            self.inner.unary(request.into_request(), path, codec).await
+            let mut req = request.into_request();
+            req.extensions_mut()
+                .insert(GrpcMethod::new("concordium.v2.Queries", "GetConsensusInfo"));
+            self.inner.unary(req, path, codec).await
         }
 
         /// Get the status of and information about a specific block item
@@ -5932,7 +6082,7 @@ pub mod queries_client {
         pub async fn get_block_item_status(
             &mut self,
             request: impl tonic::IntoRequest<super::TransactionHash>,
-        ) -> Result<tonic::Response<super::BlockItemStatus>, tonic::Status> {
+        ) -> std::result::Result<tonic::Response<super::BlockItemStatus>, tonic::Status> {
             self.inner.ready().await.map_err(|e| {
                 tonic::Status::new(
                     tonic::Code::Unknown,
@@ -5942,14 +6092,20 @@ pub mod queries_client {
             let codec = tonic::codec::ProstCodec::default();
             let path =
                 http::uri::PathAndQuery::from_static("/concordium.v2.Queries/GetBlockItemStatus");
-            self.inner.unary(request.into_request(), path, codec).await
+            let mut req = request.into_request();
+            req.extensions_mut().insert(GrpcMethod::new(
+                "concordium.v2.Queries",
+                "GetBlockItemStatus",
+            ));
+            self.inner.unary(req, path, codec).await
         }
 
         /// Get the cryptographic parameters in a given block.
         pub async fn get_cryptographic_parameters(
             &mut self,
             request: impl tonic::IntoRequest<super::BlockHashInput>,
-        ) -> Result<tonic::Response<super::CryptographicParameters>, tonic::Status> {
+        ) -> std::result::Result<tonic::Response<super::CryptographicParameters>, tonic::Status>
+        {
             self.inner.ready().await.map_err(|e| {
                 tonic::Status::new(
                     tonic::Code::Unknown,
@@ -5960,7 +6116,12 @@ pub mod queries_client {
             let path = http::uri::PathAndQuery::from_static(
                 "/concordium.v2.Queries/GetCryptographicParameters",
             );
-            self.inner.unary(request.into_request(), path, codec).await
+            let mut req = request.into_request();
+            req.extensions_mut().insert(GrpcMethod::new(
+                "concordium.v2.Queries",
+                "GetCryptographicParameters",
+            ));
+            self.inner.unary(req, path, codec).await
         }
 
         /// Get information, such as height, timings, and transaction counts for
@@ -5968,7 +6129,7 @@ pub mod queries_client {
         pub async fn get_block_info(
             &mut self,
             request: impl tonic::IntoRequest<super::BlockHashInput>,
-        ) -> Result<tonic::Response<super::BlockInfo>, tonic::Status> {
+        ) -> std::result::Result<tonic::Response<super::BlockInfo>, tonic::Status> {
             self.inner.ready().await.map_err(|e| {
                 tonic::Status::new(
                     tonic::Code::Unknown,
@@ -5977,15 +6138,20 @@ pub mod queries_client {
             })?;
             let codec = tonic::codec::ProstCodec::default();
             let path = http::uri::PathAndQuery::from_static("/concordium.v2.Queries/GetBlockInfo");
-            self.inner.unary(request.into_request(), path, codec).await
+            let mut req = request.into_request();
+            req.extensions_mut()
+                .insert(GrpcMethod::new("concordium.v2.Queries", "GetBlockInfo"));
+            self.inner.unary(req, path, codec).await
         }
 
         /// Get all the bakers at the end of the given block.
         pub async fn get_baker_list(
             &mut self,
             request: impl tonic::IntoRequest<super::BlockHashInput>,
-        ) -> Result<tonic::Response<tonic::codec::Streaming<super::BakerId>>, tonic::Status>
-        {
+        ) -> std::result::Result<
+            tonic::Response<tonic::codec::Streaming<super::BakerId>>,
+            tonic::Status,
+        > {
             self.inner.ready().await.map_err(|e| {
                 tonic::Status::new(
                     tonic::Code::Unknown,
@@ -5994,16 +6160,17 @@ pub mod queries_client {
             })?;
             let codec = tonic::codec::ProstCodec::default();
             let path = http::uri::PathAndQuery::from_static("/concordium.v2.Queries/GetBakerList");
-            self.inner
-                .server_streaming(request.into_request(), path, codec)
-                .await
+            let mut req = request.into_request();
+            req.extensions_mut()
+                .insert(GrpcMethod::new("concordium.v2.Queries", "GetBakerList"));
+            self.inner.server_streaming(req, path, codec).await
         }
 
         /// Get information about a given pool at the end of a given block.
         pub async fn get_pool_info(
             &mut self,
             request: impl tonic::IntoRequest<super::PoolInfoRequest>,
-        ) -> Result<tonic::Response<super::PoolInfoResponse>, tonic::Status> {
+        ) -> std::result::Result<tonic::Response<super::PoolInfoResponse>, tonic::Status> {
             self.inner.ready().await.map_err(|e| {
                 tonic::Status::new(
                     tonic::Code::Unknown,
@@ -6012,7 +6179,10 @@ pub mod queries_client {
             })?;
             let codec = tonic::codec::ProstCodec::default();
             let path = http::uri::PathAndQuery::from_static("/concordium.v2.Queries/GetPoolInfo");
-            self.inner.unary(request.into_request(), path, codec).await
+            let mut req = request.into_request();
+            req.extensions_mut()
+                .insert(GrpcMethod::new("concordium.v2.Queries", "GetPoolInfo"));
+            self.inner.unary(req, path, codec).await
         }
 
         /// Get information about the passive delegators at the end of a given
@@ -6020,7 +6190,8 @@ pub mod queries_client {
         pub async fn get_passive_delegation_info(
             &mut self,
             request: impl tonic::IntoRequest<super::BlockHashInput>,
-        ) -> Result<tonic::Response<super::PassiveDelegationInfo>, tonic::Status> {
+        ) -> std::result::Result<tonic::Response<super::PassiveDelegationInfo>, tonic::Status>
+        {
             self.inner.ready().await.map_err(|e| {
                 tonic::Status::new(
                     tonic::Code::Unknown,
@@ -6031,14 +6202,20 @@ pub mod queries_client {
             let path = http::uri::PathAndQuery::from_static(
                 "/concordium.v2.Queries/GetPassiveDelegationInfo",
             );
-            self.inner.unary(request.into_request(), path, codec).await
+            let mut req = request.into_request();
+            req.extensions_mut().insert(GrpcMethod::new(
+                "concordium.v2.Queries",
+                "GetPassiveDelegationInfo",
+            ));
+            self.inner.unary(req, path, codec).await
         }
 
         /// Get a list of live blocks at a given height.
         pub async fn get_blocks_at_height(
             &mut self,
             request: impl tonic::IntoRequest<super::BlocksAtHeightRequest>,
-        ) -> Result<tonic::Response<super::BlocksAtHeightResponse>, tonic::Status> {
+        ) -> std::result::Result<tonic::Response<super::BlocksAtHeightResponse>, tonic::Status>
+        {
             self.inner.ready().await.map_err(|e| {
                 tonic::Status::new(
                     tonic::Code::Unknown,
@@ -6048,14 +6225,19 @@ pub mod queries_client {
             let codec = tonic::codec::ProstCodec::default();
             let path =
                 http::uri::PathAndQuery::from_static("/concordium.v2.Queries/GetBlocksAtHeight");
-            self.inner.unary(request.into_request(), path, codec).await
+            let mut req = request.into_request();
+            req.extensions_mut().insert(GrpcMethod::new(
+                "concordium.v2.Queries",
+                "GetBlocksAtHeight",
+            ));
+            self.inner.unary(req, path, codec).await
         }
 
         /// Get information about tokenomics at the end of a given block.
         pub async fn get_tokenomics_info(
             &mut self,
             request: impl tonic::IntoRequest<super::BlockHashInput>,
-        ) -> Result<tonic::Response<super::TokenomicsInfo>, tonic::Status> {
+        ) -> std::result::Result<tonic::Response<super::TokenomicsInfo>, tonic::Status> {
             self.inner.ready().await.map_err(|e| {
                 tonic::Status::new(
                     tonic::Code::Unknown,
@@ -6065,7 +6247,12 @@ pub mod queries_client {
             let codec = tonic::codec::ProstCodec::default();
             let path =
                 http::uri::PathAndQuery::from_static("/concordium.v2.Queries/GetTokenomicsInfo");
-            self.inner.unary(request.into_request(), path, codec).await
+            let mut req = request.into_request();
+            req.extensions_mut().insert(GrpcMethod::new(
+                "concordium.v2.Queries",
+                "GetTokenomicsInfo",
+            ));
+            self.inner.unary(req, path, codec).await
         }
 
         /// Run the smart contract entrypoint in a given context and in the
@@ -6073,7 +6260,8 @@ pub mod queries_client {
         pub async fn invoke_instance(
             &mut self,
             request: impl tonic::IntoRequest<super::InvokeInstanceRequest>,
-        ) -> Result<tonic::Response<super::InvokeInstanceResponse>, tonic::Status> {
+        ) -> std::result::Result<tonic::Response<super::InvokeInstanceResponse>, tonic::Status>
+        {
             self.inner.ready().await.map_err(|e| {
                 tonic::Status::new(
                     tonic::Code::Unknown,
@@ -6083,7 +6271,10 @@ pub mod queries_client {
             let codec = tonic::codec::ProstCodec::default();
             let path =
                 http::uri::PathAndQuery::from_static("/concordium.v2.Queries/InvokeInstance");
-            self.inner.unary(request.into_request(), path, codec).await
+            let mut req = request.into_request();
+            req.extensions_mut()
+                .insert(GrpcMethod::new("concordium.v2.Queries", "InvokeInstance"));
+            self.inner.unary(req, path, codec).await
         }
 
         /// Get the registered delegators of a given pool at the end of a given
@@ -6096,8 +6287,10 @@ pub mod queries_client {
         pub async fn get_pool_delegators(
             &mut self,
             request: impl tonic::IntoRequest<super::GetPoolDelegatorsRequest>,
-        ) -> Result<tonic::Response<tonic::codec::Streaming<super::DelegatorInfo>>, tonic::Status>
-        {
+        ) -> std::result::Result<
+            tonic::Response<tonic::codec::Streaming<super::DelegatorInfo>>,
+            tonic::Status,
+        > {
             self.inner.ready().await.map_err(|e| {
                 tonic::Status::new(
                     tonic::Code::Unknown,
@@ -6107,9 +6300,12 @@ pub mod queries_client {
             let codec = tonic::codec::ProstCodec::default();
             let path =
                 http::uri::PathAndQuery::from_static("/concordium.v2.Queries/GetPoolDelegators");
-            self.inner
-                .server_streaming(request.into_request(), path, codec)
-                .await
+            let mut req = request.into_request();
+            req.extensions_mut().insert(GrpcMethod::new(
+                "concordium.v2.Queries",
+                "GetPoolDelegators",
+            ));
+            self.inner.server_streaming(req, path, codec).await
         }
 
         /// Get the fixed delegators of a given pool for the reward period of
@@ -6121,7 +6317,7 @@ pub mod queries_client {
         pub async fn get_pool_delegators_reward_period(
             &mut self,
             request: impl tonic::IntoRequest<super::GetPoolDelegatorsRequest>,
-        ) -> Result<
+        ) -> std::result::Result<
             tonic::Response<tonic::codec::Streaming<super::DelegatorRewardPeriodInfo>>,
             tonic::Status,
         > {
@@ -6135,9 +6331,12 @@ pub mod queries_client {
             let path = http::uri::PathAndQuery::from_static(
                 "/concordium.v2.Queries/GetPoolDelegatorsRewardPeriod",
             );
-            self.inner
-                .server_streaming(request.into_request(), path, codec)
-                .await
+            let mut req = request.into_request();
+            req.extensions_mut().insert(GrpcMethod::new(
+                "concordium.v2.Queries",
+                "GetPoolDelegatorsRewardPeriod",
+            ));
+            self.inner.server_streaming(req, path, codec).await
         }
 
         /// Get the registered passive delegators at the end of a given block.
@@ -6150,8 +6349,10 @@ pub mod queries_client {
         pub async fn get_passive_delegators(
             &mut self,
             request: impl tonic::IntoRequest<super::BlockHashInput>,
-        ) -> Result<tonic::Response<tonic::codec::Streaming<super::DelegatorInfo>>, tonic::Status>
-        {
+        ) -> std::result::Result<
+            tonic::Response<tonic::codec::Streaming<super::DelegatorInfo>>,
+            tonic::Status,
+        > {
             self.inner.ready().await.map_err(|e| {
                 tonic::Status::new(
                     tonic::Code::Unknown,
@@ -6161,9 +6362,12 @@ pub mod queries_client {
             let codec = tonic::codec::ProstCodec::default();
             let path =
                 http::uri::PathAndQuery::from_static("/concordium.v2.Queries/GetPassiveDelegators");
-            self.inner
-                .server_streaming(request.into_request(), path, codec)
-                .await
+            let mut req = request.into_request();
+            req.extensions_mut().insert(GrpcMethod::new(
+                "concordium.v2.Queries",
+                "GetPassiveDelegators",
+            ));
+            self.inner.server_streaming(req, path, codec).await
         }
 
         /// Get the fixed passive delegators for the reward period of the given
@@ -6175,7 +6379,7 @@ pub mod queries_client {
         pub async fn get_passive_delegators_reward_period(
             &mut self,
             request: impl tonic::IntoRequest<super::BlockHashInput>,
-        ) -> Result<
+        ) -> std::result::Result<
             tonic::Response<tonic::codec::Streaming<super::DelegatorRewardPeriodInfo>>,
             tonic::Status,
         > {
@@ -6189,9 +6393,12 @@ pub mod queries_client {
             let path = http::uri::PathAndQuery::from_static(
                 "/concordium.v2.Queries/GetPassiveDelegatorsRewardPeriod",
             );
-            self.inner
-                .server_streaming(request.into_request(), path, codec)
-                .await
+            let mut req = request.into_request();
+            req.extensions_mut().insert(GrpcMethod::new(
+                "concordium.v2.Queries",
+                "GetPassiveDelegatorsRewardPeriod",
+            ));
+            self.inner.server_streaming(req, path, codec).await
         }
 
         /// Get the current branches of blocks starting from and including the
@@ -6199,7 +6406,7 @@ pub mod queries_client {
         pub async fn get_branches(
             &mut self,
             request: impl tonic::IntoRequest<super::Empty>,
-        ) -> Result<tonic::Response<super::Branch>, tonic::Status> {
+        ) -> std::result::Result<tonic::Response<super::Branch>, tonic::Status> {
             self.inner.ready().await.map_err(|e| {
                 tonic::Status::new(
                     tonic::Code::Unknown,
@@ -6208,7 +6415,10 @@ pub mod queries_client {
             })?;
             let codec = tonic::codec::ProstCodec::default();
             let path = http::uri::PathAndQuery::from_static("/concordium.v2.Queries/GetBranches");
-            self.inner.unary(request.into_request(), path, codec).await
+            let mut req = request.into_request();
+            req.extensions_mut()
+                .insert(GrpcMethod::new("concordium.v2.Queries", "GetBranches"));
+            self.inner.unary(req, path, codec).await
         }
 
         /// Get information related to the baker election for a particular
@@ -6216,7 +6426,7 @@ pub mod queries_client {
         pub async fn get_election_info(
             &mut self,
             request: impl tonic::IntoRequest<super::BlockHashInput>,
-        ) -> Result<tonic::Response<super::ElectionInfo>, tonic::Status> {
+        ) -> std::result::Result<tonic::Response<super::ElectionInfo>, tonic::Status> {
             self.inner.ready().await.map_err(|e| {
                 tonic::Status::new(
                     tonic::Code::Unknown,
@@ -6226,7 +6436,10 @@ pub mod queries_client {
             let codec = tonic::codec::ProstCodec::default();
             let path =
                 http::uri::PathAndQuery::from_static("/concordium.v2.Queries/GetElectionInfo");
-            self.inner.unary(request.into_request(), path, codec).await
+            let mut req = request.into_request();
+            req.extensions_mut()
+                .insert(GrpcMethod::new("concordium.v2.Queries", "GetElectionInfo"));
+            self.inner.unary(req, path, codec).await
         }
 
         /// Get the identity providers registered as of the end of a given
@@ -6235,8 +6448,10 @@ pub mod queries_client {
         pub async fn get_identity_providers(
             &mut self,
             request: impl tonic::IntoRequest<super::BlockHashInput>,
-        ) -> Result<tonic::Response<tonic::codec::Streaming<super::IpInfo>>, tonic::Status>
-        {
+        ) -> std::result::Result<
+            tonic::Response<tonic::codec::Streaming<super::IpInfo>>,
+            tonic::Status,
+        > {
             self.inner.ready().await.map_err(|e| {
                 tonic::Status::new(
                     tonic::Code::Unknown,
@@ -6246,9 +6461,12 @@ pub mod queries_client {
             let codec = tonic::codec::ProstCodec::default();
             let path =
                 http::uri::PathAndQuery::from_static("/concordium.v2.Queries/GetIdentityProviders");
-            self.inner
-                .server_streaming(request.into_request(), path, codec)
-                .await
+            let mut req = request.into_request();
+            req.extensions_mut().insert(GrpcMethod::new(
+                "concordium.v2.Queries",
+                "GetIdentityProviders",
+            ));
+            self.inner.server_streaming(req, path, codec).await
         }
 
         /// Get the anonymity revokers registered as of the end of a given
@@ -6257,8 +6475,10 @@ pub mod queries_client {
         pub async fn get_anonymity_revokers(
             &mut self,
             request: impl tonic::IntoRequest<super::BlockHashInput>,
-        ) -> Result<tonic::Response<tonic::codec::Streaming<super::ArInfo>>, tonic::Status>
-        {
+        ) -> std::result::Result<
+            tonic::Response<tonic::codec::Streaming<super::ArInfo>>,
+            tonic::Status,
+        > {
             self.inner.ready().await.map_err(|e| {
                 tonic::Status::new(
                     tonic::Code::Unknown,
@@ -6268,9 +6488,12 @@ pub mod queries_client {
             let codec = tonic::codec::ProstCodec::default();
             let path =
                 http::uri::PathAndQuery::from_static("/concordium.v2.Queries/GetAnonymityRevokers");
-            self.inner
-                .server_streaming(request.into_request(), path, codec)
-                .await
+            let mut req = request.into_request();
+            req.extensions_mut().insert(GrpcMethod::new(
+                "concordium.v2.Queries",
+                "GetAnonymityRevokers",
+            ));
+            self.inner.server_streaming(req, path, codec).await
         }
 
         /// Get a list of non-finalized transaction hashes for a given account.
@@ -6281,8 +6504,10 @@ pub mod queries_client {
         pub async fn get_account_non_finalized_transactions(
             &mut self,
             request: impl tonic::IntoRequest<super::AccountAddress>,
-        ) -> Result<tonic::Response<tonic::codec::Streaming<super::TransactionHash>>, tonic::Status>
-        {
+        ) -> std::result::Result<
+            tonic::Response<tonic::codec::Streaming<super::TransactionHash>>,
+            tonic::Status,
+        > {
             self.inner.ready().await.map_err(|e| {
                 tonic::Status::new(
                     tonic::Code::Unknown,
@@ -6293,9 +6518,12 @@ pub mod queries_client {
             let path = http::uri::PathAndQuery::from_static(
                 "/concordium.v2.Queries/GetAccountNonFinalizedTransactions",
             );
-            self.inner
-                .server_streaming(request.into_request(), path, codec)
-                .await
+            let mut req = request.into_request();
+            req.extensions_mut().insert(GrpcMethod::new(
+                "concordium.v2.Queries",
+                "GetAccountNonFinalizedTransactions",
+            ));
+            self.inner.server_streaming(req, path, codec).await
         }
 
         /// Get a list of transaction events in a given block.
@@ -6304,8 +6532,10 @@ pub mod queries_client {
         pub async fn get_block_transaction_events(
             &mut self,
             request: impl tonic::IntoRequest<super::BlockHashInput>,
-        ) -> Result<tonic::Response<tonic::codec::Streaming<super::BlockItemSummary>>, tonic::Status>
-        {
+        ) -> std::result::Result<
+            tonic::Response<tonic::codec::Streaming<super::BlockItemSummary>>,
+            tonic::Status,
+        > {
             self.inner.ready().await.map_err(|e| {
                 tonic::Status::new(
                     tonic::Code::Unknown,
@@ -6316,9 +6546,12 @@ pub mod queries_client {
             let path = http::uri::PathAndQuery::from_static(
                 "/concordium.v2.Queries/GetBlockTransactionEvents",
             );
-            self.inner
-                .server_streaming(request.into_request(), path, codec)
-                .await
+            let mut req = request.into_request();
+            req.extensions_mut().insert(GrpcMethod::new(
+                "concordium.v2.Queries",
+                "GetBlockTransactionEvents",
+            ));
+            self.inner.server_streaming(req, path, codec).await
         }
 
         /// Get a list of special events in a given block. These are events
@@ -6329,8 +6562,10 @@ pub mod queries_client {
         pub async fn get_block_special_events(
             &mut self,
             request: impl tonic::IntoRequest<super::BlockHashInput>,
-        ) -> Result<tonic::Response<tonic::codec::Streaming<super::BlockSpecialEvent>>, tonic::Status>
-        {
+        ) -> std::result::Result<
+            tonic::Response<tonic::codec::Streaming<super::BlockSpecialEvent>>,
+            tonic::Status,
+        > {
             self.inner.ready().await.map_err(|e| {
                 tonic::Status::new(
                     tonic::Code::Unknown,
@@ -6341,9 +6576,12 @@ pub mod queries_client {
             let path = http::uri::PathAndQuery::from_static(
                 "/concordium.v2.Queries/GetBlockSpecialEvents",
             );
-            self.inner
-                .server_streaming(request.into_request(), path, codec)
-                .await
+            let mut req = request.into_request();
+            req.extensions_mut().insert(GrpcMethod::new(
+                "concordium.v2.Queries",
+                "GetBlockSpecialEvents",
+            ));
+            self.inner.server_streaming(req, path, codec).await
         }
 
         /// Get the pending updates to chain parameters at the end of a given
@@ -6352,8 +6590,10 @@ pub mod queries_client {
         pub async fn get_block_pending_updates(
             &mut self,
             request: impl tonic::IntoRequest<super::BlockHashInput>,
-        ) -> Result<tonic::Response<tonic::codec::Streaming<super::PendingUpdate>>, tonic::Status>
-        {
+        ) -> std::result::Result<
+            tonic::Response<tonic::codec::Streaming<super::PendingUpdate>>,
+            tonic::Status,
+        > {
             self.inner.ready().await.map_err(|e| {
                 tonic::Status::new(
                     tonic::Code::Unknown,
@@ -6364,9 +6604,12 @@ pub mod queries_client {
             let path = http::uri::PathAndQuery::from_static(
                 "/concordium.v2.Queries/GetBlockPendingUpdates",
             );
-            self.inner
-                .server_streaming(request.into_request(), path, codec)
-                .await
+            let mut req = request.into_request();
+            req.extensions_mut().insert(GrpcMethod::new(
+                "concordium.v2.Queries",
+                "GetBlockPendingUpdates",
+            ));
+            self.inner.server_streaming(req, path, codec).await
         }
 
         /// Get next available sequence numbers for updating chain parameters
@@ -6374,7 +6617,8 @@ pub mod queries_client {
         pub async fn get_next_update_sequence_numbers(
             &mut self,
             request: impl tonic::IntoRequest<super::BlockHashInput>,
-        ) -> Result<tonic::Response<super::NextUpdateSequenceNumbers>, tonic::Status> {
+        ) -> std::result::Result<tonic::Response<super::NextUpdateSequenceNumbers>, tonic::Status>
+        {
             self.inner.ready().await.map_err(|e| {
                 tonic::Status::new(
                     tonic::Code::Unknown,
@@ -6385,7 +6629,12 @@ pub mod queries_client {
             let path = http::uri::PathAndQuery::from_static(
                 "/concordium.v2.Queries/GetNextUpdateSequenceNumbers",
             );
-            self.inner.unary(request.into_request(), path, codec).await
+            let mut req = request.into_request();
+            req.extensions_mut().insert(GrpcMethod::new(
+                "concordium.v2.Queries",
+                "GetNextUpdateSequenceNumbers",
+            ));
+            self.inner.unary(req, path, codec).await
         }
 
         /// Get the projected earliest time at which a particular baker will be
@@ -6411,7 +6660,7 @@ pub mod queries_client {
         pub async fn get_baker_earliest_win_time(
             &mut self,
             request: impl tonic::IntoRequest<super::BakerId>,
-        ) -> Result<tonic::Response<super::Timestamp>, tonic::Status> {
+        ) -> std::result::Result<tonic::Response<super::Timestamp>, tonic::Status> {
             self.inner.ready().await.map_err(|e| {
                 tonic::Status::new(
                     tonic::Code::Unknown,
@@ -6422,7 +6671,12 @@ pub mod queries_client {
             let path = http::uri::PathAndQuery::from_static(
                 "/concordium.v2.Queries/GetBakerEarliestWinTime",
             );
-            self.inner.unary(request.into_request(), path, codec).await
+            let mut req = request.into_request();
+            req.extensions_mut().insert(GrpcMethod::new(
+                "concordium.v2.Queries",
+                "GetBakerEarliestWinTime",
+            ));
+            self.inner.unary(req, path, codec).await
         }
 
         /// Shut down the node.
@@ -6430,7 +6684,7 @@ pub mod queries_client {
         pub async fn shutdown(
             &mut self,
             request: impl tonic::IntoRequest<super::Empty>,
-        ) -> Result<tonic::Response<super::Empty>, tonic::Status> {
+        ) -> std::result::Result<tonic::Response<super::Empty>, tonic::Status> {
             self.inner.ready().await.map_err(|e| {
                 tonic::Status::new(
                     tonic::Code::Unknown,
@@ -6439,7 +6693,10 @@ pub mod queries_client {
             })?;
             let codec = tonic::codec::ProstCodec::default();
             let path = http::uri::PathAndQuery::from_static("/concordium.v2.Queries/Shutdown");
-            self.inner.unary(request.into_request(), path, codec).await
+            let mut req = request.into_request();
+            req.extensions_mut()
+                .insert(GrpcMethod::new("concordium.v2.Queries", "Shutdown"));
+            self.inner.unary(req, path, codec).await
         }
 
         /// Suggest to a peer to connect to the submitted peer details.
@@ -6451,7 +6708,7 @@ pub mod queries_client {
         pub async fn peer_connect(
             &mut self,
             request: impl tonic::IntoRequest<super::IpSocketAddress>,
-        ) -> Result<tonic::Response<super::Empty>, tonic::Status> {
+        ) -> std::result::Result<tonic::Response<super::Empty>, tonic::Status> {
             self.inner.ready().await.map_err(|e| {
                 tonic::Status::new(
                     tonic::Code::Unknown,
@@ -6460,7 +6717,10 @@ pub mod queries_client {
             })?;
             let codec = tonic::codec::ProstCodec::default();
             let path = http::uri::PathAndQuery::from_static("/concordium.v2.Queries/PeerConnect");
-            self.inner.unary(request.into_request(), path, codec).await
+            let mut req = request.into_request();
+            req.extensions_mut()
+                .insert(GrpcMethod::new("concordium.v2.Queries", "PeerConnect"));
+            self.inner.unary(req, path, codec).await
         }
 
         /// Disconnect from the peer and remove them from the given addresses
@@ -6469,7 +6729,7 @@ pub mod queries_client {
         pub async fn peer_disconnect(
             &mut self,
             request: impl tonic::IntoRequest<super::IpSocketAddress>,
-        ) -> Result<tonic::Response<super::Empty>, tonic::Status> {
+        ) -> std::result::Result<tonic::Response<super::Empty>, tonic::Status> {
             self.inner.ready().await.map_err(|e| {
                 tonic::Status::new(
                     tonic::Code::Unknown,
@@ -6479,14 +6739,17 @@ pub mod queries_client {
             let codec = tonic::codec::ProstCodec::default();
             let path =
                 http::uri::PathAndQuery::from_static("/concordium.v2.Queries/PeerDisconnect");
-            self.inner.unary(request.into_request(), path, codec).await
+            let mut req = request.into_request();
+            req.extensions_mut()
+                .insert(GrpcMethod::new("concordium.v2.Queries", "PeerDisconnect"));
+            self.inner.unary(req, path, codec).await
         }
 
         /// Get a list of banned peers.
         pub async fn get_banned_peers(
             &mut self,
             request: impl tonic::IntoRequest<super::Empty>,
-        ) -> Result<tonic::Response<super::BannedPeers>, tonic::Status> {
+        ) -> std::result::Result<tonic::Response<super::BannedPeers>, tonic::Status> {
             self.inner.ready().await.map_err(|e| {
                 tonic::Status::new(
                     tonic::Code::Unknown,
@@ -6496,7 +6759,10 @@ pub mod queries_client {
             let codec = tonic::codec::ProstCodec::default();
             let path =
                 http::uri::PathAndQuery::from_static("/concordium.v2.Queries/GetBannedPeers");
-            self.inner.unary(request.into_request(), path, codec).await
+            let mut req = request.into_request();
+            req.extensions_mut()
+                .insert(GrpcMethod::new("concordium.v2.Queries", "GetBannedPeers"));
+            self.inner.unary(req, path, codec).await
         }
 
         /// Ban the given peer.
@@ -6504,7 +6770,7 @@ pub mod queries_client {
         pub async fn ban_peer(
             &mut self,
             request: impl tonic::IntoRequest<super::PeerToBan>,
-        ) -> Result<tonic::Response<super::Empty>, tonic::Status> {
+        ) -> std::result::Result<tonic::Response<super::Empty>, tonic::Status> {
             self.inner.ready().await.map_err(|e| {
                 tonic::Status::new(
                     tonic::Code::Unknown,
@@ -6513,7 +6779,10 @@ pub mod queries_client {
             })?;
             let codec = tonic::codec::ProstCodec::default();
             let path = http::uri::PathAndQuery::from_static("/concordium.v2.Queries/BanPeer");
-            self.inner.unary(request.into_request(), path, codec).await
+            let mut req = request.into_request();
+            req.extensions_mut()
+                .insert(GrpcMethod::new("concordium.v2.Queries", "BanPeer"));
+            self.inner.unary(req, path, codec).await
         }
 
         /// Unban the banned peer.
@@ -6521,7 +6790,7 @@ pub mod queries_client {
         pub async fn unban_peer(
             &mut self,
             request: impl tonic::IntoRequest<super::BannedPeer>,
-        ) -> Result<tonic::Response<super::Empty>, tonic::Status> {
+        ) -> std::result::Result<tonic::Response<super::Empty>, tonic::Status> {
             self.inner.ready().await.map_err(|e| {
                 tonic::Status::new(
                     tonic::Code::Unknown,
@@ -6530,7 +6799,10 @@ pub mod queries_client {
             })?;
             let codec = tonic::codec::ProstCodec::default();
             let path = http::uri::PathAndQuery::from_static("/concordium.v2.Queries/UnbanPeer");
-            self.inner.unary(request.into_request(), path, codec).await
+            let mut req = request.into_request();
+            req.extensions_mut()
+                .insert(GrpcMethod::new("concordium.v2.Queries", "UnbanPeer"));
+            self.inner.unary(req, path, codec).await
         }
 
         /// Start dumping packages into the specified file.
@@ -6539,7 +6811,7 @@ pub mod queries_client {
         pub async fn dump_start(
             &mut self,
             request: impl tonic::IntoRequest<super::DumpRequest>,
-        ) -> Result<tonic::Response<super::Empty>, tonic::Status> {
+        ) -> std::result::Result<tonic::Response<super::Empty>, tonic::Status> {
             self.inner.ready().await.map_err(|e| {
                 tonic::Status::new(
                     tonic::Code::Unknown,
@@ -6548,7 +6820,10 @@ pub mod queries_client {
             })?;
             let codec = tonic::codec::ProstCodec::default();
             let path = http::uri::PathAndQuery::from_static("/concordium.v2.Queries/DumpStart");
-            self.inner.unary(request.into_request(), path, codec).await
+            let mut req = request.into_request();
+            req.extensions_mut()
+                .insert(GrpcMethod::new("concordium.v2.Queries", "DumpStart"));
+            self.inner.unary(req, path, codec).await
         }
 
         /// Stop dumping packages.
@@ -6557,7 +6832,7 @@ pub mod queries_client {
         pub async fn dump_stop(
             &mut self,
             request: impl tonic::IntoRequest<super::Empty>,
-        ) -> Result<tonic::Response<super::Empty>, tonic::Status> {
+        ) -> std::result::Result<tonic::Response<super::Empty>, tonic::Status> {
             self.inner.ready().await.map_err(|e| {
                 tonic::Status::new(
                     tonic::Code::Unknown,
@@ -6566,7 +6841,10 @@ pub mod queries_client {
             })?;
             let codec = tonic::codec::ProstCodec::default();
             let path = http::uri::PathAndQuery::from_static("/concordium.v2.Queries/DumpStop");
-            self.inner.unary(request.into_request(), path, codec).await
+            let mut req = request.into_request();
+            req.extensions_mut()
+                .insert(GrpcMethod::new("concordium.v2.Queries", "DumpStop"));
+            self.inner.unary(req, path, codec).await
         }
 
         /// / Get a list of the peers that the node is connected to
@@ -6574,7 +6852,7 @@ pub mod queries_client {
         pub async fn get_peers_info(
             &mut self,
             request: impl tonic::IntoRequest<super::Empty>,
-        ) -> Result<tonic::Response<super::PeersInfo>, tonic::Status> {
+        ) -> std::result::Result<tonic::Response<super::PeersInfo>, tonic::Status> {
             self.inner.ready().await.map_err(|e| {
                 tonic::Status::new(
                     tonic::Code::Unknown,
@@ -6583,7 +6861,10 @@ pub mod queries_client {
             })?;
             let codec = tonic::codec::ProstCodec::default();
             let path = http::uri::PathAndQuery::from_static("/concordium.v2.Queries/GetPeersInfo");
-            self.inner.unary(request.into_request(), path, codec).await
+            let mut req = request.into_request();
+            req.extensions_mut()
+                .insert(GrpcMethod::new("concordium.v2.Queries", "GetPeersInfo"));
+            self.inner.unary(req, path, codec).await
         }
 
         /// Get information about the node.
@@ -6598,7 +6879,7 @@ pub mod queries_client {
         pub async fn get_node_info(
             &mut self,
             request: impl tonic::IntoRequest<super::Empty>,
-        ) -> Result<tonic::Response<super::NodeInfo>, tonic::Status> {
+        ) -> std::result::Result<tonic::Response<super::NodeInfo>, tonic::Status> {
             self.inner.ready().await.map_err(|e| {
                 tonic::Status::new(
                     tonic::Code::Unknown,
@@ -6607,7 +6888,10 @@ pub mod queries_client {
             })?;
             let codec = tonic::codec::ProstCodec::default();
             let path = http::uri::PathAndQuery::from_static("/concordium.v2.Queries/GetNodeInfo");
-            self.inner.unary(request.into_request(), path, codec).await
+            let mut req = request.into_request();
+            req.extensions_mut()
+                .insert(GrpcMethod::new("concordium.v2.Queries", "GetNodeInfo"));
+            self.inner.unary(req, path, codec).await
         }
 
         /// Send a block item. A block item is either an `AccountTransaction`,
@@ -6622,7 +6906,7 @@ pub mod queries_client {
         pub async fn send_block_item(
             &mut self,
             request: impl tonic::IntoRequest<super::SendBlockItemRequest>,
-        ) -> Result<tonic::Response<super::TransactionHash>, tonic::Status> {
+        ) -> std::result::Result<tonic::Response<super::TransactionHash>, tonic::Status> {
             self.inner.ready().await.map_err(|e| {
                 tonic::Status::new(
                     tonic::Code::Unknown,
@@ -6631,7 +6915,10 @@ pub mod queries_client {
             })?;
             let codec = tonic::codec::ProstCodec::default();
             let path = http::uri::PathAndQuery::from_static("/concordium.v2.Queries/SendBlockItem");
-            self.inner.unary(request.into_request(), path, codec).await
+            let mut req = request.into_request();
+            req.extensions_mut()
+                .insert(GrpcMethod::new("concordium.v2.Queries", "SendBlockItem"));
+            self.inner.unary(req, path, codec).await
         }
 
         /// Get the hash to be signed for an account transaction. The hash
@@ -6646,7 +6933,8 @@ pub mod queries_client {
         pub async fn get_account_transaction_sign_hash(
             &mut self,
             request: impl tonic::IntoRequest<super::PreAccountTransaction>,
-        ) -> Result<tonic::Response<super::AccountTransactionSignHash>, tonic::Status> {
+        ) -> std::result::Result<tonic::Response<super::AccountTransactionSignHash>, tonic::Status>
+        {
             self.inner.ready().await.map_err(|e| {
                 tonic::Status::new(
                     tonic::Code::Unknown,
@@ -6657,14 +6945,19 @@ pub mod queries_client {
             let path = http::uri::PathAndQuery::from_static(
                 "/concordium.v2.Queries/GetAccountTransactionSignHash",
             );
-            self.inner.unary(request.into_request(), path, codec).await
+            let mut req = request.into_request();
+            req.extensions_mut().insert(GrpcMethod::new(
+                "concordium.v2.Queries",
+                "GetAccountTransactionSignHash",
+            ));
+            self.inner.unary(req, path, codec).await
         }
 
         /// Get the values of chain parameters in effect in the given block.
         pub async fn get_block_chain_parameters(
             &mut self,
             request: impl tonic::IntoRequest<super::BlockHashInput>,
-        ) -> Result<tonic::Response<super::ChainParameters>, tonic::Status> {
+        ) -> std::result::Result<tonic::Response<super::ChainParameters>, tonic::Status> {
             self.inner.ready().await.map_err(|e| {
                 tonic::Status::new(
                     tonic::Code::Unknown,
@@ -6675,14 +6968,20 @@ pub mod queries_client {
             let path = http::uri::PathAndQuery::from_static(
                 "/concordium.v2.Queries/GetBlockChainParameters",
             );
-            self.inner.unary(request.into_request(), path, codec).await
+            let mut req = request.into_request();
+            req.extensions_mut().insert(GrpcMethod::new(
+                "concordium.v2.Queries",
+                "GetBlockChainParameters",
+            ));
+            self.inner.unary(req, path, codec).await
         }
 
         /// Get the summary of the finalization data in a given block.
         pub async fn get_block_finalization_summary(
             &mut self,
             request: impl tonic::IntoRequest<super::BlockHashInput>,
-        ) -> Result<tonic::Response<super::BlockFinalizationSummary>, tonic::Status> {
+        ) -> std::result::Result<tonic::Response<super::BlockFinalizationSummary>, tonic::Status>
+        {
             self.inner.ready().await.map_err(|e| {
                 tonic::Status::new(
                     tonic::Code::Unknown,
@@ -6693,15 +6992,22 @@ pub mod queries_client {
             let path = http::uri::PathAndQuery::from_static(
                 "/concordium.v2.Queries/GetBlockFinalizationSummary",
             );
-            self.inner.unary(request.into_request(), path, codec).await
+            let mut req = request.into_request();
+            req.extensions_mut().insert(GrpcMethod::new(
+                "concordium.v2.Queries",
+                "GetBlockFinalizationSummary",
+            ));
+            self.inner.unary(req, path, codec).await
         }
 
         /// Get the items of a block.
         pub async fn get_block_items(
             &mut self,
             request: impl tonic::IntoRequest<super::BlockHashInput>,
-        ) -> Result<tonic::Response<tonic::codec::Streaming<super::BlockItem>>, tonic::Status>
-        {
+        ) -> std::result::Result<
+            tonic::Response<tonic::codec::Streaming<super::BlockItem>>,
+            tonic::Status,
+        > {
             self.inner.ready().await.map_err(|e| {
                 tonic::Status::new(
                     tonic::Code::Unknown,
@@ -6710,9 +7016,10 @@ pub mod queries_client {
             })?;
             let codec = tonic::codec::ProstCodec::default();
             let path = http::uri::PathAndQuery::from_static("/concordium.v2.Queries/GetBlockItems");
-            self.inner
-                .server_streaming(request.into_request(), path, codec)
-                .await
+            let mut req = request.into_request();
+            req.extensions_mut()
+                .insert(GrpcMethod::new("concordium.v2.Queries", "GetBlockItems"));
+            self.inner.server_streaming(req, path, codec).await
         }
 
         /// Get all bakers in the reward period of a block.
@@ -6722,7 +7029,7 @@ pub mod queries_client {
         pub async fn get_bakers_reward_period(
             &mut self,
             request: impl tonic::IntoRequest<super::BlockHashInput>,
-        ) -> Result<
+        ) -> std::result::Result<
             tonic::Response<tonic::codec::Streaming<super::BakerRewardPeriodInfo>>,
             tonic::Status,
         > {
@@ -6736,9 +7043,12 @@ pub mod queries_client {
             let path = http::uri::PathAndQuery::from_static(
                 "/concordium.v2.Queries/GetBakersRewardPeriod",
             );
-            self.inner
-                .server_streaming(request.into_request(), path, codec)
-                .await
+            let mut req = request.into_request();
+            req.extensions_mut().insert(GrpcMethod::new(
+                "concordium.v2.Queries",
+                "GetBakersRewardPeriod",
+            ));
+            self.inner.server_streaming(req, path, codec).await
         }
 
         /// For a non-genesis block, this returns the quorum certificate, a
@@ -6751,7 +7061,7 @@ pub mod queries_client {
         pub async fn get_block_certificates(
             &mut self,
             request: impl tonic::IntoRequest<super::BlockHashInput>,
-        ) -> Result<tonic::Response<super::BlockCertificates>, tonic::Status> {
+        ) -> std::result::Result<tonic::Response<super::BlockCertificates>, tonic::Status> {
             self.inner.ready().await.map_err(|e| {
                 tonic::Status::new(
                     tonic::Code::Unknown,
@@ -6761,7 +7071,12 @@ pub mod queries_client {
             let codec = tonic::codec::ProstCodec::default();
             let path =
                 http::uri::PathAndQuery::from_static("/concordium.v2.Queries/GetBlockCertificates");
-            self.inner.unary(request.into_request(), path, codec).await
+            let mut req = request.into_request();
+            req.extensions_mut().insert(GrpcMethod::new(
+                "concordium.v2.Queries",
+                "GetBlockCertificates",
+            ));
+            self.inner.unary(req, path, codec).await
         }
 
         /// Get the list of bakers that won the lottery in a particular
@@ -6786,8 +7101,10 @@ pub mod queries_client {
         pub async fn get_winning_bakers_epoch(
             &mut self,
             request: impl tonic::IntoRequest<super::EpochRequest>,
-        ) -> Result<tonic::Response<tonic::codec::Streaming<super::WinningBaker>>, tonic::Status>
-        {
+        ) -> std::result::Result<
+            tonic::Response<tonic::codec::Streaming<super::WinningBaker>>,
+            tonic::Status,
+        > {
             self.inner.ready().await.map_err(|e| {
                 tonic::Status::new(
                     tonic::Code::Unknown,
@@ -6798,9 +7115,12 @@ pub mod queries_client {
             let path = http::uri::PathAndQuery::from_static(
                 "/concordium.v2.Queries/GetWinningBakersEpoch",
             );
-            self.inner
-                .server_streaming(request.into_request(), path, codec)
-                .await
+            let mut req = request.into_request();
+            req.extensions_mut().insert(GrpcMethod::new(
+                "concordium.v2.Queries",
+                "GetWinningBakersEpoch",
+            ));
+            self.inner.server_streaming(req, path, codec).await
         }
 
         /// Get the block hash of the first finalized block in a specified
@@ -6817,7 +7137,7 @@ pub mod queries_client {
         pub async fn get_first_block_epoch(
             &mut self,
             request: impl tonic::IntoRequest<super::EpochRequest>,
-        ) -> Result<tonic::Response<super::BlockHash>, tonic::Status> {
+        ) -> std::result::Result<tonic::Response<super::BlockHash>, tonic::Status> {
             self.inner.ready().await.map_err(|e| {
                 tonic::Status::new(
                     tonic::Code::Unknown,
@@ -6827,7 +7147,12 @@ pub mod queries_client {
             let codec = tonic::codec::ProstCodec::default();
             let path =
                 http::uri::PathAndQuery::from_static("/concordium.v2.Queries/GetFirstBlockEpoch");
-            self.inner.unary(request.into_request(), path, codec).await
+            let mut req = request.into_request();
+            req.extensions_mut().insert(GrpcMethod::new(
+                "concordium.v2.Queries",
+                "GetFirstBlockEpoch",
+            ));
+            self.inner.unary(req, path, codec).await
         }
 
         /// Dry run a series of transactions and operations on a state derived
@@ -6868,8 +7193,10 @@ pub mod queries_client {
         pub async fn dry_run(
             &mut self,
             request: impl tonic::IntoStreamingRequest<Message = super::DryRunRequest>,
-        ) -> Result<tonic::Response<tonic::codec::Streaming<super::DryRunResponse>>, tonic::Status>
-        {
+        ) -> std::result::Result<
+            tonic::Response<tonic::codec::Streaming<super::DryRunResponse>>,
+            tonic::Status,
+        > {
             self.inner.ready().await.map_err(|e| {
                 tonic::Status::new(
                     tonic::Code::Unknown,
@@ -6878,9 +7205,10 @@ pub mod queries_client {
             })?;
             let codec = tonic::codec::ProstCodec::default();
             let path = http::uri::PathAndQuery::from_static("/concordium.v2.Queries/DryRun");
-            self.inner
-                .streaming(request.into_streaming_request(), path, codec)
-                .await
+            let mut req = request.into_streaming_request();
+            req.extensions_mut()
+                .insert(GrpcMethod::new("concordium.v2.Queries", "DryRun"));
+            self.inner.streaming(req, path, codec).await
         }
     }
 }
diff --git a/src/v2/proto_schema_version.rs b/src/v2/proto_schema_version.rs
index 05a87b0b4..fc076254a 100644
--- a/src/v2/proto_schema_version.rs
+++ b/src/v2/proto_schema_version.rs
@@ -1 +1 @@
-pub const PROTO_SCHEMA_VERSION: &str = "7235ab10c1086f53c7ac29ab9e8c32ab163fd866";
+pub const PROTO_SCHEMA_VERSION: &str = "3f22e954f21ec69b15fdde4b15e565d884182630";