cmd, eth, les: replace Shanghai override flag with Cancun (ethereum#27171)

karalabe · web-flow · commit 66c0c4e5174a · 2023-04-26T18:17:37.000+03:00
diff --git a/cmd/geth/config.go b/cmd/geth/config.go
@@ -158,9 +158,9 @@ func makeConfigNode(ctx *cli.Context) (*node.Node, gethConfig) {
 // makeFullNode loads geth configuration and creates the Ethereum backend.
 func makeFullNode(ctx *cli.Context) (*node.Node, ethapi.Backend) {
 	stack, cfg := makeConfigNode(ctx)
-	if ctx.IsSet(utils.OverrideShanghai.Name) {
-		v := ctx.Uint64(utils.OverrideShanghai.Name)
-		cfg.Eth.OverrideShanghai = &v
+	if ctx.IsSet(utils.OverrideCancun.Name) {
+		v := ctx.Uint64(utils.OverrideCancun.Name)
+		cfg.Eth.OverrideCancun = &v
 	}
 	backend, eth := utils.RegisterEthService(stack, &cfg.Eth)
 
diff --git a/cmd/geth/main.go b/cmd/geth/main.go
@@ -64,7 +64,7 @@ var (
 		utils.NoUSBFlag,
 		utils.USBFlag,
 		utils.SmartCardDaemonPathFlag,
-		utils.OverrideShanghai,
+		utils.OverrideCancun,
 		utils.EnablePersonal,
 		utils.EthashCacheDirFlag,
 		utils.EthashCachesInMemoryFlag,
diff --git a/cmd/utils/flags.go b/cmd/utils/flags.go
@@ -268,9 +268,9 @@ var (
 		Value:    2048,
 		Category: flags.EthCategory,
 	}
-	OverrideShanghai = &cli.Uint64Flag{
-		Name:     "override.shanghai",
-		Usage:    "Manually specify the Shanghai fork timestamp, overriding the bundled setting",
+	OverrideCancun = &cli.Uint64Flag{
+		Name:     "override.cancun",
+		Usage:    "Manually specify the Cancun fork timestamp, overriding the bundled setting",
 		Category: flags.EthCategory,
 	}
 	// Light server and client settings
diff --git a/core/genesis.go b/core/genesis.go
@@ -267,7 +267,7 @@ func (e *GenesisMismatchError) Error() string {
 
 // ChainOverrides contains the changes to chain config.
 type ChainOverrides struct {
-	OverrideShanghai *uint64
+	OverrideCancun *uint64
 }
 
 // SetupGenesisBlock writes or updates the genesis block in db.
@@ -293,8 +293,8 @@ func SetupGenesisBlockWithOverride(db ethdb.Database, triedb *trie.Database, gen
 	}
 	applyOverrides := func(config *params.ChainConfig) {
 		if config != nil {
-			if overrides != nil && overrides.OverrideShanghai != nil {
-				config.ShanghaiTime = overrides.OverrideShanghai
+			if overrides != nil && overrides.OverrideCancun != nil {
+				config.CancunTime = overrides.OverrideCancun
 			}
 		}
 	}
diff --git a/eth/backend.go b/eth/backend.go
@@ -194,8 +194,8 @@ func New(stack *node.Node, config *ethconfig.Config) (*Ethereum, error) {
 	)
 	// Override the chain config with provided settings.
 	var overrides core.ChainOverrides
-	if config.OverrideShanghai != nil {
-		overrides.OverrideShanghai = config.OverrideShanghai
+	if config.OverrideCancun != nil {
+		overrides.OverrideCancun = config.OverrideCancun
 	}
 	eth.blockchain, err = core.NewBlockChain(chainDb, cacheConfig, config.Genesis, &overrides, eth.engine, vmConfig, eth.shouldPreserve, &config.TxLookupLimit)
 	if err != nil {
diff --git a/eth/ethconfig/config.go b/eth/ethconfig/config.go
@@ -198,8 +198,8 @@ type Config struct {
 	// send-transaction variants. The unit is ether.
 	RPCTxFeeCap float64
 
-	// OverrideShanghai (TODO: remove after the fork)
-	OverrideShanghai *uint64 `toml:",omitempty"`
+	// OverrideCancun (TODO: remove after the fork)
+	OverrideCancun *uint64 `toml:",omitempty"`
 }
 
 // CreateConsensusEngine creates a consensus engine for the given chain configuration.
diff --git a/eth/ethconfig/gen_config.go b/eth/ethconfig/gen_config.go
diff --git a/les/client.go b/les/client.go
@@ -94,8 +94,8 @@ func New(stack *node.Node, config *ethconfig.Config) (*LightEthereum, error) {
 		return nil, err
 	}
 	var overrides core.ChainOverrides
-	if config.OverrideShanghai != nil {
-		overrides.OverrideShanghai = config.OverrideShanghai
+	if config.OverrideCancun != nil {
+		overrides.OverrideCancun = config.OverrideCancun
 	}
 	chainConfig, genesisHash, genesisErr := core.SetupGenesisBlockWithOverride(chainDb, trie.NewDatabase(chainDb), config.Genesis, &overrides)
 	if _, isCompat := genesisErr.(*params.ConfigCompatError); genesisErr != nil && !isCompat {

Original file line number	Diff line number	Diff line change
`@@ -268,9 +268,9 @@ var (`
`268`	`268`	`Value: 2048,`
`269`	`269`	`Category: flags.EthCategory,`
`270`	`270`	`}`
`271`		`- OverrideShanghai = &cli.Uint64Flag{`
`272`		`- Name: "override.shanghai",`
`273`		`- Usage: "Manually specify the Shanghai fork timestamp, overriding the bundled setting",`
	`271`	`+ OverrideCancun = &cli.Uint64Flag{`
	`272`	`+ Name: "override.cancun",`
	`273`	`+ Usage: "Manually specify the Cancun fork timestamp, overriding the bundled setting",`
`274`	`274`	`Category: flags.EthCategory,`
`275`	`275`	`}`
`276`	`276`	`// Light server and client settings`
Original file line number	Diff line number	Diff line change
`@@ -267,7 +267,7 @@ func (e *GenesisMismatchError) Error() string {`
`267`	`267`
`268`	`268`	`// ChainOverrides contains the changes to chain config.`
`269`	`269`	`type ChainOverrides struct {`
`270`		`- OverrideShanghai *uint64`
	`270`	`+ OverrideCancun *uint64`
`271`	`271`	`}`
`272`	`272`
`273`	`273`	`// SetupGenesisBlock writes or updates the genesis block in db.`
`@@ -293,8 +293,8 @@ func SetupGenesisBlockWithOverride(db ethdb.Database, triedb *trie.Database, gen`
`293`	`293`	`}`
`294`	`294`	`applyOverrides := func(config *params.ChainConfig) {`
`295`	`295`	`if config != nil {`
`296`		`- if overrides != nil && overrides.OverrideShanghai != nil {`
`297`		`- config.ShanghaiTime = overrides.OverrideShanghai`
	`296`	`+ if overrides != nil && overrides.OverrideCancun != nil {`
	`297`	`+ config.CancunTime = overrides.OverrideCancun`
`298`	`298`	`}`
`299`	`299`	`}`
`300`	`300`	`}`
Original file line number	Diff line number	Diff line change
`@@ -194,8 +194,8 @@ func New(stack node.Node, config ethconfig.Config) (*Ethereum, error) {`
`194`	`194`	`)`
`195`	`195`	`// Override the chain config with provided settings.`
`196`	`196`	`var overrides core.ChainOverrides`
`197`		`- if config.OverrideShanghai != nil {`
`198`		`- overrides.OverrideShanghai = config.OverrideShanghai`
	`197`	`+ if config.OverrideCancun != nil {`
	`198`	`+ overrides.OverrideCancun = config.OverrideCancun`
`199`	`199`	`}`
`200`	`200`	`eth.blockchain, err = core.NewBlockChain(chainDb, cacheConfig, config.Genesis, &overrides, eth.engine, vmConfig, eth.shouldPreserve, &config.TxLookupLimit)`
`201`	`201`	`if err != nil {`
Original file line number	Diff line number	Diff line change
`@@ -198,8 +198,8 @@ type Config struct {`
`198`	`198`	`// send-transaction variants. The unit is ether.`
`199`	`199`	`RPCTxFeeCap float64`
`200`	`200`
`201`		`- // OverrideShanghai (TODO: remove after the fork)`
`202`		- OverrideShanghai *uint64 `toml:",omitempty"`
	`201`	`+ // OverrideCancun (TODO: remove after the fork)`
	`202`	+ OverrideCancun *uint64 `toml:",omitempty"`
`203`	`203`	`}`
`204`	`204`
`205`	`205`	`// CreateConsensusEngine creates a consensus engine for the given chain configuration.`
Original file line number	Diff line number	Diff line change
`@@ -94,8 +94,8 @@ func New(stack node.Node, config ethconfig.Config) (*LightEthereum, error) {`
`94`	`94`	`return nil, err`
`95`	`95`	`}`
`96`	`96`	`var overrides core.ChainOverrides`
`97`		`- if config.OverrideShanghai != nil {`
`98`		`- overrides.OverrideShanghai = config.OverrideShanghai`
	`97`	`+ if config.OverrideCancun != nil {`
	`98`	`+ overrides.OverrideCancun = config.OverrideCancun`
`99`	`99`	`}`
`100`	`100`	`chainConfig, genesisHash, genesisErr := core.SetupGenesisBlockWithOverride(chainDb, trie.NewDatabase(chainDb), config.Genesis, &overrides)`
`101`	`101`	`if _, isCompat := genesisErr.(*params.ConfigCompatError); genesisErr != nil && !isCompat {`