aboutsummaryrefslogtreecommitdiffstats
path: root/state
diff options
context:
space:
mode:
Diffstat (limited to 'state')
-rw-r--r--state/state_object.go2
-rw-r--r--state/statedb.go8
2 files changed, 7 insertions, 3 deletions
diff --git a/state/state_object.go b/state/state_object.go
index 487952a02..51ec95efa 100644
--- a/state/state_object.go
+++ b/state/state_object.go
@@ -290,7 +290,7 @@ func (c *StateObject) Init() Code {
return c.initCode
}
-func (self *StateObject) Trie() *trie.Trie {
+func (self *StateObject) Trie() *trie.SecureTrie {
return self.State.trie
}
diff --git a/state/statedb.go b/state/statedb.go
index ff8242e1a..1231b4c1d 100644
--- a/state/statedb.go
+++ b/state/statedb.go
@@ -18,7 +18,7 @@ var statelogger = logger.NewLogger("STATE")
// * Accounts
type StateDB struct {
db ethutil.Database
- trie *trie.Trie
+ trie *trie.SecureTrie
stateObjects map[string]*StateObject
@@ -29,7 +29,7 @@ type StateDB struct {
// Create a new state from a given trie
func New(root []byte, db ethutil.Database) *StateDB {
- trie := trie.New(ethutil.CopyBytes(root), db)
+ trie := trie.NewSecure(ethutil.CopyBytes(root), db)
return &StateDB{db: db, trie: trie, stateObjects: make(map[string]*StateObject), refund: make(map[string]*big.Int)}
}
@@ -239,6 +239,10 @@ func (s *StateDB) Root() []byte {
return s.trie.Root()
}
+func (s *StateDB) Trie() *trie.SecureTrie {
+ return s.trie
+}
+
// Resets the trie and all siblings
func (s *StateDB) Reset() {
s.trie.Reset()