cmd, core, miner: rework genesis setup #30907
Open
+186
−125
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
rjl493456442
requested review from
fjl,
holiman,
karalabe,
gballet,
zsfelfoldi and
MariusVanDerWijden
as code owners
|
I think we should extract the chain config setup into its own function like I did in my branch: https://github.com/fjl/go-ethereum/tree/genesis-verkle-config |
gballet
reviewed
Dec 13, 2024
| return &triedb.Config{ | ||
| HashDB: hashdb.Defaults, | ||
| Preimages: recordPreimage, | ||
| IsVerkle: isVerkle, |
There was a problem hiding this comment.
maybe set it to false here, or just omit it, it looks a bit weird given what happens on L276
| } | ||
| } | ||
| // Get the existing chain configuration. | ||
| // Construct the new chain config either from the supplied genesis, or | ||
| // the stored chain config if nothing specified. | ||
| newcfg := genesis.configOrDefault(stored) |
There was a problem hiding this comment.
we need a better name now, because it's no longer returning any "default". Maybe getUpdatedConfig ?
| @@ -525,6 +531,11 @@ func (c *ChainConfig) IsVerkle(num *big.Int, time uint64) bool { | |||
| return c.IsLondon(num) && isTimestampForked(c.VerkleTime, time) | |||
| } | |||
|
|
|||
| // IsVerkleGenesis returns whether the verkle fork is activated at genesis block. | |||
| func (c *ChainConfig) IsVerkleGenesis() bool { | |||
| return c.IsLondon(common.Big0) && c.VerkleTime != nil && c.EnableVerkleAtGenesis | |||
There was a problem hiding this comment.
but if I EnableVerkleAtGenesis is set, does VerkleTime matter at all?
| @@ -2224,7 +2224,6 @@ func MakeTrieDatabase(ctx *cli.Context, disk ethdb.Database, preimage bool, read | |||
| // ignore the parameter silently. TODO(rjl493456442) | |||
| // please config it if read mode is implemented. | |||
| config.HashDB = hashdb.Defaults | |||
| return triedb.NewDatabase(disk, config) | |||
There was a problem hiding this comment.
that means that both config.HashDB and config.PathDB are set, and this is leading to a log.Crit in triedb.NewDatabase. Was this intentional ?
| chainConfig, genesisHash, genesisErr := SetupGenesisBlockWithOverride(db, triedb, genesis, overrides) | ||
| if _, ok := genesisErr.(*params.ConfigCompatError); genesisErr != nil && !ok { | ||
| return nil, genesisErr | ||
| chainConfig, genesisHash, compactErr, err := SetupGenesisBlockWithOverride(db, cacheConfig.StateScheme, cacheConfig.Preimages, genesis, overrides) |
There was a problem hiding this comment.
Suggested change
| chainConfig, genesisHash, compactErr, err := SetupGenesisBlockWithOverride(db, cacheConfig.StateScheme, cacheConfig.Preimages, genesis, overrides) | |
| chainConfig, genesisHash, compatErr, err := SetupGenesisBlockWithOverride(db, cacheConfig.StateScheme, cacheConfig.Preimages, genesis, overrides) |
Comment on lines
+456
to
+459
| if compactErr != nil { | ||
| log.Warn("Rewinding chain to upgrade configuration", "err", compactErr) | ||
| if compactErr.RewindToTime > 0 { | ||
| bc.SetHeadWithTimestamp(compactErr.RewindToTime) |
There was a problem hiding this comment.
Suggested change
| if compactErr != nil { | |
| log.Warn("Rewinding chain to upgrade configuration", "err", compactErr) | |
| if compactErr.RewindToTime > 0 { | |
| bc.SetHeadWithTimestamp(compactErr.RewindToTime) | |
| if compatErr != nil { | |
| log.Warn("Rewinding chain to upgrade configuration", "err", compatErr) | |
| if compactErr.RewindToTime > 0 { | |
| bc.SetHeadWithTimestamp(compatErr.RewindToTime) |
| } else { | ||
| bc.SetHead(compat.RewindToBlock) | ||
| bc.SetHead(compactErr.RewindToBlock) |
There was a problem hiding this comment.
Suggested change
| bc.SetHead(compactErr.RewindToBlock) | |
| bc.SetHead(compatErr.RewindToBlock) |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
TODO