Merge branch 'hotfix/3'

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

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