Skip to content

Commit e1bf441

Browse files
stevenroosestevenroose
committed
Merge #627: kill useless mapPeginsSpentToTxid
8591de9 kill useless mapPeginsSpentToTxid (Gregory Sanders) Pull request description: Completely redundant since #260 when peg-in inputs have taken on deterministic prevouts, so normal mempool logic has taken over for accounting for double-spending peg-in proofs in the mempool. resolves #624 Tree-SHA512: e5c0e7570657bd1418f54fdd47a6f3f815a5779e28ff15ba37c18e425780415385af64efa57be882ba12ad748e7a664fb723eae0e819bf1d5f197bb0b82b086b
2 parents d913803 + 8591de9 commit e1bf441

File tree

5 files changed

+11
-136
lines changed

5 files changed

+11
-136
lines changed

‎src/test/mempool_tests.cpp‎

Lines changed: 2 additions & 91 deletions
Original file line numberDiff line numberDiff line change
@@ -390,8 +390,7 @@ BOOST_AUTO_TEST_CASE(MempoolAncestorIndexingTest)
390390
/* after tx6 is mined, tx7 should move up in the sort */
391391
std::vector<CTransactionRef> vtx;
392392
vtx.push_back(MakeTransactionRef(tx6));
393-
std::set<std::pair<uint256, COutPoint>> setPeginsSpentDummy;
394-
pool.removeForBlock(vtx, 1, setPeginsSpentDummy);
393+
pool.removeForBlock(vtx, 1);
395394

396395
sortedOrder.erase(sortedOrder.begin()+1);
397396
// Ties are broken by hash
@@ -420,93 +419,6 @@ BOOST_AUTO_TEST_CASE(MempoolAncestorIndexingTest)
420419
CheckSort<ancestor_score>(pool, sortedOrder);
421420
}
422421

