Skip to content

Commit f7d8005

Browse files
authored
Revert "execution/bbd: el backward block downloader v2 (#16073)" (#16159)
This reverts commit ee48d8a. due to issues with hive - need more time to resolve - unblocking the release
1 parent b94f477 commit f7d8005

24 files changed

+72
-1738
lines changed

cmd/utils/flags.go

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1131,11 +1131,6 @@ var (
11311131
Usage: "Enables blazing fast eth_getProof for executed block",
11321132
Aliases: []string{"experimental.commitment-history"},
11331133
}
1134-
ElBlockDownloaderV2 = cli.BoolFlag{
1135-
Name: "el.block.downloader.v2",
1136-
Usage: "Enables the EL engine v2 block downloader",
1137-
Value: false,
1138-
}
11391134
)
11401135

11411136
var MetricFlags = []cli.Flag{&MetricsEnabledFlag, &MetricsHTTPFlag, &MetricsPortFlag, &DiagDisabledFlag, &DiagEndpointAddrFlag, &DiagEndpointPortFlag, &DiagSpeedTestFlag}
@@ -1978,7 +1973,6 @@ func SetEthConfig(ctx *cli.Context, nodeConfig *nodecfg.Config, cfg *ethconfig.C
19781973
setCaplin(ctx, cfg)
19791974

19801975
cfg.AllowAA = ctx.Bool(AAFlag.Name)
1981-
cfg.ElBlockDownloaderV2 = ctx.Bool(ElBlockDownloaderV2.Name)
19821976
cfg.Ethstats = ctx.String(EthStatsURLFlag.Name)
19831977

19841978
if ctx.Bool(ExperimentalConcurrentCommitmentFlag.Name) {

eth/backend.go

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -713,7 +713,7 @@ func New(ctx context.Context, stack *node.Node, config *ethconfig.Config, logger
713713
}
714714
}
715715

716-
sentryMcDisableBlockDownload := chainConfig.Bor != nil || config.ElBlockDownloaderV2
716+
sentryMcDisableBlockDownload := chainConfig.Bor != nil
717717
backend.sentriesClient, err = sentry_multi_client.NewMultiClient(
718718
backend.chainDB,
719719
chainConfig,
@@ -1041,7 +1041,7 @@ func New(ctx context.Context, stack *node.Node, config *ethconfig.Config, logger
10411041
engine_block_downloader.NewEngineBlockDownloader(ctx,
10421042
logger, backend.sentriesClient.Hd, executionRpc,
10431043
backend.sentriesClient.Bd, backend.sentriesClient.BroadcastNewBlock, backend.sentriesClient.SendBodyRequest, blockReader,
1044-
backend.chainDB, chainConfig, tmpdir, config.Sync, config.ElBlockDownloaderV2, sentryMux(sentries), statusDataProvider),
1044+
backend.chainDB, chainConfig, tmpdir, config.Sync),
10451045
config.InternalCL && !config.CaplinConfig.EnableEngineAPI, // If the chain supports the engine API, then we should not make the server fail.
10461046
false,
10471047
config.Miner.EnabledPOS,
@@ -1079,7 +1079,7 @@ func New(ctx context.Context, stack *node.Node, config *ethconfig.Config, logger
10791079
config,
10801080
logger,
10811081
chainConfig,
1082-
sentryMux(sentries),
1082+
polygonSyncSentry(sentries),
10831083
p2pConfig.MaxPeers,
10841084
statusDataProvider,
10851085
executionRpc,
@@ -1144,9 +1144,7 @@ func (s *Ethereum) Init(stack *node.Node, config *ethconfig.Config, chainConfig
11441144
var err error
11451145

11461146
if chainConfig.Bor == nil {
1147-
if !config.ElBlockDownloaderV2 {
1148-
s.sentriesClient.Hd.StartPoSDownloader(s.sentryCtx, s.sentriesClient.SendHeaderRequest, s.sentriesClient.Penalize)
1149-
}
1147+
s.sentriesClient.Hd.StartPoSDownloader(s.sentryCtx, s.sentriesClient.SendHeaderRequest, s.sentriesClient.Penalize)
11501148
}
11511149

11521150
emptyBadHash := config.BadBlockHash == common.Hash{}
@@ -1910,7 +1908,7 @@ func setBorDefaultTxPoolPriceLimit(chainConfig *chain.Config, config txpoolcfg.C
19101908
}
19111909
}
19121910

1913-
func sentryMux(sentries []protosentry.SentryClient) protosentry.SentryClient {
1911+
func polygonSyncSentry(sentries []protosentry.SentryClient) protosentry.SentryClient {
19141912
return libsentry.NewSentryMultiplexer(sentries)
19151913
}
19161914

eth/ethconfig/config.go

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -268,8 +268,6 @@ type Config struct {
268268

269269
// Account Abstraction
270270
AllowAA bool
271-
272-
ElBlockDownloaderV2 bool
273271
}
274272

275273
type Sync struct {

0 commit comments

Comments
 (0)