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

core: copy genesis before modifying #31097

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open

core: copy genesis before modifying #31097

Changes from 4 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
85abb73
eth/downloader: fix racy test
MariusVanDerWijden Jan 30, 2025
5803554
core: copy genesis before modifying
MariusVanDerWijden Jan 30, 2025
16b6c4c
core: copy genesis before modifying
MariusVanDerWijden Jan 30, 2025
bae8a52
core: copy genesis before modifying
MariusVanDerWijden Jan 30, 2025
3fa1ed8
core: only do a local copy of the genesis block
MariusVanDerWijden Jan 31, 2025
7f6090b
core: don't copy the config when applying overrides
MariusVanDerWijden Feb 3, 2025
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
16 changes: 15 additions & 1 deletion core/genesis.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -280,9 +280,10 @@ func SetupGenesisBlock(db ethdb.Database, triedb *triedb.Database, genesis *Gene
return SetupGenesisBlockWithOverride(db, triedb, genesis, nil)
}

func SetupGenesisBlockWithOverride(db ethdb.Database, triedb *triedb.Database, genesis *Genesis, overrides *ChainOverrides) (*params.ChainConfig, common.Hash, *params.ConfigCompatError, error) {
func SetupGenesisBlockWithOverride(db ethdb.Database, triedb *triedb.Database, origGenesis *Genesis, overrides *ChainOverrides) (*params.ChainConfig, common.Hash, *params.ConfigCompatError, error) {
MariusVanDerWijden marked this conversation as resolved.
Show resolved Hide resolved
// Sanitize the supplied genesis, ensuring it has the associated chain
// config attached.
genesis := origGenesis.copy()
if genesis != nil && genesis.Config == nil {
return nil, common.Hash{}, nil, errGenesisNoConfig
}
Expand Down Expand Up @@ -550,6 +551,19 @@ func (g *Genesis) MustCommit(db ethdb.Database, triedb *triedb.Database) *types.
return block
}

// copy copies the genesis.
func (g *Genesis) copy() *Genesis {
if g != nil {
cpy := *g
if g.Config != nil {
Copy link
Member

Choose a reason for hiding this comment

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

In overrides.apply, it also deep-copies the chain config before modification, maybe you can remove the logic there?

Copy link
Member Author

Choose a reason for hiding this comment

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

Its true, but I wanted to make copy a correct deep copy. I can remove it

Copy link
Member

Choose a reason for hiding this comment

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

Sorry what I meant is to remove the copy logic in the overrides.apply. I think it's good to have a correct deep-copy function

conf := *g.Config
cpy.Config = &conf
}
return &cpy
}
return nil
}

// EnableVerkleAtGenesis indicates whether the verkle fork should be activated
// at genesis. This is a temporary solution only for verkle devnet testing, where
// verkle fork is activated at genesis, and the configured activation date has
Expand Down