add unit testcase

cmd/evm/internal/t8ntool/execution.go

@@ -166,7 +166,11 @@ func (pre *Prestate) Apply(vmConfig vm.Config, chainConfig *params.ChainConfig,
  if chainConfig.IsByzantium(vmContext.BlockNumber) {
  statedb.Finalise(true)
  } else {
- root = statedb.IntermediateRoot(chainConfig.IsEIP158(vmContext.BlockNumber)).Bytes()
+ stateRoot, err := statedb.IntermediateRoot(chainConfig.IsEIP158(vmContext.BlockNumber))
+ if err != nil {
+ return nil, nil, err
+ }
+ root = stateRoot.Bytes()
  }
 
  // Create a new receipt for the transaction, storing the intermediate root and
@@ -197,7 +201,11 @@ func (pre *Prestate) Apply(vmConfig vm.Config, chainConfig *params.ChainConfig,
 
  txIndex++
  }
- statedb.IntermediateRoot(chainConfig.IsEIP158(vmContext.BlockNumber))
+
+ _, err := statedb.IntermediateRoot(chainConfig.IsEIP158(vmContext.BlockNumber))
+ if err != nil {
+ return nil, nil, err
+ }
  // Add mining reward?
  if miningReward > 0 {
  // Add mining reward. The mining reward may be `0`, which only makes a difference in the cases
@@ -223,7 +231,7 @@ func (pre *Prestate) Apply(vmConfig vm.Config, chainConfig *params.ChainConfig,
  statedb.AddBalance(pre.Env.Coinbase, minerReward)
  }
  // Commit block
- root, _, err := statedb.Commit(chainConfig.IsEIP158(vmContext.BlockNumber))
+ root, _, err := statedb.Commit(chainConfig.IsEIP158(vmContext.BlockNumber), nil)
  if err != nil {
  fmt.Fprintf(os.Stderr, "Could not commit state: %v", err)
  return nil, nil, NewError(ErrorEVM, fmt.Errorf("could not commit state: %v", err))
@@ -252,7 +260,7 @@ func MakePreState(db ethdb.Database, accounts core.GenesisAlloc) *state.StateDB
  }
  }
  // Commit and re-open to start with a clean state.
- root, _, _ := statedb.Commit(false)
+ root, _, _ := statedb.Commit(false, nil)
  statedb, _ = state.New(root, sdb, nil)
  return statedb
 }

cmd/evm/runner.go

