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

Better logs for forking #4966

Merged
merged 11 commits into from Mar 2, 2020
Merged

Better logs for forking #4966

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
e5774be
Move `updateHead` to ReceiveAttestationNoPubsub and better forking me…
terencechain Feb 28, 2020
cd057f1
Typo
terencechain Feb 28, 2020
abc7009
Import
terencechain Feb 28, 2020
5eac541
f
terencechain Feb 28, 2020
8f70076
Merge refs/heads/master into better-forkchoice-messages
prylabs-bulldozer[bot] Mar 1, 2020
830e3ae
Merge refs/heads/master into better-forkchoice-messages
prylabs-bulldozer[bot] Mar 2, 2020
0a349ba
Merge refs/heads/master into better-forkchoice-messages
prylabs-bulldozer[bot] Mar 2, 2020
a87a611
Merge refs/heads/master into better-forkchoice-messages
prylabs-bulldozer[bot] Mar 2, 2020
0535607
Merge refs/heads/master into better-forkchoice-messages
prylabs-bulldozer[bot] Mar 2, 2020
8ac5575
Merge refs/heads/master into better-forkchoice-messages
prylabs-bulldozer[bot] Mar 2, 2020
9cf94c5
Merge refs/heads/master into better-forkchoice-messages
prylabs-bulldozer[bot] Mar 2, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 0 additions & 8 deletions beacon-chain/blockchain/process_attestation.go
View file
Open in desktop
Expand Up @@ -11,7 +11,6 @@ import (
"github.com/prysmaticlabs/prysm/beacon-chain/flags"
stateTrie "github.com/prysmaticlabs/prysm/beacon-chain/state"
"github.com/prysmaticlabs/prysm/shared/bytesutil"
"github.com/prysmaticlabs/prysm/shared/featureconfig"
"go.opencensus.io/trace"
)

Expand Down Expand Up @@ -129,12 +128,5 @@ func (s *Service) onAttestation(ctx context.Context, a *ethpb.Attestation) ([]ui
// 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)

if !featureconfig.Get().DisableUpdateHeadPerAttestation {
// Update fork choice head after updating weight.
if err := s.updateHead(ctx, baseState.Balances()); err != nil {
return nil, err
}
}

return indexedAtt.AttestingIndices, nil
}
16 changes: 16 additions & 0 deletions beacon-chain/blockchain/receive_attestation.go
View file
Open in desktop
Expand Up @@ -11,6 +11,7 @@ import (
"github.com/prysmaticlabs/prysm/beacon-chain/core/feed"
"github.com/prysmaticlabs/prysm/beacon-chain/core/helpers"
"github.com/prysmaticlabs/prysm/shared/bytesutil"
"github.com/prysmaticlabs/prysm/shared/featureconfig"
"github.com/prysmaticlabs/prysm/shared/params"
"github.com/prysmaticlabs/prysm/shared/slotutil"
"github.com/sirupsen/logrus"
Expand All @@ -37,6 +38,21 @@ func (s *Service) ReceiveAttestationNoPubsub(ctx context.Context, att *ethpb.Att
return errors.Wrap(err, "could not process attestation")
}

if !featureconfig.Get().DisableUpdateHeadPerAttestation {
baseState, err := s.getAttPreState(ctx, att.Data.Target)
if err != nil {
return err
}

// This updates fork choice head, if a new head could not be updated due to
// long range or intermediate forking. It simply logs a warning and returns nil
// as that's more appropriate than returning errors.
if err := s.updateHead(ctx, baseState.Balances()); err != nil {
log.Warnf("Resolving fork due to new attestation: %v", err)
return nil
}
}

return nil
}

Expand Down