all: clear up Verify Node logic

cmd/evm/internal/t8ntool/execution.go

@@ -368,7 +368,7 @@ func (pre *Prestate) Apply(vmConfig vm.Config, chainConfig *params.ChainConfig,
 	}
 
 	// Commit block
-	root, _, err := statedb.Commit(vmContext.BlockNumber.Uint64(), chainConfig.IsEIP158(vmContext.BlockNumber), chainConfig.IsCancun(vmContext.BlockNumber, vmContext.Time))
+	root, err := statedb.Commit(vmContext.BlockNumber.Uint64(), chainConfig.IsEIP158(vmContext.BlockNumber), chainConfig.IsCancun(vmContext.BlockNumber, vmContext.Time))
 	if err != nil {
 		return nil, nil, nil, NewError(ErrorEVM, fmt.Errorf("could not commit state: %v", err))
 	}
@@ -426,7 +426,7 @@ func MakePreState(db ethdb.Database, accounts types.GenesisAlloc) *state.StateDB
 		}
 	}
 	// Commit and re-open to start with a clean state.
-	root, _, _ := statedb.Commit(0, false, false)
+	root, _ := statedb.Commit(0, false, false)
 	statedb, _ = state.New(root, sdb)
 	return statedb
 }

cmd/evm/runner.go

