Add config option so that pos can be used at genesis

Signed-off-by: Jason Frame <[email protected]>

besu/src/main/java/org/hyperledger/besu/controller/BesuController.java

@@ -330,10 +330,16 @@ BesuControllerBuilder fromGenesisConfig(
         builder = new QbftBesuControllerBuilder();
       } else if (configOptions.isClique()) {
         builder = new CliqueBesuControllerBuilder();
+      } else if (configOptions.isPos()) {
+        builder = new MergeBesuControllerBuilder();
       } else {
         throw new IllegalArgumentException("Unknown consensus mechanism defined");
       }
 
+      if (configOptions.isPos()) {
+        return builder.genesisConfigFile(genesisConfig);
+      }
+
       // wrap with TransitionBesuControllerBuilder if we have a terminal total difficulty:
       if (configOptions.getTerminalTotalDifficulty().isPresent()) {
         // Enable start with vanilla MergeBesuControllerBuilder for PoS checkpoint block

config/src/main/java/org/hyperledger/besu/config/GenesisConfigOptions.java

@@ -71,6 +71,13 @@ public interface GenesisConfigOptions {
    */
   boolean isClique();
 
+  /**
+   * Is pos boolean.
+   *
+   * @return the boolean
+   */
+  boolean isPos();
+
   /**
    * Is consensus migration boolean.
    *
@@ -136,6 +143,13 @@ default boolean isConsensusMigration() {
    */
   EthashConfigOptions getEthashConfigOptions();
 
+  /**
+   * Gets pos config options.
+   *
+   * @return the pos config options
+   */
+  PosConfigOptions getPosConfigOptions();
+
   /**
    * Gets keccak 256 config options.
    *

config/src/main/java/org/hyperledger/besu/config/JsonGenesisConfigOptions.java

@@ -38,6 +38,7 @@
 public class JsonGenesisConfigOptions implements GenesisConfigOptions {
 
   private static final String ETHASH_CONFIG_KEY = "ethash";
+  private static final String POS_CONFIG_KEY = "pos";
   private static final String KECCAK256_CONFIG_KEY = "keccak256";
   private static final String IBFT_LEGACY_CONFIG_KEY = "ibft";
   private static final String IBFT2_CONFIG_KEY = "ibft2";
@@ -144,6 +145,11 @@ public boolean isClique() {
     return configRoot.has(CLIQUE_CONFIG_KEY);
   }
 
+  @Override
+  public boolean isPos() {
+    return configRoot.has(POS_CONFIG_KEY);
+  }
+
   @Override
   public boolean isIbft2() {
     return configRoot.has(IBFT2_CONFIG_KEY);
@@ -204,6 +210,13 @@ public EthashConfigOptions getEthashConfigOptions() {
         .orElse(EthashConfigOptions.DEFAULT);
   }
 
+  @Override
+  public PosConfigOptions getPosConfigOptions() {
+    return JsonUtil.getObjectNode(configRoot, POS_CONFIG_KEY)
+        .map(ignore -> new PosConfigOptions())
+        .orElse(PosConfigOptions.DEFAULT);
+  }
+
   @Override
   public Keccak256ConfigOptions getKeccak256ConfigOptions() {
     return JsonUtil.getObjectNode(configRoot, KECCAK256_CONFIG_KEY)

config/src/main/java/org/hyperledger/besu/config/PosConfigOptions.java

@@ -0,0 +1,38 @@
+/*
+ * 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.config;
+
+import java.util.Map;
+
+import com.google.common.collect.ImmutableMap;
+
+public class PosConfigOptions {
+  /** The constant DEFAULT. */
+  public static final PosConfigOptions DEFAULT = new PosConfigOptions();
+
+  /** Instantiates a new Pos config options. */
+  PosConfigOptions() {}
+
+  /**
+   * As map.
+   *
+   * @return the map
+   */
+  Map<String, Object> asMap() {
+    final ImmutableMap.Builder<String, Object> builder = ImmutableMap.builder();
+    return builder.build();
+  }
+}

config/src/main/java/org/hyperledger/besu/config/StubGenesisConfigOptions.java

@@ -101,6 +101,11 @@ public boolean isClique() {
     return false;
   }
 
+  @Override
+  public boolean isPos() {
+    return false;
+  }
+
   @Override
   public boolean isIbft2() {
     return false;
@@ -146,6 +151,11 @@ public EthashConfigOptions getEthashConfigOptions() {
     return EthashConfigOptions.DEFAULT;
   }
 
+  @Override
+  public PosConfigOptions getPosConfigOptions() {
+    return PosConfigOptions.DEFAULT;
+  }
+
   @Override
   public Keccak256ConfigOptions getKeccak256ConfigOptions() {
     return Keccak256ConfigOptions.DEFAULT;