diff options
| author | MarcoFalke <[email protected]> | 2019-02-11 11:59:34 -0500 |
|---|---|---|
| committer | MarcoFalke <[email protected]> | 2019-02-12 11:34:57 -0500 |
| commit | fa178a6385bf300499fb18940051fc4142fb5b6b (patch) | |
| tree | 65c7d92724a4d7b91c06c4a6b9d0eaf3e37189ad /src/miner.h | |
| parent | Merge #15373: Move ParseConfirmTarget from rpc/mining to rpc/util (diff) | |
| download | discoin-fa178a6385bf300499fb18940051fc4142fb5b6b.tar.xz discoin-fa178a6385bf300499fb18940051fc4142fb5b6b.zip | |
[rpc] mining: Omit uninitialized currentblockweight, currentblocktx
Diffstat (limited to 'src/miner.h')
| -rw-r--r-- | src/miner.h | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/miner.h b/src/miner.h index 44c50b01a..7c4c45507 100644 --- a/src/miner.h +++ b/src/miner.h @@ -1,17 +1,19 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto -// Copyright (c) 2009-2018 The Bitcoin Core developers +// Copyright (c) 2009-2019 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. #ifndef BITCOIN_MINER_H #define BITCOIN_MINER_H +#include <optional.h> #include <primitives/block.h> #include <txmempool.h> #include <validation.h> -#include <stdint.h> #include <memory> +#include <stdint.h> + #include <boost/multi_index_container.hpp> #include <boost/multi_index/ordered_index.hpp> @@ -159,6 +161,9 @@ public: /** Construct a new block template with coinbase to scriptPubKeyIn */ std::unique_ptr<CBlockTemplate> CreateNewBlock(const CScript& scriptPubKeyIn); + static Optional<int64_t> m_last_block_num_txs; + static Optional<int64_t> m_last_block_weight; + private: // utility functions /** Clear the block's state and prepare for assembling a new block */ |