forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-08-19 10:22:23 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge bab696378c into 26a37c5351

Browse source
This commit is contained in:
Vadim Macagon 2018-10-02 11:06:41 +00:00 committed by GitHub
commit 0f556a78ff
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 21 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
core/state/state_object.go
View file

@ -79,6 +79,7 @@ type stateObject struct {
originStorage Storage // Storage cache of original entries to dedup rewrites originStorage Storage // Storage cache of original entries to dedup rewrites
dirtyStorage Storage // Storage entries that need to be flushed to disk dirtyStorage Storage // Storage entries that need to be flushed to disk
dirtyStorageKeys []common.Hash // Dirty storage keys in order of insertion into dirtyStorage
// Cache flags. // Cache flags.
// When an object is marked suicided it will be delete from the trie // When an object is marked suicided it will be delete from the trie
@ -117,6 +118,7 @@ func newObject(db *StateDB, address common.Address, data Account) *stateObject {
data: data, data: data,
originStorage: make(Storage), originStorage: make(Storage),
dirtyStorage: make(Storage), dirtyStorage: make(Storage),
dirtyStorageKeys: nil,
} }
} }
@ -212,12 +214,21 @@ func (self *stateObject) SetState(db Database, key, value common.Hash) {
func (self *stateObject) setState(key, value common.Hash) { func (self *stateObject) setState(key, value common.Hash) {
self.dirtyStorage[key] = value self.dirtyStorage[key] = value
for _, k := range self.dirtyStorageKeys {
if k == key {
return
}
}
self.dirtyStorageKeys = append(self.dirtyStorageKeys, key)
} }
// updateTrie writes cached storage modifications into the object's storage trie. // updateTrie writes cached storage modifications into the object's storage trie.
func (self *stateObject) updateTrie(db Database) Trie { func (self *stateObject) updateTrie(db Database) Trie {
tr := self.getTrie(db) tr := self.getTrie(db)
for key, value := range self.dirtyStorage { // Iterate through the storage keys in deterministic order to ensure the storage trie is
// identical across machines
for _, key := range self.dirtyStorageKeys {
value := self.dirtyStorage[key]
delete(self.dirtyStorage, key) delete(self.dirtyStorage, key)
// Skip noop changes, persist actual changes // Skip noop changes, persist actual changes
@ -303,6 +314,7 @@ func (self *stateObject) deepCopy(db *StateDB) *stateObject {
} }
stateObject.code = self.code stateObject.code = self.code
stateObject.dirtyStorage = self.dirtyStorage.Copy() stateObject.dirtyStorage = self.dirtyStorage.Copy()
stateObject.dirtyStorageKeys = append([]common.Hash{}, self.dirtyStorageKeys...)
stateObject.originStorage = self.originStorage.Copy() stateObject.originStorage = self.originStorage.Copy()
stateObject.suicided = self.suicided stateObject.suicided = self.suicided
stateObject.dirtyCode = self.dirtyCode stateObject.dirtyCode = self.dirtyCode