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

Merge c001da306b into merged_master (Bitcoin PR bitcoin/bitcoin#23325)

Browse source
This commit is contained in:
Byron Hambly 2023-05-14 10:52:15 +00:00
commit 8299bec8a2
9 changed files with 31 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/txmempool.cpp
View file

@ -1047,7 +1047,7 @@ CTxMemPool::setEntries CTxMemPool::GetIterSet(const std::set<uint256>& hashes) c
bool CTxMemPool::HasNoInputsOf(const CTransaction &tx) const
{
for (unsigned int i = 0; i < tx.vin.size(); i++)
if (exists(tx.vin[i].prevout.hash))
if (exists(GenTxid::Txid(tx.vin[i].prevout.hash)))
return false;
return true;
}
@ -1223,7 +1223,7 @@ void CTxMemPool::TrimToSize(size_t sizelimit, std::vector<COutPoint>* pvNoSpends
if (pvNoSpendsRemaining) {
for (const CTransaction& tx : txn) {
for (const CTxIn& txin : tx.vin) {
if (exists(txin.prevout.hash)) continue;
if (exists(GenTxid::Txid(txin.prevout.hash))) continue;
pvNoSpendsRemaining->push_back(txin.prevout);
}
}