From daafe73462a63efb8cf9968ec37dea3394a47931 Mon Sep 17 00:00:00 2001 From: Aayush Date: Wed, 6 Mar 2024 12:23:09 -0500 Subject: [PATCH] fix: beacon: validate drand change at nv16 correctly --- chain/beacon/beacon.go | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/chain/beacon/beacon.go b/chain/beacon/beacon.go index d06be3825..45baa6624 100644 --- a/chain/beacon/beacon.go +++ b/chain/beacon/beacon.go @@ -89,11 +89,15 @@ func ValidateBlockValues(bSchedule Schedule, nv network.Version, h *types.BlockH return xerrors.Errorf("expected final beacon entry in block to be at round %d, got %d", maxRound, last.Round) } - // Verify that all other entries' rounds are as expected for the epochs in between parentEpoch and h.Height - for i, e := range h.BeaconEntries { - correctRound := currBeacon.MaxBeaconRoundForEpoch(nv, parentEpoch+abi.ChainEpoch(i)+1) - if e.Round != correctRound { - return xerrors.Errorf("unexpected beacon round %d, expected %d for epoch %d", e.Round, correctRound, parentEpoch+abi.ChainEpoch(i)) + // If the beacon is UNchained, verify that the block only includes the rounds we want for the epochs in between parentEpoch and h.Height + // For chained beacons, you must have all the rounds forming a valid chain with prevEntry, so we can skip this step + if !currBeacon.IsChained() { + // Verify that all other entries' rounds are as expected for the epochs in between parentEpoch and h.Height + for i, e := range h.BeaconEntries { + correctRound := currBeacon.MaxBeaconRoundForEpoch(nv, parentEpoch+abi.ChainEpoch(i)+1) + if e.Round != correctRound { + return xerrors.Errorf("unexpected beacon round %d, expected %d for epoch %d", e.Round, correctRound, parentEpoch+abi.ChainEpoch(i)) + } } }