Skip to content

Commit

Permalink
use PR-3431 style fork choice on all networks (#6110)
Browse files Browse the repository at this point in the history
To start phasing out Capella fork choice logic, set default to PR 3431.
A subsequent release can remove the fallback option.
  • Loading branch information
etan-status authored Mar 20, 2024
1 parent eb5acdb commit de2d205
Showing 1 changed file with 1 addition and 6 deletions.
7 changes: 1 addition & 6 deletions beacon_chain/nimbus_beacon_node.nim
Original file line number Diff line number Diff line change
Expand Up @@ -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.} =
Expand Down

0 comments on commit de2d205

Please sign in to comment.