Ecosystem/p2pool
1
0
Fork 0
mirror of https://github.com/SChernykh/p2pool.git synced 2024-12-22 11:29:23 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Tari: use GetNewBlockTemplateWithCoinbases API

Browse source
This commit is contained in:
SChernykh 2024-04-23 21:31:40 +02:00
parent 313a099a4b
commit 2085bb454b
2 changed files with 43 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
external/src/Tari/proto.h vendored
View file

@ -2,6 +2,7 @@
#ifdef _MSC_VER
#pragma warning(push, 0)
#pragma warning(disable : 4866)
#endif
#include "proto/gRPC/base_node.pb.h"

33
src/merge_mining_client_tari.cpp
View file

@ -149,23 +149,35 @@ void MergeMiningClientTari::run()
LOGINFO(6, "Getting new block template from Tari node");
grpc::Status status;
NewBlockTemplateRequest request;
GetNewBlockTemplateWithCoinbasesRequest request;
PowAlgo* algo = new PowAlgo();
algo->set_pow_algo(PowAlgo_PowAlgos_POW_ALGOS_RANDOMX);
request.clear_algo();
request.set_allocated_algo(algo);
request.set_max_weight(1);
NewBlockCoinbase* coinbase = request.add_coinbases();
coinbase->set_address(m_auxWallet);
// TODO this should be equal to the total weight of shares in the PPLNS window for each wallet
coinbase->set_value(1);
coinbase->set_stealth_payment(false);
coinbase->set_revealed_value_proof(true);
coinbase->clear_coinbase_extra();
grpc::ClientContext ctx;
NewBlockTemplateResponse response;
status = m_TariNode->GetNewBlockTemplate(&ctx, request, &response);
GetNewBlockResult response;
grpc::ClientContext ctx2;
GetNewBlockResult response2;
status = m_TariNode->GetNewBlock(&ctx2, response.new_block_template(), &response2);
const grpc::Status status = m_TariNode->GetNewBlockTemplateWithCoinbases(&ctx, request, &response);
if (!status.ok()) {
LOGWARN(5, "GetNewBlockTemplateWithCoinbases failed: " << status.error_message());
if (!status.error_details().empty()) {
LOGWARN(5, "GetNewBlockTemplateWithCoinbases failed: " << status.error_details());
}
}
else {
bool aux_id_empty;
{
ReadLock lock2(m_chainParamsLock);
@ -173,7 +185,7 @@ void MergeMiningClientTari::run()
}
if (aux_id_empty) {
const std::string& id = response2.tari_unique_id();
const std::string& id = response.tari_unique_id();
LOGINFO(1, m_hostStr << " uses chain_id " << log::LightCyan() << log::hex_buf(id.data(), id.size()));
if (id.size() == HASH_SIZE) {
@ -185,11 +197,12 @@ void MergeMiningClientTari::run()
}
}
LOGINFO(6, "Tari block template: height = " << response.new_block_template().header().height()
LOGINFO(6, "Tari block template: height = " << response.block().header().height()
<< ", diff = " << response.miner_data().target_difficulty()
<< ", reward = " << response.miner_data().reward()
<< ", fees = " << response.miner_data().total_fees()
);
}
const int64_t timeout = std::max<int64_t>(500'000'000 - duration_cast<nanoseconds>(high_resolution_clock::now() - t1).count(), 1'000'000);