@@ -268,8 +268,11 @@ func runCmd(ctx *cli.Context) error {
  output, leftOverGas, stats, err := timedExec(bench, execFunc)
 
  if ctx.GlobalBool(DumpFlag.Name) {
- statedb.Commit(true)
- statedb.IntermediateRoot(true)
+ statedb.Commit(true, nil)
+ _, err := statedb.IntermediateRoot(true)
+ if err != nil {
+ return err
+ }
  fmt.Println(string(statedb.Dump(false, false, true)))
  }
 

cmd/evm/staterunner.go

@@ -101,7 +101,11 @@ func stateTestCmd(ctx *cli.Context) error {
  _, state, err := test.Run(st, cfg, false)
  // print state root for evmlab tracing
  if ctx.GlobalBool(MachineFlag.Name) && state != nil {
- fmt.Fprintf(os.Stderr, "{\"stateRoot\": \"%x\"}\n", state.IntermediateRoot(false))
+ root, err := state.IntermediateRoot(false)
+ if err != nil {
+ return err
+ }
+ fmt.Fprintf(os.Stderr, "{\"stateRoot\": \"%x\"}\n", root)
  }
  if err != nil {
  // Test failed, mark as so and dump any state to aid debugging

cmd/utils/flags.go

@@ -129,7 +129,7 @@ var (
  }
  PipeCommitFlag = cli.BoolFlag{
  Name: "pipecommit",
- Usage: "Enable pipeline commit feature",
+ Usage: "Enable MPT pipeline commit, it will improve syncing performance. It is an experimental feature",
  }
  RangeLimitFlag = cli.BoolFlag{
  Name: "rangelimit",

consensus/clique/clique.go

@@ -550,7 +550,7 @@ func (c *Clique) Prepare(chain consensus.ChainHeaderReader, header *types.Header
 func (c *Clique) Finalize(chain consensus.ChainHeaderReader, header *types.Header, state *state.StateDB, txs *[]*types.Transaction, uncles []*types.Header,
  receipts *[]*types.Receipt, _ *[]*types.Transaction, _ *uint64) (err error) {
  // No block rewards in PoA, so the state remains as is and uncles are dropped
- header.Root = state.IntermediateRoot(chain.Config().IsEIP158(header.Number))
+ header.Root, err = state.IntermediateRoot(chain.Config().IsEIP158(header.Number))
  header.UncleHash = types.CalcUncleHash(nil)
  return
 }
@@ -560,7 +560,11 @@ func (c *Clique) Finalize(chain consensus.ChainHeaderReader, header *types.Heade
 func (c *Clique) FinalizeAndAssemble(chain consensus.ChainHeaderReader, header *types.Header, state *state.StateDB,
  txs []*types.Transaction, uncles []*types.Header, receipts []*types.Receipt) (*types.Block, []*types.Receipt, error) {
  // No block rewards in PoA, so the state remains as is and uncles are dropped
- header.Root = state.IntermediateRoot(chain.Config().IsEIP158(header.Number))
+ var err error
+ header.Root, err = state.IntermediateRoot(chain.Config().IsEIP158(header.Number))
+ if err != nil {
+ return nil, nil, err
+ }
  header.UncleHash = types.CalcUncleHash(nil)
 
  // Assemble and return the final block for sealing

consensus/ethash/consensus.go

@@ -582,7 +582,7 @@ func (ethash *Ethash) Finalize(chain consensus.ChainHeaderReader, header *types.
  receipts *[]*types.Receipt, _ *[]*types.Transaction, _ *uint64) (err error) {
  // Accumulate any block and uncle rewards and commit the final state root
  accumulateRewards(chain.Config(), state, header, uncles)
- header.Root = state.IntermediateRoot(chain.Config().IsEIP158(header.Number))
+ header.Root, err = state.IntermediateRoot(chain.Config().IsEIP158(header.Number))
  return
 }
 

consensus/parlia/parlia.go

@@ -769,7 +769,7 @@ func (p *Parlia) FinalizeAndAssemble(chain consensus.ChainHeaderReader, header *
  wg := sync.WaitGroup{}
  wg.Add(2)
  go func() {
- rootHash = state.IntermediateRoot(chain.Config().IsEIP158(header.Number))
+ rootHash, err = state.IntermediateRoot(chain.Config().IsEIP158(header.Number))
  wg.Done()
  }()
  go func() {
@@ -779,7 +779,7 @@ func (p *Parlia) FinalizeAndAssemble(chain consensus.ChainHeaderReader, header *
  wg.Wait()
  blk.SetRoot(rootHash)
  // Assemble and return the final block for sealing
- return blk, receipts, nil
+ return blk, receipts, err
 }
 
 // Authorize injects a private key into the consensus engine to mint new blocks
@@ -1211,7 +1211,11 @@ func (p *Parlia) applyTransaction(
  if p.chainConfig.IsByzantium(header.Number) {
  state.Finalise(true)
  } else {
- root = state.IntermediateRoot(p.chainConfig.IsEIP158(header.Number)).Bytes()
+ stateRoot, err := state.IntermediateRoot(p.chainConfig.IsEIP158(header.Number))
+ if err != nil {
+ return err
+ }
+ root = stateRoot.Bytes()
  }
  *usedGas += gasUsed
  receipt := types.NewReceipt(root, false, *usedGas)

core/block_validator.go

@@ -58,7 +58,7 @@ func (v *BlockValidator) ValidateBody(block *types.Block) error {
  return ErrKnownBlock
  }
  if v.bc.isCachedBadBlock(block) {
- return errStateRootVerificationFailed
+ return ErrKnownBadBlock
  }
  // Header validity is known at this point, check the uncles and transactions
  header := block.Header()
@@ -138,8 +138,8 @@ func (v *BlockValidator) ValidateState(block *types.Block, statedb *state.StateD
  }
  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)
+ if root, err := statedb.IntermediateRoot(v.config.IsEIP158(header.Number)); header.Root != root || err != nil {
+ return fmt.Errorf("invalid merkle root (remote: %x local: %x), err %v", header.Root, root, err)
  } else {
  return nil
  }

core/blockchain.go

@@ -472,6 +472,7 @@ func NewBlockChain(db ethdb.Database, cacheConfig *CacheConfig, chainConfig *par
  }
  go bc.untrustedDiffLayerPruneLoop()
  if bc.pipeCommit {
+ // check current block and rewind invalid one
  go bc.rewindInvalidHeaderBlockLoop()
  }
  return bc, nil
@@ -595,8 +596,10 @@ func (bc *BlockChain) tryRewindBadBlocks() {
  block := bc.CurrentBlock()
  snaps := bc.snaps
  // Verified and Result is false
- if snaps != nil && snaps.Snapshot(block.Root()).Verified() && !snaps.Snapshot(block.Root()).WaitVerified() {
+ if snaps != nil && snaps.Snapshot(block.Root()) != nil &&
+ snaps.Snapshot(block.Root()).Verified() && !snaps.Snapshot(block.Root()).WaitVerified() {
  // Rewind by one block
+ log.Warn("current block verified failed, rewind to its parent", "height", block.NumberU64(), "hash", block.Hash())
  bc.futureBlocks.Remove(block.Hash())
  bc.badBlockCache.Add(block.Hash(), time.Now())
  bc.reportBlock(block, nil, errStateRootVerificationFailed)
@@ -1086,8 +1089,8 @@ func (bc *BlockChain) HasFastBlock(hash common.Hash, number uint64) bool {
 
 // HasState checks if state trie is fully present in the database or not.
 func (bc *BlockChain) HasState(hash common.Hash) bool {
- if bc.snaps != nil {
- // If parent snap is pending on verified, treat it as state exist
+ if bc.pipeCommit && bc.snaps != nil {
+ // If parent snap is pending on verification, treat it as state exist
  if s := bc.snaps.Snapshot(hash); s != nil && !s.Verified() {
  return true
  }
@@ -1774,7 +1777,7 @@ func (bc *BlockChain) writeBlockWithState(block *types.Block, receipts []*types.
  }
 
  // Commit all cached state changes into underlying memory database.
- _, diffLayer, err := state.Commit(bc.chainConfig.IsEIP158(block.Number()), tryCommitTrieDB)
+ _, diffLayer, err := state.Commit(bc.chainConfig.IsEIP158(block.Number()), bc.tryRewindBadBlocks, tryCommitTrieDB)
  if err != nil {
  return NonStatTy, err
  }
@@ -2138,8 +2141,7 @@ func (bc *BlockChain) insertChain(chain types.Blocks, verifySeals bool) (int, er
  // Validate the state using the default validator
  substart = time.Now()
  if !statedb.IsLightProcessed() {
- // Do the state root verification asynchronously
- if err := bc.validator.ValidateState(block, statedb, receipts, usedGas, true); err != nil {
+ if err := bc.validator.ValidateState(block, statedb, receipts, usedGas, bc.pipeCommit); err != nil {
  log.Error("validate state failed", "error", err)
  bc.reportBlock(block, receipts, err)
  return it.index, err