mirror of
https://github.com/OffchainLabs/prysm.git
synced 2026-01-09 15:37:56 -05:00
Do not mark blocks as invalid unnecessarily (#15846)
This commit is contained in:
@@ -30,7 +30,7 @@ var (
|
|||||||
// errWSBlockNotFoundInEpoch is returned when a block is not found in the WS cache or DB within epoch.
|
// errWSBlockNotFoundInEpoch is returned when a block is not found in the WS cache or DB within epoch.
|
||||||
errWSBlockNotFoundInEpoch = errors.New("weak subjectivity root not found in db within epoch")
|
errWSBlockNotFoundInEpoch = errors.New("weak subjectivity root not found in db within epoch")
|
||||||
// ErrNotDescendantOfFinalized is returned when a block is not a descendant of the finalized checkpoint
|
// ErrNotDescendantOfFinalized is returned when a block is not a descendant of the finalized checkpoint
|
||||||
ErrNotDescendantOfFinalized = invalidBlock{error: errors.New("not descendant of finalized checkpoint")}
|
ErrNotDescendantOfFinalized = errors.New("not descendant of finalized checkpoint")
|
||||||
// ErrNotCheckpoint is returned when a given checkpoint is not a
|
// ErrNotCheckpoint is returned when a given checkpoint is not a
|
||||||
// checkpoint in any chain known to forkchoice
|
// checkpoint in any chain known to forkchoice
|
||||||
ErrNotCheckpoint = errors.New("not a checkpoint in forkchoice")
|
ErrNotCheckpoint = errors.New("not a checkpoint in forkchoice")
|
||||||
|
|||||||
@@ -219,6 +219,9 @@ func (s *Service) validateExecutionAndConsensus(
|
|||||||
eg.Go(func() error {
|
eg.Go(func() error {
|
||||||
var err error
|
var err error
|
||||||
postState, err = s.validateStateTransition(ctx, preState, block)
|
postState, err = s.validateStateTransition(ctx, preState, block)
|
||||||
|
if errors.Is(err, ErrNotDescendantOfFinalized) {
|
||||||
|
return invalidBlock{error: err, root: block.Root()}
|
||||||
|
}
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return errors.Wrap(err, "failed to validate consensus state transition function")
|
return errors.Wrap(err, "failed to validate consensus state transition function")
|
||||||
}
|
}
|
||||||
|
|||||||
3
changelog/potuz_invalid_not_descendant.md
Normal file
3
changelog/potuz_invalid_not_descendant.md
Normal file
@@ -0,0 +1,3 @@
|
|||||||
|
### Fixed
|
||||||
|
|
||||||
|
- Do not mark blocks as invalid from ErrNotDescendantOfFinalized
|
||||||
Reference in New Issue
Block a user