Merge branch 'kobigurk-develop' into develop

3b20603e · Taylor Gerring · b9ca5eef · 779a51c0 · 3b20603e
Commit 3b20603e authored Mar 28, 2015 by Taylor Gerring
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

api.go rpc/api.go +2 -1

No files found.
--- 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 {