GlcoinCore/elements
1
0
Fork 0
mirror of https://github.com/ElementsProject/elements.git synced 2026-08-14 12:43:40 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge f13e03cda2 into merged_master (Bitcoin PR #20584)

Browse source
This commit is contained in:
Andrew Poelstra 2021-06-16 20:37:42 +00:00
commit e5cb4cb00e
19 changed files with 29 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/miner.cpp
View file

@ -263,7 +263,7 @@ bool BlockAssembler::TestPackage(uint64_t packageSize, int64_t packageSigOpsCost
// - transaction finality (locktime)
// - premature witness (in case segwit transactions are added to mempool before
// segwit activation)
bool BlockAssembler::TestPackageTransactions(const CTxMemPool::setEntries& package)
bool BlockAssembler::TestPackageTransactions(const CTxMemPool::setEntries& package) const
{
for (CTxMemPool::txiter it : package) {
if (!IsFinalTx(it->GetTx(), nHeight, nLockTimeCutoff))