From 63628618eb7155120084bf1c8859cf29855101f3 Mon Sep 17 00:00:00 2001
From: Andrew Ashikhmin <34320705+yperbasis@users.noreply.github.com>
Date: Tue, 29 Aug 2023 16:29:14 +0200
Subject: [PATCH] Small fixes to Holesky config (#8092)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Small fixes to PR #8064:

- Don't set cancunTime for Holesky – otherwise we'll have to overwrite
it later using the `--override.cancun` flag
- We don't have block snapshots for Holesky yet
- Add Holesky to `isChainIDPoS`

See https://github.com/eth-clients/holesky/pull/68
---
 eth/ethconfig/config.go        | 1 -
 params/chainspecs/holesky.json | 3 +--
 params/config.go               | 1 +
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/eth/ethconfig/config.go b/eth/ethconfig/config.go
index dae833785..5750e1000 100644
--- a/eth/ethconfig/config.go
+++ b/eth/ethconfig/config.go
@@ -261,7 +261,6 @@ type Sync struct {
 // Chains where snapshots are enabled by default
 var ChainsWithSnapshots = map[string]struct{}{
 	networkname.MainnetChainName:    {},
-	networkname.HoleskyChainName:    {},
 	networkname.SepoliaChainName:    {},
 	networkname.GoerliChainName:     {},
 	networkname.MumbaiChainName:     {},
diff --git a/params/chainspecs/holesky.json b/params/chainspecs/holesky.json
index fba46d770..da1185b1e 100644
--- a/params/chainspecs/holesky.json
+++ b/params/chainspecs/holesky.json
@@ -13,6 +13,5 @@
   "mergeForkBlock": 0,
   "terminalTotalDifficulty": 0,
   "terminalTotalDifficultyPassed": true,
-  "shanghaiTime": 1694884704,
-  "cancunTime": 2000000000
+  "shanghaiTime": 1694884704
 }
\ No newline at end of file
diff --git a/params/config.go b/params/config.go
index 70a33d302..b5593605a 100644
--- a/params/config.go
+++ b/params/config.go
@@ -286,6 +286,7 @@ func IsChainPoS(chainConfig *chain.Config, currentTDProvider func() *big.Int) bo
 func isChainIDPoS(chainID *big.Int) bool {
 	ids := []*big.Int{
 		MainnetChainConfig.ChainID,
+		HoleskyChainConfig.ChainID,
 		GoerliChainConfig.ChainID,
 		SepoliaChainConfig.ChainID,
 		GnosisChainConfig.ChainID,