gaspersic/go-ethereum
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed state overwriting issue

Browse Source
This commit is contained in:
obscuren
2014-05-21 01:12:28 +02:00
parent 6ef2832083
commit 3c35ba7c31
5 changed files with 20 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
ethchain/state.go
View File

@ -60,6 +60,7 @@ func (s *State) GetStateObject(addr []byte) *StateObject {
// Check if there's a cached state for this contract
cachedStateObject := s.states[string(addr)]
if cachedStateObject != nil {
//fmt.Printf("get cached #%d %x addr: %x\n", cachedStateObject.trie.Cache().Len(), cachedStateObject.Root(), addr[0:4])
stateObject.state = cachedStateObject
}
@ -70,8 +71,9 @@ func (s *State) GetStateObject(addr []byte) *StateObject {
func (s *State) UpdateStateObject(object *StateObject) {
addr := object.Address()
if object.state != nil {
if object.state != nil && s.states[string(addr)] == nil {
s.states[string(addr)] = object.state
//fmt.Printf("update cached #%d %x addr: %x\n", object.state.trie.Cache().Len(), object.state.Root(), addr[0:4])
}
ethutil.Config.Db.Put(ethutil.Sha3Bin(object.Script()), object.Script())
@ -81,12 +83,6 @@ func (s *State) UpdateStateObject(object *StateObject) {
s.manifest.AddObjectChange(object)
}
func (s *State) SetStateObject(stateObject *StateObject) {
s.states[string(stateObject.address)] = stateObject.state
s.UpdateStateObject(stateObject)
}
func (s *State) GetAccount(addr []byte) (account *StateObject) {
data := s.trie.Get(string(addr))
if data == "" {