diff options
| -rwxr-xr-x | build/ldflags.sh | 7 | ||||
| -rw-r--r-- | miner/remote_agent.go | 7 | ||||
| -rw-r--r-- | rpc/api/eth.go | 7 | ||||
| -rw-r--r-- | rpc/api/personal.go | 4 | ||||
| -rw-r--r-- | rpc/api/personal_args.go | 4 | ||||
| -rw-r--r-- | rpc/shared/errors.go | 14 | ||||
| -rw-r--r-- | rpc/shared/types.go | 3 |
7 files changed, 37 insertions, 9 deletions
diff --git a/build/ldflags.sh b/build/ldflags.sh index 9e17ca498..3f055d416 100755 --- a/build/ldflags.sh +++ b/build/ldflags.sh @@ -7,7 +7,12 @@ if [ ! -f "build/env.sh" ]; then exit 2 fi +# Since Go 1.5, the separator char for link time assignments +# is '=' and using ' ' prints a warning. However, Go < 1.5 does +# not support using '='. +sep=$(go version | awk '{ if ($3 >= "go1.5" || index($3, "devel")) print "="; else print " "; }' -) + # set gitCommit when running from a Git checkout. if [ -f ".git/HEAD" ]; then - echo "-ldflags '-X main.gitCommit $(git rev-parse HEAD)'" + echo "-ldflags '-X main.gitCommit$sep$(git rev-parse HEAD)'" fi diff --git a/miner/remote_agent.go b/miner/remote_agent.go index 5c672a6e0..9e4453ce8 100644 --- a/miner/remote_agent.go +++ b/miner/remote_agent.go @@ -17,6 +17,7 @@ package miner import ( + "errors" "math/big" "sync" "time" @@ -90,7 +91,7 @@ func (a *RemoteAgent) GetHashRate() (tot int64) { return } -func (a *RemoteAgent) GetWork() [3]string { +func (a *RemoteAgent) GetWork() ([3]string, error) { a.mu.Lock() defer a.mu.Unlock() @@ -110,9 +111,9 @@ func (a *RemoteAgent) GetWork() [3]string { res[2] = common.BytesToHash(n.Bytes()).Hex() a.work[block.HashNoNonce()] = a.currentWork + return res, nil } - - return res + return res, errors.New("No work available yet, don't panic.") } // Returns true or false, but does not indicate if the PoW was correct diff --git a/rpc/api/eth.go b/rpc/api/eth.go index 5199bd966..ba87e86c6 100644 --- a/rpc/api/eth.go +++ b/rpc/api/eth.go @@ -563,7 +563,12 @@ func (self *ethApi) GetLogs(req *shared.Request) (interface{}, error) { func (self *ethApi) GetWork(req *shared.Request) (interface{}, error) { self.xeth.SetMining(true, 0) - return self.xeth.RemoteMining().GetWork(), nil + ret, err := self.xeth.RemoteMining().GetWork() + if err != nil { + return nil, shared.NewNotReadyError("mining work") + } else { + return ret, nil + } } func (self *ethApi) SubmitWork(req *shared.Request) (interface{}, error) { diff --git a/rpc/api/personal.go b/rpc/api/personal.go index 1b0dea330..1fb412612 100644 --- a/rpc/api/personal.go +++ b/rpc/api/personal.go @@ -110,7 +110,7 @@ func (self *personalApi) UnlockAccount(req *shared.Request) (interface{}, error) return nil, shared.NewDecodeParamError(err.Error()) } - if len(args.Passphrase) == 0 { + if args.Passphrase == nil { fe := self.xeth.Frontend() if fe == nil { return false, fmt.Errorf("No password provided") @@ -121,6 +121,6 @@ func (self *personalApi) UnlockAccount(req *shared.Request) (interface{}, error) am := self.ethereum.AccountManager() addr := common.HexToAddress(args.Address) - err := am.TimedUnlock(addr, args.Passphrase, time.Duration(args.Duration)*time.Second) + err := am.TimedUnlock(addr, *args.Passphrase, time.Duration(args.Duration)*time.Second) return err == nil, err } diff --git a/rpc/api/personal_args.go b/rpc/api/personal_args.go index 89419029b..73dc6285e 100644 --- a/rpc/api/personal_args.go +++ b/rpc/api/personal_args.go @@ -46,7 +46,7 @@ func (args *NewAccountArgs) UnmarshalJSON(b []byte) (err error) { type UnlockAccountArgs struct { Address string - Passphrase string + Passphrase *string Duration int } @@ -70,7 +70,7 @@ func (args *UnlockAccountArgs) UnmarshalJSON(b []byte) (err error) { if len(obj) >= 2 && obj[1] != nil { if passphrasestr, ok := obj[1].(string); ok { - args.Passphrase = passphrasestr + args.Passphrase = &passphrasestr } else { return shared.NewInvalidTypeError("passphrase", "not a string") } diff --git a/rpc/shared/errors.go b/rpc/shared/errors.go index 85af1bb2f..d5a7011f9 100644 --- a/rpc/shared/errors.go +++ b/rpc/shared/errors.go @@ -64,6 +64,20 @@ func NewNotImplementedError(method string) *NotImplementedError { } } +type NotReadyError struct { + Resource string +} + +func (e *NotReadyError) Error() string { + return fmt.Sprintf("%s not ready", e.Resource) +} + +func NewNotReadyError(resource string) *NotReadyError { + return &NotReadyError{ + Resource: resource, + } +} + type DecodeParamError struct { err string } diff --git a/rpc/shared/types.go b/rpc/shared/types.go index dd9a60aab..db328234d 100644 --- a/rpc/shared/types.go +++ b/rpc/shared/types.go @@ -92,6 +92,9 @@ func NewRpcResponse(id interface{}, jsonrpcver string, reply interface{}, err er case *NotImplementedError: jsonerr := &ErrorObject{-32601, err.Error()} response = &ErrorResponse{Jsonrpc: jsonrpcver, Id: id, Error: jsonerr} + case *NotReadyError: + jsonerr := &ErrorObject{-32000, err.Error()} + response = &ErrorResponse{Jsonrpc: jsonrpcver, Id: id, Error: jsonerr} case *DecodeParamError, *InsufficientParamsError, *ValidationError, *InvalidTypeError: jsonerr := &ErrorObject{-32602, err.Error()} response = &ErrorResponse{Jsonrpc: jsonrpcver, Id: id, Error: jsonerr} |