cerc-io/lotus
16
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 27 Wiki Activity

Merge pull request #11690 from filecoin-project/asr/fix-drand-skyr

Browse Source 
fix: beacon: validate drand change at nv16 correctly
This commit is contained in:
Aayush Rajasekaran 2024-03-06 13:44:29 -05:00 committed by GitHub
commit 1f6e556d25
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
chain/beacon/beacon.go
View File

@ -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) 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 // 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 i, e := range h.BeaconEntries { // For chained beacons, you must have all the rounds forming a valid chain with prevEntry, so we can skip this step
correctRound := currBeacon.MaxBeaconRoundForEpoch(nv, parentEpoch+abi.ChainEpoch(i)+1) if !currBeacon.IsChained() {
if e.Round != correctRound { // Verify that all other entries' rounds are as expected for the epochs in between parentEpoch and h.Height
return xerrors.Errorf("unexpected beacon round %d, expected %d for epoch %d", e.Round, correctRound, parentEpoch+abi.ChainEpoch(i)) 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))
}
} }
} }