diff --git a/miner/scroll_worker.go b/miner/scroll_worker.go index ce5a9b4151..37bbb2e2aa 100644 --- a/miner/scroll_worker.go +++ b/miner/scroll_worker.go @@ -65,6 +65,7 @@ var ( collectL2Timer = metrics.NewRegisteredTimer("miner/collect_l2_txns", nil) l2CommitTimer = metrics.NewRegisteredTimer("miner/commit", nil) cccStallTimer = metrics.NewRegisteredTimer("miner/ccc_stall", nil) + idleTimer = metrics.NewRegisteredTimer("miner/idle", nil) commitReasonCCCCounter = metrics.NewRegisteredCounter("miner/commit_reason_ccc", nil) commitReasonDeadlineCounter = metrics.NewRegisteredCounter("miner/commit_reason_deadline", nil) @@ -354,8 +355,10 @@ func (w *worker) mainLoop() { w.current = nil } + idleStart := time.Now() select { case <-w.startCh: + idleTimer.UpdateSince(idleStart) if w.isRunning() { if err := w.checkHeadRowConsumption(); err != nil { log.Error("failed to start head checkers", "err", err) @@ -364,17 +367,21 @@ func (w *worker) mainLoop() { } _, err = w.tryCommitNewWork(time.Now(), w.chain.CurrentHeader().Hash(), nil) case trigger := <-w.reorgCh: + idleTimer.UpdateSince(idleStart) err = w.handleReorg(&trigger) case chainHead := <-w.chainHeadCh: + idleTimer.UpdateSince(idleStart) if w.isCanonical(chainHead.Block.Header()) { _, err = w.tryCommitNewWork(time.Now(), chainHead.Block.Hash(), nil) } case <-w.current.deadlineCh(): + idleTimer.UpdateSince(idleStart) w.current.deadlineReached = true if len(w.current.txs) > 0 { _, err = w.commit(false) } case ev := <-w.txsCh: + idleTimer.UpdateSince(idleStart) // Apply transactions to the pending state // // Note all transactions received may not be continuous with transactions diff --git a/params/version.go b/params/version.go index 0a2531d42b..a368711152 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 = 7 // Minor version component of the current release - VersionPatch = 8 // Patch version component of the current release + VersionPatch = 9 // Patch version component of the current release VersionMeta = "mainnet" // Version metadata to append to the version string )