Skip to content

miner/worker: skip the uncle and resubmit logic in Consortium #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

miner/worker: skip the uncle and resubmit logic in Consortium #3

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d918905
miner/worker: skip resubmit logic in Consortium
minh-bq Feb 22, 2024
9ef408b
miner/worker: skip the uncle logic in Consortium
minh-bq Feb 22, 2024
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
8 changes: 8 additions & 0 deletions miner/worker.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -456,6 +456,10 @@ func (w *worker) newWorkLoop(recommit time.Duration) {
commit(false, commitInterruptNewHead)

case <-timer.C:
if w.chainConfig.Consortium != nil {
continue
}

// If mining is running resubmit a new work cycle periodically to pull in
// higher priced transactions. Disable this overhead for pending blocks.
if w.isRunning() && (w.chainConfig.Clique == nil || w.chainConfig.Clique.Period > 0) {
Expand Down Expand Up @@ -521,6 +525,10 @@ func (w *worker) mainLoop() {
w.commitNewWork(req.interrupt, req.noempty, req.timestamp)

case ev := <-w.chainSideCh:
// Don't handle uncle logic in Consortium
if w.chainConfig.Consortium != nil {
continue
}
// Short circuit for duplicate side blocks
if _, exist := w.localUncles[ev.Block.Hash()]; exist {
continue
Expand Down