diff options
author | Carl Dong <contact@carldong.me> | 2021-04-05 11:11:22 -0400 |
---|---|---|
committer | Carl Dong <contact@carldong.me> | 2021-04-05 11:13:51 -0400 |
commit | cced0f46c9133e0fc6211e987421ad1d9be1a399 (patch) | |
tree | a0538dc9d5ee76146a840570e61fdfc131b51044 /src/miner.cpp | |
parent | 66daf4cb3b47e8218623936d23ad504fd189e70b (diff) | |
download | bitcoin-cced0f46c9133e0fc6211e987421ad1d9be1a399.tar.xz |
miner: Pass in previous CBlockIndex to RegenerateCommitments
Diffstat (limited to 'src/miner.cpp')
-rw-r--r-- | src/miner.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/miner.cpp b/src/miner.cpp index 8a9406f810..3bc7fdd458 100644 --- a/src/miner.cpp +++ b/src/miner.cpp @@ -39,13 +39,14 @@ int64_t UpdateTime(CBlockHeader* pblock, const Consensus::Params& consensusParam return nNewTime - nOldTime; } -void RegenerateCommitments(CBlock& block, BlockManager& blockman) +void RegenerateCommitments(CBlock& block, CBlockIndex* prev_block) { CMutableTransaction tx{*block.vtx.at(0)}; tx.vout.erase(tx.vout.begin() + GetWitnessCommitmentIndex(block)); block.vtx.at(0) = MakeTransactionRef(tx); - GenerateCoinbaseCommitment(block, WITH_LOCK(::cs_main, assert(std::addressof(g_chainman.m_blockman) == std::addressof(blockman)); return blockman.LookupBlockIndex(block.hashPrevBlock)), Params().GetConsensus()); + WITH_LOCK(::cs_main, assert(g_chainman.m_blockman.LookupBlockIndex(block.hashPrevBlock) == prev_block)); + GenerateCoinbaseCommitment(block, prev_block, Params().GetConsensus()); block.hashMerkleRoot = BlockMerkleRoot(block); } |