Commit 6b92d541 authored by obscuren's avatar obscuren

Empty string for uncle

parent 520fdfe3
......@@ -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) {
......
......@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment