Git-Mirrors/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2024-10-01 11:49:47 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #211

Browse Source 
7de1a2d previous hash added to GBT (Riccardo Spagni)
This commit is contained in:
Riccardo Spagni 2015-01-06 18:39:16 +02:00
commit 6600966e30
No known key found for this signature in database
GPG Key ID: 55432DF31CCD4FCD
2 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/rpc/core_rpc_server.cpp
View File

@ -475,6 +475,7 @@ namespace cryptonote
LOG_ERROR("Failed to calculate offset for "); LOG_ERROR("Failed to calculate offset for ");
return false; return false;
} }
res.prev_hash = string_tools::pod_to_hex(b.prev_id);
res.blocktemplate_blob = string_tools::buff_to_hex_nodelimer(block_blob); res.blocktemplate_blob = string_tools::buff_to_hex_nodelimer(block_blob);
res.status = CORE_RPC_STATUS_OK; res.status = CORE_RPC_STATUS_OK;
return true; return true;

2
src/rpc/core_rpc_server_commands_defs.h
View File

@ -383,6 +383,7 @@ namespace cryptonote
uint64_t difficulty; uint64_t difficulty;
uint64_t height; uint64_t height;
uint64_t reserved_offset; uint64_t reserved_offset;
std::string prev_hash;
blobdata blocktemplate_blob; blobdata blocktemplate_blob;
std::string status; std::string status;
@ -390,6 +391,7 @@ namespace cryptonote
KV_SERIALIZE(difficulty) KV_SERIALIZE(difficulty)
KV_SERIALIZE(height) KV_SERIALIZE(height)
KV_SERIALIZE(reserved_offset) KV_SERIALIZE(reserved_offset)
KV_SERIALIZE(prev_hash)
KV_SERIALIZE(blocktemplate_blob) KV_SERIALIZE(blocktemplate_blob)
KV_SERIALIZE(status) KV_SERIALIZE(status)
END_KV_SERIALIZE_MAP() END_KV_SERIALIZE_MAP()