diff options
| author | Riccardo Spagni <ric@spagni.net> | 2019-04-01 17:31:36 +0200 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2019-04-01 17:31:36 +0200 |
| commit | a69b71dc417a0c6acb4eab6126e2e1d4ea4c4d7f (patch) | |
| tree | d94fa8be1ec9b8c4d2783e5043160bd577365ea6 /src | |
| parent | Merge pull request #5325 (diff) | |
| parent | rpc: add miner tx hash to block header response (diff) | |
| download | monero-a69b71dc417a0c6acb4eab6126e2e1d4ea4c4d7f.tar.xz | |
Merge pull request #5326
dc20d774 rpc: add miner tx hash to block header response (moneromooo-monero)
Diffstat (limited to 'src')
| -rw-r--r-- | src/rpc/core_rpc_server.cpp | 1 | ||||
| -rw-r--r-- | src/rpc/core_rpc_server_commands_defs.h | 4 |
2 files changed, 4 insertions, 1 deletions
diff --git a/src/rpc/core_rpc_server.cpp b/src/rpc/core_rpc_server.cpp index e6a09606b..7af62bfe0 100644 --- a/src/rpc/core_rpc_server.cpp +++ b/src/rpc/core_rpc_server.cpp @@ -1394,6 +1394,7 @@ namespace cryptonote response.num_txes = blk.tx_hashes.size(); response.pow_hash = fill_pow_hash ? string_tools::pod_to_hex(get_block_longhash(blk, height)) : ""; response.long_term_weight = m_core.get_blockchain_storage().get_db().get_block_long_term_weight(height); + response.miner_tx_hash = string_tools::pod_to_hex(cryptonote::get_transaction_hash(blk.miner_tx)); return true; } //------------------------------------------------------------------------------------------------------------------------------ diff --git a/src/rpc/core_rpc_server_commands_defs.h b/src/rpc/core_rpc_server_commands_defs.h index 4786f7a9b..e65790cae 100644 --- a/src/rpc/core_rpc_server_commands_defs.h +++ b/src/rpc/core_rpc_server_commands_defs.h @@ -84,7 +84,7 @@ namespace cryptonote // advance which version they will stop working with // Don't go over 32767 for any of these #define CORE_RPC_VERSION_MAJOR 2 -#define CORE_RPC_VERSION_MINOR 4 +#define CORE_RPC_VERSION_MINOR 5 #define MAKE_CORE_RPC_VERSION(major,minor) (((major)<<16)|(minor)) #define CORE_RPC_VERSION MAKE_CORE_RPC_VERSION(CORE_RPC_VERSION_MAJOR, CORE_RPC_VERSION_MINOR) @@ -967,6 +967,7 @@ namespace cryptonote uint64_t num_txes; std::string pow_hash; uint64_t long_term_weight; + std::string miner_tx_hash; BEGIN_KV_SERIALIZE_MAP() KV_SERIALIZE(major_version) @@ -990,6 +991,7 @@ namespace cryptonote KV_SERIALIZE(num_txes) KV_SERIALIZE(pow_hash) KV_SERIALIZE_OPT(long_term_weight, (uint64_t)0) + KV_SERIALIZE(miner_tx_hash) END_KV_SERIALIZE_MAP() }; |