From 428c2721103da6d0c010ebcf5f852660d6054ebe Mon Sep 17 00:00:00 2001 From: 0xjvn Date: Sun, 17 May 2026 22:35:55 +0530 Subject: [PATCH] feat: remove osaka override flag --- cmd/geth/chaincmd.go | 5 ----- cmd/geth/config.go | 4 ---- cmd/geth/main.go | 1 - cmd/utils/flags.go | 5 ----- core/genesis.go | 10 +++------- eth/backend.go | 3 --- eth/ethconfig/config.go | 3 --- eth/ethconfig/gen_config.go | 6 ------ 8 files changed, 3 insertions(+), 34 deletions(-) diff --git a/cmd/geth/chaincmd.go b/cmd/geth/chaincmd.go index 98ed348d8c..637069b158 100644 --- a/cmd/geth/chaincmd.go +++ b/cmd/geth/chaincmd.go @@ -61,7 +61,6 @@ var ( ArgsUsage: "", Flags: slices.Concat([]cli.Flag{ utils.CachePreimagesFlag, - utils.OverrideOsaka, utils.OverrideBPO1, utils.OverrideBPO2, utils.OverrideUBT, @@ -285,10 +284,6 @@ func initGenesis(ctx *cli.Context) error { defer stack.Close() var overrides core.ChainOverrides - if ctx.IsSet(utils.OverrideOsaka.Name) { - v := ctx.Uint64(utils.OverrideOsaka.Name) - overrides.OverrideOsaka = &v - } if ctx.IsSet(utils.OverrideBPO1.Name) { v := ctx.Uint64(utils.OverrideBPO1.Name) overrides.OverrideBPO1 = &v diff --git a/cmd/geth/config.go b/cmd/geth/config.go index c02e307bdc..fa1d8561d5 100644 --- a/cmd/geth/config.go +++ b/cmd/geth/config.go @@ -224,10 +224,6 @@ func constructDevModeBanner(ctx *cli.Context, cfg gethConfig) string { // makeFullNode loads geth configuration and creates the Ethereum backend. func makeFullNode(ctx *cli.Context) *node.Node { stack, cfg := makeConfigNode(ctx) - if ctx.IsSet(utils.OverrideOsaka.Name) { - v := ctx.Uint64(utils.OverrideOsaka.Name) - cfg.Eth.OverrideOsaka = &v - } if ctx.IsSet(utils.OverrideBPO1.Name) { v := ctx.Uint64(utils.OverrideBPO1.Name) cfg.Eth.OverrideBPO1 = &v diff --git a/cmd/geth/main.go b/cmd/geth/main.go index 850e26d161..f1c800ea21 100644 --- a/cmd/geth/main.go +++ b/cmd/geth/main.go @@ -58,7 +58,6 @@ var ( utils.NoUSBFlag, // deprecated utils.USBFlag, utils.SmartCardDaemonPathFlag, - utils.OverrideOsaka, utils.OverrideBPO1, utils.OverrideBPO2, utils.OverrideUBT, diff --git a/cmd/utils/flags.go b/cmd/utils/flags.go index c41cf4ee40..30fe926bf7 100644 --- a/cmd/utils/flags.go +++ b/cmd/utils/flags.go @@ -249,11 +249,6 @@ var ( Value: 2048, Category: flags.EthCategory, } - OverrideOsaka = &cli.Uint64Flag{ - Name: "override.osaka", - Usage: "Manually specify the Osaka fork timestamp, overriding the bundled setting", - Category: flags.EthCategory, - } OverrideBPO1 = &cli.Uint64Flag{ Name: "override.bpo1", Usage: "Manually specify the bpo1 fork timestamp, overriding the bundled setting", diff --git a/core/genesis.go b/core/genesis.go index 6a0affa52e..f090a6a076 100644 --- a/core/genesis.go +++ b/core/genesis.go @@ -277,10 +277,9 @@ func (e *GenesisMismatchError) Error() string { // ChainOverrides contains the changes to chain config. type ChainOverrides struct { - OverrideOsaka *uint64 - OverrideBPO1 *uint64 - OverrideBPO2 *uint64 - OverrideUBT *uint64 + OverrideBPO1 *uint64 + OverrideBPO2 *uint64 + OverrideUBT *uint64 } // apply applies the chain overrides on the supplied chain config. @@ -288,9 +287,6 @@ func (o *ChainOverrides) apply(cfg *params.ChainConfig) error { if o == nil || cfg == nil { return nil } - if o.OverrideOsaka != nil { - cfg.OsakaTime = o.OverrideOsaka - } if o.OverrideBPO1 != nil { cfg.BPO1Time = o.OverrideBPO1 } diff --git a/eth/backend.go b/eth/backend.go index af8b04bda6..b0b2223491 100644 --- a/eth/backend.go +++ b/eth/backend.go @@ -266,9 +266,6 @@ func New(stack *node.Node, config *ethconfig.Config) (*Ethereum, error) { } // Override the chain config with provided settings. var overrides core.ChainOverrides - if config.OverrideOsaka != nil { - overrides.OverrideOsaka = config.OverrideOsaka - } if config.OverrideBPO1 != nil { overrides.OverrideBPO1 = config.OverrideBPO1 } diff --git a/eth/ethconfig/config.go b/eth/ethconfig/config.go index b51b78e199..16c0b45030 100644 --- a/eth/ethconfig/config.go +++ b/eth/ethconfig/config.go @@ -198,9 +198,6 @@ type Config struct { // send-transaction variants. The unit is ether. RPCTxFeeCap float64 - // OverrideOsaka (TODO: remove after the fork) - OverrideOsaka *uint64 `toml:",omitempty"` - // OverrideBPO1 (TODO: remove after the fork) OverrideBPO1 *uint64 `toml:",omitempty"` diff --git a/eth/ethconfig/gen_config.go b/eth/ethconfig/gen_config.go index c5e45348be..428fa089de 100644 --- a/eth/ethconfig/gen_config.go +++ b/eth/ethconfig/gen_config.go @@ -62,7 +62,6 @@ func (c Config) MarshalTOML() (interface{}, error) { RPCGasCap uint64 RPCEVMTimeout time.Duration RPCTxFeeCap float64 - OverrideOsaka *uint64 `toml:",omitempty"` OverrideBPO1 *uint64 `toml:",omitempty"` OverrideBPO2 *uint64 `toml:",omitempty"` OverrideUBT *uint64 `toml:",omitempty"` @@ -116,7 +115,6 @@ func (c Config) MarshalTOML() (interface{}, error) { enc.RPCGasCap = c.RPCGasCap enc.RPCEVMTimeout = c.RPCEVMTimeout enc.RPCTxFeeCap = c.RPCTxFeeCap - enc.OverrideOsaka = c.OverrideOsaka enc.OverrideBPO1 = c.OverrideBPO1 enc.OverrideBPO2 = c.OverrideBPO2 enc.OverrideUBT = c.OverrideUBT @@ -174,7 +172,6 @@ func (c *Config) UnmarshalTOML(unmarshal func(interface{}) error) error { RPCGasCap *uint64 RPCEVMTimeout *time.Duration RPCTxFeeCap *float64 - OverrideOsaka *uint64 `toml:",omitempty"` OverrideBPO1 *uint64 `toml:",omitempty"` OverrideBPO2 *uint64 `toml:",omitempty"` OverrideUBT *uint64 `toml:",omitempty"` @@ -321,9 +318,6 @@ func (c *Config) UnmarshalTOML(unmarshal func(interface{}) error) error { if dec.RPCTxFeeCap != nil { c.RPCTxFeeCap = *dec.RPCTxFeeCap } - if dec.OverrideOsaka != nil { - c.OverrideOsaka = dec.OverrideOsaka - } if dec.OverrideBPO1 != nil { c.OverrideBPO1 = dec.OverrideBPO1 }