Revert "Persist newpayload without fcu glamsterdam devnet 6 - fix (#10732)"

This reverts commit 10d587c.

Signed-off-by: Karim Taam <karim.t2am@gmail.com>

Author: matkt

consensus/merge/src/main/java/org/hyperledger/besu/consensus/merge/blockcreation/MergeCoordinator.java

@@ -747,27 +747,6 @@ public ForkchoiceResult updateForkChoiceWithoutLegacySkip(
     return applyForkChoice(newHead, finalizedBlockHash, safeBlockHash);
   }
 
-  @Override
-  public ForkchoiceResult updateHeadForExecution(final BlockHeader newHead) {
-    final MutableBlockchain blockchain = protocolContext.getBlockchain();
-    final Optional<Hash> latestValid = getLatestValidAncestor(newHead);
-
-    Optional<BlockHeader> parentOfNewHead = blockchain.getBlockHeader(newHead.getParentHash());
-    if (parentOfNewHead.isPresent()
-        && Long.compareUnsigned(newHead.getTimestamp(), parentOfNewHead.get().getTimestamp())
-            <= 0) {
-      return ForkchoiceResult.withFailure(
-          INVALID, "new head timestamp not greater than parent", latestValid);
-    }
-
-    if (!setNewHead(blockchain, newHead)) {
-      LOG.warn("Failed to move world state to new head {}", newHead.toLogString());
-      return ForkchoiceResult.withFailure(INVALID, "Failed to set new head", latestValid);
-    }
-
-    return ForkchoiceResult.withResult(Optional.empty(), Optional.of(newHead));
-  }
-
   private ForkchoiceResult applyForkChoice(
       final BlockHeader newHead, final Hash finalizedBlockHash, final Hash safeBlockHash) {
     final MutableBlockchain blockchain = protocolContext.getBlockchain();

consensus/merge/src/main/java/org/hyperledger/besu/consensus/merge/blockcreation/MergeMiningCoordinator.java

@@ -118,18 +118,6 @@ ForkchoiceResult updateForkChoice(
   ForkchoiceResult updateForkChoiceWithoutLegacySkip(
       final BlockHeader newHead, final Hash finalizedBlockHash, final Hash safeBlockHash);
 
-  /**
-   * Move the canonical chain head without updating forkchoice metadata (finalized or safe).
-   *
-   * <p>Use this for pre-execution head advancement during {@code engine_newPayload}, when the
-   * parent block was previously received via {@code newPayload} but the chain head was not moved
-   * forward yet.
-   *
-   * @param newHead the new head
-   * @return the update head result
-   */
-  ForkchoiceResult updateHeadForExecution(final BlockHeader newHead);
-
   /**
    * Returns true if the given block hash is a strict ancestor of the currently finalized block
    * (i.e. an older block on the same chain, not finalized itself). Returns false when no finalized

consensus/merge/src/main/java/org/hyperledger/besu/consensus/merge/blockcreation/TransitionCoordinator.java

@@ -195,11 +195,6 @@ public ForkchoiceResult updateForkChoiceWithoutLegacySkip(
         newHead, finalizedBlockHash, safeBlockHash);
   }
 
-  @Override
-  public ForkchoiceResult updateHeadForExecution(final BlockHeader newHead) {
-    return mergeCoordinator.updateHeadForExecution(newHead);
-  }
-
   @Override
   public boolean isAncestorOfFinalized(final Hash candidateHeadHash) {
     return mergeCoordinator.isAncestorOfFinalized(candidateHeadHash);

consensus/merge/src/test/java/org/hyperledger/besu/consensus/merge/blockcreation/MergeCoordinatorTest.java

@@ -24,7 +24,6 @@
 import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.atLeast;
 import static org.mockito.Mockito.atLeastOnce;
-import static org.mockito.Mockito.clearInvocations;
 import static org.mockito.Mockito.doAnswer;
 import static org.mockito.Mockito.doCallRealMethod;
 import static org.mockito.Mockito.doNothing;
@@ -1112,55 +1111,6 @@ public void forkchoiceUpdateShouldIgnoreAncestorOfChainHead() {
     verify(blockchain, never()).rewindToBlock(any());
   }
 
-  @Test
-  public void updateHeadForExecutionShouldMoveHeadWithoutUpdatingFinalizedOrSafe() {
-    BlockHeader terminalHeader = terminalPowBlock();
-    sendNewPayloadAndForkchoiceUpdate(
-        new Block(terminalHeader, BlockBody.empty()), Optional.empty(), Hash.ZERO);
-
-    BlockHeader parentHeader = nextBlockHeader(terminalHeader);
-    Block parent = new Block(parentHeader, BlockBody.empty());
-    coordinator.rememberBlock(parent);
-
-    BlockHeader childHeader = nextBlockHeader(parentHeader);
-    Block child = new Block(childHeader, BlockBody.empty());
-    sendNewPayloadAndForkchoiceUpdate(child, Optional.empty(), parent.getHash());
-
-    clearInvocations(blockchain, mergeContext);
-
-    ForkchoiceResult result = coordinator.updateHeadForExecution(parentHeader);
-
-    assertThat(result.shouldNotProceedToPayloadBuildProcess()).isFalse();
-    assertThat(result.getNewHead()).contains(parentHeader);
-    assertThat(blockchain.getChainHeadHash()).isEqualTo(parentHeader.getHash());
-
-    verify(blockchain, never()).setFinalized(any());
-    verify(mergeContext, never()).setFinalized(any());
-    verify(blockchain, never()).setSafeBlock(any());
-    verify(mergeContext, never()).setSafeBlock(any());
-  }
-
-  @Test
-  public void updateHeadForExecutionShouldNotIgnoreAncestorOfChainHead() {
-    BlockHeader terminalHeader = terminalPowBlock();
-    sendNewPayloadAndForkchoiceUpdate(
-        new Block(terminalHeader, BlockBody.empty()), Optional.empty(), Hash.ZERO);
-
-    BlockHeader parentHeader = nextBlockHeader(terminalHeader);
-    Block parent = new Block(parentHeader, BlockBody.empty());
-    sendNewPayloadAndForkchoiceUpdate(parent, Optional.empty(), terminalHeader.getHash());
-
-    BlockHeader childHeader = nextBlockHeader(parentHeader);
-    Block child = new Block(childHeader, BlockBody.empty());
-    sendNewPayloadAndForkchoiceUpdate(child, Optional.empty(), parent.getHash());
-
-    ForkchoiceResult result = coordinator.updateHeadForExecution(parentHeader);
-
-    assertThat(result.getStatus()).isEqualTo(ForkchoiceResult.Status.VALID);
-    assertThat(result.getNewHead()).contains(parentHeader);
-    assertThat(blockchain.getChainHeadHash()).isEqualTo(parentHeader.getHash());
-  }
-
   @ParameterizedTest(name = "{index}: {0}")
   @MethodSource("getGasLimits")
   public void shouldSetCorrectTargetGasLimit(final ArgumentsAccessor argumentsAccessor) {

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

@@ -72,7 +72,6 @@
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
-import java.util.Objects;
 import java.util.Optional;
 import java.util.stream.Collectors;
 
@@ -377,14 +376,15 @@ public JsonRpcResponse syncResponse(final JsonRpcRequestContext requestContext)
     }
 
     final MutableBlockchain blockchain = protocolContext.getBlockchain();
-    final Hash chainHeadHash = blockchain.getChainHeadHash();
-    maybeParentHeader
-        .filter(
-            parentHeader ->
-                chainHeadHash != null
-                    && !Objects.equals(newBlockHeader.getParentHash(), chainHeadHash)
-                    && Objects.equals(parentHeader.getParentHash(), chainHeadHash))
-        .ifPresent(mergeCoordinator::updateHeadForExecution);
+    if (!newBlockHeader.getParentHash().equals(blockchain.getChainHeadHash())) {
+      maybeParentHeader.ifPresent(
+          parentHeader -> {
+            mergeCoordinator.updateForkChoice(
+                parentHeader,
+                blockchain.getFinalized().orElse(Hash.ZERO),
+                blockchain.getSafeBlock().orElse(Hash.ZERO));
+          });
+    }
 
     // execute block and return result response
     final long startTimeNs = System.nanoTime();