merge upstream

2014-06-23 13:07:43 +01:00
parent 63157c798d d890258af6
commit f58c7ac5a6
8 changed files with 119 additions and 62 deletions
@@ -244,6 +244,14 @@ func (c *PStateObject) Script() string {
 	return ""
 }

+func (c *PStateObject) HexScript() string {
+	if c.object != nil {
+		return ethutil.Hex(c.object.Script())
+	}
+
+	return ""
+}
+
 type PStorageState struct {
 	StateAddress string
 	Address      string