diff options
| author | obscuren <geffobscura@gmail.com> | 2015-04-03 23:19:22 +0800 |
|---|---|---|
| committer | obscuren <geffobscura@gmail.com> | 2015-04-03 23:19:22 +0800 |
| commit | ec8a6e0a2b74c5755ebab97e438b00f8765851fe (patch) | |
| tree | 8c59bc962eec32b2ffb67cd7cff5fb4c93056b68 /rpc/args.go | |
| parent | 36452afd4e31083d748155e5e5ddd682128aa9b0 (diff) | |
| parent | f9d94c7462bbb3a0c463427baefc68555f853dee (diff) | |
| download | dexon-ec8a6e0a2b74c5755ebab97e438b00f8765851fe.tar dexon-ec8a6e0a2b74c5755ebab97e438b00f8765851fe.tar.gz dexon-ec8a6e0a2b74c5755ebab97e438b00f8765851fe.tar.bz2 dexon-ec8a6e0a2b74c5755ebab97e438b00f8765851fe.tar.lz dexon-ec8a6e0a2b74c5755ebab97e438b00f8765851fe.tar.xz dexon-ec8a6e0a2b74c5755ebab97e438b00f8765851fe.tar.zst dexon-ec8a6e0a2b74c5755ebab97e438b00f8765851fe.zip | |
Merge branch 'develop' into glog
Diffstat (limited to 'rpc/args.go')
| -rw-r--r-- | rpc/args.go | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/rpc/args.go b/rpc/args.go index 70618a01a..cebabf4ba 100644 --- a/rpc/args.go +++ b/rpc/args.go @@ -41,7 +41,11 @@ func blockHeight(raw interface{}, number *int64) error { case "pending": *number = -2 default: - *number = common.String2Big(str).Int64() + if common.HasHexPrefix(str) { + *number = common.String2Big(str).Int64() + } else { + return NewInvalidTypeError("blockNumber", "is not a valid string") + } } return nil @@ -1021,12 +1025,15 @@ func (args *WhisperFilterArgs) UnmarshalJSON(b []byte) (err error) { return NewInsufficientParamsError(len(obj), 1) } - var argstr string - argstr, ok := obj[0].To.(string) - if !ok { - return NewInvalidTypeError("to", "is not a string") + if obj[0].To == nil { + args.To = "" + } else { + argstr, ok := obj[0].To.(string) + if !ok { + return NewInvalidTypeError("to", "is not a string") + } + args.To = argstr } - args.To = argstr t := make([]string, len(obj[0].Topics)) for i, j := range obj[0].Topics { |