Merge pull request #6894v0.17.1.0v0.17.1.0

e49ad98 fix next_seed_height regression in getblocktemplate rpc (xnbya)

1 files changed, 7 insertions, 0 deletions

diff --git a/src/rpc/core_rpc_server.cpp b/src/rpc/core_rpc_server.cpp
index 382b5815f..ca904ae84 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;