diff options
| author | obscuren <geffobscura@gmail.com> | 2015-04-18 21:14:56 +0800 |
|---|---|---|
| committer | obscuren <geffobscura@gmail.com> | 2015-04-18 21:14:56 +0800 |
| commit | ff67fbf96448b83b778960a6c20ea8dfd854c825 (patch) | |
| tree | 557b494fb21eb3bad72121e82320cb158b00f93a /rpc | |
| parent | 8244825bbf9ca7342c052508f50a56b16c979a1e (diff) | |
| parent | 525cefa37aafbc42de8911344c9853d950c06ded (diff) | |
| download | dexon-ff67fbf96448b83b778960a6c20ea8dfd854c825.tar dexon-ff67fbf96448b83b778960a6c20ea8dfd854c825.tar.gz dexon-ff67fbf96448b83b778960a6c20ea8dfd854c825.tar.bz2 dexon-ff67fbf96448b83b778960a6c20ea8dfd854c825.tar.lz dexon-ff67fbf96448b83b778960a6c20ea8dfd854c825.tar.xz dexon-ff67fbf96448b83b778960a6c20ea8dfd854c825.tar.zst dexon-ff67fbf96448b83b778960a6c20ea8dfd854c825.zip | |
Merge branch 'develop' into downloader-proto
Diffstat (limited to 'rpc')
| -rw-r--r-- | rpc/api.go | 4 | ||||
| -rw-r--r-- | rpc/args.go | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/rpc/api.go b/rpc/api.go index 4b61fa3a5..bf5066f9a 100644 --- a/rpc/api.go +++ b/rpc/api.go @@ -182,8 +182,8 @@ func (api *EthereumApi) GetRequestReply(req *RpcRequest, reply *interface{}) err if err != nil { return err } - - *reply = v + // TODO unwrap the parent method's ToHex call + *reply = newHexData(common.FromHex(v)) case "eth_flush": return NewNotImplementedError(req.Method) case "eth_getBlockByHash": diff --git a/rpc/args.go b/rpc/args.go index 4bc36f5d9..4b3840285 100644 --- a/rpc/args.go +++ b/rpc/args.go @@ -279,6 +279,8 @@ func (args *CallArgs) UnmarshalJSON(b []byte) (err error) { return NewDecodeParamError(err.Error()) } + args.From = ext.From + if len(ext.To) == 0 { return NewValidationError("to", "is required") } |