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/block.pb.cc

@@ -1,5 +1,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: block.proto
+// Protobuf C++ Version: 5.26.1
 
 #include "block.pb.h"
 
@@ -209,7 +210,8 @@ static ::_pb::Metadata file_level_metadata_block_2eproto[7];
 static const ::_pb::EnumDescriptor* file_level_enum_descriptors_block_2eproto[1];
 static constexpr const ::_pb::ServiceDescriptor**
     file_level_service_descriptors_block_2eproto = nullptr;
-const ::uint32_t TableStruct_block_2eproto::offsets[] PROTOBUF_SECTION_VARIABLE(
+const ::uint32_t
+    TableStruct_block_2eproto::offsets[] ABSL_ATTRIBUTE_SECTION_VARIABLE(
         protodesc_cold) = {
         PROTOBUF_FIELD_OFFSET(::tari::rpc::BlockHeader, _impl_._has_bits_),
         PROTOBUF_FIELD_OFFSET(::tari::rpc::BlockHeader, _internal_metadata_),
@@ -329,7 +331,7 @@ const ::uint32_t TableStruct_block_2eproto::offsets[] PROTOBUF_SECTION_VARIABLE(
 };
 
 static const ::_pbi::MigrationSchema
-    schemas[] PROTOBUF_SECTION_VARIABLE(protodesc_cold) = {
+    schemas[] ABSL_ATTRIBUTE_SECTION_VARIABLE(protodesc_cold) = {
         {0, 24, -1, sizeof(::tari::rpc::BlockHeader)},
         {40, -1, -1, sizeof(::tari::rpc::ProofOfWork)},
         {50, -1, -1, sizeof(::tari::rpc::PowAlgo)},
@@ -338,7 +340,6 @@ static const ::_pbi::MigrationSchema
         {83, 97, -1, sizeof(::tari::rpc::NewBlockHeaderTemplate)},
         {103, 113, -1, sizeof(::tari::rpc::NewBlockTemplate)},
 };
-
 static const ::_pb::Message* const file_default_instances[] = {
     &::tari::rpc::_BlockHeader_default_instance_._instance,
     &::tari::rpc::_ProofOfWork_default_instance_._instance,
@@ -348,7 +349,8 @@ static const ::_pb::Message* const file_default_instances[] = {
     &::tari::rpc::_NewBlockHeaderTemplate_default_instance_._instance,
     &::tari::rpc::_NewBlockTemplate_default_instance_._instance,
 };
-const char descriptor_table_protodef_block_2eproto[] PROTOBUF_SECTION_VARIABLE(protodesc_cold) = {
+const char descriptor_table_protodef_block_2eproto[] ABSL_ATTRIBUTE_SECTION_VARIABLE(
+    protodesc_cold) = {
     "\n\013block.proto\022\010tari.rpc\032\021transaction.pro"
     "to\"\361\002\n\013BlockHeader\022\014\n\004hash\030\001 \001(\014\022\017\n\007vers"
     "ion\030\002 \001(\r\022\016\n\006height\030\003 \001(\004\022\021\n\tprev_hash\030\004"
@@ -413,9 +415,6 @@ const ::_pbi::DescriptorTable descriptor_table_block_2eproto = {
 PROTOBUF_ATTRIBUTE_WEAK const ::_pbi::DescriptorTable* descriptor_table_block_2eproto_getter() {
   return &descriptor_table_block_2eproto;
 }
-// Force running AddDescriptors() at dynamic initialization time.
-PROTOBUF_ATTRIBUTE_INIT_PRIORITY2
-static ::_pbi::AddDescriptorsRunner dynamic_init_dummy_block_2eproto(&descriptor_table_block_2eproto);
 namespace tari {
 namespace rpc {
 const ::google::protobuf::EnumDescriptor* PowAlgo_PowAlgos_descriptor() {
@@ -445,15 +444,8 @@ class BlockHeader::_Internal {
   using HasBits = decltype(std::declval<BlockHeader>()._impl_._has_bits_);
   static constexpr ::int32_t kHasBitsOffset =
     8 * PROTOBUF_FIELD_OFFSET(BlockHeader, _impl_._has_bits_);
-  static const ::tari::rpc::ProofOfWork& pow(const BlockHeader* msg);
-  static void set_has_pow(HasBits* has_bits) {
-    (*has_bits)[0] |= 1u;
-  }
 };
 
-const ::tari::rpc::ProofOfWork& BlockHeader::_Internal::pow(const BlockHeader* msg) {
-  return *msg->_impl_.pow_;
-}
 BlockHeader::BlockHeader(::google::protobuf::Arena* arena)
     : ::google::protobuf::Message(arena) {
   SharedCtor(arena);
@@ -483,8 +475,8 @@ BlockHeader::BlockHeader(
       from._internal_metadata_);
   new (&_impl_) Impl_(internal_visibility(), arena, from._impl_);
   ::uint32_t cached_has_bits = _impl_._has_bits_[0];
-  _impl_.pow_ = (cached_has_bits & 0x00000001u)
+  _impl_.pow_ = (cached_has_bits & 0x00000001u) ? ::google::protobuf::Message::CopyConstruct<::tari::rpc::ProofOfWork>(
-                ? CreateMaybeMessage<::tari::rpc::ProofOfWork>(arena, *from._impl_.pow_)
+                              arena, *from._impl_.pow_)
                         : nullptr;
   ::memcpy(reinterpret_cast<char *>(&_impl_) +
                offsetof(Impl_, height_),
@@ -537,6 +529,20 @@ inline void BlockHeader::SharedDtor() {
   _impl_.~Impl_();
 }
 
+const ::google::protobuf::MessageLite::ClassData*
+BlockHeader::GetClassData() const {
+  PROTOBUF_CONSTINIT static const ::google::protobuf::MessageLite::
+      ClassDataFull _data_ = {
+          {
+              nullptr,  // OnDemandRegisterArenaDtor
+              PROTOBUF_FIELD_OFFSET(BlockHeader, _impl_._cached_size_),
+              false,
+          },
+          &BlockHeader::MergeImpl,
+          &BlockHeader::kDescriptorMethods,
+      };
+  return &_data_;
+}
 PROTOBUF_NOINLINE void BlockHeader::Clear() {
 // @@protoc_insertion_point(message_clear_start:tari.rpc.BlockHeader)
   PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
@@ -585,6 +591,9 @@ const ::_pbi::TcParseTable<5, 16, 1, 0, 2> BlockHeader::_table_ = {
     offsetof(decltype(_table_), aux_entries),
     &_BlockHeader_default_instance_._instance,
     ::_pbi::TcParser::GenericFallback,  // fallback
+    #ifdef PROTOBUF_PREFETCH_PARSE_TABLE
+    ::_pbi::TcParser::GetTable<::tari::rpc::BlockHeader>(),  // to_prefetch
+    #endif  // PROTOBUF_PREFETCH_PARSE_TABLE
   }, {{
     {::_pbi::TcParser::MiniParse, {}},
     // bytes hash = 1;
@@ -782,8 +791,7 @@ const ::_pbi::TcParseTable<5, 16, 1, 0, 2> BlockHeader::_table_ = {
   // .tari.rpc.ProofOfWork pow = 12;
   if (cached_has_bits & 0x00000001u) {
     target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-        12, _Internal::pow(this),
+        12, *_impl_.pow_, _impl_.pow_->GetCachedSize(), target, stream);
-        _Internal::pow(this).GetCachedSize(), target, stream);
   }
 
   // uint64 kernel_mmr_size = 13;
@@ -936,17 +944,11 @@ const ::_pbi::TcParseTable<5, 16, 1, 0, 2> BlockHeader::_table_ = {
   return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_);
 }
 
-const ::google::protobuf::Message::ClassData BlockHeader::_class_data_ = {
-    BlockHeader::MergeImpl,
-    nullptr,  // OnDemandRegisterArenaDtor
-};
-const ::google::protobuf::Message::ClassData* BlockHeader::GetClassData() const {
-  return &_class_data_;
-}
 
-void BlockHeader::MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg) {
+void BlockHeader::MergeImpl(::google::protobuf::MessageLite& to_msg, const ::google::protobuf::MessageLite& from_msg) {
   auto* const _this = static_cast<BlockHeader*>(&to_msg);
   auto& from = static_cast<const BlockHeader&>(from_msg);
+  ::google::protobuf::Arena* arena = _this->GetArena();
   // @@protoc_insertion_point(class_specific_merge_from_start:tari.rpc.BlockHeader)
   ABSL_DCHECK_NE(&from, _this);
   ::uint32_t cached_has_bits = 0;
@@ -976,31 +978,38 @@ void BlockHeader::MergeImpl(::google::protobuf::Message& to_msg, const ::google:
   if (!from._internal_validator_node_mr().empty()) {
     _this->_internal_set_validator_node_mr(from._internal_validator_node_mr());
   }
-  if ((from._impl_._has_bits_[0] & 0x00000001u) != 0) {
+  cached_has_bits = from._impl_._has_bits_[0];
-    _this->_internal_mutable_pow()->::tari::rpc::ProofOfWork::MergeFrom(
+  if (cached_has_bits & 0x00000001u) {
-        from._internal_pow());
+    ABSL_DCHECK(from._impl_.pow_ != nullptr);
+    if (_this->_impl_.pow_ == nullptr) {
+      _this->_impl_.pow_ =
+          ::google::protobuf::Message::CopyConstruct<::tari::rpc::ProofOfWork>(arena, *from._impl_.pow_);
+    } else {
+      _this->_impl_.pow_->MergeFrom(*from._impl_.pow_);
+    }
   }
   if (from._internal_height() != 0) {
-    _this->_internal_set_height(from._internal_height());
+    _this->_impl_.height_ = from._impl_.height_;
   }
   if (from._internal_timestamp() != 0) {
-    _this->_internal_set_timestamp(from._internal_timestamp());
+    _this->_impl_.timestamp_ = from._impl_.timestamp_;
   }
   if (from._internal_nonce() != 0) {
-    _this->_internal_set_nonce(from._internal_nonce());
+    _this->_impl_.nonce_ = from._impl_.nonce_;
   }
   if (from._internal_kernel_mmr_size() != 0) {
-    _this->_internal_set_kernel_mmr_size(from._internal_kernel_mmr_size());
+    _this->_impl_.kernel_mmr_size_ = from._impl_.kernel_mmr_size_;
   }
   if (from._internal_output_mmr_size() != 0) {
-    _this->_internal_set_output_mmr_size(from._internal_output_mmr_size());
+    _this->_impl_.output_mmr_size_ = from._impl_.output_mmr_size_;
   }
   if (from._internal_validator_node_size() != 0) {
-    _this->_internal_set_validator_node_size(from._internal_validator_node_size());
+    _this->_impl_.validator_node_size_ = from._impl_.validator_node_size_;
   }
   if (from._internal_version() != 0) {
-    _this->_internal_set_version(from._internal_version());
+    _this->_impl_.version_ = from._impl_.version_;
   }
+  _this->_impl_._has_bits_[0] |= cached_has_bits;
   _this->_internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(from._internal_metadata_);
 }
 
@@ -1015,9 +1024,6 @@ PROTOBUF_NOINLINE bool BlockHeader::IsInitialized() const {
   return true;
 }
 
-::_pbi::CachedSize* BlockHeader::AccessCachedSize() const {
-  return &_impl_._cached_size_;
-}
 void BlockHeader::InternalSwap(BlockHeader* PROTOBUF_RESTRICT other) {
   using std::swap;
   auto* arena = GetArena();
@@ -1041,8 +1047,8 @@ void BlockHeader::InternalSwap(BlockHeader* PROTOBUF_RESTRICT other) {
 }
 
 ::google::protobuf::Metadata BlockHeader::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
+  return ::_pbi::AssignDescriptors(&descriptor_table_block_2eproto_getter,
-      &descriptor_table_block_2eproto_getter, &descriptor_table_block_2eproto_once,
+                                   &descriptor_table_block_2eproto_once,
                                    file_level_metadata_block_2eproto[0]);
 }
 // ===================================================================
@@ -1096,6 +1102,20 @@ inline void ProofOfWork::SharedDtor() {
   _impl_.~Impl_();
 }
 
+const ::google::protobuf::MessageLite::ClassData*
+ProofOfWork::GetClassData() const {
+  PROTOBUF_CONSTINIT static const ::google::protobuf::MessageLite::
+      ClassDataFull _data_ = {
+          {
+              nullptr,  // OnDemandRegisterArenaDtor
+              PROTOBUF_FIELD_OFFSET(ProofOfWork, _impl_._cached_size_),
+              false,
+          },
+          &ProofOfWork::MergeImpl,
+          &ProofOfWork::kDescriptorMethods,
+      };
+  return &_data_;
+}
 PROTOBUF_NOINLINE void ProofOfWork::Clear() {
 // @@protoc_insertion_point(message_clear_start:tari.rpc.ProofOfWork)
   PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
@@ -1129,6 +1149,9 @@ const ::_pbi::TcParseTable<1, 2, 0, 0, 2> ProofOfWork::_table_ = {
     offsetof(decltype(_table_), field_names),  // no aux_entries
     &_ProofOfWork_default_instance_._instance,
     ::_pbi::TcParser::GenericFallback,  // fallback
+    #ifdef PROTOBUF_PREFETCH_PARSE_TABLE
+    ::_pbi::TcParser::GetTable<::tari::rpc::ProofOfWork>(),  // to_prefetch
+    #endif  // PROTOBUF_PREFETCH_PARSE_TABLE
   }, {{
     // bytes pow_data = 4;
     {::_pbi::TcParser::FastBS1,
@@ -1203,15 +1226,8 @@ const ::_pbi::TcParseTable<1, 2, 0, 0, 2> ProofOfWork::_table_ = {
   return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_);
 }
 
-const ::google::protobuf::Message::ClassData ProofOfWork::_class_data_ = {
-    ProofOfWork::MergeImpl,
-    nullptr,  // OnDemandRegisterArenaDtor
-};
-const ::google::protobuf::Message::ClassData* ProofOfWork::GetClassData() const {
-  return &_class_data_;
-}
 
-void ProofOfWork::MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg) {
+void ProofOfWork::MergeImpl(::google::protobuf::MessageLite& to_msg, const ::google::protobuf::MessageLite& from_msg) {
   auto* const _this = static_cast<ProofOfWork*>(&to_msg);
   auto& from = static_cast<const ProofOfWork&>(from_msg);
   // @@protoc_insertion_point(class_specific_merge_from_start:tari.rpc.ProofOfWork)
@@ -1223,7 +1239,7 @@ void ProofOfWork::MergeImpl(::google::protobuf::Message& to_msg, const ::google:
     _this->_internal_set_pow_data(from._internal_pow_data());
   }
   if (from._internal_pow_algo() != 0) {
-    _this->_internal_set_pow_algo(from._internal_pow_algo());
+    _this->_impl_.pow_algo_ = from._impl_.pow_algo_;
   }
   _this->_internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(from._internal_metadata_);
 }
@@ -1239,9 +1255,6 @@ PROTOBUF_NOINLINE bool ProofOfWork::IsInitialized() const {
   return true;
 }
 
-::_pbi::CachedSize* ProofOfWork::AccessCachedSize() const {
-  return &_impl_._cached_size_;
-}
 void ProofOfWork::InternalSwap(ProofOfWork* PROTOBUF_RESTRICT other) {
   using std::swap;
   auto* arena = GetArena();
@@ -1252,8 +1265,8 @@ void ProofOfWork::InternalSwap(ProofOfWork* PROTOBUF_RESTRICT other) {
 }
 
 ::google::protobuf::Metadata ProofOfWork::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
+  return ::_pbi::AssignDescriptors(&descriptor_table_block_2eproto_getter,
-      &descriptor_table_block_2eproto_getter, &descriptor_table_block_2eproto_once,
+                                   &descriptor_table_block_2eproto_once,
                                    file_level_metadata_block_2eproto[1]);
 }
 // ===================================================================
@@ -1291,6 +1304,20 @@ inline void PowAlgo::SharedDtor() {
   _impl_.~Impl_();
 }
 
+const ::google::protobuf::MessageLite::ClassData*
+PowAlgo::GetClassData() const {
+  PROTOBUF_CONSTINIT static const ::google::protobuf::MessageLite::
+      ClassDataFull _data_ = {
+          {
+              nullptr,  // OnDemandRegisterArenaDtor
+              PROTOBUF_FIELD_OFFSET(PowAlgo, _impl_._cached_size_),
+              false,
+          },
+          &PowAlgo::MergeImpl,
+          &PowAlgo::kDescriptorMethods,
+      };
+  return &_data_;
+}
 PROTOBUF_NOINLINE void PowAlgo::Clear() {
 // @@protoc_insertion_point(message_clear_start:tari.rpc.PowAlgo)
   PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
@@ -1323,6 +1350,9 @@ const ::_pbi::TcParseTable<0, 1, 0, 0, 2> PowAlgo::_table_ = {
     offsetof(decltype(_table_), field_names),  // no aux_entries
     &_PowAlgo_default_instance_._instance,
     ::_pbi::TcParser::GenericFallback,  // fallback
+    #ifdef PROTOBUF_PREFETCH_PARSE_TABLE
+    ::_pbi::TcParser::GetTable<::tari::rpc::PowAlgo>(),  // to_prefetch
+    #endif  // PROTOBUF_PREFETCH_PARSE_TABLE
   }, {{
     // .tari.rpc.PowAlgo.PowAlgos pow_algo = 1;
     {::_pbi::TcParser::SingularVarintNoZag1<::uint32_t, offsetof(PowAlgo, _impl_.pow_algo_), 63>(),
@@ -1379,15 +1409,8 @@ const ::_pbi::TcParseTable<0, 1, 0, 0, 2> PowAlgo::_table_ = {
   return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_);
 }
 
-const ::google::protobuf::Message::ClassData PowAlgo::_class_data_ = {
-    PowAlgo::MergeImpl,
-    nullptr,  // OnDemandRegisterArenaDtor
-};
-const ::google::protobuf::Message::ClassData* PowAlgo::GetClassData() const {
-  return &_class_data_;
-}
 
-void PowAlgo::MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg) {
+void PowAlgo::MergeImpl(::google::protobuf::MessageLite& to_msg, const ::google::protobuf::MessageLite& from_msg) {
   auto* const _this = static_cast<PowAlgo*>(&to_msg);
   auto& from = static_cast<const PowAlgo&>(from_msg);
   // @@protoc_insertion_point(class_specific_merge_from_start:tari.rpc.PowAlgo)
@@ -1396,7 +1419,7 @@ void PowAlgo::MergeImpl(::google::protobuf::Message& to_msg, const ::google::pro
   (void) cached_has_bits;
 
   if (from._internal_pow_algo() != 0) {
-    _this->_internal_set_pow_algo(from._internal_pow_algo());
+    _this->_impl_.pow_algo_ = from._impl_.pow_algo_;
   }
   _this->_internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(from._internal_metadata_);
 }
@@ -1412,9 +1435,6 @@ PROTOBUF_NOINLINE bool PowAlgo::IsInitialized() const {
   return true;
 }
 
-::_pbi::CachedSize* PowAlgo::AccessCachedSize() const {
-  return &_impl_._cached_size_;
-}
 void PowAlgo::InternalSwap(PowAlgo* PROTOBUF_RESTRICT other) {
   using std::swap;
   _internal_metadata_.InternalSwap(&other->_internal_metadata_);
@@ -1422,8 +1442,8 @@ void PowAlgo::InternalSwap(PowAlgo* PROTOBUF_RESTRICT other) {
 }
 
 ::google::protobuf::Metadata PowAlgo::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
+  return ::_pbi::AssignDescriptors(&descriptor_table_block_2eproto_getter,
-      &descriptor_table_block_2eproto_getter, &descriptor_table_block_2eproto_once,
+                                   &descriptor_table_block_2eproto_once,
                                    file_level_metadata_block_2eproto[2]);
 }
 // ===================================================================
@@ -1433,22 +1453,8 @@ class Block::_Internal {
   using HasBits = decltype(std::declval<Block>()._impl_._has_bits_);
   static constexpr ::int32_t kHasBitsOffset =
     8 * PROTOBUF_FIELD_OFFSET(Block, _impl_._has_bits_);
-  static const ::tari::rpc::BlockHeader& header(const Block* msg);
-  static void set_has_header(HasBits* has_bits) {
-    (*has_bits)[0] |= 1u;
-  }
-  static const ::tari::rpc::AggregateBody& body(const Block* msg);
-  static void set_has_body(HasBits* has_bits) {
-    (*has_bits)[0] |= 2u;
-  }
 };
 
-const ::tari::rpc::BlockHeader& Block::_Internal::header(const Block* msg) {
-  return *msg->_impl_.header_;
-}
-const ::tari::rpc::AggregateBody& Block::_Internal::body(const Block* msg) {
-  return *msg->_impl_.body_;
-}
 void Block::clear_body() {
   PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   if (_impl_.body_ != nullptr) _impl_.body_->Clear();
@@ -1475,11 +1481,11 @@ Block::Block(
       from._internal_metadata_);
   new (&_impl_) Impl_(internal_visibility(), arena, from._impl_);
   ::uint32_t cached_has_bits = _impl_._has_bits_[0];
-  _impl_.header_ = (cached_has_bits & 0x00000001u)
+  _impl_.header_ = (cached_has_bits & 0x00000001u) ? ::google::protobuf::Message::CopyConstruct<::tari::rpc::BlockHeader>(
-                ? CreateMaybeMessage<::tari::rpc::BlockHeader>(arena, *from._impl_.header_)
+                              arena, *from._impl_.header_)
                         : nullptr;
-  _impl_.body_ = (cached_has_bits & 0x00000002u)
+  _impl_.body_ = (cached_has_bits & 0x00000002u) ? ::google::protobuf::Message::CopyConstruct<::tari::rpc::AggregateBody>(
-                ? CreateMaybeMessage<::tari::rpc::AggregateBody>(arena, *from._impl_.body_)
+                              arena, *from._impl_.body_)
                         : nullptr;
 
   // @@protoc_insertion_point(copy_constructor:tari.rpc.Block)
@@ -1510,6 +1516,20 @@ inline void Block::SharedDtor() {
   _impl_.~Impl_();
 }
 
+const ::google::protobuf::MessageLite::ClassData*
+Block::GetClassData() const {
+  PROTOBUF_CONSTINIT static const ::google::protobuf::MessageLite::
+      ClassDataFull _data_ = {
+          {
+              nullptr,  // OnDemandRegisterArenaDtor
+              PROTOBUF_FIELD_OFFSET(Block, _impl_._cached_size_),
+              false,
+          },
+          &Block::MergeImpl,
+          &Block::kDescriptorMethods,
+      };
+  return &_data_;
+}
 PROTOBUF_NOINLINE void Block::Clear() {
 // @@protoc_insertion_point(message_clear_start:tari.rpc.Block)
   PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
@@ -1553,6 +1573,9 @@ const ::_pbi::TcParseTable<1, 2, 2, 0, 2> Block::_table_ = {
     offsetof(decltype(_table_), aux_entries),
     &_Block_default_instance_._instance,
     ::_pbi::TcParser::GenericFallback,  // fallback
+    #ifdef PROTOBUF_PREFETCH_PARSE_TABLE
+    ::_pbi::TcParser::GetTable<::tari::rpc::Block>(),  // to_prefetch
+    #endif  // PROTOBUF_PREFETCH_PARSE_TABLE
   }, {{
     // .tari.rpc.AggregateBody body = 2;
     {::_pbi::TcParser::FastMtS1,
@@ -1587,15 +1610,13 @@ const ::_pbi::TcParseTable<1, 2, 2, 0, 2> Block::_table_ = {
   // .tari.rpc.BlockHeader header = 1;
   if (cached_has_bits & 0x00000001u) {
     target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-        1, _Internal::header(this),
+        1, *_impl_.header_, _impl_.header_->GetCachedSize(), target, stream);
-        _Internal::header(this).GetCachedSize(), target, stream);
   }
 
   // .tari.rpc.AggregateBody body = 2;
   if (cached_has_bits & 0x00000002u) {
     target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-        2, _Internal::body(this),
+        2, *_impl_.body_, _impl_.body_->GetCachedSize(), target, stream);
-        _Internal::body(this).GetCachedSize(), target, stream);
   }
 
   if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) {
@@ -1633,17 +1654,11 @@ const ::_pbi::TcParseTable<1, 2, 2, 0, 2> Block::_table_ = {
   return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_);
 }
 
-const ::google::protobuf::Message::ClassData Block::_class_data_ = {
-    Block::MergeImpl,
-    nullptr,  // OnDemandRegisterArenaDtor
-};
-const ::google::protobuf::Message::ClassData* Block::GetClassData() const {
-  return &_class_data_;
-}
 
-void Block::MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg) {
+void Block::MergeImpl(::google::protobuf::MessageLite& to_msg, const ::google::protobuf::MessageLite& from_msg) {
   auto* const _this = static_cast<Block*>(&to_msg);
   auto& from = static_cast<const Block&>(from_msg);
+  ::google::protobuf::Arena* arena = _this->GetArena();
   // @@protoc_insertion_point(class_specific_merge_from_start:tari.rpc.Block)
   ABSL_DCHECK_NE(&from, _this);
   ::uint32_t cached_has_bits = 0;
@@ -1652,14 +1667,25 @@ void Block::MergeImpl(::google::protobuf::Message& to_msg, const ::google::proto
   cached_has_bits = from._impl_._has_bits_[0];
   if (cached_has_bits & 0x00000003u) {
     if (cached_has_bits & 0x00000001u) {
-      _this->_internal_mutable_header()->::tari::rpc::BlockHeader::MergeFrom(
+      ABSL_DCHECK(from._impl_.header_ != nullptr);
-          from._internal_header());
+      if (_this->_impl_.header_ == nullptr) {
+        _this->_impl_.header_ =
+            ::google::protobuf::Message::CopyConstruct<::tari::rpc::BlockHeader>(arena, *from._impl_.header_);
+      } else {
+        _this->_impl_.header_->MergeFrom(*from._impl_.header_);
+      }
     }
     if (cached_has_bits & 0x00000002u) {
-      _this->_internal_mutable_body()->::tari::rpc::AggregateBody::MergeFrom(
+      ABSL_DCHECK(from._impl_.body_ != nullptr);
-          from._internal_body());
+      if (_this->_impl_.body_ == nullptr) {
+        _this->_impl_.body_ =
+            ::google::protobuf::Message::CopyConstruct<::tari::rpc::AggregateBody>(arena, *from._impl_.body_);
+      } else {
+        _this->_impl_.body_->MergeFrom(*from._impl_.body_);
       }
     }
+  }
+  _this->_impl_._has_bits_[0] |= cached_has_bits;
   _this->_internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(from._internal_metadata_);
 }
 
@@ -1674,9 +1700,6 @@ PROTOBUF_NOINLINE bool Block::IsInitialized() const {
   return true;
 }
 
-::_pbi::CachedSize* Block::AccessCachedSize() const {
-  return &_impl_._cached_size_;
-}
 void Block::InternalSwap(Block* PROTOBUF_RESTRICT other) {
   using std::swap;
   _internal_metadata_.InternalSwap(&other->_internal_metadata_);
@@ -1690,8 +1713,8 @@ void Block::InternalSwap(Block* PROTOBUF_RESTRICT other) {
 }
 
 ::google::protobuf::Metadata Block::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
+  return ::_pbi::AssignDescriptors(&descriptor_table_block_2eproto_getter,
-      &descriptor_table_block_2eproto_getter, &descriptor_table_block_2eproto_once,
+                                   &descriptor_table_block_2eproto_once,
                                    file_level_metadata_block_2eproto[3]);
 }
 // ===================================================================
@@ -1701,15 +1724,8 @@ class HistoricalBlock::_Internal {
   using HasBits = decltype(std::declval<HistoricalBlock>()._impl_._has_bits_);
   static constexpr ::int32_t kHasBitsOffset =
     8 * PROTOBUF_FIELD_OFFSET(HistoricalBlock, _impl_._has_bits_);
-  static const ::tari::rpc::Block& block(const HistoricalBlock* msg);
-  static void set_has_block(HasBits* has_bits) {
-    (*has_bits)[0] |= 1u;
-  }
 };
 
-const ::tari::rpc::Block& HistoricalBlock::_Internal::block(const HistoricalBlock* msg) {
-  return *msg->_impl_.block_;
-}
 HistoricalBlock::HistoricalBlock(::google::protobuf::Arena* arena)
     : ::google::protobuf::Message(arena) {
   SharedCtor(arena);
@@ -1731,8 +1747,8 @@ HistoricalBlock::HistoricalBlock(
       from._internal_metadata_);
   new (&_impl_) Impl_(internal_visibility(), arena, from._impl_);
   ::uint32_t cached_has_bits = _impl_._has_bits_[0];
-  _impl_.block_ = (cached_has_bits & 0x00000001u)
+  _impl_.block_ = (cached_has_bits & 0x00000001u) ? ::google::protobuf::Message::CopyConstruct<::tari::rpc::Block>(
-                ? CreateMaybeMessage<::tari::rpc::Block>(arena, *from._impl_.block_)
+                              arena, *from._impl_.block_)
                         : nullptr;
   _impl_.confirmations_ = from._impl_.confirmations_;
 
@@ -1763,6 +1779,20 @@ inline void HistoricalBlock::SharedDtor() {
   _impl_.~Impl_();
 }
 
+const ::google::protobuf::MessageLite::ClassData*
+HistoricalBlock::GetClassData() const {
+  PROTOBUF_CONSTINIT static const ::google::protobuf::MessageLite::
+      ClassDataFull _data_ = {
+          {
+              nullptr,  // OnDemandRegisterArenaDtor
+              PROTOBUF_FIELD_OFFSET(HistoricalBlock, _impl_._cached_size_),
+              false,
+          },
+          &HistoricalBlock::MergeImpl,
+          &HistoricalBlock::kDescriptorMethods,
+      };
+  return &_data_;
+}
 PROTOBUF_NOINLINE void HistoricalBlock::Clear() {
 // @@protoc_insertion_point(message_clear_start:tari.rpc.HistoricalBlock)
   PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
@@ -1801,6 +1831,9 @@ const ::_pbi::TcParseTable<1, 2, 1, 0, 2> HistoricalBlock::_table_ = {
     offsetof(decltype(_table_), aux_entries),
     &_HistoricalBlock_default_instance_._instance,
     ::_pbi::TcParser::GenericFallback,  // fallback
+    #ifdef PROTOBUF_PREFETCH_PARSE_TABLE
+    ::_pbi::TcParser::GetTable<::tari::rpc::HistoricalBlock>(),  // to_prefetch
+    #endif  // PROTOBUF_PREFETCH_PARSE_TABLE
   }, {{
     // .tari.rpc.Block block = 2;
     {::_pbi::TcParser::FastMtS1,
@@ -1841,8 +1874,7 @@ const ::_pbi::TcParseTable<1, 2, 1, 0, 2> HistoricalBlock::_table_ = {
   // .tari.rpc.Block block = 2;
   if (cached_has_bits & 0x00000001u) {
     target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-        2, _Internal::block(this),
+        2, *_impl_.block_, _impl_.block_->GetCachedSize(), target, stream);
-        _Internal::block(this).GetCachedSize(), target, stream);
   }
 
   if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) {
@@ -1878,29 +1910,30 @@ const ::_pbi::TcParseTable<1, 2, 1, 0, 2> HistoricalBlock::_table_ = {
   return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_);
 }
 
-const ::google::protobuf::Message::ClassData HistoricalBlock::_class_data_ = {
-    HistoricalBlock::MergeImpl,
-    nullptr,  // OnDemandRegisterArenaDtor
-};
-const ::google::protobuf::Message::ClassData* HistoricalBlock::GetClassData() const {
-  return &_class_data_;
-}
 
-void HistoricalBlock::MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg) {
+void HistoricalBlock::MergeImpl(::google::protobuf::MessageLite& to_msg, const ::google::protobuf::MessageLite& from_msg) {
   auto* const _this = static_cast<HistoricalBlock*>(&to_msg);
   auto& from = static_cast<const HistoricalBlock&>(from_msg);
+  ::google::protobuf::Arena* arena = _this->GetArena();
   // @@protoc_insertion_point(class_specific_merge_from_start:tari.rpc.HistoricalBlock)
   ABSL_DCHECK_NE(&from, _this);
   ::uint32_t cached_has_bits = 0;
   (void) cached_has_bits;
 
-  if ((from._impl_._has_bits_[0] & 0x00000001u) != 0) {
+  cached_has_bits = from._impl_._has_bits_[0];
-    _this->_internal_mutable_block()->::tari::rpc::Block::MergeFrom(
+  if (cached_has_bits & 0x00000001u) {
-        from._internal_block());
+    ABSL_DCHECK(from._impl_.block_ != nullptr);
+    if (_this->_impl_.block_ == nullptr) {
+      _this->_impl_.block_ =
+          ::google::protobuf::Message::CopyConstruct<::tari::rpc::Block>(arena, *from._impl_.block_);
+    } else {
+      _this->_impl_.block_->MergeFrom(*from._impl_.block_);
+    }
   }
   if (from._internal_confirmations() != 0) {
-    _this->_internal_set_confirmations(from._internal_confirmations());
+    _this->_impl_.confirmations_ = from._impl_.confirmations_;
   }
+  _this->_impl_._has_bits_[0] |= cached_has_bits;
   _this->_internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(from._internal_metadata_);
 }
 
@@ -1915,9 +1948,6 @@ PROTOBUF_NOINLINE bool HistoricalBlock::IsInitialized() const {
   return true;
 }
 
-::_pbi::CachedSize* HistoricalBlock::AccessCachedSize() const {
-  return &_impl_._cached_size_;
-}
 void HistoricalBlock::InternalSwap(HistoricalBlock* PROTOBUF_RESTRICT other) {
   using std::swap;
   _internal_metadata_.InternalSwap(&other->_internal_metadata_);
@@ -1931,8 +1961,8 @@ void HistoricalBlock::InternalSwap(HistoricalBlock* PROTOBUF_RESTRICT other) {
 }
 
 ::google::protobuf::Metadata HistoricalBlock::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
+  return ::_pbi::AssignDescriptors(&descriptor_table_block_2eproto_getter,
-      &descriptor_table_block_2eproto_getter, &descriptor_table_block_2eproto_once,
+                                   &descriptor_table_block_2eproto_once,
                                    file_level_metadata_block_2eproto[4]);
 }
 // ===================================================================
@@ -1942,15 +1972,8 @@ class NewBlockHeaderTemplate::_Internal {
   using HasBits = decltype(std::declval<NewBlockHeaderTemplate>()._impl_._has_bits_);
   static constexpr ::int32_t kHasBitsOffset =
     8 * PROTOBUF_FIELD_OFFSET(NewBlockHeaderTemplate, _impl_._has_bits_);
-  static const ::tari::rpc::ProofOfWork& pow(const NewBlockHeaderTemplate* msg);
-  static void set_has_pow(HasBits* has_bits) {
-    (*has_bits)[0] |= 1u;
-  }
 };
 
-const ::tari::rpc::ProofOfWork& NewBlockHeaderTemplate::_Internal::pow(const NewBlockHeaderTemplate* msg) {
-  return *msg->_impl_.pow_;
-}
 NewBlockHeaderTemplate::NewBlockHeaderTemplate(::google::protobuf::Arena* arena)
     : ::google::protobuf::Message(arena) {
   SharedCtor(arena);
@@ -1975,8 +1998,8 @@ NewBlockHeaderTemplate::NewBlockHeaderTemplate(
       from._internal_metadata_);
   new (&_impl_) Impl_(internal_visibility(), arena, from._impl_);
   ::uint32_t cached_has_bits = _impl_._has_bits_[0];
-  _impl_.pow_ = (cached_has_bits & 0x00000001u)
+  _impl_.pow_ = (cached_has_bits & 0x00000001u) ? ::google::protobuf::Message::CopyConstruct<::tari::rpc::ProofOfWork>(
-                ? CreateMaybeMessage<::tari::rpc::ProofOfWork>(arena, *from._impl_.pow_)
+                              arena, *from._impl_.pow_)
                         : nullptr;
   ::memcpy(reinterpret_cast<char *>(&_impl_) +
                offsetof(Impl_, height_),
@@ -2019,6 +2042,20 @@ inline void NewBlockHeaderTemplate::SharedDtor() {
   _impl_.~Impl_();
 }
 
+const ::google::protobuf::MessageLite::ClassData*
+NewBlockHeaderTemplate::GetClassData() const {
+  PROTOBUF_CONSTINIT static const ::google::protobuf::MessageLite::
+      ClassDataFull _data_ = {
+          {
+              nullptr,  // OnDemandRegisterArenaDtor
+              PROTOBUF_FIELD_OFFSET(NewBlockHeaderTemplate, _impl_._cached_size_),
+              false,
+          },
+          &NewBlockHeaderTemplate::MergeImpl,
+          &NewBlockHeaderTemplate::kDescriptorMethods,
+      };
+  return &_data_;
+}
 PROTOBUF_NOINLINE void NewBlockHeaderTemplate::Clear() {
 // @@protoc_insertion_point(message_clear_start:tari.rpc.NewBlockHeaderTemplate)
   PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
@@ -2062,6 +2099,9 @@ const ::_pbi::TcParseTable<3, 6, 1, 0, 2> NewBlockHeaderTemplate::_table_ = {
     offsetof(decltype(_table_), aux_entries),
     &_NewBlockHeaderTemplate_default_instance_._instance,
     ::_pbi::TcParser::GenericFallback,  // fallback
+    #ifdef PROTOBUF_PREFETCH_PARSE_TABLE
+    ::_pbi::TcParser::GetTable<::tari::rpc::NewBlockHeaderTemplate>(),  // to_prefetch
+    #endif  // PROTOBUF_PREFETCH_PARSE_TABLE
   }, {{
     {::_pbi::TcParser::MiniParse, {}},
     // uint32 version = 1;
@@ -2147,8 +2187,7 @@ const ::_pbi::TcParseTable<3, 6, 1, 0, 2> NewBlockHeaderTemplate::_table_ = {
   // .tari.rpc.ProofOfWork pow = 5;
   if (cached_has_bits & 0x00000001u) {
     target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-        5, _Internal::pow(this),
+        5, *_impl_.pow_, _impl_.pow_->GetCachedSize(), target, stream);
-        _Internal::pow(this).GetCachedSize(), target, stream);
   }
 
   // bytes total_script_offset = 7;
@@ -2214,17 +2253,11 @@ const ::_pbi::TcParseTable<3, 6, 1, 0, 2> NewBlockHeaderTemplate::_table_ = {
   return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_);
 }
 
-const ::google::protobuf::Message::ClassData NewBlockHeaderTemplate::_class_data_ = {
-    NewBlockHeaderTemplate::MergeImpl,
-    nullptr,  // OnDemandRegisterArenaDtor
-};
-const ::google::protobuf::Message::ClassData* NewBlockHeaderTemplate::GetClassData() const {
-  return &_class_data_;
-}
 
-void NewBlockHeaderTemplate::MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg) {
+void NewBlockHeaderTemplate::MergeImpl(::google::protobuf::MessageLite& to_msg, const ::google::protobuf::MessageLite& from_msg) {
   auto* const _this = static_cast<NewBlockHeaderTemplate*>(&to_msg);
   auto& from = static_cast<const NewBlockHeaderTemplate&>(from_msg);
+  ::google::protobuf::Arena* arena = _this->GetArena();
   // @@protoc_insertion_point(class_specific_merge_from_start:tari.rpc.NewBlockHeaderTemplate)
   ABSL_DCHECK_NE(&from, _this);
   ::uint32_t cached_has_bits = 0;
@@ -2239,16 +2272,23 @@ void NewBlockHeaderTemplate::MergeImpl(::google::protobuf::Message& to_msg, cons
   if (!from._internal_total_script_offset().empty()) {
     _this->_internal_set_total_script_offset(from._internal_total_script_offset());
   }
-  if ((from._impl_._has_bits_[0] & 0x00000001u) != 0) {
+  cached_has_bits = from._impl_._has_bits_[0];
-    _this->_internal_mutable_pow()->::tari::rpc::ProofOfWork::MergeFrom(
+  if (cached_has_bits & 0x00000001u) {
-        from._internal_pow());
+    ABSL_DCHECK(from._impl_.pow_ != nullptr);
+    if (_this->_impl_.pow_ == nullptr) {
+      _this->_impl_.pow_ =
+          ::google::protobuf::Message::CopyConstruct<::tari::rpc::ProofOfWork>(arena, *from._impl_.pow_);
+    } else {
+      _this->_impl_.pow_->MergeFrom(*from._impl_.pow_);
+    }
   }
   if (from._internal_height() != 0) {
-    _this->_internal_set_height(from._internal_height());
+    _this->_impl_.height_ = from._impl_.height_;
   }
   if (from._internal_version() != 0) {
-    _this->_internal_set_version(from._internal_version());
+    _this->_impl_.version_ = from._impl_.version_;
   }
+  _this->_impl_._has_bits_[0] |= cached_has_bits;
   _this->_internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(from._internal_metadata_);
 }
 
@@ -2263,9 +2303,6 @@ PROTOBUF_NOINLINE bool NewBlockHeaderTemplate::IsInitialized() const {
   return true;
 }
 
-::_pbi::CachedSize* NewBlockHeaderTemplate::AccessCachedSize() const {
-  return &_impl_._cached_size_;
-}
 void NewBlockHeaderTemplate::InternalSwap(NewBlockHeaderTemplate* PROTOBUF_RESTRICT other) {
   using std::swap;
   auto* arena = GetArena();
@@ -2284,8 +2321,8 @@ void NewBlockHeaderTemplate::InternalSwap(NewBlockHeaderTemplate* PROTOBUF_RESTR
 }
 
 ::google::protobuf::Metadata NewBlockHeaderTemplate::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
+  return ::_pbi::AssignDescriptors(&descriptor_table_block_2eproto_getter,
-      &descriptor_table_block_2eproto_getter, &descriptor_table_block_2eproto_once,
+                                   &descriptor_table_block_2eproto_once,
                                    file_level_metadata_block_2eproto[5]);
 }
 // ===================================================================
@@ -2295,22 +2332,8 @@ class NewBlockTemplate::_Internal {
   using HasBits = decltype(std::declval<NewBlockTemplate>()._impl_._has_bits_);
   static constexpr ::int32_t kHasBitsOffset =
     8 * PROTOBUF_FIELD_OFFSET(NewBlockTemplate, _impl_._has_bits_);
-  static const ::tari::rpc::NewBlockHeaderTemplate& header(const NewBlockTemplate* msg);
-  static void set_has_header(HasBits* has_bits) {
-    (*has_bits)[0] |= 1u;
-  }
-  static const ::tari::rpc::AggregateBody& body(const NewBlockTemplate* msg);
-  static void set_has_body(HasBits* has_bits) {
-    (*has_bits)[0] |= 2u;
-  }
 };
 
-const ::tari::rpc::NewBlockHeaderTemplate& NewBlockTemplate::_Internal::header(const NewBlockTemplate* msg) {
-  return *msg->_impl_.header_;
-}
-const ::tari::rpc::AggregateBody& NewBlockTemplate::_Internal::body(const NewBlockTemplate* msg) {
-  return *msg->_impl_.body_;
-}
 void NewBlockTemplate::clear_body() {
   PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   if (_impl_.body_ != nullptr) _impl_.body_->Clear();
@@ -2337,11 +2360,11 @@ NewBlockTemplate::NewBlockTemplate(
       from._internal_metadata_);
   new (&_impl_) Impl_(internal_visibility(), arena, from._impl_);
   ::uint32_t cached_has_bits = _impl_._has_bits_[0];
-  _impl_.header_ = (cached_has_bits & 0x00000001u)
+  _impl_.header_ = (cached_has_bits & 0x00000001u) ? ::google::protobuf::Message::CopyConstruct<::tari::rpc::NewBlockHeaderTemplate>(
-                ? CreateMaybeMessage<::tari::rpc::NewBlockHeaderTemplate>(arena, *from._impl_.header_)
+                              arena, *from._impl_.header_)
                         : nullptr;
-  _impl_.body_ = (cached_has_bits & 0x00000002u)
+  _impl_.body_ = (cached_has_bits & 0x00000002u) ? ::google::protobuf::Message::CopyConstruct<::tari::rpc::AggregateBody>(
-                ? CreateMaybeMessage<::tari::rpc::AggregateBody>(arena, *from._impl_.body_)
+                              arena, *from._impl_.body_)
                         : nullptr;
 
   // @@protoc_insertion_point(copy_constructor:tari.rpc.NewBlockTemplate)
@@ -2372,6 +2395,20 @@ inline void NewBlockTemplate::SharedDtor() {
   _impl_.~Impl_();
 }
 
+const ::google::protobuf::MessageLite::ClassData*
+NewBlockTemplate::GetClassData() const {
+  PROTOBUF_CONSTINIT static const ::google::protobuf::MessageLite::
+      ClassDataFull _data_ = {
+          {
+              nullptr,  // OnDemandRegisterArenaDtor
+              PROTOBUF_FIELD_OFFSET(NewBlockTemplate, _impl_._cached_size_),
+              false,
+          },
+          &NewBlockTemplate::MergeImpl,
+          &NewBlockTemplate::kDescriptorMethods,
+      };
+  return &_data_;
+}
 PROTOBUF_NOINLINE void NewBlockTemplate::Clear() {
 // @@protoc_insertion_point(message_clear_start:tari.rpc.NewBlockTemplate)
   PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
@@ -2415,6 +2452,9 @@ const ::_pbi::TcParseTable<1, 2, 2, 0, 2> NewBlockTemplate::_table_ = {
     offsetof(decltype(_table_), aux_entries),
     &_NewBlockTemplate_default_instance_._instance,
     ::_pbi::TcParser::GenericFallback,  // fallback
+    #ifdef PROTOBUF_PREFETCH_PARSE_TABLE
+    ::_pbi::TcParser::GetTable<::tari::rpc::NewBlockTemplate>(),  // to_prefetch
+    #endif  // PROTOBUF_PREFETCH_PARSE_TABLE
   }, {{
     // .tari.rpc.AggregateBody body = 2;
     {::_pbi::TcParser::FastMtS1,
@@ -2449,15 +2489,13 @@ const ::_pbi::TcParseTable<1, 2, 2, 0, 2> NewBlockTemplate::_table_ = {
   // .tari.rpc.NewBlockHeaderTemplate header = 1;
   if (cached_has_bits & 0x00000001u) {
     target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-        1, _Internal::header(this),
+        1, *_impl_.header_, _impl_.header_->GetCachedSize(), target, stream);
-        _Internal::header(this).GetCachedSize(), target, stream);
   }
 
   // .tari.rpc.AggregateBody body = 2;
   if (cached_has_bits & 0x00000002u) {
     target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-        2, _Internal::body(this),
+        2, *_impl_.body_, _impl_.body_->GetCachedSize(), target, stream);
-        _Internal::body(this).GetCachedSize(), target, stream);
   }
 
   if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) {
@@ -2495,17 +2533,11 @@ const ::_pbi::TcParseTable<1, 2, 2, 0, 2> NewBlockTemplate::_table_ = {
   return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_);
 }
 
-const ::google::protobuf::Message::ClassData NewBlockTemplate::_class_data_ = {
-    NewBlockTemplate::MergeImpl,
-    nullptr,  // OnDemandRegisterArenaDtor
-};
-const ::google::protobuf::Message::ClassData* NewBlockTemplate::GetClassData() const {
-  return &_class_data_;
-}
 
-void NewBlockTemplate::MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg) {
+void NewBlockTemplate::MergeImpl(::google::protobuf::MessageLite& to_msg, const ::google::protobuf::MessageLite& from_msg) {
   auto* const _this = static_cast<NewBlockTemplate*>(&to_msg);
   auto& from = static_cast<const NewBlockTemplate&>(from_msg);
+  ::google::protobuf::Arena* arena = _this->GetArena();
   // @@protoc_insertion_point(class_specific_merge_from_start:tari.rpc.NewBlockTemplate)
   ABSL_DCHECK_NE(&from, _this);
   ::uint32_t cached_has_bits = 0;
@@ -2514,14 +2546,25 @@ void NewBlockTemplate::MergeImpl(::google::protobuf::Message& to_msg, const ::go
   cached_has_bits = from._impl_._has_bits_[0];
   if (cached_has_bits & 0x00000003u) {
     if (cached_has_bits & 0x00000001u) {
-      _this->_internal_mutable_header()->::tari::rpc::NewBlockHeaderTemplate::MergeFrom(
+      ABSL_DCHECK(from._impl_.header_ != nullptr);
-          from._internal_header());
+      if (_this->_impl_.header_ == nullptr) {
+        _this->_impl_.header_ =
+            ::google::protobuf::Message::CopyConstruct<::tari::rpc::NewBlockHeaderTemplate>(arena, *from._impl_.header_);
+      } else {
+        _this->_impl_.header_->MergeFrom(*from._impl_.header_);
+      }
     }
     if (cached_has_bits & 0x00000002u) {
-      _this->_internal_mutable_body()->::tari::rpc::AggregateBody::MergeFrom(
+      ABSL_DCHECK(from._impl_.body_ != nullptr);
-          from._internal_body());
+      if (_this->_impl_.body_ == nullptr) {
+        _this->_impl_.body_ =
+            ::google::protobuf::Message::CopyConstruct<::tari::rpc::AggregateBody>(arena, *from._impl_.body_);
+      } else {
+        _this->_impl_.body_->MergeFrom(*from._impl_.body_);
       }
     }
+  }
+  _this->_impl_._has_bits_[0] |= cached_has_bits;
   _this->_internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(from._internal_metadata_);
 }
 
@@ -2536,9 +2579,6 @@ PROTOBUF_NOINLINE bool NewBlockTemplate::IsInitialized() const {
   return true;
 }
 
-::_pbi::CachedSize* NewBlockTemplate::AccessCachedSize() const {
-  return &_impl_._cached_size_;
-}
 void NewBlockTemplate::InternalSwap(NewBlockTemplate* PROTOBUF_RESTRICT other) {
   using std::swap;
   _internal_metadata_.InternalSwap(&other->_internal_metadata_);
@@ -2552,8 +2592,8 @@ void NewBlockTemplate::InternalSwap(NewBlockTemplate* PROTOBUF_RESTRICT other) {
 }
 
 ::google::protobuf::Metadata NewBlockTemplate::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
+  return ::_pbi::AssignDescriptors(&descriptor_table_block_2eproto_getter,
-      &descriptor_table_block_2eproto_getter, &descriptor_table_block_2eproto_once,
+                                   &descriptor_table_block_2eproto_once,
                                    file_level_metadata_block_2eproto[6]);
 }
 // @@protoc_insertion_point(namespace_scope)
@@ -2564,4 +2604,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_block_2eproto),
+     ::std::false_type{});
 #include "google/protobuf/port_undef.inc"

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,7 +243,8 @@ 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
+    TableStruct_network_2eproto::offsets[] ABSL_ATTRIBUTE_SECTION_VARIABLE(
         protodesc_cold) = {
         ~0u,  // no _has_bits_
         PROTOBUF_FIELD_OFFSET(::tari::rpc::NodeIdentity, _internal_metadata_),
@@ -353,7 +355,7 @@ const ::uint32_t TableStruct_network_2eproto::offsets[] PROTOBUF_SECTION_VARIABL
 };
 
 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,8 +697,8 @@ 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]);
 }
 // ===================================================================
@@ -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,8 +1163,8 @@ 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]);
 }
 // ===================================================================
@@ -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,8 +1397,8 @@ 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]);
 }
 // ===================================================================
@@ -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,8 +1433,8 @@ 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;
   _impl_.connection_attempts_ = from._impl_.connection_attempts_;
 
@@ -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,8 +1708,8 @@ 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]);
 }
 // ===================================================================
@@ -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,8 +1885,8 @@ 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]);
 }
 // ===================================================================
@@ -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,8 +2077,8 @@ 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]);
 }
 // ===================================================================
@@ -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,8 +2357,8 @@ 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]);
 }
 // ===================================================================
@@ -2340,8 +2392,8 @@ 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]);
 }
 // ===================================================================
@@ -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,8 +2642,8 @@ 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]);
 }
 // @@protoc_insertion_point(namespace_scope)
@@ -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/Tari/proto/gRPC/sidechain_types.pb.cc

@@ -1,5 +1,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: sidechain_types.proto
+// Protobuf C++ Version: 5.26.1
 
 #include "sidechain_types.pb.h"
 
@@ -213,7 +214,8 @@ static constexpr const ::_pb::EnumDescriptor**
     file_level_enum_descriptors_sidechain_5ftypes_2eproto = nullptr;
 static constexpr const ::_pb::ServiceDescriptor**
     file_level_service_descriptors_sidechain_5ftypes_2eproto = nullptr;
-const ::uint32_t TableStruct_sidechain_5ftypes_2eproto::offsets[] PROTOBUF_SECTION_VARIABLE(
+const ::uint32_t
+    TableStruct_sidechain_5ftypes_2eproto::offsets[] ABSL_ATTRIBUTE_SECTION_VARIABLE(
         protodesc_cold) = {
         ~0u,  // no _has_bits_
         PROTOBUF_FIELD_OFFSET(::tari::rpc::SideChainFeature, _internal_metadata_),
@@ -322,7 +324,7 @@ const ::uint32_t TableStruct_sidechain_5ftypes_2eproto::offsets[] PROTOBUF_SECTI
 };
 
 static const ::_pbi::MigrationSchema
-    schemas[] PROTOBUF_SECTION_VARIABLE(protodesc_cold) = {
+    schemas[] ABSL_ATTRIBUTE_SECTION_VARIABLE(protodesc_cold) = {
         {0, -1, -1, sizeof(::tari::rpc::SideChainFeature)},
         {12, 22, -1, sizeof(::tari::rpc::ValidatorNodeRegistration)},
         {24, 40, -1, sizeof(::tari::rpc::TemplateRegistration)},
@@ -333,7 +335,6 @@ static const ::_pbi::MigrationSchema
         {86, -1, -1, sizeof(::tari::rpc::ManifestInfo)},
         {94, -1, -1, sizeof(::tari::rpc::BuildInfo)},
 };
-
 static const ::_pb::Message* const file_default_instances[] = {
     &::tari::rpc::_SideChainFeature_default_instance_._instance,
     &::tari::rpc::_ValidatorNodeRegistration_default_instance_._instance,
@@ -345,7 +346,8 @@ static const ::_pb::Message* const file_default_instances[] = {
     &::tari::rpc::_ManifestInfo_default_instance_._instance,
     &::tari::rpc::_BuildInfo_default_instance_._instance,
 };
-const char descriptor_table_protodef_sidechain_5ftypes_2eproto[] PROTOBUF_SECTION_VARIABLE(protodesc_cold) = {
+const char descriptor_table_protodef_sidechain_5ftypes_2eproto[] ABSL_ATTRIBUTE_SECTION_VARIABLE(
+    protodesc_cold) = {
     "\n\025sidechain_types.proto\022\010tari.rpc\032\013types"
     ".proto\"\366\001\n\020SideChainFeature\022J\n\033validator"
     "_node_registration\030\001 \001(\0132#.tari.rpc.Vali"
@@ -409,9 +411,6 @@ const ::_pbi::DescriptorTable descriptor_table_sidechain_5ftypes_2eproto = {
 PROTOBUF_ATTRIBUTE_WEAK const ::_pbi::DescriptorTable* descriptor_table_sidechain_5ftypes_2eproto_getter() {
   return &descriptor_table_sidechain_5ftypes_2eproto;
 }
-// Force running AddDescriptors() at dynamic initialization time.
-PROTOBUF_ATTRIBUTE_INIT_PRIORITY2
-static ::_pbi::AddDescriptorsRunner dynamic_init_dummy_sidechain_5ftypes_2eproto(&descriptor_table_sidechain_5ftypes_2eproto);
 namespace tari {
 namespace rpc {
 // ===================================================================
@@ -420,20 +419,8 @@ class SideChainFeature::_Internal {
  public:
   static constexpr ::int32_t kOneofCaseOffset =
     PROTOBUF_FIELD_OFFSET(::tari::rpc::SideChainFeature, _impl_._oneof_case_);
-  static const ::tari::rpc::ValidatorNodeRegistration& validator_node_registration(const SideChainFeature* msg);
-  static const ::tari::rpc::TemplateRegistration& template_registration(const SideChainFeature* msg);
-  static const ::tari::rpc::ConfidentialOutputData& confidential_output(const SideChainFeature* msg);
 };
 
-const ::tari::rpc::ValidatorNodeRegistration& SideChainFeature::_Internal::validator_node_registration(const SideChainFeature* msg) {
-  return *msg->_impl_.side_chain_feature_.validator_node_registration_;
-}
-const ::tari::rpc::TemplateRegistration& SideChainFeature::_Internal::template_registration(const SideChainFeature* msg) {
-  return *msg->_impl_.side_chain_feature_.template_registration_;
-}
-const ::tari::rpc::ConfidentialOutputData& SideChainFeature::_Internal::confidential_output(const SideChainFeature* msg) {
-  return *msg->_impl_.side_chain_feature_.confidential_output_;
-}
 void SideChainFeature::set_allocated_validator_node_registration(::tari::rpc::ValidatorNodeRegistration* validator_node_registration) {
   ::google::protobuf::Arena* message_arena = GetArena();
   clear_side_chain_feature();
@@ -498,13 +485,13 @@ SideChainFeature::SideChainFeature(
     case SIDE_CHAIN_FEATURE_NOT_SET:
       break;
       case kValidatorNodeRegistration:
-        _impl_.side_chain_feature_.validator_node_registration_ = CreateMaybeMessage<::tari::rpc::ValidatorNodeRegistration>(arena, *from._impl_.side_chain_feature_.validator_node_registration_);
+        _impl_.side_chain_feature_.validator_node_registration_ = ::google::protobuf::Message::CopyConstruct<::tari::rpc::ValidatorNodeRegistration>(arena, *from._impl_.side_chain_feature_.validator_node_registration_);
         break;
       case kTemplateRegistration:
-        _impl_.side_chain_feature_.template_registration_ = CreateMaybeMessage<::tari::rpc::TemplateRegistration>(arena, *from._impl_.side_chain_feature_.template_registration_);
+        _impl_.side_chain_feature_.template_registration_ = ::google::protobuf::Message::CopyConstruct<::tari::rpc::TemplateRegistration>(arena, *from._impl_.side_chain_feature_.template_registration_);
         break;
       case kConfidentialOutput:
-        _impl_.side_chain_feature_.confidential_output_ = CreateMaybeMessage<::tari::rpc::ConfidentialOutputData>(arena, *from._impl_.side_chain_feature_.confidential_output_);
+        _impl_.side_chain_feature_.confidential_output_ = ::google::protobuf::Message::CopyConstruct<::tari::rpc::ConfidentialOutputData>(arena, *from._impl_.side_chain_feature_.confidential_output_);
         break;
   }
 
@@ -563,6 +550,20 @@ void SideChainFeature::clear_side_chain_feature() {
 }
 
 
+const ::google::protobuf::MessageLite::ClassData*
+SideChainFeature::GetClassData() const {
+  PROTOBUF_CONSTINIT static const ::google::protobuf::MessageLite::
+      ClassDataFull _data_ = {
+          {
+              nullptr,  // OnDemandRegisterArenaDtor
+              PROTOBUF_FIELD_OFFSET(SideChainFeature, _impl_._cached_size_),
+              false,
+          },
+          &SideChainFeature::MergeImpl,
+          &SideChainFeature::kDescriptorMethods,
+      };
+  return &_data_;
+}
 PROTOBUF_NOINLINE void SideChainFeature::Clear() {
 // @@protoc_insertion_point(message_clear_start:tari.rpc.SideChainFeature)
   PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
@@ -595,6 +596,9 @@ const ::_pbi::TcParseTable<0, 3, 3, 0, 2> SideChainFeature::_table_ = {
     offsetof(decltype(_table_), aux_entries),
     &_SideChainFeature_default_instance_._instance,
     ::_pbi::TcParser::GenericFallback,  // fallback
+    #ifdef PROTOBUF_PREFETCH_PARSE_TABLE
+    ::_pbi::TcParser::GetTable<::tari::rpc::SideChainFeature>(),  // to_prefetch
+    #endif  // PROTOBUF_PREFETCH_PARSE_TABLE
   }, {{
     {::_pbi::TcParser::MiniParse, {}},
   }}, {{
@@ -627,20 +631,17 @@ const ::_pbi::TcParseTable<0, 3, 3, 0, 2> SideChainFeature::_table_ = {
   switch (side_chain_feature_case()) {
     case kValidatorNodeRegistration: {
       target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-          1, _Internal::validator_node_registration(this),
+          1, *_impl_.side_chain_feature_.validator_node_registration_, _impl_.side_chain_feature_.validator_node_registration_->GetCachedSize(), target, stream);
-          _Internal::validator_node_registration(this).GetCachedSize(), target, stream);
       break;
     }
     case kTemplateRegistration: {
       target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-          2, _Internal::template_registration(this),
+          2, *_impl_.side_chain_feature_.template_registration_, _impl_.side_chain_feature_.template_registration_->GetCachedSize(), target, stream);
-          _Internal::template_registration(this).GetCachedSize(), target, stream);
       break;
     }
     case kConfidentialOutput: {
       target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-          3, _Internal::confidential_output(this),
+          3, *_impl_.side_chain_feature_.confidential_output_, _impl_.side_chain_feature_.confidential_output_->GetCachedSize(), target, stream);
-          _Internal::confidential_output(this).GetCachedSize(), target, stream);
       break;
     }
     default:
@@ -689,39 +690,55 @@ const ::_pbi::TcParseTable<0, 3, 3, 0, 2> SideChainFeature::_table_ = {
   return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_);
 }
 
-const ::google::protobuf::Message::ClassData SideChainFeature::_class_data_ = {
-    SideChainFeature::MergeImpl,
-    nullptr,  // OnDemandRegisterArenaDtor
-};
-const ::google::protobuf::Message::ClassData* SideChainFeature::GetClassData() const {
-  return &_class_data_;
-}
 
-void SideChainFeature::MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg) {
+void SideChainFeature::MergeImpl(::google::protobuf::MessageLite& to_msg, const ::google::protobuf::MessageLite& from_msg) {
   auto* const _this = static_cast<SideChainFeature*>(&to_msg);
   auto& from = static_cast<const SideChainFeature&>(from_msg);
+  ::google::protobuf::Arena* arena = _this->GetArena();
   // @@protoc_insertion_point(class_specific_merge_from_start:tari.rpc.SideChainFeature)
   ABSL_DCHECK_NE(&from, _this);
   ::uint32_t cached_has_bits = 0;
   (void) cached_has_bits;
 
-  switch (from.side_chain_feature_case()) {
+  if (const uint32_t oneof_from_case = from._impl_._oneof_case_[0]) {
+    const uint32_t oneof_to_case = _this->_impl_._oneof_case_[0];
+    const bool oneof_needs_init = oneof_to_case != oneof_from_case;
+    if (oneof_needs_init) {
+      if (oneof_to_case != 0) {
+        _this->clear_side_chain_feature();
+      }
+      _this->_impl_._oneof_case_[0] = oneof_from_case;
+    }
+
+    switch (oneof_from_case) {
       case kValidatorNodeRegistration: {
-      _this->_internal_mutable_validator_node_registration()->::tari::rpc::ValidatorNodeRegistration::MergeFrom(
+        if (oneof_needs_init) {
-          from._internal_validator_node_registration());
+          _this->_impl_.side_chain_feature_.validator_node_registration_ =
+              ::google::protobuf::Message::CopyConstruct<::tari::rpc::ValidatorNodeRegistration>(arena, *from._impl_.side_chain_feature_.validator_node_registration_);
+        } else {
+          _this->_impl_.side_chain_feature_.validator_node_registration_->MergeFrom(from._internal_validator_node_registration());
+        }
         break;
       }
       case kTemplateRegistration: {
-      _this->_internal_mutable_template_registration()->::tari::rpc::TemplateRegistration::MergeFrom(
+        if (oneof_needs_init) {
-          from._internal_template_registration());
+          _this->_impl_.side_chain_feature_.template_registration_ =
+              ::google::protobuf::Message::CopyConstruct<::tari::rpc::TemplateRegistration>(arena, *from._impl_.side_chain_feature_.template_registration_);
+        } else {
+          _this->_impl_.side_chain_feature_.template_registration_->MergeFrom(from._internal_template_registration());
+        }
         break;
       }
       case kConfidentialOutput: {
-      _this->_internal_mutable_confidential_output()->::tari::rpc::ConfidentialOutputData::MergeFrom(
+        if (oneof_needs_init) {
-          from._internal_confidential_output());
+          _this->_impl_.side_chain_feature_.confidential_output_ =
+              ::google::protobuf::Message::CopyConstruct<::tari::rpc::ConfidentialOutputData>(arena, *from._impl_.side_chain_feature_.confidential_output_);
+        } else {
+          _this->_impl_.side_chain_feature_.confidential_output_->MergeFrom(from._internal_confidential_output());
+        }
         break;
       }
-    case SIDE_CHAIN_FEATURE_NOT_SET: {
+      case SIDE_CHAIN_FEATURE_NOT_SET:
         break;
     }
   }
@@ -739,9 +756,6 @@ PROTOBUF_NOINLINE bool SideChainFeature::IsInitialized() const {
   return true;
 }
 
-::_pbi::CachedSize* SideChainFeature::AccessCachedSize() const {
-  return &_impl_._cached_size_;
-}
 void SideChainFeature::InternalSwap(SideChainFeature* PROTOBUF_RESTRICT other) {
   using std::swap;
   _internal_metadata_.InternalSwap(&other->_internal_metadata_);
@@ -750,8 +764,8 @@ void SideChainFeature::InternalSwap(SideChainFeature* PROTOBUF_RESTRICT other) {
 }
 
 ::google::protobuf::Metadata SideChainFeature::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
+  return ::_pbi::AssignDescriptors(&descriptor_table_sidechain_5ftypes_2eproto_getter,
-      &descriptor_table_sidechain_5ftypes_2eproto_getter, &descriptor_table_sidechain_5ftypes_2eproto_once,
+                                   &descriptor_table_sidechain_5ftypes_2eproto_once,
                                    file_level_metadata_sidechain_5ftypes_2eproto[0]);
 }
 // ===================================================================
@@ -761,15 +775,8 @@ class ValidatorNodeRegistration::_Internal {
   using HasBits = decltype(std::declval<ValidatorNodeRegistration>()._impl_._has_bits_);
   static constexpr ::int32_t kHasBitsOffset =
     8 * PROTOBUF_FIELD_OFFSET(ValidatorNodeRegistration, _impl_._has_bits_);
-  static const ::tari::rpc::Signature& signature(const ValidatorNodeRegistration* msg);
-  static void set_has_signature(HasBits* has_bits) {
-    (*has_bits)[0] |= 1u;
-  }
 };
 
-const ::tari::rpc::Signature& ValidatorNodeRegistration::_Internal::signature(const ValidatorNodeRegistration* msg) {
-  return *msg->_impl_.signature_;
-}
 void ValidatorNodeRegistration::clear_signature() {
   PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   if (_impl_.signature_ != nullptr) _impl_.signature_->Clear();
@@ -797,8 +804,8 @@ ValidatorNodeRegistration::ValidatorNodeRegistration(
       from._internal_metadata_);
   new (&_impl_) Impl_(internal_visibility(), arena, from._impl_);
   ::uint32_t cached_has_bits = _impl_._has_bits_[0];
-  _impl_.signature_ = (cached_has_bits & 0x00000001u)
+  _impl_.signature_ = (cached_has_bits & 0x00000001u) ? ::google::protobuf::Message::CopyConstruct<::tari::rpc::Signature>(
-                ? CreateMaybeMessage<::tari::rpc::Signature>(arena, *from._impl_.signature_)
+                              arena, *from._impl_.signature_)
                         : nullptr;
 
   // @@protoc_insertion_point(copy_constructor:tari.rpc.ValidatorNodeRegistration)
@@ -825,6 +832,20 @@ inline void ValidatorNodeRegistration::SharedDtor() {
   _impl_.~Impl_();
 }
 
+const ::google::protobuf::MessageLite::ClassData*
+ValidatorNodeRegistration::GetClassData() const {
+  PROTOBUF_CONSTINIT static const ::google::protobuf::MessageLite::
+      ClassDataFull _data_ = {
+          {
+              nullptr,  // OnDemandRegisterArenaDtor
+              PROTOBUF_FIELD_OFFSET(ValidatorNodeRegistration, _impl_._cached_size_),
+              false,
+          },
+          &ValidatorNodeRegistration::MergeImpl,
+          &ValidatorNodeRegistration::kDescriptorMethods,
+      };
+  return &_data_;
+}
 PROTOBUF_NOINLINE void ValidatorNodeRegistration::Clear() {
 // @@protoc_insertion_point(message_clear_start:tari.rpc.ValidatorNodeRegistration)
   PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
@@ -863,6 +884,9 @@ const ::_pbi::TcParseTable<1, 2, 1, 0, 2> ValidatorNodeRegistration::_table_ = {
     offsetof(decltype(_table_), aux_entries),
     &_ValidatorNodeRegistration_default_instance_._instance,
     ::_pbi::TcParser::GenericFallback,  // fallback
+    #ifdef PROTOBUF_PREFETCH_PARSE_TABLE
+    ::_pbi::TcParser::GetTable<::tari::rpc::ValidatorNodeRegistration>(),  // to_prefetch
+    #endif  // PROTOBUF_PREFETCH_PARSE_TABLE
   }, {{
     // .tari.rpc.Signature signature = 2;
     {::_pbi::TcParser::FastMtS1,
@@ -902,8 +926,7 @@ const ::_pbi::TcParseTable<1, 2, 1, 0, 2> ValidatorNodeRegistration::_table_ = {
   // .tari.rpc.Signature signature = 2;
   if (cached_has_bits & 0x00000001u) {
     target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-        2, _Internal::signature(this),
+        2, *_impl_.signature_, _impl_.signature_->GetCachedSize(), target, stream);
-        _Internal::signature(this).GetCachedSize(), target, stream);
   }
 
   if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) {
@@ -939,17 +962,11 @@ const ::_pbi::TcParseTable<1, 2, 1, 0, 2> ValidatorNodeRegistration::_table_ = {
   return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_);
 }
 
-const ::google::protobuf::Message::ClassData ValidatorNodeRegistration::_class_data_ = {
-    ValidatorNodeRegistration::MergeImpl,
-    nullptr,  // OnDemandRegisterArenaDtor
-};
-const ::google::protobuf::Message::ClassData* ValidatorNodeRegistration::GetClassData() const {
-  return &_class_data_;
-}
 
-void ValidatorNodeRegistration::MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg) {
+void ValidatorNodeRegistration::MergeImpl(::google::protobuf::MessageLite& to_msg, const ::google::protobuf::MessageLite& from_msg) {
   auto* const _this = static_cast<ValidatorNodeRegistration*>(&to_msg);
   auto& from = static_cast<const ValidatorNodeRegistration&>(from_msg);
+  ::google::protobuf::Arena* arena = _this->GetArena();
   // @@protoc_insertion_point(class_specific_merge_from_start:tari.rpc.ValidatorNodeRegistration)
   ABSL_DCHECK_NE(&from, _this);
   ::uint32_t cached_has_bits = 0;
@@ -958,10 +975,17 @@ void ValidatorNodeRegistration::MergeImpl(::google::protobuf::Message& to_msg, c
   if (!from._internal_public_key().empty()) {
     _this->_internal_set_public_key(from._internal_public_key());
   }
-  if ((from._impl_._has_bits_[0] & 0x00000001u) != 0) {
+  cached_has_bits = from._impl_._has_bits_[0];
-    _this->_internal_mutable_signature()->::tari::rpc::Signature::MergeFrom(
+  if (cached_has_bits & 0x00000001u) {
-        from._internal_signature());
+    ABSL_DCHECK(from._impl_.signature_ != nullptr);
+    if (_this->_impl_.signature_ == nullptr) {
+      _this->_impl_.signature_ =
+          ::google::protobuf::Message::CopyConstruct<::tari::rpc::Signature>(arena, *from._impl_.signature_);
+    } else {
+      _this->_impl_.signature_->MergeFrom(*from._impl_.signature_);
     }
+  }
+  _this->_impl_._has_bits_[0] |= cached_has_bits;
   _this->_internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(from._internal_metadata_);
 }
 
@@ -976,9 +1000,6 @@ PROTOBUF_NOINLINE bool ValidatorNodeRegistration::IsInitialized() const {
   return true;
 }
 
-::_pbi::CachedSize* ValidatorNodeRegistration::AccessCachedSize() const {
-  return &_impl_._cached_size_;
-}
 void ValidatorNodeRegistration::InternalSwap(ValidatorNodeRegistration* PROTOBUF_RESTRICT other) {
   using std::swap;
   auto* arena = GetArena();
@@ -990,8 +1011,8 @@ void ValidatorNodeRegistration::InternalSwap(ValidatorNodeRegistration* PROTOBUF
 }
 
 ::google::protobuf::Metadata ValidatorNodeRegistration::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
+  return ::_pbi::AssignDescriptors(&descriptor_table_sidechain_5ftypes_2eproto_getter,
-      &descriptor_table_sidechain_5ftypes_2eproto_getter, &descriptor_table_sidechain_5ftypes_2eproto_once,
+                                   &descriptor_table_sidechain_5ftypes_2eproto_once,
                                    file_level_metadata_sidechain_5ftypes_2eproto[1]);
 }
 // ===================================================================
@@ -1001,29 +1022,8 @@ class TemplateRegistration::_Internal {
   using HasBits = decltype(std::declval<TemplateRegistration>()._impl_._has_bits_);
   static constexpr ::int32_t kHasBitsOffset =
     8 * PROTOBUF_FIELD_OFFSET(TemplateRegistration, _impl_._has_bits_);
-  static const ::tari::rpc::Signature& author_signature(const TemplateRegistration* msg);
-  static void set_has_author_signature(HasBits* has_bits) {
-    (*has_bits)[0] |= 1u;
-  }
-  static const ::tari::rpc::TemplateType& template_type(const TemplateRegistration* msg);
-  static void set_has_template_type(HasBits* has_bits) {
-    (*has_bits)[0] |= 2u;
-  }
-  static const ::tari::rpc::BuildInfo& build_info(const TemplateRegistration* msg);
-  static void set_has_build_info(HasBits* has_bits) {
-    (*has_bits)[0] |= 4u;
-  }
 };
 
-const ::tari::rpc::Signature& TemplateRegistration::_Internal::author_signature(const TemplateRegistration* msg) {
-  return *msg->_impl_.author_signature_;
-}
-const ::tari::rpc::TemplateType& TemplateRegistration::_Internal::template_type(const TemplateRegistration* msg) {
-  return *msg->_impl_.template_type_;
-}
-const ::tari::rpc::BuildInfo& TemplateRegistration::_Internal::build_info(const TemplateRegistration* msg) {
-  return *msg->_impl_.build_info_;
-}
 void TemplateRegistration::clear_author_signature() {
   PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   if (_impl_.author_signature_ != nullptr) _impl_.author_signature_->Clear();
@@ -1054,14 +1054,14 @@ TemplateRegistration::TemplateRegistration(
       from._internal_metadata_);
   new (&_impl_) Impl_(internal_visibility(), arena, from._impl_);
   ::uint32_t cached_has_bits = _impl_._has_bits_[0];
-  _impl_.author_signature_ = (cached_has_bits & 0x00000001u)
+  _impl_.author_signature_ = (cached_has_bits & 0x00000001u) ? ::google::protobuf::Message::CopyConstruct<::tari::rpc::Signature>(
-                ? CreateMaybeMessage<::tari::rpc::Signature>(arena, *from._impl_.author_signature_)
+                              arena, *from._impl_.author_signature_)
                         : nullptr;
-  _impl_.template_type_ = (cached_has_bits & 0x00000002u)
+  _impl_.template_type_ = (cached_has_bits & 0x00000002u) ? ::google::protobuf::Message::CopyConstruct<::tari::rpc::TemplateType>(
-                ? CreateMaybeMessage<::tari::rpc::TemplateType>(arena, *from._impl_.template_type_)
+                              arena, *from._impl_.template_type_)
                         : nullptr;
-  _impl_.build_info_ = (cached_has_bits & 0x00000004u)
+  _impl_.build_info_ = (cached_has_bits & 0x00000004u) ? ::google::protobuf::Message::CopyConstruct<::tari::rpc::BuildInfo>(
-                ? CreateMaybeMessage<::tari::rpc::BuildInfo>(arena, *from._impl_.build_info_)
+                              arena, *from._impl_.build_info_)
                         : nullptr;
   _impl_.template_version_ = from._impl_.template_version_;
 
@@ -1102,6 +1102,20 @@ inline void TemplateRegistration::SharedDtor() {
   _impl_.~Impl_();
 }
 
+const ::google::protobuf::MessageLite::ClassData*
+TemplateRegistration::GetClassData() const {
+  PROTOBUF_CONSTINIT static const ::google::protobuf::MessageLite::
+      ClassDataFull _data_ = {
+          {
+              nullptr,  // OnDemandRegisterArenaDtor
+              PROTOBUF_FIELD_OFFSET(TemplateRegistration, _impl_._cached_size_),
+              false,
+          },
+          &TemplateRegistration::MergeImpl,
+          &TemplateRegistration::kDescriptorMethods,
+      };
+  return &_data_;
+}
 PROTOBUF_NOINLINE void TemplateRegistration::Clear() {
 // @@protoc_insertion_point(message_clear_start:tari.rpc.TemplateRegistration)
   PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
@@ -1154,6 +1168,9 @@ const ::_pbi::TcParseTable<3, 8, 3, 69, 2> TemplateRegistration::_table_ = {
     offsetof(decltype(_table_), aux_entries),
     &_TemplateRegistration_default_instance_._instance,
     ::_pbi::TcParser::GenericFallback,  // fallback
+    #ifdef PROTOBUF_PREFETCH_PARSE_TABLE
+    ::_pbi::TcParser::GetTable<::tari::rpc::TemplateRegistration>(),  // to_prefetch
+    #endif  // PROTOBUF_PREFETCH_PARSE_TABLE
   }, {{
     // string binary_url = 8;
     {::_pbi::TcParser::FastUS1,
@@ -1235,8 +1252,7 @@ const ::_pbi::TcParseTable<3, 8, 3, 69, 2> TemplateRegistration::_table_ = {
   // .tari.rpc.Signature author_signature = 2;
   if (cached_has_bits & 0x00000001u) {
     target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-        2, _Internal::author_signature(this),
+        2, *_impl_.author_signature_, _impl_.author_signature_->GetCachedSize(), target, stream);
-        _Internal::author_signature(this).GetCachedSize(), target, stream);
   }
 
   // string template_name = 3;
@@ -1257,15 +1273,13 @@ const ::_pbi::TcParseTable<3, 8, 3, 69, 2> TemplateRegistration::_table_ = {
   // .tari.rpc.TemplateType template_type = 5;
   if (cached_has_bits & 0x00000002u) {
     target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-        5, _Internal::template_type(this),
+        5, *_impl_.template_type_, _impl_.template_type_->GetCachedSize(), target, stream);
-        _Internal::template_type(this).GetCachedSize(), target, stream);
   }
 
   // .tari.rpc.BuildInfo build_info = 6;
   if (cached_has_bits & 0x00000004u) {
     target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-        6, _Internal::build_info(this),
+        6, *_impl_.build_info_, _impl_.build_info_->GetCachedSize(), target, stream);
-        _Internal::build_info(this).GetCachedSize(), target, stream);
   }
 
   // bytes binary_sha = 7;
@@ -1353,17 +1367,11 @@ const ::_pbi::TcParseTable<3, 8, 3, 69, 2> TemplateRegistration::_table_ = {
   return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_);
 }
 
-const ::google::protobuf::Message::ClassData TemplateRegistration::_class_data_ = {
-    TemplateRegistration::MergeImpl,
-    nullptr,  // OnDemandRegisterArenaDtor
-};
-const ::google::protobuf::Message::ClassData* TemplateRegistration::GetClassData() const {
-  return &_class_data_;
-}
 
-void TemplateRegistration::MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg) {
+void TemplateRegistration::MergeImpl(::google::protobuf::MessageLite& to_msg, const ::google::protobuf::MessageLite& from_msg) {
   auto* const _this = static_cast<TemplateRegistration*>(&to_msg);
   auto& from = static_cast<const TemplateRegistration&>(from_msg);
+  ::google::protobuf::Arena* arena = _this->GetArena();
   // @@protoc_insertion_point(class_specific_merge_from_start:tari.rpc.TemplateRegistration)
   ABSL_DCHECK_NE(&from, _this);
   ::uint32_t cached_has_bits = 0;
@@ -1384,21 +1392,37 @@ void TemplateRegistration::MergeImpl(::google::protobuf::Message& to_msg, const
   cached_has_bits = from._impl_._has_bits_[0];
   if (cached_has_bits & 0x00000007u) {
     if (cached_has_bits & 0x00000001u) {
-      _this->_internal_mutable_author_signature()->::tari::rpc::Signature::MergeFrom(
+      ABSL_DCHECK(from._impl_.author_signature_ != nullptr);
-          from._internal_author_signature());
+      if (_this->_impl_.author_signature_ == nullptr) {
+        _this->_impl_.author_signature_ =
+            ::google::protobuf::Message::CopyConstruct<::tari::rpc::Signature>(arena, *from._impl_.author_signature_);
+      } else {
+        _this->_impl_.author_signature_->MergeFrom(*from._impl_.author_signature_);
+      }
     }
     if (cached_has_bits & 0x00000002u) {
-      _this->_internal_mutable_template_type()->::tari::rpc::TemplateType::MergeFrom(
+      ABSL_DCHECK(from._impl_.template_type_ != nullptr);
-          from._internal_template_type());
+      if (_this->_impl_.template_type_ == nullptr) {
+        _this->_impl_.template_type_ =
+            ::google::protobuf::Message::CopyConstruct<::tari::rpc::TemplateType>(arena, *from._impl_.template_type_);
+      } else {
+        _this->_impl_.template_type_->MergeFrom(*from._impl_.template_type_);
+      }
     }
     if (cached_has_bits & 0x00000004u) {
-      _this->_internal_mutable_build_info()->::tari::rpc::BuildInfo::MergeFrom(
+      ABSL_DCHECK(from._impl_.build_info_ != nullptr);
-          from._internal_build_info());
+      if (_this->_impl_.build_info_ == nullptr) {
+        _this->_impl_.build_info_ =
+            ::google::protobuf::Message::CopyConstruct<::tari::rpc::BuildInfo>(arena, *from._impl_.build_info_);
+      } else {
+        _this->_impl_.build_info_->MergeFrom(*from._impl_.build_info_);
+      }
     }
   }
   if (from._internal_template_version() != 0) {
-    _this->_internal_set_template_version(from._internal_template_version());
+    _this->_impl_.template_version_ = from._impl_.template_version_;
   }
+  _this->_impl_._has_bits_[0] |= cached_has_bits;
   _this->_internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(from._internal_metadata_);
 }
 
@@ -1413,9 +1437,6 @@ PROTOBUF_NOINLINE bool TemplateRegistration::IsInitialized() const {
   return true;
 }
 
-::_pbi::CachedSize* TemplateRegistration::AccessCachedSize() const {
-  return &_impl_._cached_size_;
-}
 void TemplateRegistration::InternalSwap(TemplateRegistration* PROTOBUF_RESTRICT other) {
   using std::swap;
   auto* arena = GetArena();
@@ -1435,8 +1456,8 @@ void TemplateRegistration::InternalSwap(TemplateRegistration* PROTOBUF_RESTRICT
 }
 
 ::google::protobuf::Metadata TemplateRegistration::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
+  return ::_pbi::AssignDescriptors(&descriptor_table_sidechain_5ftypes_2eproto_getter,
-      &descriptor_table_sidechain_5ftypes_2eproto_getter, &descriptor_table_sidechain_5ftypes_2eproto_once,
+                                   &descriptor_table_sidechain_5ftypes_2eproto_once,
                                    file_level_metadata_sidechain_5ftypes_2eproto[2]);
 }
 // ===================================================================
@@ -1488,6 +1509,20 @@ inline void ConfidentialOutputData::SharedDtor() {
   _impl_.~Impl_();
 }
 
+const ::google::protobuf::MessageLite::ClassData*
+ConfidentialOutputData::GetClassData() const {
+  PROTOBUF_CONSTINIT static const ::google::protobuf::MessageLite::
+      ClassDataFull _data_ = {
+          {
+              nullptr,  // OnDemandRegisterArenaDtor
+              PROTOBUF_FIELD_OFFSET(ConfidentialOutputData, _impl_._cached_size_),
+              false,
+          },
+          &ConfidentialOutputData::MergeImpl,
+          &ConfidentialOutputData::kDescriptorMethods,
+      };
+  return &_data_;
+}
 PROTOBUF_NOINLINE void ConfidentialOutputData::Clear() {
 // @@protoc_insertion_point(message_clear_start:tari.rpc.ConfidentialOutputData)
   PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
@@ -1520,6 +1555,9 @@ const ::_pbi::TcParseTable<0, 1, 0, 0, 2> ConfidentialOutputData::_table_ = {
     offsetof(decltype(_table_), field_names),  // no aux_entries
     &_ConfidentialOutputData_default_instance_._instance,
     ::_pbi::TcParser::GenericFallback,  // fallback
+    #ifdef PROTOBUF_PREFETCH_PARSE_TABLE
+    ::_pbi::TcParser::GetTable<::tari::rpc::ConfidentialOutputData>(),  // to_prefetch
+    #endif  // PROTOBUF_PREFETCH_PARSE_TABLE
   }, {{
     // bytes claim_public_key = 1;
     {::_pbi::TcParser::FastBS1,
@@ -1575,15 +1613,8 @@ const ::_pbi::TcParseTable<0, 1, 0, 0, 2> ConfidentialOutputData::_table_ = {
   return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_);
 }
 
-const ::google::protobuf::Message::ClassData ConfidentialOutputData::_class_data_ = {
-    ConfidentialOutputData::MergeImpl,
-    nullptr,  // OnDemandRegisterArenaDtor
-};
-const ::google::protobuf::Message::ClassData* ConfidentialOutputData::GetClassData() const {
-  return &_class_data_;
-}
 
-void ConfidentialOutputData::MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg) {
+void ConfidentialOutputData::MergeImpl(::google::protobuf::MessageLite& to_msg, const ::google::protobuf::MessageLite& from_msg) {
   auto* const _this = static_cast<ConfidentialOutputData*>(&to_msg);
   auto& from = static_cast<const ConfidentialOutputData&>(from_msg);
   // @@protoc_insertion_point(class_specific_merge_from_start:tari.rpc.ConfidentialOutputData)
@@ -1608,9 +1639,6 @@ PROTOBUF_NOINLINE bool ConfidentialOutputData::IsInitialized() const {
   return true;
 }
 
-::_pbi::CachedSize* ConfidentialOutputData::AccessCachedSize() const {
-  return &_impl_._cached_size_;
-}
 void ConfidentialOutputData::InternalSwap(ConfidentialOutputData* PROTOBUF_RESTRICT other) {
   using std::swap;
   auto* arena = GetArena();
@@ -1620,8 +1648,8 @@ void ConfidentialOutputData::InternalSwap(ConfidentialOutputData* PROTOBUF_RESTR
 }
 
 ::google::protobuf::Metadata ConfidentialOutputData::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
+  return ::_pbi::AssignDescriptors(&descriptor_table_sidechain_5ftypes_2eproto_getter,
-      &descriptor_table_sidechain_5ftypes_2eproto_getter, &descriptor_table_sidechain_5ftypes_2eproto_once,
+                                   &descriptor_table_sidechain_5ftypes_2eproto_once,
                                    file_level_metadata_sidechain_5ftypes_2eproto[3]);
 }
 // ===================================================================
@@ -1630,20 +1658,8 @@ class TemplateType::_Internal {
  public:
   static constexpr ::int32_t kOneofCaseOffset =
     PROTOBUF_FIELD_OFFSET(::tari::rpc::TemplateType, _impl_._oneof_case_);
-  static const ::tari::rpc::WasmInfo& wasm(const TemplateType* msg);
-  static const ::tari::rpc::FlowInfo& flow(const TemplateType* msg);
-  static const ::tari::rpc::ManifestInfo& manifest(const TemplateType* msg);
 };
 
-const ::tari::rpc::WasmInfo& TemplateType::_Internal::wasm(const TemplateType* msg) {
-  return *msg->_impl_.template_type_.wasm_;
-}
-const ::tari::rpc::FlowInfo& TemplateType::_Internal::flow(const TemplateType* msg) {
-  return *msg->_impl_.template_type_.flow_;
-}
-const ::tari::rpc::ManifestInfo& TemplateType::_Internal::manifest(const TemplateType* msg) {
-  return *msg->_impl_.template_type_.manifest_;
-}
 void TemplateType::set_allocated_wasm(::tari::rpc::WasmInfo* wasm) {
   ::google::protobuf::Arena* message_arena = GetArena();
   clear_template_type();
@@ -1708,13 +1724,13 @@ TemplateType::TemplateType(
     case TEMPLATE_TYPE_NOT_SET:
       break;
       case kWasm:
-        _impl_.template_type_.wasm_ = CreateMaybeMessage<::tari::rpc::WasmInfo>(arena, *from._impl_.template_type_.wasm_);
+        _impl_.template_type_.wasm_ = ::google::protobuf::Message::CopyConstruct<::tari::rpc::WasmInfo>(arena, *from._impl_.template_type_.wasm_);
         break;
       case kFlow:
-        _impl_.template_type_.flow_ = CreateMaybeMessage<::tari::rpc::FlowInfo>(arena, *from._impl_.template_type_.flow_);
+        _impl_.template_type_.flow_ = ::google::protobuf::Message::CopyConstruct<::tari::rpc::FlowInfo>(arena, *from._impl_.template_type_.flow_);
         break;
       case kManifest:
-        _impl_.template_type_.manifest_ = CreateMaybeMessage<::tari::rpc::ManifestInfo>(arena, *from._impl_.template_type_.manifest_);
+        _impl_.template_type_.manifest_ = ::google::protobuf::Message::CopyConstruct<::tari::rpc::ManifestInfo>(arena, *from._impl_.template_type_.manifest_);
         break;
   }
 
@@ -1773,6 +1789,20 @@ void TemplateType::clear_template_type() {
 }
 
 
+const ::google::protobuf::MessageLite::ClassData*
+TemplateType::GetClassData() const {
+  PROTOBUF_CONSTINIT static const ::google::protobuf::MessageLite::
+      ClassDataFull _data_ = {
+          {
+              nullptr,  // OnDemandRegisterArenaDtor
+              PROTOBUF_FIELD_OFFSET(TemplateType, _impl_._cached_size_),
+              false,
+          },
+          &TemplateType::MergeImpl,
+          &TemplateType::kDescriptorMethods,
+      };
+  return &_data_;
+}
 PROTOBUF_NOINLINE void TemplateType::Clear() {
 // @@protoc_insertion_point(message_clear_start:tari.rpc.TemplateType)
   PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
@@ -1805,6 +1835,9 @@ const ::_pbi::TcParseTable<0, 3, 3, 0, 2> TemplateType::_table_ = {
     offsetof(decltype(_table_), aux_entries),
     &_TemplateType_default_instance_._instance,
     ::_pbi::TcParser::GenericFallback,  // fallback
+    #ifdef PROTOBUF_PREFETCH_PARSE_TABLE
+    ::_pbi::TcParser::GetTable<::tari::rpc::TemplateType>(),  // to_prefetch
+    #endif  // PROTOBUF_PREFETCH_PARSE_TABLE
   }, {{
     {::_pbi::TcParser::MiniParse, {}},
   }}, {{
@@ -1837,20 +1870,17 @@ const ::_pbi::TcParseTable<0, 3, 3, 0, 2> TemplateType::_table_ = {
   switch (template_type_case()) {
     case kWasm: {
       target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-          1, _Internal::wasm(this),
+          1, *_impl_.template_type_.wasm_, _impl_.template_type_.wasm_->GetCachedSize(), target, stream);
-          _Internal::wasm(this).GetCachedSize(), target, stream);
       break;
     }
     case kFlow: {
       target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-          2, _Internal::flow(this),
+          2, *_impl_.template_type_.flow_, _impl_.template_type_.flow_->GetCachedSize(), target, stream);
-          _Internal::flow(this).GetCachedSize(), target, stream);
       break;
     }
     case kManifest: {
       target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-          3, _Internal::manifest(this),
+          3, *_impl_.template_type_.manifest_, _impl_.template_type_.manifest_->GetCachedSize(), target, stream);
-          _Internal::manifest(this).GetCachedSize(), target, stream);
       break;
     }
     default:
@@ -1899,39 +1929,55 @@ const ::_pbi::TcParseTable<0, 3, 3, 0, 2> TemplateType::_table_ = {
   return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_);
 }
 
-const ::google::protobuf::Message::ClassData TemplateType::_class_data_ = {
-    TemplateType::MergeImpl,
-    nullptr,  // OnDemandRegisterArenaDtor
-};
-const ::google::protobuf::Message::ClassData* TemplateType::GetClassData() const {
-  return &_class_data_;
-}
 
-void TemplateType::MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg) {
+void TemplateType::MergeImpl(::google::protobuf::MessageLite& to_msg, const ::google::protobuf::MessageLite& from_msg) {
   auto* const _this = static_cast<TemplateType*>(&to_msg);
   auto& from = static_cast<const TemplateType&>(from_msg);
+  ::google::protobuf::Arena* arena = _this->GetArena();
   // @@protoc_insertion_point(class_specific_merge_from_start:tari.rpc.TemplateType)
   ABSL_DCHECK_NE(&from, _this);
   ::uint32_t cached_has_bits = 0;
   (void) cached_has_bits;
 
-  switch (from.template_type_case()) {
+  if (const uint32_t oneof_from_case = from._impl_._oneof_case_[0]) {
+    const uint32_t oneof_to_case = _this->_impl_._oneof_case_[0];
+    const bool oneof_needs_init = oneof_to_case != oneof_from_case;
+    if (oneof_needs_init) {
+      if (oneof_to_case != 0) {
+        _this->clear_template_type();
+      }
+      _this->_impl_._oneof_case_[0] = oneof_from_case;
+    }
+
+    switch (oneof_from_case) {
       case kWasm: {
-      _this->_internal_mutable_wasm()->::tari::rpc::WasmInfo::MergeFrom(
+        if (oneof_needs_init) {
-          from._internal_wasm());
+          _this->_impl_.template_type_.wasm_ =
+              ::google::protobuf::Message::CopyConstruct<::tari::rpc::WasmInfo>(arena, *from._impl_.template_type_.wasm_);
+        } else {
+          _this->_impl_.template_type_.wasm_->MergeFrom(from._internal_wasm());
+        }
         break;
       }
       case kFlow: {
-      _this->_internal_mutable_flow()->::tari::rpc::FlowInfo::MergeFrom(
+        if (oneof_needs_init) {
-          from._internal_flow());
+          _this->_impl_.template_type_.flow_ =
+              ::google::protobuf::Message::CopyConstruct<::tari::rpc::FlowInfo>(arena, *from._impl_.template_type_.flow_);
+        } else {
+          _this->_impl_.template_type_.flow_->MergeFrom(from._internal_flow());
+        }
         break;
       }
       case kManifest: {
-      _this->_internal_mutable_manifest()->::tari::rpc::ManifestInfo::MergeFrom(
+        if (oneof_needs_init) {
-          from._internal_manifest());
+          _this->_impl_.template_type_.manifest_ =
+              ::google::protobuf::Message::CopyConstruct<::tari::rpc::ManifestInfo>(arena, *from._impl_.template_type_.manifest_);
+        } else {
+          _this->_impl_.template_type_.manifest_->MergeFrom(from._internal_manifest());
+        }
         break;
       }
-    case TEMPLATE_TYPE_NOT_SET: {
+      case TEMPLATE_TYPE_NOT_SET:
         break;
     }
   }
@@ -1949,9 +1995,6 @@ PROTOBUF_NOINLINE bool TemplateType::IsInitialized() const {
   return true;
 }
 
-::_pbi::CachedSize* TemplateType::AccessCachedSize() const {
-  return &_impl_._cached_size_;
-}
 void TemplateType::InternalSwap(TemplateType* PROTOBUF_RESTRICT other) {
   using std::swap;
   _internal_metadata_.InternalSwap(&other->_internal_metadata_);
@@ -1960,8 +2003,8 @@ void TemplateType::InternalSwap(TemplateType* PROTOBUF_RESTRICT other) {
 }
 
 ::google::protobuf::Metadata TemplateType::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
+  return ::_pbi::AssignDescriptors(&descriptor_table_sidechain_5ftypes_2eproto_getter,
-      &descriptor_table_sidechain_5ftypes_2eproto_getter, &descriptor_table_sidechain_5ftypes_2eproto_once,
+                                   &descriptor_table_sidechain_5ftypes_2eproto_once,
                                    file_level_metadata_sidechain_5ftypes_2eproto[4]);
 }
 // ===================================================================
@@ -1999,6 +2042,20 @@ inline void WasmInfo::SharedDtor() {
   _impl_.~Impl_();
 }
 
+const ::google::protobuf::MessageLite::ClassData*
+WasmInfo::GetClassData() const {
+  PROTOBUF_CONSTINIT static const ::google::protobuf::MessageLite::
+      ClassDataFull _data_ = {
+          {
+              nullptr,  // OnDemandRegisterArenaDtor
+              PROTOBUF_FIELD_OFFSET(WasmInfo, _impl_._cached_size_),
+              false,
+          },
+          &WasmInfo::MergeImpl,
+          &WasmInfo::kDescriptorMethods,
+      };
+  return &_data_;
+}
 PROTOBUF_NOINLINE void WasmInfo::Clear() {
 // @@protoc_insertion_point(message_clear_start:tari.rpc.WasmInfo)
   PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
@@ -2031,6 +2088,9 @@ const ::_pbi::TcParseTable<0, 1, 0, 0, 2> WasmInfo::_table_ = {
     offsetof(decltype(_table_), field_names),  // no aux_entries
     &_WasmInfo_default_instance_._instance,
     ::_pbi::TcParser::GenericFallback,  // fallback
+    #ifdef PROTOBUF_PREFETCH_PARSE_TABLE
+    ::_pbi::TcParser::GetTable<::tari::rpc::WasmInfo>(),  // to_prefetch
+    #endif  // PROTOBUF_PREFETCH_PARSE_TABLE
   }, {{
     // uint32 abi_version = 1;
     {::_pbi::TcParser::SingularVarintNoZag1<::uint32_t, offsetof(WasmInfo, _impl_.abi_version_), 63>(),
@@ -2087,15 +2147,8 @@ const ::_pbi::TcParseTable<0, 1, 0, 0, 2> WasmInfo::_table_ = {
   return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_);
 }
 
-const ::google::protobuf::Message::ClassData WasmInfo::_class_data_ = {
-    WasmInfo::MergeImpl,
-    nullptr,  // OnDemandRegisterArenaDtor
-};
-const ::google::protobuf::Message::ClassData* WasmInfo::GetClassData() const {
-  return &_class_data_;
-}
 
-void WasmInfo::MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg) {
+void WasmInfo::MergeImpl(::google::protobuf::MessageLite& to_msg, const ::google::protobuf::MessageLite& from_msg) {
   auto* const _this = static_cast<WasmInfo*>(&to_msg);
   auto& from = static_cast<const WasmInfo&>(from_msg);
   // @@protoc_insertion_point(class_specific_merge_from_start:tari.rpc.WasmInfo)
@@ -2104,7 +2157,7 @@ void WasmInfo::MergeImpl(::google::protobuf::Message& to_msg, const ::google::pr
   (void) cached_has_bits;
 
   if (from._internal_abi_version() != 0) {
-    _this->_internal_set_abi_version(from._internal_abi_version());
+    _this->_impl_.abi_version_ = from._impl_.abi_version_;
   }
   _this->_internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(from._internal_metadata_);
 }
@@ -2120,9 +2173,6 @@ PROTOBUF_NOINLINE bool WasmInfo::IsInitialized() const {
   return true;
 }
 
-::_pbi::CachedSize* WasmInfo::AccessCachedSize() const {
-  return &_impl_._cached_size_;
-}
 void WasmInfo::InternalSwap(WasmInfo* PROTOBUF_RESTRICT other) {
   using std::swap;
   _internal_metadata_.InternalSwap(&other->_internal_metadata_);
@@ -2130,8 +2180,8 @@ void WasmInfo::InternalSwap(WasmInfo* PROTOBUF_RESTRICT other) {
 }
 
 ::google::protobuf::Metadata WasmInfo::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
+  return ::_pbi::AssignDescriptors(&descriptor_table_sidechain_5ftypes_2eproto_getter,
-      &descriptor_table_sidechain_5ftypes_2eproto_getter, &descriptor_table_sidechain_5ftypes_2eproto_once,
+                                   &descriptor_table_sidechain_5ftypes_2eproto_once,
                                    file_level_metadata_sidechain_5ftypes_2eproto[5]);
 }
 // ===================================================================
@@ -2165,8 +2215,8 @@ FlowInfo::FlowInfo(
 
 
 ::google::protobuf::Metadata FlowInfo::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
+  return ::_pbi::AssignDescriptors(&descriptor_table_sidechain_5ftypes_2eproto_getter,
-      &descriptor_table_sidechain_5ftypes_2eproto_getter, &descriptor_table_sidechain_5ftypes_2eproto_once,
+                                   &descriptor_table_sidechain_5ftypes_2eproto_once,
                                    file_level_metadata_sidechain_5ftypes_2eproto[6]);
 }
 // ===================================================================
@@ -2200,8 +2250,8 @@ ManifestInfo::ManifestInfo(
 
 
 ::google::protobuf::Metadata ManifestInfo::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
+  return ::_pbi::AssignDescriptors(&descriptor_table_sidechain_5ftypes_2eproto_getter,
-      &descriptor_table_sidechain_5ftypes_2eproto_getter, &descriptor_table_sidechain_5ftypes_2eproto_once,
+                                   &descriptor_table_sidechain_5ftypes_2eproto_once,
                                    file_level_metadata_sidechain_5ftypes_2eproto[7]);
 }
 // ===================================================================
@@ -2256,6 +2306,20 @@ inline void BuildInfo::SharedDtor() {
   _impl_.~Impl_();
 }
 
+const ::google::protobuf::MessageLite::ClassData*
+BuildInfo::GetClassData() const {
+  PROTOBUF_CONSTINIT static const ::google::protobuf::MessageLite::
+      ClassDataFull _data_ = {
+          {
+              nullptr,  // OnDemandRegisterArenaDtor
+              PROTOBUF_FIELD_OFFSET(BuildInfo, _impl_._cached_size_),
+              false,
+          },
+          &BuildInfo::MergeImpl,
+          &BuildInfo::kDescriptorMethods,
+      };
+  return &_data_;
+}
 PROTOBUF_NOINLINE void BuildInfo::Clear() {
 // @@protoc_insertion_point(message_clear_start:tari.rpc.BuildInfo)
   PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
@@ -2289,6 +2353,9 @@ const ::_pbi::TcParseTable<1, 2, 0, 35, 2> BuildInfo::_table_ = {
     offsetof(decltype(_table_), field_names),  // no aux_entries
     &_BuildInfo_default_instance_._instance,
     ::_pbi::TcParser::GenericFallback,  // fallback
+    #ifdef PROTOBUF_PREFETCH_PARSE_TABLE
+    ::_pbi::TcParser::GetTable<::tari::rpc::BuildInfo>(),  // to_prefetch
+    #endif  // PROTOBUF_PREFETCH_PARSE_TABLE
   }, {{
     // bytes commit_hash = 2;
     {::_pbi::TcParser::FastBS1,
@@ -2367,15 +2434,8 @@ const ::_pbi::TcParseTable<1, 2, 0, 35, 2> BuildInfo::_table_ = {
   return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_);
 }
 
-const ::google::protobuf::Message::ClassData BuildInfo::_class_data_ = {
-    BuildInfo::MergeImpl,
-    nullptr,  // OnDemandRegisterArenaDtor
-};
-const ::google::protobuf::Message::ClassData* BuildInfo::GetClassData() const {
-  return &_class_data_;
-}
 
-void BuildInfo::MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg) {
+void BuildInfo::MergeImpl(::google::protobuf::MessageLite& to_msg, const ::google::protobuf::MessageLite& from_msg) {
   auto* const _this = static_cast<BuildInfo*>(&to_msg);
   auto& from = static_cast<const BuildInfo&>(from_msg);
   // @@protoc_insertion_point(class_specific_merge_from_start:tari.rpc.BuildInfo)
@@ -2403,9 +2463,6 @@ PROTOBUF_NOINLINE bool BuildInfo::IsInitialized() const {
   return true;
 }
 
-::_pbi::CachedSize* BuildInfo::AccessCachedSize() const {
-  return &_impl_._cached_size_;
-}
 void BuildInfo::InternalSwap(BuildInfo* PROTOBUF_RESTRICT other) {
   using std::swap;
   auto* arena = GetArena();
@@ -2416,8 +2473,8 @@ void BuildInfo::InternalSwap(BuildInfo* PROTOBUF_RESTRICT other) {
 }
 
 ::google::protobuf::Metadata BuildInfo::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
+  return ::_pbi::AssignDescriptors(&descriptor_table_sidechain_5ftypes_2eproto_getter,
-      &descriptor_table_sidechain_5ftypes_2eproto_getter, &descriptor_table_sidechain_5ftypes_2eproto_once,
+                                   &descriptor_table_sidechain_5ftypes_2eproto_once,
                                    file_level_metadata_sidechain_5ftypes_2eproto[8]);
 }
 // @@protoc_insertion_point(namespace_scope)
@@ -2428,4 +2485,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_sidechain_5ftypes_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')