Merge with main

Signed-off-by: Matthew Whitehead <[email protected]>

CHANGELOG.md

@@ -21,6 +21,7 @@
 - Promote experimental --Xbonsai-trie-logs-pruning-window-size to production-ready, --bonsai-trie-logs-pruning-window-size [#7192](https://github.com/hyperledger/besu/pull/7192)
 - `admin_nodeInfo` JSON/RPC call returns the currently active EVM version [#7127](https://github.com/hyperledger/besu/pull/7127)
 - Improve the selection of the most profitable built block [#7174](https://github.com/hyperledger/besu/pull/7174)
+- `--Xsnapsync-bft-enabled` option enables experimental support for snap sync with IBFT/QBFT permissioned chains [#7140](https://github.com/hyperledger/besu/pull/7140)
 
 ### Bug fixes
 - Make `eth_gasPrice` aware of the base fee market [#7102](https://github.com/hyperledger/besu/pull/7102)

besu/src/main/java/org/hyperledger/besu/cli/BesuCommand.java

@@ -1540,11 +1540,11 @@ private void validateOptions() {
   }
 
   private void validateConsensusSyncCompatibilityOptions() {
-    // snap and checkpoint can't be used with BFT but can for clique
+    // snap and checkpoint are experimental for BFT
     if ((genesisConfigOptionsSupplier.get().isIbftLegacy()
             || genesisConfigOptionsSupplier.get().isIbft2()
             || genesisConfigOptionsSupplier.get().isQbft())
-        && genesisConfigOptionsSupplier.get().isEthHash()) {
+        && !unstableSynchronizerOptions.isSnapSyncBftEnabled()) {
       final String errorSuffix = "can't be used with BFT networks";
       if (SyncMode.CHECKPOINT.equals(syncMode) || SyncMode.X_CHECKPOINT.equals(syncMode)) {
         throw new ParameterException(

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

@@ -837,7 +837,9 @@ private PivotBlockSelector createPivotSelector(
       final MetricsSystem metricsSystem) {
 
     if (genesisConfigOptions.isQbft() || genesisConfigOptions.isIbft2()) {
-      LOG.info("QBFT is configured, creating initial sync for BFT");
+      LOG.info(
+          "{} is configured, creating initial sync for BFT",
+          genesisConfigOptions.getConsensusEngine().toUpperCase());
       return new BFTPivotSelectorFromPeers(
           ethContext, syncConfig, syncState, metricsSystem, protocolContext, nodeKey);
     } else if (genesisConfigOptions.getTerminalTotalDifficulty().isPresent()) {

consensus/qbft/src/main/java/org/hyperledger/besu/consensus/qbft/BFTPivotSelectorFromPeers.java

@@ -67,6 +67,9 @@ public Optional<FastSyncState> selectNewPivotBlock() {
       // pivot distance
       if (bestPeer.get().chainState().getEstimatedHeight()
           <= syncConfig.getFastSyncPivotDistance()) {
+        LOG.info(
+            "Best peer for sync found but chain height hasn't reached minimum sync pivot distance {}, exiting sync process",
+            syncConfig.getFastSyncPivotDistance());
         throw new NoSyncRequiredException();
       }
 
@@ -78,6 +81,7 @@ public Optional<FastSyncState> selectNewPivotBlock() {
           && validatorProvider
               .getValidatorsAtHead()
               .contains(Util.publicKeyToAddress(nodeKey.getPublicKey()))) {
+        LOG.info("This node is the only BFT validator, exiting sync process");
         throw new NoSyncRequiredException();
       }
 
@@ -105,6 +109,9 @@ public Optional<FastSyncState> selectNewPivotBlock() {
         // assume this is a new chain
         // and skip waiting for any more peers to sync with. The worst case is this puts us into
         // full sync mode.
+        LOG.info(
+            "Peered with {} validators but no best peer found to sync from. Assuming new BFT chain, exiting sync process",
+            peerValidatorCount.get());
         throw new NoSyncRequiredException();
       }
     }