mirror of
https://github.com/ethereum/go-ethereum.git
synced 2026-07-18 19:00:46 +00:00
Merge 175aa7398c into 06b23b4293
This commit is contained in:
commit
6e2add8d44
2 changed files with 3 additions and 3 deletions
|
|
@ -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"`
|
||||
|
|
|
|||
|
|
@ -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"`
|
||||
|
|
|
|||
Loading…
Reference in a new issue