From 0382a2cc66276bb37d121be15282a29d92c989c4 Mon Sep 17 00:00:00 2001
From: Sunny <sunny2022.za@gmail.com>
Date: Fri, 19 May 2023 18:15:17 +0800
Subject: [PATCH] fix: separate Berlin and Hertz block in config

---
 params/config.go | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/params/config.go b/params/config.go
index 20484c5738..e976ffe96d 100644
--- a/params/config.go
+++ b/params/config.go
@@ -194,8 +194,9 @@ var (
 		// TODO Caution !!! it should be very careful !!!
 		LubanBlock: nil,
 		PlatoBlock: nil,
-		// TODO modify blockNumber, this block should enable Berlin and London EIPs.
-		HertzBlock: nil,
+		// TODO modify blockNumber, make sure the Hertz block number is equal to BerlinBlock for enabling Berlin EIPs
+		BerlinBlock: nil,
+		HertzBlock:  nil,
 
 		Parlia: &ParliaConfig{
 			Period: 3,
@@ -226,9 +227,10 @@ var (
 
 		// TODO modify blockNumber, make sure the blockNumber is not an integer multiple of 200 (epoch number)
 		// TODO Caution !!! it should be very careful !!!
-		LubanBlock: big.NewInt(29295050),
-		PlatoBlock: big.NewInt(29861024),
-		HertzBlock: nil,
+		LubanBlock:  big.NewInt(29295050),
+		PlatoBlock:  big.NewInt(29861024),
+		BerlinBlock: nil,
+		HertzBlock:  nil,
 
 		Parlia: &ParliaConfig{
 			Period: 3,
@@ -258,9 +260,10 @@ var (
 		PlanckBlock:         nil,
 
 		// TODO
-		LubanBlock: nil,
-		PlatoBlock: nil,
-		HertzBlock: nil,
+		LubanBlock:  nil,
+		PlatoBlock:  nil,
+		BerlinBlock: nil,
+		HertzBlock:  nil,
 
 		Parlia: &ParliaConfig{
 			Period: 3,
@@ -604,9 +607,6 @@ func (c *ChainConfig) IsIstanbul(num *big.Int) bool {
 // IsBerlin returns whether num is either equal to the Berlin fork block or greater.
 func (c *ChainConfig) IsBerlin(num *big.Int) bool {
 	// Check if it is Hertz, which works on BSC
-	if c.IsHertz(num) {
-		return true
-	}
 	return isForked(c.BerlinBlock, num)
 }