interesting
/
go-ethereum
mirror of https://github.com/ethereum/go-ethereum.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'hotfix/3'

This commit is contained in:
obscuren 2014-05-20 22:44:05 +02:00
parent 7dae955c1a 64701e388c
commit 47fd4833ee
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ethchain/state.go
View File

@ -61,9 +61,6 @@ func (s *State) GetStateObject(addr []byte) *StateObject {
cachedStateObject := s.states[string(addr)] cachedStateObject := s.states[string(addr)]
if cachedStateObject != nil { if cachedStateObject != nil {
stateObject.state = cachedStateObject stateObject.state = cachedStateObject
} else {
// If it isn't cached, cache the state
s.states[string(addr)] = stateObject.state
} }
return stateObject return stateObject

8
ethpub/types.go
View File

@ -104,6 +104,14 @@ func (c *PStateObject) Nonce() int {
return 0 return 0
} }
func (c *PStateObject) Root() string {
if c.object != nil {
return ethutil.Hex(ethutil.NewValue(c.object.State().Root()).Bytes())
}
return "<err>"
}
func (c *PStateObject) IsContract() bool { func (c *PStateObject) IsContract() bool {
if c.object != nil { if c.object != nil {
return len(c.object.Script()) > 0 return len(c.object.Script()) > 0