diff options
| author | obscuren <geffobscura@gmail.com> | 2014-05-21 04:44:10 +0800 |
|---|---|---|
| committer | obscuren <geffobscura@gmail.com> | 2014-05-21 04:44:10 +0800 |
| commit | 6ba534af927a17a970978cb5f538f4933aca792b (patch) | |
| tree | 4ac7be0f58dfb37c8302277673ab2b4cb79a01ac | |
| parent | 27aae603817d2fed69099184b56f04c3d29fe2c6 (diff) | |
| parent | 64701e388c3f603a4fad5b6ff45ba2633b3f645e (diff) | |
| download | dexon-6ba534af927a17a970978cb5f538f4933aca792b.tar dexon-6ba534af927a17a970978cb5f538f4933aca792b.tar.gz dexon-6ba534af927a17a970978cb5f538f4933aca792b.tar.bz2 dexon-6ba534af927a17a970978cb5f538f4933aca792b.tar.lz dexon-6ba534af927a17a970978cb5f538f4933aca792b.tar.xz dexon-6ba534af927a17a970978cb5f538f4933aca792b.tar.zst dexon-6ba534af927a17a970978cb5f538f4933aca792b.zip | |
Merge branch 'hotfix/3' into develop
| -rw-r--r-- | ethchain/state.go | 3 | ||||
| -rw-r--r-- | ethpub/types.go | 8 |
2 files changed, 8 insertions, 3 deletions
diff --git a/ethchain/state.go b/ethchain/state.go index 63c4a32a6..db715f1cb 100644 --- a/ethchain/state.go +++ b/ethchain/state.go @@ -61,9 +61,6 @@ func (s *State) GetStateObject(addr []byte) *StateObject { cachedStateObject := s.states[string(addr)] if cachedStateObject != nil { stateObject.state = cachedStateObject - } else { - // If it isn't cached, cache the state - s.states[string(addr)] = stateObject.state } return stateObject diff --git a/ethpub/types.go b/ethpub/types.go index 5d3bfcaaa..77cca78b9 100644 --- a/ethpub/types.go +++ b/ethpub/types.go @@ -104,6 +104,14 @@ func (c *PStateObject) Nonce() int { 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 { if c.object != nil { return len(c.object.Script()) > 0 |