log execution errors at right level, stops transition message propaga…

…tion post-merge sync. (hyperledger#4104)

Signed-off-by: Justin Florentine <justin+github@florentine.us>

Co-authored-by: garyschulte <garyschulte@gmail.com>
Signed-off-by: Cody Born <codyborn@outlook.com>

consensus/merge/src/main/java/org/hyperledger/besu/consensus/merge/PostMergeContext.java

@@ -84,7 +84,7 @@ public PostMergeContext setTerminalTotalDifficulty(final Difficulty newTerminalT
 
   @Override
   public void setIsPostMerge(final Difficulty totalDifficulty) {
-    if (isPostMerge.get().orElse(Boolean.FALSE) && lastFinalized.get() != null) {
+    if (isPostMerge.get().orElse(Boolean.FALSE)) {
       // if we have finalized, we never switch back to a pre-merge once we have transitioned
       // post-TTD.
       return;

ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/ExecutionEngineJsonRpcMethod.java

@@ -66,7 +66,7 @@ public final JsonRpcResponse response(final JsonRpcRequestContext request) {
             cf.complete(
                 resp.otherwise(
                         t -> {
-                          LOG.debug(
+                          LOG.error(
                               String.format("failed to exec consensus method %s", this.getName()),
                               t);
                           return new JsonRpcErrorResponse(

ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/BlockPropagationManager.java

@@ -511,7 +511,8 @@ private String toLogString(final Collection<NewBlockHash> newBlockHashs) {
   }
 
   private void reactToTTDReachedEvent(final boolean ttdReached) {
-    if (ttdReached) {
+    if (started.get() && ttdReached) {
+      LOG.info("Block propagation was running, then ttd reached, stopping");
       stop();
     } else if (!started.get()) {
       start();