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

beacon/engine, consensus/beacon: use params.MaximumExtraDataSize instead of hard-coded value #29721

Merged
merged 8 commits into from
Aug 10, 2024
Merged

beacon/engine, consensus/beacon: use params.MaximumExtraDataSize instead of hard-coded value #29721

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
1b4879b
params.MaximumExtraDataSize for extraData length check
artjoma May 7, 2024
76a901a
renamed params2 to ethparams
artjoma May 7, 2024
a552c8c
Using github.com/ethereum/go-ethereum/params without alias
artjoma May 7, 2024
5252f2c
Merge remote-tracking branch 'origin/const-block-head-extra' into con…
artjoma May 7, 2024
7547606
Using github.com/ethereum/go-ethereum/params without alias
artjoma May 7, 2024
c28e49b
Update types.go
fjl May 28, 2024
1852c98
beacon/engine: gofmt -ed
MariusVanDerWijden Jun 17, 2024
cb3e46e
beacon/engine: rename parameter from execParams to data
lightclient Aug 2, 2024
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
3 changes: 2 additions & 1 deletion beacon/engine/types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ package engine

import (
"fmt"
ethparams "github.com/ethereum/go-ethereum/params"
"math/big"
"slices"

Expand Down Expand Up @@ -199,7 +200,7 @@ func ExecutableDataToBlock(params ExecutableData, versionedHashes []common.Hash,
if err != nil {
return nil, err
}
if len(params.ExtraData) > 32 {
if len(params.ExtraData) > int(ethparams.MaximumExtraDataSize) {
return nil, fmt.Errorf("invalid extradata length: %v", len(params.ExtraData))
}
if len(params.LogsBloom) != 256 {
Expand Down
2 changes: 1 addition & 1 deletion consensus/beacon/consensus.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -229,7 +229,7 @@ func (beacon *Beacon) VerifyUncles(chain consensus.ChainReader, block *types.Blo
// (c) the extradata is limited to 32 bytes
func (beacon *Beacon) verifyHeader(chain consensus.ChainHeaderReader, header, parent *types.Header) error {
// Ensure that the header's extra-data section is of a reasonable size
if len(header.Extra) > 32 {
if len(header.Extra) > int(params.MaximumExtraDataSize) {
return fmt.Errorf("extra-data longer than 32 bytes (%d)", len(header.Extra))
}
// Verify the seal parts. Ensure the nonce and uncle hash are the expected value.
Expand Down