|
|
|
@ -40,6 +40,7 @@ func (c Config) MarshalTOML() (interface{}, error) { |
|
|
|
|
TrieCleanCache int |
|
|
|
|
TrieDirtyCache int |
|
|
|
|
TrieTimeout time.Duration |
|
|
|
|
SnapshotCache int |
|
|
|
|
Miner miner.Config |
|
|
|
|
Ethash ethash.Config |
|
|
|
|
TxPool core.TxPoolConfig |
|
|
|
@ -49,10 +50,9 @@ func (c Config) MarshalTOML() (interface{}, error) { |
|
|
|
|
EWASMInterpreter string |
|
|
|
|
EVMInterpreter string |
|
|
|
|
RPCGasCap *big.Int `toml:",omitempty"` |
|
|
|
|
RPCTxFeeCap float64 `toml:",omitempty"` |
|
|
|
|
Checkpoint *params.TrustedCheckpoint `toml:",omitempty"` |
|
|
|
|
CheckpointOracle *params.CheckpointOracleConfig `toml:",omitempty"` |
|
|
|
|
OverrideIstanbul *big.Int `toml:",omitempty"` |
|
|
|
|
OverrideMuirGlacier *big.Int `toml:",omitempty"` |
|
|
|
|
} |
|
|
|
|
var enc Config |
|
|
|
|
enc.Genesis = c.Genesis |
|
|
|
@ -77,6 +77,7 @@ func (c Config) MarshalTOML() (interface{}, error) { |
|
|
|
|
enc.TrieCleanCache = c.TrieCleanCache |
|
|
|
|
enc.TrieDirtyCache = c.TrieDirtyCache |
|
|
|
|
enc.TrieTimeout = c.TrieTimeout |
|
|
|
|
enc.SnapshotCache = c.SnapshotCache |
|
|
|
|
enc.Miner = c.Miner |
|
|
|
|
enc.Ethash = c.Ethash |
|
|
|
|
enc.TxPool = c.TxPool |
|
|
|
@ -86,6 +87,7 @@ func (c Config) MarshalTOML() (interface{}, error) { |
|
|
|
|
enc.EWASMInterpreter = c.EWASMInterpreter |
|
|
|
|
enc.EVMInterpreter = c.EVMInterpreter |
|
|
|
|
enc.RPCGasCap = c.RPCGasCap |
|
|
|
|
enc.RPCTxFeeCap = c.RPCTxFeeCap |
|
|
|
|
enc.Checkpoint = c.Checkpoint |
|
|
|
|
enc.CheckpointOracle = c.CheckpointOracle |
|
|
|
|
return &enc, nil |
|
|
|
@ -116,6 +118,7 @@ func (c *Config) UnmarshalTOML(unmarshal func(interface{}) error) error { |
|
|
|
|
TrieCleanCache *int |
|
|
|
|
TrieDirtyCache *int |
|
|
|
|
TrieTimeout *time.Duration |
|
|
|
|
SnapshotCache *int |
|
|
|
|
Miner *miner.Config |
|
|
|
|
Ethash *ethash.Config |
|
|
|
|
TxPool *core.TxPoolConfig |
|
|
|
@ -125,10 +128,9 @@ func (c *Config) UnmarshalTOML(unmarshal func(interface{}) error) error { |
|
|
|
|
EWASMInterpreter *string |
|
|
|
|
EVMInterpreter *string |
|
|
|
|
RPCGasCap *big.Int `toml:",omitempty"` |
|
|
|
|
RPCTxFeeCap *float64 `toml:",omitempty"` |
|
|
|
|
Checkpoint *params.TrustedCheckpoint `toml:",omitempty"` |
|
|
|
|
CheckpointOracle *params.CheckpointOracleConfig `toml:",omitempty"` |
|
|
|
|
OverrideIstanbul *big.Int `toml:",omitempty"` |
|
|
|
|
OverrideMuirGlacier *big.Int `toml:",omitempty"` |
|
|
|
|
} |
|
|
|
|
var dec Config |
|
|
|
|
if err := unmarshal(&dec); err != nil { |
|
|
|
@ -200,6 +202,9 @@ func (c *Config) UnmarshalTOML(unmarshal func(interface{}) error) error { |
|
|
|
|
if dec.TrieTimeout != nil { |
|
|
|
|
c.TrieTimeout = *dec.TrieTimeout |
|
|
|
|
} |
|
|
|
|
if dec.SnapshotCache != nil { |
|
|
|
|
c.SnapshotCache = *dec.SnapshotCache |
|
|
|
|
} |
|
|
|
|
if dec.Miner != nil { |
|
|
|
|
c.Miner = *dec.Miner |
|
|
|
|
} |
|
|
|
@ -227,6 +232,9 @@ func (c *Config) UnmarshalTOML(unmarshal func(interface{}) error) error { |
|
|
|
|
if dec.RPCGasCap != nil { |
|
|
|
|
c.RPCGasCap = dec.RPCGasCap |
|
|
|
|
} |
|
|
|
|
if dec.RPCTxFeeCap != nil { |
|
|
|
|
c.RPCTxFeeCap = *dec.RPCTxFeeCap |
|
|
|
|
} |
|
|
|
|
if dec.Checkpoint != nil { |
|
|
|
|
c.Checkpoint = dec.Checkpoint |
|
|
|
|
} |
|
|
|
|