Merge remote-tracking branch 'fab-10/optimize-snap-sync2' into optimi…

…ze-snap-sync3

Signed-off-by: garyschulte <garyschulte@gmail.com>

CHANGELOG.md

@@ -4,9 +4,9 @@
 
 ### Additions and Improvements
 - Bring GraphQL into compliance with execution-api specs [#4112](https://github.com/hyperledger/besu/pull/4112)
-- Improve UX of initial sync logs, pushing not relevant logs to debug level [#4486](https://github.com/hyperledger/besu/pull/4486)
 - Refactor unverified forkchoice event [#4487](https://github.com/hyperledger/besu/pull/4487)
 - Optimize pivot block selector on PoS networks [#4488](https://github.com/hyperledger/besu/pull/4488)
+- Improve UX of initial sync logs, pushing not relevant logs to debug level [#4486](https://github.com/hyperledger/besu/pull/4486)
 
 ### Bug Fixes
 

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

@@ -17,7 +17,6 @@
 import org.hyperledger.besu.config.GenesisConfigFile;
 import org.hyperledger.besu.config.GenesisConfigOptions;
 import org.hyperledger.besu.consensus.merge.MergeContext;
-import org.hyperledger.besu.consensus.merge.PandaPrinter;
 import org.hyperledger.besu.consensus.merge.PostMergeContext;
 import org.hyperledger.besu.consensus.merge.TransitionBackwardSyncContext;
 import org.hyperledger.besu.consensus.merge.TransitionContext;
@@ -31,7 +30,6 @@
 import org.hyperledger.besu.ethereum.ProtocolContext;
 import org.hyperledger.besu.ethereum.blockcreation.MiningCoordinator;
 import org.hyperledger.besu.ethereum.chain.Blockchain;
-import org.hyperledger.besu.ethereum.core.Difficulty;
 import org.hyperledger.besu.ethereum.core.MiningParameters;
 import org.hyperledger.besu.ethereum.core.PrivacyParameters;
 import org.hyperledger.besu.ethereum.core.Synchronizer;
@@ -220,17 +218,6 @@ protected Synchronizer createSynchronizer(
       protocolContext
           .getConsensusContext(MergeContext.class)
           .addNewUnverifiedForkchoiceListener(sync);
-      Optional<Difficulty> currentTotal =
-          protocolContext
-              .getBlockchain()
-              .getTotalDifficultyByHash(protocolContext.getBlockchain().getChainHeadHash());
-      PandaPrinter.init(
-          currentTotal, Difficulty.of(maybeForTTD.getTerminalTotalDifficulty().get()));
-      sync.subscribeInSync(PandaPrinter.getInstance());
-      protocolContext.getBlockchain().observeBlockAdded(PandaPrinter.getInstance());
-      protocolContext
-          .getConsensusContext(MergeContext.class)
-          .addNewUnverifiedForkchoiceListener(PandaPrinter.getInstance());
     }
 
     return sync;
@@ -251,11 +238,6 @@ private void initTransitionWatcher(
                 .getBlockchain()
                 .setBlockChoiceRule((newBlockHeader, currentBlockHeader) -> -1);
 
-            if (priorState.filter(prior -> !prior).isPresent()) {
-              // only print pandas if we had a prior merge state, and it was false
-              PandaPrinter.getInstance().printOnFirstCrossing();
-            }
-
           } else if (composedCoordinator.isMiningBeforeMerge()) {
             // if our merge state is set to mine pre-merge and we are mining, start mining
             composedCoordinator.getPreMergeObject().enable();