From c0a225ebad8f4f96ef062682cc3ef4c556487fdf Mon Sep 17 00:00:00 2001 From: welkin22 Date: Mon, 29 Apr 2024 12:39:24 +0800 Subject: [PATCH] regenerate config toml marshal file --- eth/ethconfig/gen_config.go | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/eth/ethconfig/gen_config.go b/eth/ethconfig/gen_config.go index 76ab5d36fc..e9bf6128c2 100644 --- a/eth/ethconfig/gen_config.go +++ b/eth/ethconfig/gen_config.go @@ -29,8 +29,8 @@ func (c Config) MarshalTOML() (interface{}, error) { TransactionHistory uint64 `toml:",omitempty"` StateHistory uint64 `toml:",omitempty"` StateScheme string `toml:",omitempty"` - ProposeBlockInterval uint64 `toml:",omitempty"` - PathNodeBuffer pathdb.NodeBufferType `toml:",omitempty"` + PathNodeBuffer pathdb.NodeBufferType `toml:",omitempty"` + ProposeBlockInterval uint64 `toml:",omitempty"` RequiredBlocks map[uint64]common.Hash `toml:"-"` LightServ int `toml:",omitempty"` LightIngress int `toml:",omitempty"` @@ -71,6 +71,7 @@ func (c Config) MarshalTOML() (interface{}, error) { RollupDisableTxPoolGossip bool RollupDisableTxPoolAdmission bool RollupHaltOnIncompatibleProtocolVersion string + EnableOpcodeOptimizing bool } var enc Config enc.Genesis = c.Genesis @@ -84,8 +85,8 @@ func (c Config) MarshalTOML() (interface{}, error) { enc.TransactionHistory = c.TransactionHistory enc.StateHistory = c.StateHistory enc.StateScheme = c.StateScheme - enc.ProposeBlockInterval = c.ProposeBlockInterval enc.PathNodeBuffer = c.PathNodeBuffer + enc.ProposeBlockInterval = c.ProposeBlockInterval enc.RequiredBlocks = c.RequiredBlocks enc.LightServ = c.LightServ enc.LightIngress = c.LightIngress @@ -126,6 +127,7 @@ func (c Config) MarshalTOML() (interface{}, error) { enc.RollupDisableTxPoolGossip = c.RollupDisableTxPoolGossip enc.RollupDisableTxPoolAdmission = c.RollupDisableTxPoolAdmission enc.RollupHaltOnIncompatibleProtocolVersion = c.RollupHaltOnIncompatibleProtocolVersion + enc.EnableOpcodeOptimizing = c.EnableOpcodeOptimizing return &enc, nil } @@ -143,8 +145,8 @@ func (c *Config) UnmarshalTOML(unmarshal func(interface{}) error) error { TransactionHistory *uint64 `toml:",omitempty"` StateHistory *uint64 `toml:",omitempty"` StateScheme *string `toml:",omitempty"` - ProposeBlockInterval *uint64 `toml:",omitempty"` - PathNodeBuffer *pathdb.NodeBufferType `toml:",omitempty"` + PathNodeBuffer *pathdb.NodeBufferType `toml:",omitempty"` + ProposeBlockInterval *uint64 `toml:",omitempty"` RequiredBlocks map[uint64]common.Hash `toml:"-"` LightServ *int `toml:",omitempty"` LightIngress *int `toml:",omitempty"` @@ -162,7 +164,7 @@ func (c *Config) UnmarshalTOML(unmarshal func(interface{}) error) error { TrieCommitInterval *uint64 SnapshotCache *int Preimages *bool - NoTries *bool + NoTries *bool FilterLogCacheSize *int Miner *miner.Config TxPool *legacypool.Config @@ -185,6 +187,7 @@ func (c *Config) UnmarshalTOML(unmarshal func(interface{}) error) error { RollupDisableTxPoolGossip *bool RollupDisableTxPoolAdmission *bool RollupHaltOnIncompatibleProtocolVersion *string + EnableOpcodeOptimizing *bool } var dec Config if err := unmarshal(&dec); err != nil { @@ -223,12 +226,12 @@ func (c *Config) UnmarshalTOML(unmarshal func(interface{}) error) error { if dec.StateScheme != nil { c.StateScheme = *dec.StateScheme } - if dec.ProposeBlockInterval != nil { - c.ProposeBlockInterval = *dec.ProposeBlockInterval - } if dec.PathNodeBuffer != nil { c.PathNodeBuffer = *dec.PathNodeBuffer } + if dec.ProposeBlockInterval != nil { + c.ProposeBlockInterval = *dec.ProposeBlockInterval + } if dec.RequiredBlocks != nil { c.RequiredBlocks = dec.RequiredBlocks } @@ -349,5 +352,8 @@ func (c *Config) UnmarshalTOML(unmarshal func(interface{}) error) error { if dec.RollupHaltOnIncompatibleProtocolVersion != nil { c.RollupHaltOnIncompatibleProtocolVersion = *dec.RollupHaltOnIncompatibleProtocolVersion } + if dec.EnableOpcodeOptimizing != nil { + c.EnableOpcodeOptimizing = *dec.EnableOpcodeOptimizing + } return nil }