Skip to content

Don't feed invalid headers into DB #4693

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

Merged
merged 3 commits into from
Jul 12, 2022
Merged

Don't feed invalid headers into DB #4693

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
14ea95b
Reduce code duplication in verifyAndSaveNewPoSHeader
yperbasis Jul 11, 2022
06a3078
Don't feed invalid headers into DB
yperbasis Jul 11, 2022
d301f00
remove superfluous comment
yperbasis Jul 12, 2022
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
38 changes: 12 additions & 26 deletions eth/stagedsync/stage_headers.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -579,39 +579,21 @@ func verifyAndSaveNewPoSHeader(
}, false, nil
}

if err := headerInserter.FeedHeaderPoS(tx, header, headerHash); err != nil {
return nil, false, err
}

currentHeadHash := rawdb.ReadHeadHeaderHash(tx)
if currentHeadHash != header.ParentHash {
// Side chain or something weird
// TODO(yperbasis): considered non-canonical because some missing headers were downloaded but not canonized
// Or it's not a problem because forkChoice is updated frequently?
status, latestValidHash, validationError, criticalError := cfg.forkValidator.ValidatePayload(tx, header, body, false)
if criticalError != nil {
return &privateapi.PayloadStatus{CriticalError: criticalError}, false, criticalError
}
if validationError != nil {
cfg.hd.ReportBadHeaderPoS(headerHash, latestValidHash)
}
success = status == remote.EngineStatus_VALID || status == remote.EngineStatus_ACCEPTED
return &privateapi.PayloadStatus{
Status: status,
LatestValidHash: latestValidHash,
ValidationError: validationError,
}, success, nil
}
canExtendCanonical := header.ParentHash == currentHeadHash
canExtendInMemory := cfg.memoryOverlay && (cfg.forkValidator.ExtendingForkHeadHash() == (common.Hash{}) || header.ParentHash == cfg.forkValidator.ExtendingForkHeadHash())

if cfg.memoryOverlay && (cfg.forkValidator.ExtendingForkHeadHash() == (common.Hash{}) || header.ParentHash == cfg.forkValidator.ExtendingForkHeadHash()) {
status, latestValidHash, validationError, criticalError := cfg.forkValidator.ValidatePayload(tx, header, body, true)
if canExtendInMemory || !canExtendCanonical {
status, latestValidHash, validationError, criticalError := cfg.forkValidator.ValidatePayload(tx, header, body, canExtendCanonical)
if criticalError != nil {
return &privateapi.PayloadStatus{CriticalError: criticalError}, false, criticalError
}
if validationError != nil {
success = validationError == nil
if !success {
cfg.hd.ReportBadHeaderPoS(headerHash, latestValidHash)
} else if err := headerInserter.FeedHeaderPoS(tx, header, headerHash); err != nil {
return nil, false, err
}
success = status == remote.EngineStatus_VALID || status == remote.EngineStatus_ACCEPTED
return &privateapi.PayloadStatus{
Status: status,
LatestValidHash: latestValidHash,
Expand All @@ -620,6 +602,10 @@ func verifyAndSaveNewPoSHeader(
}

// OK, we're on the canonical chain
if err := headerInserter.FeedHeaderPoS(tx, header, headerHash); err != nil {
return nil, false, err
}

if requestStatus == engineapi.New {
cfg.hd.SetPendingPayloadHash(headerHash)
}
Expand Down