Merge pull request #176 from bane-labs/fix-sync

dbft: skip sealing task awaiting during node sync

Author: AnnaShaleva

consensus/dbft/dbft.go

@@ -183,6 +183,9 @@ type DBFT struct {
 	// various chain/mempool events and subscription management:
 	chainHeadSub    event.Subscription
 	chainHeadEvents chan core.ChainHeadEvent
+	// minerInterrupted is the callback indicating whether miner is temporary interrupted
+	// due to the node sync.
+	minerInterrupted func() bool
 
 	config *params.DBFTConfig // Consensus engine configuration parameters
 
@@ -686,6 +689,12 @@ func (c *DBFT) WithRequestTxs(f func(hashed []common.Hash)) {
 	c.requestTxs = f
 }
 
+// WithMinerInterrupted sets callback to indicate whether miner is interrupted due
+// to the ongoing node sync process.
+func (c *DBFT) WithMinerInterrupted(f func() bool) {
+	c.minerInterrupted = f
+}
+
 // WithTxPool initializes transaction pool API for DBFT interactions with memory pool
 // (fetching unknown transactions).
 func (c *DBFT) WithTxPool(pool txPool) {
@@ -1412,6 +1421,13 @@ func (c *DBFT) newPayload(ctx *dbft.Context, t payload.MessageType, msg any) pay
 }
 
 func (c *DBFT) handleChainBlock(b *types.Block) error {
+	// A short path if miner is not active and the node is in the process of block
+	// sync. In this case dBFT can't react properly on the newcoming blocks since no
+	// sealing task is expected from miner.
+	if c.minerInterrupted() {
+		return nil
+	}
+
 	// We can get our own block here, so check for index.
 	if uint32(b.Number().Uint64()) >= c.dbft.BlockIndex {
 		log.Info("New block in the chain",

eth/backend.go

@@ -296,6 +296,7 @@ func New(stack *node.Node, config *ethconfig.Config) (*Ethereum, error) {
 		bft.WithBroadcast(eth.dbftSrv.BroadcastMessage)
 		bft.WithTxPool(eth.TxPool())
 		bft.WithRequestTxs(eth.handler.BroadcastRequestTxs)
+		bft.WithMinerInterrupted(eth.miner.Syncing)
 	}
 
 	// Setup DNS discovery iterators.

miner/miner.go

@@ -185,6 +185,11 @@ func (miner *Miner) Mining() bool {
 	return miner.worker.isRunning()
 }
 
+// Syncing indicates whether mining is currently interrupted due to the node's Downloader work.
+func (miner *Miner) Syncing() bool {
+	return miner.worker.isSyncing()
+}
+
 func (miner *Miner) Hashrate() uint64 {
 	if pow, ok := miner.engine.(consensus.PoW); ok {
 		return uint64(pow.Hashrate())

miner/worker.go

@@ -382,6 +382,12 @@ func (w *worker) isRunning() bool {
 	return w.running.Load()
 }
 
+// isSyncing returns an indicator whether the node is in the sync process
+// from the worker PoW.
+func (w *worker) isSyncing() bool {
+	return w.syncing.Load()
+}
+
 // close terminates all background threads maintained by the worker.
 // Note the worker does not support being closed multiple times.
 func (w *worker) close() {