monero-project/monero
monero-project/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2024-12-23 12:09:54 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #5964

Browse source 
fd48461 Print cdifficulty and don't serialize miner tx hash twice (Doy-lee)
This commit is contained in:
luigi1111 2019-10-22 10:07:17 -05:00
commit c81884f088
No known key found for this signature in database
GPG key ID: F4ACA0183641E010
2 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/daemon/rpc_command_executor.cpp
View file

@ -92,6 +92,7 @@ namespace {
<< "depth: " << boost::lexical_cast<std::string>(header.depth) << std::endl << "depth: " << boost::lexical_cast<std::string>(header.depth) << std::endl
<< "hash: " << header.hash << std::endl << "hash: " << header.hash << std::endl
<< "difficulty: " << header.wide_difficulty << std::endl << "difficulty: " << header.wide_difficulty << std::endl
<< "cumulative difficulty: " << header.wide_cumulative_difficulty << std::endl
<< "POW hash: " << header.pow_hash << std::endl << "POW hash: " << header.pow_hash << std::endl
<< "block size: " << header.block_size << std::endl << "block size: " << header.block_size << std::endl
<< "block weight: " << header.block_weight << std::endl << "block weight: " << header.block_weight << std::endl

1
src/rpc/core_rpc_server.cpp
View file

@ -1951,7 +1951,6 @@ namespace cryptonote
error_resp.message = "Internal error: can't produce valid response."; error_resp.message = "Internal error: can't produce valid response.";
return false; return false;
} }
res.miner_tx_hash = epee::string_tools::pod_to_hex(cryptonote::get_transaction_hash(blk.miner_tx));
for (size_t n = 0; n < blk.tx_hashes.size(); ++n) for (size_t n = 0; n < blk.tx_hashes.size(); ++n)
{ {
res.tx_hashes.push_back(epee::string_tools::pod_to_hex(blk.tx_hashes[n])); res.tx_hashes.push_back(epee::string_tools::pod_to_hex(blk.tx_hashes[n]));