aboutsummaryrefslogtreecommitdiffstats
path: root/eth/config.go
diff options
context:
space:
mode:
authorgary rong <garyrong0905@gmail.com>2018-08-22 03:56:54 +0800
committerPéter Szilágyi <peterke@gmail.com>2018-08-22 03:56:54 +0800
commitb2c644ffb5c283a171ddf3889693673939917541 (patch)
tree501d3c337f5fb59404fd8d530eb247cdcc2144eb /eth/config.go
parent522cfc68ff496aee4205add982db049dc3092024 (diff)
downloadgo-tangerine-b2c644ffb5c283a171ddf3889693673939917541.tar
go-tangerine-b2c644ffb5c283a171ddf3889693673939917541.tar.gz
go-tangerine-b2c644ffb5c283a171ddf3889693673939917541.tar.bz2
go-tangerine-b2c644ffb5c283a171ddf3889693673939917541.tar.lz
go-tangerine-b2c644ffb5c283a171ddf3889693673939917541.tar.xz
go-tangerine-b2c644ffb5c283a171ddf3889693673939917541.tar.zst
go-tangerine-b2c644ffb5c283a171ddf3889693673939917541.zip
cmd, eth, miner: make recommit configurable (#17444)
* cmd, eth, miner: make recommit configurable * cmd, eth, les, miner: polish a bit * miner: filter duplicate sealing work * cmd: remove uncessary conversion * miner: avoid microptimization in favor of cleaner code
Diffstat (limited to 'eth/config.go')
-rw-r--r--eth/config.go15
1 files changed, 8 insertions, 7 deletions
diff --git a/eth/config.go b/eth/config.go
index 0c82f2923..cbd02416b 100644
--- a/eth/config.go
+++ b/eth/config.go
@@ -48,7 +48,7 @@ var DefaultConfig = Config{
DatabaseCache: 768,
TrieCache: 256,
TrieTimeout: 60 * time.Minute,
- GasPrice: big.NewInt(18 * params.Shannon),
+ MinerGasPrice: big.NewInt(18 * params.Shannon),
TxPool: core.DefaultTxPoolConfig,
GPO: gasprice.Config{
@@ -95,11 +95,12 @@ type Config struct {
TrieTimeout time.Duration
// Mining-related options
- Etherbase common.Address `toml:",omitempty"`
- MinerThreads int `toml:",omitempty"`
- MinerNotify []string `toml:",omitempty"`
- ExtraData []byte `toml:",omitempty"`
- GasPrice *big.Int
+ Etherbase common.Address `toml:",omitempty"`
+ MinerThreads int `toml:",omitempty"`
+ MinerNotify []string `toml:",omitempty"`
+ MinerExtraData []byte `toml:",omitempty"`
+ MinerGasPrice *big.Int
+ MinerRecommit time.Duration
// Ethash options
Ethash ethash.Config
@@ -118,5 +119,5 @@ type Config struct {
}
type configMarshaling struct {
- ExtraData hexutil.Bytes
+ MinerExtraData hexutil.Bytes
}