aboutsummaryrefslogtreecommitdiff
path: root/src/rpc
diff options
context:
space:
mode:
authorThomas Winget <tewinget@gmail.com>2015-01-21 11:25:48 -0500
committerThomas Winget <tewinget@gmail.com>2015-01-21 11:26:53 -0500
commit9d523780292b1bbf7208425a716e227730a9ba27 (patch)
tree71216dcc7eb0945b4794b11c46d902d42a8e3d96 /src/rpc
parentShould fix std::min issues related to size_t (diff)
parentMerge pull request #215 (diff)
downloadmonero-9d523780292b1bbf7208425a716e227730a9ba27.tar.xz
Merge to keep up with upstream
Merge 'monero-project/master' with blockchain
Diffstat (limited to '')
-rw-r--r--src/rpc/core_rpc_server.cpp1
-rw-r--r--src/rpc/core_rpc_server_commands_defs.h2
2 files changed, 3 insertions, 0 deletions
diff --git a/src/rpc/core_rpc_server.cpp b/src/rpc/core_rpc_server.cpp
index be45a5145..7a41e9b9f 100644
--- a/src/rpc/core_rpc_server.cpp
+++ b/src/rpc/core_rpc_server.cpp
@@ -475,6 +475,7 @@ namespace cryptonote
LOG_ERROR("Failed to calculate offset for ");
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.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 21dbb9f73..9fea933cb 100644
--- a/src/rpc/core_rpc_server_commands_defs.h
+++ b/src/rpc/core_rpc_server_commands_defs.h
@@ -383,6 +383,7 @@ namespace cryptonote
uint64_t difficulty;
uint64_t height;
uint64_t reserved_offset;
+ std::string prev_hash;
blobdata blocktemplate_blob;
std::string status;
@@ -390,6 +391,7 @@ namespace cryptonote
KV_SERIALIZE(difficulty)
KV_SERIALIZE(height)
KV_SERIALIZE(reserved_offset)
+ KV_SERIALIZE(prev_hash)
KV_SERIALIZE(blocktemplate_blob)
KV_SERIALIZE(status)
END_KV_SERIALIZE_MAP()