diff options
| author | obscuren <geffobscura@gmail.com> | 2014-10-21 19:25:31 +0800 |
|---|---|---|
| committer | obscuren <geffobscura@gmail.com> | 2014-10-21 19:25:31 +0800 |
| commit | 520fdfe346ab51708f4f1fdfd0b2e42cc919e613 (patch) | |
| tree | 51e9bef882bee329c18c85102fb98350d5880b0e /ethchain | |
| parent | 10b252dd0517175117d8d4a8ef30b3689a10eda5 (diff) | |
| download | dexon-520fdfe346ab51708f4f1fdfd0b2e42cc919e613.tar dexon-520fdfe346ab51708f4f1fdfd0b2e42cc919e613.tar.gz dexon-520fdfe346ab51708f4f1fdfd0b2e42cc919e613.tar.bz2 dexon-520fdfe346ab51708f4f1fdfd0b2e42cc919e613.tar.lz dexon-520fdfe346ab51708f4f1fdfd0b2e42cc919e613.tar.xz dexon-520fdfe346ab51708f4f1fdfd0b2e42cc919e613.tar.zst dexon-520fdfe346ab51708f4f1fdfd0b2e42cc919e613.zip | |
PoC7 Net
Diffstat (limited to 'ethchain')
| -rw-r--r-- | ethchain/block.go | 6 | ||||
| -rw-r--r-- | ethchain/genesis.go | 3 |
2 files changed, 6 insertions, 3 deletions
diff --git a/ethchain/block.go b/ethchain/block.go index 0fb01ea5b..fc7c6b13f 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, + UncleSha: EmptyShaList, //nil, GasUsed: new(big.Int), MinGasPrice: new(big.Int), GasLimit: new(big.Int), @@ -237,7 +237,9 @@ func (block *Block) SetUncles(uncles []*Block) { block.Uncles = uncles // Sha of the concatenated uncles - 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 3edbf32de..ab6469bb4 100644 --- a/ethchain/genesis.go +++ b/ethchain/genesis.go @@ -18,8 +18,9 @@ var EmptyShaList = ethcrypto.Sha3(ethutil.Encode([]interface{}{})) var GenesisHeader = []interface{}{ // Previous hash (none) ZeroHash256, - // Sha of uncles ethcrypto.Sha3(ethutil.Encode([]interface{}{})), + // Empty uncles + //"", // Coinbase ZeroHash160, // Root state |