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

eth/catalyst: only apply block if we actually have the state #24598

Merged
merged 3 commits into from Mar 29, 2022
Merged

eth/catalyst: only apply block if we actually have the state #24598

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b984200
eth/catalyst: only apply block if we actually have the state
MariusVanDerWijden Mar 28, 2022
918cb08
add header to payload queue
MariusVanDerWijden Mar 29, 2022
bc017f5
Update cmd/geth/dbcmd.go
MariusVanDerWijden Mar 29, 2022
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
3 changes: 3 additions & 0 deletions cmd/geth/dbcmd.go
View file
Open in desktop
Expand Up @@ -747,6 +747,9 @@ func showMetaData(ctx *cli.Context) error {
data = append(data, []string{"headBlock.Root", fmt.Sprintf("%v", b.Root())})
data = append(data, []string{"headBlock.Number", fmt.Sprintf("%d (0x%x)", b.Number(), b.Number())})
}
if b := rawdb.ReadSkeletonSyncStatus(db); b != nil {
data = append(data, []string{"SkeletonSyncStatus", fmt.Sprintf("%s", b)})
MariusVanDerWijden marked this conversation as resolved.
Show resolved Hide resolved
}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more. 

cmd/geth/dbcmd.go:751:54: S1025: the argument's underlying type is a slice of bytes, should use a simple conversion instead of fmt.Sprintf (gosimple)
		data = append(data, []string{"SkeletonSyncStatus", fmt.Sprintf("%s", b)})
		                                                   ^

if h := rawdb.ReadHeadHeader(db); h != nil {
data = append(data, []string{"headHeader.Hash", fmt.Sprintf("%v", h.Hash())})
data = append(data, []string{"headHeader.Root", fmt.Sprintf("%v", h.Root)})
Expand Down
4 changes: 4 additions & 0 deletions eth/catalyst/api.go
View file
Open in desktop
Expand Up @@ -298,6 +298,10 @@ func (api *ConsensusAPI) NewPayloadV1(params beacon.ExecutableDataV1) (beacon.Pa
log.Warn("Invalid timestamp", "parent", block.Time(), "block", block.Time())
return api.invalid(errors.New("invalid timestamp")), nil
}
if !api.eth.BlockChain().HasBlockAndState(block.ParentHash(), block.NumberU64()-1) {
log.Warn("State not available, ignoring new payload")
MariusVanDerWijden marked this conversation as resolved.
Show resolved Hide resolved
MariusVanDerWijden marked this conversation as resolved.
Show resolved Hide resolved
return beacon.PayloadStatusV1{Status: beacon.ACCEPTED}, nil
}
log.Trace("Inserting block without sethead", "hash", block.Hash(), "number", block.Number)
if err := api.eth.BlockChain().InsertBlockWithoutSetHead(block); err != nil {
log.Warn("NewPayloadV1: inserting block failed", "error", err)
Expand Down