Merge branch 'main' into marko/sync_subscribe

Author: tac0turtle

.mockery.yaml

@@ -80,3 +80,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

@@ -167,8 +167,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)
 		}
@@ -185,8 +184,8 @@ func createSequencer(
 		logger,
 		datastore,
 		daClient,
+		nodeConfig,
 		[]byte(genesis.ChainID),
-		nodeConfig.Node.BlockTime.Duration,
 		1000,
 		genesis,
 	)

apps/grpc/cmd/run.go

@@ -127,8 +127,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)
 		}
@@ -145,8 +144,8 @@ func createSequencer(
 		logger,
 		datastore,
 		daClient,
+		nodeConfig,
 		[]byte(genesis.ChainID),
-		nodeConfig.Node.BlockTime.Duration,
 		1000,
 		genesis,
 	)

apps/testapp/cmd/run.go

@@ -128,8 +128,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)
 		}
@@ -146,8 +145,8 @@ func createSequencer(
 		logger,
 		datastore,
 		daClient,
+		nodeConfig,
 		[]byte(genesis.ChainID),
-		nodeConfig.Node.BlockTime.Duration,
 		1000,
 		genesis,
 	)