Merge pull request #1810 from 0xPolygon/v2.3.1-hotfix-2

V2.3.1 hotfix 2

Author: cffls

consensus/bor/bor.go

@@ -1203,11 +1203,12 @@ func (c *Bor) Seal(chain consensus.ChainHeaderReader, block *types.Block, witnes
 	// Sweet, the protocol permits us to sign the block, wait for our time
 	if c.config.IsBhilai(header.Number) {
 		delay = time.Until(time.Unix(int64(header.Time), 0)) // Wait until we reach header time for non-primary validators
-		if successionNumber == 0 {
-			// For primary producers, set the delay to `header.Time - block time` instead of `header.Time`
-			// for early block announcement instead of waiting for full block time.
-			delay = time.Until(time.Unix(int64(header.Time-c.config.CalculatePeriod(number)), 0))
-		}
+		// Disable early block announcement
+		// if successionNumber == 0 {
+		// 	// For primary producers, set the delay to `header.Time - block time` instead of `header.Time`
+		// 	// for early block announcement instead of waiting for full block time.
+		// 	delay = time.Until(time.Unix(int64(header.Time-c.config.CalculatePeriod(number)), 0))
+		// }
 	} else {
 		delay = time.Until(time.Unix(int64(header.Time), 0)) // Wait until we reach header time
 	}

miner/worker.go

@@ -1555,7 +1555,12 @@ func (w *worker) commitWork(interrupt *atomic.Int32, noempty bool, timestamp int
 
 	// Create an empty block based on temporary copied state for
 	// sealing in advance without waiting block execution finished.
-	if !noempty && !w.noempty.Load() {
+	// If the block is a veblop block, we will never try to create a commit for an empty block.
+	var isRio bool
+	if w.chainConfig.Bor != nil {
+		isRio = w.chainConfig.Bor.IsRio(work.header.Number)
+	}
+	if !noempty && !w.noempty.Load() && !isRio {
 		_ = w.commit(work.copy(), nil, false, start)
 	}
 	// Fill pending transactions from the txpool into the block.

params/version.go

@@ -23,10 +23,10 @@ import (
 )
 
 const (
-	VersionMajor = 2           // Major version component of the current release
-	VersionMinor = 3           // Minor version component of the current release
-	VersionPatch = 1           // Patch version component of the current release
-	VersionMeta  = "miner-fix" // Version metadata to append to the version string
+	VersionMajor = 2        // Major version component of the current release
+	VersionMinor = 3        // Minor version component of the current release
+	VersionPatch = 1        // Patch version component of the current release
+	VersionMeta  = "hotfix" // Version metadata to append to the version string
 )
 
 var (