feat: add verify_data_root

Author: mcrakhman

blocksync/reactor.go

@@ -6,6 +6,7 @@ import (
 	"sync"
 	"time"
 
+	cfg "github.com/cometbft/cometbft/config"
 	"github.com/cometbft/cometbft/crypto"
 	"github.com/cometbft/cometbft/libs/log"
 	"github.com/cometbft/cometbft/libs/trace"
@@ -64,6 +65,7 @@ type Reactor struct {
 	traceClient   trace.Tracer
 	blockSync     bool
 	localAddr     crypto.Address
+	config        *cfg.BlockSyncConfig
 	poolRoutineWg sync.WaitGroup
 
 	requestsCh <-chan BlockRequest
@@ -78,13 +80,17 @@ type Reactor struct {
 func NewReactor(state sm.State, blockExec *sm.BlockExecutor, store *store.BlockStore,
 	blockSync bool, metrics *Metrics, offlineStateSyncHeight int64,
 ) *Reactor {
-	return NewReactorWithAddr(state, blockExec, store, blockSync, nil, metrics, offlineStateSyncHeight, trace.NoOpTracer())
+	return NewReactorWithAddr(state, blockExec, store, blockSync, nil, metrics, offlineStateSyncHeight, trace.NoOpTracer(), nil)
 }
 
 // Function added to keep existing API.
 func NewReactorWithAddr(state sm.State, blockExec *sm.BlockExecutor, store *store.BlockStore,
-	blockSync bool, localAddr crypto.Address, metrics *Metrics, offlineStateSyncHeight int64, traceClient trace.Tracer,
+	blockSync bool, localAddr crypto.Address, metrics *Metrics, offlineStateSyncHeight int64, traceClient trace.Tracer, config *cfg.BlockSyncConfig,
 ) *Reactor {
+	// Use default config if nil
+	if config == nil {
+		config = cfg.DefaultBlockSyncConfig()
+	}
 
 	storeHeight := store.Height()
 	if storeHeight == 0 {
@@ -121,6 +127,7 @@ func NewReactorWithAddr(state sm.State, blockExec *sm.BlockExecutor, store *stor
 		pool:         pool,
 		blockSync:    blockSync,
 		localAddr:    localAddr,
+		config:       config,
 		requestsCh:   requestsCh,
 		errorsCh:     errorsCh,
 		metrics:      metrics,
@@ -514,7 +521,7 @@ FOR_LOOP:
 				err = bcR.blockExec.ValidateBlock(state, first)
 			}
 
-			if err == nil {
+			if err == nil && bcR.config.VerifyDataRoot {
 				var stateMachineValid bool
 				// Block sync doesn't check that the `Data` in a block is valid.
 				// Since celestia-core can't determine if the `Data` in a block

config/config.go

@@ -1035,13 +1035,15 @@ func (cfg *StateSyncConfig) ValidateBasic() error {
 
 // BlockSyncConfig (formerly known as FastSync) defines the configuration for the CometBFT block sync service
 type BlockSyncConfig struct {
-	Version string `mapstructure:"version"`
+	Version        string `mapstructure:"version"`
+	VerifyDataRoot bool   `mapstructure:"verify_data_root"`
 }
 
 // DefaultBlockSyncConfig returns a default configuration for the block sync service
 func DefaultBlockSyncConfig() *BlockSyncConfig {
 	return &BlockSyncConfig{
-		Version: "v0",
+		Version:        "v0",
+		VerifyDataRoot: true,
 	}
 }
 

config/config_test.go

@@ -144,6 +144,9 @@ func TestBlockSyncConfigValidateBasic(t *testing.T) {
 	cfg := config.TestBlockSyncConfig()
 	assert.NoError(t, cfg.ValidateBasic())
 
+	// verify default value for VerifyDataRoot
+	assert.True(t, cfg.VerifyDataRoot)
+
 	// tamper with version
 	cfg.Version = "v1"
 	assert.Error(t, cfg.ValidateBasic())

config/toml.go

@@ -499,6 +499,11 @@ chunk_fetchers = "{{ .StateSync.ChunkFetchers }}"
 #   1) "v0" - the default block sync implementation
 version = "{{ .BlockSync.Version }}"
 
+# Verify data root during block sync.
+# When enabled, the node will verify the data root of each block during sync.
+# This adds extra validation but may slow down the sync process.
+verify_data_root = {{ .BlockSync.VerifyDataRoot }}
+
 #######################################################
 ###         Consensus Configuration Options         ###
 #######################################################

node/setup.go

@@ -352,7 +352,7 @@ func createBlocksyncReactor(config *cfg.Config,
 ) (bcReactor p2p.Reactor, err error) {
 	switch config.BlockSync.Version {
 	case "v0":
-		bcReactor = blocksync.NewReactorWithAddr(state.Copy(), blockExec, blockStore, blockSync, localAddr, metrics, offlineStateSyncHeight, tracer)
+		bcReactor = blocksync.NewReactorWithAddr(state.Copy(), blockExec, blockStore, blockSync, localAddr, metrics, offlineStateSyncHeight, tracer, config.BlockSync)
 	case "v1", "v2":
 		return nil, fmt.Errorf("block sync version %s has been deprecated. Please use v0", config.BlockSync.Version)
 	default: