From cb1fa523e4930841f4cc92689c850c7831810d03 Mon Sep 17 00:00:00 2001
From: obscuren <geffobscura@gmail.com>
Date: Sat, 9 May 2015 12:00:51 +0200
Subject: [PATCH] cmd/geth, cmd/mist, eth, flags: renamed loglevel to verbosity

---
 cmd/geth/main.go   |  3 ++-
 cmd/mist/main.go   |  2 +-
 cmd/utils/flags.go | 15 +++++++++++----
 eth/backend.go     | 18 +++++++++++-------
 4 files changed, 25 insertions(+), 13 deletions(-)

diff --git a/cmd/geth/main.go b/cmd/geth/main.go
index fd6925e6db..a2cee3bd9b 100644
--- a/cmd/geth/main.go
+++ b/cmd/geth/main.go
@@ -244,6 +244,7 @@ JavaScript API. See https://github.com/ethereum/go-ethereum/wiki/Javascipt-Conso
 		utils.MaxPeersFlag,
 		utils.MaxPendingPeersFlag,
 		utils.EtherbaseFlag,
+		utils.GasPriceFlag,
 		utils.MinerThreadsFlag,
 		utils.MiningEnabledFlag,
 		utils.NATFlag,
@@ -258,7 +259,7 @@ JavaScript API. See https://github.com/ethereum/go-ethereum/wiki/Javascipt-Conso
 		utils.ProtocolVersionFlag,
 		utils.NetworkIdFlag,
 		utils.RPCCORSDomainFlag,
-		utils.LogLevelFlag,
+		utils.VerbosityFlag,
 		utils.BacktraceAtFlag,
 		utils.LogToStdErrFlag,
 		utils.LogVModuleFlag,
