mirror of
https://github.com/vacp2p/status-linea-besu.git
synced 2026-01-09 22:07:59 -05:00
Layered txpool: do not send notifications when moving tx between layers (#7539)
Signed-off-by: Fabio Di Fabio <fabio.difabio@consensys.net>
This commit is contained in:
Fabio Di Fabio
@@ -9,6 +9,7 @@
|
||||
### Additions and Improvements
|
||||
|
||||
### Bug fixes
|
||||
- Layered txpool: do not send notifications when moving tx between layers [#7539](https://github.com/hyperledger/besu/pull/7539)
|
||||
|
||||
## 24.9.0
|
||||
|
||||
@@ -34,7 +35,7 @@
|
||||
- Correctly drops messages that exceeds local message size limit [#5455](https://github.com/hyperledger/besu/pull/7507)
|
||||
- **DebugMetrics**: Fixed a `ClassCastException` occurring in `DebugMetrics` when handling nested metric structures. Previously, `Double` values within these structures were incorrectly cast to `Map` objects, leading to errors. This update allows for proper handling of both direct values and nested structures at the same level. Issue# [#7383](https://github.com/hyperledger/besu/pull/7383)
|
||||
- `evmtool` was not respecting the `--genesis` setting, resulting in unexpected trace results. [#7433](https://github.com/hyperledger/besu/pull/7433)
|
||||
- The genesis config override `contractSizeLimit`q was not wired into code size limits [#7557](https://github.com/hyperledger/besu/pull/7557)
|
||||
- The genesis config override `contractSizeLimit` was not wired into code size limits [#7557](https://github.com/hyperledger/besu/pull/7557)
|
||||
- Fix incorrect key filtering in LayeredKeyValueStorage stream [#7535](https://github.com/hyperledger/besu/pull/7557)
|
||||
|
||||
## 24.8.0
|
||||
|
||||
@@ -15,6 +15,7 @@
|
||||
package org.hyperledger.besu.ethereum.eth.transactions;
|
||||
|
||||
import org.hyperledger.besu.datatypes.TransactionType;
|
||||
import org.hyperledger.besu.ethereum.eth.transactions.layered.TransactionsLayer.AddReason;
|
||||
import org.hyperledger.besu.ethereum.transaction.TransactionInvalidReason;
|
||||
import org.hyperledger.besu.metrics.BesuMetricCategory;
|
||||
import org.hyperledger.besu.metrics.ReplaceableDoubleSupplier;
|
||||
@@ -68,6 +69,7 @@ public class TransactionPoolMetrics {
|
||||
"Count of transactions added to the transaction pool",
|
||||
"source",
|
||||
"priority",
|
||||
"reason",
|
||||
"layer");
|
||||
|
||||
removedCounter =
|
||||
@@ -215,11 +217,13 @@ public class TransactionPoolMetrics {
|
||||
SKIPPED_MESSAGES_LOGGING_THRESHOLD));
|
||||
}
|
||||
|
||||
public void incrementAdded(final PendingTransaction pendingTransaction, final String layer) {
|
||||
public void incrementAdded(
|
||||
final PendingTransaction pendingTransaction, final AddReason addReason, final String layer) {
|
||||
addedCounter
|
||||
.labels(
|
||||
location(pendingTransaction.isReceivedFromLocalSource()),
|
||||
priority(pendingTransaction.hasPriority()),
|
||||
addReason.label(),
|
||||
layer)
|
||||
.inc();
|
||||
}
|
||||
|
||||
@@ -14,6 +14,7 @@
|
||||
*/
|
||||
package org.hyperledger.besu.ethereum.eth.transactions.layered;
|
||||
|
||||
import static org.hyperledger.besu.ethereum.eth.transactions.layered.TransactionsLayer.AddReason.MOVE;
|
||||
import static org.hyperledger.besu.ethereum.eth.transactions.layered.TransactionsLayer.RemovalReason.EVICTED;
|
||||
import static org.hyperledger.besu.ethereum.eth.transactions.layered.TransactionsLayer.RemovalReason.FOLLOW_INVALIDATED;
|
||||
|
||||
@@ -77,7 +78,7 @@ public abstract class AbstractSequentialTransactionsLayer extends AbstractTransa
|
||||
senderTxs.remove(txToRemove.getNonce());
|
||||
processRemove(senderTxs, txToRemove.getTransaction(), FOLLOW_INVALIDATED);
|
||||
})
|
||||
.forEach(followingTx -> nextLayer.add(followingTx, gap));
|
||||
.forEach(followingTx -> nextLayer.add(followingTx, gap, MOVE));
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -19,10 +19,10 @@ import static org.hyperledger.besu.ethereum.eth.transactions.TransactionAddedRes
|
||||
import static org.hyperledger.besu.ethereum.eth.transactions.TransactionAddedResult.ALREADY_KNOWN;
|
||||
import static org.hyperledger.besu.ethereum.eth.transactions.TransactionAddedResult.REJECTED_UNDERPRICED_REPLACEMENT;
|
||||
import static org.hyperledger.besu.ethereum.eth.transactions.TransactionAddedResult.TRY_NEXT_LAYER;
|
||||
import static org.hyperledger.besu.ethereum.eth.transactions.layered.TransactionsLayer.AddReason.MOVE;
|
||||
import static org.hyperledger.besu.ethereum.eth.transactions.layered.TransactionsLayer.RemovalReason.CONFIRMED;
|
||||
import static org.hyperledger.besu.ethereum.eth.transactions.layered.TransactionsLayer.RemovalReason.CROSS_LAYER_REPLACED;
|
||||
import static org.hyperledger.besu.ethereum.eth.transactions.layered.TransactionsLayer.RemovalReason.EVICTED;
|
||||
import static org.hyperledger.besu.ethereum.eth.transactions.layered.TransactionsLayer.RemovalReason.PROMOTED;
|
||||
import static org.hyperledger.besu.ethereum.eth.transactions.layered.TransactionsLayer.RemovalReason.REPLACED;
|
||||
|
||||
import org.hyperledger.besu.datatypes.Address;
|
||||
@@ -169,7 +169,8 @@ public abstract class AbstractTransactionsLayer implements TransactionsLayer {
|
||||
final PendingTransaction pendingTransaction, final int gap);
|
||||
|
||||
@Override
|
||||
public TransactionAddedResult add(final PendingTransaction pendingTransaction, final int gap) {
|
||||
public TransactionAddedResult add(
|
||||
final PendingTransaction pendingTransaction, final int gap, final AddReason addReason) {
|
||||
|
||||
// is replacing an existing one?
|
||||
TransactionAddedResult addStatus = maybeReplaceTransaction(pendingTransaction);
|
||||
@@ -178,21 +179,26 @@ public abstract class AbstractTransactionsLayer implements TransactionsLayer {
|
||||
}
|
||||
|
||||
if (addStatus.equals(TRY_NEXT_LAYER)) {
|
||||
return addToNextLayer(pendingTransaction, gap);
|
||||
return addToNextLayer(pendingTransaction, gap, addReason);
|
||||
}
|
||||
|
||||
if (addStatus.isSuccess()) {
|
||||
processAdded(pendingTransaction.detachedCopy());
|
||||
final var addedPendingTransaction =
|
||||
addReason.makeCopy() ? pendingTransaction.detachedCopy() : pendingTransaction;
|
||||
processAdded(addedPendingTransaction, addReason);
|
||||
addStatus.maybeReplacedTransaction().ifPresent(this::replaced);
|
||||
|
||||
nextLayer.notifyAdded(pendingTransaction);
|
||||
nextLayer.notifyAdded(addedPendingTransaction);
|
||||
|
||||
if (!maybeFull()) {
|
||||
// if there is space try to see if the added tx filled some gaps
|
||||
tryFillGap(addStatus, pendingTransaction, getRemainingPromotionsPerType());
|
||||
tryFillGap(addStatus, addedPendingTransaction, getRemainingPromotionsPerType());
|
||||
}
|
||||
|
||||
if (addReason.sendNotification()) {
|
||||
ethScheduler.scheduleTxWorkerTask(() -> notifyTransactionAdded(addedPendingTransaction));
|
||||
}
|
||||
|
||||
ethScheduler.scheduleTxWorkerTask(() -> notifyTransactionAdded(pendingTransaction));
|
||||
} else {
|
||||
final var rejectReason = addStatus.maybeInvalidReason().orElseThrow();
|
||||
metrics.incrementRejected(pendingTransaction, rejectReason, name());
|
||||
@@ -238,7 +244,7 @@ public abstract class AbstractTransactionsLayer implements TransactionsLayer {
|
||||
pendingTransaction.getNonce(),
|
||||
remainingPromotionsPerType);
|
||||
if (promotedTx != null) {
|
||||
processAdded(promotedTx);
|
||||
processAdded(promotedTx, AddReason.PROMOTED);
|
||||
if (!maybeFull()) {
|
||||
tryFillGap(ADDED, promotedTx, remainingPromotionsPerType);
|
||||
}
|
||||
@@ -286,7 +292,7 @@ public abstract class AbstractTransactionsLayer implements TransactionsLayer {
|
||||
|
||||
if (remainingPromotionsPerType[txType.ordinal()] > 0) {
|
||||
senderTxs.pollFirstEntry();
|
||||
processRemove(senderTxs, candidateTx.getTransaction(), PROMOTED);
|
||||
processRemove(senderTxs, candidateTx.getTransaction(), RemovalReason.PROMOTED);
|
||||
metrics.incrementRemoved(candidateTx, "promoted", name());
|
||||
|
||||
if (senderTxs.isEmpty()) {
|
||||
@@ -302,32 +308,34 @@ public abstract class AbstractTransactionsLayer implements TransactionsLayer {
|
||||
}
|
||||
|
||||
private TransactionAddedResult addToNextLayer(
|
||||
final PendingTransaction pendingTransaction, final int distance) {
|
||||
final PendingTransaction pendingTransaction, final int distance, final AddReason addReason) {
|
||||
return addToNextLayer(
|
||||
txsBySender.getOrDefault(pendingTransaction.getSender(), EMPTY_SENDER_TXS),
|
||||
pendingTransaction,
|
||||
distance);
|
||||
distance,
|
||||
addReason);
|
||||
}
|
||||
|
||||
protected TransactionAddedResult addToNextLayer(
|
||||
final NavigableMap<Long, PendingTransaction> senderTxs,
|
||||
final PendingTransaction pendingTransaction,
|
||||
final int distance) {
|
||||
final int distance,
|
||||
final AddReason addReason) {
|
||||
final int nextLayerDistance;
|
||||
if (senderTxs.isEmpty()) {
|
||||
nextLayerDistance = distance;
|
||||
} else {
|
||||
nextLayerDistance = (int) (pendingTransaction.getNonce() - (senderTxs.lastKey() + 1));
|
||||
}
|
||||
return nextLayer.add(pendingTransaction, nextLayerDistance);
|
||||
return nextLayer.add(pendingTransaction, nextLayerDistance, addReason);
|
||||
}
|
||||
|
||||
private void processAdded(final PendingTransaction addedTx) {
|
||||
private void processAdded(final PendingTransaction addedTx, final AddReason addReason) {
|
||||
pendingTransactions.put(addedTx.getHash(), addedTx);
|
||||
final var senderTxs = txsBySender.computeIfAbsent(addedTx.getSender(), s -> new TreeMap<>());
|
||||
senderTxs.put(addedTx.getNonce(), addedTx);
|
||||
increaseCounters(addedTx);
|
||||
metrics.incrementAdded(addedTx, name());
|
||||
metrics.incrementAdded(addedTx, addReason, name());
|
||||
internalAdd(senderTxs, addedTx);
|
||||
}
|
||||
|
||||
@@ -353,7 +361,7 @@ public abstract class AbstractTransactionsLayer implements TransactionsLayer {
|
||||
++evictedCount;
|
||||
evictedSize += lastTx.memorySize();
|
||||
// evicted can always be added to the next layer
|
||||
addToNextLayer(lessReadySenderTxs, lastTx, 0);
|
||||
addToNextLayer(lessReadySenderTxs, lastTx, 0, MOVE);
|
||||
}
|
||||
|
||||
if (lessReadySenderTxs.isEmpty()) {
|
||||
@@ -459,7 +467,7 @@ public abstract class AbstractTransactionsLayer implements TransactionsLayer {
|
||||
nextLayer
|
||||
.promote(
|
||||
this::promotionFilter, cacheFreeSpace(), freeSlots, getRemainingPromotionsPerType())
|
||||
.forEach(this::processAdded);
|
||||
.forEach(addedTx -> processAdded(addedTx, AddReason.PROMOTED));
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -14,6 +14,7 @@
|
||||
*/
|
||||
package org.hyperledger.besu.ethereum.eth.transactions.layered;
|
||||
|
||||
import static org.hyperledger.besu.ethereum.eth.transactions.layered.TransactionsLayer.AddReason.MOVE;
|
||||
import static org.hyperledger.besu.ethereum.eth.transactions.layered.TransactionsLayer.RemovalReason.BELOW_BASE_FEE;
|
||||
|
||||
import org.hyperledger.besu.datatypes.Wei;
|
||||
@@ -133,7 +134,7 @@ public class BaseFeePrioritizedTransactions extends AbstractPrioritizedTransacti
|
||||
.addArgument(newNextBlockBaseFee::toHumanReadableString)
|
||||
.log();
|
||||
processEvict(senderTxs, demoteTx, BELOW_BASE_FEE);
|
||||
addToNextLayer(senderTxs, demoteTx, 0);
|
||||
addToNextLayer(senderTxs, demoteTx, 0, MOVE);
|
||||
}
|
||||
});
|
||||
|
||||
|
||||
@@ -75,7 +75,8 @@ public class EndLayer implements TransactionsLayer {
|
||||
}
|
||||
|
||||
@Override
|
||||
public TransactionAddedResult add(final PendingTransaction pendingTransaction, final int gap) {
|
||||
public TransactionAddedResult add(
|
||||
final PendingTransaction pendingTransaction, final int gap, final AddReason reason) {
|
||||
notifyTransactionDropped(pendingTransaction);
|
||||
metrics.incrementRemoved(pendingTransaction, DROPPED.label(), name());
|
||||
++droppedCount;
|
||||
|
||||
@@ -20,6 +20,7 @@ import static java.util.stream.Collectors.reducing;
|
||||
import static org.hyperledger.besu.ethereum.eth.transactions.TransactionAddedResult.ALREADY_KNOWN;
|
||||
import static org.hyperledger.besu.ethereum.eth.transactions.TransactionAddedResult.INTERNAL_ERROR;
|
||||
import static org.hyperledger.besu.ethereum.eth.transactions.TransactionAddedResult.NONCE_TOO_FAR_IN_FUTURE_FOR_SENDER;
|
||||
import static org.hyperledger.besu.ethereum.eth.transactions.layered.TransactionsLayer.AddReason.NEW;
|
||||
import static org.hyperledger.besu.ethereum.eth.transactions.layered.TransactionsLayer.RemovalReason.INVALIDATED;
|
||||
import static org.hyperledger.besu.ethereum.eth.transactions.layered.TransactionsLayer.RemovalReason.RECONCILED;
|
||||
|
||||
@@ -100,7 +101,7 @@ public class LayeredPendingTransactions implements PendingTransactions {
|
||||
}
|
||||
|
||||
try {
|
||||
return prioritizedTransactions.add(pendingTransaction, (int) nonceDistance);
|
||||
return prioritizedTransactions.add(pendingTransaction, (int) nonceDistance, NEW);
|
||||
} catch (final Throwable throwable) {
|
||||
return reconcileAndRetryAdd(
|
||||
pendingTransaction, stateSenderNonce, (int) nonceDistance, throwable);
|
||||
@@ -123,7 +124,7 @@ public class LayeredPendingTransactions implements PendingTransactions {
|
||||
.log();
|
||||
reconcileSender(pendingTransaction.getSender(), stateSenderNonce);
|
||||
try {
|
||||
return prioritizedTransactions.add(pendingTransaction, nonceDistance);
|
||||
return prioritizedTransactions.add(pendingTransaction, nonceDistance, NEW);
|
||||
} catch (final Throwable throwable2) {
|
||||
// the error should have been solved by the reconcile, logging at higher level now
|
||||
LOG.atWarn()
|
||||
@@ -210,7 +211,7 @@ public class LayeredPendingTransactions implements PendingTransactions {
|
||||
final long lowestNonce = reAddTxs.getFirst().getNonce();
|
||||
final int newNonceDistance = (int) Math.max(0, lowestNonce - stateSenderNonce);
|
||||
|
||||
reAddTxs.forEach(ptx -> prioritizedTransactions.add(ptx, newNonceDistance));
|
||||
reAddTxs.forEach(ptx -> prioritizedTransactions.add(ptx, newNonceDistance, NEW));
|
||||
}
|
||||
|
||||
LOG.atDebug()
|
||||
|
||||
@@ -41,7 +41,19 @@ public interface TransactionsLayer {
|
||||
|
||||
boolean contains(Transaction transaction);
|
||||
|
||||
TransactionAddedResult add(PendingTransaction pendingTransaction, int gap);
|
||||
/**
|
||||
* Try to add a pending transaction to this layer. The {@code addReason} is used to discriminate
|
||||
* between a new tx that is added to the pool, or a tx that is already in the pool, but is moving
|
||||
* internally between layers, for example, due to a promotion or demotion. The distinction is
|
||||
* needed since we only need to send a notification for a new tx, and not when it is only an
|
||||
* internal move.
|
||||
*
|
||||
* @param pendingTransaction the tx to try to add to this layer
|
||||
* @param gap the nonce gap between the current sender nonce and the tx
|
||||
* @param addReason define if it is a new tx or an internal move
|
||||
* @return the result of the add operation
|
||||
*/
|
||||
TransactionAddedResult add(PendingTransaction pendingTransaction, int gap, AddReason addReason);
|
||||
|
||||
void remove(PendingTransaction pendingTransaction, RemovalReason reason);
|
||||
|
||||
@@ -108,6 +120,49 @@ public interface TransactionsLayer {
|
||||
|
||||
String logSender(Address sender);
|
||||
|
||||
/** Describe why we are trying to add a tx to a layer. */
|
||||
enum AddReason {
|
||||
/** When adding a tx, that is not present in the pool. */
|
||||
NEW(true, true),
|
||||
/** When adding a tx as result of an internal move between layers. */
|
||||
MOVE(false, false),
|
||||
/** When adding a tx as result of a promotion from a lower layer. */
|
||||
PROMOTED(false, false);
|
||||
|
||||
private final boolean sendNotification;
|
||||
private final boolean makeCopy;
|
||||
private final String label;
|
||||
|
||||
AddReason(final boolean sendNotification, final boolean makeCopy) {
|
||||
this.sendNotification = sendNotification;
|
||||
this.makeCopy = makeCopy;
|
||||
this.label = name().toLowerCase(Locale.ROOT);
|
||||
}
|
||||
|
||||
/**
|
||||
* Should we send add notification for this reason?
|
||||
*
|
||||
* @return true if notification should be sent
|
||||
*/
|
||||
public boolean sendNotification() {
|
||||
return sendNotification;
|
||||
}
|
||||
|
||||
/**
|
||||
* Should the layer make a copy of the pending tx before adding it, to avoid keeping reference
|
||||
* to potentially large underlying byte buffers?
|
||||
*
|
||||
* @return true is a copy is necessary
|
||||
*/
|
||||
public boolean makeCopy() {
|
||||
return makeCopy;
|
||||
}
|
||||
|
||||
public String label() {
|
||||
return label;
|
||||
}
|
||||
}
|
||||
|
||||
enum RemovalReason {
|
||||
CONFIRMED,
|
||||
CROSS_LAYER_REPLACED,
|
||||
|
||||
@@ -17,6 +17,7 @@ package org.hyperledger.besu.ethereum.eth.transactions.layered;
|
||||
import static org.assertj.core.api.Assertions.assertThat;
|
||||
import static org.hyperledger.besu.ethereum.eth.transactions.TransactionAddedResult.ADDED;
|
||||
import static org.hyperledger.besu.ethereum.eth.transactions.TransactionAddedResult.DROPPED;
|
||||
import static org.hyperledger.besu.ethereum.eth.transactions.layered.TransactionsLayer.AddReason.NEW;
|
||||
|
||||
import org.hyperledger.besu.datatypes.TransactionType;
|
||||
import org.hyperledger.besu.datatypes.Wei;
|
||||
@@ -169,7 +170,7 @@ public abstract class AbstractPrioritizedTransactionsTestBase extends BaseTransa
|
||||
.mapToObj(
|
||||
i -> {
|
||||
final var lowPriceTx = lowValueTxSupplier.next();
|
||||
final var prioritizeResult = transactions.add(lowPriceTx, 0);
|
||||
final var prioritizeResult = transactions.add(lowPriceTx, 0, NEW);
|
||||
|
||||
assertThat(prioritizeResult).isEqualTo(ADDED);
|
||||
assertThat(evictCollector.getEvictedTransactions()).isEmpty();
|
||||
@@ -180,7 +181,7 @@ public abstract class AbstractPrioritizedTransactionsTestBase extends BaseTransa
|
||||
assertThat(transactions.count()).isEqualTo(MAX_TRANSACTIONS);
|
||||
|
||||
// This should kick the oldest tx with the low gas price out, namely the first one we added
|
||||
final var highValuePrioRes = transactions.add(highValueTx, 0);
|
||||
final var highValuePrioRes = transactions.add(highValueTx, 0, NEW);
|
||||
assertThat(highValuePrioRes).isEqualTo(ADDED);
|
||||
assertEvicted(expectedDroppedTx);
|
||||
|
||||
@@ -195,7 +196,7 @@ public abstract class AbstractPrioritizedTransactionsTestBase extends BaseTransa
|
||||
}
|
||||
|
||||
protected TransactionAddedResult prioritizeTransaction(final PendingTransaction tx) {
|
||||
return transactions.add(tx, 0);
|
||||
return transactions.add(tx, 0, NEW);
|
||||
}
|
||||
|
||||
protected void assertTransactionPrioritized(final PendingTransaction tx) {
|
||||
|
||||
@@ -35,6 +35,7 @@ import org.hyperledger.besu.ethereum.eth.manager.EthScheduler;
|
||||
import org.hyperledger.besu.ethereum.eth.transactions.PendingTransaction;
|
||||
import org.hyperledger.besu.ethereum.eth.transactions.PendingTransactions;
|
||||
import org.hyperledger.besu.ethereum.eth.transactions.TransactionPoolMetrics;
|
||||
import org.hyperledger.besu.ethereum.eth.transactions.layered.TransactionsLayer.AddReason;
|
||||
import org.hyperledger.besu.evm.account.Account;
|
||||
import org.hyperledger.besu.metrics.StubMetricsSystem;
|
||||
import org.hyperledger.besu.testutil.DeterministicEthScheduler;
|
||||
@@ -258,9 +259,10 @@ public class BaseTransactionPoolTest {
|
||||
}
|
||||
}
|
||||
|
||||
protected long getAddedCount(final String source, final String priority, final String layer) {
|
||||
protected long getAddedCount(
|
||||
final String source, final String priority, final AddReason addReason, final String layer) {
|
||||
return metricsSystem.getCounterValue(
|
||||
TransactionPoolMetrics.ADDED_COUNTER_NAME, source, priority, layer);
|
||||
TransactionPoolMetrics.ADDED_COUNTER_NAME, source, priority, addReason.label(), layer);
|
||||
}
|
||||
|
||||
protected long getRemovedCount(
|
||||
|
||||
@@ -35,8 +35,9 @@ public class EvictCollectorLayer extends EndLayer {
|
||||
}
|
||||
|
||||
@Override
|
||||
public TransactionAddedResult add(final PendingTransaction pendingTransaction, final int gap) {
|
||||
final var res = super.add(pendingTransaction, gap);
|
||||
public TransactionAddedResult add(
|
||||
final PendingTransaction pendingTransaction, final int gap, final AddReason addReason) {
|
||||
final var res = super.add(pendingTransaction, gap, addReason);
|
||||
evictedTxs.add(pendingTransaction);
|
||||
return res;
|
||||
}
|
||||
|
||||
@@ -20,6 +20,8 @@ import static org.hyperledger.besu.ethereum.eth.transactions.TransactionAddedRes
|
||||
import static org.hyperledger.besu.ethereum.eth.transactions.TransactionAddedResult.ALREADY_KNOWN;
|
||||
import static org.hyperledger.besu.ethereum.eth.transactions.TransactionAddedResult.NONCE_TOO_FAR_IN_FUTURE_FOR_SENDER;
|
||||
import static org.hyperledger.besu.ethereum.eth.transactions.TransactionAddedResult.REJECTED_UNDERPRICED_REPLACEMENT;
|
||||
import static org.hyperledger.besu.ethereum.eth.transactions.layered.TransactionsLayer.AddReason.MOVE;
|
||||
import static org.hyperledger.besu.ethereum.eth.transactions.layered.TransactionsLayer.AddReason.NEW;
|
||||
import static org.hyperledger.besu.ethereum.eth.transactions.layered.TransactionsLayer.RemovalReason.DROPPED;
|
||||
import static org.hyperledger.besu.ethereum.eth.transactions.layered.TransactionsLayer.RemovalReason.REPLACED;
|
||||
import static org.hyperledger.besu.ethereum.transaction.TransactionInvalidReason.GAS_PRICE_BELOW_CURRENT_BASE_FEE;
|
||||
@@ -207,14 +209,14 @@ public class LayeredPendingTransactionsTest extends BaseTransactionPoolTest {
|
||||
createRemotePendingTransaction(transaction0), Optional.empty());
|
||||
assertThat(pendingTransactions.size()).isEqualTo(1);
|
||||
|
||||
assertThat(getAddedCount(REMOTE, NO_PRIORITY, layers.prioritizedTransactions.name()))
|
||||
assertThat(getAddedCount(REMOTE, NO_PRIORITY, NEW, layers.prioritizedTransactions.name()))
|
||||
.isEqualTo(1);
|
||||
|
||||
pendingTransactions.addTransaction(
|
||||
createRemotePendingTransaction(transaction1), Optional.empty());
|
||||
assertThat(pendingTransactions.size()).isEqualTo(2);
|
||||
|
||||
assertThat(getAddedCount(REMOTE, NO_PRIORITY, layers.prioritizedTransactions.name()))
|
||||
assertThat(getAddedCount(REMOTE, NO_PRIORITY, NEW, layers.prioritizedTransactions.name()))
|
||||
.isEqualTo(2);
|
||||
}
|
||||
|
||||
@@ -270,12 +272,48 @@ public class LayeredPendingTransactionsTest extends BaseTransactionPoolTest {
|
||||
getRemovedCount(
|
||||
REMOTE, NO_PRIORITY, DROPPED.label(), smallLayers.evictedCollector.name()))
|
||||
.isEqualTo(1);
|
||||
// before get evicted definitively, the tx moves to the lower layers, where it does not fix,
|
||||
// until is discarded
|
||||
assertThat(getAddedCount(REMOTE, NO_PRIORITY, MOVE, smallLayers.readyTransactions.name()))
|
||||
.isEqualTo(1);
|
||||
assertThat(getAddedCount(REMOTE, NO_PRIORITY, MOVE, smallLayers.sparseTransactions.name()))
|
||||
.isEqualTo(1);
|
||||
assertThat(smallLayers.evictedCollector.getEvictedTransactions())
|
||||
.map(PendingTransaction::getTransaction)
|
||||
.contains(firstTxs.get(0));
|
||||
verify(droppedListener).onTransactionDropped(firstTxs.get(0));
|
||||
}
|
||||
|
||||
@Test
|
||||
public void txsMovingToNextLayerWhenFirstIsFull() {
|
||||
final List<Transaction> txs = new ArrayList<>(MAX_TRANSACTIONS + 1);
|
||||
|
||||
pendingTransactions.subscribeDroppedTransactions(droppedListener);
|
||||
|
||||
for (int i = 0; i < MAX_TRANSACTIONS + 1; i++) {
|
||||
final Account sender = mock(Account.class);
|
||||
when(sender.getNonce()).thenReturn((long) i);
|
||||
final var tx =
|
||||
createTransaction(
|
||||
i, DEFAULT_BASE_FEE.add(i), SIGNATURE_ALGORITHM.get().generateKeyPair());
|
||||
pendingTransactions.addTransaction(createRemotePendingTransaction(tx), Optional.of(sender));
|
||||
txs.add(tx);
|
||||
assertTransactionPending(pendingTransactions, tx);
|
||||
}
|
||||
|
||||
assertThat(pendingTransactions.size()).isEqualTo(MAX_TRANSACTIONS + 1);
|
||||
assertThat(getAddedCount(REMOTE, NO_PRIORITY, NEW, layers.prioritizedTransactions.name()))
|
||||
.isEqualTo(MAX_TRANSACTIONS + 1);
|
||||
|
||||
// one tx moved to the ready layer since the prioritized was full
|
||||
assertThat(getAddedCount(REMOTE, NO_PRIORITY, MOVE, layers.readyTransactions.name()))
|
||||
.isEqualTo(1);
|
||||
|
||||
// first tx is the lowest value one so it is the first to be moved to ready
|
||||
assertThat(layers.readyTransactions.contains(txs.get(0))).isTrue();
|
||||
verifyNoInteractions(droppedListener);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void addTransactionForMultipleSenders() {
|
||||
final var transactionSenderA = createTransaction(0, KEYS1);
|
||||
@@ -574,7 +612,7 @@ public class LayeredPendingTransactionsTest extends BaseTransactionPoolTest {
|
||||
assertTransactionPending(pendingTransactions, transaction1b);
|
||||
assertTransactionPending(pendingTransactions, transaction2);
|
||||
assertThat(pendingTransactions.size()).isEqualTo(2);
|
||||
assertThat(getAddedCount(REMOTE, NO_PRIORITY, layers.prioritizedTransactions.name()))
|
||||
assertThat(getAddedCount(REMOTE, NO_PRIORITY, NEW, layers.prioritizedTransactions.name()))
|
||||
.isEqualTo(3);
|
||||
assertThat(
|
||||
getRemovedCount(
|
||||
@@ -612,7 +650,7 @@ public class LayeredPendingTransactionsTest extends BaseTransactionPoolTest {
|
||||
assertTransactionPending(pendingTransactions, independentTx);
|
||||
|
||||
assertThat(pendingTransactions.size()).isEqualTo(2);
|
||||
assertThat(getAddedCount(REMOTE, NO_PRIORITY, layers.prioritizedTransactions.name()))
|
||||
assertThat(getAddedCount(REMOTE, NO_PRIORITY, NEW, layers.prioritizedTransactions.name()))
|
||||
.isEqualTo(replacedTxCount + 2);
|
||||
assertThat(
|
||||
getRemovedCount(
|
||||
@@ -660,9 +698,9 @@ public class LayeredPendingTransactionsTest extends BaseTransactionPoolTest {
|
||||
|
||||
final int localDuplicateCount = replacedTxCount - remoteDuplicateCount;
|
||||
assertThat(pendingTransactions.size()).isEqualTo(2);
|
||||
assertThat(getAddedCount(REMOTE, NO_PRIORITY, layers.prioritizedTransactions.name()))
|
||||
assertThat(getAddedCount(REMOTE, NO_PRIORITY, NEW, layers.prioritizedTransactions.name()))
|
||||
.isEqualTo(remoteDuplicateCount + 1);
|
||||
assertThat(getAddedCount(LOCAL, NO_PRIORITY, layers.prioritizedTransactions.name()))
|
||||
assertThat(getAddedCount(LOCAL, NO_PRIORITY, NEW, layers.prioritizedTransactions.name()))
|
||||
.isEqualTo(localDuplicateCount + 1);
|
||||
assertThat(
|
||||
getRemovedCount(
|
||||
@@ -814,18 +852,20 @@ public class LayeredPendingTransactionsTest extends BaseTransactionPoolTest {
|
||||
pendingTransactions.addTransaction(
|
||||
createLocalPendingTransaction(transaction0), Optional.empty());
|
||||
assertThat(pendingTransactions.size()).isEqualTo(1);
|
||||
assertThat(getAddedCount(LOCAL, NO_PRIORITY, layers.prioritizedTransactions.name()))
|
||||
assertThat(getAddedCount(LOCAL, NO_PRIORITY, NEW, layers.prioritizedTransactions.name()))
|
||||
.isEqualTo(1);
|
||||
assertThat(getAddedCount(REMOTE, NO_PRIORITY, layers.prioritizedTransactions.name())).isZero();
|
||||
assertThat(getAddedCount(REMOTE, NO_PRIORITY, NEW, layers.prioritizedTransactions.name()))
|
||||
.isZero();
|
||||
|
||||
assertThat(
|
||||
pendingTransactions.addTransaction(
|
||||
createRemotePendingTransaction(transaction0), Optional.empty()))
|
||||
.isEqualTo(ALREADY_KNOWN);
|
||||
assertThat(pendingTransactions.size()).isEqualTo(1);
|
||||
assertThat(getAddedCount(LOCAL, NO_PRIORITY, layers.prioritizedTransactions.name()))
|
||||
assertThat(getAddedCount(LOCAL, NO_PRIORITY, NEW, layers.prioritizedTransactions.name()))
|
||||
.isEqualTo(1);
|
||||
assertThat(getAddedCount(REMOTE, NO_PRIORITY, layers.prioritizedTransactions.name())).isZero();
|
||||
assertThat(getAddedCount(REMOTE, NO_PRIORITY, NEW, layers.prioritizedTransactions.name()))
|
||||
.isZero();
|
||||
}
|
||||
|
||||
@Test
|
||||
@@ -833,8 +873,9 @@ public class LayeredPendingTransactionsTest extends BaseTransactionPoolTest {
|
||||
pendingTransactions.addTransaction(
|
||||
createRemotePendingTransaction(transaction0), Optional.empty());
|
||||
assertThat(pendingTransactions.size()).isEqualTo(1);
|
||||
assertThat(getAddedCount(LOCAL, NO_PRIORITY, layers.prioritizedTransactions.name())).isZero();
|
||||
assertThat(getAddedCount(REMOTE, NO_PRIORITY, layers.prioritizedTransactions.name()))
|
||||
assertThat(getAddedCount(LOCAL, NO_PRIORITY, NEW, layers.prioritizedTransactions.name()))
|
||||
.isZero();
|
||||
assertThat(getAddedCount(REMOTE, NO_PRIORITY, NEW, layers.prioritizedTransactions.name()))
|
||||
.isEqualTo(1);
|
||||
|
||||
assertThat(
|
||||
@@ -842,8 +883,9 @@ public class LayeredPendingTransactionsTest extends BaseTransactionPoolTest {
|
||||
createLocalPendingTransaction(transaction0), Optional.empty()))
|
||||
.isEqualTo(ALREADY_KNOWN);
|
||||
assertThat(pendingTransactions.size()).isEqualTo(1);
|
||||
assertThat(getAddedCount(LOCAL, NO_PRIORITY, layers.prioritizedTransactions.name())).isZero();
|
||||
assertThat(getAddedCount(REMOTE, NO_PRIORITY, layers.prioritizedTransactions.name()))
|
||||
assertThat(getAddedCount(LOCAL, NO_PRIORITY, NEW, layers.prioritizedTransactions.name()))
|
||||
.isZero();
|
||||
assertThat(getAddedCount(REMOTE, NO_PRIORITY, NEW, layers.prioritizedTransactions.name()))
|
||||
.isEqualTo(1);
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user