Updated gRPC to v1.65.x

.github/workflows/c-cpp.yml

@@ -355,8 +355,6 @@ jobs:
 
     - name: Apply patch
       run: |
-        cd external/src/grpc/third_party/boringssl-with-bazel
-        git apply --verbose --ignore-whitespace ../../../../../patches/msys2/gcc14_boringssl.patch
         cd /
         git apply --verbose --ignore-whitespace --directory=mingw64/include/c++/`ls mingw64/include/c++`/ /d/a/p2pool/p2pool/patches/msys2/typeinfo.patch
 

cmake/grpc.cmake

@@ -2,6 +2,7 @@ set(protobuf_INSTALL OFF CACHE BOOL "Install protobuf binaries and files")
 set(protobuf_BUILD_TESTS OFF CACHE BOOL "Build protobuf tests")
 set(protobuf_BUILD_PROTOC_BINARIES OFF CACHE BOOL "Build libprotoc and protoc compiler")
 set(protobuf_BUILD_SHARED_LIBS OFF CACHE BOOL "Build protobuf Shared Libraries")
+set(protobuf_DISABLE_RTTI ON CACHE BOOL "Remove runtime type information in the binaries")
 
 set(utf8_range_ENABLE_TESTS OFF CACHE BOOL "Build test suite")
 set(utf8_range_ENABLE_INSTALL OFF CACHE BOOL "Configure installation")
@@ -9,6 +10,7 @@ set(utf8_range_ENABLE_INSTALL OFF CACHE BOOL "Configure installation")
 set(RE2_BUILD_TESTING OFF CACHE BOOL "enable testing for RE2")
 
 set(gRPC_BUILD_CODEGEN OFF CACHE BOOL "Build codegen")
+set(gRPC_DOWNLOAD_ARCHIVES OFF CACHE BOOL "Download archives for empty 3rd party directories")
 set(gRPC_BUILD_GRPC_CPP_PLUGIN OFF CACHE BOOL "Build grpc_cpp_plugin")
 set(gRPC_BUILD_GRPC_CSHARP_PLUGIN OFF CACHE BOOL "Build grpc_csharp_plugin")
 set(gRPC_BUILD_GRPC_NODE_PLUGIN OFF CACHE BOOL "Build grpc_node_plugin")

external/src/Tari/proto/gRPC/network.pb.cc

@@ -1,5 +1,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: network.proto
+// Protobuf C++ Version: 5.26.1
 
 #include "network.pb.h"
 
@@ -242,118 +243,119 @@ static ::_pb::Metadata file_level_metadata_network_2eproto[9];
 static const ::_pb::EnumDescriptor* file_level_enum_descriptors_network_2eproto[1];
 static constexpr const ::_pb::ServiceDescriptor**
     file_level_service_descriptors_network_2eproto = nullptr;
