fix conflict

Author: julienrbrt

apps/evm/cmd/run.go

@@ -12,7 +12,6 @@ import (
 	"github.com/rs/zerolog"
 	"github.com/spf13/cobra"
 
-	"github.com/evstack/ev-node/block"
 	"github.com/evstack/ev-node/core/da"
 	"github.com/evstack/ev-node/core/execution"
 	coresequencer "github.com/evstack/ev-node/core/sequencer"
@@ -110,9 +109,6 @@ func createSequencer(
 	nodeConfig config.Config,
 	genesis genesis.Genesis,
 ) (coresequencer.Sequencer, error) {
-	daClient := block.NewDAClient(da, nodeConfig, logger)
-	fiRetriever := block.NewForcedInclusionRetriever(daClient, genesis, logger)
-
 	singleMetrics, err := single.NopMetrics()
 	if err != nil {
 		return nil, fmt.Errorf("failed to create single sequencer metrics: %w", err)
@@ -127,18 +123,11 @@ func createSequencer(
 		nodeConfig.Node.BlockTime.Duration,
 		singleMetrics,
 		nodeConfig.Node.Aggregator,
-		1000,
-		fiRetriever,
-		genesis,
 	)
 	if err != nil {
 		return nil, fmt.Errorf("failed to create single sequencer: %w", err)
 	}
 
-	logger.Info().
-		Str("forced_inclusion_namespace", nodeConfig.DA.GetForcedInclusionNamespace()).
-		Msg("single sequencer initialized")
-
 	return sequencer, nil
 }
 

apps/grpc/cmd/run.go

@@ -9,7 +9,6 @@ import (
 	"github.com/rs/zerolog"
 	"github.com/spf13/cobra"
 
-	"github.com/evstack/ev-node/block"
 	"github.com/evstack/ev-node/core/da"
 	"github.com/evstack/ev-node/core/execution"
 	coresequencer "github.com/evstack/ev-node/core/sequencer"
@@ -119,9 +118,6 @@ func createSequencer(
 	nodeConfig config.Config,
 	genesis genesis.Genesis,
 ) (coresequencer.Sequencer, error) {
-	daClient := block.NewDAClient(da, nodeConfig, logger)
-	fiRetriever := block.NewForcedInclusionRetriever(daClient, genesis, logger)
-
 	singleMetrics, err := single.NopMetrics()
 	if err != nil {
 		return nil, fmt.Errorf("failed to create single sequencer metrics: %w", err)
@@ -136,18 +132,11 @@ func createSequencer(
 		nodeConfig.Node.BlockTime.Duration,
 		singleMetrics,
 		nodeConfig.Node.Aggregator,
-		1000,
-		fiRetriever,
-		genesis,
 	)
 	if err != nil {
 		return nil, fmt.Errorf("failed to create single sequencer: %w", err)
 	}
 
-	logger.Info().
-		Str("forced_inclusion_namespace", nodeConfig.DA.GetForcedInclusionNamespace()).
-		Msg("single sequencer initialized")
-
 	return sequencer, nil
 }