Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Revert "updateForkChoice: support --sync.loop.block.limit (#9315)" #9900

Merged
merged 1 commit into from
Apr 11, 2024
Merged

Revert "updateForkChoice: support --sync.loop.block.limit (#9315)" #9900

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion eth/backend.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -793,7 +793,7 @@ func New(ctx context.Context, stack *node.Node, config *ethconfig.Config, logger
checkStateRoot := true
pipelineStages := stages2.NewPipelineStages(ctx, chainKv, config, p2pConfig, backend.sentriesClient, backend.notifications, backend.downloaderClient, blockReader, blockRetire, backend.agg, backend.silkworm, backend.forkValidator, logger, checkStateRoot)
backend.pipelineStagedSync = stagedsync.New(config.Sync, pipelineStages, stagedsync.PipelineUnwindOrder, stagedsync.PipelinePruneOrder, logger)
backend.eth1ExecutionServer = eth1.NewEthereumExecutionModule(blockReader, chainKv, backend.pipelineStagedSync, backend.forkValidator, chainConfig, assembleBlockPOS, hook, backend.notifications.Accumulator, backend.notifications.StateChangesConsumer, logger, backend.engine, config.HistoryV3, config.Sync, ctx)
backend.eth1ExecutionServer = eth1.NewEthereumExecutionModule(blockReader, chainKv, backend.pipelineStagedSync, backend.forkValidator, chainConfig, assembleBlockPOS, hook, backend.notifications.Accumulator, backend.notifications.StateChangesConsumer, logger, backend.engine, config.HistoryV3, ctx)
executionRpc := direct.NewExecutionClientDirect(backend.eth1ExecutionServer)
engineBackendRPC := engineapi.NewEngineServer(
logger,
Expand Down
10 changes: 2 additions & 8 deletions turbo/execution/eth1/ethereum_execution.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ import (
"github.com/ledgerwatch/erigon-lib/gointerfaces/execution"
"github.com/ledgerwatch/erigon-lib/kv/dbutils"
"github.com/ledgerwatch/erigon-lib/wrap"
"github.com/ledgerwatch/erigon/eth/ethconfig"
"github.com/ledgerwatch/log/v3"
"golang.org/x/sync/semaphore"
"google.golang.org/protobuf/types/known/emptypb"
Expand Down Expand Up @@ -59,7 +58,6 @@ type EthereumExecutionModule struct {

// configuration
config *chain.Config
syncCfg ethconfig.Sync
historyV3 bool
// consensus
engine consensus.Engine
Expand All @@ -73,8 +71,7 @@ func NewEthereumExecutionModule(blockReader services.FullBlockReader, db kv.RwDB
hook *stages.Hook, accumulator *shards.Accumulator,
stateChangeConsumer shards.StateChangeConsumer,
logger log.Logger, engine consensus.Engine,
historyV3 bool, syncCfg ethconfig.Sync,
ctx context.Context,
historyV3 bool, ctx context.Context,
) *EthereumExecutionModule {
return &EthereumExecutionModule{
blockReader: blockReader,
Expand All @@ -90,10 +87,7 @@ func NewEthereumExecutionModule(blockReader services.FullBlockReader, db kv.RwDB
accumulator: accumulator,
stateChangeConsumer: stateChangeConsumer,
engine: engine,

historyV3: historyV3,
syncCfg: syncCfg,
bacgroundCtx: ctx,
bacgroundCtx: ctx,
}
}

Expand Down
Loading
Loading