Skip to content

Commit

Permalink
Add POW hash to block_header_response in core RPC
Browse files Browse the repository at this point in the history
  • Loading branch information
@miltonf
miltonf committed Jan 14, 2019
1 parent f4122b0 commit b6fcc56
Show file tree
Hide file tree
Showing 4 changed files with 25 additions and 8 deletions.
3 changes: 3 additions & 0 deletions src/daemon/rpc_command_executor.cpp
View file
Expand Up @@ -74,6 +74,7 @@ namespace {
<< "depth: " << boost::lexical_cast<std::string>(header.depth) << std::endl
<< "hash: " << header.hash << std::endl
<< "difficulty: " << boost::lexical_cast<std::string>(header.difficulty) << std::endl
<< "POW hash: " << header.pow_hash << std::endl
<< "reward: " << boost::lexical_cast<std::string>(header.reward);
<< "block size: " << header.block_size << std::endl
<< "num txes: " << header.num_txes << std::endl
Expand Down Expand Up @@ -656,6 +657,7 @@ bool t_rpc_command_executor::print_block_by_hash(crypto::hash block_hash) {
epee::json_rpc::error error_resp;

req.hash = epee::string_tools::pod_to_hex(block_hash);
req.fill_pow_hash = true;

std::string fail_message = "Unsuccessful";

Expand Down Expand Up @@ -687,6 +689,7 @@ bool t_rpc_command_executor::print_block_by_height(uint64_t height) {
epee::json_rpc::error error_resp;

req.height = height;
req.fill_pow_hash = true;

std::string fail_message = "Unsuccessful";

Expand Down
13 changes: 7 additions & 6 deletions src/rpc/core_rpc_server.cpp
View file
Expand Up @@ -1234,7 +1234,7 @@ namespace cryptonote
return reward;
}
//------------------------------------------------------------------------------------------------------------------------------
bool core_rpc_server::fill_block_header_response(const block& blk, bool orphan_status, uint64_t height, const crypto::hash& hash, block_header_response& response)
bool core_rpc_server::fill_block_header_response(const block& blk, bool orphan_status, uint64_t height, const crypto::hash& hash, block_header_response& response, bool fill_pow_hash)
{
PERF_TIMER(fill_block_header_response);
response.major_version = blk.major_version;
Expand All @@ -1250,6 +1250,7 @@ namespace cryptonote
response.reward = get_block_reward(blk);
response.block_size = m_core.get_blockchain_storage().get_db().get_block_size(height);
response.num_txes = blk.tx_hashes.size();
response.pow_hash = fill_pow_hash ? string_tools::pod_to_hex(get_block_longhash(blk, height)) : "";
return true;
}
//------------------------------------------------------------------------------------------------------------------------------
Expand Down Expand Up @@ -1339,7 +1340,7 @@ namespace cryptonote
error_resp.message = "Internal error: can't get last block.";
return false;
}
bool response_filled = fill_block_header_response(last_block, false, last_block_height, last_block_hash, res.block_header);
bool response_filled = fill_block_header_response(last_block, false, last_block_height, last_block_hash, res.block_header, req.fill_pow_hash);
if (!response_filled)
{
error_resp.code = CORE_RPC_ERROR_CODE_INTERNAL_ERROR;
Expand Down Expand Up @@ -1380,7 +1381,7 @@ namespace cryptonote
return false;
}
uint64_t block_height = boost::get<txin_gen>(blk.miner_tx.vin.front()).height;
bool response_filled = fill_block_header_response(blk, orphan, block_height, block_hash, res.block_header);
bool response_filled = fill_block_header_response(blk, orphan, block_height, block_hash, res.block_header, req.fill_pow_hash);
if (!response_filled)
{
error_resp.code = CORE_RPC_ERROR_CODE_INTERNAL_ERROR;
Expand Down Expand Up @@ -1429,7 +1430,7 @@ namespace cryptonote
return false;
}
res.headers.push_back(block_header_response());
bool response_filled = fill_block_header_response(blk, false, block_height, block_hash, res.headers.back());
bool response_filled = fill_block_header_response(blk, false, block_height, block_hash, res.headers.back(), req.fill_pow_hash);
if (!response_filled)
{
error_resp.code = CORE_RPC_ERROR_CODE_INTERNAL_ERROR;
Expand Down Expand Up @@ -1462,7 +1463,7 @@ namespace cryptonote
error_resp.message = "Internal error: can't get block by height. Height = " + std::to_string(req.height) + '.';
return false;
}
bool response_filled = fill_block_header_response(blk, false, req.height, block_hash, res.block_header);
bool response_filled = fill_block_header_response(blk, false, req.height, block_hash, res.block_header, req.fill_pow_hash);
if (!response_filled)
{
error_resp.code = CORE_RPC_ERROR_CODE_INTERNAL_ERROR;
Expand Down Expand Up @@ -1516,7 +1517,7 @@ namespace cryptonote
return false;
}
uint64_t block_height = boost::get<txin_gen>(blk.miner_tx.vin.front()).height;
bool response_filled = fill_block_header_response(blk, orphan, block_height, block_hash, res.block_header);
bool response_filled = fill_block_header_response(blk, orphan, block_height, block_hash, res.block_header, req.fill_pow_hash);
if (!response_filled)
{
error_resp.code = CORE_RPC_ERROR_CODE_INTERNAL_ERROR;
Expand Down
2 changes: 1 addition & 1 deletion src/rpc/core_rpc_server.h
View file
Expand Up @@ -224,7 +224,7 @@ namespace cryptonote

//utils
uint64_t get_block_reward(const block& blk);
bool fill_block_header_response(const block& blk, bool orphan_status, uint64_t height, const crypto::hash& hash, block_header_response& response);
bool fill_block_header_response(const block& blk, bool orphan_status, uint64_t height, const crypto::hash& hash, block_header_response& response, bool fill_pow_hash);
enum invoke_http_mode { JON, BIN, JON_RPC };
template <typename COMMAND_TYPE>
bool use_bootstrap_daemon_if_necessary(const invoke_http_mode &mode, const std::string &command_name, const typename COMMAND_TYPE::request& req, typename COMMAND_TYPE::response& res, bool &r);
Expand Down
15 changes: 14 additions & 1 deletion src/rpc/core_rpc_server_commands_defs.h
View file
Expand Up @@ -49,7 +49,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 1
#define CORE_RPC_VERSION_MINOR 19
#define CORE_RPC_VERSION_MINOR 20
#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)

Expand Down Expand Up @@ -1167,6 +1167,7 @@ namespace cryptonote
uint64_t reward;
uint64_t block_size;
uint64_t num_txes;
std::string pow_hash;

BEGIN_KV_SERIALIZE_MAP()
KV_SERIALIZE(major_version)
Expand All @@ -1182,14 +1183,18 @@ namespace cryptonote
KV_SERIALIZE(reward)
KV_SERIALIZE(block_size)
KV_SERIALIZE(num_txes)
KV_SERIALIZE(pow_hash)
END_KV_SERIALIZE_MAP()
};

struct COMMAND_RPC_GET_LAST_BLOCK_HEADER
{
struct request
{
bool fill_pow_hash;

BEGIN_KV_SERIALIZE_MAP()
KV_SERIALIZE_OPT(fill_pow_hash, false);
END_KV_SERIALIZE_MAP()
};

Expand All @@ -1213,9 +1218,11 @@ namespace cryptonote
struct request
{
std::string hash;
bool fill_pow_hash;

BEGIN_KV_SERIALIZE_MAP()
KV_SERIALIZE(hash)
KV_SERIALIZE_OPT(fill_pow_hash, false);
END_KV_SERIALIZE_MAP()
};

Expand All @@ -1239,9 +1246,11 @@ namespace cryptonote
struct request
{
uint64_t height;
bool fill_pow_hash;

BEGIN_KV_SERIALIZE_MAP()
KV_SERIALIZE(height)
KV_SERIALIZE_OPT(fill_pow_hash, false);
END_KV_SERIALIZE_MAP()
};

Expand All @@ -1266,10 +1275,12 @@ namespace cryptonote
{
std::string hash;
uint64_t height;
bool fill_pow_hash;

BEGIN_KV_SERIALIZE_MAP()
KV_SERIALIZE(hash)
KV_SERIALIZE(height)
KV_SERIALIZE_OPT(fill_pow_hash, false);
END_KV_SERIALIZE_MAP()
};

Expand Down Expand Up @@ -1622,10 +1633,12 @@ namespace cryptonote
{
uint64_t start_height;
uint64_t end_height;
bool fill_pow_hash;

BEGIN_KV_SERIALIZE_MAP()
KV_SERIALIZE(start_height)
KV_SERIALIZE(end_height)
KV_SERIALIZE_OPT(fill_pow_hash, false);
END_KV_SERIALIZE_MAP()
};

Expand Down

0 comments on commit b6fcc56

Please sign in to comment.