From 828e07553a2b774a5b091ea5405607d3dcb2b0e9 Mon Sep 17 00:00:00 2001
From: zjubfd <296179868@qq.com>
Date: Wed, 30 Mar 2022 11:04:22 +0800
Subject: [PATCH] disable diffsync when pipecommit is enabled

---
 cmd/utils/flags.go | 2 +-
 eth/backend.go     | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/cmd/utils/flags.go b/cmd/utils/flags.go
index 8f5141907f..85d1cef887 100644
--- a/cmd/utils/flags.go
+++ b/cmd/utils/flags.go
@@ -129,7 +129,7 @@ var (
 	}
 	PipeCommitFlag = cli.BoolFlag{
 		Name:  "pipecommit",
-		Usage: "Enable MPT pipeline commit, it will improve syncing performance. It is an experimental feature(default is false)",
+		Usage: "Enable MPT pipeline commit, it will improve syncing performance. It is an experimental feature(default is false), diffsync will be disable if pipeline commit is enabled",
 	}
 	RangeLimitFlag = cli.BoolFlag{
 		Name:  "rangelimit",
diff --git a/eth/backend.go b/eth/backend.go
index ab93006437..3f782ff6a8 100644
--- a/eth/backend.go
+++ b/eth/backend.go
@@ -200,7 +200,8 @@ func New(stack *node.Node, config *ethconfig.Config) (*Ethereum, error) {
 		}
 	)
 	bcOps := make([]core.BlockChainOption, 0)
-	if config.DiffSync {
+	// TODO diffsync performance is not as expected, disable it when pipecommit is enabled for now
+	if config.DiffSync && !config.PipeCommit {
 		bcOps = append(bcOps, core.EnableLightProcessor)
 	}
 	if config.PipeCommit {