Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Make layered txpool aware of minGasPrice and minPriorityFeePerGas dynamic options #6611

Merged
merged 5 commits into from
Feb 27, 2024
Merged

Make layered txpool aware of minGasPrice and minPriorityFeePerGas dynamic options #6611

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d8e1554
Make layered txpool aware of min gas price and min priority fee
fab-10 Feb 26, 2024
e6458e4
Unit tests
fab-10 Feb 21, 2024
5944e03
Update CHANGELOG
fab-10 Feb 26, 2024
fcd9445
Update ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/t…
fab-10 Feb 27, 2024
d49f3b0
Merge branch 'main' into txpool-min-fee-options-aware2
fab-10 Feb 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Unit tests 
Signed-off-by: Fabio Di Fabio <fabio.difabio@consensys.net>
  • Loading branch information
@fab-10
fab-10 committed Feb 26, 2024
commit e6458e4ea488d38510141a935cebfc8c71a789ad
24 changes: 23 additions & 1 deletion ...edger/besu/ethereum/eth/transactions/layered/AbstractPrioritizedTransactionsTestBase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@

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 org.hyperledger.besu.datatypes.Wei;
import org.hyperledger.besu.ethereum.core.BlockHeader;
Expand All @@ -41,7 +42,9 @@ public abstract class AbstractPrioritizedTransactionsTestBase extends BaseTransa
protected final TransactionPoolMetrics txPoolMetrics = new TransactionPoolMetrics(metricsSystem);
protected final EvictCollectorLayer evictCollector = new EvictCollectorLayer(txPoolMetrics);
protected final MiningParameters miningParameters =
MiningParameters.newDefault().setMinTransactionGasPrice(DEFAULT_MIN_GAS_PRICE);
MiningParameters.newDefault()
.setMinTransactionGasPrice(DEFAULT_MIN_GAS_PRICE)
.setMinPriorityFeePerGas(DEFAULT_MIN_PRIORITY_FEE);
protected AbstractPrioritizedTransactions transactions =
getSorter(
ImmutableTransactionPoolConfiguration.builder()
Expand Down Expand Up @@ -129,6 +132,25 @@ public void shouldStartDroppingLocalTransactionsWhenPoolIsFullOfLocalTransaction
assertTransactionNotPrioritized(lastLocalTransaction);
}

@Test
public void txBelowCurrentMineableMinGasPriceIsNotPrioritized() {
final PendingTransaction lowGasPriceTx =
createRemotePendingTransaction(
createTransaction(0, DEFAULT_MIN_GAS_PRICE.subtract(1), KEYS1));
assertThat(prioritizeTransaction(lowGasPriceTx)).isEqualTo(DROPPED);
assertEvicted(lowGasPriceTx);
assertTransactionNotPrioritized(lowGasPriceTx);
}

@Test
public void txWithPriorityBelowCurrentMineableMinGasPriceIsPrioritized() {
final PendingTransaction lowGasPriceTx =
createRemotePendingTransaction(
createTransaction(0, DEFAULT_MIN_GAS_PRICE.subtract(1), KEYS1), true);
assertThat(prioritizeTransaction(lowGasPriceTx)).isEqualTo(ADDED);
assertTransactionPrioritized(lowGasPriceTx);
}

