Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions miner/scroll_worker.go
Original file line number Diff line number Diff line change
Expand Up @@ -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()
}
}
Expand Down
2 changes: 1 addition & 1 deletion params/version.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
)

Expand Down
Loading