From 7dbafe745340daf917b490e88a33df713519357c Mon Sep 17 00:00:00 2001
From: zzzckck <152148891+zzzckck@users.noreply.github.com>
Date: Tue, 2 Apr 2024 19:01:22 +0800
Subject: [PATCH] fix: don't switch to snapsync for fast node (#2367)

---
 eth/handler.go | 2 +-
 eth/sync.go    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/eth/handler.go b/eth/handler.go
index 5dd63cfd2f..a7e227bc01 100644
--- a/eth/handler.go
+++ b/eth/handler.go
@@ -218,7 +218,7 @@ func newHandler(config *handlerConfig) (*handler, error) {
 			}
 			h.snapSync.Store(true)
 			log.Warn("Switch sync mode from full sync to snap sync", "reason", "snap sync incomplete")
-		} else if !h.chain.HasState(fullBlock.Root) {
+		} else if !h.chain.NoTries() && !h.chain.HasState(fullBlock.Root) {
 			h.snapSync.Store(true)
 			log.Warn("Switch sync mode from full sync to snap sync", "reason", "head state missing")
 		}
diff --git a/eth/sync.go b/eth/sync.go
index 4fe0a90f41..3b04d09920 100644
--- a/eth/sync.go
+++ b/eth/sync.go
@@ -213,7 +213,7 @@ func (cs *chainSyncer) modeAndLocalHead() (downloader.SyncMode, *big.Int) {
 	// We are in a full sync, but the associated head state is missing. To complete
 	// the head state, forcefully rerun the snap sync. Note it doesn't mean the
 	// persistent state is corrupted, just mismatch with the head block.
-	if !cs.handler.chain.HasState(head.Root) {
+	if !cs.handler.chain.NoTries() && !cs.handler.chain.HasState(head.Root) {
 		block := cs.handler.chain.CurrentSnapBlock()
 		td := cs.handler.chain.GetTd(block.Hash(), block.Number.Uint64())
 		log.Info("Reenabled snap sync as chain is stateless")