Merge branch 'develop' of https://github.com/kobigurk/go-ethereum int…

…o kobigurk-develop Conflicts: rpc/api.go
RakhiRish · Mar 28, 2015 · 779a51c · 779a51c
2 parents b9ca5ee + 47af2f0
commit 779a51c
Showing 1 changed file with 2 additions and 1 deletion.
diff --git 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 {