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 b5a271334c into merged_master (Bitcoin PR bitcoin/bitcoin#28922)

Browse source
This commit is contained in:
Byron Hambly 2025-11-10 15:40:17 +02:00
commit 26b9abc2f2
No known key found for this signature in database
GPG key ID: DE8F6EA20A661697
59 changed files with 161 additions and 151 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/txmempool.cpp
View file

@ -128,7 +128,7 @@ void CTxMemPool::UpdateTransactionsFromBlock(const std::vector<uint256>& vHashes
if (it == mapTx.end()) {
continue;
}
auto iter = mapNextTx.lower_bound(COutPoint(hash, 0));
auto iter = mapNextTx.lower_bound(COutPoint(Txid::FromUint256(hash), 0));
// First calculate the children, and update CTxMemPoolEntry::m_children to
// include them, and update their CTxMemPoolEntry::m_parents to include this tx.
// we cache the in-mempool children to avoid duplicate updates