Merge branch 'hotfix/2'

2014-05-20 22:04:58 +02:00 · 2014-05-20 22:04:58 +02:00 · 7dae955c1a
parent e837c9ab3f 3b38df085e
commit 7dae955c1a
1 changed files with 9 additions and 1 deletions
--- a/ethchain/block.go
+++ b/ethchain/block.go
@ -223,7 +223,15 @@ func (block *Block) SetTransactions(txs []*Transaction) {
 		trie.Update(strconv.Itoa(i), string(tx.RlpEncode()))
 	}

-	block.TxSha = []byte(trie.Root.(string))
+	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 {