diff options
| author | Riccardo Spagni <ric@spagni.net> | 2019-04-11 13:00:55 +0200 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2019-04-11 13:00:55 +0200 |
| commit | 036daa3af9d7bfb288bb49196604cb532cc925df (patch) | |
| tree | 55632f5ed4b2e4793f3835a3a424f0ca07ee6db6 /src/cryptonote_core/blockchain.h | |
| parent | Merge pull request #5371 (diff) | |
| parent | blockchain: fix returned height in create_block_template (diff) | |
| download | monero-036daa3af9d7bfb288bb49196604cb532cc925df.tar.xz | |
Merge pull request #5373
aff80e70 blockchain: fix returned height in create_block_template (moneromooo-monero)
Diffstat (limited to 'src/cryptonote_core/blockchain.h')
| -rw-r--r-- | src/cryptonote_core/blockchain.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/cryptonote_core/blockchain.h b/src/cryptonote_core/blockchain.h index 2cd4dc31b..c1677ed37 100644 --- a/src/cryptonote_core/blockchain.h +++ b/src/cryptonote_core/blockchain.h @@ -1094,6 +1094,7 @@ namespace cryptonote account_public_address m_btc_address; blobdata m_btc_nonce; difficulty_type m_btc_difficulty; + uint64_t m_btc_height; uint64_t m_btc_pool_cookie; uint64_t m_btc_expected_reward; bool m_btc_valid; @@ -1464,6 +1465,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 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 pool_cookie); }; } // namespace cryptonote |