fixed timeout on CL (ledgerwatch#4836)

* fixed timeout * send response immediately wen dealing with SYNCING * send response immediately wen dealing with SYNCING * correct lvh for ACCEPTED Co-authored-by: giuliorebuffo <giuliorebuffo@system76-pc.localdomain>
maticnetwork · Jul 27, 2022 · 039b661 · 039b661
1 parent 0db0095
commit 039b661
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/cmd/rpcdaemon/commands/engine_api.go b/cmd/rpcdaemon/commands/engine_api.go
@@ -77,7 +77,7 @@ func convertPayloadStatus(x *remote.EnginePayloadStatus) map[string]interface{}
 	json := map[string]interface{}{
 		"status": x.Status.String(),
 	}
-	if x.LatestValidHash != nil {
+	if x.LatestValidHash != nil && x.Status != remote.EngineStatus_ACCEPTED {
 		json["latestValidHash"] = common.Hash(gointerfaces.ConvertH256ToHash(x.LatestValidHash))
 	}
 	if x.ValidationError != "" {

diff --git a/eth/stagedsync/stage_headers.go b/eth/stagedsync/stage_headers.go
@@ -209,6 +209,10 @@ func HeadersPOS(
 	}
 
 	if requestStatus == engineapi.New {
+		if payloadStatus != nil && cfg.hd.PayloadStatusCh != nil && payloadStatus.Status == remote.EngineStatus_SYNCING {
+			cfg.hd.PayloadStatusCh <- *payloadStatus
+			return nil
+		}
 		cfg.hd.SetPendingPayloadStatus(payloadStatus)
 	}