@@ -336,7 +336,7 @@ func runCmd(ctx *cli.Context) error {
 	output, stats, err := timedExec(bench, execFunc)
 
 	if ctx.Bool(DumpFlag.Name) {
-		root, _, err := runtimeConfig.State.Commit(genesisConfig.Number, true, false)
+		root, err := runtimeConfig.State.Commit(genesisConfig.Number, true, false)
 		if err != nil {
 			fmt.Printf("Failed to commit changes %v\n", err)
 			return err

cmd/geth/main.go

@@ -68,7 +68,6 @@ var (
 		utils.NoUSBFlag, // deprecated
 		utils.DirectBroadcastFlag,
 		utils.DisableSnapProtocolFlag,
-		utils.EnableTrustProtocolFlag,
 		utils.RangeLimitFlag,
 		utils.USBFlag,
 		utils.SmartCardDaemonPathFlag,
@@ -132,8 +131,6 @@ var (
 		// utils.CacheNoPrefetchFlag,
 		utils.CachePreimagesFlag,
 		utils.MultiDataBaseFlag,
-		utils.PersistDiffFlag,
-		utils.DiffBlockFlag,
 		utils.PruneAncientDataFlag,
 		utils.CacheLogSizeFlag,
 		utils.FDLimitFlag,

cmd/utils/flags.go

@@ -113,21 +113,11 @@ var (
 		Usage:    "Disable snap protocol",
 		Category: flags.EthCategory,
 	}
-	EnableTrustProtocolFlag = &cli.BoolFlag{
-		Name:     "enabletrustprotocol",
-		Usage:    "Enable trust protocol",
-		Category: flags.FastNodeCategory,
-	}
 	RangeLimitFlag = &cli.BoolFlag{
 		Name:     "rangelimit",
 		Usage:    "Enable 5000 blocks limit for range query",
 		Category: flags.APICategory,
 	}
-	DiffFlag = flags.DirectoryFlag{
-		Name:     "datadir.diff",
-		Usage:    "Data directory for difflayer segments (default = inside chaindata)",
-		Category: flags.FastNodeCategory,
-	}
 	RemoteDBFlag = &cli.StringFlag{
 		Name:     "remotedb",
 		Usage:    "URL for remote database",
@@ -282,9 +272,6 @@ var (
 		Usage: `tries verify mode:
 				"local(default): a normal full node with complete state world(both MPT and snapshot), merkle state root will
 				                 be verified against the block header.",
-				"full: a fast node with only snapshot state world. Merkle state root is verified by the trustworthy remote verify node
-					   by comparing the diffhash(an identify of difflayer generated by the block) and state root.",
-				"insecure: same as full mode, except that it can tolerate without verifying the diffhash when verify node does not have it.",
 				"none: no merkle state root verification at all, there is no need to setup or connect remote verify node at all,
 				       it is more light comparing to full and insecure mode, but get a very small chance that the state is not consistent
 						with other peers."`,
@@ -581,17 +568,6 @@ var (
 		Usage:    "Enable recording the SHA3/keccak preimages of trie keys",
 		Category: flags.PerfCategory,
 	}
-	PersistDiffFlag = &cli.BoolFlag{
-		Name:     "persistdiff",
-		Usage:    "Enable persistence of the diff layer",
-		Category: flags.FastNodeCategory,
-	}
-	DiffBlockFlag = &cli.Uint64Flag{
-		Name:     "diffblock",
-		Usage:    "The number of blocks should be persisted in db (default = 86400)",
-		Value:    uint64(86400),
-		Category: flags.FastNodeCategory,
-	}
 	PruneAncientDataFlag = &cli.BoolFlag{
 		Name:     "pruneancient",
 		Usage:    "Prune ancient data, is an optional config and disabled by default. Only keep the latest 9w blocks' data,the older blocks' data will be permanently pruned. Notice:the geth/chaindata/ancient dir will be removed, if restart without the flag, the ancient data will start with the previous point that the oldest unpruned block number. Recommends to the user who don't care about the ancient data.",
@@ -2060,15 +2036,6 @@ func SetEthConfig(ctx *cli.Context, stack *node.Node, cfg *ethconfig.Config) {
 	if ctx.IsSet(AncientFlag.Name) {
 		cfg.DatabaseFreezer = ctx.String(AncientFlag.Name)
 	}
-	if ctx.IsSet(DiffFlag.Name) {
-		cfg.DatabaseDiff = ctx.String(DiffFlag.Name)
-	}
-	if ctx.IsSet(PersistDiffFlag.Name) {
-		cfg.PersistDiff = ctx.Bool(PersistDiffFlag.Name)
-	}
-	if ctx.IsSet(DiffBlockFlag.Name) {
-		cfg.DiffBlock = ctx.Uint64(DiffBlockFlag.Name)
-	}
 	if ctx.IsSet(PruneAncientDataFlag.Name) {
 		if cfg.SyncMode != ethconfig.FullSync {
 			log.Warn("pruneancient parameter can only be used with syncmode=full, force to full sync")
@@ -2088,9 +2055,6 @@ func SetEthConfig(ctx *cli.Context, stack *node.Node, cfg *ethconfig.Config) {
 	if ctx.IsSet(DisableSnapProtocolFlag.Name) {
 		cfg.DisableSnapProtocol = ctx.Bool(DisableSnapProtocolFlag.Name)
 	}
-	if ctx.IsSet(EnableTrustProtocolFlag.Name) {
-		cfg.EnableTrustProtocol = ctx.IsSet(EnableTrustProtocolFlag.Name)
-	}
 	if ctx.IsSet(RangeLimitFlag.Name) {
 		cfg.RangeLimit = ctx.Bool(RangeLimitFlag.Name)
 	}
@@ -2150,11 +2114,6 @@ func SetEthConfig(ctx *cli.Context, stack *node.Node, cfg *ethconfig.Config) {
 		if err = cfg.TriesVerifyMode.UnmarshalText([]byte(ctx.String(TriesVerifyModeFlag.Name))); err != nil {
 			Fatalf("invalid --tries-verify-mode flag: %v", err)
 		}
-		// If a node sets verify mode to full or insecure, it's a fast node and need
-		// to verify blocks from verify nodes, then it should enable trust protocol.
-		if cfg.TriesVerifyMode.NeedRemoteVerify() {
-			cfg.EnableTrustProtocol = true
-		}
 		// A node without trie is not able to provide snap data, so it should disable snap protocol.
 		if cfg.TriesVerifyMode != core.LocalVerify {
 			log.Info("Automatically disables snap protocol due to verify mode", "mode", cfg.TriesVerifyMode)
@@ -2207,7 +2166,7 @@ func SetEthConfig(ctx *cli.Context, stack *node.Node, cfg *ethconfig.Config) {
 		cfg.RPCTxFeeCap = ctx.Float64(RPCGlobalTxFeeCapFlag.Name)
 	}
 	if ctx.IsSet(NoDiscoverFlag.Name) {
-		cfg.EthDiscoveryURLs, cfg.SnapDiscoveryURLs, cfg.TrustDiscoveryURLs, cfg.BscDiscoveryURLs = []string{}, []string{}, []string{}, []string{}
+		cfg.EthDiscoveryURLs, cfg.SnapDiscoveryURLs, cfg.BscDiscoveryURLs = []string{}, []string{}, []string{}
 	} else if ctx.IsSet(DNSDiscoveryFlag.Name) {
 		urls := ctx.String(DNSDiscoveryFlag.Name)
 		if urls == "" {
@@ -2356,7 +2315,6 @@ func SetDNSDiscoveryDefaults(cfg *ethconfig.Config, genesis common.Hash) {
 	if url := params.KnownDNSNetwork(genesis, protocol); url != "" {
 		cfg.EthDiscoveryURLs = []string{url}
 		cfg.SnapDiscoveryURLs = cfg.EthDiscoveryURLs
-		cfg.TrustDiscoveryURLs = cfg.EthDiscoveryURLs
 		cfg.BscDiscoveryURLs = cfg.EthDiscoveryURLs
 	}
 }

core/block_validator.go

@@ -27,36 +27,22 @@ import (
 	"github.com/ethereum/go-ethereum/trie"
 )
 
-type BlockValidatorOption func(*BlockValidator) *BlockValidator
-
-func EnableRemoteVerifyManager(remoteValidator *remoteVerifyManager) BlockValidatorOption {
-	return func(bv *BlockValidator) *BlockValidator {
-		bv.remoteValidator = remoteValidator
-		return bv
-	}
-}
-
 // BlockValidator is responsible for validating block headers, uncles and
 // processed state.
 //
 // BlockValidator implements Validator.
 type BlockValidator struct {
-	config          *params.ChainConfig // Chain configuration options
-	bc              *BlockChain         // Canonical block chain
-	remoteValidator *remoteVerifyManager
+	config *params.ChainConfig // Chain configuration options
+	bc     *BlockChain         // Canonical block chain
 }
 
 // NewBlockValidator returns a new block validator which is safe for re-use
-func NewBlockValidator(config *params.ChainConfig, blockchain *BlockChain, opts ...BlockValidatorOption) *BlockValidator {
+func NewBlockValidator(config *params.ChainConfig, blockchain *BlockChain) *BlockValidator {
 	validator := &BlockValidator{
 		config: config,
 		bc:     blockchain,
 	}
 
-	for _, opt := range opts {
-		validator = opt(validator)
-	}
-
 	return validator
 }
 
@@ -135,12 +121,6 @@ func (v *BlockValidator) ValidateBody(block *types.Block) error {
 			}
 			return nil
 		},
-		func() error {
-			if v.remoteValidator != nil && !v.remoteValidator.AncestorVerified(block.Header()) {
-				return fmt.Errorf("%w, number: %s, hash: %s", ErrAncestorHasNotBeenVerified, block.Number(), block.Hash())
-			}
-			return nil
-		},
 	}
 	validateRes := make(chan error, len(validateFuns))
 	for _, f := range validateFuns {
@@ -220,10 +200,6 @@ func (v *BlockValidator) ValidateState(block *types.Block, statedb *state.StateD
 	return err
 }
 
-func (v *BlockValidator) RemoteVerifyManager() *remoteVerifyManager {
-	return v.remoteValidator
-}
-
 // CalcGasLimit computes the gas limit of the next block after parent. It aims
 // to keep the baseline gas close to the provided target, and increase it towards
 // the target if the baseline gas is lower.