From b9e415c6592c80deac7b14918073d1bc4b254c14 Mon Sep 17 00:00:00 2001 From: SChernykh <15806605+SChernykh@users.noreply.github.com> Date: Sun, 25 May 2025 10:07:28 +0200 Subject: [PATCH] Updated Tari gRPC proto files --- external/src/Tari/proto/gRPC/base_node.pb.cc | 1104 +++++++++++++----- external/src/Tari/proto/gRPC/base_node.pb.h | 710 +++++++++-- external/src/Tari/proto/gRPC/base_node.proto | 25 +- external/src/Tari/proto/gRPC/block.pb.cc | 41 +- external/src/Tari/proto/gRPC/block.pb.h | 12 +- external/src/Tari/proto/gRPC/block.proto | 3 +- src/merge_mining_client_tari.cpp | 4 +- 7 files changed, 1479 insertions(+), 420 deletions(-) diff --git a/external/src/Tari/proto/gRPC/base_node.pb.cc b/external/src/Tari/proto/gRPC/base_node.pb.cc index d88c51b..a0556ac 100644 --- a/external/src/Tari/proto/gRPC/base_node.pb.cc +++ b/external/src/Tari/proto/gRPC/base_node.pb.cc @@ -26,7 +26,8 @@ namespace rpc { inline constexpr ValueAtHeightResponse::Impl_::Impl_( ::_pbi::ConstantInitialized) noexcept - : value_{::uint64_t{0u}}, + : circulating_supply_{::uint64_t{0u}}, + spendable_supply_{::uint64_t{0u}}, height_{::uint64_t{0u}}, _cached_size_{0} {} @@ -225,8 +226,9 @@ inline constexpr NetworkDifficultyResponse::Impl_::Impl_( timestamp_{::uint64_t{0u}}, pow_algo_{::uint64_t{0u}}, sha3x_estimated_hash_rate_{::uint64_t{0u}}, - randomx_estimated_hash_rate_{::uint64_t{0u}}, + monero_randomx_estimated_hash_rate_{::uint64_t{0u}}, num_coinbases_{::uint64_t{0u}}, + tari_randomx_estimated_hash_rate_{::uint64_t{0u}}, _cached_size_{0} {} template @@ -291,6 +293,29 @@ struct MempoolStatsResponseDefaultTypeInternal { PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 MempoolStatsResponseDefaultTypeInternal _MempoolStatsResponse_default_instance_; +inline constexpr LivenessResult::Impl_::Impl_( + ::_pbi::ConstantInitialized) noexcept + : peer_node_id_( + &::google::protobuf::internal::fixed_address_empty_string, + ::_pbi::ConstantInitialized()), + discover_latency_{::uint64_t{0u}}, + ping_latency_{::uint64_t{0u}}, + _cached_size_{0} {} + +template +PROTOBUF_CONSTEXPR LivenessResult::LivenessResult(::_pbi::ConstantInitialized) + : _impl_(::_pbi::ConstantInitialized()) {} +struct LivenessResultDefaultTypeInternal { + PROTOBUF_CONSTEXPR LivenessResultDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {} + ~LivenessResultDefaultTypeInternal() {} + union { + LivenessResult _instance; + }; +}; + +PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT + PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 LivenessResultDefaultTypeInternal _LivenessResult_default_instance_; + inline constexpr ListHeadersRequest::Impl_::Impl_( ::_pbi::ConstantInitialized) noexcept : from_height_{::uint64_t{0u}}, @@ -916,13 +941,16 @@ PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT inline constexpr GetNetworkStateResponse::Impl_::Impl_( ::_pbi::ConstantInitialized) noexcept : _cached_size_{0}, + liveness_results_{}, metadata_{nullptr}, base_node_state_{static_cast< ::tari::rpc::BaseNodeState >(0)}, initial_sync_achieved_{false}, failed_checkpoints_{false}, reward_{::uint64_t{0u}}, sha3x_estimated_hash_rate_{::uint64_t{0u}}, - randomx_estimated_hash_rate_{::uint64_t{0u}} {} + monero_randomx_estimated_hash_rate_{::uint64_t{0u}}, + num_connections_{::uint64_t{0u}}, + tari_randomx_estimated_hash_rate_{::uint64_t{0u}} {} template PROTOBUF_CONSTEXPR GetNetworkStateResponse::GetNetworkStateResponse(::_pbi::ConstantInitialized) @@ -1218,6 +1246,9 @@ inline constexpr GetNewBlockResult::Impl_::Impl_( tari_unique_id_( &::google::protobuf::internal::fixed_address_empty_string, ::_pbi::ConstantInitialized()), + vm_key_( + &::google::protobuf::internal::fixed_address_empty_string, + ::_pbi::ConstantInitialized()), block_{nullptr}, miner_data_{nullptr} {} @@ -1274,7 +1305,7 @@ PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 GetBlocksResponseDefaultTypeInternal _GetBlocksResponse_default_instance_; } // namespace rpc } // namespace tari -static ::_pb::Metadata file_level_metadata_base_5fnode_2eproto[57]; +static ::_pb::Metadata file_level_metadata_base_5fnode_2eproto[58]; static const ::_pb::EnumDescriptor* file_level_enum_descriptors_base_5fnode_2eproto[6]; static constexpr const ::_pb::ServiceDescriptor** file_level_service_descriptors_base_5fnode_2eproto = nullptr; @@ -1490,7 +1521,8 @@ const ::uint32_t PROTOBUF_FIELD_OFFSET(::tari::rpc::NetworkDifficultyResponse, _impl_.timestamp_), PROTOBUF_FIELD_OFFSET(::tari::rpc::NetworkDifficultyResponse, _impl_.pow_algo_), PROTOBUF_FIELD_OFFSET(::tari::rpc::NetworkDifficultyResponse, _impl_.sha3x_estimated_hash_rate_), - PROTOBUF_FIELD_OFFSET(::tari::rpc::NetworkDifficultyResponse, _impl_.randomx_estimated_hash_rate_), + PROTOBUF_FIELD_OFFSET(::tari::rpc::NetworkDifficultyResponse, _impl_.monero_randomx_estimated_hash_rate_), + PROTOBUF_FIELD_OFFSET(::tari::rpc::NetworkDifficultyResponse, _impl_.tari_randomx_estimated_hash_rate_), PROTOBUF_FIELD_OFFSET(::tari::rpc::NetworkDifficultyResponse, _impl_.num_coinbases_), PROTOBUF_FIELD_OFFSET(::tari::rpc::NetworkDifficultyResponse, _impl_.coinbase_extras_), ~0u, // no _has_bits_ @@ -1501,7 +1533,8 @@ const ::uint32_t ~0u, // no _inlined_string_donated_ ~0u, // no _split_ ~0u, // no sizeof(Split) - PROTOBUF_FIELD_OFFSET(::tari::rpc::ValueAtHeightResponse, _impl_.value_), + PROTOBUF_FIELD_OFFSET(::tari::rpc::ValueAtHeightResponse, _impl_.circulating_supply_), + PROTOBUF_FIELD_OFFSET(::tari::rpc::ValueAtHeightResponse, _impl_.spendable_supply_), PROTOBUF_FIELD_OFFSET(::tari::rpc::ValueAtHeightResponse, _impl_.height_), ~0u, // no _has_bits_ PROTOBUF_FIELD_OFFSET(::tari::rpc::IntegerValue, _internal_metadata_), @@ -1671,11 +1704,13 @@ const ::uint32_t PROTOBUF_FIELD_OFFSET(::tari::rpc::GetNewBlockResult, _impl_.merge_mining_hash_), PROTOBUF_FIELD_OFFSET(::tari::rpc::GetNewBlockResult, _impl_.tari_unique_id_), PROTOBUF_FIELD_OFFSET(::tari::rpc::GetNewBlockResult, _impl_.miner_data_), + PROTOBUF_FIELD_OFFSET(::tari::rpc::GetNewBlockResult, _impl_.vm_key_), ~0u, 0, ~0u, ~0u, 1, + ~0u, ~0u, // no _has_bits_ PROTOBUF_FIELD_OFFSET(::tari::rpc::GetNewBlockBlobResult, _internal_metadata_), ~0u, // no _extensions_ @@ -1944,7 +1979,10 @@ const ::uint32_t PROTOBUF_FIELD_OFFSET(::tari::rpc::GetNetworkStateResponse, _impl_.failed_checkpoints_), PROTOBUF_FIELD_OFFSET(::tari::rpc::GetNetworkStateResponse, _impl_.reward_), PROTOBUF_FIELD_OFFSET(::tari::rpc::GetNetworkStateResponse, _impl_.sha3x_estimated_hash_rate_), - PROTOBUF_FIELD_OFFSET(::tari::rpc::GetNetworkStateResponse, _impl_.randomx_estimated_hash_rate_), + PROTOBUF_FIELD_OFFSET(::tari::rpc::GetNetworkStateResponse, _impl_.monero_randomx_estimated_hash_rate_), + PROTOBUF_FIELD_OFFSET(::tari::rpc::GetNetworkStateResponse, _impl_.tari_randomx_estimated_hash_rate_), + PROTOBUF_FIELD_OFFSET(::tari::rpc::GetNetworkStateResponse, _impl_.num_connections_), + PROTOBUF_FIELD_OFFSET(::tari::rpc::GetNetworkStateResponse, _impl_.liveness_results_), 0, ~0u, ~0u, @@ -1952,6 +1990,20 @@ const ::uint32_t ~0u, ~0u, ~0u, + ~0u, + ~0u, + ~0u, + ~0u, // no _has_bits_ + PROTOBUF_FIELD_OFFSET(::tari::rpc::LivenessResult, _internal_metadata_), + ~0u, // no _extensions_ + ~0u, // no _oneof_case_ + ~0u, // no _weak_field_map_ + ~0u, // no _inlined_string_donated_ + ~0u, // no _split_ + ~0u, // no sizeof(Split) + PROTOBUF_FIELD_OFFSET(::tari::rpc::LivenessResult, _impl_.peer_node_id_), + PROTOBUF_FIELD_OFFSET(::tari::rpc::LivenessResult, _impl_.discover_latency_), + PROTOBUF_FIELD_OFFSET(::tari::rpc::LivenessResult, _impl_.ping_latency_), }; static const ::_pbi::MigrationSchema @@ -1971,48 +2023,49 @@ static const ::_pbi::MigrationSchema {170, 180, -1, sizeof(::tari::rpc::GetNewBlockWithCoinbasesRequest)}, {182, -1, -1, sizeof(::tari::rpc::NewBlockCoinbase)}, {195, -1, -1, sizeof(::tari::rpc::NetworkDifficultyResponse)}, - {212, -1, -1, sizeof(::tari::rpc::ValueAtHeightResponse)}, - {222, -1, -1, sizeof(::tari::rpc::IntegerValue)}, - {231, -1, -1, sizeof(::tari::rpc::StringValue)}, - {240, -1, -1, sizeof(::tari::rpc::BlockGroupRequest)}, - {252, -1, -1, sizeof(::tari::rpc::BlockGroupResponse)}, - {262, -1, -1, sizeof(::tari::rpc::HeightRequest)}, - {273, -1, -1, sizeof(::tari::rpc::BlockTimingResponse)}, - {284, -1, -1, sizeof(::tari::rpc::GetHeaderByHashRequest)}, - {293, 306, -1, sizeof(::tari::rpc::BlockHeaderResponse)}, - {311, -1, -1, sizeof(::tari::rpc::ListHeadersRequest)}, - {322, -1, -1, sizeof(::tari::rpc::GetBlocksRequest)}, - {331, -1, -1, sizeof(::tari::rpc::GetBlocksResponse)}, - {340, -1, -1, sizeof(::tari::rpc::MetaData)}, - {353, -1, -1, sizeof(::tari::rpc::SyncInfoResponse)}, - {364, -1, -1, sizeof(::tari::rpc::SyncProgressResponse)}, - {377, 390, -1, sizeof(::tari::rpc::GetNewBlockResult)}, - {395, -1, -1, sizeof(::tari::rpc::GetNewBlockBlobResult)}, - {409, 421, -1, sizeof(::tari::rpc::MinerData)}, - {425, -1, -1, sizeof(::tari::rpc::SearchKernelsRequest)}, - {434, -1, -1, sizeof(::tari::rpc::SearchUtxosRequest)}, - {443, -1, -1, sizeof(::tari::rpc::FetchMatchingUtxosRequest)}, - {452, 461, -1, sizeof(::tari::rpc::FetchMatchingUtxosResponse)}, - {462, 471, -1, sizeof(::tari::rpc::GetPeersResponse)}, - {472, -1, -1, sizeof(::tari::rpc::GetPeersRequest)}, - {480, 489, -1, sizeof(::tari::rpc::SubmitTransactionRequest)}, - {490, -1, -1, sizeof(::tari::rpc::SubmitTransactionResponse)}, - {499, -1, -1, sizeof(::tari::rpc::GetMempoolTransactionsRequest)}, - {507, 516, -1, sizeof(::tari::rpc::GetMempoolTransactionsResponse)}, - {517, 526, -1, sizeof(::tari::rpc::TransactionStateRequest)}, - {527, -1, -1, sizeof(::tari::rpc::TransactionStateResponse)}, - {536, -1, -1, sizeof(::tari::rpc::MempoolStatsResponse)}, - {547, -1, -1, sizeof(::tari::rpc::GetActiveValidatorNodesRequest)}, - {556, -1, -1, sizeof(::tari::rpc::GetActiveValidatorNodesResponse)}, - {566, -1, -1, sizeof(::tari::rpc::GetShardKeyRequest)}, - {576, -1, -1, sizeof(::tari::rpc::GetShardKeyResponse)}, - {586, -1, -1, sizeof(::tari::rpc::GetTemplateRegistrationsRequest)}, - {596, 606, -1, sizeof(::tari::rpc::GetTemplateRegistrationResponse)}, - {608, -1, -1, sizeof(::tari::rpc::BlockInfo)}, - {619, -1, -1, sizeof(::tari::rpc::GetSideChainUtxosRequest)}, - {629, 639, -1, sizeof(::tari::rpc::GetSideChainUtxosResponse)}, - {641, -1, -1, sizeof(::tari::rpc::GetNetworkStateRequest)}, - {649, 664, -1, sizeof(::tari::rpc::GetNetworkStateResponse)}, + {213, -1, -1, sizeof(::tari::rpc::ValueAtHeightResponse)}, + {224, -1, -1, sizeof(::tari::rpc::IntegerValue)}, + {233, -1, -1, sizeof(::tari::rpc::StringValue)}, + {242, -1, -1, sizeof(::tari::rpc::BlockGroupRequest)}, + {254, -1, -1, sizeof(::tari::rpc::BlockGroupResponse)}, + {264, -1, -1, sizeof(::tari::rpc::HeightRequest)}, + {275, -1, -1, sizeof(::tari::rpc::BlockTimingResponse)}, + {286, -1, -1, sizeof(::tari::rpc::GetHeaderByHashRequest)}, + {295, 308, -1, sizeof(::tari::rpc::BlockHeaderResponse)}, + {313, -1, -1, sizeof(::tari::rpc::ListHeadersRequest)}, + {324, -1, -1, sizeof(::tari::rpc::GetBlocksRequest)}, + {333, -1, -1, sizeof(::tari::rpc::GetBlocksResponse)}, + {342, -1, -1, sizeof(::tari::rpc::MetaData)}, + {355, -1, -1, sizeof(::tari::rpc::SyncInfoResponse)}, + {366, -1, -1, sizeof(::tari::rpc::SyncProgressResponse)}, + {379, 393, -1, sizeof(::tari::rpc::GetNewBlockResult)}, + {399, -1, -1, sizeof(::tari::rpc::GetNewBlockBlobResult)}, + {413, 425, -1, sizeof(::tari::rpc::MinerData)}, + {429, -1, -1, sizeof(::tari::rpc::SearchKernelsRequest)}, + {438, -1, -1, sizeof(::tari::rpc::SearchUtxosRequest)}, + {447, -1, -1, sizeof(::tari::rpc::FetchMatchingUtxosRequest)}, + {456, 465, -1, sizeof(::tari::rpc::FetchMatchingUtxosResponse)}, + {466, 475, -1, sizeof(::tari::rpc::GetPeersResponse)}, + {476, -1, -1, sizeof(::tari::rpc::GetPeersRequest)}, + {484, 493, -1, sizeof(::tari::rpc::SubmitTransactionRequest)}, + {494, -1, -1, sizeof(::tari::rpc::SubmitTransactionResponse)}, + {503, -1, -1, sizeof(::tari::rpc::GetMempoolTransactionsRequest)}, + {511, 520, -1, sizeof(::tari::rpc::GetMempoolTransactionsResponse)}, + {521, 530, -1, sizeof(::tari::rpc::TransactionStateRequest)}, + {531, -1, -1, sizeof(::tari::rpc::TransactionStateResponse)}, + {540, -1, -1, sizeof(::tari::rpc::MempoolStatsResponse)}, + {551, -1, -1, sizeof(::tari::rpc::GetActiveValidatorNodesRequest)}, + {560, -1, -1, sizeof(::tari::rpc::GetActiveValidatorNodesResponse)}, + {570, -1, -1, sizeof(::tari::rpc::GetShardKeyRequest)}, + {580, -1, -1, sizeof(::tari::rpc::GetShardKeyResponse)}, + {590, -1, -1, sizeof(::tari::rpc::GetTemplateRegistrationsRequest)}, + {600, 610, -1, sizeof(::tari::rpc::GetTemplateRegistrationResponse)}, + {612, -1, -1, sizeof(::tari::rpc::BlockInfo)}, + {623, -1, -1, sizeof(::tari::rpc::GetSideChainUtxosRequest)}, + {633, 643, -1, sizeof(::tari::rpc::GetSideChainUtxosResponse)}, + {645, -1, -1, sizeof(::tari::rpc::GetNetworkStateRequest)}, + {653, 671, -1, sizeof(::tari::rpc::GetNetworkStateResponse)}, + {681, -1, -1, sizeof(::tari::rpc::LivenessResult)}, }; static const ::_pb::Message* const file_default_instances[] = { &::tari::rpc::_GetAssetMetadataRequest_default_instance_._instance, @@ -2072,6 +2125,7 @@ static const ::_pb::Message* const file_default_instances[] = { &::tari::rpc::_GetSideChainUtxosResponse_default_instance_._instance, &::tari::rpc::_GetNetworkStateRequest_default_instance_._instance, &::tari::rpc::_GetNetworkStateResponse_default_instance_._instance, + &::tari::rpc::_LivenessResult_default_instance_._instance, }; const char descriptor_table_protodef_base_5fnode_2eproto[] ABSL_ATTRIBUTE_SECTION_VARIABLE( protodesc_cold) = { @@ -2120,186 +2174,194 @@ const char descriptor_table_protodef_base_5fnode_2eproto[] ABSL_ATTRIBUTE_SECTIO "ase\"\201\001\n\020NewBlockCoinbase\022\017\n\007address\030\001 \001(" "\t\022\r\n\005value\030\002 \001(\004\022\027\n\017stealth_payment\030\003 \001(" "\010\022\034\n\024revealed_value_proof\030\004 \001(\010\022\026\n\016coinb" - "ase_extra\030\005 \001(\014\"\371\001\n\031NetworkDifficultyRes" + "ase_extra\030\005 \001(\014\"\252\002\n\031NetworkDifficultyRes" "ponse\022\022\n\ndifficulty\030\001 \001(\004\022\033\n\023estimated_h" "ash_rate\030\002 \001(\004\022\016\n\006height\030\003 \001(\004\022\021\n\ttimest" "amp\030\004 \001(\004\022\020\n\010pow_algo\030\005 \001(\004\022!\n\031sha3x_est" - "imated_hash_rate\030\006 \001(\004\022#\n\033randomx_estima" - "ted_hash_rate\030\007 \001(\004\022\025\n\rnum_coinbases\030\010 \001" - "(\004\022\027\n\017coinbase_extras\030\t \003(\014\"6\n\025ValueAtHe" - "ightResponse\022\r\n\005value\030\001 \001(\004\022\016\n\006height\030\002 " - "\001(\004\"\035\n\014IntegerValue\022\r\n\005value\030\001 \001(\004\"\034\n\013St" - "ringValue\022\r\n\005value\030\001 \001(\t\"v\n\021BlockGroupRe" + "imated_hash_rate\030\006 \001(\004\022*\n\"monero_randomx" + "_estimated_hash_rate\030\007 \001(\004\022(\n tari_rando" + "mx_estimated_hash_rate\030\n \001(\004\022\025\n\rnum_coin" + "bases\030\010 \001(\004\022\027\n\017coinbase_extras\030\t \003(\014\"]\n\025" + "ValueAtHeightResponse\022\032\n\022circulating_sup" + "ply\030\001 \001(\004\022\030\n\020spendable_supply\030\002 \001(\004\022\016\n\006h" + "eight\030\003 \001(\004\"\035\n\014IntegerValue\022\r\n\005value\030\001 \001" + "(\004\"\034\n\013StringValue\022\r\n\005value\030\001 \001(\t\"v\n\021Bloc" + "kGroupRequest\022\020\n\010from_tip\030\001 \001(\004\022\024\n\014start" + "_height\030\002 \001(\004\022\022\n\nend_height\030\003 \001(\004\022%\n\tcal" + "c_type\030\004 \001(\0162\022.tari.rpc.CalcType\"J\n\022Bloc" + "kGroupResponse\022\r\n\005value\030\001 \003(\001\022%\n\tcalc_ty" + "pe\030\002 \001(\0162\022.tari.rpc.CalcType\"K\n\rHeightRe" "quest\022\020\n\010from_tip\030\001 \001(\004\022\024\n\014start_height\030" - "\002 \001(\004\022\022\n\nend_height\030\003 \001(\004\022%\n\tcalc_type\030\004" - " \001(\0162\022.tari.rpc.CalcType\"J\n\022BlockGroupRe" - "sponse\022\r\n\005value\030\001 \003(\001\022%\n\tcalc_type\030\002 \001(\016" - "2\022.tari.rpc.CalcType\"K\n\rHeightRequest\022\020\n" - "\010from_tip\030\001 \001(\004\022\024\n\014start_height\030\002 \001(\004\022\022\n" - "\nend_height\030\003 \001(\004\"<\n\023BlockTimingResponse" - "\022\013\n\003max\030\001 \001(\004\022\013\n\003min\030\002 \001(\004\022\013\n\003avg\030\003 \001(\001\"" - "&\n\026GetHeaderByHashRequest\022\014\n\004hash\030\001 \001(\014\"" - "\221\001\n\023BlockHeaderResponse\022%\n\006header\030\001 \001(\0132" - "\025.tari.rpc.BlockHeader\022\025\n\rconfirmations\030" - "\002 \001(\004\022\016\n\006reward\030\003 \001(\004\022\022\n\ndifficulty\030\004 \001(" - "\004\022\030\n\020num_transactions\030\005 \001(\r\"b\n\022ListHeade" - "rsRequest\022\023\n\013from_height\030\001 \001(\004\022\023\n\013num_he" - "aders\030\002 \001(\004\022\"\n\007sorting\030\003 \001(\0162\021.tari.rpc." - "Sorting\"#\n\020GetBlocksRequest\022\017\n\007heights\030\001" - " \003(\004\">\n\021GetBlocksResponse\022)\n\006blocks\030\001 \003(" - "\0132\031.tari.rpc.HistoricalBlock\"\210\001\n\010MetaDat" - "a\022\031\n\021best_block_height\030\001 \001(\004\022\027\n\017best_blo" - "ck_hash\030\002 \001(\014\022\036\n\026accumulated_difficulty\030" - "\005 \001(\014\022\025\n\rpruned_height\030\006 \001(\004\022\021\n\ttimestam" - "p\030\007 \001(\004\"R\n\020SyncInfoResponse\022\022\n\ntip_heigh" - "t\030\001 \001(\004\022\024\n\014local_height\030\002 \001(\004\022\024\n\014peer_no" - "de_id\030\003 \003(\014\"\231\001\n\024SyncProgressResponse\022\022\n\n" - "tip_height\030\001 \001(\004\022\024\n\014local_height\030\002 \001(\004\022\"" - "\n\005state\030\003 \001(\0162\023.tari.rpc.SyncState\022\022\n\nsh" - "ort_desc\030\004 \001(\t\022\037\n\027initial_connected_peer" - "s\030\005 \001(\004\"\243\001\n\021GetNewBlockResult\022\022\n\nblock_h" - "ash\030\001 \001(\014\022\036\n\005block\030\002 \001(\0132\017.tari.rpc.Bloc" - "k\022\031\n\021merge_mining_hash\030\003 \001(\014\022\026\n\016tari_uni" - "que_id\030\004 \001(\014\022\'\n\nminer_data\030\005 \001(\0132\023.tari." - "rpc.MinerData\"\223\001\n\025GetNewBlockBlobResult\022" - "\022\n\nblock_hash\030\001 \001(\014\022\016\n\006header\030\002 \001(\014\022\022\n\nb" - "lock_body\030\003 \001(\014\022\031\n\021merge_mining_hash\030\004 \001" - "(\014\022\017\n\007utxo_mr\030\005 \001(\014\022\026\n\016tari_unique_id\030\006 " - "\001(\014\"k\n\tMinerData\022\037\n\004algo\030\001 \001(\0132\021.tari.rp" - "c.PowAlgo\022\031\n\021target_difficulty\030\002 \001(\004\022\016\n\006" - "reward\030\003 \001(\004\022\022\n\ntotal_fees\030\005 \001(\004\"\?\n\024Sear" - "chKernelsRequest\022\'\n\nsignatures\030\001 \003(\0132\023.t" - "ari.rpc.Signature\")\n\022SearchUtxosRequest\022" - "\023\n\013commitments\030\001 \003(\014\"+\n\031FetchMatchingUtx" - "osRequest\022\016\n\006hashes\030\001 \003(\014\"I\n\032FetchMatchi" - "ngUtxosResponse\022+\n\006output\030\001 \001(\0132\033.tari.r" - "pc.TransactionOutput\"0\n\020GetPeersResponse" - "\022\034\n\004peer\030\001 \001(\0132\016.tari.rpc.Peer\"\021\n\017GetPee" - "rsRequest\"F\n\030SubmitTransactionRequest\022*\n" - "\013transaction\030\001 \001(\0132\025.tari.rpc.Transactio" - "n\"N\n\031SubmitTransactionResponse\0221\n\006result" - "\030\001 \001(\0162!.tari.rpc.SubmitTransactionResul" - "t\"\037\n\035GetMempoolTransactionsRequest\"L\n\036Ge" - "tMempoolTransactionsResponse\022*\n\013transact" - "ion\030\001 \001(\0132\025.tari.rpc.Transaction\"B\n\027Tran" - "sactionStateRequest\022\'\n\nexcess_sig\030\001 \001(\0132" - "\023.tari.rpc.Signature\"I\n\030TransactionState" - "Response\022-\n\006result\030\001 \001(\0162\035.tari.rpc.Tran" - "sactionLocation\"^\n\024MempoolStatsResponse\022" - "\027\n\017unconfirmed_txs\030\002 \001(\004\022\021\n\treorg_txs\030\003 " - "\001(\004\022\032\n\022unconfirmed_weight\030\004 \001(\004\"0\n\036GetAc" - "tiveValidatorNodesRequest\022\016\n\006height\030\001 \001(" - "\004\"H\n\037GetActiveValidatorNodesResponse\022\021\n\t" - "shard_key\030\001 \001(\014\022\022\n\npublic_key\030\002 \001(\014\"8\n\022G" - "etShardKeyRequest\022\016\n\006height\030\001 \001(\004\022\022\n\npub" - "lic_key\030\002 \001(\014\"7\n\023GetShardKeyResponse\022\021\n\t" - "shard_key\030\001 \001(\014\022\r\n\005found\030\002 \001(\010\"D\n\037GetTem" - "plateRegistrationsRequest\022\022\n\nstart_hash\030" - "\001 \001(\014\022\r\n\005count\030\002 \001(\004\"j\n\037GetTemplateRegis" - "trationResponse\022\021\n\tutxo_hash\030\001 \001(\014\0224\n\014re" - "gistration\030\002 \001(\0132\036.tari.rpc.TemplateRegi" - "stration\"B\n\tBlockInfo\022\016\n\006height\030\001 \001(\004\022\014\n" - "\004hash\030\002 \001(\014\022\027\n\017next_block_hash\030\003 \001(\014\"=\n\030" - "GetSideChainUtxosRequest\022\022\n\nstart_hash\030\001" - " \001(\014\022\r\n\005count\030\002 \001(\004\"r\n\031GetSideChainUtxos" - "Response\022\'\n\nblock_info\030\001 \001(\0132\023.tari.rpc." - "BlockInfo\022,\n\007outputs\030\002 \003(\0132\033.tari.rpc.Tr" - "ansactionOutput\"\030\n\026GetNetworkStateReques" - "t\"\204\002\n\027GetNetworkStateResponse\022$\n\010metadat" - "a\030\001 \001(\0132\022.tari.rpc.MetaData\022\035\n\025initial_s" - "ync_achieved\030\002 \001(\010\0220\n\017base_node_state\030\003 " - "\001(\0162\027.tari.rpc.BaseNodeState\022\032\n\022failed_c" - "heckpoints\030\004 \001(\010\022\016\n\006reward\030\005 \001(\004\022!\n\031sha3" - "x_estimated_hash_rate\030\006 \001(\004\022#\n\033randomx_e" - "stimated_hash_rate\030\007 \001(\004*\200\001\n\rBaseNodeSta" - "te\022\014\n\010START_UP\020\000\022\017\n\013HEADER_SYNC\020\001\022\020\n\014HOR" - "IZON_SYNC\020\002\022\016\n\nCONNECTING\020\003\022\016\n\nBLOCK_SYN" - "C\020\004\022\r\n\tLISTENING\020\005\022\017\n\013SYNC_FAILED\020\006*<\n\010C" - "alcType\022\010\n\004MEAN\020\000\022\n\n\006MEDIAN\020\001\022\014\n\010QUANTIL" - "E\020\002\022\014\n\010QUARTILE\020\003*,\n\007Sorting\022\020\n\014SORTING_" - "DESC\020\000\022\017\n\013SORTING_ASC\020\001*b\n\tSyncState\022\013\n\007" - "STARTUP\020\000\022\023\n\017HEADER_STARTING\020\001\022\n\n\006HEADER" - "\020\002\022\022\n\016BLOCK_STARTING\020\003\022\t\n\005BLOCK\020\004\022\010\n\004DON" - "E\020\005*t\n\027SubmitTransactionResult\022\010\n\004NONE\020\000" - "\022\014\n\010ACCEPTED\020\001\022 \n\034NOT_PROCESSABLE_AT_THI" - "S_TIME\020\002\022\021\n\rALREADY_MINED\020\003\022\014\n\010REJECTED\020" - "\004*J\n\023TransactionLocation\022\013\n\007UNKNOWN\020\000\022\013\n" - "\007MEMPOOL\020\001\022\t\n\005MINED\020\002\022\016\n\nNOT_STORED\020\0032\257\027" - "\n\010BaseNode\022L\n\013ListHeaders\022\034.tari.rpc.Lis" - "tHeadersRequest\032\035.tari.rpc.BlockHeaderRe" - "sponse0\001\022R\n\017GetHeaderByHash\022 .tari.rpc.G" - "etHeaderByHashRequest\032\035.tari.rpc.BlockHe" - "aderResponse\022D\n\tGetBlocks\022\032.tari.rpc.Get" - "BlocksRequest\032\031.tari.rpc.HistoricalBlock" - "0\001\022H\n\016GetBlockTiming\022\027.tari.rpc.HeightRe" - "quest\032\035.tari.rpc.BlockTimingResponse\022C\n\014" - "GetConstants\022\025.tari.rpc.BlockHeight\032\034.ta" - "ri.rpc.ConsensusConstants\022I\n\014GetBlockSiz" - "e\022\033.tari.rpc.BlockGroupRequest\032\034.tari.rp" - "c.BlockGroupResponse\022I\n\014GetBlockFees\022\033.t" - "ari.rpc.BlockGroupRequest\032\034.tari.rpc.Blo" - "ckGroupResponse\0224\n\nGetVersion\022\017.tari.rpc" - ".Empty\032\025.tari.rpc.StringValue\022<\n\017CheckFo" - "rUpdates\022\017.tari.rpc.Empty\032\030.tari.rpc.Sof" - "twareUpdate\022W\n\026GetTokensInCirculation\022\032." - "tari.rpc.GetBlocksRequest\032\037.tari.rpc.Val" - "ueAtHeightResponse0\001\022V\n\024GetNetworkDiffic" - "ulty\022\027.tari.rpc.HeightRequest\032#.tari.rpc" - ".NetworkDifficultyResponse0\001\022\\\n\023GetNewBl" - "ockTemplate\022!.tari.rpc.NewBlockTemplateR" - "equest\032\".tari.rpc.NewBlockTemplateRespon" - "se\022F\n\013GetNewBlock\022\032.tari.rpc.NewBlockTem" - "plate\032\033.tari.rpc.GetNewBlockResult\022b\n\030Ge" - "tNewBlockWithCoinbases\022).tari.rpc.GetNew" - "BlockWithCoinbasesRequest\032\033.tari.rpc.Get" - "NewBlockResult\022r\n GetNewBlockTemplateWit" - "hCoinbases\0221.tari.rpc.GetNewBlockTemplat" - "eWithCoinbasesRequest\032\033.tari.rpc.GetNewB" - "lockResult\022N\n\017GetNewBlockBlob\022\032.tari.rpc" - ".NewBlockTemplate\032\037.tari.rpc.GetNewBlock" - "BlobResult\022=\n\013SubmitBlock\022\017.tari.rpc.Blo" - "ck\032\035.tari.rpc.SubmitBlockResponse\022L\n\017Sub" - "mitBlockBlob\022\032.tari.rpc.BlockBlobRequest" - "\032\035.tari.rpc.SubmitBlockResponse\022\\\n\021Submi" - "tTransaction\022\".tari.rpc.SubmitTransactio" - "nRequest\032#.tari.rpc.SubmitTransactionRes" - "ponse\022:\n\013GetSyncInfo\022\017.tari.rpc.Empty\032\032." - "tari.rpc.SyncInfoResponse\022B\n\017GetSyncProg" - "ress\022\017.tari.rpc.Empty\032\036.tari.rpc.SyncPro" - "gressResponse\0228\n\nGetTipInfo\022\017.tari.rpc.E" - "mpty\032\031.tari.rpc.TipInfoResponse\022L\n\rSearc" - "hKernels\022\036.tari.rpc.SearchKernelsRequest" - "\032\031.tari.rpc.HistoricalBlock0\001\022H\n\013SearchU" - "txos\022\034.tari.rpc.SearchUtxosRequest\032\031.tar" - "i.rpc.HistoricalBlock0\001\022a\n\022FetchMatching" - "Utxos\022#.tari.rpc.FetchMatchingUtxosReque" - "st\032$.tari.rpc.FetchMatchingUtxosResponse" - "0\001\022C\n\010GetPeers\022\031.tari.rpc.GetPeersReques" - "t\032\032.tari.rpc.GetPeersResponse0\001\022m\n\026GetMe" - "mpoolTransactions\022\'.tari.rpc.GetMempoolT" - "ransactionsRequest\032(.tari.rpc.GetMempool" - "TransactionsResponse0\001\022Y\n\020TransactionSta" - "te\022!.tari.rpc.TransactionStateRequest\032\"." - "tari.rpc.TransactionStateResponse\0223\n\010Ide" - "ntify\022\017.tari.rpc.Empty\032\026.tari.rpc.NodeId" - "entity\022D\n\020GetNetworkStatus\022\017.tari.rpc.Em" - "pty\032\037.tari.rpc.NetworkStatusResponse\022K\n\022" - "ListConnectedPeers\022\017.tari.rpc.Empty\032$.ta" - "ri.rpc.ListConnectedPeersResponse\022B\n\017Get" - "MempoolStats\022\017.tari.rpc.Empty\032\036.tari.rpc" - ".MempoolStatsResponse\022p\n\027GetActiveValida" - "torNodes\022(.tari.rpc.GetActiveValidatorNo" - "desRequest\032).tari.rpc.GetActiveValidator" - "NodesResponse0\001\022J\n\013GetShardKey\022\034.tari.rp" - "c.GetShardKeyRequest\032\035.tari.rpc.GetShard" - "KeyResponse\022r\n\030GetTemplateRegistrations\022" - ").tari.rpc.GetTemplateRegistrationsReque" - "st\032).tari.rpc.GetTemplateRegistrationRes" - "ponse0\001\022^\n\021GetSideChainUtxos\022\".tari.rpc." - "GetSideChainUtxosRequest\032#.tari.rpc.GetS" - "ideChainUtxosResponse0\001\022V\n\017GetNetworkSta" - "te\022 .tari.rpc.GetNetworkStateRequest\032!.t" - "ari.rpc.GetNetworkStateResponseb\006proto3" + "\002 \001(\004\022\022\n\nend_height\030\003 \001(\004\"<\n\023BlockTiming" + "Response\022\013\n\003max\030\001 \001(\004\022\013\n\003min\030\002 \001(\004\022\013\n\003av" + "g\030\003 \001(\001\"&\n\026GetHeaderByHashRequest\022\014\n\004has" + "h\030\001 \001(\014\"\221\001\n\023BlockHeaderResponse\022%\n\006heade" + "r\030\001 \001(\0132\025.tari.rpc.BlockHeader\022\025\n\rconfir" + "mations\030\002 \001(\004\022\016\n\006reward\030\003 \001(\004\022\022\n\ndifficu" + "lty\030\004 \001(\004\022\030\n\020num_transactions\030\005 \001(\r\"b\n\022L" + "istHeadersRequest\022\023\n\013from_height\030\001 \001(\004\022\023" + "\n\013num_headers\030\002 \001(\004\022\"\n\007sorting\030\003 \001(\0162\021.t" + "ari.rpc.Sorting\"#\n\020GetBlocksRequest\022\017\n\007h" + "eights\030\001 \003(\004\">\n\021GetBlocksResponse\022)\n\006blo" + "cks\030\001 \003(\0132\031.tari.rpc.HistoricalBlock\"\210\001\n" + "\010MetaData\022\031\n\021best_block_height\030\001 \001(\004\022\027\n\017" + "best_block_hash\030\002 \001(\014\022\036\n\026accumulated_dif" + "ficulty\030\005 \001(\014\022\025\n\rpruned_height\030\006 \001(\004\022\021\n\t" + "timestamp\030\007 \001(\004\"R\n\020SyncInfoResponse\022\022\n\nt" + "ip_height\030\001 \001(\004\022\024\n\014local_height\030\002 \001(\004\022\024\n" + "\014peer_node_id\030\003 \003(\014\"\231\001\n\024SyncProgressResp" + "onse\022\022\n\ntip_height\030\001 \001(\004\022\024\n\014local_height" + "\030\002 \001(\004\022\"\n\005state\030\003 \001(\0162\023.tari.rpc.SyncSta" + "te\022\022\n\nshort_desc\030\004 \001(\t\022\037\n\027initial_connec" + "ted_peers\030\005 \001(\004\"\263\001\n\021GetNewBlockResult\022\022\n" + "\nblock_hash\030\001 \001(\014\022\036\n\005block\030\002 \001(\0132\017.tari." + "rpc.Block\022\031\n\021merge_mining_hash\030\003 \001(\014\022\026\n\016" + "tari_unique_id\030\004 \001(\014\022\'\n\nminer_data\030\005 \001(\013" + "2\023.tari.rpc.MinerData\022\016\n\006vm_key\030\006 \001(\014\"\223\001" + "\n\025GetNewBlockBlobResult\022\022\n\nblock_hash\030\001 " + "\001(\014\022\016\n\006header\030\002 \001(\014\022\022\n\nblock_body\030\003 \001(\014\022" + "\031\n\021merge_mining_hash\030\004 \001(\014\022\017\n\007utxo_mr\030\005 " + "\001(\014\022\026\n\016tari_unique_id\030\006 \001(\014\"k\n\tMinerData" + "\022\037\n\004algo\030\001 \001(\0132\021.tari.rpc.PowAlgo\022\031\n\021tar" + "get_difficulty\030\002 \001(\004\022\016\n\006reward\030\003 \001(\004\022\022\n\n" + "total_fees\030\005 \001(\004\"\?\n\024SearchKernelsRequest" + "\022\'\n\nsignatures\030\001 \003(\0132\023.tari.rpc.Signatur" + "e\")\n\022SearchUtxosRequest\022\023\n\013commitments\030\001" + " \003(\014\"+\n\031FetchMatchingUtxosRequest\022\016\n\006has" + "hes\030\001 \003(\014\"I\n\032FetchMatchingUtxosResponse\022" + "+\n\006output\030\001 \001(\0132\033.tari.rpc.TransactionOu" + "tput\"0\n\020GetPeersResponse\022\034\n\004peer\030\001 \001(\0132\016" + ".tari.rpc.Peer\"\021\n\017GetPeersRequest\"F\n\030Sub" + "mitTransactionRequest\022*\n\013transaction\030\001 \001" + "(\0132\025.tari.rpc.Transaction\"N\n\031SubmitTrans" + "actionResponse\0221\n\006result\030\001 \001(\0162!.tari.rp" + "c.SubmitTransactionResult\"\037\n\035GetMempoolT" + "ransactionsRequest\"L\n\036GetMempoolTransact" + "ionsResponse\022*\n\013transaction\030\001 \001(\0132\025.tari" + ".rpc.Transaction\"B\n\027TransactionStateRequ" + "est\022\'\n\nexcess_sig\030\001 \001(\0132\023.tari.rpc.Signa" + "ture\"I\n\030TransactionStateResponse\022-\n\006resu" + "lt\030\001 \001(\0162\035.tari.rpc.TransactionLocation\"" + "^\n\024MempoolStatsResponse\022\027\n\017unconfirmed_t" + "xs\030\002 \001(\004\022\021\n\treorg_txs\030\003 \001(\004\022\032\n\022unconfirm" + "ed_weight\030\004 \001(\004\"0\n\036GetActiveValidatorNod" + "esRequest\022\016\n\006height\030\001 \001(\004\"H\n\037GetActiveVa" + "lidatorNodesResponse\022\021\n\tshard_key\030\001 \001(\014\022" + "\022\n\npublic_key\030\002 \001(\014\"8\n\022GetShardKeyReques" + "t\022\016\n\006height\030\001 \001(\004\022\022\n\npublic_key\030\002 \001(\014\"7\n" + "\023GetShardKeyResponse\022\021\n\tshard_key\030\001 \001(\014\022" + "\r\n\005found\030\002 \001(\010\"D\n\037GetTemplateRegistratio" + "nsRequest\022\022\n\nstart_hash\030\001 \001(\014\022\r\n\005count\030\002" + " \001(\004\"j\n\037GetTemplateRegistrationResponse\022" + "\021\n\tutxo_hash\030\001 \001(\014\0224\n\014registration\030\002 \001(\013" + "2\036.tari.rpc.TemplateRegistration\"B\n\tBloc" + "kInfo\022\016\n\006height\030\001 \001(\004\022\014\n\004hash\030\002 \001(\014\022\027\n\017n" + "ext_block_hash\030\003 \001(\014\"=\n\030GetSideChainUtxo" + "sRequest\022\022\n\nstart_hash\030\001 \001(\014\022\r\n\005count\030\002 " + "\001(\004\"r\n\031GetSideChainUtxosResponse\022\'\n\nbloc" + "k_info\030\001 \001(\0132\023.tari.rpc.BlockInfo\022,\n\007out" + "puts\030\002 \003(\0132\033.tari.rpc.TransactionOutput\"" + "\030\n\026GetNetworkStateRequest\"\202\003\n\027GetNetwork" + "StateResponse\022$\n\010metadata\030\001 \001(\0132\022.tari.r" + "pc.MetaData\022\035\n\025initial_sync_achieved\030\002 \001" + "(\010\0220\n\017base_node_state\030\003 \001(\0162\027.tari.rpc.B" + "aseNodeState\022\032\n\022failed_checkpoints\030\004 \001(\010" + "\022\016\n\006reward\030\005 \001(\004\022!\n\031sha3x_estimated_hash" + "_rate\030\006 \001(\004\022*\n\"monero_randomx_estimated_" + "hash_rate\030\007 \001(\004\022(\n tari_randomx_estimate" + "d_hash_rate\030\n \001(\004\022\027\n\017num_connections\030\010 \001" + "(\004\0222\n\020liveness_results\030\t \003(\0132\030.tari.rpc." + "LivenessResult\"V\n\016LivenessResult\022\024\n\014peer" + "_node_id\030\001 \001(\014\022\030\n\020discover_latency\030\002 \001(\004" + "\022\024\n\014ping_latency\030\003 \001(\004*\200\001\n\rBaseNodeState" + "\022\014\n\010START_UP\020\000\022\017\n\013HEADER_SYNC\020\001\022\020\n\014HORIZ" + "ON_SYNC\020\002\022\016\n\nCONNECTING\020\003\022\016\n\nBLOCK_SYNC\020" + "\004\022\r\n\tLISTENING\020\005\022\017\n\013SYNC_FAILED\020\006*<\n\010Cal" + "cType\022\010\n\004MEAN\020\000\022\n\n\006MEDIAN\020\001\022\014\n\010QUANTILE\020" + "\002\022\014\n\010QUARTILE\020\003*,\n\007Sorting\022\020\n\014SORTING_DE" + "SC\020\000\022\017\n\013SORTING_ASC\020\001*b\n\tSyncState\022\013\n\007ST" + "ARTUP\020\000\022\023\n\017HEADER_STARTING\020\001\022\n\n\006HEADER\020\002" + "\022\022\n\016BLOCK_STARTING\020\003\022\t\n\005BLOCK\020\004\022\010\n\004DONE\020" + "\005*t\n\027SubmitTransactionResult\022\010\n\004NONE\020\000\022\014" + "\n\010ACCEPTED\020\001\022 \n\034NOT_PROCESSABLE_AT_THIS_" + "TIME\020\002\022\021\n\rALREADY_MINED\020\003\022\014\n\010REJECTED\020\004*" + "J\n\023TransactionLocation\022\013\n\007UNKNOWN\020\000\022\013\n\007M" + "EMPOOL\020\001\022\t\n\005MINED\020\002\022\016\n\nNOT_STORED\020\0032\257\027\n\010" + "BaseNode\022L\n\013ListHeaders\022\034.tari.rpc.ListH" + "eadersRequest\032\035.tari.rpc.BlockHeaderResp" + "onse0\001\022R\n\017GetHeaderByHash\022 .tari.rpc.Get" + "HeaderByHashRequest\032\035.tari.rpc.BlockHead" + "erResponse\022D\n\tGetBlocks\022\032.tari.rpc.GetBl" + "ocksRequest\032\031.tari.rpc.HistoricalBlock0\001" + "\022H\n\016GetBlockTiming\022\027.tari.rpc.HeightRequ" + "est\032\035.tari.rpc.BlockTimingResponse\022C\n\014Ge" + "tConstants\022\025.tari.rpc.BlockHeight\032\034.tari" + ".rpc.ConsensusConstants\022I\n\014GetBlockSize\022" + "\033.tari.rpc.BlockGroupRequest\032\034.tari.rpc." + "BlockGroupResponse\022I\n\014GetBlockFees\022\033.tar" + "i.rpc.BlockGroupRequest\032\034.tari.rpc.Block" + "GroupResponse\0224\n\nGetVersion\022\017.tari.rpc.E" + "mpty\032\025.tari.rpc.StringValue\022<\n\017CheckForU" + "pdates\022\017.tari.rpc.Empty\032\030.tari.rpc.Softw" + "areUpdate\022W\n\026GetTokensInCirculation\022\032.ta" + "ri.rpc.GetBlocksRequest\032\037.tari.rpc.Value" + "AtHeightResponse0\001\022V\n\024GetNetworkDifficul" + "ty\022\027.tari.rpc.HeightRequest\032#.tari.rpc.N" + "etworkDifficultyResponse0\001\022\\\n\023GetNewBloc" + "kTemplate\022!.tari.rpc.NewBlockTemplateReq" + "uest\032\".tari.rpc.NewBlockTemplateResponse" + "\022F\n\013GetNewBlock\022\032.tari.rpc.NewBlockTempl" + "ate\032\033.tari.rpc.GetNewBlockResult\022b\n\030GetN" + "ewBlockWithCoinbases\022).tari.rpc.GetNewBl" + "ockWithCoinbasesRequest\032\033.tari.rpc.GetNe" + "wBlockResult\022r\n GetNewBlockTemplateWithC" + "oinbases\0221.tari.rpc.GetNewBlockTemplateW" + "ithCoinbasesRequest\032\033.tari.rpc.GetNewBlo" + "ckResult\022N\n\017GetNewBlockBlob\022\032.tari.rpc.N" + "ewBlockTemplate\032\037.tari.rpc.GetNewBlockBl" + "obResult\022=\n\013SubmitBlock\022\017.tari.rpc.Block" + "\032\035.tari.rpc.SubmitBlockResponse\022L\n\017Submi" + "tBlockBlob\022\032.tari.rpc.BlockBlobRequest\032\035" + ".tari.rpc.SubmitBlockResponse\022\\\n\021SubmitT" + "ransaction\022\".tari.rpc.SubmitTransactionR" + "equest\032#.tari.rpc.SubmitTransactionRespo" + "nse\022:\n\013GetSyncInfo\022\017.tari.rpc.Empty\032\032.ta" + "ri.rpc.SyncInfoResponse\022B\n\017GetSyncProgre" + "ss\022\017.tari.rpc.Empty\032\036.tari.rpc.SyncProgr" + "essResponse\0228\n\nGetTipInfo\022\017.tari.rpc.Emp" + "ty\032\031.tari.rpc.TipInfoResponse\022L\n\rSearchK" + "ernels\022\036.tari.rpc.SearchKernelsRequest\032\031" + ".tari.rpc.HistoricalBlock0\001\022H\n\013SearchUtx" + "os\022\034.tari.rpc.SearchUtxosRequest\032\031.tari." + "rpc.HistoricalBlock0\001\022a\n\022FetchMatchingUt" + "xos\022#.tari.rpc.FetchMatchingUtxosRequest" + "\032$.tari.rpc.FetchMatchingUtxosResponse0\001" + "\022C\n\010GetPeers\022\031.tari.rpc.GetPeersRequest\032" + "\032.tari.rpc.GetPeersResponse0\001\022m\n\026GetMemp" + "oolTransactions\022\'.tari.rpc.GetMempoolTra" + "nsactionsRequest\032(.tari.rpc.GetMempoolTr" + "ansactionsResponse0\001\022Y\n\020TransactionState" + "\022!.tari.rpc.TransactionStateRequest\032\".ta" + "ri.rpc.TransactionStateResponse\0223\n\010Ident" + "ify\022\017.tari.rpc.Empty\032\026.tari.rpc.NodeIden" + "tity\022D\n\020GetNetworkStatus\022\017.tari.rpc.Empt" + "y\032\037.tari.rpc.NetworkStatusResponse\022K\n\022Li" + "stConnectedPeers\022\017.tari.rpc.Empty\032$.tari" + ".rpc.ListConnectedPeersResponse\022B\n\017GetMe" + "mpoolStats\022\017.tari.rpc.Empty\032\036.tari.rpc.M" + "empoolStatsResponse\022p\n\027GetActiveValidato" + "rNodes\022(.tari.rpc.GetActiveValidatorNode" + "sRequest\032).tari.rpc.GetActiveValidatorNo" + "desResponse0\001\022J\n\013GetShardKey\022\034.tari.rpc." + "GetShardKeyRequest\032\035.tari.rpc.GetShardKe" + "yResponse\022r\n\030GetTemplateRegistrations\022)." + "tari.rpc.GetTemplateRegistrationsRequest" + "\032).tari.rpc.GetTemplateRegistrationRespo" + "nse0\001\022^\n\021GetSideChainUtxos\022\".tari.rpc.Ge" + "tSideChainUtxosRequest\032#.tari.rpc.GetSid" + "eChainUtxosResponse0\001\022V\n\017GetNetworkState" + "\022 .tari.rpc.GetNetworkStateRequest\032!.tar" + "i.rpc.GetNetworkStateResponseb\006proto3" }; static const ::_pbi::DescriptorTable* const descriptor_table_base_5fnode_2eproto_deps[5] = { @@ -2313,13 +2375,13 @@ static ::absl::once_flag descriptor_table_base_5fnode_2eproto_once; const ::_pbi::DescriptorTable descriptor_table_base_5fnode_2eproto = { false, false, - 8999, + 9317, descriptor_table_protodef_base_5fnode_2eproto, "base_node.proto", &descriptor_table_base_5fnode_2eproto_once, descriptor_table_base_5fnode_2eproto_deps, 5, - 57, + 58, schemas, file_default_instances, TableStruct_base_5fnode_2eproto::offsets, @@ -6314,9 +6376,9 @@ NetworkDifficultyResponse::NetworkDifficultyResponse( offsetof(Impl_, difficulty_), reinterpret_cast(&from._impl_) + offsetof(Impl_, difficulty_), - offsetof(Impl_, num_coinbases_) - + offsetof(Impl_, tari_randomx_estimated_hash_rate_) - offsetof(Impl_, difficulty_) + - sizeof(Impl_::num_coinbases_)); + sizeof(Impl_::tari_randomx_estimated_hash_rate_)); // @@protoc_insertion_point(copy_constructor:tari.rpc.NetworkDifficultyResponse) } @@ -6331,9 +6393,9 @@ inline void NetworkDifficultyResponse::SharedCtor(::_pb::Arena* arena) { ::memset(reinterpret_cast(&_impl_) + offsetof(Impl_, difficulty_), 0, - offsetof(Impl_, num_coinbases_) - + offsetof(Impl_, tari_randomx_estimated_hash_rate_) - offsetof(Impl_, difficulty_) + - sizeof(Impl_::num_coinbases_)); + sizeof(Impl_::tari_randomx_estimated_hash_rate_)); } NetworkDifficultyResponse::~NetworkDifficultyResponse() { // @@protoc_insertion_point(destructor:tari.rpc.NetworkDifficultyResponse) @@ -6368,8 +6430,8 @@ PROTOBUF_NOINLINE void NetworkDifficultyResponse::Clear() { _impl_.coinbase_extras_.Clear(); ::memset(&_impl_.difficulty_, 0, static_cast<::size_t>( - reinterpret_cast(&_impl_.num_coinbases_) - - reinterpret_cast(&_impl_.difficulty_)) + sizeof(_impl_.num_coinbases_)); + reinterpret_cast(&_impl_.tari_randomx_estimated_hash_rate_) - + reinterpret_cast(&_impl_.difficulty_)) + sizeof(_impl_.tari_randomx_estimated_hash_rate_)); _internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>(); } @@ -6381,15 +6443,15 @@ const char* NetworkDifficultyResponse::_InternalParse( PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 -const ::_pbi::TcParseTable<4, 9, 0, 0, 2> NetworkDifficultyResponse::_table_ = { +const ::_pbi::TcParseTable<4, 10, 0, 0, 2> NetworkDifficultyResponse::_table_ = { { 0, // no _has_bits_ 0, // no _extensions_ - 9, 120, // max_field_number, fast_idx_mask + 10, 120, // max_field_number, fast_idx_mask offsetof(decltype(_table_), field_lookup_table), - 4294966784, // skipmap + 4294966272, // skipmap offsetof(decltype(_table_), field_entries), - 9, // num_field_entries + 10, // num_field_entries 0, // num_aux_entries offsetof(decltype(_table_), field_names), // no aux_entries &_NetworkDifficultyResponse_default_instance_._instance, @@ -6417,16 +6479,18 @@ const ::_pbi::TcParseTable<4, 9, 0, 0, 2> NetworkDifficultyResponse::_table_ = { // uint64 sha3x_estimated_hash_rate = 6; {::_pbi::TcParser::SingularVarintNoZag1<::uint64_t, offsetof(NetworkDifficultyResponse, _impl_.sha3x_estimated_hash_rate_), 63>(), {48, 63, 0, PROTOBUF_FIELD_OFFSET(NetworkDifficultyResponse, _impl_.sha3x_estimated_hash_rate_)}}, - // uint64 randomx_estimated_hash_rate = 7; - {::_pbi::TcParser::SingularVarintNoZag1<::uint64_t, offsetof(NetworkDifficultyResponse, _impl_.randomx_estimated_hash_rate_), 63>(), - {56, 63, 0, PROTOBUF_FIELD_OFFSET(NetworkDifficultyResponse, _impl_.randomx_estimated_hash_rate_)}}, + // uint64 monero_randomx_estimated_hash_rate = 7; + {::_pbi::TcParser::SingularVarintNoZag1<::uint64_t, offsetof(NetworkDifficultyResponse, _impl_.monero_randomx_estimated_hash_rate_), 63>(), + {56, 63, 0, PROTOBUF_FIELD_OFFSET(NetworkDifficultyResponse, _impl_.monero_randomx_estimated_hash_rate_)}}, // uint64 num_coinbases = 8; {::_pbi::TcParser::SingularVarintNoZag1<::uint64_t, offsetof(NetworkDifficultyResponse, _impl_.num_coinbases_), 63>(), {64, 63, 0, PROTOBUF_FIELD_OFFSET(NetworkDifficultyResponse, _impl_.num_coinbases_)}}, // repeated bytes coinbase_extras = 9; {::_pbi::TcParser::FastBR1, {74, 63, 0, PROTOBUF_FIELD_OFFSET(NetworkDifficultyResponse, _impl_.coinbase_extras_)}}, - {::_pbi::TcParser::MiniParse, {}}, + // uint64 tari_randomx_estimated_hash_rate = 10; + {::_pbi::TcParser::SingularVarintNoZag1<::uint64_t, offsetof(NetworkDifficultyResponse, _impl_.tari_randomx_estimated_hash_rate_), 63>(), + {80, 63, 0, PROTOBUF_FIELD_OFFSET(NetworkDifficultyResponse, _impl_.tari_randomx_estimated_hash_rate_)}}, {::_pbi::TcParser::MiniParse, {}}, {::_pbi::TcParser::MiniParse, {}}, {::_pbi::TcParser::MiniParse, {}}, @@ -6453,8 +6517,8 @@ const ::_pbi::TcParseTable<4, 9, 0, 0, 2> NetworkDifficultyResponse::_table_ = { // uint64 sha3x_estimated_hash_rate = 6; {PROTOBUF_FIELD_OFFSET(NetworkDifficultyResponse, _impl_.sha3x_estimated_hash_rate_), 0, 0, (0 | ::_fl::kFcSingular | ::_fl::kUInt64)}, - // uint64 randomx_estimated_hash_rate = 7; - {PROTOBUF_FIELD_OFFSET(NetworkDifficultyResponse, _impl_.randomx_estimated_hash_rate_), 0, 0, + // uint64 monero_randomx_estimated_hash_rate = 7; + {PROTOBUF_FIELD_OFFSET(NetworkDifficultyResponse, _impl_.monero_randomx_estimated_hash_rate_), 0, 0, (0 | ::_fl::kFcSingular | ::_fl::kUInt64)}, // uint64 num_coinbases = 8; {PROTOBUF_FIELD_OFFSET(NetworkDifficultyResponse, _impl_.num_coinbases_), 0, 0, @@ -6462,6 +6526,9 @@ const ::_pbi::TcParseTable<4, 9, 0, 0, 2> NetworkDifficultyResponse::_table_ = { // repeated bytes coinbase_extras = 9; {PROTOBUF_FIELD_OFFSET(NetworkDifficultyResponse, _impl_.coinbase_extras_), 0, 0, (0 | ::_fl::kFcRepeated | ::_fl::kBytes | ::_fl::kRepSString)}, + // uint64 tari_randomx_estimated_hash_rate = 10; + {PROTOBUF_FIELD_OFFSET(NetworkDifficultyResponse, _impl_.tari_randomx_estimated_hash_rate_), 0, 0, + (0 | ::_fl::kFcSingular | ::_fl::kUInt64)}, }}, // no aux_entries {{ @@ -6517,11 +6584,11 @@ const ::_pbi::TcParseTable<4, 9, 0, 0, 2> NetworkDifficultyResponse::_table_ = { 6, this->_internal_sha3x_estimated_hash_rate(), target); } - // uint64 randomx_estimated_hash_rate = 7; - if (this->_internal_randomx_estimated_hash_rate() != 0) { + // uint64 monero_randomx_estimated_hash_rate = 7; + if (this->_internal_monero_randomx_estimated_hash_rate() != 0) { target = stream->EnsureSpace(target); target = ::_pbi::WireFormatLite::WriteUInt64ToArray( - 7, this->_internal_randomx_estimated_hash_rate(), target); + 7, this->_internal_monero_randomx_estimated_hash_rate(), target); } // uint64 num_coinbases = 8; @@ -6537,6 +6604,13 @@ const ::_pbi::TcParseTable<4, 9, 0, 0, 2> NetworkDifficultyResponse::_table_ = { target = stream->WriteBytes(9, s, target); } + // uint64 tari_randomx_estimated_hash_rate = 10; + if (this->_internal_tari_randomx_estimated_hash_rate() != 0) { + target = stream->EnsureSpace(target); + target = ::_pbi::WireFormatLite::WriteUInt64ToArray( + 10, this->_internal_tari_randomx_estimated_hash_rate(), target); + } + if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) { target = ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray( @@ -6596,10 +6670,10 @@ const ::_pbi::TcParseTable<4, 9, 0, 0, 2> NetworkDifficultyResponse::_table_ = { this->_internal_sha3x_estimated_hash_rate()); } - // uint64 randomx_estimated_hash_rate = 7; - if (this->_internal_randomx_estimated_hash_rate() != 0) { + // uint64 monero_randomx_estimated_hash_rate = 7; + if (this->_internal_monero_randomx_estimated_hash_rate() != 0) { total_size += ::_pbi::WireFormatLite::UInt64SizePlusOne( - this->_internal_randomx_estimated_hash_rate()); + this->_internal_monero_randomx_estimated_hash_rate()); } // uint64 num_coinbases = 8; @@ -6608,6 +6682,12 @@ const ::_pbi::TcParseTable<4, 9, 0, 0, 2> NetworkDifficultyResponse::_table_ = { this->_internal_num_coinbases()); } + // uint64 tari_randomx_estimated_hash_rate = 10; + if (this->_internal_tari_randomx_estimated_hash_rate() != 0) { + total_size += ::_pbi::WireFormatLite::UInt64SizePlusOne( + this->_internal_tari_randomx_estimated_hash_rate()); + } + return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_); } @@ -6639,12 +6719,15 @@ void NetworkDifficultyResponse::MergeImpl(::google::protobuf::MessageLite& to_ms if (from._internal_sha3x_estimated_hash_rate() != 0) { _this->_impl_.sha3x_estimated_hash_rate_ = from._impl_.sha3x_estimated_hash_rate_; } - if (from._internal_randomx_estimated_hash_rate() != 0) { - _this->_impl_.randomx_estimated_hash_rate_ = from._impl_.randomx_estimated_hash_rate_; + if (from._internal_monero_randomx_estimated_hash_rate() != 0) { + _this->_impl_.monero_randomx_estimated_hash_rate_ = from._impl_.monero_randomx_estimated_hash_rate_; } if (from._internal_num_coinbases() != 0) { _this->_impl_.num_coinbases_ = from._impl_.num_coinbases_; } + if (from._internal_tari_randomx_estimated_hash_rate() != 0) { + _this->_impl_.tari_randomx_estimated_hash_rate_ = from._impl_.tari_randomx_estimated_hash_rate_; + } _this->_internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(from._internal_metadata_); } @@ -6664,8 +6747,8 @@ void NetworkDifficultyResponse::InternalSwap(NetworkDifficultyResponse* PROTOBUF _internal_metadata_.InternalSwap(&other->_internal_metadata_); _impl_.coinbase_extras_.InternalSwap(&other->_impl_.coinbase_extras_); ::google::protobuf::internal::memswap< - PROTOBUF_FIELD_OFFSET(NetworkDifficultyResponse, _impl_.num_coinbases_) - + sizeof(NetworkDifficultyResponse::_impl_.num_coinbases_) + PROTOBUF_FIELD_OFFSET(NetworkDifficultyResponse, _impl_.tari_randomx_estimated_hash_rate_) + + sizeof(NetworkDifficultyResponse::_impl_.tari_randomx_estimated_hash_rate_) - PROTOBUF_FIELD_OFFSET(NetworkDifficultyResponse, _impl_.difficulty_)>( reinterpret_cast(&_impl_.difficulty_), reinterpret_cast(&other->_impl_.difficulty_)); @@ -6700,10 +6783,10 @@ inline PROTOBUF_NDEBUG_INLINE ValueAtHeightResponse::Impl_::Impl_( inline void ValueAtHeightResponse::SharedCtor(::_pb::Arena* arena) { new (&_impl_) Impl_(internal_visibility(), arena); ::memset(reinterpret_cast(&_impl_) + - offsetof(Impl_, value_), + offsetof(Impl_, circulating_supply_), 0, offsetof(Impl_, height_) - - offsetof(Impl_, value_) + + offsetof(Impl_, circulating_supply_) + sizeof(Impl_::height_)); } ValueAtHeightResponse::~ValueAtHeightResponse() { @@ -6737,9 +6820,9 @@ PROTOBUF_NOINLINE void ValueAtHeightResponse::Clear() { // Prevent compiler warnings about cached_has_bits being unused (void) cached_has_bits; - ::memset(&_impl_.value_, 0, static_cast<::size_t>( + ::memset(&_impl_.circulating_supply_, 0, static_cast<::size_t>( reinterpret_cast(&_impl_.height_) - - reinterpret_cast(&_impl_.value_)) + sizeof(_impl_.height_)); + reinterpret_cast(&_impl_.circulating_supply_)) + sizeof(_impl_.height_)); _internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>(); } @@ -6751,15 +6834,15 @@ const char* ValueAtHeightResponse::_InternalParse( PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 -const ::_pbi::TcParseTable<1, 2, 0, 0, 2> ValueAtHeightResponse::_table_ = { +const ::_pbi::TcParseTable<2, 3, 0, 0, 2> ValueAtHeightResponse::_table_ = { { 0, // no _has_bits_ 0, // no _extensions_ - 2, 8, // max_field_number, fast_idx_mask + 3, 24, // max_field_number, fast_idx_mask offsetof(decltype(_table_), field_lookup_table), - 4294967292, // skipmap + 4294967288, // skipmap offsetof(decltype(_table_), field_entries), - 2, // num_field_entries + 3, // num_field_entries 0, // num_aux_entries offsetof(decltype(_table_), field_names), // no aux_entries &_ValueAtHeightResponse_default_instance_._instance, @@ -6768,19 +6851,26 @@ const ::_pbi::TcParseTable<1, 2, 0, 0, 2> ValueAtHeightResponse::_table_ = { ::_pbi::TcParser::GetTable<::tari::rpc::ValueAtHeightResponse>(), // to_prefetch #endif // PROTOBUF_PREFETCH_PARSE_TABLE }, {{ - // uint64 height = 2; + {::_pbi::TcParser::MiniParse, {}}, + // uint64 circulating_supply = 1; + {::_pbi::TcParser::SingularVarintNoZag1<::uint64_t, offsetof(ValueAtHeightResponse, _impl_.circulating_supply_), 63>(), + {8, 63, 0, PROTOBUF_FIELD_OFFSET(ValueAtHeightResponse, _impl_.circulating_supply_)}}, + // uint64 spendable_supply = 2; + {::_pbi::TcParser::SingularVarintNoZag1<::uint64_t, offsetof(ValueAtHeightResponse, _impl_.spendable_supply_), 63>(), + {16, 63, 0, PROTOBUF_FIELD_OFFSET(ValueAtHeightResponse, _impl_.spendable_supply_)}}, + // uint64 height = 3; {::_pbi::TcParser::SingularVarintNoZag1<::uint64_t, offsetof(ValueAtHeightResponse, _impl_.height_), 63>(), - {16, 63, 0, PROTOBUF_FIELD_OFFSET(ValueAtHeightResponse, _impl_.height_)}}, - // uint64 value = 1; - {::_pbi::TcParser::SingularVarintNoZag1<::uint64_t, offsetof(ValueAtHeightResponse, _impl_.value_), 63>(), - {8, 63, 0, PROTOBUF_FIELD_OFFSET(ValueAtHeightResponse, _impl_.value_)}}, + {24, 63, 0, PROTOBUF_FIELD_OFFSET(ValueAtHeightResponse, _impl_.height_)}}, }}, {{ 65535, 65535 }}, {{ - // uint64 value = 1; - {PROTOBUF_FIELD_OFFSET(ValueAtHeightResponse, _impl_.value_), 0, 0, + // uint64 circulating_supply = 1; + {PROTOBUF_FIELD_OFFSET(ValueAtHeightResponse, _impl_.circulating_supply_), 0, 0, (0 | ::_fl::kFcSingular | ::_fl::kUInt64)}, - // uint64 height = 2; + // uint64 spendable_supply = 2; + {PROTOBUF_FIELD_OFFSET(ValueAtHeightResponse, _impl_.spendable_supply_), 0, 0, + (0 | ::_fl::kFcSingular | ::_fl::kUInt64)}, + // uint64 height = 3; {PROTOBUF_FIELD_OFFSET(ValueAtHeightResponse, _impl_.height_), 0, 0, (0 | ::_fl::kFcSingular | ::_fl::kUInt64)}, }}, @@ -6796,18 +6886,25 @@ const ::_pbi::TcParseTable<1, 2, 0, 0, 2> ValueAtHeightResponse::_table_ = { ::uint32_t cached_has_bits = 0; (void)cached_has_bits; - // uint64 value = 1; - if (this->_internal_value() != 0) { + // uint64 circulating_supply = 1; + if (this->_internal_circulating_supply() != 0) { target = stream->EnsureSpace(target); target = ::_pbi::WireFormatLite::WriteUInt64ToArray( - 1, this->_internal_value(), target); + 1, this->_internal_circulating_supply(), target); } - // uint64 height = 2; + // uint64 spendable_supply = 2; + if (this->_internal_spendable_supply() != 0) { + target = stream->EnsureSpace(target); + target = ::_pbi::WireFormatLite::WriteUInt64ToArray( + 2, this->_internal_spendable_supply(), target); + } + + // uint64 height = 3; if (this->_internal_height() != 0) { target = stream->EnsureSpace(target); target = ::_pbi::WireFormatLite::WriteUInt64ToArray( - 2, this->_internal_height(), target); + 3, this->_internal_height(), target); } if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) { @@ -6827,13 +6924,19 @@ const ::_pbi::TcParseTable<1, 2, 0, 0, 2> ValueAtHeightResponse::_table_ = { // Prevent compiler warnings about cached_has_bits being unused (void) cached_has_bits; - // uint64 value = 1; - if (this->_internal_value() != 0) { + // uint64 circulating_supply = 1; + if (this->_internal_circulating_supply() != 0) { total_size += ::_pbi::WireFormatLite::UInt64SizePlusOne( - this->_internal_value()); + this->_internal_circulating_supply()); } - // uint64 height = 2; + // uint64 spendable_supply = 2; + if (this->_internal_spendable_supply() != 0) { + total_size += ::_pbi::WireFormatLite::UInt64SizePlusOne( + this->_internal_spendable_supply()); + } + + // uint64 height = 3; if (this->_internal_height() != 0) { total_size += ::_pbi::WireFormatLite::UInt64SizePlusOne( this->_internal_height()); @@ -6851,8 +6954,11 @@ void ValueAtHeightResponse::MergeImpl(::google::protobuf::MessageLite& to_msg, c ::uint32_t cached_has_bits = 0; (void) cached_has_bits; - if (from._internal_value() != 0) { - _this->_impl_.value_ = from._impl_.value_; + if (from._internal_circulating_supply() != 0) { + _this->_impl_.circulating_supply_ = from._impl_.circulating_supply_; + } + if (from._internal_spendable_supply() != 0) { + _this->_impl_.spendable_supply_ = from._impl_.spendable_supply_; } if (from._internal_height() != 0) { _this->_impl_.height_ = from._impl_.height_; @@ -6877,9 +6983,9 @@ void ValueAtHeightResponse::InternalSwap(ValueAtHeightResponse* PROTOBUF_RESTRIC ::google::protobuf::internal::memswap< PROTOBUF_FIELD_OFFSET(ValueAtHeightResponse, _impl_.height_) + sizeof(ValueAtHeightResponse::_impl_.height_) - - PROTOBUF_FIELD_OFFSET(ValueAtHeightResponse, _impl_.value_)>( - reinterpret_cast(&_impl_.value_), - reinterpret_cast(&other->_impl_.value_)); + - PROTOBUF_FIELD_OFFSET(ValueAtHeightResponse, _impl_.circulating_supply_)>( + reinterpret_cast(&_impl_.circulating_supply_), + reinterpret_cast(&other->_impl_.circulating_supply_)); } ::google::protobuf::Metadata ValueAtHeightResponse::GetMetadata() const { @@ -10266,7 +10372,8 @@ inline PROTOBUF_NDEBUG_INLINE GetNewBlockResult::Impl_::Impl_( _cached_size_{0}, block_hash_(arena, from.block_hash_), merge_mining_hash_(arena, from.merge_mining_hash_), - tari_unique_id_(arena, from.tari_unique_id_) {} + tari_unique_id_(arena, from.tari_unique_id_), + vm_key_(arena, from.vm_key_) {} GetNewBlockResult::GetNewBlockResult( ::google::protobuf::Arena* arena, @@ -10293,7 +10400,8 @@ inline PROTOBUF_NDEBUG_INLINE GetNewBlockResult::Impl_::Impl_( : _cached_size_{0}, block_hash_(arena), merge_mining_hash_(arena), - tari_unique_id_(arena) {} + tari_unique_id_(arena), + vm_key_(arena) {} inline void GetNewBlockResult::SharedCtor(::_pb::Arena* arena) { new (&_impl_) Impl_(internal_visibility(), arena); @@ -10314,6 +10422,7 @@ inline void GetNewBlockResult::SharedDtor() { _impl_.block_hash_.Destroy(); _impl_.merge_mining_hash_.Destroy(); _impl_.tari_unique_id_.Destroy(); + _impl_.vm_key_.Destroy(); delete _impl_.block_; delete _impl_.miner_data_; _impl_.~Impl_(); @@ -10343,6 +10452,7 @@ PROTOBUF_NOINLINE void GetNewBlockResult::Clear() { _impl_.block_hash_.ClearToEmpty(); _impl_.merge_mining_hash_.ClearToEmpty(); _impl_.tari_unique_id_.ClearToEmpty(); + _impl_.vm_key_.ClearToEmpty(); cached_has_bits = _impl_._has_bits_[0]; if (cached_has_bits & 0x00000003u) { if (cached_has_bits & 0x00000001u) { @@ -10366,15 +10476,15 @@ const char* GetNewBlockResult::_InternalParse( PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 -const ::_pbi::TcParseTable<3, 5, 2, 0, 2> GetNewBlockResult::_table_ = { +const ::_pbi::TcParseTable<3, 6, 2, 0, 2> GetNewBlockResult::_table_ = { { PROTOBUF_FIELD_OFFSET(GetNewBlockResult, _impl_._has_bits_), 0, // no _extensions_ - 5, 56, // max_field_number, fast_idx_mask + 6, 56, // max_field_number, fast_idx_mask offsetof(decltype(_table_), field_lookup_table), - 4294967264, // skipmap + 4294967232, // skipmap offsetof(decltype(_table_), field_entries), - 5, // num_field_entries + 6, // num_field_entries 2, // num_aux_entries offsetof(decltype(_table_), aux_entries), &_GetNewBlockResult_default_instance_._instance, @@ -10399,7 +10509,9 @@ const ::_pbi::TcParseTable<3, 5, 2, 0, 2> GetNewBlockResult::_table_ = { // .tari.rpc.MinerData miner_data = 5; {::_pbi::TcParser::FastMtS1, {42, 1, 1, PROTOBUF_FIELD_OFFSET(GetNewBlockResult, _impl_.miner_data_)}}, - {::_pbi::TcParser::MiniParse, {}}, + // bytes vm_key = 6; + {::_pbi::TcParser::FastBS1, + {50, 63, 0, PROTOBUF_FIELD_OFFSET(GetNewBlockResult, _impl_.vm_key_)}}, {::_pbi::TcParser::MiniParse, {}}, }}, {{ 65535, 65535 @@ -10419,6 +10531,9 @@ const ::_pbi::TcParseTable<3, 5, 2, 0, 2> GetNewBlockResult::_table_ = { // .tari.rpc.MinerData miner_data = 5; {PROTOBUF_FIELD_OFFSET(GetNewBlockResult, _impl_.miner_data_), _Internal::kHasBitsOffset + 1, 1, (0 | ::_fl::kFcOptional | ::_fl::kMessage | ::_fl::kTvTable)}, + // bytes vm_key = 6; + {PROTOBUF_FIELD_OFFSET(GetNewBlockResult, _impl_.vm_key_), -1, 0, + (0 | ::_fl::kFcSingular | ::_fl::kBytes | ::_fl::kRepAString)}, }}, {{ {::_pbi::TcParser::GetTable<::tari::rpc::Block>()}, {::_pbi::TcParser::GetTable<::tari::rpc::MinerData>()}, @@ -10464,6 +10579,12 @@ const ::_pbi::TcParseTable<3, 5, 2, 0, 2> GetNewBlockResult::_table_ = { 5, *_impl_.miner_data_, _impl_.miner_data_->GetCachedSize(), target, stream); } + // bytes vm_key = 6; + if (!this->_internal_vm_key().empty()) { + const std::string& _s = this->_internal_vm_key(); + target = stream->WriteBytesMaybeAliased(6, _s, target); + } + if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) { target = ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray( @@ -10499,6 +10620,12 @@ const ::_pbi::TcParseTable<3, 5, 2, 0, 2> GetNewBlockResult::_table_ = { this->_internal_tari_unique_id()); } + // bytes vm_key = 6; + if (!this->_internal_vm_key().empty()) { + total_size += 1 + ::google::protobuf::internal::WireFormatLite::BytesSize( + this->_internal_vm_key()); + } + cached_has_bits = _impl_._has_bits_[0]; if (cached_has_bits & 0x00000003u) { // .tari.rpc.Block block = 2; @@ -10536,6 +10663,9 @@ void GetNewBlockResult::MergeImpl(::google::protobuf::MessageLite& to_msg, const if (!from._internal_tari_unique_id().empty()) { _this->_internal_set_tari_unique_id(from._internal_tari_unique_id()); } + if (!from._internal_vm_key().empty()) { + _this->_internal_set_vm_key(from._internal_vm_key()); + } cached_has_bits = from._impl_._has_bits_[0]; if (cached_has_bits & 0x00000003u) { if (cached_has_bits & 0x00000001u) { @@ -10581,6 +10711,7 @@ void GetNewBlockResult::InternalSwap(GetNewBlockResult* PROTOBUF_RESTRICT other) ::_pbi::ArenaStringPtr::InternalSwap(&_impl_.block_hash_, &other->_impl_.block_hash_, arena); ::_pbi::ArenaStringPtr::InternalSwap(&_impl_.merge_mining_hash_, &other->_impl_.merge_mining_hash_, arena); ::_pbi::ArenaStringPtr::InternalSwap(&_impl_.tari_unique_id_, &other->_impl_.tari_unique_id_, arena); + ::_pbi::ArenaStringPtr::InternalSwap(&_impl_.vm_key_, &other->_impl_.vm_key_, arena); ::google::protobuf::internal::memswap< PROTOBUF_FIELD_OFFSET(GetNewBlockResult, _impl_.miner_data_) + sizeof(GetNewBlockResult::_impl_.miner_data_) @@ -15608,7 +15739,8 @@ inline PROTOBUF_NDEBUG_INLINE GetNetworkStateResponse::Impl_::Impl_( ::google::protobuf::internal::InternalVisibility visibility, ::google::protobuf::Arena* arena, const Impl_& from) : _has_bits_{from._has_bits_}, - _cached_size_{0} {} + _cached_size_{0}, + liveness_results_{visibility, arena, from.liveness_results_} {} GetNetworkStateResponse::GetNetworkStateResponse( ::google::protobuf::Arena* arena, @@ -15627,25 +15759,26 @@ GetNetworkStateResponse::GetNetworkStateResponse( offsetof(Impl_, base_node_state_), reinterpret_cast(&from._impl_) + offsetof(Impl_, base_node_state_), - offsetof(Impl_, randomx_estimated_hash_rate_) - + offsetof(Impl_, tari_randomx_estimated_hash_rate_) - offsetof(Impl_, base_node_state_) + - sizeof(Impl_::randomx_estimated_hash_rate_)); + sizeof(Impl_::tari_randomx_estimated_hash_rate_)); // @@protoc_insertion_point(copy_constructor:tari.rpc.GetNetworkStateResponse) } inline PROTOBUF_NDEBUG_INLINE GetNetworkStateResponse::Impl_::Impl_( ::google::protobuf::internal::InternalVisibility visibility, ::google::protobuf::Arena* arena) - : _cached_size_{0} {} + : _cached_size_{0}, + liveness_results_{visibility, arena} {} inline void GetNetworkStateResponse::SharedCtor(::_pb::Arena* arena) { new (&_impl_) Impl_(internal_visibility(), arena); ::memset(reinterpret_cast(&_impl_) + offsetof(Impl_, metadata_), 0, - offsetof(Impl_, randomx_estimated_hash_rate_) - + offsetof(Impl_, tari_randomx_estimated_hash_rate_) - offsetof(Impl_, metadata_) + - sizeof(Impl_::randomx_estimated_hash_rate_)); + sizeof(Impl_::tari_randomx_estimated_hash_rate_)); } GetNetworkStateResponse::~GetNetworkStateResponse() { // @@protoc_insertion_point(destructor:tari.rpc.GetNetworkStateResponse) @@ -15679,14 +15812,15 @@ PROTOBUF_NOINLINE void GetNetworkStateResponse::Clear() { // Prevent compiler warnings about cached_has_bits being unused (void) cached_has_bits; + _impl_.liveness_results_.Clear(); cached_has_bits = _impl_._has_bits_[0]; if (cached_has_bits & 0x00000001u) { ABSL_DCHECK(_impl_.metadata_ != nullptr); _impl_.metadata_->Clear(); } ::memset(&_impl_.base_node_state_, 0, static_cast<::size_t>( - reinterpret_cast(&_impl_.randomx_estimated_hash_rate_) - - reinterpret_cast(&_impl_.base_node_state_)) + sizeof(_impl_.randomx_estimated_hash_rate_)); + reinterpret_cast(&_impl_.tari_randomx_estimated_hash_rate_) - + reinterpret_cast(&_impl_.base_node_state_)) + sizeof(_impl_.tari_randomx_estimated_hash_rate_)); _impl_._has_bits_.Clear(); _internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>(); } @@ -15699,16 +15833,16 @@ const char* GetNetworkStateResponse::_InternalParse( PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 -const ::_pbi::TcParseTable<3, 7, 1, 0, 2> GetNetworkStateResponse::_table_ = { +const ::_pbi::TcParseTable<4, 10, 2, 0, 2> GetNetworkStateResponse::_table_ = { { PROTOBUF_FIELD_OFFSET(GetNetworkStateResponse, _impl_._has_bits_), 0, // no _extensions_ - 7, 56, // max_field_number, fast_idx_mask + 10, 120, // max_field_number, fast_idx_mask offsetof(decltype(_table_), field_lookup_table), - 4294967168, // skipmap + 4294966272, // skipmap offsetof(decltype(_table_), field_entries), - 7, // num_field_entries - 1, // num_aux_entries + 10, // num_field_entries + 2, // num_aux_entries offsetof(decltype(_table_), aux_entries), &_GetNetworkStateResponse_default_instance_._instance, ::_pbi::TcParser::GenericFallback, // fallback @@ -15735,9 +15869,23 @@ const ::_pbi::TcParseTable<3, 7, 1, 0, 2> GetNetworkStateResponse::_table_ = { // uint64 sha3x_estimated_hash_rate = 6; {::_pbi::TcParser::SingularVarintNoZag1<::uint64_t, offsetof(GetNetworkStateResponse, _impl_.sha3x_estimated_hash_rate_), 63>(), {48, 63, 0, PROTOBUF_FIELD_OFFSET(GetNetworkStateResponse, _impl_.sha3x_estimated_hash_rate_)}}, - // uint64 randomx_estimated_hash_rate = 7; - {::_pbi::TcParser::SingularVarintNoZag1<::uint64_t, offsetof(GetNetworkStateResponse, _impl_.randomx_estimated_hash_rate_), 63>(), - {56, 63, 0, PROTOBUF_FIELD_OFFSET(GetNetworkStateResponse, _impl_.randomx_estimated_hash_rate_)}}, + // uint64 monero_randomx_estimated_hash_rate = 7; + {::_pbi::TcParser::SingularVarintNoZag1<::uint64_t, offsetof(GetNetworkStateResponse, _impl_.monero_randomx_estimated_hash_rate_), 63>(), + {56, 63, 0, PROTOBUF_FIELD_OFFSET(GetNetworkStateResponse, _impl_.monero_randomx_estimated_hash_rate_)}}, + // uint64 num_connections = 8; + {::_pbi::TcParser::SingularVarintNoZag1<::uint64_t, offsetof(GetNetworkStateResponse, _impl_.num_connections_), 63>(), + {64, 63, 0, PROTOBUF_FIELD_OFFSET(GetNetworkStateResponse, _impl_.num_connections_)}}, + // repeated .tari.rpc.LivenessResult liveness_results = 9; + {::_pbi::TcParser::FastMtR1, + {74, 63, 1, PROTOBUF_FIELD_OFFSET(GetNetworkStateResponse, _impl_.liveness_results_)}}, + // uint64 tari_randomx_estimated_hash_rate = 10; + {::_pbi::TcParser::SingularVarintNoZag1<::uint64_t, offsetof(GetNetworkStateResponse, _impl_.tari_randomx_estimated_hash_rate_), 63>(), + {80, 63, 0, PROTOBUF_FIELD_OFFSET(GetNetworkStateResponse, _impl_.tari_randomx_estimated_hash_rate_)}}, + {::_pbi::TcParser::MiniParse, {}}, + {::_pbi::TcParser::MiniParse, {}}, + {::_pbi::TcParser::MiniParse, {}}, + {::_pbi::TcParser::MiniParse, {}}, + {::_pbi::TcParser::MiniParse, {}}, }}, {{ 65535, 65535 }}, {{ @@ -15759,11 +15907,21 @@ const ::_pbi::TcParseTable<3, 7, 1, 0, 2> GetNetworkStateResponse::_table_ = { // uint64 sha3x_estimated_hash_rate = 6; {PROTOBUF_FIELD_OFFSET(GetNetworkStateResponse, _impl_.sha3x_estimated_hash_rate_), -1, 0, (0 | ::_fl::kFcSingular | ::_fl::kUInt64)}, - // uint64 randomx_estimated_hash_rate = 7; - {PROTOBUF_FIELD_OFFSET(GetNetworkStateResponse, _impl_.randomx_estimated_hash_rate_), -1, 0, + // uint64 monero_randomx_estimated_hash_rate = 7; + {PROTOBUF_FIELD_OFFSET(GetNetworkStateResponse, _impl_.monero_randomx_estimated_hash_rate_), -1, 0, + (0 | ::_fl::kFcSingular | ::_fl::kUInt64)}, + // uint64 num_connections = 8; + {PROTOBUF_FIELD_OFFSET(GetNetworkStateResponse, _impl_.num_connections_), -1, 0, + (0 | ::_fl::kFcSingular | ::_fl::kUInt64)}, + // repeated .tari.rpc.LivenessResult liveness_results = 9; + {PROTOBUF_FIELD_OFFSET(GetNetworkStateResponse, _impl_.liveness_results_), -1, 1, + (0 | ::_fl::kFcRepeated | ::_fl::kMessage | ::_fl::kTvTable)}, + // uint64 tari_randomx_estimated_hash_rate = 10; + {PROTOBUF_FIELD_OFFSET(GetNetworkStateResponse, _impl_.tari_randomx_estimated_hash_rate_), -1, 0, (0 | ::_fl::kFcSingular | ::_fl::kUInt64)}, }}, {{ {::_pbi::TcParser::GetTable<::tari::rpc::MetaData>()}, + {::_pbi::TcParser::GetTable<::tari::rpc::LivenessResult>()}, }}, {{ }}, }; @@ -15817,11 +15975,36 @@ const ::_pbi::TcParseTable<3, 7, 1, 0, 2> GetNetworkStateResponse::_table_ = { 6, this->_internal_sha3x_estimated_hash_rate(), target); } - // uint64 randomx_estimated_hash_rate = 7; - if (this->_internal_randomx_estimated_hash_rate() != 0) { + // uint64 monero_randomx_estimated_hash_rate = 7; + if (this->_internal_monero_randomx_estimated_hash_rate() != 0) { target = stream->EnsureSpace(target); target = ::_pbi::WireFormatLite::WriteUInt64ToArray( - 7, this->_internal_randomx_estimated_hash_rate(), target); + 7, this->_internal_monero_randomx_estimated_hash_rate(), target); + } + + // uint64 num_connections = 8; + if (this->_internal_num_connections() != 0) { + target = stream->EnsureSpace(target); + target = ::_pbi::WireFormatLite::WriteUInt64ToArray( + 8, this->_internal_num_connections(), target); + } + + // repeated .tari.rpc.LivenessResult liveness_results = 9; + for (unsigned i = 0, n = static_cast( + this->_internal_liveness_results_size()); + i < n; i++) { + const auto& repfield = this->_internal_liveness_results().Get(i); + target = + ::google::protobuf::internal::WireFormatLite::InternalWriteMessage( + 9, repfield, repfield.GetCachedSize(), + target, stream); + } + + // uint64 tari_randomx_estimated_hash_rate = 10; + if (this->_internal_tari_randomx_estimated_hash_rate() != 0) { + target = stream->EnsureSpace(target); + target = ::_pbi::WireFormatLite::WriteUInt64ToArray( + 10, this->_internal_tari_randomx_estimated_hash_rate(), target); } if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) { @@ -15841,6 +16024,11 @@ const ::_pbi::TcParseTable<3, 7, 1, 0, 2> GetNetworkStateResponse::_table_ = { // Prevent compiler warnings about cached_has_bits being unused (void) cached_has_bits; + // repeated .tari.rpc.LivenessResult liveness_results = 9; + total_size += 1UL * this->_internal_liveness_results_size(); + for (const auto& msg : this->_internal_liveness_results()) { + total_size += ::google::protobuf::internal::WireFormatLite::MessageSize(msg); + } // .tari.rpc.MetaData metadata = 1; cached_has_bits = _impl_._has_bits_[0]; if (cached_has_bits & 0x00000001u) { @@ -15876,10 +16064,22 @@ const ::_pbi::TcParseTable<3, 7, 1, 0, 2> GetNetworkStateResponse::_table_ = { this->_internal_sha3x_estimated_hash_rate()); } - // uint64 randomx_estimated_hash_rate = 7; - if (this->_internal_randomx_estimated_hash_rate() != 0) { + // uint64 monero_randomx_estimated_hash_rate = 7; + if (this->_internal_monero_randomx_estimated_hash_rate() != 0) { total_size += ::_pbi::WireFormatLite::UInt64SizePlusOne( - this->_internal_randomx_estimated_hash_rate()); + this->_internal_monero_randomx_estimated_hash_rate()); + } + + // uint64 num_connections = 8; + if (this->_internal_num_connections() != 0) { + total_size += ::_pbi::WireFormatLite::UInt64SizePlusOne( + this->_internal_num_connections()); + } + + // uint64 tari_randomx_estimated_hash_rate = 10; + if (this->_internal_tari_randomx_estimated_hash_rate() != 0) { + total_size += ::_pbi::WireFormatLite::UInt64SizePlusOne( + this->_internal_tari_randomx_estimated_hash_rate()); } return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_); @@ -15895,6 +16095,8 @@ void GetNetworkStateResponse::MergeImpl(::google::protobuf::MessageLite& to_msg, ::uint32_t cached_has_bits = 0; (void) cached_has_bits; + _this->_internal_mutable_liveness_results()->MergeFrom( + from._internal_liveness_results()); cached_has_bits = from._impl_._has_bits_[0]; if (cached_has_bits & 0x00000001u) { ABSL_DCHECK(from._impl_.metadata_ != nullptr); @@ -15920,8 +16122,14 @@ void GetNetworkStateResponse::MergeImpl(::google::protobuf::MessageLite& to_msg, if (from._internal_sha3x_estimated_hash_rate() != 0) { _this->_impl_.sha3x_estimated_hash_rate_ = from._impl_.sha3x_estimated_hash_rate_; } - if (from._internal_randomx_estimated_hash_rate() != 0) { - _this->_impl_.randomx_estimated_hash_rate_ = from._impl_.randomx_estimated_hash_rate_; + if (from._internal_monero_randomx_estimated_hash_rate() != 0) { + _this->_impl_.monero_randomx_estimated_hash_rate_ = from._impl_.monero_randomx_estimated_hash_rate_; + } + if (from._internal_num_connections() != 0) { + _this->_impl_.num_connections_ = from._impl_.num_connections_; + } + if (from._internal_tari_randomx_estimated_hash_rate() != 0) { + _this->_impl_.tari_randomx_estimated_hash_rate_ = from._impl_.tari_randomx_estimated_hash_rate_; } _this->_impl_._has_bits_[0] |= cached_has_bits; _this->_internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(from._internal_metadata_); @@ -15942,9 +16150,10 @@ void GetNetworkStateResponse::InternalSwap(GetNetworkStateResponse* PROTOBUF_RES using std::swap; _internal_metadata_.InternalSwap(&other->_internal_metadata_); swap(_impl_._has_bits_[0], other->_impl_._has_bits_[0]); + _impl_.liveness_results_.InternalSwap(&other->_impl_.liveness_results_); ::google::protobuf::internal::memswap< - PROTOBUF_FIELD_OFFSET(GetNetworkStateResponse, _impl_.randomx_estimated_hash_rate_) - + sizeof(GetNetworkStateResponse::_impl_.randomx_estimated_hash_rate_) + PROTOBUF_FIELD_OFFSET(GetNetworkStateResponse, _impl_.tari_randomx_estimated_hash_rate_) + + sizeof(GetNetworkStateResponse::_impl_.tari_randomx_estimated_hash_rate_) - PROTOBUF_FIELD_OFFSET(GetNetworkStateResponse, _impl_.metadata_)>( reinterpret_cast(&_impl_.metadata_), reinterpret_cast(&other->_impl_.metadata_)); @@ -15955,6 +16164,265 @@ void GetNetworkStateResponse::InternalSwap(GetNetworkStateResponse* PROTOBUF_RES &descriptor_table_base_5fnode_2eproto_once, file_level_metadata_base_5fnode_2eproto[56]); } +// =================================================================== + +class LivenessResult::_Internal { + public: +}; + +LivenessResult::LivenessResult(::google::protobuf::Arena* arena) + : ::google::protobuf::Message(arena) { + SharedCtor(arena); + // @@protoc_insertion_point(arena_constructor:tari.rpc.LivenessResult) +} +inline PROTOBUF_NDEBUG_INLINE LivenessResult::Impl_::Impl_( + ::google::protobuf::internal::InternalVisibility visibility, ::google::protobuf::Arena* arena, + const Impl_& from) + : peer_node_id_(arena, from.peer_node_id_), + _cached_size_{0} {} + +LivenessResult::LivenessResult( + ::google::protobuf::Arena* arena, + const LivenessResult& from) + : ::google::protobuf::Message(arena) { + LivenessResult* const _this = this; + (void)_this; + _internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>( + from._internal_metadata_); + new (&_impl_) Impl_(internal_visibility(), arena, from._impl_); + ::memcpy(reinterpret_cast(&_impl_) + + offsetof(Impl_, discover_latency_), + reinterpret_cast(&from._impl_) + + offsetof(Impl_, discover_latency_), + offsetof(Impl_, ping_latency_) - + offsetof(Impl_, discover_latency_) + + sizeof(Impl_::ping_latency_)); + + // @@protoc_insertion_point(copy_constructor:tari.rpc.LivenessResult) +} +inline PROTOBUF_NDEBUG_INLINE LivenessResult::Impl_::Impl_( + ::google::protobuf::internal::InternalVisibility visibility, + ::google::protobuf::Arena* arena) + : peer_node_id_(arena), + _cached_size_{0} {} + +inline void LivenessResult::SharedCtor(::_pb::Arena* arena) { + new (&_impl_) Impl_(internal_visibility(), arena); + ::memset(reinterpret_cast(&_impl_) + + offsetof(Impl_, discover_latency_), + 0, + offsetof(Impl_, ping_latency_) - + offsetof(Impl_, discover_latency_) + + sizeof(Impl_::ping_latency_)); +} +LivenessResult::~LivenessResult() { + // @@protoc_insertion_point(destructor:tari.rpc.LivenessResult) + _internal_metadata_.Delete<::google::protobuf::UnknownFieldSet>(); + SharedDtor(); +} +inline void LivenessResult::SharedDtor() { + ABSL_DCHECK(GetArena() == nullptr); + _impl_.peer_node_id_.Destroy(); + _impl_.~Impl_(); +} + +const ::google::protobuf::MessageLite::ClassData* +LivenessResult::GetClassData() const { + PROTOBUF_CONSTINIT static const ::google::protobuf::MessageLite:: + ClassDataFull _data_ = { + { + nullptr, // OnDemandRegisterArenaDtor + PROTOBUF_FIELD_OFFSET(LivenessResult, _impl_._cached_size_), + false, + }, + &LivenessResult::MergeImpl, + &LivenessResult::kDescriptorMethods, + }; + return &_data_; +} +PROTOBUF_NOINLINE void LivenessResult::Clear() { +// @@protoc_insertion_point(message_clear_start:tari.rpc.LivenessResult) + PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); + ::uint32_t cached_has_bits = 0; + // Prevent compiler warnings about cached_has_bits being unused + (void) cached_has_bits; + + _impl_.peer_node_id_.ClearToEmpty(); + ::memset(&_impl_.discover_latency_, 0, static_cast<::size_t>( + reinterpret_cast(&_impl_.ping_latency_) - + reinterpret_cast(&_impl_.discover_latency_)) + sizeof(_impl_.ping_latency_)); + _internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>(); +} + +const char* LivenessResult::_InternalParse( + const char* ptr, ::_pbi::ParseContext* ctx) { + ptr = ::_pbi::TcParser::ParseLoop(this, ptr, ctx, &_table_.header); + return ptr; +} + + +PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 +const ::_pbi::TcParseTable<2, 3, 0, 0, 2> LivenessResult::_table_ = { + { + 0, // no _has_bits_ + 0, // no _extensions_ + 3, 24, // max_field_number, fast_idx_mask + offsetof(decltype(_table_), field_lookup_table), + 4294967288, // skipmap + offsetof(decltype(_table_), field_entries), + 3, // num_field_entries + 0, // num_aux_entries + offsetof(decltype(_table_), field_names), // no aux_entries + &_LivenessResult_default_instance_._instance, + ::_pbi::TcParser::GenericFallback, // fallback + #ifdef PROTOBUF_PREFETCH_PARSE_TABLE + ::_pbi::TcParser::GetTable<::tari::rpc::LivenessResult>(), // to_prefetch + #endif // PROTOBUF_PREFETCH_PARSE_TABLE + }, {{ + {::_pbi::TcParser::MiniParse, {}}, + // bytes peer_node_id = 1; + {::_pbi::TcParser::FastBS1, + {10, 63, 0, PROTOBUF_FIELD_OFFSET(LivenessResult, _impl_.peer_node_id_)}}, + // uint64 discover_latency = 2; + {::_pbi::TcParser::SingularVarintNoZag1<::uint64_t, offsetof(LivenessResult, _impl_.discover_latency_), 63>(), + {16, 63, 0, PROTOBUF_FIELD_OFFSET(LivenessResult, _impl_.discover_latency_)}}, + // uint64 ping_latency = 3; + {::_pbi::TcParser::SingularVarintNoZag1<::uint64_t, offsetof(LivenessResult, _impl_.ping_latency_), 63>(), + {24, 63, 0, PROTOBUF_FIELD_OFFSET(LivenessResult, _impl_.ping_latency_)}}, + }}, {{ + 65535, 65535 + }}, {{ + // bytes peer_node_id = 1; + {PROTOBUF_FIELD_OFFSET(LivenessResult, _impl_.peer_node_id_), 0, 0, + (0 | ::_fl::kFcSingular | ::_fl::kBytes | ::_fl::kRepAString)}, + // uint64 discover_latency = 2; + {PROTOBUF_FIELD_OFFSET(LivenessResult, _impl_.discover_latency_), 0, 0, + (0 | ::_fl::kFcSingular | ::_fl::kUInt64)}, + // uint64 ping_latency = 3; + {PROTOBUF_FIELD_OFFSET(LivenessResult, _impl_.ping_latency_), 0, 0, + (0 | ::_fl::kFcSingular | ::_fl::kUInt64)}, + }}, + // no aux_entries + {{ + }}, +}; + +::uint8_t* LivenessResult::_InternalSerialize( + ::uint8_t* target, + ::google::protobuf::io::EpsCopyOutputStream* stream) const { + // @@protoc_insertion_point(serialize_to_array_start:tari.rpc.LivenessResult) + ::uint32_t cached_has_bits = 0; + (void)cached_has_bits; + + // bytes peer_node_id = 1; + if (!this->_internal_peer_node_id().empty()) { + const std::string& _s = this->_internal_peer_node_id(); + target = stream->WriteBytesMaybeAliased(1, _s, target); + } + + // uint64 discover_latency = 2; + if (this->_internal_discover_latency() != 0) { + target = stream->EnsureSpace(target); + target = ::_pbi::WireFormatLite::WriteUInt64ToArray( + 2, this->_internal_discover_latency(), target); + } + + // uint64 ping_latency = 3; + if (this->_internal_ping_latency() != 0) { + target = stream->EnsureSpace(target); + target = ::_pbi::WireFormatLite::WriteUInt64ToArray( + 3, this->_internal_ping_latency(), target); + } + + if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) { + target = + ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray( + _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance), target, stream); + } + // @@protoc_insertion_point(serialize_to_array_end:tari.rpc.LivenessResult) + return target; +} + +::size_t LivenessResult::ByteSizeLong() const { +// @@protoc_insertion_point(message_byte_size_start:tari.rpc.LivenessResult) + ::size_t total_size = 0; + + ::uint32_t cached_has_bits = 0; + // Prevent compiler warnings about cached_has_bits being unused + (void) cached_has_bits; + + // bytes peer_node_id = 1; + if (!this->_internal_peer_node_id().empty()) { + total_size += 1 + ::google::protobuf::internal::WireFormatLite::BytesSize( + this->_internal_peer_node_id()); + } + + // uint64 discover_latency = 2; + if (this->_internal_discover_latency() != 0) { + total_size += ::_pbi::WireFormatLite::UInt64SizePlusOne( + this->_internal_discover_latency()); + } + + // uint64 ping_latency = 3; + if (this->_internal_ping_latency() != 0) { + total_size += ::_pbi::WireFormatLite::UInt64SizePlusOne( + this->_internal_ping_latency()); + } + + return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_); +} + + +void LivenessResult::MergeImpl(::google::protobuf::MessageLite& to_msg, const ::google::protobuf::MessageLite& from_msg) { + auto* const _this = static_cast(&to_msg); + auto& from = static_cast(from_msg); + // @@protoc_insertion_point(class_specific_merge_from_start:tari.rpc.LivenessResult) + ABSL_DCHECK_NE(&from, _this); + ::uint32_t cached_has_bits = 0; + (void) cached_has_bits; + + if (!from._internal_peer_node_id().empty()) { + _this->_internal_set_peer_node_id(from._internal_peer_node_id()); + } + if (from._internal_discover_latency() != 0) { + _this->_impl_.discover_latency_ = from._impl_.discover_latency_; + } + if (from._internal_ping_latency() != 0) { + _this->_impl_.ping_latency_ = from._impl_.ping_latency_; + } + _this->_internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(from._internal_metadata_); +} + +void LivenessResult::CopyFrom(const LivenessResult& from) { +// @@protoc_insertion_point(class_specific_copy_from_start:tari.rpc.LivenessResult) + if (&from == this) return; + Clear(); + MergeFrom(from); +} + +PROTOBUF_NOINLINE bool LivenessResult::IsInitialized() const { + return true; +} + +void LivenessResult::InternalSwap(LivenessResult* PROTOBUF_RESTRICT other) { + using std::swap; + auto* arena = GetArena(); + ABSL_DCHECK_EQ(arena, other->GetArena()); + _internal_metadata_.InternalSwap(&other->_internal_metadata_); + ::_pbi::ArenaStringPtr::InternalSwap(&_impl_.peer_node_id_, &other->_impl_.peer_node_id_, arena); + ::google::protobuf::internal::memswap< + PROTOBUF_FIELD_OFFSET(LivenessResult, _impl_.ping_latency_) + + sizeof(LivenessResult::_impl_.ping_latency_) + - PROTOBUF_FIELD_OFFSET(LivenessResult, _impl_.discover_latency_)>( + reinterpret_cast(&_impl_.discover_latency_), + reinterpret_cast(&other->_impl_.discover_latency_)); +} + +::google::protobuf::Metadata LivenessResult::GetMetadata() const { + return ::_pbi::AssignDescriptors(&descriptor_table_base_5fnode_2eproto_getter, + &descriptor_table_base_5fnode_2eproto_once, + file_level_metadata_base_5fnode_2eproto[57]); +} // @@protoc_insertion_point(namespace_scope) } // namespace rpc } // namespace tari diff --git a/external/src/Tari/proto/gRPC/base_node.pb.h b/external/src/Tari/proto/gRPC/base_node.pb.h index 924101f..f9df006 100644 --- a/external/src/Tari/proto/gRPC/base_node.pb.h +++ b/external/src/Tari/proto/gRPC/base_node.pb.h @@ -172,6 +172,9 @@ extern ListAssetRegistrationsResponseDefaultTypeInternal _ListAssetRegistrations class ListHeadersRequest; struct ListHeadersRequestDefaultTypeInternal; extern ListHeadersRequestDefaultTypeInternal _ListHeadersRequest_default_instance_; +class LivenessResult; +struct LivenessResultDefaultTypeInternal; +extern LivenessResultDefaultTypeInternal _LivenessResult_default_instance_; class MempoolStatsResponse; struct MempoolStatsResponseDefaultTypeInternal; extern MempoolStatsResponseDefaultTypeInternal _MempoolStatsResponse_default_instance_; @@ -583,20 +586,31 @@ class ValueAtHeightResponse final : public ::google::protobuf::Message // accessors ------------------------------------------------------- enum : int { - kValueFieldNumber = 1, - kHeightFieldNumber = 2, + kCirculatingSupplyFieldNumber = 1, + kSpendableSupplyFieldNumber = 2, + kHeightFieldNumber = 3, }; - // uint64 value = 1; - void clear_value() ; - ::uint64_t value() const; - void set_value(::uint64_t value); + // uint64 circulating_supply = 1; + void clear_circulating_supply() ; + ::uint64_t circulating_supply() const; + void set_circulating_supply(::uint64_t value); private: - ::uint64_t _internal_value() const; - void _internal_set_value(::uint64_t value); + ::uint64_t _internal_circulating_supply() const; + void _internal_set_circulating_supply(::uint64_t value); public: - // uint64 height = 2; + // uint64 spendable_supply = 2; + void clear_spendable_supply() ; + ::uint64_t spendable_supply() const; + void set_spendable_supply(::uint64_t value); + + private: + ::uint64_t _internal_spendable_supply() const; + void _internal_set_spendable_supply(::uint64_t value); + + public: + // uint64 height = 3; void clear_height() ; ::uint64_t height() const; void set_height(::uint64_t value); @@ -611,7 +625,7 @@ class ValueAtHeightResponse final : public ::google::protobuf::Message class _Internal; friend class ::google::protobuf::internal::TcParser; static const ::google::protobuf::internal::TcParseTable< - 1, 2, 0, + 2, 3, 0, 0, 2> _table_; friend class ::google::protobuf::MessageLite; @@ -627,7 +641,8 @@ class ValueAtHeightResponse final : public ::google::protobuf::Message ::google::protobuf::Arena* arena); inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility, ::google::protobuf::Arena* arena, const Impl_& from); - ::uint64_t value_; + ::uint64_t circulating_supply_; + ::uint64_t spendable_supply_; ::uint64_t height_; mutable ::google::protobuf::internal::CachedSize _cached_size_; PROTOBUF_TSAN_DECLARE_MEMBER @@ -2291,8 +2306,9 @@ class NetworkDifficultyResponse final : public ::google::protobuf::Message kTimestampFieldNumber = 4, kPowAlgoFieldNumber = 5, kSha3XEstimatedHashRateFieldNumber = 6, - kRandomxEstimatedHashRateFieldNumber = 7, + kMoneroRandomxEstimatedHashRateFieldNumber = 7, kNumCoinbasesFieldNumber = 8, + kTariRandomxEstimatedHashRateFieldNumber = 10, }; // repeated bytes coinbase_extras = 9; int coinbase_extras_size() const; @@ -2382,14 +2398,14 @@ class NetworkDifficultyResponse final : public ::google::protobuf::Message void _internal_set_sha3x_estimated_hash_rate(::uint64_t value); public: - // uint64 randomx_estimated_hash_rate = 7; - void clear_randomx_estimated_hash_rate() ; - ::uint64_t randomx_estimated_hash_rate() const; - void set_randomx_estimated_hash_rate(::uint64_t value); + // uint64 monero_randomx_estimated_hash_rate = 7; + void clear_monero_randomx_estimated_hash_rate() ; + ::uint64_t monero_randomx_estimated_hash_rate() const; + void set_monero_randomx_estimated_hash_rate(::uint64_t value); private: - ::uint64_t _internal_randomx_estimated_hash_rate() const; - void _internal_set_randomx_estimated_hash_rate(::uint64_t value); + ::uint64_t _internal_monero_randomx_estimated_hash_rate() const; + void _internal_set_monero_randomx_estimated_hash_rate(::uint64_t value); public: // uint64 num_coinbases = 8; @@ -2401,13 +2417,23 @@ class NetworkDifficultyResponse final : public ::google::protobuf::Message ::uint64_t _internal_num_coinbases() const; void _internal_set_num_coinbases(::uint64_t value); + public: + // uint64 tari_randomx_estimated_hash_rate = 10; + void clear_tari_randomx_estimated_hash_rate() ; + ::uint64_t tari_randomx_estimated_hash_rate() const; + void set_tari_randomx_estimated_hash_rate(::uint64_t value); + + private: + ::uint64_t _internal_tari_randomx_estimated_hash_rate() const; + void _internal_set_tari_randomx_estimated_hash_rate(::uint64_t value); + public: // @@protoc_insertion_point(class_scope:tari.rpc.NetworkDifficultyResponse) private: class _Internal; friend class ::google::protobuf::internal::TcParser; static const ::google::protobuf::internal::TcParseTable< - 4, 9, 0, + 4, 10, 0, 0, 2> _table_; friend class ::google::protobuf::MessageLite; @@ -2430,8 +2456,9 @@ class NetworkDifficultyResponse final : public ::google::protobuf::Message ::uint64_t timestamp_; ::uint64_t pow_algo_; ::uint64_t sha3x_estimated_hash_rate_; - ::uint64_t randomx_estimated_hash_rate_; + ::uint64_t monero_randomx_estimated_hash_rate_; ::uint64_t num_coinbases_; + ::uint64_t tari_randomx_estimated_hash_rate_; mutable ::google::protobuf::internal::CachedSize _cached_size_; PROTOBUF_TSAN_DECLARE_MEMBER }; @@ -2858,6 +2885,203 @@ class MempoolStatsResponse final : public ::google::protobuf::Message }; // ------------------------------------------------------------------- +class LivenessResult final : public ::google::protobuf::Message +/* @@protoc_insertion_point(class_definition:tari.rpc.LivenessResult) */ { + public: + inline LivenessResult() : LivenessResult(nullptr) {} + ~LivenessResult() override; + template + explicit PROTOBUF_CONSTEXPR LivenessResult( + ::google::protobuf::internal::ConstantInitialized); + + inline LivenessResult(const LivenessResult& from) : LivenessResult(nullptr, from) {} + inline LivenessResult(LivenessResult&& from) noexcept + : LivenessResult(nullptr, std::move(from)) {} + inline LivenessResult& operator=(const LivenessResult& from) { + CopyFrom(from); + return *this; + } + inline LivenessResult& operator=(LivenessResult&& from) noexcept { + if (this == &from) return *this; + if (GetArena() == from.GetArena() +#ifdef PROTOBUF_FORCE_COPY_IN_MOVE + && GetArena() != nullptr +#endif // !PROTOBUF_FORCE_COPY_IN_MOVE + ) { + InternalSwap(&from); + } else { + CopyFrom(from); + } + return *this; + } + + inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const + ABSL_ATTRIBUTE_LIFETIME_BOUND { + return _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance); + } + inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields() + ABSL_ATTRIBUTE_LIFETIME_BOUND { + return _internal_metadata_.mutable_unknown_fields<::google::protobuf::UnknownFieldSet>(); + } + + static const ::google::protobuf::Descriptor* descriptor() { + return GetDescriptor(); + } + static const ::google::protobuf::Descriptor* GetDescriptor() { + return default_instance().GetMetadata().descriptor; + } + static const ::google::protobuf::Reflection* GetReflection() { + return default_instance().GetMetadata().reflection; + } + static const LivenessResult& default_instance() { + return *internal_default_instance(); + } + static inline const LivenessResult* internal_default_instance() { + return reinterpret_cast( + &_LivenessResult_default_instance_); + } + static constexpr int kIndexInFileMessages = 57; + friend void swap(LivenessResult& a, LivenessResult& b) { a.Swap(&b); } + inline void Swap(LivenessResult* other) { + if (other == this) return; +#ifdef PROTOBUF_FORCE_COPY_IN_SWAP + if (GetArena() != nullptr && GetArena() == other->GetArena()) { +#else // PROTOBUF_FORCE_COPY_IN_SWAP + if (GetArena() == other->GetArena()) { +#endif // !PROTOBUF_FORCE_COPY_IN_SWAP + InternalSwap(other); + } else { + ::google::protobuf::internal::GenericSwap(this, other); + } + } + void UnsafeArenaSwap(LivenessResult* other) { + if (other == this) return; + ABSL_DCHECK(GetArena() == other->GetArena()); + InternalSwap(other); + } + + // implements Message ---------------------------------------------- + + LivenessResult* New(::google::protobuf::Arena* arena = nullptr) const final { + return ::google::protobuf::Message::DefaultConstruct(arena); + } + using ::google::protobuf::Message::CopyFrom; + void CopyFrom(const LivenessResult& from); + using ::google::protobuf::Message::MergeFrom; + void MergeFrom(const LivenessResult& from) { LivenessResult::MergeImpl(*this, from); } + + private: + static void MergeImpl( + ::google::protobuf::MessageLite& to_msg, + const ::google::protobuf::MessageLite& from_msg); + + public: + ABSL_ATTRIBUTE_REINITIALIZES void Clear() final; + bool IsInitialized() const final; + + ::size_t ByteSizeLong() const final; + const char* _InternalParse(const char* ptr, ::google::protobuf::internal::ParseContext* ctx) final; + ::uint8_t* _InternalSerialize( + ::uint8_t* target, + ::google::protobuf::io::EpsCopyOutputStream* stream) const final; + int GetCachedSize() const { return _impl_._cached_size_.Get(); } + + private: + void SharedCtor(::google::protobuf::Arena* arena); + void SharedDtor(); + void InternalSwap(LivenessResult* other); + private: + friend class ::google::protobuf::internal::AnyMetadata; + static ::absl::string_view FullMessageName() { return "tari.rpc.LivenessResult"; } + + protected: + explicit LivenessResult(::google::protobuf::Arena* arena); + LivenessResult(::google::protobuf::Arena* arena, const LivenessResult& from); + LivenessResult(::google::protobuf::Arena* arena, LivenessResult&& from) noexcept + : LivenessResult(arena) { + *this = ::std::move(from); + } + const ::google::protobuf::MessageLite::ClassData* GetClassData() + const final; + + public: + ::google::protobuf::Metadata GetMetadata() const final; + // nested types ---------------------------------------------------- + + // accessors ------------------------------------------------------- + enum : int { + kPeerNodeIdFieldNumber = 1, + kDiscoverLatencyFieldNumber = 2, + kPingLatencyFieldNumber = 3, + }; + // bytes peer_node_id = 1; + void clear_peer_node_id() ; + const std::string& peer_node_id() const; + template + void set_peer_node_id(Arg_&& arg, Args_... args); + std::string* mutable_peer_node_id(); + PROTOBUF_NODISCARD std::string* release_peer_node_id(); + void set_allocated_peer_node_id(std::string* value); + + private: + const std::string& _internal_peer_node_id() const; + inline PROTOBUF_ALWAYS_INLINE void _internal_set_peer_node_id( + const std::string& value); + std::string* _internal_mutable_peer_node_id(); + + public: + // uint64 discover_latency = 2; + void clear_discover_latency() ; + ::uint64_t discover_latency() const; + void set_discover_latency(::uint64_t value); + + private: + ::uint64_t _internal_discover_latency() const; + void _internal_set_discover_latency(::uint64_t value); + + public: + // uint64 ping_latency = 3; + void clear_ping_latency() ; + ::uint64_t ping_latency() const; + void set_ping_latency(::uint64_t value); + + private: + ::uint64_t _internal_ping_latency() const; + void _internal_set_ping_latency(::uint64_t value); + + public: + // @@protoc_insertion_point(class_scope:tari.rpc.LivenessResult) + private: + class _Internal; + friend class ::google::protobuf::internal::TcParser; + static const ::google::protobuf::internal::TcParseTable< + 2, 3, 0, + 0, 2> + _table_; + friend class ::google::protobuf::MessageLite; + friend class ::google::protobuf::Arena; + template + friend class ::google::protobuf::Arena::InternalHelper; + using InternalArenaConstructable_ = void; + using DestructorSkippable_ = void; + struct Impl_ { + inline explicit constexpr Impl_( + ::google::protobuf::internal::ConstantInitialized) noexcept; + inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility, + ::google::protobuf::Arena* arena); + inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility, + ::google::protobuf::Arena* arena, const Impl_& from); + ::google::protobuf::internal::ArenaStringPtr peer_node_id_; + ::uint64_t discover_latency_; + ::uint64_t ping_latency_; + mutable ::google::protobuf::internal::CachedSize _cached_size_; + PROTOBUF_TSAN_DECLARE_MEMBER + }; + union { Impl_ _impl_; }; + friend struct ::TableStruct_base_5fnode_2eproto; +}; +// ------------------------------------------------------------------- + class ListHeadersRequest final : public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:tari.rpc.ListHeadersRequest) */ { public: @@ -8495,14 +8719,34 @@ class GetNetworkStateResponse final : public ::google::protobuf::Message // accessors ------------------------------------------------------- enum : int { + kLivenessResultsFieldNumber = 9, kMetadataFieldNumber = 1, kBaseNodeStateFieldNumber = 3, kInitialSyncAchievedFieldNumber = 2, kFailedCheckpointsFieldNumber = 4, kRewardFieldNumber = 5, kSha3XEstimatedHashRateFieldNumber = 6, - kRandomxEstimatedHashRateFieldNumber = 7, + kMoneroRandomxEstimatedHashRateFieldNumber = 7, + kNumConnectionsFieldNumber = 8, + kTariRandomxEstimatedHashRateFieldNumber = 10, }; + // repeated .tari.rpc.LivenessResult liveness_results = 9; + int liveness_results_size() const; + private: + int _internal_liveness_results_size() const; + + public: + void clear_liveness_results() ; + ::tari::rpc::LivenessResult* mutable_liveness_results(int index); + ::google::protobuf::RepeatedPtrField<::tari::rpc::LivenessResult>* mutable_liveness_results(); + + private: + const ::google::protobuf::RepeatedPtrField<::tari::rpc::LivenessResult>& _internal_liveness_results() const; + ::google::protobuf::RepeatedPtrField<::tari::rpc::LivenessResult>* _internal_mutable_liveness_results(); + public: + const ::tari::rpc::LivenessResult& liveness_results(int index) const; + ::tari::rpc::LivenessResult* add_liveness_results(); + const ::google::protobuf::RepeatedPtrField<::tari::rpc::LivenessResult>& liveness_results() const; // .tari.rpc.MetaData metadata = 1; bool has_metadata() const; void clear_metadata() ; @@ -8568,14 +8812,34 @@ class GetNetworkStateResponse final : public ::google::protobuf::Message void _internal_set_sha3x_estimated_hash_rate(::uint64_t value); public: - // uint64 randomx_estimated_hash_rate = 7; - void clear_randomx_estimated_hash_rate() ; - ::uint64_t randomx_estimated_hash_rate() const; - void set_randomx_estimated_hash_rate(::uint64_t value); + // uint64 monero_randomx_estimated_hash_rate = 7; + void clear_monero_randomx_estimated_hash_rate() ; + ::uint64_t monero_randomx_estimated_hash_rate() const; + void set_monero_randomx_estimated_hash_rate(::uint64_t value); private: - ::uint64_t _internal_randomx_estimated_hash_rate() const; - void _internal_set_randomx_estimated_hash_rate(::uint64_t value); + ::uint64_t _internal_monero_randomx_estimated_hash_rate() const; + void _internal_set_monero_randomx_estimated_hash_rate(::uint64_t value); + + public: + // uint64 num_connections = 8; + void clear_num_connections() ; + ::uint64_t num_connections() const; + void set_num_connections(::uint64_t value); + + private: + ::uint64_t _internal_num_connections() const; + void _internal_set_num_connections(::uint64_t value); + + public: + // uint64 tari_randomx_estimated_hash_rate = 10; + void clear_tari_randomx_estimated_hash_rate() ; + ::uint64_t tari_randomx_estimated_hash_rate() const; + void set_tari_randomx_estimated_hash_rate(::uint64_t value); + + private: + ::uint64_t _internal_tari_randomx_estimated_hash_rate() const; + void _internal_set_tari_randomx_estimated_hash_rate(::uint64_t value); public: // @@protoc_insertion_point(class_scope:tari.rpc.GetNetworkStateResponse) @@ -8583,7 +8847,7 @@ class GetNetworkStateResponse final : public ::google::protobuf::Message class _Internal; friend class ::google::protobuf::internal::TcParser; static const ::google::protobuf::internal::TcParseTable< - 3, 7, 1, + 4, 10, 2, 0, 2> _table_; friend class ::google::protobuf::MessageLite; @@ -8601,13 +8865,16 @@ class GetNetworkStateResponse final : public ::google::protobuf::Message ::google::protobuf::Arena* arena, const Impl_& from); ::google::protobuf::internal::HasBits<1> _has_bits_; mutable ::google::protobuf::internal::CachedSize _cached_size_; + ::google::protobuf::RepeatedPtrField< ::tari::rpc::LivenessResult > liveness_results_; ::tari::rpc::MetaData* metadata_; int base_node_state_; bool initial_sync_achieved_; bool failed_checkpoints_; ::uint64_t reward_; ::uint64_t sha3x_estimated_hash_rate_; - ::uint64_t randomx_estimated_hash_rate_; + ::uint64_t monero_randomx_estimated_hash_rate_; + ::uint64_t num_connections_; + ::uint64_t tari_randomx_estimated_hash_rate_; PROTOBUF_TSAN_DECLARE_MEMBER }; union { Impl_ _impl_; }; @@ -11085,6 +11352,7 @@ class GetNewBlockResult final : public ::google::protobuf::Message kBlockHashFieldNumber = 1, kMergeMiningHashFieldNumber = 3, kTariUniqueIdFieldNumber = 4, + kVmKeyFieldNumber = 6, kBlockFieldNumber = 2, kMinerDataFieldNumber = 5, }; @@ -11135,6 +11403,22 @@ class GetNewBlockResult final : public ::google::protobuf::Message const std::string& value); std::string* _internal_mutable_tari_unique_id(); + public: + // bytes vm_key = 6; + void clear_vm_key() ; + const std::string& vm_key() const; + template + void set_vm_key(Arg_&& arg, Args_... args); + std::string* mutable_vm_key(); + PROTOBUF_NODISCARD std::string* release_vm_key(); + void set_allocated_vm_key(std::string* value); + + private: + const std::string& _internal_vm_key() const; + inline PROTOBUF_ALWAYS_INLINE void _internal_set_vm_key( + const std::string& value); + std::string* _internal_mutable_vm_key(); + public: // .tari.rpc.Block block = 2; bool has_block() const; @@ -11171,7 +11455,7 @@ class GetNewBlockResult final : public ::google::protobuf::Message class _Internal; friend class ::google::protobuf::internal::TcParser; static const ::google::protobuf::internal::TcParseTable< - 3, 5, 2, + 3, 6, 2, 0, 2> _table_; friend class ::google::protobuf::MessageLite; @@ -11192,6 +11476,7 @@ class GetNewBlockResult final : public ::google::protobuf::Message ::google::protobuf::internal::ArenaStringPtr block_hash_; ::google::protobuf::internal::ArenaStringPtr merge_mining_hash_; ::google::protobuf::internal::ArenaStringPtr tari_unique_id_; + ::google::protobuf::internal::ArenaStringPtr vm_key_; ::tari::rpc::Block* block_; ::tari::rpc::MinerData* miner_data_; PROTOBUF_TSAN_DECLARE_MEMBER @@ -14188,26 +14473,48 @@ inline void NetworkDifficultyResponse::_internal_set_sha3x_estimated_hash_rate(: _impl_.sha3x_estimated_hash_rate_ = value; } -// uint64 randomx_estimated_hash_rate = 7; -inline void NetworkDifficultyResponse::clear_randomx_estimated_hash_rate() { +// uint64 monero_randomx_estimated_hash_rate = 7; +inline void NetworkDifficultyResponse::clear_monero_randomx_estimated_hash_rate() { PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); - _impl_.randomx_estimated_hash_rate_ = ::uint64_t{0u}; + _impl_.monero_randomx_estimated_hash_rate_ = ::uint64_t{0u}; } -inline ::uint64_t NetworkDifficultyResponse::randomx_estimated_hash_rate() const { - // @@protoc_insertion_point(field_get:tari.rpc.NetworkDifficultyResponse.randomx_estimated_hash_rate) - return _internal_randomx_estimated_hash_rate(); +inline ::uint64_t NetworkDifficultyResponse::monero_randomx_estimated_hash_rate() const { + // @@protoc_insertion_point(field_get:tari.rpc.NetworkDifficultyResponse.monero_randomx_estimated_hash_rate) + return _internal_monero_randomx_estimated_hash_rate(); } -inline void NetworkDifficultyResponse::set_randomx_estimated_hash_rate(::uint64_t value) { - _internal_set_randomx_estimated_hash_rate(value); - // @@protoc_insertion_point(field_set:tari.rpc.NetworkDifficultyResponse.randomx_estimated_hash_rate) +inline void NetworkDifficultyResponse::set_monero_randomx_estimated_hash_rate(::uint64_t value) { + _internal_set_monero_randomx_estimated_hash_rate(value); + // @@protoc_insertion_point(field_set:tari.rpc.NetworkDifficultyResponse.monero_randomx_estimated_hash_rate) } -inline ::uint64_t NetworkDifficultyResponse::_internal_randomx_estimated_hash_rate() const { +inline ::uint64_t NetworkDifficultyResponse::_internal_monero_randomx_estimated_hash_rate() const { PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race); - return _impl_.randomx_estimated_hash_rate_; + return _impl_.monero_randomx_estimated_hash_rate_; } -inline void NetworkDifficultyResponse::_internal_set_randomx_estimated_hash_rate(::uint64_t value) { +inline void NetworkDifficultyResponse::_internal_set_monero_randomx_estimated_hash_rate(::uint64_t value) { PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); - _impl_.randomx_estimated_hash_rate_ = value; + _impl_.monero_randomx_estimated_hash_rate_ = value; +} + +// uint64 tari_randomx_estimated_hash_rate = 10; +inline void NetworkDifficultyResponse::clear_tari_randomx_estimated_hash_rate() { + PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); + _impl_.tari_randomx_estimated_hash_rate_ = ::uint64_t{0u}; +} +inline ::uint64_t NetworkDifficultyResponse::tari_randomx_estimated_hash_rate() const { + // @@protoc_insertion_point(field_get:tari.rpc.NetworkDifficultyResponse.tari_randomx_estimated_hash_rate) + return _internal_tari_randomx_estimated_hash_rate(); +} +inline void NetworkDifficultyResponse::set_tari_randomx_estimated_hash_rate(::uint64_t value) { + _internal_set_tari_randomx_estimated_hash_rate(value); + // @@protoc_insertion_point(field_set:tari.rpc.NetworkDifficultyResponse.tari_randomx_estimated_hash_rate) +} +inline ::uint64_t NetworkDifficultyResponse::_internal_tari_randomx_estimated_hash_rate() const { + PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race); + return _impl_.tari_randomx_estimated_hash_rate_; +} +inline void NetworkDifficultyResponse::_internal_set_tari_randomx_estimated_hash_rate(::uint64_t value) { + PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); + _impl_.tari_randomx_estimated_hash_rate_ = value; } // uint64 num_coinbases = 8; @@ -14338,29 +14645,51 @@ NetworkDifficultyResponse::_internal_mutable_coinbase_extras() { // ValueAtHeightResponse -// uint64 value = 1; -inline void ValueAtHeightResponse::clear_value() { +// uint64 circulating_supply = 1; +inline void ValueAtHeightResponse::clear_circulating_supply() { PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); - _impl_.value_ = ::uint64_t{0u}; + _impl_.circulating_supply_ = ::uint64_t{0u}; } -inline ::uint64_t ValueAtHeightResponse::value() const { - // @@protoc_insertion_point(field_get:tari.rpc.ValueAtHeightResponse.value) - return _internal_value(); +inline ::uint64_t ValueAtHeightResponse::circulating_supply() const { + // @@protoc_insertion_point(field_get:tari.rpc.ValueAtHeightResponse.circulating_supply) + return _internal_circulating_supply(); } -inline void ValueAtHeightResponse::set_value(::uint64_t value) { - _internal_set_value(value); - // @@protoc_insertion_point(field_set:tari.rpc.ValueAtHeightResponse.value) +inline void ValueAtHeightResponse::set_circulating_supply(::uint64_t value) { + _internal_set_circulating_supply(value); + // @@protoc_insertion_point(field_set:tari.rpc.ValueAtHeightResponse.circulating_supply) } -inline ::uint64_t ValueAtHeightResponse::_internal_value() const { +inline ::uint64_t ValueAtHeightResponse::_internal_circulating_supply() const { PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race); - return _impl_.value_; + return _impl_.circulating_supply_; } -inline void ValueAtHeightResponse::_internal_set_value(::uint64_t value) { +inline void ValueAtHeightResponse::_internal_set_circulating_supply(::uint64_t value) { PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); - _impl_.value_ = value; + _impl_.circulating_supply_ = value; } -// uint64 height = 2; +// uint64 spendable_supply = 2; +inline void ValueAtHeightResponse::clear_spendable_supply() { + PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); + _impl_.spendable_supply_ = ::uint64_t{0u}; +} +inline ::uint64_t ValueAtHeightResponse::spendable_supply() const { + // @@protoc_insertion_point(field_get:tari.rpc.ValueAtHeightResponse.spendable_supply) + return _internal_spendable_supply(); +} +inline void ValueAtHeightResponse::set_spendable_supply(::uint64_t value) { + _internal_set_spendable_supply(value); + // @@protoc_insertion_point(field_set:tari.rpc.ValueAtHeightResponse.spendable_supply) +} +inline ::uint64_t ValueAtHeightResponse::_internal_spendable_supply() const { + PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race); + return _impl_.spendable_supply_; +} +inline void ValueAtHeightResponse::_internal_set_spendable_supply(::uint64_t value) { + PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); + _impl_.spendable_supply_ = value; +} + +// uint64 height = 3; inline void ValueAtHeightResponse::clear_height() { PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); _impl_.height_ = ::uint64_t{0u}; @@ -15973,6 +16302,56 @@ inline void GetNewBlockResult::set_allocated_miner_data(::tari::rpc::MinerData* // @@protoc_insertion_point(field_set_allocated:tari.rpc.GetNewBlockResult.miner_data) } +// bytes vm_key = 6; +inline void GetNewBlockResult::clear_vm_key() { + PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); + _impl_.vm_key_.ClearToEmpty(); +} +inline const std::string& GetNewBlockResult::vm_key() const + ABSL_ATTRIBUTE_LIFETIME_BOUND { + // @@protoc_insertion_point(field_get:tari.rpc.GetNewBlockResult.vm_key) + return _internal_vm_key(); +} +template +inline PROTOBUF_ALWAYS_INLINE void GetNewBlockResult::set_vm_key(Arg_&& arg, + Args_... args) { + PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); + _impl_.vm_key_.SetBytes(static_cast(arg), args..., GetArena()); + // @@protoc_insertion_point(field_set:tari.rpc.GetNewBlockResult.vm_key) +} +inline std::string* GetNewBlockResult::mutable_vm_key() ABSL_ATTRIBUTE_LIFETIME_BOUND { + std::string* _s = _internal_mutable_vm_key(); + // @@protoc_insertion_point(field_mutable:tari.rpc.GetNewBlockResult.vm_key) + return _s; +} +inline const std::string& GetNewBlockResult::_internal_vm_key() const { + PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race); + return _impl_.vm_key_.Get(); +} +inline void GetNewBlockResult::_internal_set_vm_key(const std::string& value) { + PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); + _impl_.vm_key_.Set(value, GetArena()); +} +inline std::string* GetNewBlockResult::_internal_mutable_vm_key() { + PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); + return _impl_.vm_key_.Mutable( GetArena()); +} +inline std::string* GetNewBlockResult::release_vm_key() { + PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); + // @@protoc_insertion_point(field_release:tari.rpc.GetNewBlockResult.vm_key) + return _impl_.vm_key_.Release(); +} +inline void GetNewBlockResult::set_allocated_vm_key(std::string* value) { + PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); + _impl_.vm_key_.SetAllocated(value, GetArena()); + #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING + if (_impl_.vm_key_.IsDefault()) { + _impl_.vm_key_.Set("", GetArena()); + } + #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING + // @@protoc_insertion_point(field_set_allocated:tari.rpc.GetNewBlockResult.vm_key) +} + // ------------------------------------------------------------------- // GetNewBlockBlobResult @@ -18368,26 +18747,217 @@ inline void GetNetworkStateResponse::_internal_set_sha3x_estimated_hash_rate(::u _impl_.sha3x_estimated_hash_rate_ = value; } -// uint64 randomx_estimated_hash_rate = 7; -inline void GetNetworkStateResponse::clear_randomx_estimated_hash_rate() { +// uint64 monero_randomx_estimated_hash_rate = 7; +inline void GetNetworkStateResponse::clear_monero_randomx_estimated_hash_rate() { PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); - _impl_.randomx_estimated_hash_rate_ = ::uint64_t{0u}; + _impl_.monero_randomx_estimated_hash_rate_ = ::uint64_t{0u}; } -inline ::uint64_t GetNetworkStateResponse::randomx_estimated_hash_rate() const { - // @@protoc_insertion_point(field_get:tari.rpc.GetNetworkStateResponse.randomx_estimated_hash_rate) - return _internal_randomx_estimated_hash_rate(); +inline ::uint64_t GetNetworkStateResponse::monero_randomx_estimated_hash_rate() const { + // @@protoc_insertion_point(field_get:tari.rpc.GetNetworkStateResponse.monero_randomx_estimated_hash_rate) + return _internal_monero_randomx_estimated_hash_rate(); } -inline void GetNetworkStateResponse::set_randomx_estimated_hash_rate(::uint64_t value) { - _internal_set_randomx_estimated_hash_rate(value); - // @@protoc_insertion_point(field_set:tari.rpc.GetNetworkStateResponse.randomx_estimated_hash_rate) +inline void GetNetworkStateResponse::set_monero_randomx_estimated_hash_rate(::uint64_t value) { + _internal_set_monero_randomx_estimated_hash_rate(value); + // @@protoc_insertion_point(field_set:tari.rpc.GetNetworkStateResponse.monero_randomx_estimated_hash_rate) } -inline ::uint64_t GetNetworkStateResponse::_internal_randomx_estimated_hash_rate() const { +inline ::uint64_t GetNetworkStateResponse::_internal_monero_randomx_estimated_hash_rate() const { PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race); - return _impl_.randomx_estimated_hash_rate_; + return _impl_.monero_randomx_estimated_hash_rate_; } -inline void GetNetworkStateResponse::_internal_set_randomx_estimated_hash_rate(::uint64_t value) { +inline void GetNetworkStateResponse::_internal_set_monero_randomx_estimated_hash_rate(::uint64_t value) { PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); - _impl_.randomx_estimated_hash_rate_ = value; + _impl_.monero_randomx_estimated_hash_rate_ = value; +} + +// uint64 tari_randomx_estimated_hash_rate = 10; +inline void GetNetworkStateResponse::clear_tari_randomx_estimated_hash_rate() { + PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); + _impl_.tari_randomx_estimated_hash_rate_ = ::uint64_t{0u}; +} +inline ::uint64_t GetNetworkStateResponse::tari_randomx_estimated_hash_rate() const { + // @@protoc_insertion_point(field_get:tari.rpc.GetNetworkStateResponse.tari_randomx_estimated_hash_rate) + return _internal_tari_randomx_estimated_hash_rate(); +} +inline void GetNetworkStateResponse::set_tari_randomx_estimated_hash_rate(::uint64_t value) { + _internal_set_tari_randomx_estimated_hash_rate(value); + // @@protoc_insertion_point(field_set:tari.rpc.GetNetworkStateResponse.tari_randomx_estimated_hash_rate) +} +inline ::uint64_t GetNetworkStateResponse::_internal_tari_randomx_estimated_hash_rate() const { + PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race); + return _impl_.tari_randomx_estimated_hash_rate_; +} +inline void GetNetworkStateResponse::_internal_set_tari_randomx_estimated_hash_rate(::uint64_t value) { + PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); + _impl_.tari_randomx_estimated_hash_rate_ = value; +} + +// uint64 num_connections = 8; +inline void GetNetworkStateResponse::clear_num_connections() { + PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); + _impl_.num_connections_ = ::uint64_t{0u}; +} +inline ::uint64_t GetNetworkStateResponse::num_connections() const { + // @@protoc_insertion_point(field_get:tari.rpc.GetNetworkStateResponse.num_connections) + return _internal_num_connections(); +} +inline void GetNetworkStateResponse::set_num_connections(::uint64_t value) { + _internal_set_num_connections(value); + // @@protoc_insertion_point(field_set:tari.rpc.GetNetworkStateResponse.num_connections) +} +inline ::uint64_t GetNetworkStateResponse::_internal_num_connections() const { + PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race); + return _impl_.num_connections_; +} +inline void GetNetworkStateResponse::_internal_set_num_connections(::uint64_t value) { + PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); + _impl_.num_connections_ = value; +} + +// repeated .tari.rpc.LivenessResult liveness_results = 9; +inline int GetNetworkStateResponse::_internal_liveness_results_size() const { + return _internal_liveness_results().size(); +} +inline int GetNetworkStateResponse::liveness_results_size() const { + return _internal_liveness_results_size(); +} +inline void GetNetworkStateResponse::clear_liveness_results() { + PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); + _impl_.liveness_results_.Clear(); +} +inline ::tari::rpc::LivenessResult* GetNetworkStateResponse::mutable_liveness_results(int index) + ABSL_ATTRIBUTE_LIFETIME_BOUND { + // @@protoc_insertion_point(field_mutable:tari.rpc.GetNetworkStateResponse.liveness_results) + return _internal_mutable_liveness_results()->Mutable(index); +} +inline ::google::protobuf::RepeatedPtrField<::tari::rpc::LivenessResult>* GetNetworkStateResponse::mutable_liveness_results() + ABSL_ATTRIBUTE_LIFETIME_BOUND { + // @@protoc_insertion_point(field_mutable_list:tari.rpc.GetNetworkStateResponse.liveness_results) + PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); + return _internal_mutable_liveness_results(); +} +inline const ::tari::rpc::LivenessResult& GetNetworkStateResponse::liveness_results(int index) const + ABSL_ATTRIBUTE_LIFETIME_BOUND { + // @@protoc_insertion_point(field_get:tari.rpc.GetNetworkStateResponse.liveness_results) + return _internal_liveness_results().Get(index); +} +inline ::tari::rpc::LivenessResult* GetNetworkStateResponse::add_liveness_results() ABSL_ATTRIBUTE_LIFETIME_BOUND { + PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); + ::tari::rpc::LivenessResult* _add = _internal_mutable_liveness_results()->Add(); + // @@protoc_insertion_point(field_add:tari.rpc.GetNetworkStateResponse.liveness_results) + return _add; +} +inline const ::google::protobuf::RepeatedPtrField<::tari::rpc::LivenessResult>& GetNetworkStateResponse::liveness_results() const + ABSL_ATTRIBUTE_LIFETIME_BOUND { + // @@protoc_insertion_point(field_list:tari.rpc.GetNetworkStateResponse.liveness_results) + return _internal_liveness_results(); +} +inline const ::google::protobuf::RepeatedPtrField<::tari::rpc::LivenessResult>& +GetNetworkStateResponse::_internal_liveness_results() const { + PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race); + return _impl_.liveness_results_; +} +inline ::google::protobuf::RepeatedPtrField<::tari::rpc::LivenessResult>* +GetNetworkStateResponse::_internal_mutable_liveness_results() { + PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race); + return &_impl_.liveness_results_; +} + +// ------------------------------------------------------------------- + +// LivenessResult + +// bytes peer_node_id = 1; +inline void LivenessResult::clear_peer_node_id() { + PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); + _impl_.peer_node_id_.ClearToEmpty(); +} +inline const std::string& LivenessResult::peer_node_id() const + ABSL_ATTRIBUTE_LIFETIME_BOUND { + // @@protoc_insertion_point(field_get:tari.rpc.LivenessResult.peer_node_id) + return _internal_peer_node_id(); +} +template +inline PROTOBUF_ALWAYS_INLINE void LivenessResult::set_peer_node_id(Arg_&& arg, + Args_... args) { + PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); + _impl_.peer_node_id_.SetBytes(static_cast(arg), args..., GetArena()); + // @@protoc_insertion_point(field_set:tari.rpc.LivenessResult.peer_node_id) +} +inline std::string* LivenessResult::mutable_peer_node_id() ABSL_ATTRIBUTE_LIFETIME_BOUND { + std::string* _s = _internal_mutable_peer_node_id(); + // @@protoc_insertion_point(field_mutable:tari.rpc.LivenessResult.peer_node_id) + return _s; +} +inline const std::string& LivenessResult::_internal_peer_node_id() const { + PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race); + return _impl_.peer_node_id_.Get(); +} +inline void LivenessResult::_internal_set_peer_node_id(const std::string& value) { + PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); + _impl_.peer_node_id_.Set(value, GetArena()); +} +inline std::string* LivenessResult::_internal_mutable_peer_node_id() { + PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); + return _impl_.peer_node_id_.Mutable( GetArena()); +} +inline std::string* LivenessResult::release_peer_node_id() { + PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); + // @@protoc_insertion_point(field_release:tari.rpc.LivenessResult.peer_node_id) + return _impl_.peer_node_id_.Release(); +} +inline void LivenessResult::set_allocated_peer_node_id(std::string* value) { + PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); + _impl_.peer_node_id_.SetAllocated(value, GetArena()); + #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING + if (_impl_.peer_node_id_.IsDefault()) { + _impl_.peer_node_id_.Set("", GetArena()); + } + #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING + // @@protoc_insertion_point(field_set_allocated:tari.rpc.LivenessResult.peer_node_id) +} + +// uint64 discover_latency = 2; +inline void LivenessResult::clear_discover_latency() { + PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); + _impl_.discover_latency_ = ::uint64_t{0u}; +} +inline ::uint64_t LivenessResult::discover_latency() const { + // @@protoc_insertion_point(field_get:tari.rpc.LivenessResult.discover_latency) + return _internal_discover_latency(); +} +inline void LivenessResult::set_discover_latency(::uint64_t value) { + _internal_set_discover_latency(value); + // @@protoc_insertion_point(field_set:tari.rpc.LivenessResult.discover_latency) +} +inline ::uint64_t LivenessResult::_internal_discover_latency() const { + PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race); + return _impl_.discover_latency_; +} +inline void LivenessResult::_internal_set_discover_latency(::uint64_t value) { + PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); + _impl_.discover_latency_ = value; +} + +// uint64 ping_latency = 3; +inline void LivenessResult::clear_ping_latency() { + PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); + _impl_.ping_latency_ = ::uint64_t{0u}; +} +inline ::uint64_t LivenessResult::ping_latency() const { + // @@protoc_insertion_point(field_get:tari.rpc.LivenessResult.ping_latency) + return _internal_ping_latency(); +} +inline void LivenessResult::set_ping_latency(::uint64_t value) { + _internal_set_ping_latency(value); + // @@protoc_insertion_point(field_set:tari.rpc.LivenessResult.ping_latency) +} +inline ::uint64_t LivenessResult::_internal_ping_latency() const { + PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race); + return _impl_.ping_latency_; +} +inline void LivenessResult::_internal_set_ping_latency(::uint64_t value) { + PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); + _impl_.ping_latency_ = value; } #ifdef __GNUC__ diff --git a/external/src/Tari/proto/gRPC/base_node.proto b/external/src/Tari/proto/gRPC/base_node.proto index a0b21d8..cf56bac 100644 --- a/external/src/Tari/proto/gRPC/base_node.proto +++ b/external/src/Tari/proto/gRPC/base_node.proto @@ -218,15 +218,17 @@ message NetworkDifficultyResponse { uint64 timestamp = 4; uint64 pow_algo = 5; uint64 sha3x_estimated_hash_rate = 6; - uint64 randomx_estimated_hash_rate = 7; + uint64 monero_randomx_estimated_hash_rate = 7; + uint64 tari_randomx_estimated_hash_rate = 10; uint64 num_coinbases = 8; repeated bytes coinbase_extras = 9; } // A generic single value response for a specific height message ValueAtHeightResponse { - uint64 value= 1; - uint64 height = 2; + uint64 circulating_supply = 1; + uint64 spendable_supply = 2; + uint64 height = 3; } // A generic uint value @@ -382,6 +384,7 @@ message GetNewBlockResult{ bytes merge_mining_hash =3; bytes tari_unique_id =4; MinerData miner_data = 5; + bytes vm_key = 6; } // This is the message that is returned for a miner after it asks for a new block. @@ -539,6 +542,20 @@ message GetNetworkStateResponse { // estimate sha3x hash rate uint64 sha3x_estimated_hash_rate = 6; // estimate randomx hash rate - uint64 randomx_estimated_hash_rate = 7; + uint64 monero_randomx_estimated_hash_rate = 7; + uint64 tari_randomx_estimated_hash_rate = 10; + // number of connections + uint64 num_connections = 8; + //liveness results + repeated LivenessResult liveness_results = 9; +} + +message LivenessResult{ + // node id + bytes peer_node_id = 1; + // time to discover + uint64 discover_latency = 2; + // Dial latency + uint64 ping_latency = 3; } diff --git a/external/src/Tari/proto/gRPC/block.pb.cc b/external/src/Tari/proto/gRPC/block.pb.cc index ffa5381..9216297 100644 --- a/external/src/Tari/proto/gRPC/block.pb.cc +++ b/external/src/Tari/proto/gRPC/block.pb.cc @@ -371,22 +371,22 @@ const char descriptor_table_protodef_block_2eproto[] ABSL_ATTRIBUTE_SECTION_VARI "tal_script_offset\030\017 \001(\014\022\031\n\021validator_nod" "e_mr\030\020 \001(\014\022\033\n\023validator_node_size\030\021 \001(\004\"" "1\n\013ProofOfWork\022\020\n\010pow_algo\030\001 \001(\004\022\020\n\010pow_" - "data\030\004 \001(\014\"o\n\007PowAlgo\022,\n\010pow_algo\030\001 \001(\0162" - "\032.tari.rpc.PowAlgo.PowAlgos\"6\n\010PowAlgos\022" - "\025\n\021POW_ALGOS_RANDOMX\020\000\022\023\n\017POW_ALGOS_SHA3" - "X\020\001\"U\n\005Block\022%\n\006header\030\001 \001(\0132\025.tari.rpc." - "BlockHeader\022%\n\004body\030\002 \001(\0132\027.tari.rpc.Agg" - "regateBody\"H\n\017HistoricalBlock\022\025\n\rconfirm" - "ations\030\001 \001(\004\022\036\n\005block\030\002 \001(\0132\017.tari.rpc.B" - "lock\"\252\001\n\026NewBlockHeaderTemplate\022\017\n\007versi" - "on\030\001 \001(\r\022\016\n\006height\030\002 \001(\004\022\021\n\tprev_hash\030\003 " - "\001(\014\022\033\n\023total_kernel_offset\030\004 \001(\014\022\"\n\003pow\030" - "\005 \001(\0132\025.tari.rpc.ProofOfWork\022\033\n\023total_sc" - "ript_offset\030\007 \001(\014\"\207\001\n\020NewBlockTemplate\0220" - "\n\006header\030\001 \001(\0132 .tari.rpc.NewBlockHeader" - "Template\022%\n\004body\030\002 \001(\0132\027.tari.rpc.Aggreg" - "ateBody\022\032\n\022is_mempool_in_sync\030\003 \001(\010b\006pro" - "to3" + "data\030\004 \001(\014\"\210\001\n\007PowAlgo\022,\n\010pow_algo\030\001 \001(\016" + "2\032.tari.rpc.PowAlgo.PowAlgos\"O\n\010PowAlgos" + "\022\026\n\022POW_ALGOS_RANDOMXM\020\000\022\023\n\017POW_ALGOS_SH" + "A3X\020\001\022\026\n\022POW_ALGOS_RANDOMXT\020\002\"U\n\005Block\022%" + "\n\006header\030\001 \001(\0132\025.tari.rpc.BlockHeader\022%\n" + "\004body\030\002 \001(\0132\027.tari.rpc.AggregateBody\"H\n\017" + "HistoricalBlock\022\025\n\rconfirmations\030\001 \001(\004\022\036" + "\n\005block\030\002 \001(\0132\017.tari.rpc.Block\"\252\001\n\026NewBl" + "ockHeaderTemplate\022\017\n\007version\030\001 \001(\r\022\016\n\006he" + "ight\030\002 \001(\004\022\021\n\tprev_hash\030\003 \001(\014\022\033\n\023total_k" + "ernel_offset\030\004 \001(\014\022\"\n\003pow\030\005 \001(\0132\025.tari.r" + "pc.ProofOfWork\022\033\n\023total_script_offset\030\007 " + "\001(\014\"\207\001\n\020NewBlockTemplate\0220\n\006header\030\001 \001(\013" + "2 .tari.rpc.NewBlockHeaderTemplate\022%\n\004bo" + "dy\030\002 \001(\0132\027.tari.rpc.AggregateBody\022\032\n\022is_" + "mempool_in_sync\030\003 \001(\010b\006proto3" }; static const ::_pbi::DescriptorTable* const descriptor_table_block_2eproto_deps[1] = { @@ -396,7 +396,7 @@ static ::absl::once_flag descriptor_table_block_2eproto_once; const ::_pbi::DescriptorTable descriptor_table_block_2eproto = { false, false, - 1083, + 1109, descriptor_table_protodef_block_2eproto, "block.proto", &descriptor_table_block_2eproto_once, @@ -432,15 +432,16 @@ const ::google::protobuf::EnumDescriptor* PowAlgo_PowAlgos_descriptor() { return file_level_enum_descriptors_block_2eproto[0]; } PROTOBUF_CONSTINIT const uint32_t PowAlgo_PowAlgos_internal_data_[] = { - 131072u, 0u, }; + 196608u, 0u, }; bool PowAlgo_PowAlgos_IsValid(int value) { - return 0 <= value && value <= 1; + return 0 <= value && value <= 2; } #if (__cplusplus < 201703) && \ (!defined(_MSC_VER) || (_MSC_VER >= 1900 && _MSC_VER < 1912)) -constexpr PowAlgo_PowAlgos PowAlgo::POW_ALGOS_RANDOMX; +constexpr PowAlgo_PowAlgos PowAlgo::POW_ALGOS_RANDOMXM; constexpr PowAlgo_PowAlgos PowAlgo::POW_ALGOS_SHA3X; +constexpr PowAlgo_PowAlgos PowAlgo::POW_ALGOS_RANDOMXT; constexpr PowAlgo_PowAlgos PowAlgo::PowAlgos_MIN; constexpr PowAlgo_PowAlgos PowAlgo::PowAlgos_MAX; constexpr int PowAlgo::PowAlgos_ARRAYSIZE; diff --git a/external/src/Tari/proto/gRPC/block.pb.h b/external/src/Tari/proto/gRPC/block.pb.h index 4fba76b..b579dd2 100644 --- a/external/src/Tari/proto/gRPC/block.pb.h +++ b/external/src/Tari/proto/gRPC/block.pb.h @@ -84,8 +84,9 @@ namespace protobuf { namespace tari { namespace rpc { enum PowAlgo_PowAlgos : int { - PowAlgo_PowAlgos_POW_ALGOS_RANDOMX = 0, + PowAlgo_PowAlgos_POW_ALGOS_RANDOMXM = 0, PowAlgo_PowAlgos_POW_ALGOS_SHA3X = 1, + PowAlgo_PowAlgos_POW_ALGOS_RANDOMXT = 2, PowAlgo_PowAlgos_PowAlgo_PowAlgos_INT_MIN_SENTINEL_DO_NOT_USE_ = std::numeric_limits<::int32_t>::min(), PowAlgo_PowAlgos_PowAlgo_PowAlgos_INT_MAX_SENTINEL_DO_NOT_USE_ = @@ -95,8 +96,8 @@ enum PowAlgo_PowAlgos : int { bool PowAlgo_PowAlgos_IsValid(int value); extern const uint32_t PowAlgo_PowAlgos_internal_data_[]; constexpr PowAlgo_PowAlgos PowAlgo_PowAlgos_PowAlgos_MIN = static_cast(0); -constexpr PowAlgo_PowAlgos PowAlgo_PowAlgos_PowAlgos_MAX = static_cast(1); -constexpr int PowAlgo_PowAlgos_PowAlgos_ARRAYSIZE = 1 + 1; +constexpr PowAlgo_PowAlgos PowAlgo_PowAlgos_PowAlgos_MAX = static_cast(2); +constexpr int PowAlgo_PowAlgos_PowAlgos_ARRAYSIZE = 2 + 1; const ::google::protobuf::EnumDescriptor* PowAlgo_PowAlgos_descriptor(); template @@ -109,7 +110,7 @@ const std::string& PowAlgo_PowAlgos_Name(T value) { template <> inline const std::string& PowAlgo_PowAlgos_Name(PowAlgo_PowAlgos value) { return ::google::protobuf::internal::NameOfDenseEnum( + 0, 2>( static_cast(value)); } inline bool PowAlgo_PowAlgos_Parse(absl::string_view name, PowAlgo_PowAlgos* value) { @@ -430,8 +431,9 @@ class PowAlgo final : public ::google::protobuf::Message ::google::protobuf::Metadata GetMetadata() const final; // nested types ---------------------------------------------------- using PowAlgos = PowAlgo_PowAlgos; - static constexpr PowAlgos POW_ALGOS_RANDOMX = PowAlgo_PowAlgos_POW_ALGOS_RANDOMX; + static constexpr PowAlgos POW_ALGOS_RANDOMXM = PowAlgo_PowAlgos_POW_ALGOS_RANDOMXM; static constexpr PowAlgos POW_ALGOS_SHA3X = PowAlgo_PowAlgos_POW_ALGOS_SHA3X; + static constexpr PowAlgos POW_ALGOS_RANDOMXT = PowAlgo_PowAlgos_POW_ALGOS_RANDOMXT; static inline bool PowAlgos_IsValid(int value) { return PowAlgo_PowAlgos_IsValid(value); } diff --git a/external/src/Tari/proto/gRPC/block.proto b/external/src/Tari/proto/gRPC/block.proto index e5968c0..9a4971c 100644 --- a/external/src/Tari/proto/gRPC/block.proto +++ b/external/src/Tari/proto/gRPC/block.proto @@ -80,8 +80,9 @@ message ProofOfWork { message PowAlgo { // The permitted pow algorithms enum PowAlgos { - POW_ALGOS_RANDOMX = 0; // Accessible as `grpc::pow_algo::PowAlgos::Randomx` + POW_ALGOS_RANDOMXM = 0; // Accessible as `grpc::pow_algo::PowAlgos::RandomxM` POW_ALGOS_SHA3X = 1; // Accessible as `grpc::pow_algo::PowAlgos::Sha3x` + POW_ALGOS_RANDOMXT = 2; // Accessible as `grpc::pow_algo::PowAlgos::RandomxT` } // The pow algo to use PowAlgos pow_algo = 1; diff --git a/src/merge_mining_client_tari.cpp b/src/merge_mining_client_tari.cpp index 8fd9503..3399d16 100644 --- a/src/merge_mining_client_tari.cpp +++ b/src/merge_mining_client_tari.cpp @@ -332,7 +332,7 @@ void MergeMiningClientTari::submit_solution(const std::vector& coinbase } ProofOfWork* pow = block.mutable_header()->mutable_pow(); - pow->set_pow_algo(PowAlgo_PowAlgos_POW_ALGOS_RANDOMX); + pow->set_pow_algo(PowAlgo_PowAlgos_POW_ALGOS_RANDOMXM); { std::string data; @@ -583,7 +583,7 @@ void MergeMiningClientTari::run() GetNewBlockTemplateWithCoinbasesRequest request{}; PowAlgo* algo = new PowAlgo(); - algo->set_pow_algo(PowAlgo_PowAlgos_POW_ALGOS_RANDOMX); + algo->set_pow_algo(PowAlgo_PowAlgos_POW_ALGOS_RANDOMXM); request.clear_algo(); request.set_allocated_algo(algo);