aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorluigi1111 <luigi1111w@gmail.com>2020-11-29 00:41:42 -0600
committerluigi1111 <luigi1111w@gmail.com>2020-11-29 00:41:42 -0600
commit7539d4ac74e22216d45d05ecbd2647fb9a528bd3 (patch)
treefc7af610dabf7f8ca5f7a6de204d0e989a07e2f6
parentMerge pull request #6892 (diff)
parentfix next_seed_height regression in getblocktemplate rpc (diff)
downloadmonero-7539d4ac74e22216d45d05ecbd2647fb9a528bd3.tar.xz
Merge pull request #6895
b49f489 fix next_seed_height regression in getblocktemplate rpc (xnbya)
-rw-r--r--src/rpc/core_rpc_server.cpp7
1 files changed, 7 insertions, 0 deletions
diff --git a/src/rpc/core_rpc_server.cpp b/src/rpc/core_rpc_server.cpp
index f84da9d55..e72f60d05 100644
--- a/src/rpc/core_rpc_server.cpp
+++ b/src/rpc/core_rpc_server.cpp
@@ -1669,6 +1669,13 @@ namespace cryptonote
return false;
}
+ uint64_t next_height;
+ crypto::rx_seedheights(height, &seed_height, &next_height);
+ if (next_height != seed_height)
+ next_seed_hash = m_core.get_block_id_by_height(next_height);
+ else
+ next_seed_hash = seed_hash;
+
if (extra_nonce.empty())
{
reserved_offset = 0;