Sort transactions by priority

Signed-off-by: Fabio Di Fabio <[email protected]>
hyperledger · Sep 27, 2023 · 67cf062 · 67cf062
1 parent b36a09d
commit 67cf062
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 7 deletions.
diff --git a/...rg/hyperledger/besu/ethereum/eth/transactions/layered/BaseFeePrioritizedTransactions.java b/...rg/hyperledger/besu/ethereum/eth/transactions/layered/BaseFeePrioritizedTransactions.java
@@ -53,7 +53,8 @@ public BaseFeePrioritizedTransactions(
 
   @Override
   protected int compareByFee(final PendingTransaction pt1, final PendingTransaction pt2) {
-    return Comparator.comparing(
+    return Comparator.comparing(PendingTransaction::hasPriority)
+        .thenComparing(
             (PendingTransaction pendingTransaction) ->
                 pendingTransaction.getTransaction().getEffectivePriorityFeePerGas(nextBlockBaseFee))
         .thenComparing(

diff --git a/...g/hyperledger/besu/ethereum/eth/transactions/layered/GasPricePrioritizedTransactions.java b/...g/hyperledger/besu/ethereum/eth/transactions/layered/GasPricePrioritizedTransactions.java
@@ -43,7 +43,7 @@ public GasPricePrioritizedTransactions(
 
   @Override
   protected int compareByFee(final PendingTransaction pt1, final PendingTransaction pt2) {
-    return comparing(PendingTransaction::isReceivedFromLocalSource)
+    return comparing(PendingTransaction::hasPriority)
         .thenComparing(PendingTransaction::getGasPrice)
         .thenComparing(PendingTransaction::getSequence)
         .compare(pt1, pt2);

diff --git a/...c/main/java/org/hyperledger/besu/ethereum/eth/transactions/layered/ReadyTransactions.java b/...c/main/java/org/hyperledger/besu/ethereum/eth/transactions/layered/ReadyTransactions.java
@@ -43,7 +43,8 @@ public class ReadyTransactions extends AbstractSequentialTransactionsLayer {
 
   private final NavigableSet<PendingTransaction> orderByMaxFee =
       new TreeSet<>(
-          Comparator.comparing((PendingTransaction pt) -> pt.getTransaction().getMaxGasPrice())
+          Comparator.comparing(PendingTransaction::hasPriority)
+              .thenComparing((PendingTransaction pt) -> pt.getTransaction().getMaxGasPrice())
               .thenComparing(PendingTransaction::getSequence));
 
   public ReadyTransactions(

diff --git a/.../main/java/org/hyperledger/besu/ethereum/eth/transactions/layered/SparseTransactions.java b/.../main/java/org/hyperledger/besu/ethereum/eth/transactions/layered/SparseTransactions.java
@@ -46,7 +46,9 @@
 
 public class SparseTransactions extends AbstractTransactionsLayer {
   private final NavigableSet<PendingTransaction> sparseEvictionOrder =
-      new TreeSet<>(Comparator.comparing(PendingTransaction::getSequence));
+      new TreeSet<>(
+          Comparator.comparing(PendingTransaction::hasPriority)
+              .thenComparing(PendingTransaction::getSequence));
   private final Map<Address, Integer> gapBySender = new HashMap<>();
   private final List<Set<Address>> orderByGap;
 

diff --git a/...g/hyperledger/besu/ethereum/eth/transactions/sorter/BaseFeePendingTransactionsSorter.java b/...g/hyperledger/besu/ethereum/eth/transactions/sorter/BaseFeePendingTransactionsSorter.java
@@ -63,7 +63,7 @@ public BaseFeePendingTransactionsSorter(
    */
   private final NavigableSet<PendingTransaction> prioritizedTransactionsStaticRange =
       new TreeSet<>(
-          comparing(PendingTransaction::isReceivedFromLocalSource)
+          comparing(PendingTransaction::hasPriority)
               .thenComparing(
                   pendingTx ->
                       pendingTx
@@ -79,7 +79,7 @@ public BaseFeePendingTransactionsSorter(
 
   private final NavigableSet<PendingTransaction> prioritizedTransactionsDynamicRange =
       new TreeSet<>(
-          comparing(PendingTransaction::isReceivedFromLocalSource)
+          comparing(PendingTransaction::hasPriority)
               .thenComparing(
                   pendingTx ->
                       pendingTx

diff --git a/.../hyperledger/besu/ethereum/eth/transactions/sorter/GasPricePendingTransactionsSorter.java b/.../hyperledger/besu/ethereum/eth/transactions/sorter/GasPricePendingTransactionsSorter.java
@@ -37,7 +37,7 @@ public class GasPricePendingTransactionsSorter extends AbstractPendingTransactio
 
   private final NavigableSet<PendingTransaction> prioritizedTransactions =
       new TreeSet<>(
-          comparing(PendingTransaction::isReceivedFromLocalSource)
+          comparing(PendingTransaction::hasPriority)
               .thenComparing(PendingTransaction::getGasPrice)
               .thenComparing(PendingTransaction::getAddedAt)
               .thenComparing(PendingTransaction::getSequence)