core/state: fixed (self)destructed objects

Add the object to the list of destructed objects during a selfdestruct /
suicide operation and also remove it from the list once the journal
reverts.
This commit is contained in:
Jeffrey Wilcke 2017-05-12 21:47:09 +02:00
parent a5f6a1cb7c
commit e7119ce12d
2 changed files with 9 additions and 2 deletions

View File

@ -91,6 +91,11 @@ func (ch suicideChange) undo(s *StateDB) {
if obj != nil { if obj != nil {
obj.suicided = ch.prev obj.suicided = ch.prev
obj.setBalance(ch.prevbalance) obj.setBalance(ch.prevbalance)
// if the object wasn't suicided before, remove
// it from the list of destructed objects as well.
if !obj.suicided {
delete(s.stateObjectsDestructed, *ch.account)
}
} }
} }

View File

@ -378,6 +378,8 @@ func (self *StateDB) Suicide(addr common.Address) bool {
}) })
stateObject.markSuicided() stateObject.markSuicided()
stateObject.data.Balance = new(big.Int) stateObject.data.Balance = new(big.Int)
self.stateObjectsDestructed[addr] = struct{}{}
return true return true
} }