diff --git a/src/txmempool.cpp b/src/txmempool.cpp index 60ae8bd855..c374274cb3 100644 --- a/src/txmempool.cpp +++ b/src/txmempool.cpp @@ -574,28 +574,6 @@ void CTxMemPool::removeForBlock(const std::vector& vtx, unsigne ClearPrioritisation(tx->GetHash()); } - // Eject any newly-invalid peg-outs based on changing block commitment - const CChainParams& chainparams = Params(); - if (pak_transition && chainparams.GetEnforcePak()) { - std::vector tx_to_remove; - for (const auto& entry : mapTx) { - for (const auto& out : entry.GetTx().vout) { - if (out.scriptPubKey.IsPegoutScript(Params().ParentGenesisBlockHash()) && - !ScriptHasValidPAKProof(out.scriptPubKey, Params().ParentGenesisBlockHash())) { - const uint256 tx_id = entry.GetTx().GetHash(); - txiter it = mapTx.find(tx_id); - const CTransaction& tx = it->GetTx(); - tx_to_remove.push_back(MakeTransactionRef(tx)); - break; - } - } - } - for (auto& tx : tx_to_remove) { - const uint256 tx_id = tx->GetHash(); - removeRecursive(*tx, MemPoolRemovalReason::BLOCK); - ClearPrioritisation(tx_id); - } - } lastRollingFeeUpdate = GetTime(); blockSinceLastRollingFeeBump = true; }