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

Have removeForBlock boot transactions when required

Browse source
This commit is contained in:
Gregory Sanders 2019-05-31 13:45:38 -04:00
parent 0cfe03bec4
commit 2eded09b6a
2 changed files with 39 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

37
src/txmempool.cpp
View file

@ -18,6 +18,7 @@
#include <util/moneystr.h> #include <util/moneystr.h>
#include <util/time.h> #include <util/time.h>
#include <chainparams.h> // removeForBlock paklist transition #include <chainparams.h> // removeForBlock paklist transition
#include <pegins.h>
CTxMemPoolEntry::CTxMemPoolEntry(const CTransactionRef& _tx, const CAmount& _nFee, CTxMemPoolEntry::CTxMemPoolEntry(const CTransactionRef& _tx, const CAmount& _nFee,
int64_t _nTime, unsigned int _entryHeight, int64_t _nTime, unsigned int _entryHeight,
@ -548,7 +549,7 @@ void CTxMemPool::removeConflicts(const CTransaction &tx)
/** /**
* Called when a block is connected. Removes from mempool and updates the miner fee estimator. * Called when a block is connected. Removes from mempool and updates the miner fee estimator.
*/ */
void CTxMemPool::removeForBlock(const std::vector<CTransactionRef>& vtx, unsigned int nBlockHeight, bool pak_transition) void CTxMemPool::removeForBlock(const std::vector<CTransactionRef>& vtx, unsigned int nBlockHeight, const CBlockIndex* p_block_index_new)
{ {
LOCK(cs); LOCK(cs);
std::vector<const CTxMemPoolEntry*> entries; std::vector<const CTxMemPoolEntry*> entries;
@ -574,6 +575,40 @@ void CTxMemPool::removeForBlock(const std::vector<CTransactionRef>& vtx, unsigne
ClearPrioritisation(tx->GetHash()); ClearPrioritisation(tx->GetHash());
} }
// Eject transactions that are invalid for *following* block due to transition
// We check every epoch_length blocks due to peg-ins expiring an epoch after
// being changed
if (p_block_index_new) {
const CChainParams& chainparams = Params();
uint32_t epoch_length = chainparams.GetConsensus().dynamic_epoch_length;
if ((p_block_index_new->nHeight+1) % epoch_length == 0) {
CPAKList enforced_paklist = GetActivePAKList(p_block_index_new, chainparams.GetConsensus());
std::vector<CTransactionRef> tx_to_remove;
for (const auto& entry : mapTx) {
const CTransaction& tx = entry.GetTx();
if (chainparams.GetEnforcePak() && !IsPAKValidTx(tx, enforced_paklist)) {
tx_to_remove.push_back(MakeTransactionRef(tx));
continue;
}
std::vector<CScript> fedpegscripts = GetValidFedpegScripts(p_block_index_new, chainparams.GetConsensus(), true /* nextblock_validation */);
for (size_t nIn = 0; nIn < tx.vin.size(); nIn++) {
const CTxIn& in = tx.vin[nIn];
std::string err;
if (in.m_is_pegin && (!tx.HasWitness() || !IsValidPeginWitness(tx.witness.vtxinwit[nIn].m_pegin_witness, fedpegscripts, in.prevout, err, true /* check_depth */))) {
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;
} }

7
src/validation.cpp
View file

@ -2652,10 +2652,9 @@ bool CChainState::ConnectTip(CValidationState& state, const CChainParams& chainp
int64_t nTime5 = GetTimeMicros(); nTimeChainState += nTime5 - nTime4; int64_t nTime5 = GetTimeMicros(); nTimeChainState += nTime5 - nTime4;
LogPrint(BCLog::BENCH, " - Writing chainstate: %.2fms [%.2fs (%.2fms/blk)]\n", (nTime5 - nTime4) * MILLI, nTimeChainState * MICRO, nTimeChainState * MILLI / nBlocksTotal); LogPrint(BCLog::BENCH, " - Writing chainstate: %.2fms [%.2fs (%.2fms/blk)]\n", (nTime5 - nTime4) * MILLI, nTimeChainState * MICRO, nTimeChainState * MILLI / nBlocksTotal);
// Remove conflicting transactions from the mempool.; // Remove conflicting transactions from the mempool.;
// ELEMENTS: We also eject now-invalid peg-outs based on block transition if not config list set // ELEMENTS: We also eject peg-outs with now-invalid PAK proofs
// If config is set, this means all peg-outs have been filtered for that list already and other // as well as peg-in inputs during transitional periods.
// functionaries aren't matching your list. Operator should restart with no list or new matching list. mempool.removeForBlock(blockConnecting.vtx, pindexNew->nHeight, pindexNew);
mempool.removeForBlock(blockConnecting.vtx, pindexNew->nHeight, (paklist && !g_paklist_config));
disconnectpool.removeForBlock(blockConnecting.vtx); disconnectpool.removeForBlock(blockConnecting.vtx);
// Update chainActive & related variables. // Update chainActive & related variables.
chainActive.SetTip(pindexNew); chainActive.SetTip(pindexNew);