aboutsummaryrefslogtreecommitdiffstats
path: root/rpc
diff options
context:
space:
mode:
authorobscuren <geffobscura@gmail.com>2015-04-18 08:33:04 +0800
committerobscuren <geffobscura@gmail.com>2015-04-18 08:33:04 +0800
commitc39a7b5c0d2002d72df7a0517ccc6edd7557ab7d (patch)
tree6d5bea52157c4fa04de8402fe4aaf375b78801df /rpc
parent89fd752659c5c11b243c30f739781d723cac82c2 (diff)
parent7dc6c338736b05fa239316f5764fb3ffec6ec6c2 (diff)
downloaddexon-c39a7b5c0d2002d72df7a0517ccc6edd7557ab7d.tar
dexon-c39a7b5c0d2002d72df7a0517ccc6edd7557ab7d.tar.gz
dexon-c39a7b5c0d2002d72df7a0517ccc6edd7557ab7d.tar.bz2
dexon-c39a7b5c0d2002d72df7a0517ccc6edd7557ab7d.tar.lz
dexon-c39a7b5c0d2002d72df7a0517ccc6edd7557ab7d.tar.xz
dexon-c39a7b5c0d2002d72df7a0517ccc6edd7557ab7d.tar.zst
dexon-c39a7b5c0d2002d72df7a0517ccc6edd7557ab7d.zip
Merge branch 'develop' of github.com-obscure:ethereum/go-ethereum into develop
Diffstat (limited to 'rpc')
-rw-r--r--rpc/api.go4
1 files changed, 2 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":