Merge branch 'main' into alex/adr023_ha-failover_raft8

* main:
  fix: Fail fast when executor ahead (#2966)
  feat(block): async epoch fetching (#2952)
  perf: tune badger defaults and add db bench (#2950)

Author: alpe

.mockery.yaml

@@ -87,3 +87,10 @@ packages:
           dir: ./pkg/da/jsonrpc/mocks
           pkgname: mocks
           filename: header_module_mock.go
+  github.com/evstack/ev-node/block:
+    interfaces:
+      ForcedInclusionRetriever:
+        config:
+          dir: ./pkg/sequencers/common
+          pkgname: common
+          filename: forced_inclusion_retriever_mock.go

apps/evm/cmd/run.go

@@ -161,8 +161,7 @@ func createSequencer(
 			return nil, fmt.Errorf("based sequencer mode requires aggregator mode to be enabled")
 		}
 
-		fiRetriever := block.NewForcedInclusionRetriever(daClient, logger, genesis.DAStartHeight, genesis.DAEpochForcedInclusion)
-		basedSeq, err := based.NewBasedSequencer(fiRetriever, datastore, genesis, logger)
+		basedSeq, err := based.NewBasedSequencer(daClient, nodeConfig, datastore, genesis, logger)
 		if err != nil {
 			return nil, fmt.Errorf("failed to create based sequencer: %w", err)
 		}
@@ -179,8 +178,8 @@ func createSequencer(
 		logger,
 		datastore,
 		daClient,
+		nodeConfig,
 		[]byte(genesis.ChainID),
-		nodeConfig.Node.BlockTime.Duration,
 		1000,
 		genesis,
 	)

apps/grpc/cmd/run.go

@@ -120,8 +120,7 @@ func createSequencer(
 			return nil, fmt.Errorf("based sequencer mode requires aggregator mode to be enabled")
 		}
 
-		fiRetriever := block.NewForcedInclusionRetriever(daClient, logger, genesis.DAStartHeight, genesis.DAEpochForcedInclusion)
-		basedSeq, err := based.NewBasedSequencer(fiRetriever, datastore, genesis, logger)
+		basedSeq, err := based.NewBasedSequencer(daClient, nodeConfig, datastore, genesis, logger)
 		if err != nil {
 			return nil, fmt.Errorf("failed to create based sequencer: %w", err)
 		}
@@ -138,8 +137,8 @@ func createSequencer(
 		logger,
 		datastore,
 		daClient,
+		nodeConfig,
 		[]byte(genesis.ChainID),
-		nodeConfig.Node.BlockTime.Duration,
 		1000,
 		genesis,
 	)

apps/testapp/cmd/run.go

@@ -122,8 +122,7 @@ func createSequencer(
 			return nil, fmt.Errorf("based sequencer mode requires aggregator mode to be enabled")
 		}
 
-		fiRetriever := block.NewForcedInclusionRetriever(daClient, logger, genesis.DAStartHeight, genesis.DAEpochForcedInclusion)
-		basedSeq, err := based.NewBasedSequencer(fiRetriever, datastore, genesis, logger)
+		basedSeq, err := based.NewBasedSequencer(daClient, nodeConfig, datastore, genesis, logger)
 		if err != nil {
 			return nil, fmt.Errorf("failed to create based sequencer: %w", err)
 		}
@@ -140,8 +139,8 @@ func createSequencer(
 		logger,
 		datastore,
 		daClient,
+		nodeConfig,
 		[]byte(genesis.ChainID),
-		nodeConfig.Node.BlockTime.Duration,
 		1000,
 		genesis,
 	)

block/internal/common/replay.go

@@ -67,15 +67,11 @@ func (s *Replayer) SyncToHeight(ctx context.Context, targetHeight uint64) error
 		Uint64("exec_layer_height", execHeight).
 		Msg("execution layer height check")
 
-	// If execution layer is ahead, skip syncing and continue. This can happen if execution
-	// progressed independently (e.g. after manual intervention). We log it for visibility but
-	// do not treat it as fatal.
+	// If execution layer is ahead, we cannot proceed safely as this indicates state divergence.
+	// The execution layer must be rolled back before the node can continue.
 	if execHeight > targetHeight {
-		s.logger.Warn().
-			Uint64("target_height", targetHeight).
-			Uint64("exec_layer_height", execHeight).
-			Msg("execution layer is ahead of target height - skipping replay")
-		return nil
+		return fmt.Errorf("execution layer height (%d) ahead of target height (%d): manually rollback execution layer to height %d",
+			execHeight, targetHeight, targetHeight)
 	}
 
 	// If execution layer is behind, sync the missing blocks

block/internal/common/replay_test.go

@@ -135,15 +135,16 @@ func TestReplayer_SyncToHeight_ExecutorAhead(t *testing.T) {
 
 	syncer := NewReplayer(mockStore, mockExec, gen, logger)
 
-	// Setup: target height is 100, execution layer is at 101 (unexpected!)
+	// Setup: execution layer is ahead of target (indicates state divergence)
 	targetHeight := uint64(100)
 	execHeight := uint64(101)
 
 	mockExec.On("GetLatestHeight", mock.Anything).Return(execHeight, nil)
 
-	// Execute sync - should just log and continue without error
+	// Should return error to prevent proceeding with divergent state
 	err := syncer.SyncToHeight(ctx, targetHeight)
-	require.NoError(t, err)
+	require.Error(t, err)
+	require.Contains(t, err.Error(), "ahead of target height")
 
 	// No replay should be attempted
 	mockExec.AssertNotCalled(t, "ExecuteTxs", mock.Anything, mock.Anything, mock.Anything, mock.Anything, mock.Anything)