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

fixup CreateNewBlock required age of transactions

Browse source
This commit is contained in:
Gregory Sanders 2018-11-14 12:02:40 -05:00
parent 3902a2902b
commit 8f287d4100
1 changed files with 3 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/miner.cpp
View file

@ -98,6 +98,7 @@ void BlockAssembler::resetBlock()
std::unique_ptr<CBlockTemplate> BlockAssembler::CreateNewBlock(const CScript& scriptPubKeyIn, bool fMineWitnessTx, int required_age_in_secs)
{
assert(required_age_in_secs >= 0);
int64_t nTimeStart = GetTimeMicros();
resetBlock();
@ -368,7 +369,8 @@ void BlockAssembler::addPackageTxs(int &nPackagesSelected, int &nDescendantsUpda
}
// Skip transactions that are under X seconds in mempool
if (iter->GetTime() > GetTime() - required_age_in_secs) {
// required_age_in_secs value of 0 is considered "inactive", in case of mocktime
if (required_age_in_secs > 0 && iter->GetTime() > GetTime() - required_age_in_secs) {
continue;
}