miner: Pass in blockman to ::RegenerateCommitments

dongcarl · dongcarl · commit 2c3ba006930a · 2021-03-08T15:54:31.000-05:00
REQUIRES ATTENTION
diff --git 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);
 }
diff --git a/src/miner.h b/src/miner.h
@@ -202,6 +202,6 @@ void IncrementExtraNonce(CBlock* pblock, const CBlockIndex* pindexPrev, unsigned
 int64_t UpdateTime(CBlockHeader* pblock, const Consensus::Params& consensusParams, const CBlockIndex* pindexPrev);
 
 /** Update an old GenerateCoinbaseCommitment from CreateNewBlock after the block txs have changed */
-void RegenerateCommitments(CBlock& block);
+void RegenerateCommitments(CBlock& block, BlockManager& blockman);
 
 #endif // BITCOIN_MINER_H
diff --git a/src/rpc/mining.cpp b/src/rpc/mining.cpp
@@ -369,7 +369,7 @@ static RPCHelpMan generateblock()
 
     // Add transactions
     block.vtx.insert(block.vtx.end(), txs.begin(), txs.end());
-    RegenerateCommitments(block);
+    RegenerateCommitments(block, WITH_LOCK(::cs_main, return std::ref(g_chainman.m_blockman)));
 
     {
         LOCK(cs_main);
diff --git a/src/test/util/setup_common.cpp b/src/test/util/setup_common.cpp
@@ -251,7 +251,7 @@ CBlock TestChain100Setup::CreateAndProcessBlock(const std::vector<CMutableTransa
     for (const CMutableTransaction& tx : txns) {
         block.vtx.push_back(MakeTransactionRef(tx));
     }
-    RegenerateCommitments(block);
+    RegenerateCommitments(block, WITH_LOCK(::cs_main, return std::ref(g_chainman.m_blockman)));
 
     while (!CheckProofOfWork(block.GetHash(), block.nBits, chainparams.GetConsensus())) ++block.nNonce;
 

Original file line number	Diff line number	Diff line change
`@@ -39,13 +39,13 @@ int64_t UpdateTime(CBlockHeader* pblock, const Consensus::Params& consensusParam`
`39`	`39`	`return nNewTime - nOldTime;`
`40`	`40`	`}`
`41`	`41`
`42`		`-void RegenerateCommitments(CBlock& block)`
	`42`	`+void RegenerateCommitments(CBlock& block, BlockManager& blockman)`
`43`	`43`	`{`
`44`	`44`	`CMutableTransaction tx{*block.vtx.at(0)};`
`45`	`45`	`tx.vout.erase(tx.vout.begin() + GetWitnessCommitmentIndex(block));`
`46`	`46`	`block.vtx.at(0) = MakeTransactionRef(tx);`
`47`	`47`
`48`		`- GenerateCoinbaseCommitment(block, WITH_LOCK(cs_main, return g_chainman.m_blockman.LookupBlockIndex(block.hashPrevBlock)), Params().GetConsensus());`
	`48`	`+ GenerateCoinbaseCommitment(block, WITH_LOCK(::cs_main, assert(std::addressof(g_chainman.m_blockman) == std::addressof(blockman)); return blockman.LookupBlockIndex(block.hashPrevBlock)), Params().GetConsensus());`
`49`	`49`
`50`	`50`	`block.hashMerkleRoot = BlockMerkleRoot(block);`
`51`	`51`	`}`
Original file line number	Diff line number	Diff line change
`@@ -369,7 +369,7 @@ static RPCHelpMan generateblock()`
`369`	`369`
`370`	`370`	`// Add transactions`
`371`	`371`	`block.vtx.insert(block.vtx.end(), txs.begin(), txs.end());`
`372`		`- RegenerateCommitments(block);`
	`372`	`+ RegenerateCommitments(block, WITH_LOCK(::cs_main, return std::ref(g_chainman.m_blockman)));`
`373`	`373`
`374`	`374`	`{`
`375`	`375`	`LOCK(cs_main);`
Original file line number	Diff line number	Diff line change
`@@ -251,7 +251,7 @@ CBlock TestChain100Setup::CreateAndProcessBlock(const std::vector<CMutableTransa`
`251`	`251`	`for (const CMutableTransaction& tx : txns) {`
`252`	`252`	`block.vtx.push_back(MakeTransactionRef(tx));`
`253`	`253`	`}`
`254`		`- RegenerateCommitments(block);`
	`254`	`+ RegenerateCommitments(block, WITH_LOCK(::cs_main, return std::ref(g_chainman.m_blockman)));`
`255`	`255`
`256`	`256`	`while (!CheckProofOfWork(block.GetHash(), block.nBits, chainparams.GetConsensus())) ++block.nNonce;`
`257`	`257`