status-im/nimbus-eth2
2
0
Fork 0
mirror of https://github.com/status-im/nimbus-eth2.git synced 2025-01-28 07:15:57 +00:00
Code Issues Projects Releases Wiki Activity

dag: protect against finalized epoch moving before BlockRef cutoff (#3847)

Browse Source
This commit is contained in:
Jacek Sieka 2022-07-07 16:24:31 +02:00 committed by GitHub
parent 9de2c6171f
commit b00eac7a50
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
beacon_chain/consensus_object_pools/attestation_pool.nim
View File

@ -152,11 +152,9 @@ proc init*(T: type AttestationPool, dag: ChainDAGRef,
doAssert status.isOk(), "Error in preloading the fork choice: " & $status.error doAssert status.isOk(), "Error in preloading the fork choice: " & $status.error
info "Fork choice initialized", info "Fork choice initialized",
justified_epoch = getStateField( justified = shortLog(getStateField(
dag.headState, current_justified_checkpoint).epoch, dag.headState, current_justified_checkpoint)),
finalized_epoch = getStateField(dag.headState, finalized_checkpoint).epoch, finalized = shortLog(getStateField(dag.headState, finalized_checkpoint))
finalized_root = shortLog(dag.finalizedHead.blck.root)
T( T(
dag: dag, dag: dag,
quarantine: quarantine, quarantine: quarantine,

6
beacon_chain/consensus_object_pools/blockchain_dag.nim
View File

@ -1696,7 +1696,11 @@ proc updateHead*(
let let
finalized_checkpoint = finalized_checkpoint =
getStateField(dag.headState, finalized_checkpoint) getStateField(dag.headState, finalized_checkpoint)
finalizedSlot = max(finalized_checkpoint.epoch.start_slot(), dag.tail.slot) finalizedSlot =
# finalized checkpoint may move back in the head state compared to what
# we've seen in other forks - it does not move back in fork choice
# however, so we'll use the last-known-finalized in that case
max(finalized_checkpoint.epoch.start_slot(), dag.finalizedHead.slot)
finalizedHead = newHead.atSlot(finalizedSlot) finalizedHead = newHead.atSlot(finalizedSlot)
doAssert (not finalizedHead.blck.isNil), doAssert (not finalizedHead.blck.isNil),