Browse Source

Merge pull request #22629 from karalabe/fix-chain-tracing-from-0

eth: fix tracing state retrieval if requesting the non-dirty genesis
Péter Szilágyi 4 years ago
parent
commit
264fff7dd4
1 changed files with 10 additions and 0 deletions
  1. 10 0
      eth/state_accessor.go

+ 10 - 0
eth/state_accessor.go

@@ -61,6 +61,16 @@ func (eth *Ethereum) stateAtBlock(block *types.Block, reexec uint64, base *state
 		// the internal junks created by tracing will be persisted into the disk.
 		database = state.NewDatabaseWithConfig(eth.chainDb, &trie.Config{Cache: 16})
 
+		// If we didn't check the dirty database, do check the clean one, otherwise
+		// we would rewind past a persisted block (specific corner case is chain
+		// tracing from the genesis).
+		if !checkLive {
+			statedb, err = state.New(current.Root(), database, nil)
+			if err == nil {
+				return statedb, nil
+			}
+		}
+		// Database does not have the state for the given block, try to regenerate
 		for i := uint64(0); i < reexec; i++ {
 			if current.NumberU64() == 0 {
 				return nil, errors.New("genesis state is missing")