Skip to content

Commit a013ec2

Browse files
authored
Revert "updateForkChoice: support --sync.loop.block.limit (#9315)" (#9833)
Revert PR #9315 since it apparently causes MDBX bloat and performance regression. The regression was introduced in [v2.58.0](https://github.com/ledgerwatch/erigon/releases/tag/v2.58.0).
1 parent 02c9d4b commit a013ec2

File tree

5 files changed

+127
-198
lines changed

5 files changed

+127
-198
lines changed

eth/backend.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -781,7 +781,7 @@ func New(ctx context.Context, stack *node.Node, config *ethconfig.Config, logger
781781
checkStateRoot := true
782782
pipelineStages := stages2.NewPipelineStages(ctx, chainKv, config, stack.Config().P2P, backend.sentriesClient, backend.notifications, backend.downloaderClient, blockReader, blockRetire, backend.agg, backend.silkworm, backend.forkValidator, logger, checkStateRoot)
783783
backend.pipelineStagedSync = stagedsync.New(config.Sync, pipelineStages, stagedsync.PipelineUnwindOrder, stagedsync.PipelinePruneOrder, logger)
784-
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)
784+
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)
785785
executionRpc := direct.NewExecutionClientDirect(backend.eth1ExecutionServer)
786786
engineBackendRPC := engineapi.NewEngineServer(
787787
logger,

params/version.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ var (
3333
const (
3434
VersionMajor = 2 // Major version component of the current release
3535
VersionMinor = 59 // Minor version component of the current release
36-
VersionMicro = 1 // Patch version component of the current release
36+
VersionMicro = 2 // Patch version component of the current release
3737
VersionModifier = "" // Modifier component of the current release
3838
VersionKeyCreated = "ErigonVersionCreated"
3939
VersionKeyFinished = "ErigonVersionFinished"

turbo/execution/eth1/ethereum_execution.go

+2-8
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ import (
1111
"github.com/ledgerwatch/erigon-lib/gointerfaces/execution"
1212
"github.com/ledgerwatch/erigon-lib/kv/dbutils"
1313
"github.com/ledgerwatch/erigon-lib/wrap"
14-
"github.com/ledgerwatch/erigon/eth/ethconfig"
1514
"github.com/ledgerwatch/log/v3"
1615
"golang.org/x/sync/semaphore"
1716
"google.golang.org/protobuf/types/known/emptypb"
@@ -59,7 +58,6 @@ type EthereumExecutionModule struct {
5958

6059
// configuration
6160
config *chain.Config
62-
syncCfg ethconfig.Sync
6361
historyV3 bool
6462
// consensus
6563
engine consensus.Engine
@@ -73,8 +71,7 @@ func NewEthereumExecutionModule(blockReader services.FullBlockReader, db kv.RwDB
7371
hook *stages.Hook, accumulator *shards.Accumulator,
7472
stateChangeConsumer shards.StateChangeConsumer,
7573
logger log.Logger, engine consensus.Engine,
76-
historyV3 bool, syncCfg ethconfig.Sync,
77-
ctx context.Context,
74+
historyV3 bool, ctx context.Context,
7875
) *EthereumExecutionModule {
7976
return &EthereumExecutionModule{
8077
blockReader: blockReader,
@@ -90,10 +87,7 @@ func NewEthereumExecutionModule(blockReader services.FullBlockReader, db kv.RwDB
9087
accumulator: accumulator,
9188
stateChangeConsumer: stateChangeConsumer,
9289
engine: engine,
93-
94-
historyV3: historyV3,
95-
syncCfg: syncCfg,
96-
bacgroundCtx: ctx,
90+
bacgroundCtx: ctx,
9791
}
9892
}
9993

0 commit comments

Comments
 (0)