Merge pull request #14733 from karalabe/metro-eip100

consensus/ethash, core: implement Metropolis EIP 100
2017-07-17 12:43:13 +03:00
parent a56f3dc0d9 8c313eed26
commit c65f10a17b
2 changed files with 70 additions and 12 deletions
--- a/core/chain_makers.go
+++ b/core/chain_makers.go
@ -218,6 +218,7 @@ func makeHeader(config *params.ChainConfig, parent *types.Block, state *state.St
 			Number:     parent.Number(),
 			Time:       new(big.Int).Sub(time, big.NewInt(10)),
 			Difficulty: parent.Difficulty(),
+			UncleHash:  parent.UncleHash(),
 		}),
 		GasLimit: CalcGasLimit(parent),
 		GasUsed:  new(big.Int),