diff options
| author | obscuren <geffobscura@gmail.com> | 2014-05-21 04:04:58 +0800 |
|---|---|---|
| committer | obscuren <geffobscura@gmail.com> | 2014-05-21 04:04:58 +0800 |
| commit | 7dae955c1a66792bd345c24bace22b69cff8f8a9 (patch) | |
| tree | 51ebdf31ab7be376d226a64d4156967c826fe7c6 | |
| parent | e837c9ab3fc94979dd79df9b70a3e7fda74263b9 (diff) | |
| parent | 3b38df085ebebd68f1bf76c11c8b87ae75f29fe2 (diff) | |
| download | dexon-7dae955c1a66792bd345c24bace22b69cff8f8a9.tar dexon-7dae955c1a66792bd345c24bace22b69cff8f8a9.tar.gz dexon-7dae955c1a66792bd345c24bace22b69cff8f8a9.tar.bz2 dexon-7dae955c1a66792bd345c24bace22b69cff8f8a9.tar.lz dexon-7dae955c1a66792bd345c24bace22b69cff8f8a9.tar.xz dexon-7dae955c1a66792bd345c24bace22b69cff8f8a9.tar.zst dexon-7dae955c1a66792bd345c24bace22b69cff8f8a9.zip | |
Merge branch 'hotfix/2'
| -rw-r--r-- | ethchain/block.go | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/ethchain/block.go b/ethchain/block.go index bdb243286..24ff5a32f 100644 --- 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 { |