forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-07-19 03:10:48 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge 175aa7398c into 06b23b4293

Browse source
This commit is contained in:
0xoasis 2026-07-17 12:48:29 +00:00 committed by GitHub
commit 6e2add8d44
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
eth/ethconfig/config.go
View file

@ -207,7 +207,7 @@ type Config struct {
// EngineMaxReorgDepth is the maximum depth the chain head can be rewound // EngineMaxReorgDepth is the maximum depth the chain head can be rewound
// to an already-canonical ancestor by engine API forkchoiceUpdated calls // to an already-canonical ancestor by engine API forkchoiceUpdated calls
// (0 = no limit). // (0 = no limit).
EngineMaxReorgDepth uint64 `toml:",omitempty"` EngineMaxReorgDepth uint64
// OverrideOsaka (TODO: remove after the fork) // OverrideOsaka (TODO: remove after the fork)
OverrideOsaka *uint64 `toml:",omitempty"` OverrideOsaka *uint64 `toml:",omitempty"`

4
eth/ethconfig/gen_config.go
View file

@ -63,7 +63,7 @@ func (c Config) MarshalTOML() (interface{}, error) {
RPCGasCap uint64 RPCGasCap uint64
RPCEVMTimeout time.Duration RPCEVMTimeout time.Duration
RPCTxFeeCap float64 RPCTxFeeCap float64
EngineMaxReorgDepth uint64 `toml:",omitempty"` EngineMaxReorgDepth uint64
OverrideOsaka *uint64 `toml:",omitempty"` OverrideOsaka *uint64 `toml:",omitempty"`
OverrideAmsterdam *uint64 `toml:",omitempty"` OverrideAmsterdam *uint64 `toml:",omitempty"`
OverrideBPO1 *uint64 `toml:",omitempty"` OverrideBPO1 *uint64 `toml:",omitempty"`
@ -181,7 +181,7 @@ func (c *Config) UnmarshalTOML(unmarshal func(interface{}) error) error {
RPCGasCap *uint64 RPCGasCap *uint64
RPCEVMTimeout *time.Duration RPCEVMTimeout *time.Duration
RPCTxFeeCap *float64 RPCTxFeeCap *float64
EngineMaxReorgDepth *uint64 `toml:",omitempty"` EngineMaxReorgDepth *uint64
OverrideOsaka *uint64 `toml:",omitempty"` OverrideOsaka *uint64 `toml:",omitempty"`
OverrideAmsterdam *uint64 `toml:",omitempty"` OverrideAmsterdam *uint64 `toml:",omitempty"`
OverrideBPO1 *uint64 `toml:",omitempty"` OverrideBPO1 *uint64 `toml:",omitempty"`