Commit 6b92d541 authored by obscuren's avatar obscuren

Empty string for uncle

parent 520fdfe3
...@@ -130,7 +130,7 @@ func CreateBlock(root interface{}, ...@@ -130,7 +130,7 @@ func CreateBlock(root interface{},
Nonce: Nonce, Nonce: Nonce,
Time: time.Now().Unix(), Time: time.Now().Unix(),
Extra: extra, Extra: extra,
UncleSha: EmptyShaList, //nil, UncleSha: nil,
GasUsed: new(big.Int), GasUsed: new(big.Int),
MinGasPrice: new(big.Int), MinGasPrice: new(big.Int),
GasLimit: new(big.Int), GasLimit: new(big.Int),
...@@ -237,9 +237,9 @@ func (block *Block) SetUncles(uncles []*Block) { ...@@ -237,9 +237,9 @@ func (block *Block) SetUncles(uncles []*Block) {
block.Uncles = uncles block.Uncles = uncles
// Sha of the concatenated uncles // Sha of the concatenated uncles
//if len(uncles) > 0 { if len(uncles) > 0 {
// block.UncleSha = ethcrypto.Sha3(ethutil.Encode(block.rlpUncles())) block.UncleSha = ethcrypto.Sha3(ethutil.Encode(block.rlpUncles()))
//} }
} }
func (self *Block) SetReceipts(receipts []*Receipt, txs []*Transaction) { func (self *Block) SetReceipts(receipts []*Receipt, txs []*Transaction) {
......
...@@ -18,9 +18,8 @@ var EmptyShaList = ethcrypto.Sha3(ethutil.Encode([]interface{}{})) ...@@ -18,9 +18,8 @@ var EmptyShaList = ethcrypto.Sha3(ethutil.Encode([]interface{}{}))
var GenesisHeader = []interface{}{ var GenesisHeader = []interface{}{
// Previous hash (none) // Previous hash (none)
ZeroHash256, ZeroHash256,
ethcrypto.Sha3(ethutil.Encode([]interface{}{})),
// Empty uncles // Empty uncles
//"", "",
// Coinbase // Coinbase
ZeroHash160, ZeroHash160,
// Root state // 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