diff options
| author | Riccardo Spagni <ric@spagni.net> | 2016-04-02 12:05:07 +0900 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2016-04-02 12:05:07 +0900 |
| commit | ab43e803311c6f42b7ff50f7bfa02eb6bf4c42f9 (patch) | |
| tree | 5ea48b6060838a0b020c01d3f38bedf58dd83359 | |
| parent | Merge pull request #774 (diff) | |
| parent | add blockhashing blob to getblocktemplate (diff) | |
| download | monero-ab43e803311c6f42b7ff50f7bfa02eb6bf4c42f9.tar.xz | |
Merge pull request #777
8757e46 add blockhashing blob to getblocktemplate (Howard Chu)
| -rw-r--r-- | src/rpc/core_rpc_server.cpp | 2 | ||||
| -rw-r--r-- | src/rpc/core_rpc_server_commands_defs.h | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/src/rpc/core_rpc_server.cpp b/src/rpc/core_rpc_server.cpp index 2d2727a29..165a24c22 100644 --- a/src/rpc/core_rpc_server.cpp +++ b/src/rpc/core_rpc_server.cpp @@ -643,8 +643,10 @@ namespace cryptonote LOG_ERROR("Failed to calculate offset for "); return false; } + blobdata hashing_blob = get_block_hashing_blob(b); res.prev_hash = string_tools::pod_to_hex(b.prev_id); res.blocktemplate_blob = string_tools::buff_to_hex_nodelimer(block_blob); + res.blockhashing_blob = string_tools::buff_to_hex_nodelimer(hashing_blob); res.status = CORE_RPC_STATUS_OK; return true; } diff --git a/src/rpc/core_rpc_server_commands_defs.h b/src/rpc/core_rpc_server_commands_defs.h index 52885dd34..91f5e2c90 100644 --- a/src/rpc/core_rpc_server_commands_defs.h +++ b/src/rpc/core_rpc_server_commands_defs.h @@ -445,6 +445,7 @@ namespace cryptonote uint64_t reserved_offset; std::string prev_hash; blobdata blocktemplate_blob; + blobdata blockhashing_blob; std::string status; BEGIN_KV_SERIALIZE_MAP() @@ -453,6 +454,7 @@ namespace cryptonote KV_SERIALIZE(reserved_offset) KV_SERIALIZE(prev_hash) KV_SERIALIZE(blocktemplate_blob) + KV_SERIALIZE(blockhashing_blob) KV_SERIALIZE(status) END_KV_SERIALIZE_MAP() }; |