From 6b92d541dabc289043529f65e586e40c4613e7f8 Mon Sep 17 00:00:00 2001 From: obscuren Date: Tue, 21 Oct 2014 13:30:23 +0200 Subject: Empty string for uncle --- ethchain/block.go | 8 ++++---- ethchain/genesis.go | 3 +-- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/ethchain/block.go b/ethchain/block.go index fc7c6b13f..951bd8de3 100644 --- a/ethchain/block.go +++ b/ethchain/block.go @@ -130,7 +130,7 @@ func CreateBlock(root interface{}, Nonce: Nonce, Time: time.Now().Unix(), Extra: extra, - UncleSha: EmptyShaList, //nil, + UncleSha: nil, GasUsed: new(big.Int), MinGasPrice: new(big.Int), GasLimit: new(big.Int), @@ -237,9 +237,9 @@ func (block *Block) SetUncles(uncles []*Block) { block.Uncles = uncles // Sha of the concatenated uncles - //if len(uncles) > 0 { - // block.UncleSha = ethcrypto.Sha3(ethutil.Encode(block.rlpUncles())) - //} + if len(uncles) > 0 { + block.UncleSha = ethcrypto.Sha3(ethutil.Encode(block.rlpUncles())) + } } func (self *Block) SetReceipts(receipts []*Receipt, txs []*Transaction) { diff --git a/ethchain/genesis.go b/ethchain/genesis.go index ab6469bb4..8a6cb5527 100644 --- a/ethchain/genesis.go +++ b/ethchain/genesis.go @@ -18,9 +18,8 @@ var EmptyShaList = ethcrypto.Sha3(ethutil.Encode([]interface{}{})) var GenesisHeader = []interface{}{ // Previous hash (none) ZeroHash256, - ethcrypto.Sha3(ethutil.Encode([]interface{}{})), // Empty uncles - //"", + "", // Coinbase ZeroHash160, // Root state -- cgit v1.2.3