aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarl Dong <contact@carldong.me>2021-03-16 19:31:17 -0400
committerCarl Dong <contact@carldong.me>2021-03-24 15:40:56 -0400
commit0c1b2bc549aec77b247f0103652d883227841ac5 (patch)
tree35922a16b08c6482dd13b7c10842c1a011ac63eb
parented49203daabb6550d44518792c30faad64bf9a9f (diff)
Revert "miner: Remove old CreateNewBlock w/o chainstate param"
This reverts commit 2afcf24408b4453e4418ebfb326b141f6ea8647c.
-rw-r--r--src/miner.cpp5
-rw-r--r--src/miner.h1
2 files changed, 6 insertions, 0 deletions
diff --git a/src/miner.cpp b/src/miner.cpp
index fe7a54c052..14443c432d 100644
--- a/src/miner.cpp
+++ b/src/miner.cpp
@@ -96,6 +96,11 @@ void BlockAssembler::resetBlock()
nFees = 0;
}
+std::unique_ptr<CBlockTemplate> BlockAssembler::CreateNewBlock(const CScript& scriptPubKeyIn)
+{
+ return CreateNewBlock(::ChainstateActive(), scriptPubKeyIn);
+}
+
std::unique_ptr<CBlockTemplate> BlockAssembler::CreateNewBlock(CChainState& chainstate, const CScript& scriptPubKeyIn)
{
int64_t nTimeStart = GetTimeMicros();
diff --git a/src/miner.h b/src/miner.h
index 023635814c..06af570130 100644
--- a/src/miner.h
+++ b/src/miner.h
@@ -158,6 +158,7 @@ public:
explicit BlockAssembler(const CTxMemPool& mempool, const CChainParams& params, const Options& options);
/** Construct a new block template with coinbase to scriptPubKeyIn */
+ std::unique_ptr<CBlockTemplate> CreateNewBlock(const CScript& scriptPubKeyIn);
std::unique_ptr<CBlockTemplate> CreateNewBlock(CChainState& chainstate, const CScript& scriptPubKeyIn);
inline static std::optional<int64_t> m_last_block_num_txs{};