poanetwork
/
quorum
mirror of https://github.com/poanetwork/quorum.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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

Conflicts:
	rpc/api.go
This commit is contained in:
Taylor Gerring 2015-03-28 21:05:32 +01:00
parent b9ca5eef58 47af2f02cb
commit 779a51c047
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
rpc/api.go
View File

@ -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 {