423-
// ELEMENTS:
424-
BOOST_AUTO_TEST_CASE(PeginSpentTest)
425-
{
426-
CBlockPolicyEstimator feeEst;
427-
CTxMemPool pool(&feeEst);
428-
LOCK(pool.cs);
429-
430-
std::set<std::pair<uint256, COutPoint> > setPeginsSpent;
431-
TestMemPoolEntryHelper entry;
432-
433-
std::pair<uint256, COutPoint> pegin1, pegin2, pegin3;
434-
GetRandBytes(pegin1.first.begin(), pegin1.first.size());
435-
GetRandBytes(pegin2.first.begin(), pegin2.first.size());
436-
GetRandBytes(pegin3.first.begin(), pegin3.first.size());
437-
GetRandBytes(pegin1.second.hash.begin(), pegin1.second.hash.size());
438-
GetRandBytes(pegin2.second.hash.begin(), pegin2.second.hash.size());
439-
pegin3.second.hash = pegin2.second.hash;
440-
pegin1.second.n = 0;
441-
pegin2.second.n = 0;
442-
pegin3.second.n = 1;
443-
444-
CMutableTransaction tx;
445-
tx.vin.resize(1);
446-
tx.vout.resize(1);
447-
tx.vout[0].nValue = 0;
448-
pool.addUnchecked(entry.PeginsSpent(setPeginsSpent).FromTx(tx));
449-
BOOST_CHECK(pool.mapPeginsSpentToTxid.empty());
450-
451-
setPeginsSpent = {pegin1};
452-
GetRandBytes(tx.vin[0].prevout.hash.begin(), tx.vin[0].prevout.hash.size());
453-
tx.vout.resize(2);
454-
tx.vout[1].nValue = 0;
455-
const uint256 tx2Hash(tx.GetHash());
456-
pool.addUnchecked(entry.PeginsSpent(setPeginsSpent).FromTx(tx));
457-
BOOST_CHECK_EQUAL(pool.mapPeginsSpentToTxid[pegin1].ToString(), tx2Hash.ToString());
458-
459-
setPeginsSpent = {pegin2};
460-
GetRandBytes(tx.vin[0].prevout.hash.begin(), tx.vin[0].prevout.hash.size());
461-
tx.vout.resize(3);
462-
tx.vout[2].nValue = 0;
463-
const uint256 tx3Hash(tx.GetHash());
464-
pool.addUnchecked(entry.PeginsSpent(setPeginsSpent).FromTx(tx));
465-
BOOST_CHECK_EQUAL(pool.mapPeginsSpentToTxid[pegin2].ToString(), tx3Hash.ToString());
466-
467-
setPeginsSpent = {pegin3};
468-
GetRandBytes(tx.vin[0].prevout.hash.begin(), tx.vin[0].prevout.hash.size());
469-
tx.vout.resize(4);
470-
tx.vout[3].nValue = 0;
471-
CTransactionRef txref(MakeTransactionRef(tx));
472-
pool.removeForBlock({txref}, 1, setPeginsSpent);
473-
474-
BOOST_CHECK_EQUAL(pool.size(), 3);
475-
BOOST_CHECK_EQUAL(pool.mapPeginsSpentToTxid.size(), 2);
476-
BOOST_CHECK_EQUAL(pool.mapPeginsSpentToTxid[pegin1].ToString(), tx2Hash.ToString());
477-
BOOST_CHECK_EQUAL(pool.mapPeginsSpentToTxid[pegin2].ToString(), tx3Hash.ToString());
478-
479-
setPeginsSpent = {pegin1};
480-
GetRandBytes(tx.vin[0].prevout.hash.begin(), tx.vin[0].prevout.hash.size());
481-
tx.vout.resize(5);
482-
tx.vout[4].nValue = 0;
483-
txref = MakeTransactionRef(tx);
484-
pool.removeForBlock({txref}, 2, setPeginsSpent);
485-
486-
BOOST_CHECK_EQUAL(pool.size(), 2);
487-
BOOST_CHECK_EQUAL(pool.mapPeginsSpentToTxid.size(), 1);
488-
BOOST_CHECK_EQUAL(pool.mapPeginsSpentToTxid[pegin2].ToString(), tx3Hash.ToString());
489-
490-
setPeginsSpent = {pegin1, pegin3};
491-
GetRandBytes(tx.vin[0].prevout.hash.begin(), tx.vin[0].prevout.hash.size());
492-
tx.vout.resize(6);
493-
tx.vout[5].nValue = 0;
494-
const uint256 tx4Hash(tx.GetHash());
495-
pool.addUnchecked(entry.PeginsSpent(setPeginsSpent).FromTx(tx));
496-
BOOST_CHECK_EQUAL(pool.mapPeginsSpentToTxid[pegin1].ToString(), tx4Hash.ToString());
497-
BOOST_CHECK_EQUAL(pool.mapPeginsSpentToTxid[pegin3].ToString(), tx4Hash.ToString());
498-
499-
setPeginsSpent = {pegin2, pegin3};
500-
GetRandBytes(tx.vin[0].prevout.hash.begin(), tx.vin[0].prevout.hash.size());
501-
tx.vout.resize(7);
502-
tx.vout[6].nValue = 0;
503-
txref = MakeTransactionRef(tx);
504-
pool.removeForBlock({txref}, 3, setPeginsSpent);
505-
506-
BOOST_CHECK_EQUAL(pool.size(), 1);
507-
BOOST_CHECK(pool.mapPeginsSpentToTxid.empty());
508-
}
509-
510422
BOOST_AUTO_TEST_CASE(MempoolSizeLimitTest)
511423
{
512424
CTxMemPool pool;
@@ -637,8 +549,7 @@ BOOST_AUTO_TEST_CASE(MempoolSizeLimitTest)
637549
SetMockTime(42 + CTxMemPool::ROLLING_FEE_HALFLIFE);
638550
BOOST_CHECK_EQUAL(pool.GetMinFee(1).GetFeePerK(), maxFeeRateRemoved.GetFeePerK() + 1000);
639551
// ... we should keep the same min fee until we get a block
640-
std::set<std::pair<uint256, COutPoint>> setPeginsSpentDummy;
641-
pool.removeForBlock(vtx, 1, setPeginsSpentDummy);
552+
pool.removeForBlock(vtx, 1);
642553
SetMockTime(42 + 2*CTxMemPool::ROLLING_FEE_HALFLIFE);
643554
BOOST_CHECK_EQUAL(pool.GetMinFee(1).GetFeePerK(), llround((maxFeeRateRemoved.GetFeePerK() + 1000)/2.0));
644555
// ... then feerate should drop 1/2 each halflife

‎src/test/policyestimator_tests.cpp‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ BOOST_AUTO_TEST_CASE(BlockPolicyEstimates)
2323
CAmount basefee(2000);
2424
CAmount deltaFee(100);
2525
std::vector<CAmount> feeV;
26-
std::set<std::pair<uint256, COutPoint>> setPeginsSpentDummy;
2726

2827
// Populate vectors of increasing fees
2928
for (int j = 0; j < 10; j++) {
@@ -75,7 +74,7 @@ BOOST_AUTO_TEST_CASE(BlockPolicyEstimates)
7574
txHashes[9-h].pop_back();
7675
}
7776
}
78-
mpool.removeForBlock(block, ++blocknum, setPeginsSpentDummy);
77+
mpool.removeForBlock(block, ++blocknum);
7978
block.clear();
8079
// Check after just a few txs that combining buckets works as expected
8180
if (blocknum == 3) {
@@ -114,7 +113,7 @@ BOOST_AUTO_TEST_CASE(BlockPolicyEstimates)
114113
// Mine 50 more blocks with no transactions happening, estimates shouldn't change
115114
// We haven't decayed the moving average enough so we still have enough data points in every bucket
116115
while (blocknum < 250)
117-
mpool.removeForBlock(block, ++blocknum, setPeginsSpentDummy);
116+
mpool.removeForBlock(block, ++blocknum);
118117

119118
BOOST_CHECK(feeEst.estimateFee(1) == CFeeRate(0));
120119
for (int i = 2; i < 10;i++) {
@@ -134,7 +133,7 @@ BOOST_AUTO_TEST_CASE(BlockPolicyEstimates)
134133
txHashes[j].push_back(hash);
135134
}
136135
}
137-
mpool.removeForBlock(block, ++blocknum, setPeginsSpentDummy);
136+
mpool.removeForBlock(block, ++blocknum);
138137
}
139138

