status-im/nimbus-eth2
2
0
Fork 0
mirror of https://github.com/status-im/nimbus-eth2.git synced 2025-01-09 13:56:23 +00:00
Code Issues Projects Releases Wiki Activity

weaken overaggressive different-fork-next-slot check (#4665)

Browse Source
This commit is contained in:
tersec 2023-02-27 20:23:00 +00:00 committed by GitHub
parent 0a87889eaf
commit 8ee5e8271d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
beacon_chain/consensus_object_pools/consensus_manager.nim
View File

@ -354,11 +354,14 @@ proc runProposalForkchoiceUpdated*(
nextWallSlot, validatorIndex, nextProposer nextWallSlot, validatorIndex, nextProposer
withState(self.dag.headState): withState(self.dag.headState):
let nextSlotFork = self.dag.cfg.forkAtEpoch(nextWallSlot.epoch) let
if forkyState.data.fork != nextSlotFork: nextSlotFork = self.dag.cfg.forkAtEpoch(nextWallSlot.epoch)
debug "runProposalForkchoiceUpdated: about to do fork transition; don't have appropriate state to fcU ahead", nextSlotForkVersion = self.dag.cfg.forkVersionAtEpoch(nextWallSlot.epoch)
if nextSlotForkVersion == self.dag.cfg.CAPELLA_FORK_VERSION and
forkyState.data.fork.current_version != nextSlotFork.current_version:
debug "runProposalForkchoiceUpdated: about to do Capella transition; don't have appropriate state to fcU ahead",
nextWallSlot, validatorIndex, nextProposer, nextSlotFork, nextWallSlot, validatorIndex, nextProposer, nextSlotFork,
stateFork = forkyState.data.fork nextSlotForkVersion, stateFork = forkyState.data.fork
# Approximately lines up with validator_duties version. Used optimistically/ # Approximately lines up with validator_duties version. Used optimistically/
# opportunistically, so mismatches are fine if not too frequent. # opportunistically, so mismatches are fine if not too frequent.