Merge 3a7e0a210c into merged_master (Bitcoin PR bitcoin/bitcoin#24513)

This commit is contained in:
Byron Hambly 2024-11-26 14:11:12 +02:00
commit b80b3aeff4
33 changed files with 154 additions and 154 deletions

View file

@ -620,7 +620,7 @@ static RPCHelpMan getblocktemplate()
std::string strMode = "template";
UniValue lpval = NullUniValue;
std::set<std::string> setClientRules;
CChainState& active_chainstate = chainman.ActiveChainstate();
Chainstate& active_chainstate = chainman.ActiveChainstate();
CChain& active_chain = active_chainstate.m_chain;
if (!request.params[0].isNull())
{