core: apply overrides to mainnet chainconfig (ethereum#31733)

MariusVanDerWijden · web-flow · commit a511553e448c · 2025-04-29T08:29:56.000+02:00
This PR applies the config overrides to the new config as well, otherwise they will not be applied to defined configs, making shadowforks impossible. To test: ``` > ./build/bin/geth --override.prague 123 --dev --datadir /tmp/geth INFO [04-28|21:20:47.009] - Prague: @123 > ./build/bin/geth --override.prague 321 --dev --datadir /tmp/geth INFO [04-28|21:23:59.760] - Prague: @321 ``
diff --git a/core/genesis.go b/core/genesis.go
@@ -365,6 +365,9 @@ func SetupGenesisBlockWithOverride(db ethdb.Database, triedb *triedb.Database, g
 		return nil, common.Hash{}, nil, errors.New("missing head header")
 	}
 	newCfg := genesis.chainConfigOrDefault(ghash, storedCfg)
+	if err := overrides.apply(newCfg); err != nil {
+		return nil, common.Hash{}, nil, err
+	}
 
 	// Sanity-check the new configuration.
 	if err := newCfg.CheckConfigForkOrder(); err != nil {

Original file line number	Diff line number	Diff line change
`@@ -365,6 +365,9 @@ func SetupGenesisBlockWithOverride(db ethdb.Database, triedb *triedb.Database, g`
`365`	`365`	`return nil, common.Hash{}, nil, errors.New("missing head header")`
`366`	`366`	`}`
`367`	`367`	`newCfg := genesis.chainConfigOrDefault(ghash, storedCfg)`
	`368`	`+ if err := overrides.apply(newCfg); err != nil {`
	`369`	`+ return nil, common.Hash{}, nil, err`
	`370`	`+ }`
`368`	`371`
`369`	`372`	`// Sanity-check the new configuration.`
`370`	`373`	`if err := newCfg.CheckConfigForkOrder(); err != nil {`