Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add nil checks to Versioned*BeaconBlock functions #111

Merged
merged 3 commits into from
Feb 28, 2024
Merged

Add nil checks to Versioned*BeaconBlock functions #111

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cf7bf33
Add nil checks to VersionedSignedBeaconBlock funcs
jtraglia Feb 28, 2024
0802562
Fix another minor typo
jtraglia Feb 28, 2024
79285e0
Fix some things in VersionedBeaconBlock
jtraglia Feb 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 23 additions & 8 deletions spec/versionedbeaconblock.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ func (v *VersionedBeaconBlock) Slot() (phase0.Slot, error) {
return v.Capella.Slot, nil
case DataVersionDeneb:
if v.Deneb == nil {
return 0, errors.New("no deneb block contents")
return 0, errors.New("no deneb block")
}

return v.Deneb.Slot, nil
Expand Down Expand Up @@ -117,7 +117,7 @@ func (v *VersionedBeaconBlock) RandaoReveal() (phase0.BLSSignature, error) {
return v.Capella.Body.RANDAOReveal, nil
case DataVersionDeneb:
if v.Deneb == nil {
return phase0.BLSSignature{}, errors.New("no deneb block contents")
return phase0.BLSSignature{}, errors.New("no deneb block")
}
if v.Deneb.Body == nil {
return phase0.BLSSignature{}, errors.New("no deneb block body")
Expand Down Expand Up @@ -170,7 +170,7 @@ func (v *VersionedBeaconBlock) Graffiti() ([32]byte, error) {
return v.Capella.Body.Graffiti, nil
case DataVersionDeneb:
if v.Deneb == nil {
return [32]byte{}, errors.New("no deneb block contents")
return [32]byte{}, errors.New("no deneb block")
}
if v.Deneb.Body == nil {
return [32]byte{}, errors.New("no deneb block body")
Expand Down Expand Up @@ -211,7 +211,7 @@ func (v *VersionedBeaconBlock) ProposerIndex() (phase0.ValidatorIndex, error) {
return v.Capella.ProposerIndex, nil
case DataVersionDeneb:
if v.Deneb == nil {
return 0, errors.New("no deneb block contents")
return 0, errors.New("no deneb block")
}

return v.Deneb.ProposerIndex, nil
Expand Down Expand Up @@ -249,7 +249,7 @@ func (v *VersionedBeaconBlock) Root() (phase0.Root, error) {
return v.Capella.HashTreeRoot()
case DataVersionDeneb:
if v.Deneb == nil {
return phase0.Root{}, errors.New("no deneb block contents")
return phase0.Root{}, errors.New("no deneb block")
}

return v.Deneb.HashTreeRoot()
Expand All @@ -265,29 +265,44 @@ func (v *VersionedBeaconBlock) BodyRoot() (phase0.Root, error) {
if v.Phase0 == nil {
return phase0.Root{}, errors.New("no phase0 block")
}
if v.Phase0.Body == nil {
return phase0.Root{}, errors.New("no phase0 block body")
}

return v.Phase0.Body.HashTreeRoot()
case DataVersionAltair:
if v.Altair == nil {
return phase0.Root{}, errors.New("no altair block")
}
if v.Altair.Body == nil {
return phase0.Root{}, errors.New("no altair block body")
}

return v.Altair.Body.HashTreeRoot()
case DataVersionBellatrix:
if v.Bellatrix == nil {
return phase0.Root{}, errors.New("no bellatrix block")
}
if v.Bellatrix.Body == nil {
return phase0.Root{}, errors.New("no bellatrix block body")
}

return v.Bellatrix.Body.HashTreeRoot()
case DataVersionCapella:
if v.Capella == nil {
return phase0.Root{}, errors.New("no capella block")
}
if v.Capella.Body == nil {
return phase0.Root{}, errors.New("no capella block body")
}

return v.Capella.Body.HashTreeRoot()
case DataVersionDeneb:
if v.Deneb == nil {
return phase0.Root{}, errors.New("no deneb block contents")
return phase0.Root{}, errors.New("no deneb block")
}
if v.Deneb.Body == nil {
return phase0.Root{}, errors.New("no deneb block body")
}

return v.Deneb.Body.HashTreeRoot()
Expand Down Expand Up @@ -325,7 +340,7 @@ func (v *VersionedBeaconBlock) ParentRoot() (phase0.Root, error) {
return v.Capella.ParentRoot, nil
case DataVersionDeneb:
if v.Deneb == nil {
return phase0.Root{}, errors.New("no deneb block contents")
return phase0.Root{}, errors.New("no deneb block")
}

return v.Deneb.ParentRoot, nil
Expand Down Expand Up @@ -363,7 +378,7 @@ func (v *VersionedBeaconBlock) StateRoot() (phase0.Root, error) {
return v.Capella.StateRoot, nil
case DataVersionDeneb:
if v.Deneb == nil {
return phase0.Root{}, errors.New("no deneb block contents")
return phase0.Root{}, errors.New("no deneb block")
}

return v.Deneb.StateRoot, nil
Expand Down
72 changes: 37 additions & 35 deletions spec/versionedsignedbeaconblock.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ func (v *VersionedSignedBeaconBlock) Slot() (phase0.Slot, error) {
return v.Capella.Message.Slot, nil
case DataVersionDeneb:
if v.Deneb == nil || v.Deneb.Message == nil {
return 0, errors.New("no denb block")
return 0, errors.New("no deneb block")
}

return v.Deneb.Message.Slot, nil
Expand All @@ -75,25 +75,25 @@ func (v *VersionedSignedBeaconBlock) Slot() (phase0.Slot, error) {
func (v *VersionedSignedBeaconBlock) ProposerIndex() (phase0.ValidatorIndex, error) {
switch v.Version {
case DataVersionPhase0:
if v.Phase0 == nil {
if v.Phase0 == nil || v.Phase0.Message == nil {
return 0, errors.New("no phase0 block")
}

return v.Phase0.Message.ProposerIndex, nil
case DataVersionAltair:
if v.Altair == nil {
if v.Altair == nil || v.Altair.Message == nil {
return 0, errors.New("no altair block")
}

return v.Altair.Message.ProposerIndex, nil
case DataVersionBellatrix:
if v.Bellatrix == nil {
if v.Bellatrix == nil || v.Bellatrix.Message == nil {
return 0, errors.New("no bellatrix block")
}

return v.Bellatrix.Message.ProposerIndex, nil
case DataVersionCapella:
if v.Capella == nil {
if v.Capella == nil || v.Capella.Message == nil {
return 0, errors.New("no capella block")
}

Expand Down Expand Up @@ -126,7 +126,7 @@ func (v *VersionedSignedBeaconBlock) ExecutionBlockHash() (phase0.Hash32, error)
return v.Capella.Message.Body.ExecutionPayload.BlockHash, nil
case DataVersionDeneb:
if v.Deneb == nil || v.Deneb.Message == nil || v.Deneb.Message.Body == nil || v.Deneb.Message.Body.ExecutionPayload == nil {
return phase0.Hash32{}, errors.New("no denb block")
return phase0.Hash32{}, errors.New("no deneb block")
}

return v.Deneb.Message.Body.ExecutionPayload.BlockHash, nil
Expand Down Expand Up @@ -213,13 +213,13 @@ func (v *VersionedSignedBeaconBlock) Graffiti() ([32]byte, error) {

return v.Bellatrix.Message.Body.Graffiti, nil
case DataVersionCapella:
if v.Capella == nil || v.Capella.Message == nil || v.Capella.Message.Body == nil || v.Capella.Message.Body.ExecutionPayload == nil {
if v.Capella == nil || v.Capella.Message == nil || v.Capella.Message.Body == nil {
return [32]byte{}, errors.New("no capella block")
}

return v.Capella.Message.Body.Graffiti, nil
case DataVersionDeneb:
if v.Deneb == nil || v.Deneb.Message == nil || v.Deneb.Message.Body == nil || v.Deneb.Message.Body.ExecutionPayload == nil {
if v.Deneb == nil || v.Deneb.Message == nil || v.Deneb.Message.Body == nil {
return [32]byte{}, errors.New("no deneb block")
}

Expand Down Expand Up @@ -271,25 +271,25 @@ func (v *VersionedSignedBeaconBlock) Attestations() ([]*phase0.Attestation, erro
func (v *VersionedSignedBeaconBlock) Root() (phase0.Root, error) {
switch v.Version {
case DataVersionPhase0:
if v.Phase0 == nil {
if v.Phase0 == nil || v.Phase0.Message == nil {
return phase0.Root{}, errors.New("no phase0 block")
}

return v.Phase0.Message.HashTreeRoot()
case DataVersionAltair:
if v.Altair == nil {
if v.Altair == nil || v.Altair.Message == nil {
return phase0.Root{}, errors.New("no altair block")
}

return v.Altair.Message.HashTreeRoot()
case DataVersionBellatrix:
if v.Bellatrix == nil {
if v.Bellatrix == nil || v.Bellatrix.Message == nil {
return phase0.Root{}, errors.New("no bellatrix block")
}

return v.Bellatrix.Message.HashTreeRoot()
case DataVersionCapella:
if v.Capella == nil {
if v.Capella == nil || v.Capella.Message == nil {
return phase0.Root{}, errors.New("no capella block")
}

Expand All @@ -309,25 +309,25 @@ func (v *VersionedSignedBeaconBlock) Root() (phase0.Root, error) {
func (v *VersionedSignedBeaconBlock) BodyRoot() (phase0.Root, error) {
switch v.Version {
case DataVersionPhase0:
if v.Phase0 == nil {
if v.Phase0 == nil || v.Phase0.Message == nil || v.Phase0.Message.Body == nil {
return phase0.Root{}, errors.New("no phase0 block")
}

return v.Phase0.Message.Body.HashTreeRoot()
case DataVersionAltair:
if v.Altair == nil {
if v.Altair == nil || v.Altair.Message == nil || v.Altair.Message.Body == nil {
return phase0.Root{}, errors.New("no altair block")
}

return v.Altair.Message.Body.HashTreeRoot()
case DataVersionBellatrix:
if v.Bellatrix == nil {
if v.Bellatrix == nil || v.Bellatrix.Message == nil || v.Bellatrix.Message.Body == nil {
return phase0.Root{}, errors.New("no bellatrix block")
}

return v.Bellatrix.Message.Body.HashTreeRoot()
case DataVersionCapella:
if v.Capella == nil {
if v.Capella == nil || v.Capella.Message == nil || v.Capella.Message.Body == nil {
return phase0.Root{}, errors.New("no capella block")
}

Expand All @@ -347,25 +347,25 @@ func (v *VersionedSignedBeaconBlock) BodyRoot() (phase0.Root, error) {
func (v *VersionedSignedBeaconBlock) ParentRoot() (phase0.Root, error) {
switch v.Version {
case DataVersionPhase0:
if v.Phase0 == nil {
if v.Phase0 == nil || v.Phase0.Message == nil {
return phase0.Root{}, errors.New("no phase0 block")
}

return v.Phase0.Message.ParentRoot, nil
case DataVersionAltair:
if v.Altair == nil {
if v.Altair == nil || v.Altair.Message == nil {
return phase0.Root{}, errors.New("no altair block")
}

return v.Altair.Message.ParentRoot, nil
case DataVersionBellatrix:
if v.Bellatrix == nil {
if v.Bellatrix == nil || v.Bellatrix.Message == nil {
return phase0.Root{}, errors.New("no bellatrix block")
}

return v.Bellatrix.Message.ParentRoot, nil
case DataVersionCapella:
if v.Capella == nil {
if v.Capella == nil || v.Capella.Message == nil {
return phase0.Root{}, errors.New("no capella block")
}

Expand All @@ -385,25 +385,25 @@ func (v *VersionedSignedBeaconBlock) ParentRoot() (phase0.Root, error) {
func (v *VersionedSignedBeaconBlock) StateRoot() (phase0.Root, error) {
switch v.Version {
case DataVersionPhase0:
if v.Phase0 == nil {
if v.Phase0 == nil || v.Phase0.Message == nil {
return phase0.Root{}, errors.New("no phase0 block")
}

return v.Phase0.Message.StateRoot, nil
case DataVersionAltair:
if v.Altair == nil {
if v.Altair == nil || v.Altair.Message == nil {
return phase0.Root{}, errors.New("no altair block")
}

return v.Altair.Message.StateRoot, nil
case DataVersionBellatrix:
if v.Bellatrix == nil {
if v.Bellatrix == nil || v.Bellatrix.Message == nil {
return phase0.Root{}, errors.New("no bellatrix block")
}

return v.Bellatrix.Message.StateRoot, nil
case DataVersionCapella:
if v.Capella == nil {
if v.Capella == nil || v.Capella.Message == nil {
return phase0.Root{}, errors.New("no capella block")
}

Expand Down Expand Up @@ -575,25 +575,25 @@ func (v *VersionedSignedBeaconBlock) VoluntaryExits() ([]*phase0.SignedVoluntary
func (v *VersionedSignedBeaconBlock) AttesterSlashings() ([]*phase0.AttesterSlashing, error) {
switch v.Version {
case DataVersionPhase0:
if v.Phase0 == nil {
if v.Phase0 == nil || v.Phase0.Message == nil || v.Phase0.Message.Body == nil {
return nil, errors.New("no phase0 block")
}

return v.Phase0.Message.Body.AttesterSlashings, nil
case DataVersionAltair:
if v.Altair == nil {
if v.Altair == nil || v.Altair.Message == nil || v.Altair.Message.Body == nil {
return nil, errors.New("no altair block")
}

return v.Altair.Message.Body.AttesterSlashings, nil
case DataVersionBellatrix:
if v.Bellatrix == nil {
if v.Bellatrix == nil || v.Bellatrix.Message == nil || v.Bellatrix.Message.Body == nil {
return nil, errors.New("no bellatrix block")
}

return v.Bellatrix.Message.Body.AttesterSlashings, nil
case DataVersionCapella:
if v.Capella == nil {
if v.Capella == nil || v.Capella.Message == nil || v.Capella.Message.Body == nil {
return nil, errors.New("no capella block")
}

Expand All @@ -613,25 +613,25 @@ func (v *VersionedSignedBeaconBlock) AttesterSlashings() ([]*phase0.AttesterSlas
func (v *VersionedSignedBeaconBlock) ProposerSlashings() ([]*phase0.ProposerSlashing, error) {
switch v.Version {
case DataVersionPhase0:
if v.Phase0 == nil {
if v.Phase0 == nil || v.Phase0.Message == nil || v.Phase0.Message.Body == nil {
return nil, errors.New("no phase0 block")
}

return v.Phase0.Message.Body.ProposerSlashings, nil
case DataVersionAltair:
if v.Altair == nil {
if v.Altair == nil || v.Altair.Message == nil || v.Altair.Message.Body == nil {
return nil, errors.New("no altair block")
}

return v.Altair.Message.Body.ProposerSlashings, nil
case DataVersionBellatrix:
if v.Bellatrix == nil {
if v.Bellatrix == nil || v.Bellatrix.Message == nil || v.Bellatrix.Message.Body == nil {
return nil, errors.New("no bellatrix block")
}

return v.Bellatrix.Message.Body.ProposerSlashings, nil
case DataVersionCapella:
if v.Capella == nil {
if v.Capella == nil || v.Capella.Message == nil || v.Capella.Message.Body == nil {
return nil, errors.New("no capella block")
}

Expand All @@ -653,19 +653,19 @@ func (v *VersionedSignedBeaconBlock) SyncAggregate() (*altair.SyncAggregate, err
case DataVersionPhase0:
return nil, errors.New("phase0 block does not have sync aggregate")
case DataVersionAltair:
if v.Altair == nil {
if v.Altair == nil || v.Altair.Message == nil || v.Altair.Message.Body == nil {
return nil, errors.New("no altair block")
}

return v.Altair.Message.Body.SyncAggregate, nil
case DataVersionBellatrix:
if v.Bellatrix == nil {
if v.Bellatrix == nil || v.Bellatrix.Message == nil || v.Bellatrix.Message.Body == nil {
return nil, errors.New("no bellatrix block")
}

return v.Bellatrix.Message.Body.SyncAggregate, nil
case DataVersionCapella:
if v.Capella == nil {
if v.Capella == nil || v.Capella.Message == nil || v.Capella.Message.Body == nil {
return nil, errors.New("no capella block")
}

Expand Down Expand Up @@ -742,6 +742,8 @@ func (v *VersionedSignedBeaconBlock) BlobKZGCommitments() ([]deneb.KZGCommitment
return nil, errors.New("altair block does not have kzg commitments")
case DataVersionBellatrix:
return nil, errors.New("bellatrix block does not have kzg commitments")
case DataVersionCapella:
return nil, errors.New("capella block does not have kzg commitments")
case DataVersionDeneb:
if v.Deneb == nil || v.Deneb.Message == nil || v.Deneb.Message.Body == nil {
return nil, errors.New("no deneb block")
Expand Down
Loading