aboutsummaryrefslogtreecommitdiffstats
path: root/rpc
diff options
context:
space:
mode:
authorJeffrey Wilcke <jeffrey@ethereum.org>2015-07-07 17:55:33 +0800
committerJeffrey Wilcke <jeffrey@ethereum.org>2015-07-07 17:55:33 +0800
commite5fba8fd7025bb45a88a19c1bbef80db5bd3b688 (patch)
treeb17726c936fcb695e26b2a145b5d423b8556871b /rpc
parent916d1554675974adb92af4046e1b04ad3b26dca3 (diff)
parent37c1a8f69de44827a60296342189b6719a49dbc3 (diff)
downloadgo-tangerine-e5fba8fd7025bb45a88a19c1bbef80db5bd3b688.tar
go-tangerine-e5fba8fd7025bb45a88a19c1bbef80db5bd3b688.tar.gz
go-tangerine-e5fba8fd7025bb45a88a19c1bbef80db5bd3b688.tar.bz2
go-tangerine-e5fba8fd7025bb45a88a19c1bbef80db5bd3b688.tar.lz
go-tangerine-e5fba8fd7025bb45a88a19c1bbef80db5bd3b688.tar.xz
go-tangerine-e5fba8fd7025bb45a88a19c1bbef80db5bd3b688.tar.zst
go-tangerine-e5fba8fd7025bb45a88a19c1bbef80db5bd3b688.zip
Merge pull request #1428 from obscuren/coinbase-fixes
cmd,eth,rpc,tests: default coinbase
Diffstat (limited to 'rpc')
-rw-r--r--rpc/api/miner.go10
-rw-r--r--rpc/api/miner_args.go26
-rw-r--r--rpc/api/miner_js.go7
3 files changed, 43 insertions, 0 deletions
diff --git a/rpc/api/miner.go b/rpc/api/miner.go
index 7a84cb9ae..8d4646a5c 100644
--- a/rpc/api/miner.go
+++ b/rpc/api/miner.go
@@ -19,6 +19,7 @@ var (
"miner_makeDAG": (*minerApi).MakeDAG,
"miner_setExtra": (*minerApi).SetExtra,
"miner_setGasPrice": (*minerApi).SetGasPrice,
+ "miner_setEtherbase": (*minerApi).SetEtherbase,
"miner_startAutoDAG": (*minerApi).StartAutoDAG,
"miner_start": (*minerApi).StartMiner,
"miner_stopAutoDAG": (*minerApi).StopAutoDAG,
@@ -119,6 +120,15 @@ func (self *minerApi) SetGasPrice(req *shared.Request) (interface{}, error) {
return true, nil
}
+func (self *minerApi) SetEtherbase(req *shared.Request) (interface{}, error) {
+ args := new(SetEtherbaseArgs)
+ if err := self.codec.Decode(req.Params, &args); err != nil {
+ return false, err
+ }
+ self.ethereum.SetEtherbase(args.Etherbase)
+ return nil, nil
+}
+
func (self *minerApi) StartAutoDAG(req *shared.Request) (interface{}, error) {
self.ethereum.StartAutoDAG()
return true, nil
diff --git a/rpc/api/miner_args.go b/rpc/api/miner_args.go
index 7b0560c16..9da3b95ad 100644
--- a/rpc/api/miner_args.go
+++ b/rpc/api/miner_args.go
@@ -5,6 +5,7 @@ import (
"math/big"
+ "github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/rpc/shared"
)
@@ -76,6 +77,31 @@ func (args *GasPriceArgs) UnmarshalJSON(b []byte) (err error) {
return shared.NewInvalidTypeError("Price", "not a string")
}
+type SetEtherbaseArgs struct {
+ Etherbase common.Address
+}
+
+func (args *SetEtherbaseArgs) UnmarshalJSON(b []byte) (err error) {
+ var obj []interface{}
+ if err := json.Unmarshal(b, &obj); err != nil {
+ return shared.NewDecodeParamError(err.Error())
+ }
+
+ if len(obj) < 1 {
+ return shared.NewInsufficientParamsError(len(obj), 1)
+ }
+
+ if addr, ok := obj[0].(string); ok {
+ args.Etherbase = common.HexToAddress(addr)
+ if (args.Etherbase == common.Address{}) {
+ return shared.NewInvalidTypeError("Etherbase", "not a valid address")
+ }
+ return nil
+ }
+
+ return shared.NewInvalidTypeError("Etherbase", "not a string")
+}
+
type MakeDAGArgs struct {
BlockNumber int64
}
diff --git a/rpc/api/miner_js.go b/rpc/api/miner_js.go
index 8861a177a..c205f6712 100644
--- a/rpc/api/miner_js.go
+++ b/rpc/api/miner_js.go
@@ -18,6 +18,13 @@ web3._extend({
inputFormatter: [null]
}),
new web3._extend.Method({
+ name: 'setEtherbase',
+ call: 'miner_setEtherbase',
+ params: 1,
+ inputFormatter: [web3._extend.formatters.formatInputInt],
+ outputFormatter: web3._extend.formatters.formatOutputBool
+ }),
+ new web3._extend.Method({
name: 'setExtra',
call: 'miner_setExtra',
params: 1,