improve

Author: julienrbrt

block/internal/submitting/submitter.go

@@ -59,10 +59,9 @@ type Submitter struct {
 	logger zerolog.Logger
 
 	// Lifecycle
-	ctx               context.Context
-	cancel            context.CancelFunc
-	wg                sync.WaitGroup
-	retriesBeforeHalt map[uint64]uint64
+	ctx    context.Context
+	cancel context.CancelFunc
+	wg     sync.WaitGroup
 }
 
 // NewSubmitter creates a new DA submitter component
@@ -79,18 +78,17 @@ func NewSubmitter(
 	errorCh chan<- error,
 ) *Submitter {
 	return &Submitter{
-		store:             store,
-		exec:              exec,
-		cache:             cache,
-		metrics:           metrics,
-		config:            config,
-		genesis:           genesis,
-		daSubmitter:       daSubmitter,
-		signer:            signer,
-		daStateMtx:        &sync.RWMutex{},
-		errorCh:           errorCh,
-		logger:            logger.With().Str("component", "submitter").Logger(),
-		retriesBeforeHalt: make(map[uint64]uint64),
+		store:       store,
+		exec:        exec,
+		cache:       cache,
+		metrics:     metrics,
+		config:      config,
+		genesis:     genesis,
+		daSubmitter: daSubmitter,
+		signer:      signer,
+		daStateMtx:  &sync.RWMutex{},
+		errorCh:     errorCh,
+		logger:      logger.With().Str("component", "submitter").Logger(),
 	}
 }
 
@@ -219,21 +217,11 @@ func (s *Submitter) processDAInclusionLoop() {
 					break
 				}
 
-			retry:
 				// Set final height in executor
-				if err := s.exec.SetFinal(s.ctx, nextHeight); err != nil {
-					s.retriesBeforeHalt[header.Height()]++
-					if s.retriesBeforeHalt[header.Height()] > common.MaxRetriesBeforeHalt {
-						s.sendCriticalError(fmt.Errorf("failed to set final height: %w", err))
-						s.logger.Error().Err(err).Uint64("height", nextHeight).Msg("failed to set final height")
-						return
-					}
-
-					time.Sleep(common.MaxRetriesTimeout) // sleep before retrying
-					s.logger.Error().Err(err).Msgf("failed to set final height (retry %d / %d): %w", s.retriesBeforeHalt[header.Height()], common.MaxRetriesBeforeHalt, err)
-					goto retry
+				if err := s.setFinalWithRetry(nextHeight, header.Height()); err != nil {
+					s.logger.Error().Err(err).Uint64("height", nextHeight).Msg("failed to set final height")
+					break
 				}
-				delete(s.retriesBeforeHalt, header.Height())
 
 				// Update DA included height
 				s.SetDAIncludedHeight(nextHeight)
@@ -250,6 +238,32 @@ func (s *Submitter) processDAInclusionLoop() {
 	}
 }
 
+// setFinalWithRetry sets the final height in executor with retry logic
+func (s *Submitter) setFinalWithRetry(nextHeight uint64, headerHeight uint64) error {
+	for attempt := 1; attempt <= common.MaxRetriesBeforeHalt; attempt++ {
+		if err := s.exec.SetFinal(s.ctx, nextHeight); err != nil {
+			if attempt == common.MaxRetriesBeforeHalt {
+				err = fmt.Errorf("failed to set final height after %d attempts: %w", attempt, err)
+				s.sendCriticalError(err)
+				return err
+			}
+
+			s.logger.Error().Err(err).
+				Int("attempt", attempt).
+				Int("max_attempts", common.MaxRetriesBeforeHalt).
+				Uint64("height", nextHeight).
+				Msg("failed to set final height, retrying")
+
+			time.Sleep(common.MaxRetriesTimeout)
+			continue
+		}
+
+		return nil
+	}
+
+	return nil
+}
+
 // GetDAIncludedHeight returns the DA included height
 func (s *Submitter) GetDAIncludedHeight() uint64 {
 	s.daStateMtx.RLock()