140139
for (int i = 1; i < 10;i++) {
@@ -151,7 +150,7 @@ BOOST_AUTO_TEST_CASE(BlockPolicyEstimates)
151150
txHashes[j].pop_back();
152151
}
153152
}
154-
mpool.removeForBlock(block, 266, setPeginsSpentDummy);
153+
mpool.removeForBlock(block, 266);
155154
block.clear();
156155
BOOST_CHECK(feeEst.estimateFee(1) == CFeeRate(0));
157156
for (int i = 2; i < 10;i++) {
@@ -172,7 +171,7 @@ BOOST_AUTO_TEST_CASE(BlockPolicyEstimates)
172171

173172
}
174173
}
175-
mpool.removeForBlock(block, ++blocknum, setPeginsSpentDummy);
174+
mpool.removeForBlock(block, ++blocknum);
176175
block.clear();
177176
}
178177
BOOST_CHECK(feeEst.estimateFee(1) == CFeeRate(0));

‎src/txmempool.cpp‎

Lines changed: 2 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -403,13 +403,6 @@ void CTxMemPool::addUnchecked(const CTxMemPoolEntry &entry, setEntries &setAnces
403403

404404
vTxHashes.emplace_back(tx.GetWitnessHash(), newit);
405405
newit->vTxHashesIdx = vTxHashes.size() - 1;
406-
407-
// ELEMENTS:
408-
typedef std::pair<uint256, COutPoint> PeginPair;
409-
for(const PeginPair& it : entry.setPeginsSpent) {
410-
std::pair<std::map<std::pair<uint256, COutPoint>, uint256>::iterator, bool> ret = mapPeginsSpentToTxid.insert(std::make_pair(it, tx.GetHash()));
411-
assert(ret.second);
412-
}
413406
}
414407

415408
void CTxMemPool::removeUnchecked(txiter it, MemPoolRemovalReason reason)
@@ -419,12 +412,6 @@ void CTxMemPool::removeUnchecked(txiter it, MemPoolRemovalReason reason)
419412
for (const CTxIn& txin : it->GetTx().vin)
420413
mapNextTx.erase(txin.prevout);
421414

