diff options
| author | obscuren <geffobscura@gmail.com> | 2014-10-21 19:30:23 +0800 |
|---|---|---|
| committer | obscuren <geffobscura@gmail.com> | 2014-10-21 19:30:23 +0800 |
| commit | 6b92d541dabc289043529f65e586e40c4613e7f8 (patch) | |
| tree | 173a00244281cce72a63cbb422b72a460db2c576 | |
| parent | 520fdfe346ab51708f4f1fdfd0b2e42cc919e613 (diff) | |
| download | dexon-6b92d541dabc289043529f65e586e40c4613e7f8.tar dexon-6b92d541dabc289043529f65e586e40c4613e7f8.tar.gz dexon-6b92d541dabc289043529f65e586e40c4613e7f8.tar.bz2 dexon-6b92d541dabc289043529f65e586e40c4613e7f8.tar.lz dexon-6b92d541dabc289043529f65e586e40c4613e7f8.tar.xz dexon-6b92d541dabc289043529f65e586e40c4613e7f8.tar.zst dexon-6b92d541dabc289043529f65e586e40c4613e7f8.zip | |
Empty string for uncle
| -rw-r--r-- | ethchain/block.go | 8 | ||||
| -rw-r--r-- | 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 |