diff options
author | Péter Szilágyi <peterke@gmail.com> | 2016-01-20 18:09:24 +0800 |
---|---|---|
committer | Péter Szilágyi <peterke@gmail.com> | 2016-01-20 18:09:24 +0800 |
commit | 886478b18b73bbe8421531f1a71664a2bc0f5eeb (patch) | |
tree | 230986c30bc908eadfcd8b3f862e43ee2dba7d4d /core | |
parent | 5945a33350ea6e8bfc6308826efe16aab0e2e93d (diff) | |
download | dexon-886478b18b73bbe8421531f1a71664a2bc0f5eeb.tar dexon-886478b18b73bbe8421531f1a71664a2bc0f5eeb.tar.gz dexon-886478b18b73bbe8421531f1a71664a2bc0f5eeb.tar.bz2 dexon-886478b18b73bbe8421531f1a71664a2bc0f5eeb.tar.lz dexon-886478b18b73bbe8421531f1a71664a2bc0f5eeb.tar.xz dexon-886478b18b73bbe8421531f1a71664a2bc0f5eeb.tar.zst dexon-886478b18b73bbe8421531f1a71664a2bc0f5eeb.zip |
core/state, trie: don't leak database writes before commit
Diffstat (limited to 'core')
-rw-r--r-- | core/state/statedb.go | 10 | ||||
-rw-r--r-- | core/state/statedb_test.go | 52 |
2 files changed, 59 insertions, 3 deletions
diff --git a/core/state/statedb.go b/core/state/statedb.go index 8093472b5..22ffa36a0 100644 --- a/core/state/statedb.go +++ b/core/state/statedb.go @@ -206,9 +206,6 @@ func (self *StateDB) Delete(addr common.Address) bool { // Update the given state object and apply it to state trie func (self *StateDB) UpdateStateObject(stateObject *StateObject) { - if len(stateObject.code) > 0 { - self.db.Put(stateObject.codeHash, stateObject.code) - } addr := stateObject.Address() data, err := rlp.EncodeToBytes(stateObject) if err != nil { @@ -375,8 +372,15 @@ func (s *StateDB) commit(db trie.DatabaseWriter) (common.Hash, error) { // and just mark it for deletion in the trie. s.DeleteStateObject(stateObject) } else { + // Write any contract code associated with the state object + if len(stateObject.code) > 0 { + if err := db.Put(stateObject.codeHash, stateObject.code); err != nil { + return common.Hash{}, err + } + } // Write any storage changes in the state object to its trie. stateObject.Update() + // Commit the trie of the object to the batch. // This updates the trie root internally, so // getting the root hash of the storage trie diff --git a/core/state/statedb_test.go b/core/state/statedb_test.go new file mode 100644 index 000000000..fd4d02fdd --- /dev/null +++ b/core/state/statedb_test.go @@ -0,0 +1,52 @@ +// Copyright 2015 The go-ethereum Authors +// This file is part of the go-ethereum library. +// +// The go-ethereum library is free software: you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// The go-ethereum library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public License +// along with the go-ethereum library. If not, see <http://www.gnu.org/licenses/>. + +package state + +import ( + "math/big" + "testing" + + "github.com/ethereum/go-ethereum/common" + "github.com/ethereum/go-ethereum/ethdb" +) + +// Tests that updating a state trie does not leak any database writes prior to +// actually committing the state. +func TestUpdateLeaks(t *testing.T) { + // Create an empty state database + db, _ := ethdb.NewMemDatabase() + state, _ := New(common.Hash{}, db) + + // Update it with some accounts + for i := byte(0); i < 255; i++ { + obj := state.GetOrNewStateObject(common.BytesToAddress([]byte{i})) + obj.AddBalance(big.NewInt(int64(11 * i))) + obj.SetNonce(uint64(42 * i)) + if i%2 == 0 { + obj.SetState(common.BytesToHash([]byte{i, i, i}), common.BytesToHash([]byte{i, i, i, i})) + } + if i%3 == 0 { + obj.SetCode([]byte{i, i, i, i, i}) + } + state.UpdateStateObject(obj) + } + // Ensure that no data was leaked into the database + for _, key := range db.Keys() { + value, _ := db.Get(key) + t.Errorf("State leaked into database: %x -> %x", key, value) + } +} |