diff options
| author | Daniel A. Nagy <nagy.da@gmail.com> | 2015-05-11 18:47:14 +0800 |
|---|---|---|
| committer | Daniel A. Nagy <nagy.da@gmail.com> | 2015-05-11 18:47:14 +0800 |
| commit | a9e1d38612cfde56c285a5de5b5bfe5326bdc9b5 (patch) | |
| tree | 6c16d3e2b216fdf0027a477a8975c9052930e34a /cmd/geth | |
| parent | 1fe70a66ba2ef0f148affa7a72b4e65023474859 (diff) | |
| parent | 5176fbc6faaa5e7f0305ad7f2b896c092781deaa (diff) | |
| download | go-tangerine-a9e1d38612cfde56c285a5de5b5bfe5326bdc9b5.tar.gz go-tangerine-a9e1d38612cfde56c285a5de5b5bfe5326bdc9b5.tar.zst go-tangerine-a9e1d38612cfde56c285a5de5b5bfe5326bdc9b5.zip | |
Merge branch 'develop' of github.com:ethereum/go-ethereum into develop
Conflicts:
rpc/jeth.go
Diffstat (limited to 'cmd/geth')
| -rw-r--r-- | cmd/geth/admin.go | 12 | ||||
| -rw-r--r-- | cmd/geth/main.go | 5 |
2 files changed, 15 insertions, 2 deletions
diff --git a/cmd/geth/admin.go b/cmd/geth/admin.go index 49e2dc6f8..2b9956638 100644 --- a/cmd/geth/admin.go +++ b/cmd/geth/admin.go @@ -70,6 +70,7 @@ func (js *jsre) adminBindings() { miner.Set("stop", js.stopMining) miner.Set("hashrate", js.hashrate) miner.Set("setExtra", js.setExtra) + miner.Set("setGasPrice", js.setGasPrice) admin.Set("debug", struct{}{}) t, _ = admin.Get("debug") @@ -236,6 +237,17 @@ func (js *jsre) setExtra(call otto.FunctionCall) otto.Value { return otto.UndefinedValue() } +func (js *jsre) setGasPrice(call otto.FunctionCall) otto.Value { + gasPrice, err := call.Argument(0).ToString() + if err != nil { + fmt.Println(err) + return otto.UndefinedValue() + } + + js.ethereum.Miner().SetGasPrice(common.String2Big(gasPrice)) + return otto.UndefinedValue() +} + func (js *jsre) hashrate(otto.FunctionCall) otto.Value { return js.re.ToVal(js.ethereum.Miner().HashRate()) } diff --git a/cmd/geth/main.go b/cmd/geth/main.go index fd6925e6d..fd7aae4c2 100644 --- a/cmd/geth/main.go +++ b/cmd/geth/main.go @@ -51,7 +51,7 @@ import _ "net/http/pprof" const ( ClientIdentifier = "Geth" - Version = "0.9.17" + Version = "0.9.19" ) var ( @@ -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, |