merge upstream

2 files changed, 10 insertions, 1 deletions

diff --git a/ethutil/config.go b/ethutil/config.go
index 8a005670f..675175cdd 100644
--- a/ethutil/config.go
+++ b/ethutil/config.go
@@ -14,6 +14,7 @@ type config struct {
 
 	ExecPath     string
 	Debug        bool
+	Paranoia     bool
 	Ver          string
 	ClientString string
 	Identifier   string
@@ -43,7 +44,7 @@ func ReadConfig(ConfigFile string, Datadir string, Identifier string, EnvPrefix
 		} else {
 			g.ParseAll()
 		}
-		Config = &config{ExecPath: Datadir, Debug: true, Ver: "0.5.15", conf: g, Identifier: Identifier}
+		Config = &config{ExecPath: Datadir, Debug: true, Ver: "0.5.15", conf: g, Identifier: Identifier, Paranoia: true}
 		Config.SetClientString("Ethereum(G)")
 	}
 	return Config
diff --git a/ethutil/value.go b/ethutil/value.go
index ddd864d8a..b37b33c28 100644
--- a/ethutil/value.go
+++ b/ethutil/value.go
@@ -116,6 +116,8 @@ func (val *Value) Bytes() []byte {
 		return a
 	} else if s, ok := val.Val.(byte); ok {
 		return []byte{s}
+	} else if s, ok := val.Val.(string); ok {
+		return []byte(s)
 	}
 
 	return []byte{}
@@ -196,6 +198,12 @@ func (val *Value) Encode() []byte {
 	return Encode(val.Val)
 }
 
+// Assume that the data we have is encoded
+func (self *Value) Decode() {
+	v, _ := Decode(self.Bytes(), 0)
+	self.Val = v
+}
+
 func NewValueFromBytes(data []byte) *Value {
 	if len(data) != 0 {
 		data, _ := Decode(data, 0)