Updated Tari gRPC proto files

This commit is contained in:
SChernykh 2025-03-19 13:43:59 +01:00
parent 6178277745
commit f94d411f3c
18 changed files with 2733 additions and 491 deletions

View file

@ -70,7 +70,7 @@ jobs:
run: |
mkdir build
cd build
cmake .. -DCMAKE_BUILD_TYPE=Release -DCMAKE_C_FLAGS='${{ matrix.config.flags }} -Wl,-s -Wl,--gc-sections' -DCMAKE_CXX_FLAGS='${{ matrix.config.flags }} -Wl,-s -Wl,--gc-sections' -DSTATIC_BINARY=ON -DARCH_ID=${{ matrix.config.arch }}
cmake .. -DCMAKE_BUILD_TYPE=Release -DCMAKE_C_FLAGS='${{ matrix.config.flags }} -Wl,-s -Wl,--gc-sections' -DCMAKE_CXX_FLAGS='${{ matrix.config.flags }} -Wl,-s -Wl,--gc-sections' -DSTATIC_BINARY=ON -DARCH_ID=${{ matrix.config.arch }}
make -j$(nproc) p2pool
- name: Run RandomX tests
@ -87,7 +87,7 @@ jobs:
cd tests
mkdir build
cd build
cmake .. -DCMAKE_BUILD_TYPE=Release -DCMAKE_C_FLAGS='${{ matrix.config.flags }} -Wl,-s -Wl,--gc-sections' -DCMAKE_CXX_FLAGS='${{ matrix.config.flags }} -Wl,-s -Wl,--gc-sections' -DSTATIC_LIBS=ON -DARCH_ID=${{ matrix.config.arch }}
cmake .. -DCMAKE_BUILD_TYPE=Release -DCMAKE_C_FLAGS='${{ matrix.config.flags }} -Wl,-s -Wl,--gc-sections' -DCMAKE_CXX_FLAGS='${{ matrix.config.flags }} -Wl,-s -Wl,--gc-sections' -DSTATIC_LIBS=ON -DARCH_ID=${{ matrix.config.arch }}
make -j$(nproc)
- name: Run tests
@ -220,7 +220,7 @@ jobs:
run: |
mkdir build
cd build
cmake .. -DCMAKE_BUILD_TYPE=Release -DCMAKE_C_FLAGS='${{ matrix.config.flags }} -Wl,-s -Wl,--gc-sections' -DCMAKE_CXX_FLAGS='${{ matrix.config.flags }} -Wl,-s -Wl,--gc-sections' -DSTATIC_LIBS=ON
cmake .. -DCMAKE_BUILD_TYPE=Release -DCMAKE_C_FLAGS='${{ matrix.config.flags }} -Wl,-s -Wl,--gc-sections' -DCMAKE_CXX_FLAGS='${{ matrix.config.flags }} -Wl,-s -Wl,--gc-sections' -DSTATIC_LIBS=ON
make -j$(nproc) p2pool
- name: Run RandomX tests
@ -235,7 +235,7 @@ jobs:
cd tests
mkdir build
cd build
cmake .. -DCMAKE_BUILD_TYPE=Release -DCMAKE_C_FLAGS='${{ matrix.config.flags }} -Wl,-s -Wl,--gc-sections' -DCMAKE_CXX_FLAGS='${{ matrix.config.flags }} -Wl,-s -Wl,--gc-sections' -DSTATIC_LIBS=ON
cmake .. -DCMAKE_BUILD_TYPE=Release -DCMAKE_C_FLAGS='${{ matrix.config.flags }} -Wl,-s -Wl,--gc-sections' -DCMAKE_CXX_FLAGS='${{ matrix.config.flags }} -Wl,-s -Wl,--gc-sections' -DSTATIC_LIBS=ON
make -j$(nproc)
- name: Run tests

View file

@ -385,7 +385,7 @@ add_definitions("-DRAPIDJSON_PARSE_DEFAULT_FLAGS=kParseTrailingCommasFlag")
add_executable(${CMAKE_PROJECT_NAME} ${HEADERS} ${SOURCES})
if (STATIC_BINARY OR STATIC_LIBS)
if (NOT (DEV_WITH_TSAN OR DEV_WITH_MSAN OR DEV_WITH_UBSAN OR DEV_WITH_ASAN))
if ((CMAKE_BUILD_TYPE STREQUAL "Release") AND (NOT (DEV_WITH_TSAN OR DEV_WITH_MSAN OR DEV_WITH_UBSAN OR DEV_WITH_ASAN)))
if (WIN32)
add_custom_command(TARGET ${CMAKE_PROJECT_NAME} POST_BUILD COMMAND ${CMAKE_STRIP} "${CMAKE_PROJECT_NAME}.exe")
else()

View file

