From 4911ab04fc14cb8e5e55f05e383a65ee817d301c Mon Sep 17 00:00:00 2001 From: 0xoasis Date: Mon, 20 Jul 2026 10:53:19 +0800 Subject: [PATCH] cmd/geth, eth/ethconfig: preserve zero engine reorg depth (#35373) --- eth/ethconfig/config.go | 2 +- eth/ethconfig/gen_config.go | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eth/ethconfig/config.go b/eth/ethconfig/config.go index c6f2fadde9..8e27a66419 100644 --- a/eth/ethconfig/config.go +++ b/eth/ethconfig/config.go @@ -207,7 +207,7 @@ type Config struct { // EngineMaxReorgDepth is the maximum depth the chain head can be rewound // to an already-canonical ancestor by engine API forkchoiceUpdated calls // (0 = no limit). - EngineMaxReorgDepth uint64 `toml:",omitempty"` + EngineMaxReorgDepth uint64 // OverrideOsaka (TODO: remove after the fork) OverrideOsaka *uint64 `toml:",omitempty"` diff --git a/eth/ethconfig/gen_config.go b/eth/ethconfig/gen_config.go index 167c93e685..4e61b1cccb 100644 --- a/eth/ethconfig/gen_config.go +++ b/eth/ethconfig/gen_config.go @@ -63,7 +63,7 @@ func (c Config) MarshalTOML() (interface{}, error) { RPCGasCap uint64 RPCEVMTimeout time.Duration RPCTxFeeCap float64 - EngineMaxReorgDepth uint64 `toml:",omitempty"` + EngineMaxReorgDepth uint64 OverrideOsaka *uint64 `toml:",omitempty"` OverrideAmsterdam *uint64 `toml:",omitempty"` OverrideBPO1 *uint64 `toml:",omitempty"` @@ -181,7 +181,7 @@ func (c *Config) UnmarshalTOML(unmarshal func(interface{}) error) error { RPCGasCap *uint64 RPCEVMTimeout *time.Duration RPCTxFeeCap *float64 - EngineMaxReorgDepth *uint64 `toml:",omitempty"` + EngineMaxReorgDepth *uint64 OverrideOsaka *uint64 `toml:",omitempty"` OverrideAmsterdam *uint64 `toml:",omitempty"` OverrideBPO1 *uint64 `toml:",omitempty"`