poanetwork
/
quorum
mirror of https://github.com/poanetwork/quorum.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'hotfix/2' into develop

This commit is contained in:
obscuren 2014-05-20 22:05:04 +02:00
parent de87e436ab 3b38df085e
commit 27aae60381
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ethchain/block.go
View File

@ -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 {