aboutsummaryrefslogtreecommitdiffstats
path: root/rpc
diff options
context:
space:
mode:
authorTaylor Gerring <taylor.gerring@gmail.com>2015-03-29 04:05:32 +0800
committerTaylor Gerring <taylor.gerring@gmail.com>2015-03-29 04:05:32 +0800
commit779a51c0479ae5715d73db6ffb4edbef92d21ff3 (patch)
tree4b89844a4b9c042e998eee2046f9fb32c606f970 /rpc
parentb9ca5eef585a6bc5f3233cfcc7c0a641a046e7c4 (diff)
parent47af2f02cb6b03d1fec1b0cecff8cab965b33edc (diff)
downloadgo-tangerine-779a51c0479ae5715d73db6ffb4edbef92d21ff3.tar.gz
go-tangerine-779a51c0479ae5715d73db6ffb4edbef92d21ff3.tar.zst
go-tangerine-779a51c0479ae5715d73db6ffb4edbef92d21ff3.zip
Merge branch 'develop' of https://github.com/kobigurk/go-ethereum into kobigurk-develop
Conflicts: rpc/api.go
Diffstat (limited to 'rpc')
-rw-r--r--rpc/api.go3
1 files changed, 2 insertions, 1 deletions
diff --git a/rpc/api.go b/rpc/api.go
index 8803c28dd..78e464c99 100644
--- a/rpc/api.go
+++ b/rpc/api.go
@@ -106,7 +106,8 @@ func (api *EthereumApi) GetRequestReply(req *RpcRequest, reply *interface{}) err
return err
}
- *reply = api.xethAtStateNum(args.BlockNumber).TxCountAt(args.Address)
+ count := api.xethAtStateNum(args.BlockNumber).TxCountAt(args.Address)
+ *reply = common.ToHex(big.NewInt(int64(count)).Bytes())
case "eth_getBlockTransactionCountByHash":
args := new(GetBlockByHashArgs)
if err := json.Unmarshal(req.Params, &args); err != nil {