pipeline commit trie

add metrics

reopen trie

cmd/geth/main.go

@@ -72,6 +72,7 @@ var (
  utils.DirectBroadcastFlag,
  utils.DisableSnapProtocolFlag,
  utils.DiffSyncFlag,
+ utils.PipeCommitFlag,
  utils.RangeLimitFlag,
  utils.USBFlag,
  utils.SmartCardDaemonPathFlag,

cmd/utils/flags.go

@@ -127,6 +127,10 @@ var (
  Usage: "Enable diffy sync, Please note that enable diffsync will improve the syncing speed, " +
  "but will degrade the security to light client level",
  }
+ PipeCommitFlag = cli.BoolFlag{
+ Name: "pipecommit",
+ Usage: "Enable pipeline commit feature",
+ }
  RangeLimitFlag = cli.BoolFlag{
  Name: "rangelimit",
  Usage: "Enable 5000 blocks limit for range query",
@@ -1632,6 +1636,9 @@ func SetEthConfig(ctx *cli.Context, stack *node.Node, cfg *ethconfig.Config) {
  if ctx.GlobalIsSet(DiffSyncFlag.Name) {
  cfg.DiffSync = ctx.GlobalBool(DiffSyncFlag.Name)
  }
+ if ctx.GlobalIsSet(PipeCommitFlag.Name) {
+ cfg.PipeCommit = ctx.GlobalBool(PipeCommitFlag.Name)
+ }
  if ctx.GlobalIsSet(RangeLimitFlag.Name) {
  cfg.RangeLimit = ctx.GlobalBool(RangeLimitFlag.Name)
  }

core/block_validator.go

@@ -18,6 +18,7 @@ package core
 
 import (
  "fmt"
+ "time"
 
  "github.com/ethereum/go-ethereum/consensus"
  "github.com/ethereum/go-ethereum/core/state"
@@ -26,6 +27,8 @@ import (
  "github.com/ethereum/go-ethereum/trie"
 )
 
+const badBlockCacheExpire = 30 * time.Second
+
 // BlockValidator is responsible for validating block headers, uncles and
 // processed state.
 //
@@ -54,6 +57,9 @@ func (v *BlockValidator) ValidateBody(block *types.Block) error {
  if v.bc.HasBlockAndState(block.Hash(), block.NumberU64()) {
  return ErrKnownBlock
  }
+ if v.bc.isCachedBadBlock(block) {
+ return errStateRootVerificationFailed
+ }
  // Header validity is known at this point, check the uncles and transactions
  header := block.Header()
  if err := v.engine.VerifyUncles(v.bc, block); err != nil {
@@ -106,7 +112,7 @@ func (v *BlockValidator) ValidateBody(block *types.Block) error {
 // transition, such as amount of used gas, the receipt roots and the state root
 // itself. ValidateState returns a database batch if the validation was a success
 // otherwise nil and an error is returned.
-func (v *BlockValidator) ValidateState(block *types.Block, statedb *state.StateDB, receipts types.Receipts, usedGas uint64) error {
+func (v *BlockValidator) ValidateState(block *types.Block, statedb *state.StateDB, receipts types.Receipts, usedGas uint64, skipHeavyVerify bool) error {
  header := block.Header()
  if block.GasUsed() != usedGas {
  return fmt.Errorf("invalid gas used (remote: %d local: %d)", block.GasUsed(), usedGas)
@@ -129,13 +135,15 @@ func (v *BlockValidator) ValidateState(block *types.Block, statedb *state.StateD
  return nil
  }
  },
- func() error {
+ }
+ if !skipHeavyVerify {
+ validateFuns = append(validateFuns, func() error {
  if root := statedb.IntermediateRoot(v.config.IsEIP158(header.Number)); header.Root != root {
  return fmt.Errorf("invalid merkle root (remote: %x local: %x)", header.Root, root)
  } else {
  return nil
  }
- },
+ })
  }
  validateRes := make(chan error, len(validateFuns))
  for _, f := range validateFuns {