GlcoinCore/elements
1
0
Fork 0
mirror of https://github.com/ElementsProject/elements.git synced 2026-08-13 12:33:42 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge 1847ce2d49 into merged_master (Bitcoin PR bitcoin/bitcoin#23157)

Browse source
This commit is contained in:
James Dorfman 2023-05-16 05:49:35 +00:00 • committed by Byron Hambly
commit df8f97d63b
7 changed files with 71 additions and 71 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/validation.cpp
View file

@ -1335,12 +1335,6 @@ void UpdateCoins(const CTransaction& tx, CCoinsViewCache& inputs, CTxUndo &txund
AddCoins(inputs, tx, nHeight);
}
void UpdateCoins(const CTransaction& tx, CCoinsViewCache& inputs, int nHeight)
{
CTxUndo txundo;
UpdateCoins(tx, inputs, txundo, nHeight);
}
bool CScriptCheck::operator()() {
const CScript &scriptSig = ptxTo->vin[nIn].scriptSig;
const CScriptWitness *witness = ptxTo->witness.vtxinwit.size() > nIn ? &ptxTo->witness.vtxinwit[nIn].scriptWitness : NULL;
@ -2771,7 +2765,7 @@ bool CChainState::ActivateBestChainStep(BlockValidationState& state, CBlockIndex
// any disconnected transactions back to the mempool.
MaybeUpdateMempoolForReorg(disconnectpool, true);
}
if (m_mempool) m_mempool->check(*this);
if (m_mempool) m_mempool->check(this->m_chain.Tip(), this->CoinsTip(), this->m_chain.Height() + 1);
CheckForkWarningConditions();