diff --git a/miner/scroll_worker.go b/miner/scroll_worker.go index ffd7b7890bf..17faa527b0f 100644 --- a/miner/scroll_worker.go +++ b/miner/scroll_worker.go @@ -414,8 +414,10 @@ func (w *worker) mainLoop() { // already included in the current mining block. These transactions will // be automatically eliminated. if w.current != nil { - shouldCommit, _ := w.processTxnSlice(ev.Txs) - if shouldCommit || (w.current.deadlineReached && len(w.current.txs) > 0) { + // Note: We ignore shouldCommit and commit based on len(w.current.txs) instead. + w.processTxnSlice(ev.Txs) + // Note: We must wait for the deadline to avoid creating a block with a future timestamp. + if w.current.deadlineReached && len(w.current.txs) > 0 { _, err = w.commit() } } diff --git a/params/version.go b/params/version.go index 25e472d7298..8a779174ef3 100644 --- a/params/version.go +++ b/params/version.go @@ -24,7 +24,7 @@ import ( const ( VersionMajor = 5 // Major version component of the current release VersionMinor = 9 // Minor version component of the current release - VersionPatch = 5 // Patch version component of the current release + VersionPatch = 6 // Patch version component of the current release VersionMeta = "mainnet" // Version metadata to append to the version string )