fix(taiko-client): update highestUnsafeL2PayloadBlockID if reorging via POST /preconfBlocks (#19490)

Author: cyberhorsey

packages/taiko-client/driver/preconf_blocks/api.go

@@ -166,11 +166,9 @@ func (s *PreconfBlockAPIServer) BuildPreconfBlock(c echo.Context) error {
 
 	header := headers[0]
 
-	// If the block number is greater than the highest unsafe L2 payload block ID,
-	// update the highest unsafe L2 payload block ID.
-	if header.Number.Uint64() > s.highestUnsafeL2PayloadBlockID {
-		s.updateHighestUnsafeL2Payload(header.Number.Uint64())
-	}
+	// always update the highest unsafe L2 payload block ID.
+	// its either higher than the existing one, or we reorged.
+	s.updateHighestUnsafeL2Payload(header.Number.Uint64())
 
 	// Propagate the preconfirmation block to the P2P network, if the current server
 	// connects to the P2P network.

packages/taiko-client/driver/preconf_blocks/server.go

@@ -942,6 +942,7 @@ func (s *PreconfBlockAPIServer) TryImportingPayload(
 	if err != nil && !errors.Is(err, ethereum.NotFound) {
 		return false, fmt.Errorf("failed to fetch header by hash: %w", err)
 	}
+
 	if header != nil {
 		if header.Hash() == msg.ExecutionPayload.BlockHash {
 			log.Info(
@@ -1004,11 +1005,18 @@ func (s *PreconfBlockAPIServer) TryImportingPayload(
 
 // updateHighestUnsafeL2Payload updates the highest unsafe L2 payload block ID.
 func (s *PreconfBlockAPIServer) updateHighestUnsafeL2Payload(blockID uint64) {
-	log.Info(
-		"Updating highest unsafe L2 payload block ID",
-		"blockID", blockID,
-		"currentHighestUnsafeL2PayloadBlockID", s.highestUnsafeL2PayloadBlockID,
-	)
+	if blockID > s.highestUnsafeL2PayloadBlockID {
+		log.Info(
+			"Updating highest unsafe L2 payload block ID",
+			"blockID", blockID,
+			"currentHighestUnsafeL2PayloadBlockID", s.highestUnsafeL2PayloadBlockID,
+		)
+	} else {
+		log.Info("Reorging highest unsafe L2 payload blockID",
+			"blockID", blockID,
+			"currentHighestUnsafeL2PayloadBlockID", s.highestUnsafeL2PayloadBlockID,
+		)
+	}
 	s.highestUnsafeL2PayloadBlockID = blockID
 }