From 4f926086eeb74192b69284ce9471945b2dd1f57a Mon Sep 17 00:00:00 2001 From: Chris Purta Date: Fri, 6 Jul 2018 10:40:43 -0700 Subject: [PATCH] Use genesis difficulty for private networks --- consensus/ethash/consensus.go | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/consensus/ethash/consensus.go b/consensus/ethash/consensus.go index 99eec82211..c24e6d2cb8 100644 --- a/consensus/ethash/consensus.go +++ b/consensus/ethash/consensus.go @@ -297,6 +297,8 @@ func (ethash *Ethash) CalcDifficulty(chain consensus.ChainReader, time uint64, p func CalcDifficulty(config *params.ChainConfig, time uint64, parent *types.Header) *big.Int { next := new(big.Int).Add(parent.Number, big1) switch { + case isPrivateNetwork(config): + return parent.Difficulty case config.IsByzantium(next): return calcDifficultyByzantium(time, parent) case config.IsHomestead(next): @@ -306,6 +308,15 @@ func CalcDifficulty(config *params.ChainConfig, time uint64, parent *types.Heade } } +// isPrivateNetwork is a helper function to determine if the current +// chain is a private network or not based on the configurations +// ChainID. +func isPrivateNetwork(config *params.ChainConfig) bool { + return config.ChainID != params.MainnetChainConfig.ChainID || + config.ChainID != params.TestChainConfig.ChainID || + config.ChainID != params.RinkebyChainConfig.ChainID +} + // Some weird constants to avoid constant memory allocs for them. var ( expDiffPeriod = big.NewInt(100000)