@@ -335,12 +335,12 @@ var (
335
335
MinerGasPriceFlag = BigFlag {
336
336
Name : "miner.gasprice" ,
337
337
Usage : "Minimal gas price for mining a transactions" ,
338
- Value : eth .DefaultConfig .GasPrice ,
338
+ Value : eth .DefaultConfig .MinerGasPrice ,
339
339
}
340
340
MinerLegacyGasPriceFlag = BigFlag {
341
341
Name : "gasprice" ,
342
342
Usage : "Minimal gas price for mining a transactions (deprecated, use --miner.gasprice)" ,
343
- Value : eth .DefaultConfig .GasPrice ,
343
+ Value : eth .DefaultConfig .MinerGasPrice ,
344
344
}
345
345
MinerEtherbaseFlag = cli.StringFlag {
346
346
Name : "miner.etherbase" ,
@@ -360,6 +360,11 @@ var (
360
360
Name : "extradata" ,
361
361
Usage : "Block extra data set by the miner (default = client version, deprecated, use --miner.extradata)" ,
362
362
}
363
+ MinerRecommitIntervalFlag = cli.DurationFlag {
364
+ Name : "miner.recommit" ,
365
+ Usage : "Time interval to recreate the block being mined." ,
366
+ Value : 3 * time .Second ,
367
+ }
363
368
// Account settings
364
369
UnlockedAccountFlag = cli.StringFlag {
365
370
Name : "unlock" ,
@@ -1124,16 +1129,19 @@ func SetEthConfig(ctx *cli.Context, stack *node.Node, cfg *eth.Config) {
1124
1129
cfg .DocRoot = ctx .GlobalString (DocRootFlag .Name )
1125
1130
}
1126
1131
if ctx .GlobalIsSet (MinerLegacyExtraDataFlag .Name ) {
1127
- cfg .ExtraData = []byte (ctx .GlobalString (MinerLegacyExtraDataFlag .Name ))
1132
+ cfg .MinerExtraData = []byte (ctx .GlobalString (MinerLegacyExtraDataFlag .Name ))
1128
1133
}
1129
1134
if ctx .GlobalIsSet (MinerExtraDataFlag .Name ) {
1130
- cfg .ExtraData = []byte (ctx .GlobalString (MinerExtraDataFlag .Name ))
1135
+ cfg .MinerExtraData = []byte (ctx .GlobalString (MinerExtraDataFlag .Name ))
1131
1136
}
1132
1137
if ctx .GlobalIsSet (MinerLegacyGasPriceFlag .Name ) {
1133
- cfg .GasPrice = GlobalBig (ctx , MinerLegacyGasPriceFlag .Name )
1138
+ cfg .MinerGasPrice = GlobalBig (ctx , MinerLegacyGasPriceFlag .Name )
1134
1139
}
1135
1140
if ctx .GlobalIsSet (MinerGasPriceFlag .Name ) {
1136
- cfg .GasPrice = GlobalBig (ctx , MinerGasPriceFlag .Name )
1141
+ cfg .MinerGasPrice = GlobalBig (ctx , MinerGasPriceFlag .Name )
1142
+ }
1143
+ if ctx .GlobalIsSet (MinerRecommitIntervalFlag .Name ) {
1144
+ cfg .MinerRecommit = ctx .Duration (MinerRecommitIntervalFlag .Name )
1137
1145
}
1138
1146
if ctx .GlobalIsSet (VMEnableDebugFlag .Name ) {
1139
1147
// TODO(fjl): force-enable this in --dev mode
@@ -1176,7 +1184,7 @@ func SetEthConfig(ctx *cli.Context, stack *node.Node, cfg *eth.Config) {
1176
1184
1177
1185
cfg .Genesis = core .DeveloperGenesisBlock (uint64 (ctx .GlobalInt (DeveloperPeriodFlag .Name )), developer .Address )
1178
1186
if ! ctx .GlobalIsSet (MinerGasPriceFlag .Name ) && ! ctx .GlobalIsSet (MinerLegacyGasPriceFlag .Name ) {
1179
- cfg .GasPrice = big .NewInt (1 )
1187
+ cfg .MinerGasPrice = big .NewInt (1 )
1180
1188
}
1181
1189
}
1182
1190
// TODO(fjl): move trie cache generations into config
0 commit comments