poanetwork
/
quorum
mirror of https://github.com/poanetwork/quorum.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Empty string for uncle

This commit is contained in:
obscuren 2014-10-21 13:30:23 +02:00
parent 520fdfe346
commit 6b92d541da
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ethchain/block.go
View File

@ -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) {

3
ethchain/genesis.go
View File

@ -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