@ -59,6 +59,7 @@ static const char* BaseNode_method_names[] = {
"/tari.rpc.BaseNode/GetShardKey",
"/tari.rpc.BaseNode/GetTemplateRegistrations",
"/tari.rpc.BaseNode/GetSideChainUtxos",
"/tari.rpc.BaseNode/GetNetworkState",
};
std::unique_ptr< BaseNode::Stub> BaseNode::NewStub(const std::shared_ptr< ::grpc::ChannelInterface>& channel, const ::grpc::StubOptions& options) {
@ -104,6 +105,7 @@ BaseNode::Stub::Stub(const std::shared_ptr< ::grpc::ChannelInterface>& channel,
, rpcmethod_GetShardKey_(BaseNode_method_names[33], options.suffix_for_stats(),::grpc::internal::RpcMethod::NORMAL_RPC, channel)
, rpcmethod_GetTemplateRegistrations_(BaseNode_method_names[34], options.suffix_for_stats(),::grpc::internal::RpcMethod::SERVER_STREAMING, channel)
, rpcmethod_GetSideChainUtxos_(BaseNode_method_names[35], options.suffix_for_stats(),::grpc::internal::RpcMethod::SERVER_STREAMING, channel)
, rpcmethod_GetNetworkState_(BaseNode_method_names[36], options.suffix_for_stats(),::grpc::internal::RpcMethod::NORMAL_RPC, channel)
{}
::grpc::ClientReader< ::tari::rpc::BlockHeaderResponse>* BaseNode::Stub::ListHeadersRaw(::grpc::ClientContext* context, const ::tari::rpc::ListHeadersRequest& request) {
@ -850,6 +852,29 @@ void BaseNode::Stub::async::GetSideChainUtxos(::grpc::ClientContext* context, co
return ::grpc::internal::ClientAsyncReaderFactory< ::tari::rpc::GetSideChainUtxosResponse>::Create(channel_.get(), cq, rpcmethod_GetSideChainUtxos_, context, request, false, nullptr);
}
::grpc::Status BaseNode::Stub::GetNetworkState(::grpc::ClientContext* context, const ::tari::rpc::GetNetworkStateRequest& request, ::tari::rpc::GetNetworkStateResponse* response) {
return ::grpc::internal::BlockingUnaryCall< ::tari::rpc::GetNetworkStateRequest, ::tari::rpc::GetNetworkStateResponse, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(channel_.get(), rpcmethod_GetNetworkState_, context, request, response);
}
void BaseNode::Stub::async::GetNetworkState(::grpc::ClientContext* context, const ::tari::rpc::GetNetworkStateRequest* request, ::tari::rpc::GetNetworkStateResponse* response, std::function<void(::grpc::Status)> f) {
::grpc::internal::CallbackUnaryCall< ::tari::rpc::GetNetworkStateRequest, ::tari::rpc::GetNetworkStateResponse, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(stub_->channel_.get(), stub_->rpcmethod_GetNetworkState_, context, request, response, std::move(f));
}
void BaseNode::Stub::async::GetNetworkState(::grpc::ClientContext* context, const ::tari::rpc::GetNetworkStateRequest* request, ::tari::rpc::GetNetworkStateResponse* response, ::grpc::ClientUnaryReactor* reactor) {
::grpc::internal::ClientCallbackUnaryFactory::Create< ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(stub_->channel_.get(), stub_->rpcmethod_GetNetworkState_, context, request, response, reactor);
}
::grpc::ClientAsyncResponseReader< ::tari::rpc::GetNetworkStateResponse>* BaseNode::Stub::PrepareAsyncGetNetworkStateRaw(::grpc::ClientContext* context, const ::tari::rpc::GetNetworkStateRequest& request, ::grpc::CompletionQueue* cq) {
return ::grpc::internal::ClientAsyncResponseReaderHelper::Create< ::tari::rpc::GetNetworkStateResponse, ::tari::rpc::GetNetworkStateRequest, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(channel_.get(), cq, rpcmethod_GetNetworkState_, context, request);
}
::grpc::ClientAsyncResponseReader< ::tari::rpc::GetNetworkStateResponse>* BaseNode::Stub::AsyncGetNetworkStateRaw(::grpc::ClientContext* context, const ::tari::rpc::GetNetworkStateRequest& request, ::grpc::CompletionQueue* cq) {
auto* result =
this->PrepareAsyncGetNetworkStateRaw(context, request, cq);
result->StartCall();
return result;
}
BaseNode::Service::Service() {
AddMethod(new ::grpc::internal::RpcServiceMethod(
BaseNode_method_names[0],
@ -1211,6 +1236,16 @@ BaseNode::Service::Service() {
::grpc::ServerWriter<::tari::rpc::GetSideChainUtxosResponse>* writer) {
return service->GetSideChainUtxos(ctx, req, writer);
}, this)));
AddMethod(new ::grpc::internal::RpcServiceMethod(
BaseNode_method_names[36],
::grpc::internal::RpcMethod::NORMAL_RPC,
new ::grpc::internal::RpcMethodHandler< BaseNode::Service, ::tari::rpc::GetNetworkStateRequest, ::tari::rpc::GetNetworkStateResponse, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(
[](BaseNode::Service* service,
::grpc::ServerContext* ctx,
const ::tari::rpc::GetNetworkStateRequest* req,
::tari::rpc::GetNetworkStateResponse* resp) {
return service->GetNetworkState(ctx, req, resp);
}, this)));
}
BaseNode::Service::~Service() {
@ -1468,6 +1503,13 @@ BaseNode::Service::~Service() {
return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
}
::grpc::Status BaseNode::Service::GetNetworkState(::grpc::ServerContext* context, const ::tari::rpc::GetNetworkStateRequest* request, ::tari::rpc::GetNetworkStateResponse* response) {
(void) context;
(void) request;
(void) response;
return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
}
} // namespace tari
} // namespace rpc

View file

@ -367,6 +367,13 @@ class BaseNode final {
std::unique_ptr< ::grpc::ClientAsyncReaderInterface< ::tari::rpc::GetSideChainUtxosResponse>> PrepareAsyncGetSideChainUtxos(::grpc::ClientContext* context, const ::tari::rpc::GetSideChainUtxosRequest& request, ::grpc::CompletionQueue* cq) {
return std::unique_ptr< ::grpc::ClientAsyncReaderInterface< ::tari::rpc::GetSideChainUtxosResponse>>(PrepareAsyncGetSideChainUtxosRaw(context, request, cq));
}
virtual ::grpc::Status GetNetworkState(::grpc::ClientContext* context, const ::tari::rpc::GetNetworkStateRequest& request, ::tari::rpc::GetNetworkStateResponse* response) = 0;
std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::tari::rpc::GetNetworkStateResponse>> AsyncGetNetworkState(::grpc::ClientContext* context, const ::tari::rpc::GetNetworkStateRequest& request, ::grpc::CompletionQueue* cq) {
return std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::tari::rpc::GetNetworkStateResponse>>(AsyncGetNetworkStateRaw(context, request, cq));
}
std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::tari::rpc::GetNetworkStateResponse>> PrepareAsyncGetNetworkState(::grpc::ClientContext* context, const ::tari::rpc::GetNetworkStateRequest& request, ::grpc::CompletionQueue* cq) {
return std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::tari::rpc::GetNetworkStateResponse>>(PrepareAsyncGetNetworkStateRaw(context, request, cq));
}
class async_interface {
public:
virtual ~async_interface() {}
@ -462,6 +469,8 @@ class BaseNode final {
// Get templates
virtual void GetTemplateRegistrations(::grpc::ClientContext* context, const ::tari::rpc::GetTemplateRegistrationsRequest* request, ::grpc::ClientReadReactor< ::tari::rpc::GetTemplateRegistrationResponse>* reactor) = 0;
virtual void GetSideChainUtxos(::grpc::ClientContext* context, const ::tari::rpc::GetSideChainUtxosRequest* request, ::grpc::ClientReadReactor< ::tari::rpc::GetSideChainUtxosResponse>* reactor) = 0;
virtual void GetNetworkState(::grpc::ClientContext* context, const ::tari::rpc::GetNetworkStateRequest* request, ::tari::rpc::GetNetworkStateResponse* response, std::function<void(::grpc::Status)>) = 0;
virtual void GetNetworkState(::grpc::ClientContext* context, const ::tari::rpc::GetNetworkStateRequest* request, ::tari::rpc::GetNetworkStateResponse* response, ::grpc::ClientUnaryReactor* reactor) = 0;
};
typedef class async_interface experimental_async_interface;
virtual class async_interface* async() { return nullptr; }
@ -551,6 +560,8 @@ class BaseNode final {
virtual ::grpc::ClientReaderInterface< ::tari::rpc::GetSideChainUtxosResponse>* GetSideChainUtxosRaw(::grpc::ClientContext* context, const ::tari::rpc::GetSideChainUtxosRequest& request) = 0;
virtual ::grpc::ClientAsyncReaderInterface< ::tari::rpc::GetSideChainUtxosResponse>* AsyncGetSideChainUtxosRaw(::grpc::ClientContext* context, const ::tari::rpc::GetSideChainUtxosRequest& request, ::grpc::CompletionQueue* cq, void* tag) = 0;
virtual ::grpc::ClientAsyncReaderInterface< ::tari::rpc::GetSideChainUtxosResponse>* PrepareAsyncGetSideChainUtxosRaw(::grpc::ClientContext* context, const ::tari::rpc::GetSideChainUtxosRequest& request, ::grpc::CompletionQueue* cq) = 0;
virtual ::grpc::ClientAsyncResponseReaderInterface< ::tari::rpc::GetNetworkStateResponse>* AsyncGetNetworkStateRaw(::grpc::ClientContext* context, const ::tari::rpc::GetNetworkStateRequest& request, ::grpc::CompletionQueue* cq) = 0;
virtual ::grpc::ClientAsyncResponseReaderInterface< ::tari::rpc::GetNetworkStateResponse>* PrepareAsyncGetNetworkStateRaw(::grpc::ClientContext* context, const ::tari::rpc::GetNetworkStateRequest& request, ::grpc::CompletionQueue* cq) = 0;
};
class Stub final : public StubInterface {
public:
@ -831,6 +842,13 @@ class BaseNode final {
std::unique_ptr< ::grpc::ClientAsyncReader< ::tari::rpc::GetSideChainUtxosResponse>> PrepareAsyncGetSideChainUtxos(::grpc::ClientContext* context, const ::tari::rpc::GetSideChainUtxosRequest& request, ::grpc::CompletionQueue* cq) {
return std::unique_ptr< ::grpc::ClientAsyncReader< ::tari::rpc::GetSideChainUtxosResponse>>(PrepareAsyncGetSideChainUtxosRaw(context, request, cq));
}
::grpc::Status GetNetworkState(::grpc::ClientContext* context, const ::tari::rpc::GetNetworkStateRequest& request, ::tari::rpc::GetNetworkStateResponse* response) override;
std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::tari::rpc::GetNetworkStateResponse>> AsyncGetNetworkState(::grpc::ClientContext* context, const ::tari::rpc::GetNetworkStateRequest& request, ::grpc::CompletionQueue* cq) {
return std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::tari::rpc::GetNetworkStateResponse>>(AsyncGetNetworkStateRaw(context, request, cq));
}
std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::tari::rpc::GetNetworkStateResponse>> PrepareAsyncGetNetworkState(::grpc::ClientContext* context, const ::tari::rpc::GetNetworkStateRequest& request, ::grpc::CompletionQueue* cq) {
return std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::tari::rpc::GetNetworkStateResponse>>(PrepareAsyncGetNetworkStateRaw(context, request, cq));
}
class async final :
public StubInterface::async_interface {
public:
@ -894,6 +912,8 @@ class BaseNode final {
void GetShardKey(::grpc::ClientContext* context, const ::tari::rpc::GetShardKeyRequest* request, ::tari::rpc::GetShardKeyResponse* response, ::grpc::ClientUnaryReactor* reactor) override;
void GetTemplateRegistrations(::grpc::ClientContext* context, const ::tari::rpc::GetTemplateRegistrationsRequest* request, ::grpc::ClientReadReactor< ::tari::rpc::GetTemplateRegistrationResponse>* reactor) override;
void GetSideChainUtxos(::grpc::ClientContext* context, const ::tari::rpc::GetSideChainUtxosRequest* request, ::grpc::ClientReadReactor< ::tari::rpc::GetSideChainUtxosResponse>* reactor) override;
void GetNetworkState(::grpc::ClientContext* context, const ::tari::rpc::GetNetworkStateRequest* request, ::tari::rpc::GetNetworkStateResponse* response, std::function<void(::grpc::Status)>) override;
void GetNetworkState(::grpc::ClientContext* context, const ::tari::rpc::GetNetworkStateRequest* request, ::tari::rpc::GetNetworkStateResponse* response, ::grpc::ClientUnaryReactor* reactor) override;
private:
friend class Stub;
explicit async(Stub* stub): stub_(stub) { }
@ -989,6 +1009,8 @@ class BaseNode final {
::grpc::ClientReader< ::tari::rpc::GetSideChainUtxosResponse>* GetSideChainUtxosRaw(::grpc::ClientContext* context, const ::tari::rpc::GetSideChainUtxosRequest& request) override;
::grpc::ClientAsyncReader< ::tari::rpc::GetSideChainUtxosResponse>* AsyncGetSideChainUtxosRaw(::grpc::ClientContext* context, const ::tari::rpc::GetSideChainUtxosRequest& request, ::grpc::CompletionQueue* cq, void* tag) override;
::grpc::ClientAsyncReader< ::tari::rpc::GetSideChainUtxosResponse>* PrepareAsyncGetSideChainUtxosRaw(::grpc::ClientContext* context, const ::tari::rpc::GetSideChainUtxosRequest& request, ::grpc::CompletionQueue* cq) override;
::grpc::ClientAsyncResponseReader< ::tari::rpc::GetNetworkStateResponse>* AsyncGetNetworkStateRaw(::grpc::ClientContext* context, const ::tari::rpc::GetNetworkStateRequest& request, ::grpc::CompletionQueue* cq) override;
::grpc::ClientAsyncResponseReader< ::tari::rpc::GetNetworkStateResponse>* PrepareAsyncGetNetworkStateRaw(::grpc::ClientContext* context, const ::tari::rpc::GetNetworkStateRequest& request, ::grpc::CompletionQueue* cq) override;
const ::grpc::internal::RpcMethod rpcmethod_ListHeaders_;
const ::grpc::internal::RpcMethod rpcmethod_GetHeaderByHash_;
const ::grpc::internal::RpcMethod rpcmethod_GetBlocks_;
@ -1025,6 +1047,7 @@ class BaseNode final {
const ::grpc::internal::RpcMethod rpcmethod_GetShardKey_;
const ::grpc::internal::RpcMethod rpcmethod_GetTemplateRegistrations_;
const ::grpc::internal::RpcMethod rpcmethod_GetSideChainUtxos_;
const ::grpc::internal::RpcMethod rpcmethod_GetNetworkState_;
};
static std::unique_ptr<Stub> NewStub(const std::shared_ptr< ::grpc::ChannelInterface>& channel, const ::grpc::StubOptions& options = ::grpc::StubOptions());
@ -1100,6 +1123,7 @@ class BaseNode final {
// Get templates
virtual ::grpc::Status GetTemplateRegistrations(::grpc::ServerContext* context, const ::tari::rpc::GetTemplateRegistrationsRequest* request, ::grpc::ServerWriter< ::tari::rpc::GetTemplateRegistrationResponse>* writer);
virtual ::grpc::Status GetSideChainUtxos(::grpc::ServerContext* context, const ::tari::rpc::GetSideChainUtxosRequest* request, ::grpc::ServerWriter< ::tari::rpc::GetSideChainUtxosResponse>* writer);
virtual ::grpc::Status GetNetworkState(::grpc::ServerContext* context, const ::tari::rpc::GetNetworkStateRequest* request, ::tari::rpc::GetNetworkStateResponse* response);
};
template <class BaseClass>
class WithAsyncMethod_ListHeaders : public BaseClass {
@ -1821,7 +1845,27 @@ class BaseNode final {
::grpc::Service::RequestAsyncServerStreaming(35, context, request, writer, new_call_cq, notification_cq, tag);
}
};
typedef WithAsyncMethod_ListHeaders<WithAsyncMethod_GetHeaderByHash<WithAsyncMethod_GetBlocks<WithAsyncMethod_GetBlockTiming<WithAsyncMethod_GetConstants<WithAsyncMethod_GetBlockSize<WithAsyncMethod_GetBlockFees<WithAsyncMethod_GetVersion<WithAsyncMethod_CheckForUpdates<WithAsyncMethod_GetTokensInCirculation<WithAsyncMethod_GetNetworkDifficulty<WithAsyncMethod_GetNewBlockTemplate<WithAsyncMethod_GetNewBlock<WithAsyncMethod_GetNewBlockWithCoinbases<WithAsyncMethod_GetNewBlockTemplateWithCoinbases<WithAsyncMethod_GetNewBlockBlob<WithAsyncMethod_SubmitBlock<WithAsyncMethod_SubmitBlockBlob<WithAsyncMethod_SubmitTransaction<WithAsyncMethod_GetSyncInfo<WithAsyncMethod_GetSyncProgress<WithAsyncMethod_GetTipInfo<WithAsyncMethod_SearchKernels<WithAsyncMethod_SearchUtxos<WithAsyncMethod_FetchMatchingUtxos<WithAsyncMethod_GetPeers<WithAsyncMethod_GetMempoolTransactions<WithAsyncMethod_TransactionState<WithAsyncMethod_Identify<WithAsyncMethod_GetNetworkStatus<WithAsyncMethod_ListConnectedPeers<WithAsyncMethod_GetMempoolStats<WithAsyncMethod_GetActiveValidatorNodes<WithAsyncMethod_GetShardKey<WithAsyncMethod_GetTemplateRegistrations<WithAsyncMethod_GetSideChainUtxos<Service > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > AsyncService;
template <class BaseClass>
class WithAsyncMethod_GetNetworkState : public BaseClass {
private:
void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
public:
WithAsyncMethod_GetNetworkState() {
::grpc::Service::MarkMethodAsync(36);
}
~WithAsyncMethod_GetNetworkState() override {
BaseClassMustBeDerivedFromService(this);
}
// disable synchronous version of this method
::grpc::Status GetNetworkState(::grpc::ServerContext* /*context*/, const ::tari::rpc::GetNetworkStateRequest* /*request*/, ::tari::rpc::GetNetworkStateResponse* /*response*/) override {
abort();
return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
}
void RequestGetNetworkState(::grpc::ServerContext* context, ::tari::rpc::GetNetworkStateRequest* request, ::grpc::ServerAsyncResponseWriter< ::tari::rpc::GetNetworkStateResponse>* response, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) {
::grpc::Service::RequestAsyncUnary(36, context, request, response, new_call_cq, notification_cq, tag);
}
};
typedef WithAsyncMethod_ListHeaders<WithAsyncMethod_GetHeaderByHash<WithAsyncMethod_GetBlocks<WithAsyncMethod_GetBlockTiming<WithAsyncMethod_GetConstants<WithAsyncMethod_GetBlockSize<WithAsyncMethod_GetBlockFees<WithAsyncMethod_GetVersion<WithAsyncMethod_CheckForUpdates<WithAsyncMethod_GetTokensInCirculation<WithAsyncMethod_GetNetworkDifficulty<WithAsyncMethod_GetNewBlockTemplate<WithAsyncMethod_GetNewBlock<WithAsyncMethod_GetNewBlockWithCoinbases<WithAsyncMethod_GetNewBlockTemplateWithCoinbases<WithAsyncMethod_GetNewBlockBlob<WithAsyncMethod_SubmitBlock<WithAsyncMethod_SubmitBlockBlob<WithAsyncMethod_SubmitTransaction<WithAsyncMethod_GetSyncInfo<WithAsyncMethod_GetSyncProgress<WithAsyncMethod_GetTipInfo<WithAsyncMethod_SearchKernels<WithAsyncMethod_SearchUtxos<WithAsyncMethod_FetchMatchingUtxos<WithAsyncMethod_GetPeers<WithAsyncMethod_GetMempoolTransactions<WithAsyncMethod_TransactionState<WithAsyncMethod_Identify<WithAsyncMethod_GetNetworkStatus<WithAsyncMethod_ListConnectedPeers<WithAsyncMethod_GetMempoolStats<WithAsyncMethod_GetActiveValidatorNodes<WithAsyncMethod_GetShardKey<WithAsyncMethod_GetTemplateRegistrations<WithAsyncMethod_GetSideChainUtxos<WithAsyncMethod_GetNetworkState<Service > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > AsyncService;
template <class BaseClass>
class WithCallbackMethod_ListHeaders : public BaseClass {
private:
@ -2734,7 +2778,34 @@ class BaseNode final {
virtual ::grpc::ServerWriteReactor< ::tari::rpc::GetSideChainUtxosResponse>* GetSideChainUtxos(
::grpc::CallbackServerContext* /*context*/, const ::tari::rpc::GetSideChainUtxosRequest* /*request*/) { return nullptr; }
};
typedef WithCallbackMethod_ListHeaders<WithCallbackMethod_GetHeaderByHash<WithCallbackMethod_GetBlocks<WithCallbackMethod_GetBlockTiming<WithCallbackMethod_GetConstants<WithCallbackMethod_GetBlockSize<WithCallbackMethod_GetBlockFees<WithCallbackMethod_GetVersion<WithCallbackMethod_CheckForUpdates<WithCallbackMethod_GetTokensInCirculation<WithCallbackMethod_GetNetworkDifficulty<WithCallbackMethod_GetNewBlockTemplate<WithCallbackMethod_GetNewBlock<WithCallbackMethod_GetNewBlockWithCoinbases<WithCallbackMethod_GetNewBlockTemplateWithCoinbases<WithCallbackMethod_GetNewBlockBlob<WithCallbackMethod_SubmitBlock<WithCallbackMethod_SubmitBlockBlob<WithCallbackMethod_SubmitTransaction<WithCallbackMethod_GetSyncInfo<WithCallbackMethod_GetSyncProgress<WithCallbackMethod_GetTipInfo<WithCallbackMethod_SearchKernels<WithCallbackMethod_SearchUtxos<WithCallbackMethod_FetchMatchingUtxos<WithCallbackMethod_GetPeers<WithCallbackMethod_GetMempoolTransactions<WithCallbackMethod_TransactionState<WithCallbackMethod_Identify<WithCallbackMethod_GetNetworkStatus<WithCallbackMethod_ListConnectedPeers<WithCallbackMethod_GetMempoolStats<WithCallbackMethod_GetActiveValidatorNodes<WithCallbackMethod_GetShardKey<WithCallbackMethod_GetTemplateRegistrations<WithCallbackMethod_GetSideChainUtxos<Service > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > CallbackService;
template <class BaseClass>
class WithCallbackMethod_GetNetworkState : public BaseClass {
private:
void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
public:
WithCallbackMethod_GetNetworkState() {
::grpc::Service::MarkMethodCallback(36,
new ::grpc::internal::CallbackUnaryHandler< ::tari::rpc::GetNetworkStateRequest, ::tari::rpc::GetNetworkStateResponse>(
[this](
::grpc::CallbackServerContext* context, const ::tari::rpc::GetNetworkStateRequest* request, ::tari::rpc::GetNetworkStateResponse* response) { return this->GetNetworkState(context, request, response); }));}
void SetMessageAllocatorFor_GetNetworkState(
::grpc::MessageAllocator< ::tari::rpc::GetNetworkStateRequest, ::tari::rpc::GetNetworkStateResponse>* allocator) {
::grpc::internal::MethodHandler* const handler = ::grpc::Service::GetHandler(36);
static_cast<::grpc::internal::CallbackUnaryHandler< ::tari::rpc::GetNetworkStateRequest, ::tari::rpc::GetNetworkStateResponse>*>(handler)
->SetMessageAllocator(allocator);
}
~WithCallbackMethod_GetNetworkState() override {
BaseClassMustBeDerivedFromService(this);
}
// disable synchronous version of this method
::grpc::Status GetNetworkState(::grpc::ServerContext* /*context*/, const ::tari::rpc::GetNetworkStateRequest* /*request*/, ::tari::rpc::GetNetworkStateResponse* /*response*/) override {
abort();
return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
}
virtual ::grpc::ServerUnaryReactor* GetNetworkState(
::grpc::CallbackServerContext* /*context*/, const ::tari::rpc::GetNetworkStateRequest* /*request*/, ::tari::rpc::GetNetworkStateResponse* /*response*/) { return nullptr; }
};
typedef WithCallbackMethod_ListHeaders<WithCallbackMethod_GetHeaderByHash<WithCallbackMethod_GetBlocks<WithCallbackMethod_GetBlockTiming<WithCallbackMethod_GetConstants<WithCallbackMethod_GetBlockSize<WithCallbackMethod_GetBlockFees<WithCallbackMethod_GetVersion<WithCallbackMethod_CheckForUpdates<WithCallbackMethod_GetTokensInCirculation<WithCallbackMethod_GetNetworkDifficulty<WithCallbackMethod_GetNewBlockTemplate<WithCallbackMethod_GetNewBlock<WithCallbackMethod_GetNewBlockWithCoinbases<WithCallbackMethod_GetNewBlockTemplateWithCoinbases<WithCallbackMethod_GetNewBlockBlob<WithCallbackMethod_SubmitBlock<WithCallbackMethod_SubmitBlockBlob<WithCallbackMethod_SubmitTransaction<WithCallbackMethod_GetSyncInfo<WithCallbackMethod_GetSyncProgress<WithCallbackMethod_GetTipInfo<WithCallbackMethod_SearchKernels<WithCallbackMethod_SearchUtxos<WithCallbackMethod_FetchMatchingUtxos<WithCallbackMethod_GetPeers<WithCallbackMethod_GetMempoolTransactions<WithCallbackMethod_TransactionState<WithCallbackMethod_Identify<WithCallbackMethod_GetNetworkStatus<WithCallbackMethod_ListConnectedPeers<WithCallbackMethod_GetMempoolStats<WithCallbackMethod_GetActiveValidatorNodes<WithCallbackMethod_GetShardKey<WithCallbackMethod_GetTemplateRegistrations<WithCallbackMethod_GetSideChainUtxos<WithCallbackMethod_GetNetworkState<Service > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > CallbackService;
typedef CallbackService ExperimentalCallbackService;
template <class BaseClass>
class WithGenericMethod_ListHeaders : public BaseClass {
@ -3349,6 +3420,23 @@ class BaseNode final {
}
};
template <class BaseClass>
class WithGenericMethod_GetNetworkState : public BaseClass {
private:
void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
public:
WithGenericMethod_GetNetworkState() {
::grpc::Service::MarkMethodGeneric(36);
}
~WithGenericMethod_GetNetworkState() override {
BaseClassMustBeDerivedFromService(this);
}
// disable synchronous version of this method
::grpc::Status GetNetworkState(::grpc::ServerContext* /*context*/, const ::tari::rpc::GetNetworkStateRequest* /*request*/, ::tari::rpc::GetNetworkStateResponse* /*response*/) override {
abort();
return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
}
};
template <class BaseClass>
class WithRawMethod_ListHeaders : public BaseClass {
private:
void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
@ -4069,6 +4157,26 @@ class BaseNode final {
}
};
template <class BaseClass>
class WithRawMethod_GetNetworkState : public BaseClass {
private:
void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
public:
WithRawMethod_GetNetworkState() {
::grpc::Service::MarkMethodRaw(36);
}
~WithRawMethod_GetNetworkState() override {
BaseClassMustBeDerivedFromService(this);
}
// disable synchronous version of this method
::grpc::Status GetNetworkState(::grpc::ServerContext* /*context*/, const ::tari::rpc::GetNetworkStateRequest* /*request*/, ::tari::rpc::GetNetworkStateResponse* /*response*/) override {
abort();
return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
}
void RequestGetNetworkState(::grpc::ServerContext* context, ::grpc::ByteBuffer* request, ::grpc::ServerAsyncResponseWriter< ::grpc::ByteBuffer>* response, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) {
::grpc::Service::RequestAsyncUnary(36, context, request, response, new_call_cq, notification_cq, tag);
}
};
template <class BaseClass>
class WithRawCallbackMethod_ListHeaders : public BaseClass {
private:
void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
@ -4861,6 +4969,28 @@ class BaseNode final {
::grpc::CallbackServerContext* /*context*/, const ::grpc::ByteBuffer* /*request*/) { return nullptr; }
};
template <class BaseClass>
class WithRawCallbackMethod_GetNetworkState : public BaseClass {
private:
void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
public:
WithRawCallbackMethod_GetNetworkState() {
::grpc::Service::MarkMethodRawCallback(36,
new ::grpc::internal::CallbackUnaryHandler< ::grpc::ByteBuffer, ::grpc::ByteBuffer>(
[this](
::grpc::CallbackServerContext* context, const ::grpc::ByteBuffer* request, ::grpc::ByteBuffer* response) { return this->GetNetworkState(context, request, response); }));
}
~WithRawCallbackMethod_GetNetworkState() override {
BaseClassMustBeDerivedFromService(this);
}
// disable synchronous version of this method
::grpc::Status GetNetworkState(::grpc::ServerContext* /*context*/, const ::tari::rpc::GetNetworkStateRequest* /*request*/, ::tari::rpc::GetNetworkStateResponse* /*response*/) override {
abort();
return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
}
virtual ::grpc::ServerUnaryReactor* GetNetworkState(
::grpc::CallbackServerContext* /*context*/, const ::grpc::ByteBuffer* /*request*/, ::grpc::ByteBuffer* /*response*/) { return nullptr; }
};
template <class BaseClass>
class WithStreamedUnaryMethod_GetHeaderByHash : public BaseClass {
private:
void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
@ -5508,7 +5638,34 @@ class BaseNode final {
// replace default version of method with streamed unary
virtual ::grpc::Status StreamedGetShardKey(::grpc::ServerContext* context, ::grpc::ServerUnaryStreamer< ::tari::rpc::GetShardKeyRequest,::tari::rpc::GetShardKeyResponse>* server_unary_streamer) = 0;
};
typedef WithStreamedUnaryMethod_GetHeaderByHash<WithStreamedUnaryMethod_GetBlockTiming<WithStreamedUnaryMethod_GetConstants<WithStreamedUnaryMethod_GetBlockSize<WithStreamedUnaryMethod_GetBlockFees<WithStreamedUnaryMethod_GetVersion<WithStreamedUnaryMethod_CheckForUpdates<WithStreamedUnaryMethod_GetNewBlockTemplate<WithStreamedUnaryMethod_GetNewBlock<WithStreamedUnaryMethod_GetNewBlockWithCoinbases<WithStreamedUnaryMethod_GetNewBlockTemplateWithCoinbases<WithStreamedUnaryMethod_GetNewBlockBlob<WithStreamedUnaryMethod_SubmitBlock<WithStreamedUnaryMethod_SubmitBlockBlob<WithStreamedUnaryMethod_SubmitTransaction<WithStreamedUnaryMethod_GetSyncInfo<WithStreamedUnaryMethod_GetSyncProgress<WithStreamedUnaryMethod_GetTipInfo<WithStreamedUnaryMethod_TransactionState<WithStreamedUnaryMethod_Identify<WithStreamedUnaryMethod_GetNetworkStatus<WithStreamedUnaryMethod_ListConnectedPeers<WithStreamedUnaryMethod_GetMempoolStats<WithStreamedUnaryMethod_GetShardKey<Service > > > > > > > > > > > > > > > > > > > > > > > > StreamedUnaryService;
template <class BaseClass>
class WithStreamedUnaryMethod_GetNetworkState : public BaseClass {
private:
void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
public:
WithStreamedUnaryMethod_GetNetworkState() {
::grpc::Service::MarkMethodStreamed(36,
new ::grpc::internal::StreamedUnaryHandler<
::tari::rpc::GetNetworkStateRequest, ::tari::rpc::GetNetworkStateResponse>(
[this](::grpc::ServerContext* context,
::grpc::ServerUnaryStreamer<
::tari::rpc::GetNetworkStateRequest, ::tari::rpc::GetNetworkStateResponse>* streamer) {
return this->StreamedGetNetworkState(context,
streamer);
}));
}
~WithStreamedUnaryMethod_GetNetworkState() override {
BaseClassMustBeDerivedFromService(this);
}
// disable regular version of this method
::grpc::Status GetNetworkState(::grpc::ServerContext* /*context*/, const ::tari::rpc::GetNetworkStateRequest* /*request*/, ::tari::rpc::GetNetworkStateResponse* /*response*/) override {
abort();
return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
}
// replace default version of method with streamed unary
virtual ::grpc::Status StreamedGetNetworkState(::grpc::ServerContext* context, ::grpc::ServerUnaryStreamer< ::tari::rpc::GetNetworkStateRequest,::tari::rpc::GetNetworkStateResponse>* server_unary_streamer) = 0;
};
typedef WithStreamedUnaryMethod_GetHeaderByHash<WithStreamedUnaryMethod_GetBlockTiming<WithStreamedUnaryMethod_GetConstants<WithStreamedUnaryMethod_GetBlockSize<WithStreamedUnaryMethod_GetBlockFees<WithStreamedUnaryMethod_GetVersion<WithStreamedUnaryMethod_CheckForUpdates<WithStreamedUnaryMethod_GetNewBlockTemplate<WithStreamedUnaryMethod_GetNewBlock<WithStreamedUnaryMethod_GetNewBlockWithCoinbases<WithStreamedUnaryMethod_GetNewBlockTemplateWithCoinbases<WithStreamedUnaryMethod_GetNewBlockBlob<WithStreamedUnaryMethod_SubmitBlock<WithStreamedUnaryMethod_SubmitBlockBlob<WithStreamedUnaryMethod_SubmitTransaction<WithStreamedUnaryMethod_GetSyncInfo<WithStreamedUnaryMethod_GetSyncProgress<WithStreamedUnaryMethod_GetTipInfo<WithStreamedUnaryMethod_TransactionState<WithStreamedUnaryMethod_Identify<WithStreamedUnaryMethod_GetNetworkStatus<WithStreamedUnaryMethod_ListConnectedPeers<WithStreamedUnaryMethod_GetMempoolStats<WithStreamedUnaryMethod_GetShardKey<WithStreamedUnaryMethod_GetNetworkState<Service > > > > > > > > > > > > > > > > > > > > > > > > > StreamedUnaryService;
template <class BaseClass>
class WithSplitStreamingMethod_ListHeaders : public BaseClass {
private:
@ -5834,7 +5991,7 @@ class BaseNode final {
virtual ::grpc::Status StreamedGetSideChainUtxos(::grpc::ServerContext* context, ::grpc::ServerSplitStreamer< ::tari::rpc::GetSideChainUtxosRequest,::tari::rpc::GetSideChainUtxosResponse>* server_split_streamer) = 0;
};
typedef WithSplitStreamingMethod_ListHeaders<WithSplitStreamingMethod_GetBlocks<WithSplitStreamingMethod_GetTokensInCirculation<WithSplitStreamingMethod_GetNetworkDifficulty<WithSplitStreamingMethod_SearchKernels<WithSplitStreamingMethod_SearchUtxos<WithSplitStreamingMethod_FetchMatchingUtxos<WithSplitStreamingMethod_GetPeers<WithSplitStreamingMethod_GetMempoolTransactions<WithSplitStreamingMethod_GetActiveValidatorNodes<WithSplitStreamingMethod_GetTemplateRegistrations<WithSplitStreamingMethod_GetSideChainUtxos<Service > > > > > > > > > > > > SplitStreamedService;
typedef WithSplitStreamingMethod_ListHeaders<WithStreamedUnaryMethod_GetHeaderByHash<WithSplitStreamingMethod_GetBlocks<WithStreamedUnaryMethod_GetBlockTiming<WithStreamedUnaryMethod_GetConstants<WithStreamedUnaryMethod_GetBlockSize<WithStreamedUnaryMethod_GetBlockFees<WithStreamedUnaryMethod_GetVersion<WithStreamedUnaryMethod_CheckForUpdates<WithSplitStreamingMethod_GetTokensInCirculation<WithSplitStreamingMethod_GetNetworkDifficulty<WithStreamedUnaryMethod_GetNewBlockTemplate<WithStreamedUnaryMethod_GetNewBlock<WithStreamedUnaryMethod_GetNewBlockWithCoinbases<WithStreamedUnaryMethod_GetNewBlockTemplateWithCoinbases<WithStreamedUnaryMethod_GetNewBlockBlob<WithStreamedUnaryMethod_SubmitBlock<WithStreamedUnaryMethod_SubmitBlockBlob<WithStreamedUnaryMethod_SubmitTransaction<WithStreamedUnaryMethod_GetSyncInfo<WithStreamedUnaryMethod_GetSyncProgress<WithStreamedUnaryMethod_GetTipInfo<WithSplitStreamingMethod_SearchKernels<WithSplitStreamingMethod_SearchUtxos<WithSplitStreamingMethod_FetchMatchingUtxos<WithSplitStreamingMethod_GetPeers<WithSplitStreamingMethod_GetMempoolTransactions<WithStreamedUnaryMethod_TransactionState<WithStreamedUnaryMethod_Identify<WithStreamedUnaryMethod_GetNetworkStatus<WithStreamedUnaryMethod_ListConnectedPeers<WithStreamedUnaryMethod_GetMempoolStats<WithSplitStreamingMethod_GetActiveValidatorNodes<WithStreamedUnaryMethod_GetShardKey<WithSplitStreamingMethod_GetTemplateRegistrations<WithSplitStreamingMethod_GetSideChainUtxos<Service > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > StreamedService;
typedef WithSplitStreamingMethod_ListHeaders<WithStreamedUnaryMethod_GetHeaderByHash<WithSplitStreamingMethod_GetBlocks<WithStreamedUnaryMethod_GetBlockTiming<WithStreamedUnaryMethod_GetConstants<WithStreamedUnaryMethod_GetBlockSize<WithStreamedUnaryMethod_GetBlockFees<WithStreamedUnaryMethod_GetVersion<WithStreamedUnaryMethod_CheckForUpdates<WithSplitStreamingMethod_GetTokensInCirculation<WithSplitStreamingMethod_GetNetworkDifficulty<WithStreamedUnaryMethod_GetNewBlockTemplate<WithStreamedUnaryMethod_GetNewBlock<WithStreamedUnaryMethod_GetNewBlockWithCoinbases<WithStreamedUnaryMethod_GetNewBlockTemplateWithCoinbases<WithStreamedUnaryMethod_GetNewBlockBlob<WithStreamedUnaryMethod_SubmitBlock<WithStreamedUnaryMethod_SubmitBlockBlob<WithStreamedUnaryMethod_SubmitTransaction<WithStreamedUnaryMethod_GetSyncInfo<WithStreamedUnaryMethod_GetSyncProgress<WithStreamedUnaryMethod_GetTipInfo<WithSplitStreamingMethod_SearchKernels<WithSplitStreamingMethod_SearchUtxos<WithSplitStreamingMethod_FetchMatchingUtxos<WithSplitStreamingMethod_GetPeers<WithSplitStreamingMethod_GetMempoolTransactions<WithStreamedUnaryMethod_TransactionState<WithStreamedUnaryMethod_Identify<WithStreamedUnaryMethod_GetNetworkStatus<WithStreamedUnaryMethod_ListConnectedPeers<WithStreamedUnaryMethod_GetMempoolStats<WithSplitStreamingMethod_GetActiveValidatorNodes<WithStreamedUnaryMethod_GetShardKey<WithSplitStreamingMethod_GetTemplateRegistrations<WithSplitStreamingMethod_GetSideChainUtxos<WithStreamedUnaryMethod_GetNetworkState<Service > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > StreamedService;
};
} // namespace rpc

File diff suppressed because it is too large Load diff

File diff suppressed because it is too large Load diff

View file

@ -99,6 +99,7 @@ service BaseNode {
// Get templates
rpc GetTemplateRegistrations(GetTemplateRegistrationsRequest) returns (stream GetTemplateRegistrationResponse);
rpc GetSideChainUtxos(GetSideChainUtxosRequest) returns (stream GetSideChainUtxosResponse);
rpc GetNetworkState(GetNetworkStateRequest) returns (GetNetworkStateResponse);
}
message GetAssetMetadataRequest {
@ -160,6 +161,7 @@ message TipInfoResponse {
MetaData metadata = 1;
bool initial_sync_achieved = 2;
BaseNodeState base_node_state = 3;
bool failed_checkpoints = 4;
}
enum BaseNodeState{
@ -217,6 +219,8 @@ message NetworkDifficultyResponse {
uint64 pow_algo = 5;
uint64 sha3x_estimated_hash_rate = 6;
uint64 randomx_estimated_hash_rate = 7;
uint64 num_coinbases = 8;
repeated bytes coinbase_extras = 9;
}
// A generic single value response for a specific height
@ -339,10 +343,11 @@ message MetaData {
uint64 best_block_height = 1;
// The block hash of the current tip of the longest valid chain, or `None` for an empty chain
bytes best_block_hash = 2;
// This is the min height this node can provide complete blocks for. A 0 here means this node is archival and can provide complete blocks for every height.
uint64 pruned_height = 6;
// The current geometric mean of the pow of the chain tip, or `None` if there is no chain
bytes accumulated_difficulty = 5;
// This is the min height this node can provide complete blocks for. A 0 here means this node is archival and can provide complete blocks for every height.
uint64 pruned_height = 6;
uint64 timestamp = 7;
}
message SyncInfoResponse {
@ -355,6 +360,8 @@ message SyncProgressResponse {
uint64 tip_height = 1;
uint64 local_height = 2;
SyncState state = 3;
string short_desc = 4;
uint64 initial_connected_peers = 5;
}
enum SyncState {
@ -515,3 +522,23 @@ message GetSideChainUtxosResponse {
repeated TransactionOutput outputs = 2;
}
message GetNetworkStateRequest {
}
message GetNetworkStateResponse {
// metadata
MetaData metadata = 1;
// has the base node synced
bool initial_sync_achieved = 2;
//current state of the base node
BaseNodeState base_node_state = 3;
// do we have failed checkpoints
bool failed_checkpoints = 4;
// The block reward of the next tip
uint64 reward = 5;
// estimate sha3x hash rate
uint64 sha3x_estimated_hash_rate = 6;
// estimate randomx hash rate
uint64 randomx_estimated_hash_rate = 7;
}

View file

@ -107,6 +107,9 @@ inline constexpr BlockHeader::Impl_::Impl_(
output_mr_(
&::google::protobuf::internal::fixed_address_empty_string,
::_pbi::ConstantInitialized()),
block_output_mr_(
&::google::protobuf::internal::fixed_address_empty_string,
::_pbi::ConstantInitialized()),
kernel_mr_(
&::google::protobuf::internal::fixed_address_empty_string,
::_pbi::ConstantInitialized()),
@ -149,7 +152,8 @@ inline constexpr NewBlockTemplate::Impl_::Impl_(
::_pbi::ConstantInitialized) noexcept
: _cached_size_{0},
header_{nullptr},
body_{nullptr} {}
body_{nullptr},
is_mempool_in_sync_{false} {}
template <typename>
PROTOBUF_CONSTEXPR NewBlockTemplate::NewBlockTemplate(::_pbi::ConstantInitialized)
@ -227,6 +231,7 @@ const ::uint32_t
PROTOBUF_FIELD_OFFSET(::tari::rpc::BlockHeader, _impl_.prev_hash_),
PROTOBUF_FIELD_OFFSET(::tari::rpc::BlockHeader, _impl_.timestamp_),
PROTOBUF_FIELD_OFFSET(::tari::rpc::BlockHeader, _impl_.output_mr_),
PROTOBUF_FIELD_OFFSET(::tari::rpc::BlockHeader, _impl_.block_output_mr_),
PROTOBUF_FIELD_OFFSET(::tari::rpc::BlockHeader, _impl_.kernel_mr_),
PROTOBUF_FIELD_OFFSET(::tari::rpc::BlockHeader, _impl_.input_mr_),
PROTOBUF_FIELD_OFFSET(::tari::rpc::BlockHeader, _impl_.total_kernel_offset_),
@ -247,6 +252,7 @@ const ::uint32_t
~0u,
~0u,
~0u,
~0u,
0,
~0u,
~0u,
@ -326,19 +332,21 @@ const ::uint32_t
~0u, // no sizeof(Split)
PROTOBUF_FIELD_OFFSET(::tari::rpc::NewBlockTemplate, _impl_.header_),
PROTOBUF_FIELD_OFFSET(::tari::rpc::NewBlockTemplate, _impl_.body_),
PROTOBUF_FIELD_OFFSET(::tari::rpc::NewBlockTemplate, _impl_.is_mempool_in_sync_),
0,
1,
~0u,
};
static const ::_pbi::MigrationSchema
schemas[] ABSL_ATTRIBUTE_SECTION_VARIABLE(protodesc_cold) = {
{0, 24, -1, sizeof(::tari::rpc::BlockHeader)},
{40, -1, -1, sizeof(::tari::rpc::ProofOfWork)},
{50, -1, -1, sizeof(::tari::rpc::PowAlgo)},
{59, 69, -1, sizeof(::tari::rpc::Block)},
{71, 81, -1, sizeof(::tari::rpc::HistoricalBlock)},
{83, 97, -1, sizeof(::tari::rpc::NewBlockHeaderTemplate)},
{103, 113, -1, sizeof(::tari::rpc::NewBlockTemplate)},
{0, 25, -1, sizeof(::tari::rpc::BlockHeader)},
{42, -1, -1, sizeof(::tari::rpc::ProofOfWork)},
{52, -1, -1, sizeof(::tari::rpc::PowAlgo)},
{61, 71, -1, sizeof(::tari::rpc::Block)},
{73, 83, -1, sizeof(::tari::rpc::HistoricalBlock)},
{85, 99, -1, sizeof(::tari::rpc::NewBlockHeaderTemplate)},
{105, 116, -1, sizeof(::tari::rpc::NewBlockTemplate)},
};
static const ::_pb::Message* const file_default_instances[] = {
&::tari::rpc::_BlockHeader_default_instance_._instance,
@ -352,31 +360,33 @@ static const ::_pb::Message* const file_default_instances[] = {
const char descriptor_table_protodef_block_2eproto[] ABSL_ATTRIBUTE_SECTION_VARIABLE(
protodesc_cold) = {
"\n\013block.proto\022\010tari.rpc\032\021transaction.pro"
"to\"\361\002\n\013BlockHeader\022\014\n\004hash\030\001 \001(\014\022\017\n\007vers"
"to\"\212\003\n\013BlockHeader\022\014\n\004hash\030\001 \001(\014\022\017\n\007vers"
"ion\030\002 \001(\r\022\016\n\006height\030\003 \001(\004\022\021\n\tprev_hash\030\004"
" \001(\014\022\021\n\ttimestamp\030\005 \001(\004\022\021\n\toutput_mr\030\006 \001"
"(\014\022\021\n\tkernel_mr\030\010 \001(\014\022\020\n\010input_mr\030\t \001(\014\022"
"\033\n\023total_kernel_offset\030\n \001(\014\022\r\n\005nonce\030\013 "
"\001(\004\022\"\n\003pow\030\014 \001(\0132\025.tari.rpc.ProofOfWork\022"
"\027\n\017kernel_mmr_size\030\r \001(\004\022\027\n\017output_mmr_s"
"ize\030\016 \001(\004\022\033\n\023total_script_offset\030\017 \001(\014\022\031"
"\n\021validator_node_mr\030\020 \001(\014\022\033\n\023validator_n"
"ode_size\030\021 \001(\004\"1\n\013ProofOfWork\022\020\n\010pow_alg"
"o\030\001 \001(\004\022\020\n\010pow_data\030\004 \001(\014\"o\n\007PowAlgo\022,\n\010"
"pow_algo\030\001 \001(\0162\032.tari.rpc.PowAlgo.PowAlg"
"os\"6\n\010PowAlgos\022\025\n\021POW_ALGOS_RANDOMX\020\000\022\023\n"
"\017POW_ALGOS_SHA3X\020\001\"U\n\005Block\022%\n\006header\030\001 "
"\001(\0132\025.tari.rpc.BlockHeader\022%\n\004body\030\002 \001(\013"
"2\027.tari.rpc.AggregateBody\"H\n\017HistoricalB"
"lock\022\025\n\rconfirmations\030\001 \001(\004\022\036\n\005block\030\002 \001"
"(\0132\017.tari.rpc.Block\"\252\001\n\026NewBlockHeaderTe"
"mplate\022\017\n\007version\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_offse"
"t\030\004 \001(\014\022\"\n\003pow\030\005 \001(\0132\025.tari.rpc.ProofOfW"
"ork\022\033\n\023total_script_offset\030\007 \001(\014\"k\n\020NewB"
"lockTemplate\0220\n\006header\030\001 \001(\0132 .tari.rpc."
"NewBlockHeaderTemplate\022%\n\004body\030\002 \001(\0132\027.t"
"ari.rpc.AggregateBodyb\006proto3"
"(\014\022\027\n\017block_output_mr\030\007 \001(\014\022\021\n\tkernel_mr"
"\030\010 \001(\014\022\020\n\010input_mr\030\t \001(\014\022\033\n\023total_kernel"
"_offset\030\n \001(\014\022\r\n\005nonce\030\013 \001(\004\022\"\n\003pow\030\014 \001("
"\0132\025.tari.rpc.ProofOfWork\022\027\n\017kernel_mmr_s"
"ize\030\r \001(\004\022\027\n\017output_mmr_size\030\016 \001(\004\022\033\n\023to"
"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"
};
static const ::_pbi::DescriptorTable* const descriptor_table_block_2eproto_deps[1] =
{
@ -386,7 +396,7 @@ static ::absl::once_flag descriptor_table_block_2eproto_once;
const ::_pbi::DescriptorTable descriptor_table_block_2eproto = {
false,
false,
1029,
1083,
descriptor_table_protodef_block_2eproto,
"block.proto",
&descriptor_table_block_2eproto_once,
@ -459,6 +469,7 @@ inline PROTOBUF_NDEBUG_INLINE BlockHeader::Impl_::Impl_(
hash_(arena, from.hash_),
prev_hash_(arena, from.prev_hash_),
output_mr_(arena, from.output_mr_),
block_output_mr_(arena, from.block_output_mr_),
kernel_mr_(arena, from.kernel_mr_),
input_mr_(arena, from.input_mr_),
total_kernel_offset_(arena, from.total_kernel_offset_),
@ -495,6 +506,7 @@ inline PROTOBUF_NDEBUG_INLINE BlockHeader::Impl_::Impl_(
hash_(arena),
prev_hash_(arena),
output_mr_(arena),
block_output_mr_(arena),
kernel_mr_(arena),
input_mr_(arena),
total_kernel_offset_(arena),
@ -520,6 +532,7 @@ inline void BlockHeader::SharedDtor() {
_impl_.hash_.Destroy();
_impl_.prev_hash_.Destroy();
_impl_.output_mr_.Destroy();
_impl_.block_output_mr_.Destroy();
_impl_.kernel_mr_.Destroy();
_impl_.input_mr_.Destroy();
_impl_.total_kernel_offset_.Destroy();
@ -553,6 +566,7 @@ PROTOBUF_NOINLINE void BlockHeader::Clear() {
_impl_.hash_.ClearToEmpty();
_impl_.prev_hash_.ClearToEmpty();
_impl_.output_mr_.ClearToEmpty();
_impl_.block_output_mr_.ClearToEmpty();
_impl_.kernel_mr_.ClearToEmpty();
_impl_.input_mr_.ClearToEmpty();
_impl_.total_kernel_offset_.ClearToEmpty();
@ -578,15 +592,15 @@ const char* BlockHeader::_InternalParse(
PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1
const ::_pbi::TcParseTable<5, 16, 1, 0, 2> BlockHeader::_table_ = {
const ::_pbi::TcParseTable<5, 17, 1, 0, 2> BlockHeader::_table_ = {
{
PROTOBUF_FIELD_OFFSET(BlockHeader, _impl_._has_bits_),
0, // no _extensions_
17, 248, // max_field_number, fast_idx_mask
offsetof(decltype(_table_), field_lookup_table),
4294836288, // skipmap
4294836224, // skipmap
offsetof(decltype(_table_), field_entries),
16, // num_field_entries
17, // num_field_entries
1, // num_aux_entries
offsetof(decltype(_table_), aux_entries),
&_BlockHeader_default_instance_._instance,
@ -614,7 +628,9 @@ const ::_pbi::TcParseTable<5, 16, 1, 0, 2> BlockHeader::_table_ = {
// bytes output_mr = 6;
{::_pbi::TcParser::FastBS1,
{50, 63, 0, PROTOBUF_FIELD_OFFSET(BlockHeader, _impl_.output_mr_)}},
{::_pbi::TcParser::MiniParse, {}},
// bytes block_output_mr = 7;
{::_pbi::TcParser::FastBS1,
{58, 63, 0, PROTOBUF_FIELD_OFFSET(BlockHeader, _impl_.block_output_mr_)}},
// bytes kernel_mr = 8;
{::_pbi::TcParser::FastBS1,
{66, 63, 0, PROTOBUF_FIELD_OFFSET(BlockHeader, _impl_.kernel_mr_)}},
@ -680,6 +696,9 @@ const ::_pbi::TcParseTable<5, 16, 1, 0, 2> BlockHeader::_table_ = {
// bytes output_mr = 6;
{PROTOBUF_FIELD_OFFSET(BlockHeader, _impl_.output_mr_), -1, 0,
(0 | ::_fl::kFcSingular | ::_fl::kBytes | ::_fl::kRepAString)},
// bytes block_output_mr = 7;
{PROTOBUF_FIELD_OFFSET(BlockHeader, _impl_.block_output_mr_), -1, 0,
(0 | ::_fl::kFcSingular | ::_fl::kBytes | ::_fl::kRepAString)},
// bytes kernel_mr = 8;
{PROTOBUF_FIELD_OFFSET(BlockHeader, _impl_.kernel_mr_), -1, 0,
(0 | ::_fl::kFcSingular | ::_fl::kBytes | ::_fl::kRepAString)},
@ -762,6 +781,12 @@ const ::_pbi::TcParseTable<5, 16, 1, 0, 2> BlockHeader::_table_ = {
target = stream->WriteBytesMaybeAliased(6, _s, target);
}
// bytes block_output_mr = 7;
if (!this->_internal_block_output_mr().empty()) {
const std::string& _s = this->_internal_block_output_mr();
target = stream->WriteBytesMaybeAliased(7, _s, target);
}
// bytes kernel_mr = 8;
if (!this->_internal_kernel_mr().empty()) {
const std::string& _s = this->_internal_kernel_mr();
@ -862,6 +887,12 @@ const ::_pbi::TcParseTable<5, 16, 1, 0, 2> BlockHeader::_table_ = {
this->_internal_output_mr());
}
// bytes block_output_mr = 7;
if (!this->_internal_block_output_mr().empty()) {
total_size += 1 + ::google::protobuf::internal::WireFormatLite::BytesSize(
this->_internal_block_output_mr());
}
// bytes kernel_mr = 8;
if (!this->_internal_kernel_mr().empty()) {
total_size += 1 + ::google::protobuf::internal::WireFormatLite::BytesSize(
@ -963,6 +994,9 @@ void BlockHeader::MergeImpl(::google::protobuf::MessageLite& to_msg, const ::goo
if (!from._internal_output_mr().empty()) {
_this->_internal_set_output_mr(from._internal_output_mr());
}
if (!from._internal_block_output_mr().empty()) {
_this->_internal_set_block_output_mr(from._internal_block_output_mr());
}
if (!from._internal_kernel_mr().empty()) {
_this->_internal_set_kernel_mr(from._internal_kernel_mr());
}
@ -1033,6 +1067,7 @@ void BlockHeader::InternalSwap(BlockHeader* PROTOBUF_RESTRICT other) {
::_pbi::ArenaStringPtr::InternalSwap(&_impl_.hash_, &other->_impl_.hash_, arena);
::_pbi::ArenaStringPtr::InternalSwap(&_impl_.prev_hash_, &other->_impl_.prev_hash_, arena);
::_pbi::ArenaStringPtr::InternalSwap(&_impl_.output_mr_, &other->_impl_.output_mr_, arena);
::_pbi::ArenaStringPtr::InternalSwap(&_impl_.block_output_mr_, &other->_impl_.block_output_mr_, arena);
::_pbi::ArenaStringPtr::InternalSwap(&_impl_.kernel_mr_, &other->_impl_.kernel_mr_, arena);
::_pbi::ArenaStringPtr::InternalSwap(&_impl_.input_mr_, &other->_impl_.input_mr_, arena);
::_pbi::ArenaStringPtr::InternalSwap(&_impl_.total_kernel_offset_, &other->_impl_.total_kernel_offset_, arena);
@ -2366,6 +2401,7 @@ NewBlockTemplate::NewBlockTemplate(
_impl_.body_ = (cached_has_bits & 0x00000002u) ? ::google::protobuf::Message::CopyConstruct<::tari::rpc::AggregateBody>(
arena, *from._impl_.body_)
: nullptr;
_impl_.is_mempool_in_sync_ = from._impl_.is_mempool_in_sync_;
// @@protoc_insertion_point(copy_constructor:tari.rpc.NewBlockTemplate)
}
@ -2379,9 +2415,9 @@ inline void NewBlockTemplate::SharedCtor(::_pb::Arena* arena) {
::memset(reinterpret_cast<char *>(&_impl_) +
offsetof(Impl_, header_),
0,
offsetof(Impl_, body_) -
offsetof(Impl_, is_mempool_in_sync_) -
offsetof(Impl_, header_) +
sizeof(Impl_::body_));
sizeof(Impl_::is_mempool_in_sync_));
}
NewBlockTemplate::~NewBlockTemplate() {
// @@protoc_insertion_point(destructor:tari.rpc.NewBlockTemplate)
@ -2427,6 +2463,7 @@ PROTOBUF_NOINLINE void NewBlockTemplate::Clear() {
_impl_.body_->Clear();
}
}
_impl_.is_mempool_in_sync_ = false;
_impl_._has_bits_.Clear();
_internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>();
}
@ -2439,15 +2476,15 @@ const char* NewBlockTemplate::_InternalParse(
PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1
const ::_pbi::TcParseTable<1, 2, 2, 0, 2> NewBlockTemplate::_table_ = {
const ::_pbi::TcParseTable<2, 3, 2, 0, 2> NewBlockTemplate::_table_ = {
{
PROTOBUF_FIELD_OFFSET(NewBlockTemplate, _impl_._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
2, // num_aux_entries
offsetof(decltype(_table_), aux_entries),
&_NewBlockTemplate_default_instance_._instance,
@ -2456,12 +2493,16 @@ const ::_pbi::TcParseTable<1, 2, 2, 0, 2> NewBlockTemplate::_table_ = {
::_pbi::TcParser::GetTable<::tari::rpc::NewBlockTemplate>(), // to_prefetch
#endif // PROTOBUF_PREFETCH_PARSE_TABLE
}, {{
// .tari.rpc.AggregateBody body = 2;
{::_pbi::TcParser::FastMtS1,
{18, 1, 1, PROTOBUF_FIELD_OFFSET(NewBlockTemplate, _impl_.body_)}},
{::_pbi::TcParser::MiniParse, {}},
// .tari.rpc.NewBlockHeaderTemplate header = 1;
{::_pbi::TcParser::FastMtS1,
{10, 0, 0, PROTOBUF_FIELD_OFFSET(NewBlockTemplate, _impl_.header_)}},
// .tari.rpc.AggregateBody body = 2;
{::_pbi::TcParser::FastMtS1,
{18, 1, 1, PROTOBUF_FIELD_OFFSET(NewBlockTemplate, _impl_.body_)}},
// bool is_mempool_in_sync = 3;
{::_pbi::TcParser::SingularVarintNoZag1<bool, offsetof(NewBlockTemplate, _impl_.is_mempool_in_sync_), 63>(),
{24, 63, 0, PROTOBUF_FIELD_OFFSET(NewBlockTemplate, _impl_.is_mempool_in_sync_)}},
}}, {{
65535, 65535
}}, {{
@ -2471,6 +2512,9 @@ const ::_pbi::TcParseTable<1, 2, 2, 0, 2> NewBlockTemplate::_table_ = {
// .tari.rpc.AggregateBody body = 2;
{PROTOBUF_FIELD_OFFSET(NewBlockTemplate, _impl_.body_), _Internal::kHasBitsOffset + 1, 1,
(0 | ::_fl::kFcOptional | ::_fl::kMessage | ::_fl::kTvTable)},
// bool is_mempool_in_sync = 3;
{PROTOBUF_FIELD_OFFSET(NewBlockTemplate, _impl_.is_mempool_in_sync_), -1, 0,
(0 | ::_fl::kFcSingular | ::_fl::kBool)},
}}, {{
{::_pbi::TcParser::GetTable<::tari::rpc::NewBlockHeaderTemplate>()},
{::_pbi::TcParser::GetTable<::tari::rpc::AggregateBody>()},
@ -2498,6 +2542,13 @@ const ::_pbi::TcParseTable<1, 2, 2, 0, 2> NewBlockTemplate::_table_ = {
2, *_impl_.body_, _impl_.body_->GetCachedSize(), target, stream);
}
// bool is_mempool_in_sync = 3;
if (this->_internal_is_mempool_in_sync() != 0) {
target = stream->EnsureSpace(target);
target = ::_pbi::WireFormatLite::WriteBoolToArray(
3, this->_internal_is_mempool_in_sync(), target);
}
if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) {
target =
::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray(
@ -2530,6 +2581,11 @@ const ::_pbi::TcParseTable<1, 2, 2, 0, 2> NewBlockTemplate::_table_ = {
}
}
// bool is_mempool_in_sync = 3;
if (this->_internal_is_mempool_in_sync() != 0) {
total_size += 2;
}
return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_);
}
@ -2564,6 +2620,9 @@ void NewBlockTemplate::MergeImpl(::google::protobuf::MessageLite& to_msg, const
}
}
}
if (from._internal_is_mempool_in_sync() != 0) {
_this->_impl_.is_mempool_in_sync_ = from._impl_.is_mempool_in_sync_;
}
_this->_impl_._has_bits_[0] |= cached_has_bits;
_this->_internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(from._internal_metadata_);
}
@ -2584,8 +2643,8 @@ void NewBlockTemplate::InternalSwap(NewBlockTemplate* PROTOBUF_RESTRICT other) {
_internal_metadata_.InternalSwap(&other->_internal_metadata_);
swap(_impl_._has_bits_[0], other->_impl_._has_bits_[0]);
::google::protobuf::internal::memswap<
PROTOBUF_FIELD_OFFSET(NewBlockTemplate, _impl_.body_)
+ sizeof(NewBlockTemplate::_impl_.body_)
PROTOBUF_FIELD_OFFSET(NewBlockTemplate, _impl_.is_mempool_in_sync_)
+ sizeof(NewBlockTemplate::_impl_.is_mempool_in_sync_)
- PROTOBUF_FIELD_OFFSET(NewBlockTemplate, _impl_.header_)>(
reinterpret_cast<char*>(&_impl_.header_),
reinterpret_cast<char*>(&other->_impl_.header_));

View file

@ -872,6 +872,7 @@ class BlockHeader final : public ::google::protobuf::Message
kHashFieldNumber = 1,
kPrevHashFieldNumber = 4,
kOutputMrFieldNumber = 6,
kBlockOutputMrFieldNumber = 7,
kKernelMrFieldNumber = 8,
kInputMrFieldNumber = 9,
kTotalKernelOffsetFieldNumber = 10,
@ -933,6 +934,22 @@ class BlockHeader final : public ::google::protobuf::Message
const std::string& value);
std::string* _internal_mutable_output_mr();
public:
// bytes block_output_mr = 7;
void clear_block_output_mr() ;
const std::string& block_output_mr() const;
template <typename Arg_ = const std::string&, typename... Args_>
void set_block_output_mr(Arg_&& arg, Args_... args);
std::string* mutable_block_output_mr();
PROTOBUF_NODISCARD std::string* release_block_output_mr();
void set_allocated_block_output_mr(std::string* value);
private:
const std::string& _internal_block_output_mr() const;
inline PROTOBUF_ALWAYS_INLINE void _internal_set_block_output_mr(
const std::string& value);
std::string* _internal_mutable_block_output_mr();
public:
// bytes kernel_mr = 8;
void clear_kernel_mr() ;
@ -1104,7 +1121,7 @@ class BlockHeader final : public ::google::protobuf::Message
class _Internal;
friend class ::google::protobuf::internal::TcParser;
static const ::google::protobuf::internal::TcParseTable<
5, 16, 1,
5, 17, 1,
0, 2>
_table_;
friend class ::google::protobuf::MessageLite;
@ -1125,6 +1142,7 @@ class BlockHeader final : public ::google::protobuf::Message
::google::protobuf::internal::ArenaStringPtr hash_;
::google::protobuf::internal::ArenaStringPtr prev_hash_;
::google::protobuf::internal::ArenaStringPtr output_mr_;
::google::protobuf::internal::ArenaStringPtr block_output_mr_;
::google::protobuf::internal::ArenaStringPtr kernel_mr_;
::google::protobuf::internal::ArenaStringPtr input_mr_;
::google::protobuf::internal::ArenaStringPtr total_kernel_offset_;
@ -1272,6 +1290,7 @@ class NewBlockTemplate final : public ::google::protobuf::Message
enum : int {
kHeaderFieldNumber = 1,
kBodyFieldNumber = 2,
kIsMempoolInSyncFieldNumber = 3,
};
// .tari.rpc.NewBlockHeaderTemplate header = 1;
bool has_header() const;
@ -1302,13 +1321,23 @@ class NewBlockTemplate final : public ::google::protobuf::Message
const ::tari::rpc::AggregateBody& _internal_body() const;
::tari::rpc::AggregateBody* _internal_mutable_body();
public:
// bool is_mempool_in_sync = 3;
void clear_is_mempool_in_sync() ;
bool is_mempool_in_sync() const;
void set_is_mempool_in_sync(bool value);
private:
bool _internal_is_mempool_in_sync() const;
void _internal_set_is_mempool_in_sync(bool value);
public:
// @@protoc_insertion_point(class_scope:tari.rpc.NewBlockTemplate)
private:
class _Internal;
friend class ::google::protobuf::internal::TcParser;
static const ::google::protobuf::internal::TcParseTable<
1, 2, 2,
2, 3, 2,
0, 2>
_table_;
friend class ::google::protobuf::MessageLite;
@ -1328,6 +1357,7 @@ class NewBlockTemplate final : public ::google::protobuf::Message
mutable ::google::protobuf::internal::CachedSize _cached_size_;
::tari::rpc::NewBlockHeaderTemplate* header_;
::tari::rpc::AggregateBody* body_;
bool is_mempool_in_sync_;
PROTOBUF_TSAN_DECLARE_MEMBER
};
union { Impl_ _impl_; };
@ -1941,6 +1971,56 @@ inline void BlockHeader::set_allocated_output_mr(std::string* value) {
// @@protoc_insertion_point(field_set_allocated:tari.rpc.BlockHeader.output_mr)
}
// bytes block_output_mr = 7;
inline void BlockHeader::clear_block_output_mr() {
PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
_impl_.block_output_mr_.ClearToEmpty();
}
inline const std::string& BlockHeader::block_output_mr() const
ABSL_ATTRIBUTE_LIFETIME_BOUND {
// @@protoc_insertion_point(field_get:tari.rpc.BlockHeader.block_output_mr)
return _internal_block_output_mr();
}
template <typename Arg_, typename... Args_>
inline PROTOBUF_ALWAYS_INLINE void BlockHeader::set_block_output_mr(Arg_&& arg,
Args_... args) {
PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
_impl_.block_output_mr_.SetBytes(static_cast<Arg_&&>(arg), args..., GetArena());
// @@protoc_insertion_point(field_set:tari.rpc.BlockHeader.block_output_mr)
}
inline std::string* BlockHeader::mutable_block_output_mr() ABSL_ATTRIBUTE_LIFETIME_BOUND {
std::string* _s = _internal_mutable_block_output_mr();
// @@protoc_insertion_point(field_mutable:tari.rpc.BlockHeader.block_output_mr)
return _s;
}
inline const std::string& BlockHeader::_internal_block_output_mr() const {
PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
return _impl_.block_output_mr_.Get();
}
inline void BlockHeader::_internal_set_block_output_mr(const std::string& value) {
PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
_impl_.block_output_mr_.Set(value, GetArena());
}
inline std::string* BlockHeader::_internal_mutable_block_output_mr() {
PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
return _impl_.block_output_mr_.Mutable( GetArena());
}
inline std::string* BlockHeader::release_block_output_mr() {
PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
// @@protoc_insertion_point(field_release:tari.rpc.BlockHeader.block_output_mr)
return _impl_.block_output_mr_.Release();
}
inline void BlockHeader::set_allocated_block_output_mr(std::string* value) {
PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
_impl_.block_output_mr_.SetAllocated(value, GetArena());
#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
if (_impl_.block_output_mr_.IsDefault()) {
_impl_.block_output_mr_.Set("", GetArena());
}
#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
// @@protoc_insertion_point(field_set_allocated:tari.rpc.BlockHeader.block_output_mr)
}
// bytes kernel_mr = 8;
inline void BlockHeader::clear_kernel_mr() {
PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
@ -3275,6 +3355,28 @@ inline void NewBlockTemplate::set_allocated_body(::tari::rpc::AggregateBody* val
// @@protoc_insertion_point(field_set_allocated:tari.rpc.NewBlockTemplate.body)
}
// bool is_mempool_in_sync = 3;
inline void NewBlockTemplate::clear_is_mempool_in_sync() {
PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
_impl_.is_mempool_in_sync_ = false;
}
inline bool NewBlockTemplate::is_mempool_in_sync() const {
// @@protoc_insertion_point(field_get:tari.rpc.NewBlockTemplate.is_mempool_in_sync)
return _internal_is_mempool_in_sync();
}
inline void NewBlockTemplate::set_is_mempool_in_sync(bool value) {
_internal_set_is_mempool_in_sync(value);
// @@protoc_insertion_point(field_set:tari.rpc.NewBlockTemplate.is_mempool_in_sync)
}
inline bool NewBlockTemplate::_internal_is_mempool_in_sync() const {
PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
return _impl_.is_mempool_in_sync_;
}
inline void NewBlockTemplate::_internal_set_is_mempool_in_sync(bool value) {
PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
_impl_.is_mempool_in_sync_ = value;
}
#ifdef __GNUC__
#pragma GCC diagnostic pop
#endif // __GNUC__

View file

@ -38,9 +38,10 @@ message BlockHeader {
bytes prev_hash = 4;
// Timestamp at which the block was built.
uint64 timestamp = 5;
// This is the UTXO merkle root of the outputs
// This is calculated as Hash (txo MMR root || roaring bitmap hash of UTXO indices)
// This is the UTXO merkle root of the outputs in the blockchain
bytes output_mr = 6;
// This is the merkle root of all outputs in this block
bytes block_output_mr = 7;
// This is the MMR root of the kernels
bytes kernel_mr = 8;
// This is the Merkle root of the inputs in this block
@ -133,5 +134,8 @@ message NewBlockTemplate {
// This flag indicates if the inputs, outputs and kernels have been sorted internally, that is, the sort() method
// has been called. This may be false even if all components are sorted.
AggregateBody body = 2;
// Sometimes the mempool has not synced to the latest tip, this flag indicates if the mempool is out of sync.
// In most cases the next call to get_new_block_template will return a block with the mempool in sync.
bool is_mempool_in_sync = 3;
}

View file

@ -108,6 +108,7 @@ inline constexpr UnblindedOutput::Impl_::Impl_(
::_pbi::ConstantInitialized()),
features_{nullptr},
metadata_signature_{nullptr},
range_proof_{nullptr},
value_{::uint64_t{0u}},
script_lock_height_{::uint64_t{0u}},
minimum_value_promise_{::uint64_t{0u}} {}
@ -427,6 +428,7 @@ const ::uint32_t
PROTOBUF_FIELD_OFFSET(::tari::rpc::UnblindedOutput, _impl_.covenant_),
PROTOBUF_FIELD_OFFSET(::tari::rpc::UnblindedOutput, _impl_.encrypted_data_),
PROTOBUF_FIELD_OFFSET(::tari::rpc::UnblindedOutput, _impl_.minimum_value_promise_),
PROTOBUF_FIELD_OFFSET(::tari::rpc::UnblindedOutput, _impl_.range_proof_),
~0u,
~0u,
0,
@ -439,6 +441,7 @@ const ::uint32_t
~0u,
~0u,
~0u,
2,
};
static const ::_pbi::MigrationSchema
@ -449,7 +452,7 @@ static const ::_pbi::MigrationSchema
{90, 104, -1, sizeof(::tari::rpc::OutputFeatures)},
{110, -1, -1, sizeof(::tari::rpc::AggregateBody)},
{121, 132, -1, sizeof(::tari::rpc::Transaction)},
{135, 155, -1, sizeof(::tari::rpc::UnblindedOutput)},
{135, 156, -1, sizeof(::tari::rpc::UnblindedOutput)},
};
static const ::_pb::Message* const file_default_instances[] = {
&::tari::rpc::_TransactionKernel_default_instance_._instance,
@ -498,7 +501,7 @@ const char descriptor_table_protodef_transaction_2eproto[] ABSL_ATTRIBUTE_SECTIO
"tari.rpc.TransactionKernel\"[\n\013Transactio"
"n\022\016\n\006offset\030\001 \001(\014\022%\n\004body\030\002 \001(\0132\027.tari.r"
"pc.AggregateBody\022\025\n\rscript_offset\030\003 \001(\014\""
"\343\002\n\017UnblindedOutput\022\r\n\005value\030\001 \001(\004\022\024\n\014sp"
"\216\003\n\017UnblindedOutput\022\r\n\005value\030\001 \001(\004\022\024\n\014sp"
"ending_key\030\002 \001(\014\022*\n\010features\030\003 \001(\0132\030.tar"
"i.rpc.OutputFeatures\022\016\n\006script\030\004 \001(\014\022\022\n\n"
"input_data\030\005 \001(\014\022\032\n\022script_private_key\030\007"
@ -506,8 +509,9 @@ const char descriptor_table_protodef_transaction_2eproto[] ABSL_ATTRIBUTE_SECTIO
"\n\022metadata_signature\030\t \001(\0132\034.tari.rpc.Co"
"mAndPubSignature\022\032\n\022script_lock_height\030\n"
" \001(\004\022\020\n\010covenant\030\013 \001(\014\022\026\n\016encrypted_data"
"\030\014 \001(\014\022\035\n\025minimum_value_promise\030\r \001(\004b\006p"
"roto3"
"\030\014 \001(\014\022\035\n\025minimum_value_promise\030\r \001(\004\022)\n"
"\013range_proof\030\016 \001(\0132\024.tari.rpc.RangeProof"
"b\006proto3"
};
static const ::_pbi::DescriptorTable* const descriptor_table_transaction_2eproto_deps[2] =
{
@ -518,7 +522,7 @@ static ::absl::once_flag descriptor_table_transaction_2eproto_once;
const ::_pbi::DescriptorTable descriptor_table_transaction_2eproto = {
false,
false,
1805,
1848,
descriptor_table_protodef_transaction_2eproto,
"transaction.proto",
&descriptor_table_transaction_2eproto_once,
@ -2988,6 +2992,11 @@ void UnblindedOutput::clear_metadata_signature() {
if (_impl_.metadata_signature_ != nullptr) _impl_.metadata_signature_->Clear();
_impl_._has_bits_[0] &= ~0x00000002u;
}
void UnblindedOutput::clear_range_proof() {
PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
if (_impl_.range_proof_ != nullptr) _impl_.range_proof_->Clear();
_impl_._has_bits_[0] &= ~0x00000004u;
}
UnblindedOutput::UnblindedOutput(::google::protobuf::Arena* arena)
: ::google::protobuf::Message(arena) {
SharedCtor(arena);
@ -3022,6 +3031,9 @@ UnblindedOutput::UnblindedOutput(
_impl_.metadata_signature_ = (cached_has_bits & 0x00000002u) ? ::google::protobuf::Message::CopyConstruct<::tari::rpc::ComAndPubSignature>(
arena, *from._impl_.metadata_signature_)
: nullptr;
_impl_.range_proof_ = (cached_has_bits & 0x00000004u) ? ::google::protobuf::Message::CopyConstruct<::tari::rpc::RangeProof>(
arena, *from._impl_.range_proof_)
: nullptr;
::memcpy(reinterpret_cast<char *>(&_impl_) +
offsetof(Impl_, value_),
reinterpret_cast<const char *>(&from._impl_) +
@ -3069,6 +3081,7 @@ inline void UnblindedOutput::SharedDtor() {
_impl_.encrypted_data_.Destroy();
delete _impl_.features_;
delete _impl_.metadata_signature_;
delete _impl_.range_proof_;
_impl_.~Impl_();
}
@ -3101,7 +3114,7 @@ PROTOBUF_NOINLINE void UnblindedOutput::Clear() {
_impl_.covenant_.ClearToEmpty();
_impl_.encrypted_data_.ClearToEmpty();
cached_has_bits = _impl_._has_bits_[0];
if (cached_has_bits & 0x00000003u) {
if (cached_has_bits & 0x00000007u) {
if (cached_has_bits & 0x00000001u) {
ABSL_DCHECK(_impl_.features_ != nullptr);
_impl_.features_->Clear();
@ -3110,6 +3123,10 @@ PROTOBUF_NOINLINE void UnblindedOutput::Clear() {
ABSL_DCHECK(_impl_.metadata_signature_ != nullptr);
_impl_.metadata_signature_->Clear();
}
if (cached_has_bits & 0x00000004u) {
ABSL_DCHECK(_impl_.range_proof_ != nullptr);
_impl_.range_proof_->Clear();
}
}
::memset(&_impl_.value_, 0, static_cast<::size_t>(
reinterpret_cast<char*>(&_impl_.minimum_value_promise_) -
@ -3126,16 +3143,16 @@ const char* UnblindedOutput::_InternalParse(
PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1
const ::_pbi::TcParseTable<4, 12, 2, 0, 2> UnblindedOutput::_table_ = {
const ::_pbi::TcParseTable<4, 13, 3, 0, 2> UnblindedOutput::_table_ = {
{
PROTOBUF_FIELD_OFFSET(UnblindedOutput, _impl_._has_bits_),
0, // no _extensions_
13, 120, // max_field_number, fast_idx_mask
14, 120, // max_field_number, fast_idx_mask
offsetof(decltype(_table_), field_lookup_table),
4294959136, // skipmap
4294950944, // skipmap
offsetof(decltype(_table_), field_entries),
12, // num_field_entries
2, // num_aux_entries
13, // num_field_entries
3, // num_aux_entries
offsetof(decltype(_table_), aux_entries),
&_UnblindedOutput_default_instance_._instance,
::_pbi::TcParser::GenericFallback, // fallback
@ -3181,7 +3198,9 @@ const ::_pbi::TcParseTable<4, 12, 2, 0, 2> UnblindedOutput::_table_ = {
// uint64 minimum_value_promise = 13;
{::_pbi::TcParser::SingularVarintNoZag1<::uint64_t, offsetof(UnblindedOutput, _impl_.minimum_value_promise_), 63>(),
{104, 63, 0, PROTOBUF_FIELD_OFFSET(UnblindedOutput, _impl_.minimum_value_promise_)}},
{::_pbi::TcParser::MiniParse, {}},
// .tari.rpc.RangeProof range_proof = 14;
{::_pbi::TcParser::FastMtS1,
{114, 2, 2, PROTOBUF_FIELD_OFFSET(UnblindedOutput, _impl_.range_proof_)}},
{::_pbi::TcParser::MiniParse, {}},
}}, {{
65535, 65535
@ -3222,9 +3241,13 @@ const ::_pbi::TcParseTable<4, 12, 2, 0, 2> UnblindedOutput::_table_ = {
// uint64 minimum_value_promise = 13;
{PROTOBUF_FIELD_OFFSET(UnblindedOutput, _impl_.minimum_value_promise_), -1, 0,
(0 | ::_fl::kFcSingular | ::_fl::kUInt64)},
// .tari.rpc.RangeProof range_proof = 14;
{PROTOBUF_FIELD_OFFSET(UnblindedOutput, _impl_.range_proof_), _Internal::kHasBitsOffset + 2, 2,
(0 | ::_fl::kFcOptional | ::_fl::kMessage | ::_fl::kTvTable)},
}}, {{
{::_pbi::TcParser::GetTable<::tari::rpc::OutputFeatures>()},
{::_pbi::TcParser::GetTable<::tari::rpc::ComAndPubSignature>()},
{::_pbi::TcParser::GetTable<::tari::rpc::RangeProof>()},
}}, {{
}},
};
@ -3312,6 +3335,12 @@ const ::_pbi::TcParseTable<4, 12, 2, 0, 2> UnblindedOutput::_table_ = {
13, this->_internal_minimum_value_promise(), target);
}
// .tari.rpc.RangeProof range_proof = 14;
if (cached_has_bits & 0x00000004u) {
target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
14, *_impl_.range_proof_, _impl_.range_proof_->GetCachedSize(), target, stream);
}
if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) {
target =
::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray(
@ -3372,7 +3401,7 @@ const ::_pbi::TcParseTable<4, 12, 2, 0, 2> UnblindedOutput::_table_ = {
}
cached_has_bits = _impl_._has_bits_[0];
if (cached_has_bits & 0x00000003u) {
if (cached_has_bits & 0x00000007u) {
// .tari.rpc.OutputFeatures features = 3;
if (cached_has_bits & 0x00000001u) {
total_size +=
@ -3385,6 +3414,12 @@ const ::_pbi::TcParseTable<4, 12, 2, 0, 2> UnblindedOutput::_table_ = {
1 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.metadata_signature_);
}
// .tari.rpc.RangeProof range_proof = 14;
if (cached_has_bits & 0x00000004u) {
total_size +=
1 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.range_proof_);
}
}
// uint64 value = 1;
if (this->_internal_value() != 0) {
@ -3439,7 +3474,7 @@ void UnblindedOutput::MergeImpl(::google::protobuf::MessageLite& to_msg, const :
_this->_internal_set_encrypted_data(from._internal_encrypted_data());
}
cached_has_bits = from._impl_._has_bits_[0];
if (cached_has_bits & 0x00000003u) {
if (cached_has_bits & 0x00000007u) {
if (cached_has_bits & 0x00000001u) {
ABSL_DCHECK(from._impl_.features_ != nullptr);
if (_this->_impl_.features_ == nullptr) {
@ -3458,6 +3493,15 @@ void UnblindedOutput::MergeImpl(::google::protobuf::MessageLite& to_msg, const :
_this->_impl_.metadata_signature_->MergeFrom(*from._impl_.metadata_signature_);
}
}
if (cached_has_bits & 0x00000004u) {
ABSL_DCHECK(from._impl_.range_proof_ != nullptr);
if (_this->_impl_.range_proof_ == nullptr) {
_this->_impl_.range_proof_ =
::google::protobuf::Message::CopyConstruct<::tari::rpc::RangeProof>(arena, *from._impl_.range_proof_);
} else {
_this->_impl_.range_proof_->MergeFrom(*from._impl_.range_proof_);
}
}
}
if (from._internal_value() != 0) {
_this->_impl_.value_ = from._impl_.value_;

View file

@ -737,6 +737,7 @@ class UnblindedOutput final : public ::google::protobuf::Message
kEncryptedDataFieldNumber = 12,
kFeaturesFieldNumber = 3,
kMetadataSignatureFieldNumber = 9,
kRangeProofFieldNumber = 14,
kValueFieldNumber = 1,
kScriptLockHeightFieldNumber = 10,
kMinimumValuePromiseFieldNumber = 13,
@ -882,6 +883,21 @@ class UnblindedOutput final : public ::google::protobuf::Message
const ::tari::rpc::ComAndPubSignature& _internal_metadata_signature() const;
::tari::rpc::ComAndPubSignature* _internal_mutable_metadata_signature();
public:
// .tari.rpc.RangeProof range_proof = 14;
bool has_range_proof() const;
void clear_range_proof() ;
const ::tari::rpc::RangeProof& range_proof() const;
PROTOBUF_NODISCARD ::tari::rpc::RangeProof* release_range_proof();
::tari::rpc::RangeProof* mutable_range_proof();
void set_allocated_range_proof(::tari::rpc::RangeProof* value);
void unsafe_arena_set_allocated_range_proof(::tari::rpc::RangeProof* value);
::tari::rpc::RangeProof* unsafe_arena_release_range_proof();
private:
const ::tari::rpc::RangeProof& _internal_range_proof() const;
::tari::rpc::RangeProof* _internal_mutable_range_proof();
public:
// uint64 value = 1;
void clear_value() ;
@ -918,7 +934,7 @@ class UnblindedOutput final : public ::google::protobuf::Message
class _Internal;
friend class ::google::protobuf::internal::TcParser;
static const ::google::protobuf::internal::TcParseTable<
4, 12, 2,
4, 13, 3,
0, 2>
_table_;
friend class ::google::protobuf::MessageLite;
@ -945,6 +961,7 @@ class UnblindedOutput final : public ::google::protobuf::Message
::google::protobuf::internal::ArenaStringPtr encrypted_data_;
::tari::rpc::OutputFeatures* features_;
::tari::rpc::ComAndPubSignature* metadata_signature_;
::tari::rpc::RangeProof* range_proof_;
::uint64_t value_;
::uint64_t script_lock_height_;
::uint64_t minimum_value_promise_;
@ -5045,6 +5062,97 @@ inline void UnblindedOutput::_internal_set_minimum_value_promise(::uint64_t valu
_impl_.minimum_value_promise_ = value;
}
// .tari.rpc.RangeProof range_proof = 14;
inline bool UnblindedOutput::has_range_proof() const {
bool value = (_impl_._has_bits_[0] & 0x00000004u) != 0;
PROTOBUF_ASSUME(!value || _impl_.range_proof_ != nullptr);
return value;
}
inline const ::tari::rpc::RangeProof& UnblindedOutput::_internal_range_proof() const {
PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
const ::tari::rpc::RangeProof* p = _impl_.range_proof_;
return p != nullptr ? *p : reinterpret_cast<const ::tari::rpc::RangeProof&>(::tari::rpc::_RangeProof_default_instance_);
}
inline const ::tari::rpc::RangeProof& UnblindedOutput::range_proof() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
// @@protoc_insertion_point(field_get:tari.rpc.UnblindedOutput.range_proof)
return _internal_range_proof();
}
inline void UnblindedOutput::unsafe_arena_set_allocated_range_proof(::tari::rpc::RangeProof* value) {
PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
if (GetArena() == nullptr) {
delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.range_proof_);
}
_impl_.range_proof_ = reinterpret_cast<::tari::rpc::RangeProof*>(value);
if (value != nullptr) {
_impl_._has_bits_[0] |= 0x00000004u;
} else {
_impl_._has_bits_[0] &= ~0x00000004u;
}
// @@protoc_insertion_point(field_unsafe_arena_set_allocated:tari.rpc.UnblindedOutput.range_proof)
}
inline ::tari::rpc::RangeProof* UnblindedOutput::release_range_proof() {
PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
_impl_._has_bits_[0] &= ~0x00000004u;
::tari::rpc::RangeProof* released = _impl_.range_proof_;
_impl_.range_proof_ = nullptr;
#ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
auto* old = reinterpret_cast<::google::protobuf::MessageLite*>(released);
released = ::google::protobuf::internal::DuplicateIfNonNull(released);
if (GetArena() == nullptr) {
delete old;
}
#else // PROTOBUF_FORCE_COPY_IN_RELEASE
if (GetArena() != nullptr) {
released = ::google::protobuf::internal::DuplicateIfNonNull(released);
}
#endif // !PROTOBUF_FORCE_COPY_IN_RELEASE
return released;
}
inline ::tari::rpc::RangeProof* UnblindedOutput::unsafe_arena_release_range_proof() {
PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
// @@protoc_insertion_point(field_release:tari.rpc.UnblindedOutput.range_proof)
_impl_._has_bits_[0] &= ~0x00000004u;
::tari::rpc::RangeProof* temp = _impl_.range_proof_;
_impl_.range_proof_ = nullptr;
return temp;
}
inline ::tari::rpc::RangeProof* UnblindedOutput::_internal_mutable_range_proof() {
PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
if (_impl_.range_proof_ == nullptr) {
auto* p = ::google::protobuf::Message::DefaultConstruct<::tari::rpc::RangeProof>(GetArena());
_impl_.range_proof_ = reinterpret_cast<::tari::rpc::RangeProof*>(p);
}
return _impl_.range_proof_;
}
inline ::tari::rpc::RangeProof* UnblindedOutput::mutable_range_proof() ABSL_ATTRIBUTE_LIFETIME_BOUND {
_impl_._has_bits_[0] |= 0x00000004u;
::tari::rpc::RangeProof* _msg = _internal_mutable_range_proof();
// @@protoc_insertion_point(field_mutable:tari.rpc.UnblindedOutput.range_proof)
return _msg;
}
inline void UnblindedOutput::set_allocated_range_proof(::tari::rpc::RangeProof* value) {
::google::protobuf::Arena* message_arena = GetArena();
PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
if (message_arena == nullptr) {
delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.range_proof_);
}
if (value != nullptr) {
::google::protobuf::Arena* submessage_arena = reinterpret_cast<::google::protobuf::MessageLite*>(value)->GetArena();
if (message_arena != submessage_arena) {
value = ::google::protobuf::internal::GetOwnedMessage(message_arena, value, submessage_arena);
}
_impl_._has_bits_[0] |= 0x00000004u;
} else {
_impl_._has_bits_[0] &= ~0x00000004u;
}
_impl_.range_proof_ = reinterpret_cast<::tari::rpc::RangeProof*>(value);
// @@protoc_insertion_point(field_set_allocated:tari.rpc.UnblindedOutput.range_proof)
}
#ifdef __GNUC__
#pragma GCC diagnostic pop
#endif // __GNUC__

View file

@ -178,5 +178,7 @@ message UnblindedOutput {
bytes encrypted_data = 12;
// The minimum value of the commitment that is proven by the range proof (in MicroMinotari)
uint64 minimum_value_promise = 13;
// The range proof
RangeProof range_proof = 14;
}

View file

@ -302,7 +302,7 @@ inline constexpr ConsensusConstants::Impl_::Impl_(
block_weight_inputs_{::uint64_t{0u}},
block_weight_outputs_{::uint64_t{0u}},
block_weight_kernels_{::uint64_t{0u}},
faucet_value_{::uint64_t{0u}},
pre_mine_value_{::uint64_t{0u}},
max_script_byte_size_{::uint64_t{0u}},
validator_node_validity_period_{::uint64_t{0u}},
effective_from_height_{::uint64_t{0u}},
@ -313,6 +313,7 @@ inline constexpr ConsensusConstants::Impl_::Impl_(
validator_node_registration_shuffle_interval_epoch_{::uint64_t{0u}},
inflation_bips_{::uint64_t{0u}},
tail_epoch_length_{::uint64_t{0u}},
max_block_coinbase_count_{::uint64_t{0u}},
blockchain_version_{0u} {}
template <typename>
@ -486,7 +487,7 @@ const ::uint32_t
PROTOBUF_FIELD_OFFSET(::tari::rpc::ConsensusConstants, _impl_.block_weight_inputs_),
PROTOBUF_FIELD_OFFSET(::tari::rpc::ConsensusConstants, _impl_.block_weight_outputs_),
PROTOBUF_FIELD_OFFSET(::tari::rpc::ConsensusConstants, _impl_.block_weight_kernels_),
PROTOBUF_FIELD_OFFSET(::tari::rpc::ConsensusConstants, _impl_.faucet_value_),
PROTOBUF_FIELD_OFFSET(::tari::rpc::ConsensusConstants, _impl_.pre_mine_value_),
PROTOBUF_FIELD_OFFSET(::tari::rpc::ConsensusConstants, _impl_.max_script_byte_size_),
PROTOBUF_FIELD_OFFSET(::tari::rpc::ConsensusConstants, _impl_.validator_node_validity_period_),
PROTOBUF_FIELD_OFFSET(::tari::rpc::ConsensusConstants, _impl_.effective_from_height_),
@ -505,6 +506,7 @@ const ::uint32_t
PROTOBUF_FIELD_OFFSET(::tari::rpc::ConsensusConstants, _impl_.permitted_range_proof_types_),
PROTOBUF_FIELD_OFFSET(::tari::rpc::ConsensusConstants, _impl_.inflation_bips_),
PROTOBUF_FIELD_OFFSET(::tari::rpc::ConsensusConstants, _impl_.tail_epoch_length_),
PROTOBUF_FIELD_OFFSET(::tari::rpc::ConsensusConstants, _impl_.max_block_coinbase_count_),
~0u,
~0u,
~0u,
@ -538,6 +540,7 @@ const ::uint32_t
~0u,
~0u,
~0u,
~0u,
};
static const ::_pbi::MigrationSchema
@ -554,7 +557,7 @@ static const ::_pbi::MigrationSchema
{96, -1, -1, sizeof(::tari::rpc::PermittedRangeProofs)},
{106, -1, -1, sizeof(::tari::rpc::RangeProof)},
{115, 125, -1, sizeof(::tari::rpc::ConsensusConstants_ProofOfWorkEntry_DoNotUse)},
{127, 168, -1, sizeof(::tari::rpc::ConsensusConstants)},
{127, 169, -1, sizeof(::tari::rpc::ConsensusConstants)},
};
static const ::_pb::Message* const file_default_instances[] = {
&::tari::rpc::_Range_default_instance_._instance,
@ -593,7 +596,7 @@ const char descriptor_table_protodef_types_2eproto[] ABSL_ATTRIBUTE_SECTION_VARI
"output_type\030\001 \001(\0162\024.tari.rpc.OutputType\022"
"3\n\021range_proof_types\030\002 \003(\0162\030.tari.rpc.Ra"
"ngeProofType\"!\n\nRangeProof\022\023\n\013proof_byte"
"s\030\001 \001(\014\"\327\n\n\022ConsensusConstants\022\035\n\025coinba"
"s\030\001 \001(\014\"\373\n\n\022ConsensusConstants\022\035\n\025coinba"
"se_min_maturity\030\001 \001(\004\022\032\n\022blockchain_vers"
"ion\030\002 \001(\r\022\031\n\021future_time_limit\030\003 \001(\004\022\037\n\027"
"difficulty_block_window\030\005 \001(\004\022$\n\034max_blo"
@ -604,41 +607,41 @@ const char descriptor_table_protodef_types_2eproto[] ABSL_ATTRIBUTE_SECTION_VARI
"\022 \n\030min_sha3x_pow_difficulty\030\r \001(\004\022\033\n\023bl"
"ock_weight_inputs\030\016 \001(\004\022\034\n\024block_weight_"
"outputs\030\017 \001(\004\022\034\n\024block_weight_kernels\030\020 "
"\001(\004\022\024\n\014faucet_value\030\021 \001(\004\022\034\n\024max_script_"
"byte_size\030\022 \001(\004\022&\n\036validator_node_validi"
"ty_period\030\023 \001(\004\022\035\n\025effective_from_height"
"\030\024 \001(\004\0227\n\036valid_blockchain_version_range"
"\030\025 \001(\0132\017.tari.rpc.Range\022\037\n\027max_randomx_s"
"eed_height\030\026 \001(\004\022D\n\rproof_of_work\030\027 \003(\0132"
"-.tari.rpc.ConsensusConstants.ProofOfWor"
"kEntry\0222\n\022transaction_weight\030\030 \001(\0132\026.tar"
"i.rpc.WeightParams\022,\n\023input_version_rang"
"e\030\032 \001(\0132\017.tari.rpc.Range\0226\n\024output_versi"
"on_range\030\033 \001(\0132\030.tari.rpc.OutputsVersion"
"\022-\n\024kernel_version_range\030\034 \001(\0132\017.tari.rp"
"c.Range\0224\n\026permitted_output_types\030\035 \003(\0162"
"\024.tari.rpc.OutputType\022\024\n\014epoch_length\030\036 "
"\001(\004\0226\n.validator_node_registration_min_d"
"eposit_amount\030\037 \001(\004\0223\n+validator_node_re"
"gistration_min_lock_height\030 \001(\004\022:\n2vali"
"dator_node_registration_shuffle_interval"
"_epoch\030! \001(\004\022C\n\033permitted_range_proof_ty"
"pes\030\" \003(\0132\036.tari.rpc.PermittedRangeProof"
"s\022\026\n\016inflation_bips\030# \001(\004\022\031\n\021tail_epoch_"
"length\030$ \001(\004\032S\n\020ProofOfWorkEntry\022\013\n\003key\030"
"\001 \001(\r\022.\n\005value\030\002 \001(\0132\037.tari.rpc.PowAlgor"
"ithmConstants:\0028\001*s\n\nOutputType\022\014\n\010STAND"
"ARD\020\000\022\014\n\010COINBASE\020\001\022\010\n\004BURN\020\002\022\037\n\033VALIDAT"
"OR_NODE_REGISTRATION\020\003\022\036\n\032CODE_TEMPLATE_"
"REGISTRATION\020\004*:\n\016RangeProofType\022\024\n\020BULL"
"ETPROOF_PLUS\020\000\022\022\n\016REVEALED_VALUE\020\001b\006prot"
"o3"
"\001(\004\022\026\n\016pre_mine_value\030\021 \001(\004\022\034\n\024max_scrip"
"t_byte_size\030\022 \001(\004\022&\n\036validator_node_vali"
"dity_period\030\023 \001(\004\022\035\n\025effective_from_heig"
"ht\030\024 \001(\004\0227\n\036valid_blockchain_version_ran"
"ge\030\025 \001(\0132\017.tari.rpc.Range\022\037\n\027max_randomx"
"_seed_height\030\026 \001(\004\022D\n\rproof_of_work\030\027 \003("
"\0132-.tari.rpc.ConsensusConstants.ProofOfW"
"orkEntry\0222\n\022transaction_weight\030\030 \001(\0132\026.t"
"ari.rpc.WeightParams\022,\n\023input_version_ra"
"nge\030\032 \001(\0132\017.tari.rpc.Range\0226\n\024output_ver"
"sion_range\030\033 \001(\0132\030.tari.rpc.OutputsVersi"
"on\022-\n\024kernel_version_range\030\034 \001(\0132\017.tari."
"rpc.Range\0224\n\026permitted_output_types\030\035 \003("
"\0162\024.tari.rpc.OutputType\022\024\n\014epoch_length\030"
"\036 \001(\004\0226\n.validator_node_registration_min"
"_deposit_amount\030\037 \001(\004\0223\n+validator_node_"
"registration_min_lock_height\030 \001(\004\022:\n2va"
"lidator_node_registration_shuffle_interv"
"al_epoch\030! \001(\004\022C\n\033permitted_range_proof_"
"types\030\" \003(\0132\036.tari.rpc.PermittedRangePro"
"ofs\022\026\n\016inflation_bips\030# \001(\004\022\031\n\021tail_epoc"
"h_length\030$ \001(\004\022 \n\030max_block_coinbase_cou"
"nt\030% \001(\004\032S\n\020ProofOfWorkEntry\022\013\n\003key\030\001 \001("
"\r\022.\n\005value\030\002 \001(\0132\037.tari.rpc.PowAlgorithm"
"Constants:\0028\001*s\n\nOutputType\022\014\n\010STANDARD\020"
"\000\022\014\n\010COINBASE\020\001\022\010\n\004BURN\020\002\022\037\n\033VALIDATOR_N"
"ODE_REGISTRATION\020\003\022\036\n\032CODE_TEMPLATE_REGI"
"STRATION\020\004*:\n\016RangeProofType\022\024\n\020BULLETPR"
"OOF_PLUS\020\000\022\022\n\016REVEALED_VALUE\020\001b\006proto3"
};
static ::absl::once_flag descriptor_table_types_2eproto_once;
const ::_pbi::DescriptorTable descriptor_table_types_2eproto = {
false,
false,
2362,
2398,
descriptor_table_protodef_types_2eproto,
"types.proto",
&descriptor_table_types_2eproto_once,
@ -3217,15 +3220,15 @@ const char* ConsensusConstants::_InternalParse(
PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1
const ::_pbi::TcParseTable<5, 33, 8, 0, 7> ConsensusConstants::_table_ = {
const ::_pbi::TcParseTable<5, 34, 8, 0, 7> ConsensusConstants::_table_ = {
{
PROTOBUF_FIELD_OFFSET(ConsensusConstants, _impl_._has_bits_),
0, // no _extensions_
36, 248, // max_field_number, fast_idx_mask
37, 248, // max_field_number, fast_idx_mask
offsetof(decltype(_table_), field_lookup_table),
16777256, // skipmap
offsetof(decltype(_table_), field_entries),
33, // num_field_entries
34, // num_field_entries
8, // num_aux_entries
offsetof(decltype(_table_), aux_entries),
&_ConsensusConstants_default_instance_._instance,
@ -3279,9 +3282,9 @@ const ::_pbi::TcParseTable<5, 33, 8, 0, 7> ConsensusConstants::_table_ = {
// uint64 block_weight_kernels = 16;
{::_pbi::TcParser::FastV64S2,
{384, 63, 0, PROTOBUF_FIELD_OFFSET(ConsensusConstants, _impl_.block_weight_kernels_)}},
// uint64 faucet_value = 17;
// uint64 pre_mine_value = 17;
{::_pbi::TcParser::FastV64S2,
{392, 63, 0, PROTOBUF_FIELD_OFFSET(ConsensusConstants, _impl_.faucet_value_)}},
{392, 63, 0, PROTOBUF_FIELD_OFFSET(ConsensusConstants, _impl_.pre_mine_value_)}},
// uint64 max_script_byte_size = 18;
{::_pbi::TcParser::FastV64S2,
{400, 63, 0, PROTOBUF_FIELD_OFFSET(ConsensusConstants, _impl_.max_script_byte_size_)}},
@ -3322,7 +3325,7 @@ const ::_pbi::TcParseTable<5, 33, 8, 0, 7> ConsensusConstants::_table_ = {
{504, 63, 0, PROTOBUF_FIELD_OFFSET(ConsensusConstants, _impl_.validator_node_registration_min_deposit_amount_)}},
}}, {{
33, 0, 1,
65520, 29,
65504, 29,
65535, 65535
}}, {{
// uint64 coinbase_min_maturity = 1;
@ -3367,8 +3370,8 @@ const ::_pbi::TcParseTable<5, 33, 8, 0, 7> ConsensusConstants::_table_ = {
// uint64 block_weight_kernels = 16;
{PROTOBUF_FIELD_OFFSET(ConsensusConstants, _impl_.block_weight_kernels_), -1, 0,
(0 | ::_fl::kFcSingular | ::_fl::kUInt64)},
// uint64 faucet_value = 17;
{PROTOBUF_FIELD_OFFSET(ConsensusConstants, _impl_.faucet_value_), -1, 0,
// uint64 pre_mine_value = 17;
{PROTOBUF_FIELD_OFFSET(ConsensusConstants, _impl_.pre_mine_value_), -1, 0,
(0 | ::_fl::kFcSingular | ::_fl::kUInt64)},
// uint64 max_script_byte_size = 18;
{PROTOBUF_FIELD_OFFSET(ConsensusConstants, _impl_.max_script_byte_size_), -1, 0,
@ -3424,6 +3427,9 @@ const ::_pbi::TcParseTable<5, 33, 8, 0, 7> ConsensusConstants::_table_ = {
// uint64 tail_epoch_length = 36;
{PROTOBUF_FIELD_OFFSET(ConsensusConstants, _impl_.tail_epoch_length_), -1, 0,
(0 | ::_fl::kFcSingular | ::_fl::kUInt64)},
// uint64 max_block_coinbase_count = 37;
{PROTOBUF_FIELD_OFFSET(ConsensusConstants, _impl_.max_block_coinbase_count_), -1, 0,
(0 | ::_fl::kFcSingular | ::_fl::kUInt64)},
}}, {{
{::_pbi::TcParser::GetTable<::tari::rpc::Range>()},
{::_pbi::TcParser::GetMapAuxInfo<
@ -3547,11 +3553,11 @@ const ::_pbi::TcParseTable<5, 33, 8, 0, 7> ConsensusConstants::_table_ = {
16, this->_internal_block_weight_kernels(), target);
}
// uint64 faucet_value = 17;
if (this->_internal_faucet_value() != 0) {
// uint64 pre_mine_value = 17;
if (this->_internal_pre_mine_value() != 0) {
target = stream->EnsureSpace(target);
target = ::_pbi::WireFormatLite::WriteUInt64ToArray(
17, this->_internal_faucet_value(), target);
17, this->_internal_pre_mine_value(), target);
}
// uint64 max_script_byte_size = 18;
@ -3696,6 +3702,13 @@ const ::_pbi::TcParseTable<5, 33, 8, 0, 7> ConsensusConstants::_table_ = {
36, this->_internal_tail_epoch_length(), target);
}
// uint64 max_block_coinbase_count = 37;
if (this->_internal_max_block_coinbase_count() != 0) {
target = stream->EnsureSpace(target);
target = ::_pbi::WireFormatLite::WriteUInt64ToArray(
37, this->_internal_max_block_coinbase_count(), target);
}
if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) {
target =
::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray(
@ -3860,10 +3873,10 @@ const ::_pbi::TcParseTable<5, 33, 8, 0, 7> ConsensusConstants::_table_ = {
this->_internal_block_weight_kernels());
}
// uint64 faucet_value = 17;
if (this->_internal_faucet_value() != 0) {
// uint64 pre_mine_value = 17;
if (this->_internal_pre_mine_value() != 0) {
total_size += 2 + ::_pbi::WireFormatLite::UInt64Size(
this->_internal_faucet_value());
this->_internal_pre_mine_value());
}
// uint64 max_script_byte_size = 18;
@ -3926,6 +3939,12 @@ const ::_pbi::TcParseTable<5, 33, 8, 0, 7> ConsensusConstants::_table_ = {
this->_internal_tail_epoch_length());
}
// uint64 max_block_coinbase_count = 37;
if (this->_internal_max_block_coinbase_count() != 0) {
total_size += 2 + ::_pbi::WireFormatLite::UInt64Size(
this->_internal_max_block_coinbase_count());
}
// uint32 blockchain_version = 2;
if (this->_internal_blockchain_version() != 0) {
total_size += ::_pbi::WireFormatLite::UInt32SizePlusOne(
@ -4034,8 +4053,8 @@ void ConsensusConstants::MergeImpl(::google::protobuf::MessageLite& to_msg, cons
if (from._internal_block_weight_kernels() != 0) {
_this->_impl_.block_weight_kernels_ = from._impl_.block_weight_kernels_;
}
if (from._internal_faucet_value() != 0) {
_this->_impl_.faucet_value_ = from._impl_.faucet_value_;
if (from._internal_pre_mine_value() != 0) {
_this->_impl_.pre_mine_value_ = from._impl_.pre_mine_value_;
}
if (from._internal_max_script_byte_size() != 0) {
_this->_impl_.max_script_byte_size_ = from._impl_.max_script_byte_size_;
@ -4067,6 +4086,9 @@ void ConsensusConstants::MergeImpl(::google::protobuf::MessageLite& to_msg, cons
if (from._internal_tail_epoch_length() != 0) {
_this->_impl_.tail_epoch_length_ = from._impl_.tail_epoch_length_;
}
if (from._internal_max_block_coinbase_count() != 0) {
_this->_impl_.max_block_coinbase_count_ = from._impl_.max_block_coinbase_count_;
}
if (from._internal_blockchain_version() != 0) {
_this->_impl_.blockchain_version_ = from._impl_.blockchain_version_;
}

View file

@ -2416,7 +2416,7 @@ class ConsensusConstants final : public ::google::protobuf::Message
kBlockWeightInputsFieldNumber = 14,
kBlockWeightOutputsFieldNumber = 15,
kBlockWeightKernelsFieldNumber = 16,
kFaucetValueFieldNumber = 17,
kPreMineValueFieldNumber = 17,
kMaxScriptByteSizeFieldNumber = 18,
kValidatorNodeValidityPeriodFieldNumber = 19,
kEffectiveFromHeightFieldNumber = 20,
@ -2427,6 +2427,7 @@ class ConsensusConstants final : public ::google::protobuf::Message
kValidatorNodeRegistrationShuffleIntervalEpochFieldNumber = 33,
kInflationBipsFieldNumber = 35,
kTailEpochLengthFieldNumber = 36,
kMaxBlockCoinbaseCountFieldNumber = 37,
kBlockchainVersionFieldNumber = 2,
};
// repeated uint64 emission_decay = 11;
@ -2693,14 +2694,14 @@ class ConsensusConstants final : public ::google::protobuf::Message
void _internal_set_block_weight_kernels(::uint64_t value);
public:
// uint64 faucet_value = 17;
void clear_faucet_value() ;
::uint64_t faucet_value() const;
void set_faucet_value(::uint64_t value);
// uint64 pre_mine_value = 17;
void clear_pre_mine_value() ;
::uint64_t pre_mine_value() const;
void set_pre_mine_value(::uint64_t value);
private:
::uint64_t _internal_faucet_value() const;
void _internal_set_faucet_value(::uint64_t value);
::uint64_t _internal_pre_mine_value() const;
void _internal_set_pre_mine_value(::uint64_t value);
public:
// uint64 max_script_byte_size = 18;
@ -2802,6 +2803,16 @@ class ConsensusConstants final : public ::google::protobuf::Message
::uint64_t _internal_tail_epoch_length() const;
void _internal_set_tail_epoch_length(::uint64_t value);
public:
// uint64 max_block_coinbase_count = 37;
void clear_max_block_coinbase_count() ;
::uint64_t max_block_coinbase_count() const;
void set_max_block_coinbase_count(::uint64_t value);
private:
::uint64_t _internal_max_block_coinbase_count() const;
void _internal_set_max_block_coinbase_count(::uint64_t value);
public:
// uint32 blockchain_version = 2;
void clear_blockchain_version() ;
@ -2818,7 +2829,7 @@ class ConsensusConstants final : public ::google::protobuf::Message
class _Internal;
friend class ::google::protobuf::internal::TcParser;
static const ::google::protobuf::internal::TcParseTable<
5, 33, 8,
5, 34, 8,
0, 7>
_table_;
friend class ::google::protobuf::MessageLite;
@ -2862,7 +2873,7 @@ class ConsensusConstants final : public ::google::protobuf::Message
::uint64_t block_weight_inputs_;
::uint64_t block_weight_outputs_;
::uint64_t block_weight_kernels_;
::uint64_t faucet_value_;
::uint64_t pre_mine_value_;
::uint64_t max_script_byte_size_;
::uint64_t validator_node_validity_period_;
::uint64_t effective_from_height_;
@ -2873,6 +2884,7 @@ class ConsensusConstants final : public ::google::protobuf::Message
::uint64_t validator_node_registration_shuffle_interval_epoch_;
::uint64_t inflation_bips_;
::uint64_t tail_epoch_length_;
::uint64_t max_block_coinbase_count_;
::uint32_t blockchain_version_;
PROTOBUF_TSAN_DECLARE_MEMBER
};
@ -4302,26 +4314,26 @@ inline void ConsensusConstants::_internal_set_block_weight_kernels(::uint64_t va
_impl_.block_weight_kernels_ = value;
}
// uint64 faucet_value = 17;
inline void ConsensusConstants::clear_faucet_value() {
// uint64 pre_mine_value = 17;
inline void ConsensusConstants::clear_pre_mine_value() {
PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
_impl_.faucet_value_ = ::uint64_t{0u};
_impl_.pre_mine_value_ = ::uint64_t{0u};
}
inline ::uint64_t ConsensusConstants::faucet_value() const {
// @@protoc_insertion_point(field_get:tari.rpc.ConsensusConstants.faucet_value)
return _internal_faucet_value();
inline ::uint64_t ConsensusConstants::pre_mine_value() const {
// @@protoc_insertion_point(field_get:tari.rpc.ConsensusConstants.pre_mine_value)
return _internal_pre_mine_value();
}
inline void ConsensusConstants::set_faucet_value(::uint64_t value) {
_internal_set_faucet_value(value);
// @@protoc_insertion_point(field_set:tari.rpc.ConsensusConstants.faucet_value)
inline void ConsensusConstants::set_pre_mine_value(::uint64_t value) {
_internal_set_pre_mine_value(value);
// @@protoc_insertion_point(field_set:tari.rpc.ConsensusConstants.pre_mine_value)
}
inline ::uint64_t ConsensusConstants::_internal_faucet_value() const {
inline ::uint64_t ConsensusConstants::_internal_pre_mine_value() const {
PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
return _impl_.faucet_value_;
return _impl_.pre_mine_value_;
}
inline void ConsensusConstants::_internal_set_faucet_value(::uint64_t value) {
inline void ConsensusConstants::_internal_set_pre_mine_value(::uint64_t value) {
PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
_impl_.faucet_value_ = value;
_impl_.pre_mine_value_ = value;
}
// uint64 max_script_byte_size = 18;
@ -5146,6 +5158,28 @@ inline void ConsensusConstants::_internal_set_tail_epoch_length(::uint64_t value
_impl_.tail_epoch_length_ = value;
}
// uint64 max_block_coinbase_count = 37;
inline void ConsensusConstants::clear_max_block_coinbase_count() {
PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
_impl_.max_block_coinbase_count_ = ::uint64_t{0u};
}
inline ::uint64_t ConsensusConstants::max_block_coinbase_count() const {
// @@protoc_insertion_point(field_get:tari.rpc.ConsensusConstants.max_block_coinbase_count)
return _internal_max_block_coinbase_count();
}
inline void ConsensusConstants::set_max_block_coinbase_count(::uint64_t value) {
_internal_set_max_block_coinbase_count(value);
// @@protoc_insertion_point(field_set:tari.rpc.ConsensusConstants.max_block_coinbase_count)
}
inline ::uint64_t ConsensusConstants::_internal_max_block_coinbase_count() const {
PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
return _impl_.max_block_coinbase_count_;
}
inline void ConsensusConstants::_internal_set_max_block_coinbase_count(::uint64_t value) {
PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
_impl_.max_block_coinbase_count_ = value;
}
#ifdef __GNUC__
#pragma GCC diagnostic pop
#endif // __GNUC__

View file

@ -124,7 +124,7 @@ message ConsensusConstants {
uint64 block_weight_inputs = 14;
uint64 block_weight_outputs = 15;
uint64 block_weight_kernels = 16;
uint64 faucet_value = 17;
uint64 pre_mine_value = 17;
uint64 max_script_byte_size = 18;
uint64 validator_node_validity_period = 19;
uint64 effective_from_height = 20;
@ -143,4 +143,5 @@ message ConsensusConstants {
repeated PermittedRangeProofs permitted_range_proof_types = 34;
uint64 inflation_bips = 35;
uint64 tail_epoch_length = 36;
uint64 max_block_coinbase_count = 37;
}

View file

@ -20,6 +20,8 @@
#include "uv_util.h"
#include "wallet.h"
#include <map>
#if defined(_DEBUG) || defined(DEV_DEBUG)
#define POOL_BLOCK_DEBUG 1
#else
@ -143,7 +145,7 @@ struct PoolBlock
// Merge mining extra data
// Format: vector of (chain ID, chain data) pairs
// Chain data format is arbitrary and depends on the merge mined chain's requirements
std::vector<std::pair<hash, std::vector<uint8_t>>> m_mergeMiningExtra;
std::map<hash, std::vector<uint8_t>> m_mergeMiningExtra;
// Arbitrary extra data
uint32_t m_sidechainExtraBuf[4];

View file

@ -370,14 +370,15 @@ int PoolBlock::deserialize(const uint8_t* data, size_t size, const SideChain& si
if (mm_extra_data_count > MERGE_MINING_MAX_CHAINS) return __LINE__;
if (static_cast<uint64_t>(data_end - data) < mm_extra_data_count * (HASH_SIZE + 1)) return __LINE__;
m_mergeMiningExtra.reserve(mm_extra_data_count);
hash prev_chain_id;
for (uint64_t i = 0; i < mm_extra_data_count; ++i) {
hash chain_id;
READ_BUF(chain_id.h, HASH_SIZE);
// IDs must be ordered to avoid duplicates
if (i && !(m_mergeMiningExtra[i - 1].first < chain_id)) return __LINE__;
if (i && !(prev_chain_id < chain_id)) return __LINE__;
prev_chain_id = chain_id;
uint64_t n;
READ_VARINT(n);
@ -390,7 +391,7 @@ int PoolBlock::deserialize(const uint8_t* data, size_t size, const SideChain& si
READ_BUF(t.data(), n);
m_mergeMiningExtra.emplace_back(chain_id, std::move(t));
m_mergeMiningExtra.emplace(chain_id, std::move(t));
}
}