gaspersic/go-ethereum
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Transaction execution fixes

Browse Source
This commit is contained in:
obscuren
2014-11-12 01:36:36 +01:00
parent 9bb1ac7564
commit 60cdb1148c
12 changed files with 61 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
state/dump.go
View File

@@ -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),
}

2
state/state.go
View File

@@ -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
}

4
state/state_object.go
View File

@@ -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 {