@@ -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
0 commit comments