Merge pull request #2697 from CortexFoundation/dev

opt stateObject.GetState

Author: ucwong

core/state/state_object.go

@@ -172,8 +172,11 @@ func (s *stateObject) getPrefetchedTrie() Trie {
 
 // GetState retrieves a value from the account storage trie.
 func (s *stateObject) GetState(key common.Hash) common.Hash {
-	value, _ := s.getState(key)
-	return value
+	value, dirty := s.dirtyStorage[key]
+	if dirty {
+		return value
+	}
+	return s.GetCommittedState(key)
 }
 
 // getState retrieves a value associated with the given storage key, along with