422-
// ELEMENTS:
423-
typedef std::pair<uint256, COutPoint> PeginPair;
424-
for (const PeginPair& it2 : it->setPeginsSpent) {
425-
mapPeginsSpentToTxid.erase(it2);
426-
}
427-
428415
if (vTxHashes.size() > 1) {
429416
vTxHashes[it->vTxHashesIdx] = std::move(vTxHashes.back());
430417
vTxHashes[it->vTxHashesIdx].second->vTxHashesIdx = it->vTxHashesIdx;
@@ -561,7 +548,7 @@ void CTxMemPool::removeConflicts(const CTransaction &tx)
561548
/**
562549
* Called when a block is connected. Removes from mempool and updates the miner fee estimator.
563550
*/
564-
void CTxMemPool::removeForBlock(const std::vector<CTransactionRef>& vtx, unsigned int nBlockHeight, const std::set<std::pair<uint256, COutPoint>>& setPeginsSpent, bool pak_transition)
551+
void CTxMemPool::removeForBlock(const std::vector<CTransactionRef>& vtx, unsigned int nBlockHeight, bool pak_transition)
565552
{
566553
LOCK(cs);
567554
std::vector<const CTxMemPoolEntry*> entries;
@@ -587,22 +574,6 @@ void CTxMemPool::removeForBlock(const std::vector<CTransactionRef>& vtx, unsigne
587574
ClearPrioritisation(tx->GetHash());
588575
}
589576

590-
// ELEMENTS:
591-
// Eject any conflicting pegins
592-
for (std::set<std::pair<uint256, COutPoint> >::const_iterator it = setPeginsSpent.begin(); it != setPeginsSpent.end(); it++) {
593-
std::map<std::pair<uint256, COutPoint>, uint256>::const_iterator it2 = mapPeginsSpentToTxid.find(*it);
594-
if (it2 != mapPeginsSpentToTxid.end()) {
595-
uint256 tx_id = it2->second;
596-
txiter txit = mapTx.find(tx_id);
597-
assert(txit != mapTx.end());
598-
const CTransaction& tx = txit->GetTx();
599-
setEntries stage;
600-
stage.insert(txit);
601-
RemoveStaged(stage, true);
602-
removeRecursive(tx, MemPoolRemovalReason::CONFLICT);
603-
ClearPrioritisation(tx_id);
604-
}
605-
}
606577
// Eject any newly-invalid peg-outs based on changing block commitment
607578
const CChainParams& chainparams = Params();
608579
if (pak_transition && chainparams.GetEnforcePak()) {
@@ -786,10 +757,6 @@ void CTxMemPool::check(const CCoinsViewCache *pcoins) const
786757
for (std::set<std::pair<uint256, COutPoint> >::const_iterator it = setGlobalPeginsSpent.begin(); it != setGlobalPeginsSpent.end(); it++) {
787758
assert(!pcoins->IsPeginSpent(*it));
788759
}
789-
for (std::map<std::pair<uint256, COutPoint>, uint256>::const_iterator it = mapPeginsSpentToTxid.begin(); it != mapPeginsSpentToTxid.end(); it++) {
790-
assert(setGlobalPeginsSpent.erase(it->first));
791-
}
792-
assert(setGlobalPeginsSpent.size() == 0);
793760
// END ELEMENTS
794761
//
795762

@@ -988,7 +955,7 @@ bool CCoinsViewMemPool::GetCoin(const COutPoint &outpoint, Coin &coin) const {
988955

989956
// ELEMENTS:
990957
bool CCoinsViewMemPool::IsPeginSpent(const std::pair<uint256, COutPoint> &outpoint) const {
991-
return mempool.mapPeginsSpentToTxid.count(outpoint) || base->IsPeginSpent(outpoint);
958+
return base->IsPeginSpent(outpoint);
992959
}
993960

994961
size_t CTxMemPool::DynamicMemoryUsage() const {

‎src/txmempool.h‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -505,8 +505,6 @@ class CTxMemPool
505505
const setEntries & GetMemPoolParents(txiter entry) const EXCLUSIVE_LOCKS_REQUIRED(cs);
506506
const setEntries & GetMemPoolChildren(txiter entry) const EXCLUSIVE_LOCKS_REQUIRED(cs);
507507
uint64_t CalculateDescendantMaximum(txiter entry) const EXCLUSIVE_LOCKS_REQUIRED(cs);
508-
// ELEMENTS:
509-
std::map<std::pair<uint256, COutPoint>, uint256> mapPeginsSpentToTxid;
510508
private:
511509
typedef std::map<txiter, setEntries, CompareIteratorByHash> cacheMap;
512510

@@ -554,7 +552,7 @@ class CTxMemPool
554552
void removeForReorg(const CCoinsViewCache *pcoins, unsigned int nMemPoolHeight, int flags) EXCLUSIVE_LOCKS_REQUIRED(cs_main);
555553
void removeConflicts(const CTransaction &tx) EXCLUSIVE_LOCKS_REQUIRED(cs);
556554
void removeForBlock(const std::vector<CTransactionRef>& vtx, unsigned int nBlockHeight,
557-
const std::set<std::pair<uint256, COutPoint>>& setPeginsSpent, bool pak_transition=false);
555+
bool pak_transition=false);
558556

559557
void clear();
560558
void _clear() EXCLUSIVE_LOCKS_REQUIRED(cs); //lock free

‎src/validation.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2650,7 +2650,7 @@ bool CChainState::ConnectTip(CValidationState& state, const CChainParams& chainp
26502650
// ELEMENTS: We also eject now-invalid peg-outs based on block transition if not config list set
26512651
// If config is set, this means all peg-outs have been filtered for that list already and other
26522652
// functionaries aren't matching your list. Operator should restart with no list or new matching list.
2653-
mempool.removeForBlock(blockConnecting.vtx, pindexNew->nHeight, setPeginsSpent, (paklist && !g_paklist_config));
2653+
mempool.removeForBlock(blockConnecting.vtx, pindexNew->nHeight, (paklist && !g_paklist_config));
26542654
disconnectpool.removeForBlock(blockConnecting.vtx);
26552655
// Update chainActive & related variables.
26562656
chainActive.SetTip(pindexNew);

0 commit comments

Comments
 (0)