diff options
| author | Carl Dong <contact@carldong.me> | 2020-10-06 14:20:25 -0400 |
|---|---|---|
| committer | Carl Dong <contact@carldong.me> | 2021-03-08 15:54:31 -0500 |
| commit | 2c3ba006930a5bbbf5a33bd530f3c1b2c4103c74 (patch) | |
| tree | 5bd37554891daf021b07b7cbda15e49d30295e13 /src/miner.cpp | |
| parent | 2afcf24408b4453e4418ebfb326b141f6ea8647c (diff) | |
| download | bitcoin-2c3ba006930a5bbbf5a33bd530f3c1b2c4103c74.tar.xz | |
miner: Pass in blockman to ::RegenerateCommitments
REQUIRES ATTENTION
Diffstat (limited to 'src/miner.cpp')
| -rw-r--r-- | src/miner.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/miner.cpp b/src/miner.cpp index 444edb6976..fbaef0f224 100644 --- a/src/miner.cpp +++ b/src/miner.cpp @@ -39,13 +39,13 @@ int64_t UpdateTime(CBlockHeader* pblock, const Consensus::Params& consensusParam return nNewTime - nOldTime; } -void RegenerateCommitments(CBlock& block) +void RegenerateCommitments(CBlock& block, BlockManager& blockman) { 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, return g_chainman.m_blockman.LookupBlockIndex(block.hashPrevBlock)), Params().GetConsensus()); + GenerateCoinbaseCommitment(block, WITH_LOCK(::cs_main, assert(std::addressof(g_chainman.m_blockman) == std::addressof(blockman)); return blockman.LookupBlockIndex(block.hashPrevBlock)), Params().GetConsensus()); block.hashMerkleRoot = BlockMerkleRoot(block); } |