aboutsummaryrefslogtreecommitdiffstats
path: root/state
diff options
context:
space:
mode:
authorobscuren <geffobscura@gmail.com>2014-11-12 08:36:36 +0800
committerobscuren <geffobscura@gmail.com>2014-11-12 08:36:36 +0800
commit60cdb1148c404218846fd39331690658168f4e04 (patch)
tree229e68d7dfdaccb12e0b6b9ff19c5c14b9f9c603 /state
parent9bb1ac7564ff0588f33a1eb43e76f40664d9e527 (diff)
downloaddexon-60cdb1148c404218846fd39331690658168f4e04.tar.gz
dexon-60cdb1148c404218846fd39331690658168f4e04.tar.zst
dexon-60cdb1148c404218846fd39331690658168f4e04.zip
Transaction execution fixes
Diffstat (limited to 'state')
-rw-r--r--state/dump.go2
-rw-r--r--state/state.go2
-rw-r--r--state/state_object.go4
3 files changed, 4 insertions, 4 deletions
diff --git a/state/dump.go b/state/dump.go
index a7057b445..be3b362c4 100644
--- a/state/dump.go
+++ b/state/dump.go
@@ -22,7 +22,7 @@ type World struct {
func (self *State) Dump() []byte {
world := World{
- Root: ethutil.Bytes2Hex(self.Trie.Root.([]byte)),
+ Root: ethutil.Bytes2Hex(self.Trie.GetRoot()),
Accounts: make(map[string]Account),
}
diff --git a/state/state.go b/state/state.go
index e3012f019..3abf1545b 100644
--- a/state/state.go
+++ b/state/state.go
@@ -302,7 +302,7 @@ func (self *State) Update() {
if deleted {
valid, t2 := trie.ParanoiaCheck(self.Trie)
if !valid {
- statelogger.Infof("Warn: PARANOIA: Different state root during copy %x vs %x\n", self.Trie.Root, t2.Root)
+ statelogger.Infof("Warn: PARANOIA: Different state root during copy %x vs %x\n", self.Trie.GetRoot(), t2.GetRoot())
self.Trie = t2
}
diff --git a/state/state_object.go b/state/state_object.go
index dde058e12..5ce74c434 100644
--- a/state/state_object.go
+++ b/state/state_object.go
@@ -160,7 +160,7 @@ func (self *StateObject) Sync() {
valid, t2 := trie.ParanoiaCheck(self.State.Trie)
if !valid {
- statelogger.Infof("Warn: PARANOIA: Different state storage root during copy %x vs %x\n", self.State.Trie.Root, t2.Root)
+ statelogger.Infof("Warn: PARANOIA: Different state storage root during copy %x vs %x\n", self.State.Root(), t2.GetRoot())
self.State.Trie = t2
}
@@ -301,7 +301,7 @@ func (self *StateObject) CreateOutputForDiff() {
// State object encoding methods
func (c *StateObject) RlpEncode() []byte {
- return ethutil.Encode([]interface{}{c.Nonce, c.balance, c.State.Trie.Root, c.CodeHash()})
+ return ethutil.Encode([]interface{}{c.Nonce, c.balance, c.Root(), c.CodeHash()})
}
func (c *StateObject) CodeHash() ethutil.Bytes {