Merge branch 'main' into alex/adr023_ha-failover_raft8

* main: (34 commits) feat: make reaper poll duration configurable (#2951) chore!: move sequencers to pkg (#2931) feat: Ensure Header integrity on DA (#2948) feat(testda): add header support with GetHeaderByHeight method (#2946) chore: improve code comments clarity (#2947) chore(sequencers): optimize store check (#2945) fix: make evm_execution more robust (#2942) fix(sequencers/single): deterministic queue (#2938) fix(block): fix init logic sequencer for da epoch fetching (#2926) feat: use DA timestamp (#2939) chore: improve code comments clarity (#2943) build(deps): bump libp2p (#2937) build(deps): Bump actions/cache from 4 to 5 (#2934) build(deps): Bump actions/download-artifact from 6 to 7 (#2933) build(deps): Bump actions/upload-artifact from 5 to 6 (#2932) feat: DA Client remove interface part 3, replace types with new code (#2910) DA Client remove interface: Part 2.5, create e2e test to validate that a blob is posted in DA layer. (#2920) fix(syncing): skip forced txs checks for p2p blocks (#2922) build(deps): Bump the all-go group across 5 directories with 5 updates (#2919) chore: loosen syncer state check (#2927) ...
alpe · Jan 28, 2026 · Nov 12, 2025 · Nov 12, 2025 · Nov 17, 2025 · Nov 17, 2025
commit 567092f1bd766953b76caa0d7bb24d169d33ee2e
diff --git a/apps/evm/cmd/run.go b/apps/evm/cmd/run.go
@@ -98,7 +98,45 @@ var RunCmd = &cobra.Command{
 			return err
 		}
 
-		return rollcmd.StartNode(logger, cmd, executor, sequencer, &daJrpc.DA, nodeKey, datastore, nodeConfig, genesis, node.NodeOptions{})
+		// Start force inclusion API server if address is provided
+		forceInclusionAddr, err := cmd.Flags().GetString(flagForceInclusionServer)
+		if err != nil {
+			return fmt.Errorf("failed to get '%s' flag: %w", flagForceInclusionServer, err)
+		}
+
+		if forceInclusionAddr != "" {
+			ethURL, err := cmd.Flags().GetString(evm.FlagEvmEthURL)
+			if err != nil {
+				return fmt.Errorf("failed to get '%s' flag: %w", evm.FlagEvmEthURL, err)
+			}
+
+			forceInclusionServer, err := server.NewForceInclusionServer(
+				forceInclusionAddr,
+				daClient,
+				nodeConfig,
+				genesis,
+				logger,
+				ethURL,
+			)
+			if err != nil {
+				return fmt.Errorf("failed to create force inclusion server: %w", err)
+			}
+
+			if err := forceInclusionServer.Start(cmd.Context()); err != nil {
+				return fmt.Errorf("failed to start force inclusion API server: %w", err)
+			}
+
+			// Ensure server is stopped when node stops
+			defer func() {
+				shutdownCtx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
+				defer cancel()
+				if err := forceInclusionServer.Stop(shutdownCtx); err != nil {
+					logger.Error().Err(err).Msg("failed to stop force inclusion API server")
+				}
+			}()
+		}
+
+		return rollcmd.StartNode(logger, cmd, executor, sequencer, nodeKey, datastore, nodeConfig, genesis, node.NodeOptions{})
 	},
 }
 

