Skip to content

Commit

Permalink
Add missing nil checks to two Versioned structs
Browse files Browse the repository at this point in the history
  • Loading branch information
@jtraglia
jtraglia committed May 8, 2024
1 parent 2730975 commit f50dcb2
Show file tree
Hide file tree
Showing 2 changed files with 77 additions and 31 deletions.
63 changes: 45 additions & 18 deletions api/versionedsignedblindedbeaconblock.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -94,19 +94,22 @@ func (v *VersionedSignedBlindedBeaconBlock) Attestations() ([]*phase0.Attestatio
func (v *VersionedSignedBlindedBeaconBlock) Root() (phase0.Root, error) {
switch v.Version {
case spec.DataVersionBellatrix:
if v.Bellatrix == nil {
if v.Bellatrix == nil ||
v.Bellatrix.Message == nil {
return phase0.Root{}, ErrDataMissing
}

return v.Bellatrix.Message.HashTreeRoot()
case spec.DataVersionCapella:
if v.Capella == nil {
if v.Capella == nil ||
v.Capella.Message == nil {
return phase0.Root{}, ErrDataMissing
}

return v.Capella.Message.HashTreeRoot()
case spec.DataVersionDeneb:
if v.Deneb == nil {
if v.Deneb == nil ||
v.Deneb.Message == nil {
return phase0.Root{}, ErrDataMissing
}

Expand All @@ -120,19 +123,25 @@ func (v *VersionedSignedBlindedBeaconBlock) Root() (phase0.Root, error) {
func (v *VersionedSignedBlindedBeaconBlock) BodyRoot() (phase0.Root, error) {
switch v.Version {
case spec.DataVersionBellatrix:
if v.Bellatrix == nil {
if v.Bellatrix == nil ||
v.Bellatrix.Message == nil ||
v.Bellatrix.Message.Body == nil {
return phase0.Root{}, ErrDataMissing
}

return v.Bellatrix.Message.Body.HashTreeRoot()
case spec.DataVersionCapella:
if v.Capella == nil {
if v.Capella == nil ||
v.Capella.Message == nil ||
v.Capella.Message.Body == nil {
return phase0.Root{}, ErrDataMissing
}

return v.Capella.Message.Body.HashTreeRoot()
case spec.DataVersionDeneb:
if v.Deneb == nil {
if v.Deneb == nil ||
v.Deneb.Message == nil ||
v.Deneb.Message.Body == nil {
return phase0.Root{}, ErrDataMissing
}

Expand All @@ -146,19 +155,22 @@ func (v *VersionedSignedBlindedBeaconBlock) BodyRoot() (phase0.Root, error) {
func (v *VersionedSignedBlindedBeaconBlock) ParentRoot() (phase0.Root, error) {
switch v.Version {
case spec.DataVersionBellatrix:
if v.Bellatrix == nil {
if v.Bellatrix == nil ||
v.Bellatrix.Message == nil {
return phase0.Root{}, ErrDataMissing
}

return v.Bellatrix.Message.ParentRoot, nil
case spec.DataVersionCapella:
if v.Capella == nil {
if v.Capella == nil ||
v.Capella.Message == nil {
return phase0.Root{}, ErrDataMissing
}

return v.Capella.Message.ParentRoot, nil
case spec.DataVersionDeneb:
if v.Deneb == nil {
if v.Deneb == nil ||
v.Deneb.Message == nil {
return phase0.Root{}, ErrDataMissing
}

Expand All @@ -172,19 +184,22 @@ func (v *VersionedSignedBlindedBeaconBlock) ParentRoot() (phase0.Root, error) {
func (v *VersionedSignedBlindedBeaconBlock) StateRoot() (phase0.Root, error) {
switch v.Version {
case spec.DataVersionBellatrix:
if v.Bellatrix == nil {
if v.Bellatrix == nil ||
v.Bellatrix.Message == nil {
return phase0.Root{}, ErrDataMissing
}

return v.Bellatrix.Message.StateRoot, nil
case spec.DataVersionCapella:
if v.Capella == nil {
if v.Capella == nil ||
v.Capella.Message == nil {
return phase0.Root{}, ErrDataMissing
}

return v.Capella.Message.StateRoot, nil
case spec.DataVersionDeneb:
if v.Deneb == nil {
if v.Deneb == nil ||
v.Deneb.Message == nil {
return phase0.Root{}, ErrDataMissing
}

Expand All @@ -198,19 +213,25 @@ func (v *VersionedSignedBlindedBeaconBlock) StateRoot() (phase0.Root, error) {
func (v *VersionedSignedBlindedBeaconBlock) AttesterSlashings() ([]*phase0.AttesterSlashing, error) {
switch v.Version {
case spec.DataVersionBellatrix:
if v.Bellatrix == nil {
if v.Bellatrix == nil ||
v.Bellatrix.Message == nil ||
v.Bellatrix.Message.Body == nil {
return nil, ErrDataMissing
}

return v.Bellatrix.Message.Body.AttesterSlashings, nil
case spec.DataVersionCapella:
if v.Capella == nil {
if v.Capella == nil ||
v.Capella.Message == nil ||
v.Capella.Message.Body == nil {
return nil, ErrDataMissing
}

return v.Capella.Message.Body.AttesterSlashings, nil
case spec.DataVersionDeneb:
if v.Deneb == nil {
if v.Deneb == nil ||
v.Deneb.Message == nil ||
v.Deneb.Message.Body == nil {
return nil, ErrDataMissing
}

Expand All @@ -224,19 +245,25 @@ func (v *VersionedSignedBlindedBeaconBlock) AttesterSlashings() ([]*phase0.Attes
func (v *VersionedSignedBlindedBeaconBlock) ProposerSlashings() ([]*phase0.ProposerSlashing, error) {
switch v.Version {
case spec.DataVersionBellatrix:
if v.Bellatrix == nil {
if v.Bellatrix == nil ||
v.Bellatrix.Message == nil ||
v.Bellatrix.Message.Body == nil {
return nil, ErrDataMissing
}

return v.Bellatrix.Message.Body.ProposerSlashings, nil
case spec.DataVersionCapella:
if v.Capella == nil {
if v.Capella == nil ||
v.Capella.Message == nil ||
v.Capella.Message.Body == nil {
return nil, ErrDataMissing
}

return v.Capella.Message.Body.ProposerSlashings, nil
case spec.DataVersionDeneb:
if v.Deneb == nil {
if v.Deneb == nil ||
v.Deneb.Message == nil ||
v.Deneb.Message.Body == nil {
return nil, ErrDataMissing
}

Expand Down
45 changes: 32 additions & 13 deletions api/versionedsignedblindedproposal.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -94,19 +94,22 @@ func (v *VersionedSignedBlindedProposal) Attestations() ([]*phase0.Attestation,
func (v *VersionedSignedBlindedProposal) Root() (phase0.Root, error) {
switch v.Version {
case spec.DataVersionBellatrix:
if v.Bellatrix == nil {
if v.Bellatrix == nil ||
v.Bellatrix.Message == nil {
return phase0.Root{}, ErrDataMissing
}

return v.Bellatrix.Message.HashTreeRoot()
case spec.DataVersionCapella:
if v.Capella == nil {
if v.Capella == nil ||
v.Capella.Message == nil {
return phase0.Root{}, ErrDataMissing
}

return v.Capella.Message.HashTreeRoot()
case spec.DataVersionDeneb:
if v.Deneb == nil {
if v.Deneb == nil ||
v.Deneb.Message == nil {
return phase0.Root{}, ErrDataMissing
}

Expand All @@ -120,13 +123,17 @@ func (v *VersionedSignedBlindedProposal) Root() (phase0.Root, error) {
func (v *VersionedSignedBlindedProposal) BodyRoot() (phase0.Root, error) {
switch v.Version {
case spec.DataVersionBellatrix:
if v.Bellatrix == nil {
if v.Bellatrix == nil ||
v.Bellatrix.Message == nil ||
v.Bellatrix.Message.Body == nil {
return phase0.Root{}, ErrDataMissing
}

return v.Bellatrix.Message.Body.HashTreeRoot()
case spec.DataVersionCapella:
if v.Capella == nil {
if v.Capella == nil ||
v.Capella.Message == nil ||
v.Capella.Message.Body == nil {
return phase0.Root{}, ErrDataMissing
}

Expand All @@ -148,13 +155,15 @@ func (v *VersionedSignedBlindedProposal) BodyRoot() (phase0.Root, error) {
func (v *VersionedSignedBlindedProposal) ParentRoot() (phase0.Root, error) {
switch v.Version {
case spec.DataVersionBellatrix:
if v.Bellatrix == nil {
if v.Bellatrix == nil ||
v.Bellatrix.Message == nil {
return phase0.Root{}, ErrDataMissing
}

return v.Bellatrix.Message.ParentRoot, nil
case spec.DataVersionCapella:
if v.Capella == nil {
if v.Capella == nil ||
v.Capella.Message == nil {
return phase0.Root{}, ErrDataMissing
}

Expand All @@ -175,13 +184,15 @@ func (v *VersionedSignedBlindedProposal) ParentRoot() (phase0.Root, error) {
func (v *VersionedSignedBlindedProposal) StateRoot() (phase0.Root, error) {
switch v.Version {
case spec.DataVersionBellatrix:
if v.Bellatrix == nil {
if v.Bellatrix == nil ||
v.Bellatrix.Message == nil {
return phase0.Root{}, ErrDataMissing
}

return v.Bellatrix.Message.StateRoot, nil
case spec.DataVersionCapella:
if v.Capella == nil {
if v.Capella == nil ||
v.Capella.Message == nil {
return phase0.Root{}, ErrDataMissing
}

Expand All @@ -202,13 +213,17 @@ func (v *VersionedSignedBlindedProposal) StateRoot() (phase0.Root, error) {
func (v *VersionedSignedBlindedProposal) AttesterSlashings() ([]*phase0.AttesterSlashing, error) {
switch v.Version {
case spec.DataVersionBellatrix:
if v.Bellatrix == nil {
if v.Bellatrix == nil ||
v.Bellatrix.Message == nil ||
v.Bellatrix.Message.Body == nil {
return nil, ErrDataMissing
}

return v.Bellatrix.Message.Body.AttesterSlashings, nil
case spec.DataVersionCapella:
if v.Capella == nil {
if v.Capella == nil ||
v.Capella.Message == nil ||
v.Capella.Message.Body == nil {
return nil, ErrDataMissing
}

Expand All @@ -230,13 +245,17 @@ func (v *VersionedSignedBlindedProposal) AttesterSlashings() ([]*phase0.Attester
func (v *VersionedSignedBlindedProposal) ProposerSlashings() ([]*phase0.ProposerSlashing, error) {
switch v.Version {
case spec.DataVersionBellatrix:
if v.Bellatrix == nil {
if v.Bellatrix == nil ||
v.Bellatrix.Message == nil ||
v.Bellatrix.Message.Body == nil {
return nil, ErrDataMissing
}

return v.Bellatrix.Message.Body.ProposerSlashings, nil
case spec.DataVersionCapella:
if v.Capella == nil {
if v.Capella == nil ||
v.Capella.Message == nil ||
v.Capella.Message.Body == nil {
return nil, ErrDataMissing
}

Expand Down

0 comments on commit f50dcb2

Please sign in to comment.