Skip to content

Commit 4f808c8

Browse files
julienrbrtjulienrbrt
committed
simplify
1 parent 16889f5 commit 4f808c8

3 files changed

Lines changed: 20 additions & 87 deletions

File tree

‎apps/evm/single/cmd/run.go‎

Lines changed: 6 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -113,18 +113,18 @@ func createSequencer(
113113
nodeConfig config.Config,
114114
genesis genesis.Genesis,
115115
) (coresequencer.Sequencer, error) {
116+
daRetriever, err := block.NewDARetriever(da, nodeConfig, genesis, logger)
117+
if err != nil {
118+
return nil, fmt.Errorf("failed to create DA retriever: %w", err)
119+
}
120+
adapter := based.NewDARetrieverAdapter(daRetriever.RetrieveForcedIncludedTxsFromDA)
121+
116122
if nodeConfig.Node.BasedSequencer {
117123
// Based sequencer mode - fetch transactions only from DA
118124
if !nodeConfig.Node.Aggregator {
119125
return nil, fmt.Errorf("based sequencer mode requires aggregator mode to be enabled")
120126
}
121127

122-
daRetriever, err := block.NewDARetriever(da, nodeConfig, genesis, logger)
123-
if err != nil {
124-
return nil, fmt.Errorf("failed to create DA retriever: %w", err)
125-
}
126-
127-
adapter := based.NewDARetrieverAdapter(daRetriever.RetrieveForcedIncludedTxsFromDA)
128128
basedSeq := based.NewBasedSequencer(adapter, da, nodeConfig, genesis, logger)
129129

130130
logger.Info().
@@ -140,29 +140,6 @@ func createSequencer(
140140
return nil, fmt.Errorf("failed to create single sequencer metrics: %w", err)
141141
}
142142

143-
// Create DA retriever for forced inclusion support
144-
var daRetriever single.DARetriever
145-
if nodeConfig.Node.Aggregator {
146-
commonDARetriever, err := block.NewDARetriever(da, nodeConfig, genesis, logger)
147-
if err != nil {
148-
return nil, fmt.Errorf("failed to create DA retriever: %w", err)
149-
}
150-
151-
// Adapter function to convert between common and single event types
152-
adapterFunc := func(ctx context.Context, daHeight uint64) (*single.ForcedInclusionEvent, error) {
153-
event, err := commonDARetriever.RetrieveForcedIncludedTxsFromDA(ctx, daHeight)
154-
if err != nil {
155-
return nil, err
156-
}
157-
return &single.ForcedInclusionEvent{
158-
Txs: event.Txs,
159-
StartDaHeight: event.StartDaHeight,
160-
EndDaHeight: event.EndDaHeight,
161-
}, nil
162-
}
163-
daRetriever = single.NewDARetrieverAdapter(adapterFunc)
164-
}
165-
166143
sequencer, err := single.NewSequencer(
167144
ctx,
168145
logger,

‎apps/grpc/single/cmd/run.go‎

Lines changed: 6 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -122,18 +122,18 @@ func createSequencer(
122122
nodeConfig config.Config,
123123
genesis genesis.Genesis,
124124
) (coresequencer.Sequencer, error) {
125+
daRetriever, err := block.NewDARetriever(da, nodeConfig, genesis, logger)
126+
if err != nil {
127+
return nil, fmt.Errorf("failed to create DA retriever: %w", err)
128+
}
129+
adapter := based.NewDARetrieverAdapter(daRetriever.RetrieveForcedIncludedTxsFromDA)
130+
125131
if nodeConfig.Node.BasedSequencer {
126132
// Based sequencer mode - fetch transactions only from DA
127133
if !nodeConfig.Node.Aggregator {
128134
return nil, fmt.Errorf("based sequencer mode requires aggregator mode to be enabled")
129135
}
130136

131-
daRetriever, err := block.NewDARetriever(da, nodeConfig, genesis, logger)
132-
if err != nil {
133-
return nil, fmt.Errorf("failed to create DA retriever: %w", err)
134-
}
135-
136-
adapter := based.NewDARetrieverAdapter(daRetriever.RetrieveForcedIncludedTxsFromDA)
137137
basedSeq := based.NewBasedSequencer(adapter, da, nodeConfig, genesis, logger)
138138

139139
logger.Info().
@@ -149,28 +149,6 @@ func createSequencer(
149149
return nil, fmt.Errorf("failed to create single sequencer metrics: %w", err)
150150
}
151151

152-
// Create DA retriever for forced inclusion support
153-
var daRetriever single.DARetriever
154-
if nodeConfig.Node.Aggregator {
155-
commonDARetriever, err := block.NewDARetriever(da, nodeConfig, genesis, logger)
156-
if err != nil {
157-
return nil, fmt.Errorf("failed to create DA retriever: %w", err)
158-
}
159-
// Adapter function to convert between common and single event types
160-
adapterFunc := func(ctx context.Context, daHeight uint64) (*single.ForcedInclusionEvent, error) {
161-
event, err := commonDARetriever.RetrieveForcedIncludedTxsFromDA(ctx, daHeight)
162-
if err != nil {
163-
return nil, err
164-
}
165-
return &single.ForcedInclusionEvent{
166-
Txs: event.Txs,
167-
StartDaHeight: event.StartDaHeight,
168-
EndDaHeight: event.EndDaHeight,
169-
}, nil
170-
}
171-
daRetriever = single.NewDARetrieverAdapter(adapterFunc)
172-
}
173-
174152
sequencer, err := single.NewSequencer(
175153
ctx,
176154
logger,

‎apps/testapp/cmd/run.go‎

Lines changed: 8 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ import (
1717
"github.com/evstack/ev-node/node"
1818
"github.com/evstack/ev-node/pkg/cmd"
1919
"github.com/evstack/ev-node/pkg/config"
20+
"github.com/evstack/ev-node/pkg/genesis"
2021
genesispkg "github.com/evstack/ev-node/pkg/genesis"
2122
"github.com/evstack/ev-node/pkg/p2p"
2223
"github.com/evstack/ev-node/pkg/p2p/key"
@@ -117,20 +118,20 @@ func createSequencer(
117118
datastore datastore.Batching,
118119
da da.DA,
119120
nodeConfig config.Config,
120-
genesis genesispkg.Genesis,
121+
genesis genesis.Genesis,
121122
) (coresequencer.Sequencer, error) {
123+
daRetriever, err := block.NewDARetriever(da, nodeConfig, genesis, logger)
124+
if err != nil {
125+
return nil, fmt.Errorf("failed to create DA retriever: %w", err)
126+
}
127+
adapter := based.NewDARetrieverAdapter(daRetriever.RetrieveForcedIncludedTxsFromDA)
128+
122129
if nodeConfig.Node.BasedSequencer {
123130
// Based sequencer mode - fetch transactions only from DA
124131
if !nodeConfig.Node.Aggregator {
125132
return nil, fmt.Errorf("based sequencer mode requires aggregator mode to be enabled")
126133
}
127134

128-
daRetriever, err := block.NewDARetriever(da, nodeConfig, genesis, logger)
129-
if err != nil {
130-
return nil, fmt.Errorf("failed to create DA retriever: %w", err)
131-
}
132-
133-
adapter := based.NewDARetrieverAdapter(daRetriever.RetrieveForcedIncludedTxsFromDA)
134135
basedSeq := based.NewBasedSequencer(adapter, da, nodeConfig, genesis, logger)
135136

136137
logger.Info().
@@ -146,29 +147,6 @@ func createSequencer(
146147
return nil, fmt.Errorf("failed to create single sequencer metrics: %w", err)
147148
}
148149

149-
// Create DA retriever for forced inclusion support
150-
var daRetriever single.DARetriever
151-
if nodeConfig.Node.Aggregator {
152-
commonDARetriever, err := block.NewDARetriever(da, nodeConfig, genesis, logger)
153-
if err != nil {
154-
return nil, fmt.Errorf("failed to create DA retriever: %w", err)
155-
}
156-
157-
// Adapter function to convert between common and single event types
158-
adapterFunc := func(ctx context.Context, daHeight uint64) (*single.ForcedInclusionEvent, error) {
159-
event, err := commonDARetriever.RetrieveForcedIncludedTxsFromDA(ctx, daHeight)
160-
if err != nil {
161-
return nil, err
162-
}
163-
return &single.ForcedInclusionEvent{
164-
Txs: event.Txs,
165-
StartDaHeight: event.StartDaHeight,
166-
EndDaHeight: event.EndDaHeight,
167-
}, nil
168-
}
169-
daRetriever = single.NewDARetrieverAdapter(adapterFunc)
170-
}
171-
172150
sequencer, err := single.NewSequencer(
173151
ctx,
174152
logger,

0 commit comments

Comments
 (0)