protected void shouldPrioritizeValueThenTimeAddedToPool(
final Iterator<PendingTransaction> lowValueTxSupplier,
final PendingTransaction highValueTx,
Expand Down
41 changes: 38 additions & 3 deletions ...yperledger/besu/ethereum/eth/transactions/layered/BaseFeePrioritizedTransactionsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,11 @@
*/
package org.hyperledger.besu.ethereum.eth.transactions.layered;

import static org.assertj.core.api.Assertions.assertThat;
import static org.hyperledger.besu.datatypes.TransactionType.EIP1559;
import static org.hyperledger.besu.datatypes.TransactionType.FRONTIER;
import static org.hyperledger.besu.ethereum.eth.transactions.TransactionAddedResult.ADDED;
import static org.hyperledger.besu.ethereum.eth.transactions.TransactionAddedResult.DROPPED;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;

Expand All @@ -34,6 +37,7 @@

import java.util.Comparator;
import java.util.List;
import java.util.Map;
import java.util.Optional;
import java.util.Random;
import java.util.function.BiFunction;
Expand All @@ -43,7 +47,7 @@
import org.junit.jupiter.api.Test;

public class BaseFeePrioritizedTransactionsTest extends AbstractPrioritizedTransactionsTestBase {

private static final FeeMarket EIP1559_FEE_MARKET = FeeMarket.london(0L);
private static final Random randomizeTxType = new Random();

@Override
Expand All @@ -61,15 +65,19 @@ AbstractPrioritizedTransactions getSorter(
nextLayer,
txPoolMetrics,
transactionReplacementTester,
FeeMarket.london(0L),
EIP1559_FEE_MARKET,
new BlobCache(),
miningParameters);
}

@Override
protected BlockHeader mockBlockHeader() {
return mockBlockHeader(Wei.ONE);
}

private BlockHeader mockBlockHeader(final Wei baseFee) {
final BlockHeader blockHeader = mock(BlockHeader.class);
when(blockHeader.getBaseFee()).thenReturn(Optional.of(Wei.ONE));
when(blockHeader.getBaseFee()).thenReturn(Optional.of(baseFee));
return blockHeader;
}

Expand Down Expand Up @@ -157,6 +165,29 @@ public void shouldPrioritizeEffectivePriorityFeeThenTimeAddedToPoolOnMixedTypes(
lowValueTxs.iterator(), highGasPriceTransaction, firstLowValueTx);
}

@Test
public void txBelowCurrentMineableMinPriorityFeeIsNotPrioritized() {
setBaseFee(DEFAULT_MIN_GAS_PRICE.subtract(2));
miningParameters.setMinPriorityFeePerGas(Wei.of(5));
final PendingTransaction lowPriorityFeeTx =
createRemotePendingTransaction(
createTransaction(0, DEFAULT_MIN_GAS_PRICE.subtract(1), KEYS1));
assertThat(prioritizeTransaction(lowPriorityFeeTx)).isEqualTo(DROPPED);
assertEvicted(lowPriorityFeeTx);
assertTransactionNotPrioritized(lowPriorityFeeTx);
}

@Test
public void txWithPriorityBelowCurrentMineableMinPriorityFeeIsPrioritized() {
setBaseFee(DEFAULT_MIN_GAS_PRICE.subtract(2));
miningParameters.setMinPriorityFeePerGas(Wei.of(5));
final PendingTransaction lowGasPriceTx =
createRemotePendingTransaction(
createTransaction(0, DEFAULT_MIN_GAS_PRICE.subtract(1), KEYS1), true);
assertThat(prioritizeTransaction(lowGasPriceTx)).isEqualTo(ADDED);
assertTransactionPrioritized(lowGasPriceTx);
}

private void shouldPrioritizePriorityFeeThenTimeAddedToPoolSameTypeTxs(
final TransactionType transactionType) {
final PendingTransaction highGasPriceTransaction =
Expand All @@ -179,4 +210,8 @@ private void shouldPrioritizePriorityFeeThenTimeAddedToPoolSameTypeTxs(
shouldPrioritizeValueThenTimeAddedToPool(
lowValueTxs.iterator(), highGasPriceTransaction, lowValueTxs.get(0));
}

private void setBaseFee(final Wei baseFee) {
transactions.blockAdded(EIP1559_FEE_MARKET, mockBlockHeader(baseFee), Map.of());
}
}
1 change: 1 addition & 0 deletions .../java/org/hyperledger/besu/ethereum/eth/transactions/layered/BaseTransactionPoolTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ public class BaseTransactionPoolTest {
protected static final Address SENDER1 = Util.publicKeyToAddress(KEYS1.getPublicKey());
protected static final Address SENDER2 = Util.publicKeyToAddress(KEYS2.getPublicKey());
protected static final Wei DEFAULT_MIN_GAS_PRICE = Wei.of(50);
protected static final Wei DEFAULT_MIN_PRIORITY_FEE = Wei.ZERO;
private static final Random randomizeTxType = new Random();

protected final Transaction transaction0 = createTransaction(0);
Expand Down
Loading