Skip to content

fix: close head tracker/broadcaster before balance monitor to prevent race #425

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

Merged
jmank88 merged 1 commit into from
Apr 16, 2026
Merged

fix: close head tracker/broadcaster before balance monitor to prevent race #425

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 10 additions & 4 deletions pkg/chains/legacyevm/chain.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -377,20 +377,26 @@ func (c *chain) Close() error {
return c.StopOnce("Chain", func() (merr error) {
c.logger.Debug("Chain: stopping")

// Stop event sources before consumers to prevent late delivery
// (e.g. headBroadcaster calling balanceMonitor.OnNewLongestChain
// after the balance monitor has stopped, causing a data race).

if c.logPoller != logpoller.LogPollerDisabled {
merr = multierr.Append(merr, c.logPoller.Close())
}

if c.balanceMonitor != nil {
c.logger.Debug("Chain: stopping balance monitor")
merr = c.balanceMonitor.Close()
}
c.logger.Debug("Chain: stopping logBroadcaster")
merr = multierr.Combine(merr, c.logBroadcaster.Close())
c.logger.Debug("Chain: stopping headTracker")
merr = multierr.Combine(merr, c.headTracker.Close())
c.logger.Debug("Chain: stopping headBroadcaster")
merr = multierr.Combine(merr, c.headBroadcaster.Close())

if c.balanceMonitor != nil {
c.logger.Debug("Chain: stopping balance monitor")
merr = multierr.Combine(merr, c.balanceMonitor.Close())
}

c.logger.Debug("Chain: stopping evmTxm")
merr = multierr.Combine(merr, c.txm.Close())

Expand Down
Loading