diff options
| author | moneromooo-monero <moneromooo-monero@users.noreply.github.com> | 2019-11-08 17:30:18 +0000 |
|---|---|---|
| committer | moneromooo-monero <moneromooo-monero@users.noreply.github.com> | 2020-08-27 15:13:00 +0000 |
| commit | 9d42649d58a1a898b8fd1be17f42fb6b7ad1f6ee (patch) | |
| tree | d3e5a6a12cbd0bd4d3906afd4d9b350667aceda3 /src/cryptonote_core/blockchain.h | |
| parent | Merge pull request #6771 (diff) | |
| download | monero-9d42649d58a1a898b8fd1be17f42fb6b7ad1f6ee.tar.xz | |
core: fix mining from a block that's not the current top
Diffstat (limited to 'src/cryptonote_core/blockchain.h')
| -rw-r--r-- | src/cryptonote_core/blockchain.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/cryptonote_core/blockchain.h b/src/cryptonote_core/blockchain.h index 85aa5d4e2..20bd3e5d3 100644 --- a/src/cryptonote_core/blockchain.h +++ b/src/cryptonote_core/blockchain.h @@ -366,8 +366,8 @@ namespace cryptonote * * @return true if block template filled in successfully, else false */ - bool create_block_template(block& b, const account_public_address& miner_address, difficulty_type& di, uint64_t& height, uint64_t& expected_reward, const blobdata& ex_nonce); - bool create_block_template(block& b, const crypto::hash *from_block, const account_public_address& miner_address, difficulty_type& di, uint64_t& height, uint64_t& expected_reward, const blobdata& ex_nonce); + bool create_block_template(block& b, const account_public_address& miner_address, difficulty_type& di, uint64_t& height, uint64_t& expected_reward, const blobdata& ex_nonce, uint64_t &seed_height, crypto::hash &seed_hash); + bool create_block_template(block& b, const crypto::hash *from_block, const account_public_address& miner_address, difficulty_type& di, uint64_t& height, uint64_t& expected_reward, const blobdata& ex_nonce, uint64_t &seed_height, crypto::hash &seed_hash); /** * @brief checks if a block is known about with a given hash @@ -1124,6 +1124,8 @@ namespace cryptonote uint64_t m_btc_height; uint64_t m_btc_pool_cookie; uint64_t m_btc_expected_reward; + crypto::hash m_btc_seed_hash; + uint64_t m_btc_seed_height; bool m_btc_valid; @@ -1520,6 +1522,6 @@ namespace cryptonote * * At some point, may be used to push an update to miners */ - void cache_block_template(const block &b, const cryptonote::account_public_address &address, const blobdata &nonce, const difficulty_type &diff, uint64_t height, uint64_t expected_reward, uint64_t pool_cookie); + void cache_block_template(const block &b, const cryptonote::account_public_address &address, const blobdata &nonce, const difficulty_type &diff, uint64_t height, uint64_t expected_reward, uint64_t seed_height, const crypto::hash &seed_hash, uint64_t pool_cookie); }; } // namespace cryptonote |