aboutsummaryrefslogtreecommitdiff
path: root/src/cryptonote_core/blockchain.h
diff options
context:
space:
mode:
authormoneromooo-monero <moneromooo-monero@users.noreply.github.com>2019-03-30 20:25:40 +0000
committermoneromooo-monero <moneromooo-monero@users.noreply.github.com>2019-03-30 20:27:25 +0000
commitaff80e70433465a05f066e9da0e82c064f3680bb (patch)
treebe207c43aa6bcc846b38e598760518e30828301d /src/cryptonote_core/blockchain.h
parentMerge pull request #5359 (diff)
downloadmonero-aff80e70433465a05f066e9da0e82c064f3680bb.tar.xz
blockchain: fix returned height in create_block_template
It's now needed for CNv4, and was not retained when cached
Diffstat (limited to 'src/cryptonote_core/blockchain.h')
-rw-r--r--src/cryptonote_core/blockchain.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/cryptonote_core/blockchain.h b/src/cryptonote_core/blockchain.h
index 3b8169764..8aa4cb5b7 100644
--- a/src/cryptonote_core/blockchain.h
+++ b/src/cryptonote_core/blockchain.h
@@ -1092,6 +1092,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;
@@ -1462,6 +1463,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