Merge branch 'hotfix/2' into develop

ethchain/block.go

@@ -223,7 +223,15 @@ func (block *Block) SetTransactions(txs []*Transaction) {
 		trie.Update(strconv.Itoa(i), string(tx.RlpEncode()))
 	}
 
+	switch trie.Root.(type) {
+	case string:
 		block.TxSha = []byte(trie.Root.(string))
+	case []byte:
+		block.TxSha = trie.Root.([]byte)
+	default:
+		panic(fmt.Sprintf("invalid root type %T", trie.Root))
+	}
+
 }
 
 func (block *Block) Value() *ethutil.Value {