Quorum/IBFT to Besu/QBFT migration

acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/WaitUtils.java

@@ -21,7 +21,7 @@
 
 public class WaitUtils {
   public static void waitFor(final ThrowingRunnable condition) {
-    waitFor(30, condition);
+    waitFor(40, condition);
   }
 
   public static void waitFor(final int timeout, final ThrowingRunnable condition) {

acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/QuorumIBFTMigrationTest.java

@@ -0,0 +1,127 @@
+/*
+ * Copyright contributors to Hyperledger Besu.
+ *
+ * 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.tests.acceptance;
+
+import static org.apache.logging.log4j.util.LoaderUtil.getClassLoader;
+
+import org.hyperledger.besu.tests.acceptance.bft.BftAcceptanceTestParameterization;
+import org.hyperledger.besu.tests.acceptance.bft.ParameterizedBftTestBase;
+import org.hyperledger.besu.tests.acceptance.dsl.node.BesuNode;
+
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.StandardCopyOption;
+
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class QuorumIBFTMigrationTest extends ParameterizedBftTestBase {
+
+  private static final Logger LOG = LoggerFactory.getLogger(QuorumIBFTMigrationTest.class);
+
+  public static void copyKeyFilesToNodeDataDirs(final BesuNode... nodes) throws IOException {
+    for (BesuNode node : nodes) {
+      copyKeyFile(node, "key");
+      copyKeyFile(node, "key.pub");
+    }
+  }
+
+  private static void copyKeyFile(final BesuNode node, final String keyFileName)
+      throws IOException {
+    String resourceFileName = node.getName() + keyFileName;
+    try (InputStream keyFileStream = getClassLoader().getResourceAsStream(resourceFileName)) {
+      if (keyFileStream == null) {
+        throw new IOException("Resource not found: " + resourceFileName);
+      }
+      Path targetPath = node.homeDirectory().resolve(keyFileName);
+      Files.createDirectories(targetPath.getParent());
+      Files.copy(keyFileStream, targetPath, StandardCopyOption.REPLACE_EXISTING);
+    }
+  }
+
+  public static void runBesuCommand(final Path dataPath) throws IOException, InterruptedException {
+    ProcessBuilder processBuilder =
+        new ProcessBuilder(
+            "../../build/install/besu/bin/besu",
+            "--genesis-file",
+            "src/test/resources/qbft/qbft.json",
+            "--data-path",
+            dataPath.toString(),
+            "--data-storage-format",
+            "FOREST",
+            "blocks",
+            "import",
+            "src/test/resources/ibft.blocks");
+
+    processBuilder.directory(new File(System.getProperty("user.dir")));
+    processBuilder.inheritIO(); // This will redirect the output to the console
+
+    Process process = processBuilder.start();
+    int exitCode = process.waitFor();
+    if (exitCode == 0) {
+      System.out.println("Import command executed successfully.");
+    } else {
+      throw new RuntimeException("Import command execution failed with exit code: " + exitCode);
+    }
+  }
+
+  @ParameterizedTest(name = "{index}: {0}")
+  @MethodSource("factoryFunctions")
+  public void shouldImportIBFTBlocksAndTransitionToQBFT(
+      final String testName, final BftAcceptanceTestParameterization nodeFactory) throws Exception {
+
+    if ("ibft2".equals(testName)) {
+      LOG.info("Skipping test: " + testName);
+      return;
+    }
+
+    setUp(testName, nodeFactory);
+
+    // Create a mix of Bonsai and Forest DB nodes
+    final BesuNode minerNode1 = nodeFactory.createForestNodeFixedPort(besu, "miner1");
+    final BesuNode minerNode2 = nodeFactory.createForestNodeFixedPort(besu, "miner2");
+    final BesuNode minerNode3 = nodeFactory.createForestNodeFixedPort(besu, "miner3");
+    final BesuNode minerNode4 = nodeFactory.createForestNodeFixedPort(besu, "miner4");
+    final BesuNode minerNode5 = nodeFactory.createForestNodeFixedPort(besu, "miner5");
+
+    // Copy key files to the node datadirs
+    // Use the key files saved in resources directory
+    copyKeyFilesToNodeDataDirs(minerNode1, minerNode2, minerNode3, minerNode4, minerNode5);
+
+    // start one node and import blocks from import file
+    // Use import file, genesis saved in resources directory
+
+    runBesuCommand(minerNode1.homeDirectory());
+
+    // After the import is done, start the rest of the nodes using the same genesis and respective
+    // node keys
+
+    cluster.start(minerNode1, minerNode2, minerNode3, minerNode4, minerNode5);
+
+    // Check that the chain is progressing as expected
+    cluster.verify(blockchain.reachesHeight(minerNode2, 1, 120));
+  }
+
+  @Override
+  public void tearDownAcceptanceTestBase() {
+    cluster.stop();
+    super.tearDownAcceptanceTestBase();
+  }
+}

acceptance-tests/tests/src/test/resources/miner1key

@@ -0,0 +1 @@
+0a46b91fe0c770a4355d1fec9ccd72d39264f46a74ed67a69a12ed4c265aa768

acceptance-tests/tests/src/test/resources/miner1key.pub

@@ -0,0 +1 @@
+8093fb3200c783555ed487b8b5210ef3369b062a1f3ce5762d83d7a62205693d1e4f253e840ca48ec98d8f20c5b41bbbd43f34f87a1f68324ab51afe73732b96

acceptance-tests/tests/src/test/resources/miner2key

@@ -0,0 +1 @@
+17c2aacfdf1f6defde20e6ae7132c6d3991e758af3799a307a75b38135678a48

acceptance-tests/tests/src/test/resources/miner2key.pub

@@ -0,0 +1 @@
+d81f65976ccc44c5e7e6ca859c5ede06b0f484f72c52d35dd8f7bd7581a8b7020d9ef45878696b4593daf5575b48dda5259f78f192a3445d5cc97c032660642f

acceptance-tests/tests/src/test/resources/miner3key

@@ -0,0 +1 @@
+917fb1b03034e5d7156b89bc2a3bc2aae1d146d2640d75e095f07110b0871bc1

acceptance-tests/tests/src/test/resources/miner3key.pub

@@ -0,0 +1 @@
+67785a2ac328648d94245abb25bdcfab853d06e68c70026d90f2fd5c8338b65c19235398eac205e4bbdb3fc1de9669ad6309e43ab203c8e7430664cea6451f56

acceptance-tests/tests/src/test/resources/miner4key

@@ -0,0 +1 @@
+3b3cbae8c034c4ba2d5f4df44faa013888216a6eabb7fffa0b224003ea770ba7

acceptance-tests/tests/src/test/resources/miner4key.pub

@@ -0,0 +1 @@
+ec403552908986b5d9e4def3be9ddcb26d5b03def3b44ef2d5d728bb9a3028603405e7379c3e185cb2bc3e784548fcdd0e7616162029c3f407155b2fb25ba0ca

acceptance-tests/tests/src/test/resources/miner5key

@@ -0,0 +1 @@
+4ddfb30d4fcd6f5a9f959961f734e4c1469af223bc16b217eef0d3796e64973d

acceptance-tests/tests/src/test/resources/miner5key.pub

@@ -0,0 +1 @@
+28c02b375d62b0adef8213b76882dfec264d5dcbb0a8ba73f167bc718a6d02f1833af80ab9f51a5f007e5f3b8320e8fc5ab287d4bd59ad497f8949bf4abb9e80

acceptance-tests/tests/src/test/resources/qbft/qbft.json

@@ -1,39 +1,65 @@
 {
-  "config": {
-    "chainId": 4,
-    "berlinBlock": 0,
-    "qbft": {
-      "blockperiodseconds": 1,
-      "epochlength": 30000,
-      "requesttimeoutseconds": 5,
-      "blockreward": "5000000000000000000"
-    }
-  },
   "nonce": "0x0",
   "timestamp": "0x58ee40ba",
-  "extraData": "%extraData%",
-  "gasLimit": "0x47b760",
+  "extraData": "0x0000000000000000000000000000000000000000000000000000000000000000f86df86994a18182ee8ca476f2f0fb8170a1d4620edb39c5e194065541903bf3bb8c088a18046b441f5d286288c994d1e106d68cac92668b100f6f43791ddcb2c7588094d156777a1e1539fe654fc82266f41fd5d4aa548494efbbd8900222d7b2f75d081c3e7446a1f4fe10ce80c0",
+  "gasLimit": "700000000",
+  "gasUsed": "0x0",
+  "number": "0x0",
   "difficulty": "0x1",
-  "mixHash": "0x63746963616c2062797a616e74696e65206661756c7420746f6c6572616e6365",
   "coinbase": "0x0000000000000000000000000000000000000000",
+  "mixHash": "0x63746963616c2062797a616e74696e65206661756c7420746f6c6572616e6365",
+  "parentHash": "0x0000000000000000000000000000000000000000000000000000000000000000",
+  "config": {
+    "chainId": 1337,
+    "homesteadBlock": 10,
+    "eip150Block": 20,
+    "eip150Hash": "0x0000000000000000000000000000000000000000000000000000000000000000",
+    "eip155Block": 25,
+    "eip158Block": 30,
+    "byzantiumBlock": 50,
+    "constantinopleBlock": 60,
+    "petersburgBlock": 70,
+    "istanbulBlock": 80,
+    "ibft": {
+      "epochlength": 100,
+      "blockperiodseconds": 5,
+      "requesttimeoutseconds": 10,
+      "policy": 0,
+      "ceil2Nby3Block": 0,
+      "validatorcontractaddress": "0x0000000000000000000000000000000000000000"
+    },
+    "qbft": {
+      "epochLength": 30000,
+      "blockPeriodSeconds" : 1,
+      "requestTimeoutSeconds": 10,
+      "startBlock": 101
+    },
+    "txnSizeLimit": 64,
+    "maxCodeSize": 0,
+    "maxCodeSizeConfig": [
+      {
+        "block": 0,
+        "size": 64
+      }
+    ],
+    "isMPS": false
+
+  },
   "alloc": {
-    "fe3b557e8fb62b89f4916b721be55ceb828dbd73": {
-      "privateKey": "8f2a55949038a9610f50fb23b5883af3b4ecb3c3bb792cbcefbd1542c692be63",
-      "comment": "private key and this comment are ignored.  In a real chain, the private key should NOT be stored",
-      "balance": "0xad78ebc5ac6200000"
+    "0xde8e2ae09f2ee2c6c282c054b2384f8b5f9debee": {
+      "balance": "1000000000000000000000000000"
+    },
+    "0x23bcbca17fc4978909ab44ac82559c7d379aa006": {
+      "balance": "1000000000000000000000000000"
     },
-    "627306090abaB3A6e1400e9345bC60c78a8BEf57": {
-      "privateKey": "c87509a1c067bbde78beb793e6fa76530b6382a4c0241e5e4a9ec0a0f44dc0d3",
-      "comment": "private key and this comment are ignored.  In a real chain, the private key should NOT be stored",
-      "balance": "90000000000000000000000"
+    "0x870276532cca9f33e66273cfa494cf41e04b5a66": {
+      "balance": "1000000000000000000000000000"
     },
-    "f17f52151EbEF6C7334FAD080c5704D77216b732": {
-      "privateKey": "ae6ae8e5ccbfb04590405997ee2d52d2b330726137b875053c36d94e974d162f",
-      "comment": "private key and this comment are ignored.  In a real chain, the private key should NOT be stored",
-      "balance": "90000000000000000000000"
+    "0x7d7fc9fdfa49e2db22fc6ebab593dcf3aeffbde8": {
+      "balance": "1000000000000000000000000000"
+    },
+    "0x4df76ad0678513846699056e0070c5f587580eb5": {
+      "balance": "1000000000000000000000000000"
     }
-  },
-  "number": "0x0",
-  "gasUsed": "0x0",
-  "parentHash": "0x0000000000000000000000000000000000000000000000000000000000000000"
+  }
 }

besu/build.gradle

@@ -23,7 +23,7 @@ jar {
       'Specification-Version': project.version,
       'Implementation-Title': archiveBaseName,
       'Implementation-Version': calculateVersion(),
-      'Commit-Hash': getGitCommitDetails(40).hash
+      'Commit-Hash': 'UNKNOWN'
       )
   }
 }
@@ -37,6 +37,7 @@ dependencies {
   implementation project(':consensus:clique')
   implementation project(':consensus:common')
   implementation project(':consensus:ibft')
+  implementation project(':consensus:ibftlegacy')
   implementation project(':consensus:merge')
   implementation project(':consensus:qbft')
   implementation project(':consensus:qbft-core')

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

@@ -176,6 +176,7 @@ public void startEthereumMainLoop() {
       if (networkRunner.getNetwork().isP2pEnabled()) {
         besuController.getSynchronizer().start();
       }
+      besuController.getMiningCoordinator().subscribe();
       besuController.getMiningCoordinator().start();
       transactionPoolEvictionService.start();
 

besu/src/main/java/org/hyperledger/besu/chainimport/RlpBlockImporter.java

@@ -267,14 +267,19 @@ private void logProgress(final long blockNum) {
 
   private BlockHeader lookupPreviousHeader(
       final MutableBlockchain blockchain, final BlockHeader header) {
-    return blockchain
-        .getBlockHeader(header.getParentHash())
-        .orElseThrow(
-            () ->
-                new IllegalStateException(
-                    String.format(
-                        "Block %s does not connect to the existing chain. Current chain head %s",
-                        header.getNumber(), blockchain.getChainHeadBlockNumber())));
+    try {
+      return blockchain
+          .getBlockHeader(header.getParentHash())
+          .orElseThrow(
+              () ->
+                  new IllegalStateException(
+                      String.format(
+                          "Block %s does not connect to the existing chain. Current chain head %s",
+                          header.getNumber(), blockchain.getChainHeadBlockNumber())));
+    } catch (IllegalStateException e) {
+      e.printStackTrace();
+      throw e;
+    }
   }
 
   @Override

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

@@ -394,8 +394,7 @@ private BesuControllerBuilder createConsensusScheduleBesuControllerBuilder(
       if (configOptions.isIbft2()) {
         originalControllerBuilder = new IbftBesuControllerBuilder();
       } else if (configOptions.isIbftLegacy()) {
-        throw new IllegalStateException(
-            "IBFT1 (legacy) is no longer supported. Consider using IBFT2 or QBFT.");
+        originalControllerBuilder = new IbftLegacyBesuControllerBuilder();
       } else {
         throw new IllegalStateException(
             "Invalid genesis migration config. Migration is supported from IBFT (legacy) or IBFT2 to QBFT)");

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

@@ -199,7 +199,7 @@ protected ConsensusContext createConsensusContext(
   protected PluginServiceFactory createAdditionalPluginServices(
       final Blockchain blockchain, final ProtocolContext protocolContext) {
     return besuControllerBuilderSchedule
-        .get(0L)
+        .get(besuControllerBuilderSchedule.keySet().stream().skip(1).findFirst().orElseThrow())
         .createAdditionalPluginServices(blockchain, protocolContext);
   }
 
@@ -209,7 +209,7 @@ protected JsonRpcMethods createAdditionalJsonRpcMethodFactory(
       final ProtocolSchedule protocolSchedule,
       final MiningConfiguration miningConfiguration) {
     return besuControllerBuilderSchedule
-        .get(0L)
+        .get(besuControllerBuilderSchedule.keySet().stream().skip(1).findFirst().orElseThrow())
         .createAdditionalJsonRpcMethodFactory(
             protocolContext, protocolSchedule, miningConfiguration);
   }
@@ -219,7 +219,7 @@ protected SubProtocolConfiguration createSubProtocolConfiguration(
       final EthProtocolManager ethProtocolManager,
       final Optional<SnapProtocolManager> maybeSnapProtocolManager) {
     return besuControllerBuilderSchedule
-        .get(0L)
+        .get(besuControllerBuilderSchedule.keySet().stream().skip(1).findFirst().orElseThrow())
         .createSubProtocolConfiguration(ethProtocolManager, maybeSnapProtocolManager);
   }
 
@@ -242,7 +242,7 @@ protected EthProtocolManager createEthProtocolManager(
       final Optional<MergePeerFilter> mergePeerFilter,
       final ForkIdManager forkIdManager) {
     return besuControllerBuilderSchedule
-        .get(0L)
+        .get(besuControllerBuilderSchedule.keySet().stream().skip(1).findFirst().orElseThrow())
         .createEthProtocolManager(
             protocolContext,
             synchronizerConfiguration,