diff --git a/apps/evm/go.sum b/apps/evm/go.sum
diff --git a/apps/grpc/cmd/run.go b/apps/grpc/cmd/run.go
@@ -87,7 +87,7 @@ The execution client must implement the Evolve execution gRPC interface.`,
 		}
 
 		// Start the node
-		return rollcmd.StartNode(logger, cmd, executor, sequencer, &daJrpc.DA, nodeKey, datastore, nodeConfig, genesis, node.NodeOptions{})
+		return rollcmd.StartNode(logger, cmd, executor, sequencer, nodeKey, datastore, nodeConfig, genesis, node.NodeOptions{})
 	},
 }
 

diff --git a/apps/grpc/go.sum b/apps/grpc/go.sum
diff --git a/apps/testapp/cmd/run.go b/apps/testapp/cmd/run.go
@@ -13,8 +13,12 @@ import (
 	"github.com/evstack/ev-node/block"
 	coresequencer "github.com/evstack/ev-node/core/sequencer"
 	"github.com/evstack/ev-node/node"
-	rollcmd "github.com/evstack/ev-node/pkg/cmd"
-	genesispkg "github.com/evstack/ev-node/pkg/genesis"
+	"github.com/evstack/ev-node/pkg/cmd"
+	"github.com/evstack/ev-node/pkg/config"
+	blobrpc "github.com/evstack/ev-node/pkg/da/jsonrpc"
+	da "github.com/evstack/ev-node/pkg/da/types"
+	"github.com/evstack/ev-node/pkg/genesis"
+	"github.com/evstack/ev-node/pkg/p2p"
 	"github.com/evstack/ev-node/pkg/p2p/key"
 	"github.com/evstack/ev-node/pkg/sequencers/based"
 	"github.com/evstack/ev-node/pkg/sequencers/single"
@@ -92,7 +96,12 @@ var RunCmd = &cobra.Command{
 			return err
 		}
 
-		return rollcmd.StartNode(logger, cmd, executor, sequencer, &daJrpc.DA, nodeKey, datastore, nodeConfig, genesis, node.NodeOptions{})
+		p2pClient, err := p2p.NewClient(nodeConfig.P2P, nodeKey.PrivKey, datastore, genesis.ChainID, logger, p2p.NopMetrics())
+		if err != nil {
+			return err
+		}
+
+		return cmd.StartNode(logger, command, executor, sequencer, p2pClient, datastore, nodeConfig, genesis, node.NodeOptions{})
 	},
 }
 

diff --git a/apps/testapp/go.sum b/apps/testapp/go.sum
diff --git a/block/internal/executing/executor_restart_test.go b/block/internal/executing/executor_restart_test.go
@@ -323,11 +323,15 @@ func TestExecutor_RestartNoPendingHeader(t *testing.T) {
 		mockExec1.EXPECT().ExecuteTxs(mock.Anything, mock.Anything, gen.InitialHeight+uint64(i), mock.AnythingOfType("time.Time"), lastStateRoot).
 			Return(newStateRoot, uint64(1024), nil).Once()
 		lastStateRoot = newStateRoot
-
 		require.NoError(t, exec1.produceBlock())
 	}
 	require.Equal(t, uint64(numBlocks), exec1.GetLastState().LastBlockHeight)
 
+	mockSeq1.EXPECT().GetDAHeight().Return(uint64(0)).Once()
+
+	err = exec1.produceBlock()
+	require.NoError(t, err)
+
 	// Stop first executor
 	exec1.cancel()
 

diff --git a/block/internal/syncing/syncer.go b/block/internal/syncing/syncer.go
@@ -3,16 +3,15 @@ package syncing
 import (
 	"bytes"
 	"context"
-	"crypto/sha256"
 	"encoding/binary"
-	"encoding/hex"
 	"errors"
 	"fmt"
-	"reflect"
 	"sync"
+	"reflect"
 	"sync/atomic"
 	"time"
 
+	coreexecutor "github.com/evstack/ev-node/core/execution"
 	"github.com/evstack/ev-node/pkg/raft"
 	pubsub "github.com/libp2p/go-libp2p-pubsub"
 	"github.com/rs/zerolog"
@@ -22,7 +21,6 @@ import (
 	"github.com/evstack/ev-node/block/internal/common"
 	"github.com/evstack/ev-node/block/internal/da"
 	"github.com/evstack/ev-node/pkg/config"
-	datypes "github.com/evstack/ev-node/pkg/da/types"
 	"github.com/evstack/ev-node/pkg/genesis"
 	"github.com/evstack/ev-node/pkg/store"
 	"github.com/evstack/ev-node/types"
@@ -104,6 +102,7 @@ type Syncer struct {
 	daRetriever   DARetriever
 	p2pHandler    p2pHandler
 	raftRetriever *raftRetriever
+	fiRetriever   *da.ForcedInclusionRetriever
 
 	// Forced inclusion tracking
 	pendingForcedInclusionTxs sync.Map // map[string]pendingForcedInclusionTx
@@ -144,22 +143,37 @@ func NewSyncer(
 	errorCh chan<- error,
 	raftNode common.RaftNode,
 ) *Syncer {
+	daRetrieverHeight := &atomic.Uint64{}
+	daRetrieverHeight.Store(genesis.DAStartHeight)
+
+	// Initialize dynamic grace period state
+	initialMultiplier := 1.0
+	gracePeriodMultiplier := &atomic.Pointer[float64]{}
+	gracePeriodMultiplier.Store(&initialMultiplier)
+
+	initialFullness := 0.0
+	blockFullnessEMA := &atomic.Pointer[float64]{}
+	blockFullnessEMA.Store(&initialFullness)
+
 	s := &Syncer{
 		store:             store,
 		exec:              exec,
-		daClient:          daClient,
 		cache:             cache,
 		metrics:           metrics,
 		config:            config,
 		genesis:           genesis,
 		options:           options,
+		lastState:         &atomic.Pointer[types.State]{},
+		daClient:          daClient,
+		daRetrieverHeight: daRetrieverHeight,
 		headerStore:       headerStore,
 		dataStore:         dataStore,
-		lastState:         &atomic.Pointer[types.State]{},
-		daRetrieverHeight: &atomic.Uint64{},
 		heightInCh:        make(chan common.DAHeightEvent, 1_000),
 		errorCh:           errorCh,
 		logger:            logger.With().Str("component", "syncer").Logger(),
+		gracePeriodMultiplier: gracePeriodMultiplier,
+		blockFullnessEMA:      blockFullnessEMA,
+		gracePeriodConfig:     newForcedInclusionGracePeriodConfig(),
 	}
 	if raftNode != nil && !reflect.ValueOf(raftNode).IsNil() {
 		s.raftRetriever = newRaftRetriever(raftNode, genesis, logger, eventProcessorFn(s.pipeEvent), func(ctx context.Context, state *raft.RaftBlockState) error {
@@ -227,7 +241,6 @@ func (s *Syncer) Stop() error {
 	s.cancel = nil
 	return nil
 }
-
 // isCatchingUpState returns true if the syncer has pending events or is behind the current raft height
 func (s *Syncer) isCatchingUpState() bool {
 	return len(s.heightInCh) != 0 || func() bool {
@@ -242,8 +255,8 @@ func (s *Syncer) isCatchingUpState() bool {
 	}()
 }
 
-// GetLastState returns the current state
-func (s *Syncer) GetLastState() types.State {
+// getLastState returns the current state
+func (s *Syncer) getLastState() types.State {
 	state := s.lastState.Load()
 	if state == nil {
 		return types.State{}

diff --git a/block/public.go b/block/public.go
@@ -58,5 +58,26 @@ func NewDAClient(
 	})
 }
 
+// ErrForceInclusionNotConfigured is returned when force inclusion is not configured.
+// It is exported because sequencers needs to check for this error.
+var ErrForceInclusionNotConfigured = da.ErrForceInclusionNotConfigured
+
+// ForcedInclusionEvent represents forced inclusion transactions retrieved from DA
+type ForcedInclusionEvent = da.ForcedInclusionEvent
+
+// ForcedInclusionRetriever defines the interface for retrieving forced inclusion transactions from DA
+type ForcedInclusionRetriever interface {
+	RetrieveForcedIncludedTxs(ctx context.Context, daHeight uint64) (*da.ForcedInclusionEvent, error)
+}
+
+// NewForcedInclusionRetriever creates a new forced inclusion retriever
+func NewForcedInclusionRetriever(
+	client DAClient,
+	logger zerolog.Logger,
+	daStartHeight, daEpochSize uint64,
+) ForcedInclusionRetriever {
+	return da.NewForcedInclusionRetriever(client, logger, daStartHeight, daEpochSize)
+}
+
 // Expose Raft types for consensus integration
 type RaftNode = common.RaftNode
-Original file line number
+Diff line change
@@ Expand Up @@
     		}
     		// Start the node
-    		return rollcmd.StartNode(logger, cmd, executor, sequencer, &daJrpc.DA, nodeKey, datastore, nodeConfig, genesis, node.NodeOptions{})
+    		return rollcmd.StartNode(logger, cmd, executor, sequencer, nodeKey, datastore, nodeConfig, genesis, node.NodeOptions{})
     	},
     }
@@ Expand Down @@