diff options
author | luigi1111 <luigi1111w@gmail.com> | 2019-09-14 13:04:41 -0500 |
---|---|---|
committer | luigi1111 <luigi1111w@gmail.com> | 2019-09-14 13:04:41 -0500 |
commit | 29e0f1130589e03b2dbc941c4333267798571804 (patch) | |
tree | 5d2196bc67031f04b9be43a04b3d0f203e861eb9 /src/cryptonote_core/blockchain.h | |
parent | Merge pull request #5876 (diff) | |
parent | blockchain: reject rct signatures in coinbase txes from v12 (diff) | |
download | monero-29e0f1130589e03b2dbc941c4333267798571804.tar.xz |
Merge pull request #5823
26072f1 blockchain: forbid v1 coinbase from v12 (moneromooo-monero)
555dc7c core: from v12, require consistent ring size for mixable txes (moneromooo-monero)
d22dfb7 blockchain: reject rct signatures in coinbase txes from v12 (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 f58059a6d..f32645949 100644 --- a/src/cryptonote_core/blockchain.h +++ b/src/cryptonote_core/blockchain.h @@ -1245,10 +1245,11 @@ namespace cryptonote * * @param b the block containing the miner transaction * @param height the height at which the block will be added + * @param hf_version the consensus rules to apply * * @return false if anything is found wrong with the miner transaction, otherwise true */ - bool prevalidate_miner_transaction(const block& b, uint64_t height); + bool prevalidate_miner_transaction(const block& b, uint64_t height, uint8_t hf_version); /** * @brief validates a miner (coinbase) transaction |