hyperledger · pullurib · Mar 23, 2025 · Mar 23, 2025 · Mar 24, 2025 · Mar 24, 2025
diff --git a/...l/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/node/ProcessBesuNodeRunner.java b/...l/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/node/ProcessBesuNodeRunner.java
@@ -189,23 +189,6 @@ private List<String> commandlineArgs(final BesuNode node, final Path dataDir) {
     params.addAll(
         DataStorageOptions.fromConfig(node.getDataStorageConfiguration()).getCLIOptions());
 
-    if (node.getMiningParameters().isMiningEnabled()) {
-      params.add("--miner-enabled");
-      params.add("--miner-extra-data");
-      params.add(node.getMiningParameters().getExtraData().toHexString());
-      params.add("--miner-coinbase");
-      params.add(node.getMiningParameters().getCoinbase().get().toString());
-      params.add("--min-gas-price");
-      params.add(
-          Integer.toString(node.getMiningParameters().getMinTransactionGasPrice().intValue()));
-      params.add("--Xminer-remote-sealers-limit");
-      params.add(
-          Integer.toString(node.getMiningParameters().getUnstable().getRemoteSealersLimit()));
-      params.add("--Xminer-remote-sealers-hashrate-ttl");
-      params.add(
-          Long.toString(node.getMiningParameters().getUnstable().getRemoteSealersTimeToLive()));
-    }
-
     if (!node.getBootnodes().isEmpty()) {
       params.add("--bootnodes");
       params.add(node.getBootnodes().stream().map(URI::toString).collect(Collectors.joining(",")));

diff --git a/...in/java/org/hyperledger/besu/tests/acceptance/dsl/node/configuration/BesuNodeFactory.java b/...in/java/org/hyperledger/besu/tests/acceptance/dsl/node/configuration/BesuNodeFactory.java
@@ -17,7 +17,9 @@
 import static java.util.Arrays.asList;
 import static java.util.stream.Collectors.toList;
 import static org.hyperledger.besu.ethereum.api.jsonrpc.RpcApis.ADMIN;
+import static org.hyperledger.besu.ethereum.api.jsonrpc.RpcApis.CLIQUE;
 import static org.hyperledger.besu.ethereum.api.jsonrpc.RpcApis.IBFT;
+import static org.hyperledger.besu.ethereum.api.jsonrpc.RpcApis.PLUGINS;
 import static org.hyperledger.besu.tests.acceptance.dsl.transaction.bft.ConsensusType.QBFT;
 
 import org.hyperledger.besu.crypto.KeyPair;
@@ -91,53 +93,6 @@ public BesuNode create(final BesuNodeConfiguration config) throws IOException {
         config.storageImplementation());
   }
 
-  public BesuNode createMinerNode(
-      final String name, final UnaryOperator<BesuNodeConfigurationBuilder> configModifier)
-      throws IOException {
-    BesuNodeConfigurationBuilder builder =
-        new BesuNodeConfigurationBuilder()
-            .name(name)
-            .miningEnabled()
-            .jsonRpcEnabled()
-            .webSocketEnabled();
-    builder = configModifier.apply(builder);
-    final BesuNodeConfiguration config = builder.build();
-
-    return create(config);
-  }
-
-  public BesuNode createMinerNodeWithExtraCliOptions(
-      final String name,
-      final UnaryOperator<BesuNodeConfigurationBuilder> configModifier,
-      final List<String> extraCliOptions)
-      throws IOException {
-    BesuNodeConfigurationBuilder builder =
-        new BesuNodeConfigurationBuilder()
-            .name(name)
-            .miningEnabled()
-            .jsonRpcEnabled()
-            .jsonRpcTxPool()
-            .webSocketEnabled()
-            .extraCLIOptions(extraCliOptions);
-    builder = configModifier.apply(builder);
-    final BesuNodeConfiguration config = builder.build();
-
-    return create(config);
-  }
-
-  public BesuNode createMinerNode(final String name) throws IOException {
-    return createMinerNode(name, UnaryOperator.identity());
-  }
-
-  public BesuNode createMinerNodeWithExtraCliOptions(
-      final String name, final List<String> extraCliOptions) throws IOException {
-    return createMinerNodeWithExtraCliOptions(name, UnaryOperator.identity(), extraCliOptions);
-  }
-
-  public BesuNode createMinerNodeWithRevertReasonEnabled(final String name) throws IOException {
-    return createMinerNode(name, BesuNodeConfigurationBuilder::revertReasonEnabled);
-  }
-
   public BesuNode createArchiveNode(final String name) throws IOException {
     return createArchiveNode(name, UnaryOperator.identity());
   }
@@ -346,7 +301,7 @@ public BesuNode createCliqueNode(
       final String name, final UnaryOperator<BesuNodeConfigurationBuilder> configModifier)
       throws IOException {
     final List<String> enableRpcApis = new ArrayList<>(Arrays.asList());
-    enableRpcApis.addAll(List.of(IBFT.name(), ADMIN.name()));
+    enableRpcApis.addAll(List.of(IBFT.name(), ADMIN.name(), CLIQUE.name()));
     BesuNodeConfigurationBuilder builder =
         new BesuNodeConfigurationBuilder()
             .name(name)
@@ -394,7 +349,7 @@ public BesuNode createCliquePluginsNode(
       throws IOException {
 
     final List<String> enableRpcApis = new ArrayList<>(Arrays.asList(extraRpcApis));
-    enableRpcApis.addAll(List.of(IBFT.name(), ADMIN.name()));
+    enableRpcApis.addAll(List.of(IBFT.name(), ADMIN.name(), PLUGINS.name(), CLIQUE.name()));
 
     return create(
         new BesuNodeConfigurationBuilder()
@@ -583,7 +538,7 @@ public BesuNode createQbftPluginsNode(
       throws IOException {
 
     final List<String> enableRpcApis = new ArrayList<>(Arrays.asList(extraRpcApis));
-    enableRpcApis.addAll(List.of(QBFT.name(), ADMIN.name()));
+    enableRpcApis.addAll(List.of(QBFT.name(), ADMIN.name(), PLUGINS.name()));
 
     return create(
         new BesuNodeConfigurationBuilder()
@@ -595,7 +550,7 @@ public BesuNode createQbftPluginsNode(
             .extraCLIOptions(extraCLIOptions)
             .devMode(false)
             .jsonRpcTxPool()
-            .genesisConfigProvider(GenesisConfigurationFactory::createQbftGenesisConfig)
+            .genesisConfigProvider(GenesisConfigurationFactory::createQbftLondonGenesisConfig)
             .build());
   }
 
@@ -812,16 +767,6 @@ private BesuNodeConfigurationBuilder createConfigurationBuilderWithStaticNodes(
         .bootnodeEligible(false);
   }
 
-  public BesuNode createNodeWithNonDefaultSignatureAlgorithm(
-      final String name, final String genesisPath, final KeyPair keyPair) throws IOException {
-    BesuNodeConfigurationBuilder builder =
-        createNodeConfigurationWithNonDefaultSignatureAlgorithm(
-            name, genesisPath, keyPair, new ArrayList<>());
-    builder.miningEnabled();
-
-    return create(builder.build());
-  }
-
   public BesuNode createNodeWithNonDefaultSignatureAlgorithm(
       final String name,
       final String genesisPath,
@@ -839,15 +784,23 @@ public BesuNodeConfigurationBuilder createNodeConfigurationWithNonDefaultSignatu
       final String genesisPath,
       final KeyPair keyPair,
       final List<Node> staticNodes) {
+
+    final List<String> enableRpcApis = new ArrayList<>(Arrays.asList());
+    enableRpcApis.addAll(List.of(QBFT.name(), ADMIN.name()));
+
     BesuNodeConfigurationBuilder builder =
         createConfigurationBuilderWithStaticNodes(name, staticNodes);
 
-    final String genesisData = GenesisConfigurationFactory.readGenesisFile(genesisPath);
+    builder =
+        builder
+            .jsonRpcConfiguration(
+                node.createJsonRpcWithRpcApiEnabledConfig(enableRpcApis.toArray(String[]::new)))
+            .webSocketConfiguration(node.createWebSocketEnabledConfig())
+            .devMode(false)
+            .jsonRpcTxPool()
+            .genesisConfigProvider(GenesisConfigurationFactory::createQbft256r1GenesisConfig);
 
-    return builder
-        .devMode(false)
-        .genesisConfigProvider((nodes) -> Optional.of(genesisData))
-        .keyPair(keyPair);
+    return builder.keyPair(keyPair);
   }
 
   public BesuNode runCommand(final String command) throws IOException {

diff --git a/...ger/besu/tests/acceptance/dsl/node/configuration/genesis/GenesisConfigurationFactory.java b/...ger/besu/tests/acceptance/dsl/node/configuration/genesis/GenesisConfigurationFactory.java
@@ -89,6 +89,13 @@ public static Optional<String> createQbftGenesisConfig(
         validators, template, QbftExtraDataCodec::createGenesisExtraDataString);
   }
 
+  public static Optional<String> createQbft256r1GenesisConfig(
+      final Collection<? extends RunnableNode> validators) {
+    final String template = readGenesisFile("/crypto/secp256r1.json");
+    return updateGenesisExtraData(
+        validators, template, QbftExtraDataCodec::createGenesisExtraDataString);
+  }
+
   public static Optional<String> createQbftLondonGenesisConfig(
       final Collection<? extends RunnableNode> validators) {
     final String template = readGenesisFile("/qbft/qbft-london.json");

diff --git a/...r/besu/tests/acceptance/dsl/node/configuration/permissioning/PermissionedNodeBuilder.java b/...r/besu/tests/acceptance/dsl/node/configuration/permissioning/PermissionedNodeBuilder.java
@@ -51,7 +51,6 @@
 public class PermissionedNodeBuilder {
 
   private String name;
-  private GenesisConfigurationProvider genesisConfigProvider;
   private boolean localConfigNodesPermissioningEnabled = false;
   private Path localConfigNodesPermissioningFile = null;
   private Collection<URI> localConfigPermittedNodes = null;
@@ -63,6 +62,7 @@ public class PermissionedNodeBuilder {
   private List<String> staticNodes = new ArrayList<>();
   private boolean isDnsEnabled = false;
   private boolean mining = true;
+  private GenesisConfigurationProvider genesisConfigProvider;
 
   public PermissionedNodeBuilder name(final String name) {
     this.name = name;
@@ -164,10 +164,8 @@ public BesuNode build() {
 
     builder.dnsEnabled(isDnsEnabled);
 
-    if (genesisConfigProvider != null) {
-      builder.genesisConfigProvider(genesisConfigProvider);
-      builder.devMode(false);
-    }
+    builder.genesisConfigProvider(genesisConfigProvider);
+    builder.devMode(false);
 
     try {
       return new BesuNodeFactory().create(builder.build());

diff --git a/...ests/src/test/java/org/hyperledger/besu/tests/acceptance/CreateAccountAcceptanceTest.java b/...ests/src/test/java/org/hyperledger/besu/tests/acceptance/CreateAccountAcceptanceTest.java
diff --git a/.../src/test/java/org/hyperledger/besu/tests/acceptance/bootstrap/ClusterAcceptanceTest.java b/.../src/test/java/org/hyperledger/besu/tests/acceptance/bootstrap/ClusterAcceptanceTest.java
@@ -27,8 +27,8 @@ public class ClusterAcceptanceTest extends AcceptanceTestBase {
 
   @BeforeEach
   public void setUp() throws Exception {
-    minerNode = besu.createMinerNode("node1");
-    fullNode = besu.createArchiveNode("node2");
+    minerNode = besu.createQbftNode("node1");
+    fullNode = besu.createQbftNode("node2");
     cluster.start(minerNode, fullNode);
   }
 

diff --git a/...rg/hyperledger/besu/tests/acceptance/bootstrap/ClusterThreadNodeRunnerAcceptanceTest.java b/...rg/hyperledger/besu/tests/acceptance/bootstrap/ClusterThreadNodeRunnerAcceptanceTest.java
diff --git a/...s/src/test/java/org/hyperledger/besu/tests/acceptance/crypto/SECP256R1AcceptanceTest.java b/...s/src/test/java/org/hyperledger/besu/tests/acceptance/crypto/SECP256R1AcceptanceTest.java
@@ -60,7 +60,7 @@ public void setUp() throws Exception {
 
     minerNode =
         besu.createNodeWithNonDefaultSignatureAlgorithm(
-            "minerNode", GENESIS_FILE, minerNodeKeyPair);
+            "minerNode", GENESIS_FILE, minerNodeKeyPair, List.of());
     noDiscoveryCluster.start(minerNode);
 
     otherNode =