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

Remove old mempool-booting logic

Browse source
This commit is contained in:
Gregory Sanders 2019-05-31 12:53:39 -04:00
parent 1c7782451a
commit 144d486220
1 changed files with 0 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

22
src/txmempool.cpp
View file

@ -574,28 +574,6 @@ void CTxMemPool::removeForBlock(const std::vector<CTransactionRef>& vtx, unsigne
ClearPrioritisation(tx->GetHash()); 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<CTransactionRef> 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(); lastRollingFeeUpdate = GetTime();
blockSinceLastRollingFeeBump = true; blockSinceLastRollingFeeBump = true;
} }