Merge pull request #19473 from karalabe/geth-1.8.27v1.8.27

[1.8.27 backport] eth, les, light: enforce CHT checkpoints on fast-sync too

2 files changed, 1 insertions, 9 deletions

diff --git a/light/lightchain.go b/light/lightchain.go
index 977f497a7..c9143c05f 100644
--- a/light/lightchain.go
+++ b/light/lightchain.go
@@ -100,7 +100,7 @@ func NewLightChain(odr OdrBackend, config *params.ChainConfig, engine consensus.
 	if bc.genesisBlock == nil {
 		return nil, core.ErrNoGenesis
 	}
-	if cp, ok := trustedCheckpoints[bc.genesisBlock.Hash()]; ok {
+	if cp, ok := params.TrustedCheckpoints[bc.genesisBlock.Hash()]; ok {
 		bc.addTrustedCheckpoint(cp)
 	}
 	if err := bc.loadLastState(); err != nil {
diff --git a/light/postprocess.go b/light/postprocess.go
index 24fe47bc7..8e0495566 100644
--- a/light/postprocess.go
+++ b/light/postprocess.go
@@ -104,14 +104,6 @@ var (
 	}
 )
 
-// trustedCheckpoints associates each known checkpoint with the genesis hash of the chain it belongs to
-var trustedCheckpoints = map[common.Hash]*params.TrustedCheckpoint{
-	params.MainnetGenesisHash: params.MainnetTrustedCheckpoint,
-	params.TestnetGenesisHash: params.TestnetTrustedCheckpoint,
-	params.RinkebyGenesisHash: params.RinkebyTrustedCheckpoint,
-	params.GoerliGenesisHash:  params.GoerliTrustedCheckpoint,
-}
-
 var (
 	ErrNoTrustedCht       = errors.New("no trusted canonical hash trie")
 	ErrNoTrustedBloomTrie = errors.New("no trusted bloom trie")