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

Jump to bottom

Nil Checks in Process Attestation v0.11 #5331

Merged
merged 12 commits into from
Apr 7, 2020
Merged

Nil Checks in Process Attestation v0.11 #5331

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
0c97850
Started testing
terencechain Apr 6, 2020
3d7b6c3
Bunch of fixes
terencechain Apr 6, 2020
4090792
use-interop
terencechain Apr 6, 2020
b86ee25
Sync with v0.11
terencechain Apr 6, 2020
4b5aefe
Conflict
terencechain Apr 6, 2020
cd3f445
Uncomment wait for activation
terencechain Apr 6, 2020
8769238
Move pending block queue from subscriber to validator pipeline
terencechain Apr 6, 2020
42733ba
Merge branch 'v0.11' into use-interop-config
rauljordan Apr 6, 2020
b50408b
passing tests
rauljordan Apr 6, 2020
944448f
nil checks to prevent panics
rauljordan Apr 7, 2020
dfb3764
Merge branch 'v0.11' into add-nil-checks
rauljordan Apr 7, 2020
bdbf59d
lint
rauljordan Apr 7, 2020
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
10 changes: 10 additions & 0 deletions beacon-chain/blockchain/process_attestation.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,16 @@ func (s *Service) onAttestation(ctx context.Context, a *ethpb.Attestation) ([]ui
}
}

if indexedAtt.AttestingIndices == nil {
return nil, errors.New("nil attesting indices")
}
if a.Data == nil {
return nil, errors.New("nil att data")
}
if a.Data.Target == nil {
return nil, errors.New("nil att target")
}

// Update forkchoice store with the new attestation for updating weight.
s.forkChoiceStore.ProcessAttestation(ctx, indexedAtt.AttestingIndices, bytesutil.ToBytes32(a.Data.BeaconBlockRoot), a.Data.Target.Epoch)

Expand Down
16 changes: 10 additions & 6 deletions beacon-chain/blockchain/process_attestation_helpers.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,14 +130,18 @@ func (s *Service) verifyAttestation(ctx context.Context, baseState *stateTrie.Be
var err error
if !featureconfig.Get().DisableNewStateMgmt {
aState, err = s.stateGen.StateByRoot(ctx, bytesutil.ToBytes32(a.Data.BeaconBlockRoot))
return nil, err
if err != nil {
return nil, err
}
} else {
aState, err = s.beaconDB.State(ctx, bytesutil.ToBytes32(a.Data.BeaconBlockRoot))
if err != nil {
return nil, err
}
}

aState, err = s.beaconDB.State(ctx, bytesutil.ToBytes32(a.Data.BeaconBlockRoot))
if err != nil {
return nil, err
if aState == nil {
return nil, fmt.Errorf("nil state for block root %#x", a.Data.BeaconBlockRoot)
}

epoch := helpers.SlotToEpoch(a.Data.Slot)
origSeed, err := helpers.Seed(baseState, epoch, params.BeaconConfig().DomainBeaconAttester)
if err != nil {
Expand Down