forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-07-27 15:16:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

fix: avoid committing empty blocks after the deadline (#1051)

Browse source
This commit is contained in:
Ömer Faruk Irmak 2024-09-20 14:59:23 +03:00 committed by GitHub
parent d599666894
commit c0094ee0b4
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
miner/scroll_worker.go
View file

@ -396,7 +396,7 @@ func (w *worker) mainLoop() {
// be automatically eliminated. // be automatically eliminated.
if w.current != nil { if w.current != nil {
shouldCommit, _ := w.processTxnSlice(ev.Txs) shouldCommit, _ := w.processTxnSlice(ev.Txs)
if shouldCommit || w.current.deadlineReached { if shouldCommit || (w.current.deadlineReached && len(w.current.txs) > 0) {
_, err = w.commit() _, err = w.commit()
} }
} }

2
params/version.go
View file

@ -24,7 +24,7 @@ import (
const ( const (
VersionMajor = 5 // Major version component of the current release VersionMajor = 5 // Major version component of the current release
VersionMinor = 7 // Minor version component of the current release VersionMinor = 7 // Minor version component of the current release
VersionPatch = 19 // Patch version component of the current release VersionPatch = 20 // Patch version component of the current release
VersionMeta = "mainnet" // Version metadata to append to the version string VersionMeta = "mainnet" // Version metadata to append to the version string
) )