Merge branch 'master' into fix/getmasternodeblocks-depth

DeFiCh · Dec 7, 2021 · 334ee3b · 334ee3b
2 parents a3c3a8e + 5dd54ad
commit 334ee3b
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/src/miner.cpp b/src/miner.cpp
@@ -425,7 +425,7 @@ void BlockAssembler::SortForBlock(const CTxMemPool::setEntries& package, std::ve
     // transactions for block inclusion.
     sortedEntries.clear();
     sortedEntries.insert(sortedEntries.begin(), package.begin(), package.end());
-    std::sort(sortedEntries.begin(), sortedEntries.end(), CompareTxIterByAncestorCount());
+    std::sort(sortedEntries.begin(), sortedEntries.end(), CompareTxIterByEntryTime());
 }
 
 // This transaction selection algorithm orders the mempool based
@@ -993,4 +993,4 @@ void ThreadStaker::operator()(std::vector<ThreadStaker::Args> args, CChainParams
     }
 }
 
-}
+}
diff --git a/src/miner.h b/src/miner.h
@@ -93,6 +93,16 @@ struct CompareTxIterByAncestorCount {
     }
 };
 
+// A comparator that sorts transactions based on tx entry time.
+struct CompareTxIterByEntryTime {
+    bool operator()(const CTxMemPool::txiter &a, const CTxMemPool::txiter &b) const
+    {
+        if (a->GetTime() == b->GetTime())
+            return CompareTxIterByAncestorCount()(a, b);
+        return CompareTxMemPoolEntryByEntryTime()(*a, *b);
+    }
+};
+
 typedef boost::multi_index_container<
     CTxMemPoolModifiedEntry,
     boost::multi_index::indexed_by<