implement feedback

julienrbrt · Dec 4, 2025 · Nov 21, 2025 · Nov 24, 2025 · Nov 24, 2025 · Nov 25, 2025
commit e5ba96540c2fd127535814307e47e47ad893518d
diff --git a/block/internal/da/forced_inclusion_retriever.go b/block/internal/da/forced_inclusion_retriever.go
@@ -51,7 +51,7 @@ func (r *ForcedInclusionRetriever) RetrieveForcedIncludedTxs(ctx context.Context
 		return nil, ErrForceInclusionNotConfigured
 	}
 
-	epochStart, epochEnd := types.CalculateEpochBoundaries(daHeight, r.genesis.DAStartHeight, r.daEpochSize)
+	epochStart, epochEnd, currentEpochNumber := types.CalculateEpochBoundaries(daHeight, r.genesis.DAStartHeight, r.daEpochSize)
 
 	if daHeight != epochStart {
 		r.logger.Debug().
@@ -66,9 +66,6 @@ func (r *ForcedInclusionRetriever) RetrieveForcedIncludedTxs(ctx context.Context
 		}, nil
 	}
 
-	// We're at epoch start - fetch transactions from DA
-	currentEpochNumber := types.CalculateEpochNumber(daHeight, r.genesis.DAStartHeight, r.daEpochSize)
-
 	event := &ForcedInclusionEvent{
 		StartDaHeight: epochStart,
 		Txs:           [][]byte{},
@@ -81,22 +78,22 @@ func (r *ForcedInclusionRetriever) RetrieveForcedIncludedTxs(ctx context.Context
 		Uint64("epoch_num", currentEpochNumber).
 		Msg("retrieving forced included transactions from DA")
 
-	epochStartResult := r.client.RetrieveForcedInclusion(ctx, epochStart)
-	if epochStartResult.Code == coreda.StatusHeightFromFuture {
+	epochEndResult := r.client.RetrieveForcedInclusion(ctx, epochEnd)
+	if epochEndResult.Code == coreda.StatusHeightFromFuture {
 		r.logger.Debug().
-			Uint64("epoch_start", epochStart).
-			Msg("epoch start height not yet available on DA - backoff required")
-		return nil, fmt.Errorf("%w: epoch start height %d not yet available", coreda.ErrHeightFromFuture, epochStart)
+			Uint64("epoch_end", epochEnd).
+			Msg("epoch end height not yet available on DA - backoff required")
+		return nil, fmt.Errorf("%w: epoch end height %d not yet available", coreda.ErrHeightFromFuture, epochEnd)
 	}
 
-	epochEndResult := epochStartResult
+	epochStartResult := epochEndResult
 	if epochStart != epochEnd {
-		epochEndResult = r.client.RetrieveForcedInclusion(ctx, epochEnd)
-		if epochEndResult.Code == coreda.StatusHeightFromFuture {
+		epochStartResult = r.client.RetrieveForcedInclusion(ctx, epochStart)
+		if epochStartResult.Code == coreda.StatusHeightFromFuture {
 			r.logger.Debug().
-				Uint64("epoch_end", epochEnd).
-				Msg("epoch end height not yet available on DA - backoff required")
-			return nil, fmt.Errorf("%w: epoch end height %d not yet available", coreda.ErrHeightFromFuture, epochEnd)
+				Uint64("epoch_start", epochStart).
+				Msg("epoch start height not yet available on DA - backoff required")
+			return nil, fmt.Errorf("%w: epoch start height %d not yet available", coreda.ErrHeightFromFuture, epochStart)
 		}
 	}
 

diff --git a/block/internal/syncing/syncer.go b/block/internal/syncing/syncer.go
@@ -705,7 +705,7 @@ func (s *Syncer) verifyForcedInclusionTxs(currentState types.State, data *types.
 
 	// Check if any pending forced inclusion txs from previous epochs are included
 	var stillPending []pendingForcedInclusionTx
-	s.pendingForcedInclusionTxs.Range(func(key, value interface{}) bool {
+	s.pendingForcedInclusionTxs.Range(func(key, value any) bool {
 		pending := value.(pendingForcedInclusionTx)
 		if _, ok := blockTxMap[pending.TxHash]; ok {
 			s.logger.Debug().
@@ -752,7 +752,7 @@ func (s *Syncer) verifyForcedInclusionTxs(currentState types.State, data *types.
 	}
 
 	// Update pending map - clear old entries and store only remaining pending
-	s.pendingForcedInclusionTxs.Range(func(key, value interface{}) bool {
+	s.pendingForcedInclusionTxs.Range(func(key, value any) bool {
 		s.pendingForcedInclusionTxs.Delete(key)
 		return true
 	})
@@ -774,7 +774,7 @@ func (s *Syncer) verifyForcedInclusionTxs(currentState types.State, data *types.
 	if len(forcedIncludedTxsEvent.Txs) > 0 {
 		if newPendingCount > 0 {
 			totalPending := 0
-			s.pendingForcedInclusionTxs.Range(func(key, value interface{}) bool {
+			s.pendingForcedInclusionTxs.Range(func(key, value any) bool {
 				totalPending++
 				return true
 			})

diff --git a/block/internal/syncing/syncer_forced_inclusion_test.go b/block/internal/syncing/syncer_forced_inclusion_test.go
@@ -556,7 +556,7 @@ func TestVerifyForcedInclusionTxs_DeferralWithinEpoch(t *testing.T) {
 
 	// Verify that dataBin2 is now tracked as pending
 	pendingCount := 0
-	s.pendingForcedInclusionTxs.Range(func(key, value interface{}) bool {
+	s.pendingForcedInclusionTxs.Range(func(key, value any) bool {
 		pendingCount++
 		return true
 	})
@@ -593,7 +593,7 @@ func TestVerifyForcedInclusionTxs_DeferralWithinEpoch(t *testing.T) {
 
 	// Verify that pending queue is now empty (dataBin2 was included)
 	pendingCount = 0
-	s.pendingForcedInclusionTxs.Range(func(key, value interface{}) bool {
+	s.pendingForcedInclusionTxs.Range(func(key, value any) bool {
 		pendingCount++
 		return true
 	})
@@ -699,7 +699,7 @@ func TestVerifyForcedInclusionTxs_MaliciousAfterEpochEnd(t *testing.T) {
 
 	// Verify that the forced tx is tracked as pending
 	pendingCount := 0
-	s.pendingForcedInclusionTxs.Range(func(key, value interface{}) bool {
+	s.pendingForcedInclusionTxs.Range(func(key, value any) bool {
 		pendingCount++
 		return true
 	})

diff --git a/docs/adr/adr-019-forced-inclusion-mechanism.md b/docs/adr/adr-019-forced-inclusion-mechanism.md
@@ -322,7 +322,7 @@ func (s *Syncer) verifyForcedInclusionTxs(currentState State, data *Data) error
 
     // 3. Check if any pending forced inclusion txs from previous epochs are included
     var stillPending []pendingForcedInclusionTx
-    s.pendingForcedInclusionTxs.Range(func(key, value interface{}) bool {
+    s.pendingForcedInclusionTxs.Range(func(key, value any) bool {
         pending := value.(pendingForcedInclusionTx)
         if _, ok := blockTxMap[pending.TxHash]; ok {
             // Transaction was included - remove from pending

diff --git a/types/epoch.go b/types/epoch.go
@@ -33,18 +33,19 @@ func CalculateEpochNumber(daHeight, daStartHeight, daEpochSize uint64) uint64 {
 // Returns:
 //   - start: The first DA height in the epoch (inclusive)
 //   - end: The last DA height in the epoch (inclusive)
-func CalculateEpochBoundaries(daHeight, daStartHeight, daEpochSize uint64) (start, end uint64) {
+func CalculateEpochBoundaries(daHeight, daStartHeight, daEpochSize uint64) (start, end, epochNum uint64) {
+	epochNum = CalculateEpochNumber(daHeight, daStartHeight, daEpochSize)
+
 	if daEpochSize == 0 {
-		return daStartHeight, daStartHeight
+		return daStartHeight, daStartHeight, epochNum
 	}
 
 	if daHeight < daStartHeight {
-		return daStartHeight, daStartHeight + daEpochSize - 1
+		return daStartHeight, daStartHeight + daEpochSize - 1, epochNum
 	}
 
-	epochNum := CalculateEpochNumber(daHeight, daStartHeight, daEpochSize)
 	start = daStartHeight + (epochNum-1)*daEpochSize
 	end = daStartHeight + epochNum*daEpochSize - 1
 
-	return start, end
+	return start, end, epochNum
 }
diff --git a/types/epoch_test.go b/types/epoch_test.go
@@ -218,7 +218,7 @@ func TestCalculateEpochBoundaries(t *testing.T) {
 
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			start, end := CalculateEpochBoundaries(tt.daHeight, tt.daStartHeight, tt.daEpochSize)
+			start, end, _ := CalculateEpochBoundaries(tt.daHeight, tt.daStartHeight, tt.daEpochSize)
 			assert.Equal(t, tt.expectedStart, start, "start height mismatch")
 			assert.Equal(t, tt.expectedEnd, end, "end height mismatch")
 		})
@@ -262,7 +262,7 @@ func TestEpochConsistency(t *testing.T) {
 					epochNum := CalculateEpochNumber(h, tt.daStartHeight, tt.daEpochSize)
 					assert.Equal(t, epoch, epochNum, "height %d should be in epoch %d", h, epoch)
 
-					start, end := CalculateEpochBoundaries(h, tt.daStartHeight, tt.daEpochSize)
+					start, end, _ := CalculateEpochBoundaries(h, tt.daStartHeight, tt.daEpochSize)
 					assert.Equal(t, expectedStart, start, "height %d should have start %d", h, expectedStart)
 					assert.Equal(t, expectedEnd, end, "height %d should have end %d", h, expectedEnd)
 				}
@@ -293,7 +293,7 @@ func TestEpochBoundaryTransitions(t *testing.T) {
 		epoch := CalculateEpochNumber(tr.height, daStartHeight, daEpochSize)
 		assert.Equal(t, tr.expectedEpoch, epoch, "height %d epoch mismatch", tr.height)
 
-		start, end := CalculateEpochBoundaries(tr.height, daStartHeight, daEpochSize)
+		start, end, _ := CalculateEpochBoundaries(tr.height, daStartHeight, daEpochSize)
 		assert.Equal(t, tr.expectedStart, start, "height %d start mismatch", tr.height)
 		assert.Equal(t, tr.expectedEnd, end, "height %d end mismatch", tr.height)
 	}