consensus/bor,internal/cli,params: add header timestamp fix when in past

Author: Raneet10

consensus/bor/bor.go

@@ -932,7 +932,11 @@ func (c *Bor) Prepare(chain consensus.ChainHeaderReader, header *types.Header) e
 
 	header.Time = parent.Time + CalcProducerDelay(number, succession, c.config)
 	if header.Time < uint64(time.Now().Unix()) {
-		header.Time = uint64(time.Now().Unix()) + CalcProducerDelay(number, succession, c.config)
+		if c.config.IsTimestampHF(big.NewInt(int64(number))) {
+			header.Time = uint64(time.Now().Unix()) + CalcProducerDelay(number, succession, c.config)
+		} else {
+			header.Time = uint64(time.Now().Unix())
+		}
 	} else {
 		// For primary validators, wait until the current block production window
 		// starts. This prevents bor from starting to build next block before time

internal/cli/server/chains/amoy.go

@@ -34,7 +34,8 @@ var amoyTestnet = &Chain{
 				DelhiBlock:     big.NewInt(73100),
 				IndoreBlock:    big.NewInt(73100),
 				AhmedabadBlock: big.NewInt(11865856),
-				BhilaiBlock:    big.NewInt(22765056),
+				BhilaiBlock:      big.NewInt(22765056),
+				TimestampHFBlock: big.NewInt(999999999999),
 				StateSyncConfirmationDelay: map[string]uint64{
 					"0": 128,
 				},

internal/cli/server/chains/mainnet.go

@@ -35,7 +35,8 @@ var mainnetBor = &Chain{
 				DelhiBlock:     big.NewInt(38189056),
 				IndoreBlock:    big.NewInt(44934656),
 				AhmedabadBlock: big.NewInt(62278656),
-				BhilaiBlock:    big.NewInt(73440256),
+				BhilaiBlock:      big.NewInt(73440256),
+				TimestampHFBlock: big.NewInt(999999999999),
 				StateSyncConfirmationDelay: map[string]uint64{
 					"44934656": 128,
 				},

internal/cli/server/chains/mumbai.go

@@ -35,8 +35,9 @@ var mumbaiTestnet = &Chain{
 				DelhiBlock:     big.NewInt(29638656),
 				IndoreBlock:    big.NewInt(37075456),
 				AhmedabadBlock: big.NewInt(48467456),
-				BhilaiBlock:    big.NewInt(48467456),
-				RioBlock:       big.NewInt(48473856),
+				BhilaiBlock:      big.NewInt(48467456),
+				RioBlock:         big.NewInt(48473856),
+				TimestampHFBlock: big.NewInt(999999999999),
 				StateSyncConfirmationDelay: map[string]uint64{
 					"37075456": 128,
 				},

params/config.go

@@ -261,8 +261,9 @@ var (
 			DelhiBlock:     big.NewInt(29638656),
 			IndoreBlock:    big.NewInt(37075456),
 			AhmedabadBlock: big.NewInt(48467456),
-			BhilaiBlock:    big.NewInt(48467456),
-			RioBlock:       big.NewInt(48473856),
+			BhilaiBlock:      big.NewInt(48467456),
+			RioBlock:         big.NewInt(48473856),
+			TimestampHFBlock: big.NewInt(999999999999),
 			StateSyncConfirmationDelay: map[string]uint64{
 				"37075456": 128,
 			},
@@ -336,7 +337,8 @@ var (
 			DelhiBlock:     big.NewInt(73100),
 			IndoreBlock:    big.NewInt(73100),
 			AhmedabadBlock: big.NewInt(11865856),
-			BhilaiBlock:    big.NewInt(22765056),
+			BhilaiBlock:      big.NewInt(22765056),
+			TimestampHFBlock: big.NewInt(999999999999),
 			StateSyncConfirmationDelay: map[string]uint64{
 				"0": 128,
 			},
@@ -414,7 +416,8 @@ var (
 			DelhiBlock:     big.NewInt(38189056),
 			IndoreBlock:    big.NewInt(44934656),
 			AhmedabadBlock: big.NewInt(62278656),
-			BhilaiBlock:    big.NewInt(73440256),
+			BhilaiBlock:      big.NewInt(73440256),
+			TimestampHFBlock: big.NewInt(999999999999),
 			StateSyncConfirmationDelay: map[string]uint64{
 				"44934656": 128,
 			},
@@ -871,6 +874,7 @@ type BorConfig struct {
 	AhmedabadBlock                  *big.Int               `json:"ahmedabadBlock"`             // Ahmedabad switch block (nil = no fork, 0 = already on ahmedabad)
 	BhilaiBlock                     *big.Int               `json:"bhilaiBlock"`                // Bhilai switch block (nil = no fork, 0 = already on bhilai)
 	RioBlock                        *big.Int               `json:"rioBlock"`                   // Rio switch block (nil = no fork, 0 = already on rio)
+	TimestampHFBlock                *big.Int               `json:"timestampHFBlock"`           // Timestamp hardfork switch block (nil = no fork, 0 = already active)
 }
 
 // String implements the stringer interface, returning the consensus engine details.
@@ -922,6 +926,10 @@ func (c *BorConfig) IsRio(number *big.Int) bool {
 	return isBlockForked(c.RioBlock, number)
 }
 
+func (c *BorConfig) IsTimestampHF(number *big.Int) bool {
+	return isBlockForked(c.TimestampHFBlock, number)
+}
+
 // // TODO: modify this function once the block number is finalized
 // func (c *BorConfig) IsNapoli(number *big.Int) bool {
 // 	if c.NapoliBlock != nil {