Revert "tweak empty block logic"

This reverts commit 46857f0.

Author: colinlyguo

miner/worker.go

@@ -469,7 +469,7 @@ func (w *worker) newWorkLoop(recommit time.Duration) {
 		case head := <-w.chainHeadCh:
 			clearPending(head.Block.NumberU64())
 			timestamp = time.Now().Unix()
-			commit(true, commitInterruptNewHead)
+			commit(false, commitInterruptNewHead)
 
 		case <-timer.C:
 			// If mining is running resubmit a new work cycle periodically to pull in
@@ -480,7 +480,7 @@ func (w *worker) newWorkLoop(recommit time.Duration) {
 					timer.Reset(recommit)
 					continue
 				}
-				commit(true, commitInterruptResubmit)
+				commit(false, commitInterruptResubmit)
 			}
 
 		case interval := <-w.resubmitIntervalCh:
@@ -1467,9 +1467,9 @@ func (w *worker) commitNewWork(interrupt *int32, noempty bool, timestamp int64)
 	}
 
 	// do not produce empty blocks
-	// if w.current.tcount == 0 {
-	//   return
-	// }
+	if w.current.tcount == 0 {
+		return
+	}
 
 	w.commit(uncles, w.fullTaskHook, true, tstart)
 }

params/version.go

@@ -23,9 +23,9 @@ import (
 
 const (
 	VersionMajor = 5         // Major version component of the current release
-	VersionMinor = 2         // Minor version component of the current release
-	VersionPatch = 1         // Patch version component of the current release
-	VersionMeta  = "4844-v1" // Version metadata to append to the version string
+	VersionMinor = 1         // Minor version component of the current release
+	VersionPatch = 31        // Patch version component of the current release
+	VersionMeta  = "4844-v0" // Version metadata to append to the version string
 )
 
 // Version holds the textual version string.