Add QBFT support for evmtool

ethereum/evmtool/build.gradle

@@ -38,6 +38,7 @@ dependencies {
   implementation project(':consensus:clique')
   implementation project(':consensus:common')
   implementation project(':consensus:ibft')
+  implementation project(':consensus:qbft')
   implementation project(':ethereum:api')
   implementation project(':ethereum:core')
   implementation project(':ethereum:referencetests')

ethereum/evmtool/src/main/java/org/hyperledger/besu/evmtool/GenesisFileModule.java

@@ -106,6 +106,8 @@ private static GenesisFileModule createGenesisModule(final String genesisConfig)
       return new IBFTGenesisFileModule(genesisConfig);
     } else if (config.containsKey("clique")) {
       return new CliqueGenesisFileModule(genesisConfig);
+    } else if (config.containsKey("qbft")) {
+      return new QBFTGenesisFileModule(genesisConfig);
     } else {
       // default is mainnet
       return new MainnetGenesisFileModule(genesisConfig);

ethereum/evmtool/src/main/java/org/hyperledger/besu/evmtool/QBFTGenesisFileModule.java

@@ -0,0 +1,52 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * 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.evmtool;
+
+import org.hyperledger.besu.config.GenesisConfigOptions;
+import org.hyperledger.besu.consensus.common.bft.BftBlockHeaderFunctions;
+import org.hyperledger.besu.consensus.qbft.QbftExtraDataCodec;
+import org.hyperledger.besu.consensus.qbft.QbftProtocolSchedule;
+import org.hyperledger.besu.ethereum.core.BlockHeaderFunctions;
+import org.hyperledger.besu.ethereum.core.PrivacyParameters;
+import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule;
+import org.hyperledger.besu.evm.internal.EvmConfiguration;
+
+import javax.inject.Named;
+
+class QBFTGenesisFileModule extends GenesisFileModule {
+  final QbftExtraDataCodec bftExtraDataEncoder = new QbftExtraDataCodec();
+
+  QBFTGenesisFileModule(final String genesisConfig) {
+    super(genesisConfig);
+  }
+
+  @Override
+  ProtocolSchedule provideProtocolSchedule(
+      final GenesisConfigOptions configOptions,
+      @Named("RevertReasonEnabled") final boolean revertReasonEnabled) {
+    return QbftProtocolSchedule.create(
+        configOptions,
+        PrivacyParameters.DEFAULT,
+        revertReasonEnabled,
+        bftExtraDataEncoder,
+        EvmConfiguration.DEFAULT);
+  }
+
+  @Override
+  BlockHeaderFunctions blockHashFunction() {
+    return BftBlockHeaderFunctions.forOnchainBlock(bftExtraDataEncoder);
+  }
+}