Implement miner_setMinPriorityFee and miner_getMinPriorityFee

besu/src/main/java/org/hyperledger/besu/RunnerBuilder.java

@@ -802,6 +802,7 @@ public Runner build() {
               blockchainQueries,
               synchronizer,
               transactionPool,
+              miningParameters,
               miningCoordinator,
               metricsSystem,
               supportedCapabilities,
@@ -847,6 +848,7 @@ public Runner build() {
               blockchainQueries,
               synchronizer,
               transactionPool,
+              miningParameters,
               miningCoordinator,
               metricsSystem,
               supportedCapabilities,
@@ -937,6 +939,7 @@ public Runner build() {
               blockchainQueries,
               synchronizer,
               transactionPool,
+              miningParameters,
               miningCoordinator,
               metricsSystem,
               supportedCapabilities,
@@ -1019,6 +1022,7 @@ public Runner build() {
               blockchainQueries,
               synchronizer,
               transactionPool,
+              miningParameters,
               miningCoordinator,
               metricsSystem,
               supportedCapabilities,
@@ -1187,6 +1191,7 @@ private Map<String, JsonRpcMethod> jsonRpcMethods(
       final BlockchainQueries blockchainQueries,
       final Synchronizer synchronizer,
       final TransactionPool transactionPool,
+      final MiningParameters miningParameters,
       final MiningCoordinator miningCoordinator,
       final ObservableMetricsSystem metricsSystem,
       final Set<Capability> supportedCapabilities,
@@ -1218,6 +1223,7 @@ private Map<String, JsonRpcMethod> jsonRpcMethods(
                 protocolContext,
                 filterManager,
                 transactionPool,
+                miningParameters,
                 miningCoordinator,
                 metricsSystem,
                 supportedCapabilities,

besu/src/main/java/org/hyperledger/besu/cli/options/MiningOptions.java

@@ -17,6 +17,7 @@
 import static java.util.Arrays.asList;
 import static org.hyperledger.besu.ethereum.core.MiningParameters.MutableInitValues.DEFAULT_EXTRA_DATA;
 import static org.hyperledger.besu.ethereum.core.MiningParameters.MutableInitValues.DEFAULT_MIN_BLOCK_OCCUPANCY_RATIO;
+import static org.hyperledger.besu.ethereum.core.MiningParameters.MutableInitValues.DEFAULT_MIN_PRIORITY_FEE_PER_GAS;
 import static org.hyperledger.besu.ethereum.core.MiningParameters.MutableInitValues.DEFAULT_MIN_TRANSACTION_GAS_PRICE;
 import static org.hyperledger.besu.ethereum.core.MiningParameters.Unstable.DEFAULT_MAX_OMMERS_DEPTH;
 import static org.hyperledger.besu.ethereum.core.MiningParameters.Unstable.DEFAULT_POS_BLOCK_CREATION_MAX_TIME;
@@ -93,10 +94,19 @@ public class MiningOptions implements CLIOptions<MiningParameters> {
       arity = "1")
   private Wei minTransactionGasPrice = DEFAULT_MIN_TRANSACTION_GAS_PRICE;
 
+  @Option(
+      names = {"--min-priority-fee"},
+      description =
+          "Minimum priority fee per gas (in Wei) offered by a transaction for it to be included in a "
+              + "block (default: ${DEFAULT-VALUE})",
+      arity = "1")
+  private Wei minPriorityFeePerGas = DEFAULT_MIN_PRIORITY_FEE_PER_GAS;
+
   @Option(
       names = {"--target-gas-limit"},
       description =
-          "Sets target gas limit per block. If set, each block's gas limit will approach this setting over time if the current gas limit is different.")
+          "Sets target gas limit per block."
+              + " If set, each block's gas limit will approach this setting over time.")
   private Long targetGasLimit = null;
 
   @CommandLine.ArgGroup(validate = false)
@@ -202,6 +212,7 @@ public void validate(
           asList(
               "--miner-coinbase",
               "--min-gas-price",
+              "--min-priority-fee",
               "--min-block-occupancy-ratio",
               "--miner-extra-data"));
 
@@ -238,6 +249,7 @@ static MiningOptions fromConfig(final MiningParameters miningParameters) {
     miningOptions.stratumPort = miningParameters.getStratumPort();
     miningOptions.extraData = miningParameters.getExtraData();
     miningOptions.minTransactionGasPrice = miningParameters.getMinTransactionGasPrice();
+    miningOptions.minPriorityFeePerGas = miningParameters.getMinPriorityFeePerGas();
     miningOptions.minBlockOccupancyRatio = miningParameters.getMinBlockOccupancyRatio();
     miningOptions.unstableOptions.remoteSealersLimit =
         miningParameters.getUnstable().getRemoteSealersLimit();
@@ -266,6 +278,7 @@ public MiningParameters toDomainObject() {
             .isMiningEnabled(isMiningEnabled)
             .extraData(extraData)
             .minTransactionGasPrice(minTransactionGasPrice)
+            .minPriorityFeePerGas(minPriorityFeePerGas)
             .minBlockOccupancyRatio(minBlockOccupancyRatio);
 
     if (targetGasLimit != null) {

besu/src/test/resources/everything_config.toml

@@ -137,6 +137,7 @@ miner-stratum-enabled=false
 miner-coinbase="0x0000000000000000000000000000000000000002"
 miner-extra-data="0x444F4E27542050414E4943202120484F444C2C20484F444C2C20484F444C2021"
 min-gas-price=1
+min-priority-fee=0
 min-block-occupancy-ratio=0.7
 miner-stratum-host="0.0.0.0"
 miner-stratum-port=8008

ethereum/api/src/integration-test/java/org/hyperledger/besu/ethereum/api/jsonrpc/JsonRpcTestMethodsFactory.java

@@ -30,6 +30,7 @@
 import org.hyperledger.besu.ethereum.chain.MutableBlockchain;
 import org.hyperledger.besu.ethereum.core.Block;
 import org.hyperledger.besu.ethereum.core.BlockImporter;
+import org.hyperledger.besu.ethereum.core.MiningParameters;
 import org.hyperledger.besu.ethereum.core.PrivacyParameters;
 import org.hyperledger.besu.ethereum.core.Synchronizer;
 import org.hyperledger.besu.ethereum.eth.manager.EthPeers;
@@ -128,6 +129,7 @@ public Map<String, JsonRpcMethod> methods() {
     final P2PNetwork peerDiscovery = mock(P2PNetwork.class);
     final EthPeers ethPeers = mock(EthPeers.class);
     final TransactionPool transactionPool = mock(TransactionPool.class);
+    final MiningParameters miningParameters = mock(MiningParameters.class);
     final PoWMiningCoordinator miningCoordinator = mock(PoWMiningCoordinator.class);
     final ObservableMetricsSystem metricsSystem = new NoOpMetricsSystem();
     final Optional<AccountLocalConfigPermissioningController> accountWhitelistController =
@@ -169,6 +171,7 @@ public Map<String, JsonRpcMethod> methods() {
             context,
             filterManager,
             transactionPool,
+            miningParameters,
             miningCoordinator,
             metricsSystem,
             new HashSet<>(),

ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/RpcMethod.java

@@ -153,6 +153,8 @@ public enum RpcMethod {
   MINER_SET_ETHERBASE("miner_setEtherbase"),
   MINER_START("miner_start"),
   MINER_STOP("miner_stop"),
+  MINER_GET_MIN_PRIORITY_FEE("miner_getMinPriorityFee"),
+  MINER_SET_MIN_PRIORITY_FEE("miner_setMinPriorityFee"),
   NET_ENODE("net_enode"),
   NET_LISTENING("net_listening"),
   NET_PEER_COUNT("net_peerCount"),

ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/miner/MinerGetMinPriorityFee.java

@@ -0,0 +1,41 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.miner;
+
+import org.hyperledger.besu.ethereum.api.jsonrpc.RpcMethod;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequestContext;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.JsonRpcMethod;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse;
+import org.hyperledger.besu.ethereum.core.MiningParameters;
+
+public class MinerGetMinPriorityFee implements JsonRpcMethod {
+  private final MiningParameters miningParameters;
+
+  public MinerGetMinPriorityFee(final MiningParameters miningParameters) {
+    this.miningParameters = miningParameters;
+  }
+
+  @Override
+  public String getName() {
+    return RpcMethod.MINER_GET_MIN_PRIORITY_FEE.getMethodName();
+  }
+
+  @Override
+  public JsonRpcResponse response(final JsonRpcRequestContext requestContext) {
+    return new JsonRpcSuccessResponse(
+        requestContext.getRequest().getId(), miningParameters.getMinPriorityFeePerGas().getValue());
+  }
+}

ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/miner/MinerSetMinPriorityFee.java

@@ -0,0 +1,53 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.miner;
+
+import org.hyperledger.besu.datatypes.Wei;
+import org.hyperledger.besu.ethereum.api.jsonrpc.RpcMethod;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequestContext;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.JsonRpcMethod;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse;
+import org.hyperledger.besu.ethereum.core.MiningParameters;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class MinerSetMinPriorityFee implements JsonRpcMethod {
+  private static final Logger LOG = LoggerFactory.getLogger(MinerSetMinPriorityFee.class);
+
+  private final MiningParameters miningParameters;
+
+  public MinerSetMinPriorityFee(final MiningParameters miningParameters) {
+    this.miningParameters = miningParameters;
+  }
+
+  @Override
+  public String getName() {
+    return RpcMethod.MINER_SET_MIN_PRIORITY_FEE.getMethodName();
+  }
+
+  @Override
+  public JsonRpcResponse response(final JsonRpcRequestContext requestContext) {
+    try {
+      final Wei minPriorityFeePerGas = Wei.of(requestContext.getRequiredParameter(0, Long.class));
+      miningParameters.setMinPriorityFeePerGas(minPriorityFeePerGas);
+      LOG.debug("min priority fee per gas changed to {}", minPriorityFeePerGas);
+      return new JsonRpcSuccessResponse(requestContext.getRequest().getId(), true);
+    } catch (final IllegalArgumentException invalidJsonRpcParameters) {
+      return new JsonRpcSuccessResponse(requestContext.getRequest().getId(), false);
+    }
+  }
+}

ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/methods/JsonRpcMethodsFactory.java

@@ -23,6 +23,7 @@
 import org.hyperledger.besu.ethereum.api.jsonrpc.websocket.WebSocketConfiguration;
 import org.hyperledger.besu.ethereum.api.query.BlockchainQueries;
 import org.hyperledger.besu.ethereum.blockcreation.MiningCoordinator;
+import org.hyperledger.besu.ethereum.core.MiningParameters;
 import org.hyperledger.besu.ethereum.core.PrivacyParameters;
 import org.hyperledger.besu.ethereum.core.Synchronizer;
 import org.hyperledger.besu.ethereum.eth.manager.EthPeers;
@@ -62,6 +63,7 @@ public Map<String, JsonRpcMethod> methods(
       final ProtocolContext protocolContext,
       final FilterManager filterManager,
       final TransactionPool transactionPool,
+      final MiningParameters miningParameters,
       final MiningCoordinator miningCoordinator,
       final ObservableMetricsSystem metricsSystem,
       final Set<Capability> supportedCapabilities,
@@ -126,7 +128,7 @@ public Map<String, JsonRpcMethod> methods(
                   jsonRpcConfiguration,
                   webSocketConfiguration,
                   metricsConfiguration),
-              new MinerJsonRpcMethods(miningCoordinator),
+              new MinerJsonRpcMethods(miningParameters, miningCoordinator),
               new PermJsonRpcMethods(accountsAllowlistController, nodeAllowlistController),
               new PrivJsonRpcMethods(
                   blockchainQueries,

ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/methods/MinerJsonRpcMethods.java

@@ -17,19 +17,25 @@
 import org.hyperledger.besu.ethereum.api.jsonrpc.RpcApis;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.JsonRpcMethod;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.miner.MinerChangeTargetGasLimit;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.miner.MinerGetMinPriorityFee;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.miner.MinerSetCoinbase;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.miner.MinerSetEtherbase;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.miner.MinerSetMinPriorityFee;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.miner.MinerStart;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.miner.MinerStop;
 import org.hyperledger.besu.ethereum.blockcreation.MiningCoordinator;
+import org.hyperledger.besu.ethereum.core.MiningParameters;
 
 import java.util.Map;
 
 public class MinerJsonRpcMethods extends ApiGroupJsonRpcMethods {
 
   private final MiningCoordinator miningCoordinator;
+  private final MiningParameters miningParameters;
 
-  public MinerJsonRpcMethods(final MiningCoordinator miningCoordinator) {
+  public MinerJsonRpcMethods(
+      final MiningParameters miningParameters, final MiningCoordinator miningCoordinator) {
+    this.miningParameters = miningParameters;
     this.miningCoordinator = miningCoordinator;
   }
 
@@ -46,6 +52,8 @@ protected Map<String, JsonRpcMethod> create() {
         new MinerStop(miningCoordinator),
         minerSetCoinbase,
         new MinerSetEtherbase(minerSetCoinbase),
-        new MinerChangeTargetGasLimit(miningCoordinator));
+        new MinerChangeTargetGasLimit(miningCoordinator),
+        new MinerGetMinPriorityFee(miningParameters),
+        new MinerSetMinPriorityFee(miningParameters));
   }
 }

ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/AbstractJsonRpcHttpServiceTest.java

@@ -33,6 +33,7 @@
 import org.hyperledger.besu.ethereum.api.query.BlockchainQueries;
 import org.hyperledger.besu.ethereum.blockcreation.PoWMiningCoordinator;
 import org.hyperledger.besu.ethereum.core.BlockchainSetupUtil;
+import org.hyperledger.besu.ethereum.core.MiningParameters;
 import org.hyperledger.besu.ethereum.core.PrivacyParameters;
 import org.hyperledger.besu.ethereum.core.Synchronizer;
 import org.hyperledger.besu.ethereum.core.Transaction;
@@ -133,6 +134,7 @@ protected Map<String, JsonRpcMethod> getRpcMethods(
     final Synchronizer synchronizerMock = mock(Synchronizer.class);
     final P2PNetwork peerDiscoveryMock = mock(P2PNetwork.class);
     final TransactionPool transactionPoolMock = mock(TransactionPool.class);
+    final MiningParameters miningParameters = mock(MiningParameters.class);
     final PoWMiningCoordinator miningCoordinatorMock = mock(PoWMiningCoordinator.class);
     when(transactionPoolMock.addTransactionViaApi(any(Transaction.class)))
         .thenReturn(ValidationResult.valid());
@@ -173,6 +175,7 @@ protected Map<String, JsonRpcMethod> getRpcMethods(
             protocolContext,
             filterManager,
             transactionPoolMock,
+            miningParameters,
             miningCoordinatorMock,
             new NoOpMetricsSystem(),
             supportedCapabilities,

ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/JsonRpcHttpServiceHostAllowlistTest.java

@@ -28,6 +28,7 @@
 import org.hyperledger.besu.ethereum.api.jsonrpc.websocket.WebSocketConfiguration;
 import org.hyperledger.besu.ethereum.api.query.BlockchainQueries;
 import org.hyperledger.besu.ethereum.blockcreation.PoWMiningCoordinator;
+import org.hyperledger.besu.ethereum.core.MiningParameters;
 import org.hyperledger.besu.ethereum.core.PrivacyParameters;
 import org.hyperledger.besu.ethereum.core.Synchronizer;
 import org.hyperledger.besu.ethereum.eth.EthProtocol;
@@ -110,6 +111,7 @@ public void initServerAndClient() throws Exception {
                     mock(ProtocolContext.class),
                     mock(FilterManager.class),
                     mock(TransactionPool.class),
+                    mock(MiningParameters.class),
                     mock(PoWMiningCoordinator.class),
                     new NoOpMetricsSystem(),
                     supportedCapabilities,

ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/JsonRpcHttpServiceLoginTest.java

@@ -35,6 +35,7 @@
 import org.hyperledger.besu.ethereum.api.jsonrpc.websocket.WebSocketConfiguration;
 import org.hyperledger.besu.ethereum.api.query.BlockchainQueries;
 import org.hyperledger.besu.ethereum.blockcreation.PoWMiningCoordinator;
+import org.hyperledger.besu.ethereum.core.MiningParameters;
 import org.hyperledger.besu.ethereum.core.PrivacyParameters;
 import org.hyperledger.besu.ethereum.core.Synchronizer;
 import org.hyperledger.besu.ethereum.eth.EthProtocol;
@@ -139,6 +140,7 @@ public static void initServerAndClient() throws Exception {
                     mock(ProtocolContext.class),
                     mock(FilterManager.class),
                     mock(TransactionPool.class),
+                    mock(MiningParameters.class),
                     mock(PoWMiningCoordinator.class),
                     new NoOpMetricsSystem(),
                     supportedCapabilities,

ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/JsonRpcHttpServiceRpcApisTest.java

@@ -35,6 +35,7 @@
 import org.hyperledger.besu.ethereum.chain.MutableBlockchain;
 import org.hyperledger.besu.ethereum.core.Block;
 import org.hyperledger.besu.ethereum.core.InMemoryKeyValueStorageProvider;
+import org.hyperledger.besu.ethereum.core.MiningParameters;
 import org.hyperledger.besu.ethereum.core.PrivacyParameters;
 import org.hyperledger.besu.ethereum.core.ProtocolScheduleFixture;
 import org.hyperledger.besu.ethereum.core.Synchronizer;
@@ -212,6 +213,7 @@ private JsonRpcHttpService createJsonRpcHttpServiceWithRpcApis(final JsonRpcConf
                     mock(ProtocolContext.class),
                     mock(FilterManager.class),
                     mock(TransactionPool.class),
+                    mock(MiningParameters.class),
                     mock(PoWMiningCoordinator.class),
                     new NoOpMetricsSystem(),
                     supportedCapabilities,
@@ -321,6 +323,7 @@ private JsonRpcHttpService createJsonRpcHttpService(
                     mock(ProtocolContext.class),
                     mock(FilterManager.class),
                     mock(TransactionPool.class),
+                    mock(MiningParameters.class),
                     mock(PoWMiningCoordinator.class),
                     new NoOpMetricsSystem(),
                     supportedCapabilities,

ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/JsonRpcHttpServiceTestBase.java

@@ -29,6 +29,7 @@
 import org.hyperledger.besu.ethereum.blockcreation.PoWMiningCoordinator;
 import org.hyperledger.besu.ethereum.chain.Blockchain;
 import org.hyperledger.besu.ethereum.chain.ChainHead;
+import org.hyperledger.besu.ethereum.core.MiningParameters;
 import org.hyperledger.besu.ethereum.core.PrivacyParameters;
 import org.hyperledger.besu.ethereum.core.Synchronizer;
 import org.hyperledger.besu.ethereum.eth.EthProtocol;
@@ -118,6 +119,7 @@ public static void initServerAndClient() throws Exception {
                     mock(ProtocolContext.class),
                     mock(FilterManager.class),
                     mock(TransactionPool.class),
+                    mock(MiningParameters.class),
                     mock(PoWMiningCoordinator.class),
                     new NoOpMetricsSystem(),
                     supportedCapabilities,