Merge branch 'main' into alex/2803_best_2worlds

* main:
  fix(node): race on caught up (#3133)

Author: alpe

block/internal/syncing/syncer.go

@@ -396,6 +396,11 @@ func (s *Syncer) HasReachedDAHead() bool {
 
 // fetchDAUntilCaughtUp was removed — the DAFollower handles this concern.
 
+// PendingCount returns the number of unprocessed height events in the pipeline.
+func (s *Syncer) PendingCount() int {
+	return len(s.heightInCh)
+}
+
 func (s *Syncer) pendingWorkerLoop(ctx context.Context) {
 	defer s.wg.Done()
 

node/failover.go

@@ -315,7 +315,8 @@ func (f *failoverState) waitForCatchup(ctx context.Context) (bool, error) {
 				p2pCaughtUp = true
 			}
 
-			if daCaughtUp && p2pCaughtUp {
+			pipelineDrained := f.bc.Syncer == nil || f.bc.Syncer.PendingCount() == 0
+			if daCaughtUp && p2pCaughtUp && pipelineDrained {
 				f.logger.Info().
 					Uint64("store_height", storeHeight).
 					Uint64("max_p2p_height", maxP2PHeight).