use PR-3431 style fork choice on all networks (#6110)

To start phasing out Capella fork choice logic, set default to PR 3431.
A subsequent release can remove the fallback option.
This commit is contained in:
Etan Kissling 2024-03-20 19:12:33 +01:00 committed by GitHub
parent eb5acdb7dd
commit de2d205f61
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

View File

@ -2156,12 +2156,7 @@ proc doRunBeaconNode(config: var BeaconNodeConf, rng: ref HmacDrbgContext) {.rai
for node in metadata.bootstrapNodes:
config.bootstrapNodes.add node
if config.forkChoiceVersion.isNone:
config.forkChoiceVersion =
if metadata.cfg.DENEB_FORK_EPOCH != FAR_FUTURE_EPOCH:
# https://github.com/ethereum/pm/issues/844#issuecomment-1673359012
some(ForkChoiceVersion.Pr3431)
else:
some(ForkChoiceVersion.Stable)
config.forkChoiceVersion = some(ForkChoiceVersion.Pr3431)
## Ctrl+C handling
proc controlCHandler() {.noconv.} =