diff options
| author | luigi1111 <luigi1111w@gmail.com> | 2019-10-22 10:07:17 -0500 |
|---|---|---|
| committer | luigi1111 <luigi1111w@gmail.com> | 2019-10-22 10:07:17 -0500 |
| commit | c81884f0885904dfdc22c758e0abc12cc3f3bdcc (patch) | |
| tree | d613a2d64e5fbb613b4d8b7c81760ed68291b8b5 | |
| parent | Merge pull request #5919 (diff) | |
| parent | Print cdifficulty and don't serialize miner tx hash twice (diff) | |
| download | monero-c81884f0885904dfdc22c758e0abc12cc3f3bdcc.tar.xz | |
Merge pull request #5964
fd48461 Print cdifficulty and don't serialize miner tx hash twice (Doy-lee)
| -rw-r--r-- | src/daemon/rpc_command_executor.cpp | 1 | ||||
| -rw-r--r-- | src/rpc/core_rpc_server.cpp | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/src/daemon/rpc_command_executor.cpp b/src/daemon/rpc_command_executor.cpp index 014865730..75c54d048 100644 --- a/src/daemon/rpc_command_executor.cpp +++ b/src/daemon/rpc_command_executor.cpp @@ -92,6 +92,7 @@ namespace { << "depth: " << boost::lexical_cast<std::string>(header.depth) << std::endl << "hash: " << header.hash << std::endl << "difficulty: " << header.wide_difficulty << std::endl + << "cumulative difficulty: " << header.wide_cumulative_difficulty << std::endl << "POW hash: " << header.pow_hash << std::endl << "block size: " << header.block_size << std::endl << "block weight: " << header.block_weight << std::endl diff --git a/src/rpc/core_rpc_server.cpp b/src/rpc/core_rpc_server.cpp index 6f5f912cd..dfc4d4cf3 100644 --- a/src/rpc/core_rpc_server.cpp +++ b/src/rpc/core_rpc_server.cpp @@ -1951,7 +1951,6 @@ namespace cryptonote error_resp.message = "Internal error: can't produce valid response."; 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) { res.tx_hashes.push_back(epee::string_tools::pod_to_hex(blk.tx_hashes[n])); |