diff options
| author | obscuren <geffobscura@gmail.com> | 2014-10-08 18:06:39 +0800 |
|---|---|---|
| committer | obscuren <geffobscura@gmail.com> | 2014-10-08 18:06:39 +0800 |
| commit | 9d86a49a7327199c01977f3372c8adf748252c32 (patch) | |
| tree | a07141b5910df83e6284713149f9173c31ce247b /ethchain/block.go | |
| parent | f3196c915a6f8ddde1d2e178ad419a114b608b91 (diff) | |
| download | go-tangerine-9d86a49a7327199c01977f3372c8adf748252c32.tar go-tangerine-9d86a49a7327199c01977f3372c8adf748252c32.tar.gz go-tangerine-9d86a49a7327199c01977f3372c8adf748252c32.tar.bz2 go-tangerine-9d86a49a7327199c01977f3372c8adf748252c32.tar.lz go-tangerine-9d86a49a7327199c01977f3372c8adf748252c32.tar.xz go-tangerine-9d86a49a7327199c01977f3372c8adf748252c32.tar.zst go-tangerine-9d86a49a7327199c01977f3372c8adf748252c32.zip | |
Renamed Sha3Bin to Sha3
Diffstat (limited to 'ethchain/block.go')
| -rw-r--r-- | ethchain/block.go | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/ethchain/block.go b/ethchain/block.go index 5e8aca33a..d6ff5ef7e 100644 --- a/ethchain/block.go +++ b/ethchain/block.go @@ -144,12 +144,12 @@ func CreateBlock(root interface{}, // Returns a hash of the block func (block *Block) Hash() ethutil.Bytes { - return ethcrypto.Sha3Bin(ethutil.NewValue(block.header()).Encode()) - //return ethcrypto.Sha3Bin(block.Value().Encode()) + return ethcrypto.Sha3(ethutil.NewValue(block.header()).Encode()) + //return ethcrypto.Sha3(block.Value().Encode()) } func (block *Block) HashNoNonce() []byte { - return ethcrypto.Sha3Bin(ethutil.Encode([]interface{}{block.PrevHash, + return ethcrypto.Sha3(ethutil.Encode([]interface{}{block.PrevHash, block.UncleSha, block.Coinbase, block.state.Trie.Root, block.TxSha, block.Difficulty, block.Number, block.MinGasPrice, block.GasLimit, block.GasUsed, block.Time, block.Extra})) @@ -237,7 +237,7 @@ func (block *Block) SetUncles(uncles []*Block) { block.Uncles = uncles // Sha of the concatenated uncles - block.UncleSha = ethcrypto.Sha3Bin(ethutil.Encode(block.rlpUncles())) + block.UncleSha = ethcrypto.Sha3(ethutil.Encode(block.rlpUncles())) } func (self *Block) SetReceipts(receipts []*Receipt, txs []*Transaction) { |