diff --git a/cmd/mist/main.go b/cmd/mist/main.go
index 9d92cc1754..098afc7e24 100644
--- a/cmd/mist/main.go
+++ b/cmd/mist/main.go
@@ -73,7 +73,7 @@ func init() {
 		utils.DataDirFlag,
 		utils.ListenPortFlag,
 		utils.LogFileFlag,
-		utils.LogLevelFlag,
+		utils.VerbosityFlag,
 		utils.MaxPeersFlag,
 		utils.MaxPendingPeersFlag,
 		utils.MinerThreadsFlag,
diff --git a/cmd/utils/flags.go b/cmd/utils/flags.go
index b18d9851f8..dd3b6c8a2f 100644
--- a/cmd/utils/flags.go
+++ b/cmd/utils/flags.go
@@ -4,6 +4,7 @@ import (
 	"crypto/ecdsa"
 	"fmt"
 	"log"
+	"math/big"
 	"net/http"
 	"os"
 	"path"
@@ -116,6 +117,11 @@ var (
 		Usage: "Public address for block mining rewards. By default the address of your primary account is used",
 		Value: "primary",
 	}
+	GasPriceFlag = cli.StringFlag{
+		Name:  "gasprice",
+		Usage: "Sets the minimal gasprice when mining transactions",
+		Value: new(big.Int).Mul(big.NewInt(10), common.Szabo).String(),
+	}
 
 	UnlockedAccountFlag = cli.StringFlag{
 		Name:  "unlock",
@@ -133,8 +139,8 @@ var (
 		Name:  "logfile",
 		Usage: "Send log output to a file",
 	}
-	LogLevelFlag = cli.IntFlag{
-		Name:  "loglevel",
+	VerbosityFlag = cli.IntFlag{
+		Name:  "verbosity",
 		Usage: "Logging verbosity: 0-6 (0=silent, 1=error, 2=warn, 3=info, 4=core, 5=debug, 6=debug detail)",
 		Value: int(logger.InfoLevel),
 	}
@@ -270,7 +276,7 @@ func GetNodeKey(ctx *cli.Context) (key *ecdsa.PrivateKey) {
 
 func MakeEthConfig(clientID, version string, ctx *cli.Context) *eth.Config {
 	// Set verbosity on glog
-	glog.SetV(ctx.GlobalInt(LogLevelFlag.Name))
+	glog.SetV(ctx.GlobalInt(VerbosityFlag.Name))
 	// Set the log type
 	//glog.SetToStderr(ctx.GlobalBool(LogToStdErrFlag.Name))
 	glog.SetToStderr(true)
@@ -290,7 +296,7 @@ func MakeEthConfig(clientID, version string, ctx *cli.Context) *eth.Config {
 		SkipBcVersionCheck: false,
 		NetworkId:          ctx.GlobalInt(NetworkIdFlag.Name),
 		LogFile:            ctx.GlobalString(LogFileFlag.Name),
-		LogLevel:           ctx.GlobalInt(LogLevelFlag.Name),
+		Verbosity:          ctx.GlobalInt(VerbosityFlag.Name),
 		LogJSON:            ctx.GlobalString(LogJSONFlag.Name),
 		Etherbase:          ctx.GlobalString(EtherbaseFlag.Name),
 		MinerThreads:       ctx.GlobalInt(MinerThreadsFlag.Name),
@@ -305,6 +311,7 @@ func MakeEthConfig(clientID, version string, ctx *cli.Context) *eth.Config {
 		Shh:                ctx.GlobalBool(WhisperEnabledFlag.Name),
 		Dial:               true,
 		BootNodes:          ctx.GlobalString(BootnodesFlag.Name),
+		GasPrice:           common.String2Big(ctx.GlobalString(GasPriceFlag.Name)),
 	}
 
 }
diff --git a/eth/backend.go b/eth/backend.go
index 0f23cde2fd..8f07894670 100644
--- a/eth/backend.go
+++ b/eth/backend.go
@@ -5,6 +5,7 @@ import (
 	"encoding/json"
 	"fmt"
 	"io/ioutil"
+	"math/big"
 	"os"
 	"path"
 	"path/filepath"
@@ -53,12 +54,12 @@ type Config struct {
 	BlockChainVersion  int
 	SkipBcVersionCheck bool // e.g. blockchain export
 
-	DataDir  string
-	LogFile  string
-	LogLevel int
-	LogJSON  string
-	VmDebug  bool
-	NatSpec  bool
+	DataDir   string
+	LogFile   string
+	Verbosity int
+	LogJSON   string
+	VmDebug   bool
+	NatSpec   bool
 
 	MaxPeers        int
 	MaxPendingPeers int
@@ -76,6 +77,7 @@ type Config struct {
 	Dial bool
 
 	Etherbase      string
+	GasPrice       *big.Int
 	MinerThreads   int
 	AccountManager *accounts.Manager
 
@@ -200,7 +202,7 @@ type Ethereum struct {
 
 func New(config *Config) (*Ethereum, error) {
 	// Bootstrap database
-	logger.New(config.DataDir, config.LogFile, config.LogLevel)
+	logger.New(config.DataDir, config.LogFile, config.Verbosity)
 	if len(config.LogJSON) > 0 {
 		logger.NewJSONsystem(config.DataDir, config.LogJSON)
 	}
@@ -266,6 +268,8 @@ func New(config *Config) (*Ethereum, error) {
 	eth.blockProcessor = core.NewBlockProcessor(stateDb, extraDb, eth.pow, eth.txPool, eth.chainManager, eth.EventMux())
 	eth.chainManager.SetProcessor(eth.blockProcessor)
 	eth.miner = miner.New(eth, eth.pow, config.MinerThreads)
+	eth.miner.SetGasPrice(config.GasPrice)
+
 	eth.protocolManager = NewProtocolManager(config.ProtocolVersion, config.NetworkId, eth.eventMux, eth.txPool, eth.chainManager, eth.downloader)
 	if config.Shh {
 		eth.whisper = whisper.New()