Skip to content

Commit

Permalink
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
save
Browse files Browse the repository at this point in the history
yperbasis authored and AskAlexSharov committed Apr 10, 2024
1 parent 56cf84b commit ec670e4
Showing 4 changed files with 126 additions and 197 deletions.
2 changes: 1 addition & 1 deletion eth/backend.go
Original file line number Diff line number Diff line change
@@ -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,
10 changes: 2 additions & 8 deletions turbo/execution/eth1/ethereum_execution.go
Original file line number Diff line number Diff line change
@@ -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"
@@ -59,7 +58,6 @@ type EthereumExecutionModule struct {

// configuration
config *chain.Config
syncCfg ethconfig.Sync
historyV3 bool
// consensus
engine consensus.Engine
@@ -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,
@@ -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,
}
}

Loading

0 comments on commit ec670e4

Please sign in to comment.