-const ::uint32_t TableStruct_network_2eproto::offsets[] PROTOBUF_SECTION_VARIABLE(
+const ::uint32_t
-    protodesc_cold) = {
+    TableStruct_network_2eproto::offsets[] ABSL_ATTRIBUTE_SECTION_VARIABLE(
-    ~0u,  // no _has_bits_
+        protodesc_cold) = {
-    PROTOBUF_FIELD_OFFSET(::tari::rpc::NodeIdentity, _internal_metadata_),
+        ~0u,  // no _has_bits_
-    ~0u,  // no _extensions_
+        PROTOBUF_FIELD_OFFSET(::tari::rpc::NodeIdentity, _internal_metadata_),
-    ~0u,  // no _oneof_case_
+        ~0u,  // no _extensions_
-    ~0u,  // no _weak_field_map_
+        ~0u,  // no _oneof_case_
-    ~0u,  // no _inlined_string_donated_
+        ~0u,  // no _weak_field_map_
-    ~0u,  // no _split_
+        ~0u,  // no _inlined_string_donated_
-    ~0u,  // no sizeof(Split)
+        ~0u,  // no _split_
-    PROTOBUF_FIELD_OFFSET(::tari::rpc::NodeIdentity, _impl_.public_key_),
+        ~0u,  // no sizeof(Split)
-    PROTOBUF_FIELD_OFFSET(::tari::rpc::NodeIdentity, _impl_.public_addresses_),
+        PROTOBUF_FIELD_OFFSET(::tari::rpc::NodeIdentity, _impl_.public_key_),
-    PROTOBUF_FIELD_OFFSET(::tari::rpc::NodeIdentity, _impl_.node_id_),
+        PROTOBUF_FIELD_OFFSET(::tari::rpc::NodeIdentity, _impl_.public_addresses_),
-    ~0u,  // no _has_bits_
+        PROTOBUF_FIELD_OFFSET(::tari::rpc::NodeIdentity, _impl_.node_id_),
-    PROTOBUF_FIELD_OFFSET(::tari::rpc::Peer, _internal_metadata_),
+        ~0u,  // no _has_bits_
-    ~0u,  // no _extensions_
+        PROTOBUF_FIELD_OFFSET(::tari::rpc::Peer, _internal_metadata_),
-    ~0u,  // no _oneof_case_
+        ~0u,  // no _extensions_
-    ~0u,  // no _weak_field_map_
+        ~0u,  // no _oneof_case_
-    ~0u,  // no _inlined_string_donated_
+        ~0u,  // no _weak_field_map_
-    ~0u,  // no _split_
+        ~0u,  // no _inlined_string_donated_
-    ~0u,  // no sizeof(Split)
+        ~0u,  // no _split_
-    PROTOBUF_FIELD_OFFSET(::tari::rpc::Peer, _impl_.public_key_),
+        ~0u,  // no sizeof(Split)
-    PROTOBUF_FIELD_OFFSET(::tari::rpc::Peer, _impl_.node_id_),
+        PROTOBUF_FIELD_OFFSET(::tari::rpc::Peer, _impl_.public_key_),
-    PROTOBUF_FIELD_OFFSET(::tari::rpc::Peer, _impl_.addresses_),
+        PROTOBUF_FIELD_OFFSET(::tari::rpc::Peer, _impl_.node_id_),
-    PROTOBUF_FIELD_OFFSET(::tari::rpc::Peer, _impl_.last_connection_),
+        PROTOBUF_FIELD_OFFSET(::tari::rpc::Peer, _impl_.addresses_),
-    PROTOBUF_FIELD_OFFSET(::tari::rpc::Peer, _impl_.flags_),
+        PROTOBUF_FIELD_OFFSET(::tari::rpc::Peer, _impl_.last_connection_),
-    PROTOBUF_FIELD_OFFSET(::tari::rpc::Peer, _impl_.banned_until_),
+        PROTOBUF_FIELD_OFFSET(::tari::rpc::Peer, _impl_.flags_),
-    PROTOBUF_FIELD_OFFSET(::tari::rpc::Peer, _impl_.banned_reason_),
+        PROTOBUF_FIELD_OFFSET(::tari::rpc::Peer, _impl_.banned_until_),
-    PROTOBUF_FIELD_OFFSET(::tari::rpc::Peer, _impl_.offline_at_),
+        PROTOBUF_FIELD_OFFSET(::tari::rpc::Peer, _impl_.banned_reason_),
-    PROTOBUF_FIELD_OFFSET(::tari::rpc::Peer, _impl_.features_),
+        PROTOBUF_FIELD_OFFSET(::tari::rpc::Peer, _impl_.offline_at_),
-    PROTOBUF_FIELD_OFFSET(::tari::rpc::Peer, _impl_.supported_protocols_),
+        PROTOBUF_FIELD_OFFSET(::tari::rpc::Peer, _impl_.features_),
-    PROTOBUF_FIELD_OFFSET(::tari::rpc::Peer, _impl_.user_agent_),
+        PROTOBUF_FIELD_OFFSET(::tari::rpc::Peer, _impl_.supported_protocols_),
-    ~0u,  // no _has_bits_
+        PROTOBUF_FIELD_OFFSET(::tari::rpc::Peer, _impl_.user_agent_),
-    PROTOBUF_FIELD_OFFSET(::tari::rpc::NetworkStatusResponse, _internal_metadata_),
+        ~0u,  // no _has_bits_
-    ~0u,  // no _extensions_
+        PROTOBUF_FIELD_OFFSET(::tari::rpc::NetworkStatusResponse, _internal_metadata_),
-    ~0u,  // no _oneof_case_
+        ~0u,  // no _extensions_
-    ~0u,  // no _weak_field_map_
+        ~0u,  // no _oneof_case_
-    ~0u,  // no _inlined_string_donated_
+        ~0u,  // no _weak_field_map_
-    ~0u,  // no _split_
+        ~0u,  // no _inlined_string_donated_
-    ~0u,  // no sizeof(Split)
+        ~0u,  // no _split_
-    PROTOBUF_FIELD_OFFSET(::tari::rpc::NetworkStatusResponse, _impl_.status_),
+        ~0u,  // no sizeof(Split)
-    PROTOBUF_FIELD_OFFSET(::tari::rpc::NetworkStatusResponse, _impl_.avg_latency_ms_),
+        PROTOBUF_FIELD_OFFSET(::tari::rpc::NetworkStatusResponse, _impl_.status_),
-    PROTOBUF_FIELD_OFFSET(::tari::rpc::NetworkStatusResponse, _impl_.num_node_connections_),
+        PROTOBUF_FIELD_OFFSET(::tari::rpc::NetworkStatusResponse, _impl_.avg_latency_ms_),
-    PROTOBUF_FIELD_OFFSET(::tari::rpc::Address, _impl_._has_bits_),
+        PROTOBUF_FIELD_OFFSET(::tari::rpc::NetworkStatusResponse, _impl_.num_node_connections_),
-    PROTOBUF_FIELD_OFFSET(::tari::rpc::Address, _internal_metadata_),
+        PROTOBUF_FIELD_OFFSET(::tari::rpc::Address, _impl_._has_bits_),
-    ~0u,  // no _extensions_
+        PROTOBUF_FIELD_OFFSET(::tari::rpc::Address, _internal_metadata_),
-    ~0u,  // no _oneof_case_
+        ~0u,  // no _extensions_
-    ~0u,  // no _weak_field_map_
+        ~0u,  // no _oneof_case_
-    ~0u,  // no _inlined_string_donated_
+        ~0u,  // no _weak_field_map_
-    ~0u,  // no _split_
+        ~0u,  // no _inlined_string_donated_
-    ~0u,  // no sizeof(Split)
+        ~0u,  // no _split_
-    PROTOBUF_FIELD_OFFSET(::tari::rpc::Address, _impl_.address_),
+        ~0u,  // no sizeof(Split)
-    PROTOBUF_FIELD_OFFSET(::tari::rpc::Address, _impl_.last_seen_),
+        PROTOBUF_FIELD_OFFSET(::tari::rpc::Address, _impl_.address_),
-    PROTOBUF_FIELD_OFFSET(::tari::rpc::Address, _impl_.connection_attempts_),
+        PROTOBUF_FIELD_OFFSET(::tari::rpc::Address, _impl_.last_seen_),
-    PROTOBUF_FIELD_OFFSET(::tari::rpc::Address, _impl_.avg_latency_),
+        PROTOBUF_FIELD_OFFSET(::tari::rpc::Address, _impl_.connection_attempts_),
-    ~0u,
+        PROTOBUF_FIELD_OFFSET(::tari::rpc::Address, _impl_.avg_latency_),
-    ~0u,
+        ~0u,
-    ~0u,
+        ~0u,
-    0,
+        ~0u,
-    ~0u,  // no _has_bits_
+        0,
-    PROTOBUF_FIELD_OFFSET(::tari::rpc::AverageLatency, _internal_metadata_),
+        ~0u,  // no _has_bits_
-    ~0u,  // no _extensions_
+        PROTOBUF_FIELD_OFFSET(::tari::rpc::AverageLatency, _internal_metadata_),
-    ~0u,  // no _oneof_case_
+        ~0u,  // no _extensions_
-    ~0u,  // no _weak_field_map_
+        ~0u,  // no _oneof_case_
-    ~0u,  // no _inlined_string_donated_
+        ~0u,  // no _weak_field_map_
-    ~0u,  // no _split_
+        ~0u,  // no _inlined_string_donated_
-    ~0u,  // no sizeof(Split)
+        ~0u,  // no _split_
-    PROTOBUF_FIELD_OFFSET(::tari::rpc::AverageLatency, _impl_.latency_),
+        ~0u,  // no sizeof(Split)
-    ~0u,  // no _has_bits_
+        PROTOBUF_FIELD_OFFSET(::tari::rpc::AverageLatency, _impl_.latency_),
-    PROTOBUF_FIELD_OFFSET(::tari::rpc::ListConnectedPeersResponse, _internal_metadata_),
+        ~0u,  // no _has_bits_
-    ~0u,  // no _extensions_
+        PROTOBUF_FIELD_OFFSET(::tari::rpc::ListConnectedPeersResponse, _internal_metadata_),
-    ~0u,  // no _oneof_case_
+        ~0u,  // no _extensions_
-    ~0u,  // no _weak_field_map_
+        ~0u,  // no _oneof_case_
-    ~0u,  // no _inlined_string_donated_
+        ~0u,  // no _weak_field_map_
-    ~0u,  // no _split_
+        ~0u,  // no _inlined_string_donated_
-    ~0u,  // no sizeof(Split)
+        ~0u,  // no _split_
-    PROTOBUF_FIELD_OFFSET(::tari::rpc::ListConnectedPeersResponse, _impl_.connected_peers_),
+        ~0u,  // no sizeof(Split)
-    ~0u,  // no _has_bits_
+        PROTOBUF_FIELD_OFFSET(::tari::rpc::ListConnectedPeersResponse, _impl_.connected_peers_),
-    PROTOBUF_FIELD_OFFSET(::tari::rpc::SoftwareUpdate, _internal_metadata_),
+        ~0u,  // no _has_bits_
-    ~0u,  // no _extensions_
+        PROTOBUF_FIELD_OFFSET(::tari::rpc::SoftwareUpdate, _internal_metadata_),
-    ~0u,  // no _oneof_case_
+        ~0u,  // no _extensions_
-    ~0u,  // no _weak_field_map_
+        ~0u,  // no _oneof_case_
-    ~0u,  // no _inlined_string_donated_
+        ~0u,  // no _weak_field_map_
-    ~0u,  // no _split_
+        ~0u,  // no _inlined_string_donated_
-    ~0u,  // no sizeof(Split)
+        ~0u,  // no _split_
-    PROTOBUF_FIELD_OFFSET(::tari::rpc::SoftwareUpdate, _impl_.has_update_),
+        ~0u,  // no sizeof(Split)
-    PROTOBUF_FIELD_OFFSET(::tari::rpc::SoftwareUpdate, _impl_.version_),
+        PROTOBUF_FIELD_OFFSET(::tari::rpc::SoftwareUpdate, _impl_.has_update_),
-    PROTOBUF_FIELD_OFFSET(::tari::rpc::SoftwareUpdate, _impl_.sha_),
+        PROTOBUF_FIELD_OFFSET(::tari::rpc::SoftwareUpdate, _impl_.version_),
-    PROTOBUF_FIELD_OFFSET(::tari::rpc::SoftwareUpdate, _impl_.download_url_),
+        PROTOBUF_FIELD_OFFSET(::tari::rpc::SoftwareUpdate, _impl_.sha_),
-    ~0u,  // no _has_bits_
+        PROTOBUF_FIELD_OFFSET(::tari::rpc::SoftwareUpdate, _impl_.download_url_),
-    PROTOBUF_FIELD_OFFSET(::tari::rpc::GetIdentityRequest, _internal_metadata_),
+        ~0u,  // no _has_bits_
-    ~0u,  // no _extensions_
+        PROTOBUF_FIELD_OFFSET(::tari::rpc::GetIdentityRequest, _internal_metadata_),
-    ~0u,  // no _oneof_case_
+        ~0u,  // no _extensions_
-    ~0u,  // no _weak_field_map_
+        ~0u,  // no _oneof_case_
-    ~0u,  // no _inlined_string_donated_
+        ~0u,  // no _weak_field_map_
-    ~0u,  // no _split_
+        ~0u,  // no _inlined_string_donated_
-    ~0u,  // no sizeof(Split)
+        ~0u,  // no _split_
-    ~0u,  // no _has_bits_
+        ~0u,  // no sizeof(Split)
-    PROTOBUF_FIELD_OFFSET(::tari::rpc::GetIdentityResponse, _internal_metadata_),
+        ~0u,  // no _has_bits_
-    ~0u,  // no _extensions_
+        PROTOBUF_FIELD_OFFSET(::tari::rpc::GetIdentityResponse, _internal_metadata_),
-    ~0u,  // no _oneof_case_
+        ~0u,  // no _extensions_
-    ~0u,  // no _weak_field_map_
+        ~0u,  // no _oneof_case_
-    ~0u,  // no _inlined_string_donated_
+        ~0u,  // no _weak_field_map_
-    ~0u,  // no _split_
+        ~0u,  // no _inlined_string_donated_
-    ~0u,  // no sizeof(Split)
+        ~0u,  // no _split_
-    PROTOBUF_FIELD_OFFSET(::tari::rpc::GetIdentityResponse, _impl_.public_key_),
+        ~0u,  // no sizeof(Split)
-    PROTOBUF_FIELD_OFFSET(::tari::rpc::GetIdentityResponse, _impl_.public_address_),
+        PROTOBUF_FIELD_OFFSET(::tari::rpc::GetIdentityResponse, _impl_.public_key_),
-    PROTOBUF_FIELD_OFFSET(::tari::rpc::GetIdentityResponse, _impl_.node_id_),
+        PROTOBUF_FIELD_OFFSET(::tari::rpc::GetIdentityResponse, _impl_.public_address_),
+        PROTOBUF_FIELD_OFFSET(::tari::rpc::GetIdentityResponse, _impl_.node_id_),
 };
 
 static const ::_pbi::MigrationSchema
-    schemas[] PROTOBUF_SECTION_VARIABLE(protodesc_cold) = {
+    schemas[] ABSL_ATTRIBUTE_SECTION_VARIABLE(protodesc_cold) = {
         {0, -1, -1, sizeof(::tari::rpc::NodeIdentity)},
         {11, -1, -1, sizeof(::tari::rpc::Peer)},
         {30, -1, -1, sizeof(::tari::rpc::NetworkStatusResponse)},
@@ -364,7 +366,6 @@ static const ::_pbi::MigrationSchema
         {87, -1, -1, sizeof(::tari::rpc::GetIdentityRequest)},
         {95, -1, -1, sizeof(::tari::rpc::GetIdentityResponse)},
 };
-
 static const ::_pb::Message* const file_default_instances[] = {
     &::tari::rpc::_NodeIdentity_default_instance_._instance,
     &::tari::rpc::_Peer_default_instance_._instance,
@@ -376,7 +377,8 @@ static const ::_pb::Message* const file_default_instances[] = {
     &::tari::rpc::_GetIdentityRequest_default_instance_._instance,
     &::tari::rpc::_GetIdentityResponse_default_instance_._instance,
 };
-const char descriptor_table_protodef_network_2eproto[] PROTOBUF_SECTION_VARIABLE(protodesc_cold) = {
+const char descriptor_table_protodef_network_2eproto[] ABSL_ATTRIBUTE_SECTION_VARIABLE(
+    protodesc_cold) = {
     "\n\rnetwork.proto\022\010tari.rpc\032\037google/protob"
     "uf/timestamp.proto\"M\n\014NodeIdentity\022\022\n\npu"
     "blic_key\030\001 \001(\014\022\030\n\020public_addresses\030\002 \003(\t"
@@ -441,9 +443,6 @@ const ::_pbi::DescriptorTable descriptor_table_network_2eproto = {
 PROTOBUF_ATTRIBUTE_WEAK const ::_pbi::DescriptorTable* descriptor_table_network_2eproto_getter() {
   return &descriptor_table_network_2eproto;
 }
-// Force running AddDescriptors() at dynamic initialization time.
-PROTOBUF_ATTRIBUTE_INIT_PRIORITY2
-static ::_pbi::AddDescriptorsRunner dynamic_init_dummy_network_2eproto(&descriptor_table_network_2eproto);
 namespace tari {
 namespace rpc {
 const ::google::protobuf::EnumDescriptor* ConnectivityStatus_descriptor() {
@@ -509,6 +508,20 @@ inline void NodeIdentity::SharedDtor() {
   _impl_.~Impl_();
 }
 
+const ::google::protobuf::MessageLite::ClassData*
+NodeIdentity::GetClassData() const {
+  PROTOBUF_CONSTINIT static const ::google::protobuf::MessageLite::
+      ClassDataFull _data_ = {
+          {
+              nullptr,  // OnDemandRegisterArenaDtor
+              PROTOBUF_FIELD_OFFSET(NodeIdentity, _impl_._cached_size_),
+              false,
+          },
+          &NodeIdentity::MergeImpl,
+          &NodeIdentity::kDescriptorMethods,
+      };
+  return &_data_;
+}
 PROTOBUF_NOINLINE void NodeIdentity::Clear() {
 // @@protoc_insertion_point(message_clear_start:tari.rpc.NodeIdentity)
   PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
@@ -543,6 +556,9 @@ const ::_pbi::TcParseTable<2, 3, 0, 46, 2> NodeIdentity::_table_ = {
     offsetof(decltype(_table_), field_names),  // no aux_entries
     &_NodeIdentity_default_instance_._instance,
     ::_pbi::TcParser::GenericFallback,  // fallback
+    #ifdef PROTOBUF_PREFETCH_PARSE_TABLE
+    ::_pbi::TcParser::GetTable<::tari::rpc::NodeIdentity>(),  // to_prefetch
+    #endif  // PROTOBUF_PREFETCH_PARSE_TABLE
   }, {{
     {::_pbi::TcParser::MiniParse, {}},
     // bytes public_key = 1;
@@ -640,15 +656,8 @@ const ::_pbi::TcParseTable<2, 3, 0, 46, 2> NodeIdentity::_table_ = {
   return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_);
 }
 
-const ::google::protobuf::Message::ClassData NodeIdentity::_class_data_ = {
-    NodeIdentity::MergeImpl,
-    nullptr,  // OnDemandRegisterArenaDtor
-};
-const ::google::protobuf::Message::ClassData* NodeIdentity::GetClassData() const {
-  return &_class_data_;
-}
 
-void NodeIdentity::MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg) {
+void NodeIdentity::MergeImpl(::google::protobuf::MessageLite& to_msg, const ::google::protobuf::MessageLite& from_msg) {
   auto* const _this = static_cast<NodeIdentity*>(&to_msg);
   auto& from = static_cast<const NodeIdentity&>(from_msg);
   // @@protoc_insertion_point(class_specific_merge_from_start:tari.rpc.NodeIdentity)
@@ -677,9 +686,6 @@ PROTOBUF_NOINLINE bool NodeIdentity::IsInitialized() const {
   return true;
 }
 
-::_pbi::CachedSize* NodeIdentity::AccessCachedSize() const {
-  return &_impl_._cached_size_;
-}
 void NodeIdentity::InternalSwap(NodeIdentity* PROTOBUF_RESTRICT other) {
   using std::swap;
   auto* arena = GetArena();
@@ -691,9 +697,9 @@ void NodeIdentity::InternalSwap(NodeIdentity* PROTOBUF_RESTRICT other) {
 }
 
 ::google::protobuf::Metadata NodeIdentity::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
+  return ::_pbi::AssignDescriptors(&descriptor_table_network_2eproto_getter,
-      &descriptor_table_network_2eproto_getter, &descriptor_table_network_2eproto_once,
+                                   &descriptor_table_network_2eproto_once,
-      file_level_metadata_network_2eproto[0]);
+                                   file_level_metadata_network_2eproto[0]);
 }
 // ===================================================================
 
@@ -770,6 +776,20 @@ inline void Peer::SharedDtor() {
   _impl_.~Impl_();
 }
 
+const ::google::protobuf::MessageLite::ClassData*
+Peer::GetClassData() const {
+  PROTOBUF_CONSTINIT static const ::google::protobuf::MessageLite::
+      ClassDataFull _data_ = {
+          {
+              nullptr,  // OnDemandRegisterArenaDtor
+              PROTOBUF_FIELD_OFFSET(Peer, _impl_._cached_size_),
+              false,
+          },
+          &Peer::MergeImpl,
+          &Peer::kDescriptorMethods,
+      };
+  return &_data_;
+}
 PROTOBUF_NOINLINE void Peer::Clear() {
 // @@protoc_insertion_point(message_clear_start:tari.rpc.Peer)
   PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
@@ -810,6 +830,9 @@ const ::_pbi::TcParseTable<4, 11, 1, 53, 2> Peer::_table_ = {
     offsetof(decltype(_table_), aux_entries),
     &_Peer_default_instance_._instance,
     ::_pbi::TcParser::GenericFallback,  // fallback
+    #ifdef PROTOBUF_PREFETCH_PARSE_TABLE
+    ::_pbi::TcParser::GetTable<::tari::rpc::Peer>(),  // to_prefetch
+    #endif  // PROTOBUF_PREFETCH_PARSE_TABLE
   }, {{
     {::_pbi::TcParser::MiniParse, {}},
     // bytes public_key = 1;
@@ -915,11 +938,14 @@ const ::_pbi::TcParseTable<4, 11, 1, 53, 2> Peer::_table_ = {
   }
 
   // repeated .tari.rpc.Address addresses = 3;
-  for (unsigned i = 0,
+  for (unsigned i = 0, n = static_cast<unsigned>(
-      n = static_cast<unsigned>(this->_internal_addresses_size()); i < n; i++) {
+                           this->_internal_addresses_size());
+       i < n; i++) {
     const auto& repfield = this->_internal_addresses().Get(i);
-    target = ::google::protobuf::internal::WireFormatLite::
+    target =
-        InternalWriteMessage(3, repfield, repfield.GetCachedSize(), target, stream);
+        ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
+            3, repfield, repfield.GetCachedSize(),
+            target, stream);
   }
 
   // uint64 last_connection = 4;
@@ -999,8 +1025,7 @@ const ::_pbi::TcParseTable<4, 11, 1, 53, 2> Peer::_table_ = {
   // repeated .tari.rpc.Address addresses = 3;
   total_size += 1UL * this->_internal_addresses_size();
   for (const auto& msg : this->_internal_addresses()) {
-    total_size +=
+    total_size += ::google::protobuf::internal::WireFormatLite::MessageSize(msg);
-      ::google::protobuf::internal::WireFormatLite::MessageSize(msg);
   }
   // repeated bytes supported_protocols = 11;
   total_size += 1 * ::google::protobuf::internal::FromIntSize(_internal_supported_protocols().size());
@@ -1065,15 +1090,8 @@ const ::_pbi::TcParseTable<4, 11, 1, 53, 2> Peer::_table_ = {
   return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_);
 }
 
-const ::google::protobuf::Message::ClassData Peer::_class_data_ = {
-    Peer::MergeImpl,
-    nullptr,  // OnDemandRegisterArenaDtor
-};
-const ::google::protobuf::Message::ClassData* Peer::GetClassData() const {
-  return &_class_data_;
-}
 
-void Peer::MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg) {
+void Peer::MergeImpl(::google::protobuf::MessageLite& to_msg, const ::google::protobuf::MessageLite& from_msg) {
   auto* const _this = static_cast<Peer*>(&to_msg);
   auto& from = static_cast<const Peer&>(from_msg);
   // @@protoc_insertion_point(class_specific_merge_from_start:tari.rpc.Peer)
@@ -1097,19 +1115,19 @@ void Peer::MergeImpl(::google::protobuf::Message& to_msg, const ::google::protob
     _this->_internal_set_user_agent(from._internal_user_agent());
   }
   if (from._internal_last_connection() != 0) {
-    _this->_internal_set_last_connection(from._internal_last_connection());
+    _this->_impl_.last_connection_ = from._impl_.last_connection_;
   }
   if (from._internal_banned_until() != 0) {
-    _this->_internal_set_banned_until(from._internal_banned_until());
+    _this->_impl_.banned_until_ = from._impl_.banned_until_;
   }
   if (from._internal_flags() != 0) {
-    _this->_internal_set_flags(from._internal_flags());
+    _this->_impl_.flags_ = from._impl_.flags_;
   }
   if (from._internal_features() != 0) {
-    _this->_internal_set_features(from._internal_features());
+    _this->_impl_.features_ = from._impl_.features_;
   }
   if (from._internal_offline_at() != 0) {
-    _this->_internal_set_offline_at(from._internal_offline_at());
+    _this->_impl_.offline_at_ = from._impl_.offline_at_;
   }
   _this->_internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(from._internal_metadata_);
 }
@@ -1125,9 +1143,6 @@ PROTOBUF_NOINLINE bool Peer::IsInitialized() const {
   return true;
 }
 
-::_pbi::CachedSize* Peer::AccessCachedSize() const {
-  return &_impl_._cached_size_;
-}
 void Peer::InternalSwap(Peer* PROTOBUF_RESTRICT other) {
   using std::swap;
   auto* arena = GetArena();
@@ -1148,9 +1163,9 @@ void Peer::InternalSwap(Peer* PROTOBUF_RESTRICT other) {
 }
 
 ::google::protobuf::Metadata Peer::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
+  return ::_pbi::AssignDescriptors(&descriptor_table_network_2eproto_getter,
-      &descriptor_table_network_2eproto_getter, &descriptor_table_network_2eproto_once,
+                                   &descriptor_table_network_2eproto_once,
-      file_level_metadata_network_2eproto[1]);
+                                   file_level_metadata_network_2eproto[1]);
 }
 // ===================================================================
 
@@ -1192,6 +1207,20 @@ inline void NetworkStatusResponse::SharedDtor() {
   _impl_.~Impl_();
 }
 
+const ::google::protobuf::MessageLite::ClassData*
+NetworkStatusResponse::GetClassData() const {
+  PROTOBUF_CONSTINIT static const ::google::protobuf::MessageLite::
+      ClassDataFull _data_ = {
+          {
+              nullptr,  // OnDemandRegisterArenaDtor
+              PROTOBUF_FIELD_OFFSET(NetworkStatusResponse, _impl_._cached_size_),
+              false,
+          },
+          &NetworkStatusResponse::MergeImpl,
+          &NetworkStatusResponse::kDescriptorMethods,
+      };
+  return &_data_;
+}
 PROTOBUF_NOINLINE void NetworkStatusResponse::Clear() {
 // @@protoc_insertion_point(message_clear_start:tari.rpc.NetworkStatusResponse)
   PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
@@ -1226,6 +1255,9 @@ const ::_pbi::TcParseTable<2, 3, 0, 0, 2> NetworkStatusResponse::_table_ = {
     offsetof(decltype(_table_), field_names),  // no aux_entries
     &_NetworkStatusResponse_default_instance_._instance,
     ::_pbi::TcParser::GenericFallback,  // fallback
+    #ifdef PROTOBUF_PREFETCH_PARSE_TABLE
+    ::_pbi::TcParser::GetTable<::tari::rpc::NetworkStatusResponse>(),  // to_prefetch
+    #endif  // PROTOBUF_PREFETCH_PARSE_TABLE
   }, {{
     {::_pbi::TcParser::MiniParse, {}},
     // .tari.rpc.ConnectivityStatus status = 1;
@@ -1321,15 +1353,8 @@ const ::_pbi::TcParseTable<2, 3, 0, 0, 2> NetworkStatusResponse::_table_ = {
   return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_);
 }
 
-const ::google::protobuf::Message::ClassData NetworkStatusResponse::_class_data_ = {
-    NetworkStatusResponse::MergeImpl,
-    nullptr,  // OnDemandRegisterArenaDtor
-};
-const ::google::protobuf::Message::ClassData* NetworkStatusResponse::GetClassData() const {
-  return &_class_data_;
-}
 
-void NetworkStatusResponse::MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg) {
+void NetworkStatusResponse::MergeImpl(::google::protobuf::MessageLite& to_msg, const ::google::protobuf::MessageLite& from_msg) {
   auto* const _this = static_cast<NetworkStatusResponse*>(&to_msg);
   auto& from = static_cast<const NetworkStatusResponse&>(from_msg);
   // @@protoc_insertion_point(class_specific_merge_from_start:tari.rpc.NetworkStatusResponse)
@@ -1338,13 +1363,13 @@ void NetworkStatusResponse::MergeImpl(::google::protobuf::Message& to_msg, const
   (void) cached_has_bits;
 
   if (from._internal_status() != 0) {
-    _this->_internal_set_status(from._internal_status());
+    _this->_impl_.status_ = from._impl_.status_;
   }
   if (from._internal_avg_latency_ms() != 0) {
-    _this->_internal_set_avg_latency_ms(from._internal_avg_latency_ms());
+    _this->_impl_.avg_latency_ms_ = from._impl_.avg_latency_ms_;
   }
   if (from._internal_num_node_connections() != 0) {
-    _this->_internal_set_num_node_connections(from._internal_num_node_connections());
+    _this->_impl_.num_node_connections_ = from._impl_.num_node_connections_;
   }
   _this->_internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(from._internal_metadata_);
 }
@@ -1360,9 +1385,6 @@ PROTOBUF_NOINLINE bool NetworkStatusResponse::IsInitialized() const {
   return true;
 }
 
-::_pbi::CachedSize* NetworkStatusResponse::AccessCachedSize() const {
-  return &_impl_._cached_size_;
-}
 void NetworkStatusResponse::InternalSwap(NetworkStatusResponse* PROTOBUF_RESTRICT other) {
   using std::swap;
   _internal_metadata_.InternalSwap(&other->_internal_metadata_);
@@ -1375,9 +1397,9 @@ void NetworkStatusResponse::InternalSwap(NetworkStatusResponse* PROTOBUF_RESTRIC
 }
 
 ::google::protobuf::Metadata NetworkStatusResponse::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
+  return ::_pbi::AssignDescriptors(&descriptor_table_network_2eproto_getter,
-      &descriptor_table_network_2eproto_getter, &descriptor_table_network_2eproto_once,
+                                   &descriptor_table_network_2eproto_once,
-      file_level_metadata_network_2eproto[2]);
+                                   file_level_metadata_network_2eproto[2]);
 }
 // ===================================================================
 
@@ -1386,15 +1408,8 @@ class Address::_Internal {
   using HasBits = decltype(std::declval<Address>()._impl_._has_bits_);
   static constexpr ::int32_t kHasBitsOffset =
     8 * PROTOBUF_FIELD_OFFSET(Address, _impl_._has_bits_);
-  static const ::tari::rpc::AverageLatency& avg_latency(const Address* msg);
-  static void set_has_avg_latency(HasBits* has_bits) {
-    (*has_bits)[0] |= 1u;
-  }
 };
 
-const ::tari::rpc::AverageLatency& Address::_Internal::avg_latency(const Address* msg) {
-  return *msg->_impl_.avg_latency_;
-}
 Address::Address(::google::protobuf::Arena* arena)
     : ::google::protobuf::Message(arena) {
   SharedCtor(arena);
@@ -1418,9 +1433,9 @@ Address::Address(
       from._internal_metadata_);
   new (&_impl_) Impl_(internal_visibility(), arena, from._impl_);
   ::uint32_t cached_has_bits = _impl_._has_bits_[0];
-  _impl_.avg_latency_ = (cached_has_bits & 0x00000001u)
+  _impl_.avg_latency_ = (cached_has_bits & 0x00000001u) ? ::google::protobuf::Message::CopyConstruct<::tari::rpc::AverageLatency>(
-                ? CreateMaybeMessage<::tari::rpc::AverageLatency>(arena, *from._impl_.avg_latency_)
+                              arena, *from._impl_.avg_latency_)
-                : nullptr;
+                        : nullptr;
   _impl_.connection_attempts_ = from._impl_.connection_attempts_;
 
   // @@protoc_insertion_point(copy_constructor:tari.rpc.Address)
@@ -1454,6 +1469,20 @@ inline void Address::SharedDtor() {
   _impl_.~Impl_();
 }
 
+const ::google::protobuf::MessageLite::ClassData*
+Address::GetClassData() const {
+  PROTOBUF_CONSTINIT static const ::google::protobuf::MessageLite::
+      ClassDataFull _data_ = {
+          {
+              nullptr,  // OnDemandRegisterArenaDtor
+              PROTOBUF_FIELD_OFFSET(Address, _impl_._cached_size_),
+              false,
+          },
+          &Address::MergeImpl,
+          &Address::kDescriptorMethods,
+      };
+  return &_data_;
+}
 PROTOBUF_NOINLINE void Address::Clear() {
 // @@protoc_insertion_point(message_clear_start:tari.rpc.Address)
   PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
@@ -1494,6 +1523,9 @@ const ::_pbi::TcParseTable<3, 4, 1, 34, 2> Address::_table_ = {
     offsetof(decltype(_table_), aux_entries),
     &_Address_default_instance_._instance,
     ::_pbi::TcParser::GenericFallback,  // fallback
+    #ifdef PROTOBUF_PREFETCH_PARSE_TABLE
+    ::_pbi::TcParser::GetTable<::tari::rpc::Address>(),  // to_prefetch
+    #endif  // PROTOBUF_PREFETCH_PARSE_TABLE
   }, {{
     {::_pbi::TcParser::MiniParse, {}},
     // bytes address = 1;
@@ -1567,8 +1599,7 @@ const ::_pbi::TcParseTable<3, 4, 1, 34, 2> Address::_table_ = {
   // .tari.rpc.AverageLatency avg_latency = 5;
   if (cached_has_bits & 0x00000001u) {
     target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-        5, _Internal::avg_latency(this),
+        5, *_impl_.avg_latency_, _impl_.avg_latency_->GetCachedSize(), target, stream);
-        _Internal::avg_latency(this).GetCachedSize(), target, stream);
   }
 
   if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) {
@@ -1616,17 +1647,11 @@ const ::_pbi::TcParseTable<3, 4, 1, 34, 2> Address::_table_ = {
   return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_);
 }
 
-const ::google::protobuf::Message::ClassData Address::_class_data_ = {
-    Address::MergeImpl,
-    nullptr,  // OnDemandRegisterArenaDtor
-};
-const ::google::protobuf::Message::ClassData* Address::GetClassData() const {
-  return &_class_data_;
-}
 
-void Address::MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg) {
+void Address::MergeImpl(::google::protobuf::MessageLite& to_msg, const ::google::protobuf::MessageLite& from_msg) {
   auto* const _this = static_cast<Address*>(&to_msg);
   auto& from = static_cast<const Address&>(from_msg);
+  ::google::protobuf::Arena* arena = _this->GetArena();
   // @@protoc_insertion_point(class_specific_merge_from_start:tari.rpc.Address)
   ABSL_DCHECK_NE(&from, _this);
   ::uint32_t cached_has_bits = 0;
@@ -1638,13 +1663,20 @@ void Address::MergeImpl(::google::protobuf::Message& to_msg, const ::google::pro
   if (!from._internal_last_seen().empty()) {
     _this->_internal_set_last_seen(from._internal_last_seen());
   }
-  if ((from._impl_._has_bits_[0] & 0x00000001u) != 0) {
+  cached_has_bits = from._impl_._has_bits_[0];
-    _this->_internal_mutable_avg_latency()->::tari::rpc::AverageLatency::MergeFrom(
+  if (cached_has_bits & 0x00000001u) {
-        from._internal_avg_latency());
+    ABSL_DCHECK(from._impl_.avg_latency_ != nullptr);
+    if (_this->_impl_.avg_latency_ == nullptr) {
+      _this->_impl_.avg_latency_ =
+          ::google::protobuf::Message::CopyConstruct<::tari::rpc::AverageLatency>(arena, *from._impl_.avg_latency_);
+    } else {
+      _this->_impl_.avg_latency_->MergeFrom(*from._impl_.avg_latency_);
+    }
   }
   if (from._internal_connection_attempts() != 0) {
-    _this->_internal_set_connection_attempts(from._internal_connection_attempts());
+    _this->_impl_.connection_attempts_ = from._impl_.connection_attempts_;
   }
+  _this->_impl_._has_bits_[0] |= cached_has_bits;
   _this->_internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(from._internal_metadata_);
 }
 
@@ -1659,9 +1691,6 @@ PROTOBUF_NOINLINE bool Address::IsInitialized() const {
   return true;
 }
 
-::_pbi::CachedSize* Address::AccessCachedSize() const {
-  return &_impl_._cached_size_;
-}
 void Address::InternalSwap(Address* PROTOBUF_RESTRICT other) {
   using std::swap;
   auto* arena = GetArena();
@@ -1679,9 +1708,9 @@ void Address::InternalSwap(Address* PROTOBUF_RESTRICT other) {
 }
 
 ::google::protobuf::Metadata Address::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
+  return ::_pbi::AssignDescriptors(&descriptor_table_network_2eproto_getter,
-      &descriptor_table_network_2eproto_getter, &descriptor_table_network_2eproto_once,
+                                   &descriptor_table_network_2eproto_once,
-      file_level_metadata_network_2eproto[3]);
+                                   file_level_metadata_network_2eproto[3]);
 }
 // ===================================================================
 
@@ -1718,6 +1747,20 @@ inline void AverageLatency::SharedDtor() {
   _impl_.~Impl_();
 }
 
+const ::google::protobuf::MessageLite::ClassData*
+AverageLatency::GetClassData() const {
+  PROTOBUF_CONSTINIT static const ::google::protobuf::MessageLite::
+      ClassDataFull _data_ = {
+          {
+              nullptr,  // OnDemandRegisterArenaDtor
+              PROTOBUF_FIELD_OFFSET(AverageLatency, _impl_._cached_size_),
+              false,
+          },
+          &AverageLatency::MergeImpl,
+          &AverageLatency::kDescriptorMethods,
+      };
+  return &_data_;
+}
 PROTOBUF_NOINLINE void AverageLatency::Clear() {
 // @@protoc_insertion_point(message_clear_start:tari.rpc.AverageLatency)
   PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
@@ -1750,6 +1793,9 @@ const ::_pbi::TcParseTable<0, 1, 0, 0, 2> AverageLatency::_table_ = {
     offsetof(decltype(_table_), field_names),  // no aux_entries
     &_AverageLatency_default_instance_._instance,
     ::_pbi::TcParser::GenericFallback,  // fallback
+    #ifdef PROTOBUF_PREFETCH_PARSE_TABLE
+    ::_pbi::TcParser::GetTable<::tari::rpc::AverageLatency>(),  // to_prefetch
+    #endif  // PROTOBUF_PREFETCH_PARSE_TABLE
   }, {{
     // uint64 latency = 1;
     {::_pbi::TcParser::SingularVarintNoZag1<::uint64_t, offsetof(AverageLatency, _impl_.latency_), 63>(),
@@ -1806,15 +1852,8 @@ const ::_pbi::TcParseTable<0, 1, 0, 0, 2> AverageLatency::_table_ = {
   return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_);
 }
 
-const ::google::protobuf::Message::ClassData AverageLatency::_class_data_ = {
-    AverageLatency::MergeImpl,
-    nullptr,  // OnDemandRegisterArenaDtor
-};
-const ::google::protobuf::Message::ClassData* AverageLatency::GetClassData() const {
-  return &_class_data_;
-}
 
-void AverageLatency::MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg) {
+void AverageLatency::MergeImpl(::google::protobuf::MessageLite& to_msg, const ::google::protobuf::MessageLite& from_msg) {
   auto* const _this = static_cast<AverageLatency*>(&to_msg);
   auto& from = static_cast<const AverageLatency&>(from_msg);
   // @@protoc_insertion_point(class_specific_merge_from_start:tari.rpc.AverageLatency)
@@ -1823,7 +1862,7 @@ void AverageLatency::MergeImpl(::google::protobuf::Message& to_msg, const ::goog
   (void) cached_has_bits;
 
   if (from._internal_latency() != 0) {
-    _this->_internal_set_latency(from._internal_latency());
+    _this->_impl_.latency_ = from._impl_.latency_;
   }
   _this->_internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(from._internal_metadata_);
 }
@@ -1839,9 +1878,6 @@ PROTOBUF_NOINLINE bool AverageLatency::IsInitialized() const {
   return true;
 }
 
-::_pbi::CachedSize* AverageLatency::AccessCachedSize() const {
-  return &_impl_._cached_size_;
-}
 void AverageLatency::InternalSwap(AverageLatency* PROTOBUF_RESTRICT other) {
   using std::swap;
   _internal_metadata_.InternalSwap(&other->_internal_metadata_);
@@ -1849,9 +1885,9 @@ void AverageLatency::InternalSwap(AverageLatency* PROTOBUF_RESTRICT other) {
 }
 
 ::google::protobuf::Metadata AverageLatency::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
+  return ::_pbi::AssignDescriptors(&descriptor_table_network_2eproto_getter,
-      &descriptor_table_network_2eproto_getter, &descriptor_table_network_2eproto_once,
+                                   &descriptor_table_network_2eproto_once,
-      file_level_metadata_network_2eproto[4]);
+                                   file_level_metadata_network_2eproto[4]);
 }
 // ===================================================================
 
@@ -1901,6 +1937,20 @@ inline void ListConnectedPeersResponse::SharedDtor() {
   _impl_.~Impl_();
 }
 
+const ::google::protobuf::MessageLite::ClassData*
+ListConnectedPeersResponse::GetClassData() const {
+  PROTOBUF_CONSTINIT static const ::google::protobuf::MessageLite::
+      ClassDataFull _data_ = {
+          {
+              nullptr,  // OnDemandRegisterArenaDtor
+              PROTOBUF_FIELD_OFFSET(ListConnectedPeersResponse, _impl_._cached_size_),
+              false,
+          },
+          &ListConnectedPeersResponse::MergeImpl,
+          &ListConnectedPeersResponse::kDescriptorMethods,
+      };
+  return &_data_;
+}
 PROTOBUF_NOINLINE void ListConnectedPeersResponse::Clear() {
 // @@protoc_insertion_point(message_clear_start:tari.rpc.ListConnectedPeersResponse)
   PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
@@ -1933,6 +1983,9 @@ const ::_pbi::TcParseTable<0, 1, 1, 0, 2> ListConnectedPeersResponse::_table_ =
     offsetof(decltype(_table_), aux_entries),
     &_ListConnectedPeersResponse_default_instance_._instance,
     ::_pbi::TcParser::GenericFallback,  // fallback
+    #ifdef PROTOBUF_PREFETCH_PARSE_TABLE
+    ::_pbi::TcParser::GetTable<::tari::rpc::ListConnectedPeersResponse>(),  // to_prefetch
+    #endif  // PROTOBUF_PREFETCH_PARSE_TABLE
   }, {{
     // repeated .tari.rpc.Peer connected_peers = 1;
     {::_pbi::TcParser::FastMtR1,
@@ -1957,11 +2010,14 @@ const ::_pbi::TcParseTable<0, 1, 1, 0, 2> ListConnectedPeersResponse::_table_ =
   (void)cached_has_bits;
 
   // repeated .tari.rpc.Peer connected_peers = 1;
-  for (unsigned i = 0,
+  for (unsigned i = 0, n = static_cast<unsigned>(
-      n = static_cast<unsigned>(this->_internal_connected_peers_size()); i < n; i++) {
+                           this->_internal_connected_peers_size());
+       i < n; i++) {
     const auto& repfield = this->_internal_connected_peers().Get(i);
-    target = ::google::protobuf::internal::WireFormatLite::
+    target =
-        InternalWriteMessage(1, repfield, repfield.GetCachedSize(), target, stream);
+        ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
+            1, repfield, repfield.GetCachedSize(),
+            target, stream);
   }
 
   if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) {
@@ -1984,21 +2040,13 @@ const ::_pbi::TcParseTable<0, 1, 1, 0, 2> ListConnectedPeersResponse::_table_ =
   // repeated .tari.rpc.Peer connected_peers = 1;
   total_size += 1UL * this->_internal_connected_peers_size();
   for (const auto& msg : this->_internal_connected_peers()) {
-    total_size +=
+    total_size += ::google::protobuf::internal::WireFormatLite::MessageSize(msg);
-      ::google::protobuf::internal::WireFormatLite::MessageSize(msg);
   }
   return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_);
 }
 
-const ::google::protobuf::Message::ClassData ListConnectedPeersResponse::_class_data_ = {
-    ListConnectedPeersResponse::MergeImpl,
-    nullptr,  // OnDemandRegisterArenaDtor
-};
-const ::google::protobuf::Message::ClassData* ListConnectedPeersResponse::GetClassData() const {
-  return &_class_data_;
-}
 
-void ListConnectedPeersResponse::MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg) {
+void ListConnectedPeersResponse::MergeImpl(::google::protobuf::MessageLite& to_msg, const ::google::protobuf::MessageLite& from_msg) {
   auto* const _this = static_cast<ListConnectedPeersResponse*>(&to_msg);
   auto& from = static_cast<const ListConnectedPeersResponse&>(from_msg);
   // @@protoc_insertion_point(class_specific_merge_from_start:tari.rpc.ListConnectedPeersResponse)
@@ -2022,9 +2070,6 @@ PROTOBUF_NOINLINE bool ListConnectedPeersResponse::IsInitialized() const {
   return true;
 }
 
-::_pbi::CachedSize* ListConnectedPeersResponse::AccessCachedSize() const {
-  return &_impl_._cached_size_;
-}
 void ListConnectedPeersResponse::InternalSwap(ListConnectedPeersResponse* PROTOBUF_RESTRICT other) {
   using std::swap;
   _internal_metadata_.InternalSwap(&other->_internal_metadata_);
@@ -2032,9 +2077,9 @@ void ListConnectedPeersResponse::InternalSwap(ListConnectedPeersResponse* PROTOB
 }
 
 ::google::protobuf::Metadata ListConnectedPeersResponse::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
+  return ::_pbi::AssignDescriptors(&descriptor_table_network_2eproto_getter,
-      &descriptor_table_network_2eproto_getter, &descriptor_table_network_2eproto_once,
+                                   &descriptor_table_network_2eproto_once,
-      file_level_metadata_network_2eproto[5]);
+                                   file_level_metadata_network_2eproto[5]);
 }
 // ===================================================================
 
@@ -2093,6 +2138,20 @@ inline void SoftwareUpdate::SharedDtor() {
   _impl_.~Impl_();
 }
 
+const ::google::protobuf::MessageLite::ClassData*
+SoftwareUpdate::GetClassData() const {
+  PROTOBUF_CONSTINIT static const ::google::protobuf::MessageLite::
+      ClassDataFull _data_ = {
+          {
+              nullptr,  // OnDemandRegisterArenaDtor
+              PROTOBUF_FIELD_OFFSET(SoftwareUpdate, _impl_._cached_size_),
+              false,
+          },
+          &SoftwareUpdate::MergeImpl,
+          &SoftwareUpdate::kDescriptorMethods,
+      };
+  return &_data_;
+}
 PROTOBUF_NOINLINE void SoftwareUpdate::Clear() {
 // @@protoc_insertion_point(message_clear_start:tari.rpc.SoftwareUpdate)
   PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
@@ -2128,6 +2187,9 @@ const ::_pbi::TcParseTable<2, 4, 0, 54, 2> SoftwareUpdate::_table_ = {
     offsetof(decltype(_table_), field_names),  // no aux_entries
     &_SoftwareUpdate_default_instance_._instance,
     ::_pbi::TcParser::GenericFallback,  // fallback
+    #ifdef PROTOBUF_PREFETCH_PARSE_TABLE
+    ::_pbi::TcParser::GetTable<::tari::rpc::SoftwareUpdate>(),  // to_prefetch
+    #endif  // PROTOBUF_PREFETCH_PARSE_TABLE
   }, {{
     // string download_url = 4;
     {::_pbi::TcParser::FastUS1,
@@ -2248,15 +2310,8 @@ const ::_pbi::TcParseTable<2, 4, 0, 54, 2> SoftwareUpdate::_table_ = {
   return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_);
 }
 
-const ::google::protobuf::Message::ClassData SoftwareUpdate::_class_data_ = {
-    SoftwareUpdate::MergeImpl,
-    nullptr,  // OnDemandRegisterArenaDtor
-};
-const ::google::protobuf::Message::ClassData* SoftwareUpdate::GetClassData() const {
-  return &_class_data_;
-}
 
-void SoftwareUpdate::MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg) {
+void SoftwareUpdate::MergeImpl(::google::protobuf::MessageLite& to_msg, const ::google::protobuf::MessageLite& from_msg) {
   auto* const _this = static_cast<SoftwareUpdate*>(&to_msg);
   auto& from = static_cast<const SoftwareUpdate&>(from_msg);
   // @@protoc_insertion_point(class_specific_merge_from_start:tari.rpc.SoftwareUpdate)
@@ -2274,7 +2329,7 @@ void SoftwareUpdate::MergeImpl(::google::protobuf::Message& to_msg, const ::goog
     _this->_internal_set_download_url(from._internal_download_url());
   }
   if (from._internal_has_update() != 0) {
-    _this->_internal_set_has_update(from._internal_has_update());
+    _this->_impl_.has_update_ = from._impl_.has_update_;
   }
   _this->_internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(from._internal_metadata_);
 }
@@ -2290,9 +2345,6 @@ PROTOBUF_NOINLINE bool SoftwareUpdate::IsInitialized() const {
   return true;
 }
 
-::_pbi::CachedSize* SoftwareUpdate::AccessCachedSize() const {
-  return &_impl_._cached_size_;
-}
 void SoftwareUpdate::InternalSwap(SoftwareUpdate* PROTOBUF_RESTRICT other) {
   using std::swap;
   auto* arena = GetArena();
@@ -2305,9 +2357,9 @@ void SoftwareUpdate::InternalSwap(SoftwareUpdate* PROTOBUF_RESTRICT other) {
 }
 
 ::google::protobuf::Metadata SoftwareUpdate::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
+  return ::_pbi::AssignDescriptors(&descriptor_table_network_2eproto_getter,
-      &descriptor_table_network_2eproto_getter, &descriptor_table_network_2eproto_once,
+                                   &descriptor_table_network_2eproto_once,
-      file_level_metadata_network_2eproto[6]);
+                                   file_level_metadata_network_2eproto[6]);
 }
 // ===================================================================
 
@@ -2340,9 +2392,9 @@ GetIdentityRequest::GetIdentityRequest(
 
 
 ::google::protobuf::Metadata GetIdentityRequest::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
+  return ::_pbi::AssignDescriptors(&descriptor_table_network_2eproto_getter,
-      &descriptor_table_network_2eproto_getter, &descriptor_table_network_2eproto_once,
+                                   &descriptor_table_network_2eproto_once,
-      file_level_metadata_network_2eproto[7]);
+                                   file_level_metadata_network_2eproto[7]);
 }
 // ===================================================================
 
@@ -2399,6 +2451,20 @@ inline void GetIdentityResponse::SharedDtor() {
   _impl_.~Impl_();
 }
 
+const ::google::protobuf::MessageLite::ClassData*
+GetIdentityResponse::GetClassData() const {
+  PROTOBUF_CONSTINIT static const ::google::protobuf::MessageLite::
+      ClassDataFull _data_ = {
+          {
+              nullptr,  // OnDemandRegisterArenaDtor
+              PROTOBUF_FIELD_OFFSET(GetIdentityResponse, _impl_._cached_size_),
+              false,
+          },
+          &GetIdentityResponse::MergeImpl,
+          &GetIdentityResponse::kDescriptorMethods,
+      };
+  return &_data_;
+}
 PROTOBUF_NOINLINE void GetIdentityResponse::Clear() {
 // @@protoc_insertion_point(message_clear_start:tari.rpc.GetIdentityResponse)
   PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
@@ -2433,6 +2499,9 @@ const ::_pbi::TcParseTable<2, 3, 0, 51, 2> GetIdentityResponse::_table_ = {
     offsetof(decltype(_table_), field_names),  // no aux_entries
     &_GetIdentityResponse_default_instance_._instance,
     ::_pbi::TcParser::GenericFallback,  // fallback
+    #ifdef PROTOBUF_PREFETCH_PARSE_TABLE
+    ::_pbi::TcParser::GetTable<::tari::rpc::GetIdentityResponse>(),  // to_prefetch
+    #endif  // PROTOBUF_PREFETCH_PARSE_TABLE
   }, {{
     {::_pbi::TcParser::MiniParse, {}},
     // bytes public_key = 1;
@@ -2530,15 +2599,8 @@ const ::_pbi::TcParseTable<2, 3, 0, 51, 2> GetIdentityResponse::_table_ = {
   return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_);
 }
 
-const ::google::protobuf::Message::ClassData GetIdentityResponse::_class_data_ = {
-    GetIdentityResponse::MergeImpl,
-    nullptr,  // OnDemandRegisterArenaDtor
-};
-const ::google::protobuf::Message::ClassData* GetIdentityResponse::GetClassData() const {
-  return &_class_data_;
-}
 
-void GetIdentityResponse::MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg) {
+void GetIdentityResponse::MergeImpl(::google::protobuf::MessageLite& to_msg, const ::google::protobuf::MessageLite& from_msg) {
   auto* const _this = static_cast<GetIdentityResponse*>(&to_msg);
   auto& from = static_cast<const GetIdentityResponse&>(from_msg);
   // @@protoc_insertion_point(class_specific_merge_from_start:tari.rpc.GetIdentityResponse)
@@ -2569,9 +2631,6 @@ PROTOBUF_NOINLINE bool GetIdentityResponse::IsInitialized() const {
   return true;
 }
 
-::_pbi::CachedSize* GetIdentityResponse::AccessCachedSize() const {
-  return &_impl_._cached_size_;
-}
 void GetIdentityResponse::InternalSwap(GetIdentityResponse* PROTOBUF_RESTRICT other) {
   using std::swap;
   auto* arena = GetArena();
@@ -2583,9 +2642,9 @@ void GetIdentityResponse::InternalSwap(GetIdentityResponse* PROTOBUF_RESTRICT ot
 }
 
 ::google::protobuf::Metadata GetIdentityResponse::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
+  return ::_pbi::AssignDescriptors(&descriptor_table_network_2eproto_getter,
-      &descriptor_table_network_2eproto_getter, &descriptor_table_network_2eproto_once,
+                                   &descriptor_table_network_2eproto_once,
-      file_level_metadata_network_2eproto[8]);
+                                   file_level_metadata_network_2eproto[8]);
 }
 // @@protoc_insertion_point(namespace_scope)
 }  // namespace rpc
@@ -2595,4 +2654,8 @@ namespace protobuf {
 }  // namespace protobuf
 }  // namespace google
 // @@protoc_insertion_point(global_scope)
+PROTOBUF_ATTRIBUTE_INIT_PRIORITY2
+static ::std::false_type _static_init_ PROTOBUF_UNUSED =
+    (::_pbi::AddDescriptors(&descriptor_table_network_2eproto),
+     ::std::false_type{});
 #include "google/protobuf/port_undef.inc"

external/src/grpc

@@ -1 +1 @@
-Subproject commit 783e600967a2e3f2d89369860361ded673b1b41c
+Subproject commit 2a179e51d66b2272515215013383e0d6dff05342

patches/msys2/gcc14_boringssl.patch

@@ -1,22 +0,0 @@
-diff --git a/src/crypto/internal.h b/src/crypto/internal.h
-index a77102d76..30d6826dd 100644
---- a/src/crypto/internal.h
-+++ b/src/crypto/internal.h
-@@ -1176,7 +1176,7 @@ static inline uint64_t CRYPTO_rotr_u64(uint64_t value, int shift) {
- 
- // CRYPTO_addc_* returns |x + y + carry|, and sets |*out_carry| to the carry
- // bit. |carry| must be zero or one.
--#if OPENSSL_HAS_BUILTIN(__builtin_addc)
-+#if OPENSSL_HAS_BUILTIN(__builtin_addc) && !defined(__cplusplus)
- 
- #define CRYPTO_GENERIC_ADDC(x, y, carry, out_carry) \
-   (_Generic((x),                                    \
-@@ -1228,7 +1228,7 @@ static inline uint64_t CRYPTO_addc_u64(uint64_t x, uint64_t y, uint64_t carry,
- 
- // CRYPTO_subc_* returns |x - y - borrow|, and sets |*out_borrow| to the borrow
- // bit. |borrow| must be zero or one.
--#if OPENSSL_HAS_BUILTIN(__builtin_subc)
-+#if OPENSSL_HAS_BUILTIN(__builtin_subc) && !defined(__cplusplus)
- 
- #define CRYPTO_GENERIC_SUBC(x, y, borrow, out_borrow) \
-   (_Generic((x),                                      \

tests/src/check_win7.py

@@ -285,6 +285,12 @@ allowedAPIs = {
 	"InitOnceBeginInitialize",
 	"BCryptOpenAlgorithmProvider",
 	"BCryptCloseAlgorithmProvider",
+	"CertOpenSystemStoreW",
+	"CertEnumCertificatesInStore",
+	"CertCloseStore",
+	"CryptBinaryToStringW",
+	"DeleteFileA",
+	"GetFileAttributesA",
 }
 
 f = open(sys.argv[1], 'r')