Mirrors
/
wownero
mirror of https://git.wownero.com/wownero/wownero.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request 'rpc: Add unlock height to getblocktemplate' (#328) from asymptotically/wownero:getblocktemplate-height into master 

Reviewed-on: https://git.wownero.com/wownero/wownero/pulls/328
This commit is contained in:
jwinterm 2020-09-22 18:15:50 +00:00
parent e09d17ba1f 9364b49ecb
commit c336e15f0c
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

@ -1773,6 +1773,7 @@ namespace cryptonote
}
res.reserved_offset = reserved_offset;
res.unlock_height = b.miner_tx.unlock_time;
store_difficulty(wdiff, res.difficulty, res.wide_difficulty, res.difficulty_top64);
blobdata block_blob = t_serializable_object_to_blob(b);
blobdata hashing_blob = get_block_hashing_blob(b);

2
src/rpc/core_rpc_server_commands_defs.h
View File

@ -914,6 +914,7 @@ namespace cryptonote
std::string next_seed_hash;
blobdata blocktemplate_blob;
blobdata blockhashing_blob;
uint64_t unlock_height;
BEGIN_KV_SERIALIZE_MAP()
KV_SERIALIZE_PARENT(rpc_response_base)
@ -929,6 +930,7 @@ namespace cryptonote
KV_SERIALIZE(blockhashing_blob)
KV_SERIALIZE(seed_hash)
KV_SERIALIZE(next_seed_hash)
KV_SERIALIZE(unlock_height)
END_KV_SERIALIZE_MAP()
};
typedef epee::misc_utils::struct_init<response_t> response;