Merge dca9ab48b8 into merged_master (Bitcoin PR bitcoin/bitcoin#23661)

This commit is contained in:
Byron Hambly 2023-06-02 08:54:50 +00:00
commit 6089b0123d
2 changed files with 3 additions and 1 deletions

View file

@ -1621,6 +1621,7 @@ static bool TxOutDBEntryIsSame(const CTxOut& block_txout, const CTxOut& txdb_txo
* When FAILED is returned, view is left in an indeterminate state. */
DisconnectResult CChainState::DisconnectBlock(const CBlock& block, const CBlockIndex* pindex, CCoinsViewCache& view)
{
AssertLockHeld(::cs_main);
bool fClean = true;
CBlockUndo blockUndo;